3666 files changed, 75876 insertions, 69805 deletions

diff --git a/network/2ping/2ping.SlackBuild b/network/2ping/2ping.SlackBuild
index 263ffa123b..6607e3576a 100644
--- a/network/2ping/2ping.SlackBuild
+++ b/network/2ping/2ping.SlackBuild
@@ -1,20 +1,28 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for 2ping
 
-# 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.
 
+# 20220331 bkw: BUILD=2, add SlackBuild to doc dir.
+# 20210911 bkw: update for v4.5.1.
+# 20200805 bkw: update for v4.5.
+# 20191130 bkw: update for v4.3.
+
 # 20180821 bkw:
 # - update for v4.2.
 # - document optional deps in README.
 # - include wireshark stuff in package.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=2ping
-VERSION=${VERSION:-4.2}
-BUILD=${BUILD:-1}
+VERSION=${VERSION:-4.5.1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -24,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}
@@ -61,12 +73,15 @@ fi
 
 mkdir -p $PKG/usr/man/man1
 gzip -9c < doc/$PRGNAM.1 > $PKG/usr/man/man1/$PRGNAM.1.gz
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/wireshark
-cp -a README* COPYING ChangeLog doc/*.py doc/*.md $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a wireshark/*.pcap $PKG/usr/doc/$PRGNAM-$VERSION/wireshark
+
+PKGDOC=$PKG/usr/doc/$PRGNAM-$VERSION
+mkdir -p $PKGDOC/wireshark
+cat $CWD/$PRGNAM.SlackBuild > $PKGDOC/$PRGNAM.SlackBuild
+cp -a README* COPYING* ChangeLog* doc/*.py doc/*.md $PKGDOC
+cp -a wireshark/*.pcap $PKGDOC/wireshark
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/network/2ping/2ping.info b/network/2ping/2ping.info
index 2cc7f5188f..605dca9070 100644
--- a/network/2ping/2ping.info
+++ b/network/2ping/2ping.info
@@ -1,10 +1,10 @@
 PRGNAM="2ping"
-VERSION="4.2"
+VERSION="4.5.1"
 HOMEPAGE="https://www.finnie.org/software/2ping/"
-DOWNLOAD="https://github.com/rfinnie/2ping/archive/v4.2/2ping-4.2.tar.gz"
-MD5SUM="5be6bdc3a35c1592133642ea80c0e63e"
+DOWNLOAD="https://github.com/rfinnie/2ping/archive/v4.5.1/2ping-4.5.1.tar.gz"
+MD5SUM="6fbe77fbda98fb3a41fb4fa7c6c14871"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="python3"
+REQUIRES=""
 MAINTAINER="B. Watson"
-EMAIL="yalhcru@gmail.com"
+EMAIL="urchlay@slackware.uk"
diff --git a/network/2ping/README b/network/2ping/README
index 59335bc9b2..f47b5705c1 100644
--- a/network/2ping/README
+++ b/network/2ping/README
@@ -10,17 +10,19 @@ without setting one of your own up, there are several public test
 listeners available. Try test.2ping.net, cromulent.colobox.com, or
 linode-london.mirrors.finnix.org.
 
-To run a listener, you can manually start one with e.g. "2ping --listen".
+To run a listener, you can manually start it with e.g. "2ping --listen".
 If you want to start a listener at boot, add a command like this to
 /etc/rc.d/rc.local:
 
-su nobody -s /bin/sh -c 'exec /usr/bin/2ping --quiet --listen' &> /dev/null &
+su nobody -s /bin/sh -c \
+   'exec /usr/bin/2ping --quiet --listen' \
+   &> /dev/null &
 
 Optional dependencies: Certain command line options to 2ping require
 additional packages.
 
-- dnspython (built after python3 is installed): --srv option.
-- netifaces (built with PYTHON3=yes): --all-interfaces option.
+- dnspython: --srv option.
+- netifaces: --all-interfaces option.
 - python3-pycrypto: --encrypt option.
 
 The package can include a wireshark plugin for decoding the 2ping
diff --git a/network/3proxy/3proxy.SlackBuild b/network/3proxy/3proxy.SlackBuild
index a0bd0b6089..91743fb540 100644
--- a/network/3proxy/3proxy.SlackBuild
+++ b/network/3proxy/3proxy.SlackBuild
@@ -1,9 +1,9 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for 3proxy
 
 # Copyright 2008, 2009 Ilya INSTE Ponetayev, <inste@mail.ru>
-# Copyright 2018 wigums pioneer22675@gmail.com
+# Copyright 2018-2019 wigums pioneer22675@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=3proxy
-VERSION=${VERSION:-0.8.12}
+VERSION=${VERSION:-0.8.13}
 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 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/network/3proxy/3proxy.info b/network/3proxy/3proxy.info
index 9bbd9a0768..2de1849234 100644
--- a/network/3proxy/3proxy.info
+++ b/network/3proxy/3proxy.info
@@ -1,8 +1,8 @@
 PRGNAM="3proxy"
-VERSION="0.8.12"
+VERSION="0.8.13"
 HOMEPAGE="https://3proxy.ru/"
-DOWNLOAD="https://github.com/z3APA3A/3proxy/archive/0.8.12/3proxy-0.8.12.tar.gz"
-MD5SUM="f8ccbe689ff8da8ff67942fc440187ae"
+DOWNLOAD="https://github.com/z3APA3A/3proxy/archive/0.8.13/3proxy-0.8.13.tar.gz"
+MD5SUM="d9420c56f05fb78bf9043dd8a30c6a1c"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/network/3proxy/README b/network/3proxy/README
index cdfd807f31..f3e55335f7 100644
--- a/network/3proxy/README
+++ b/network/3proxy/README
@@ -1,11 +1,12 @@
-3Proxy tiny free proxy server previously known as 3[APA3A] tiny freeware
-proxy (pronounce it as "Zaraza tiny freeware proxy") is really tiny
-cross-platform (Win32/Win64&Unix) proxy servers set. It includes
-HTTP proxy with HTTPS and FTP support, SOCKSv4/SOCKSv4.5/SOCKSv5 proxy
-(socks/socks.exe), POP3 proxy, SMTP proxy, AIM/ICQ proxy (icqpr/icqpr.exe),
-MSN messenger / Live messenger proxy (msnpr/msnpr.exe), FTP proxy,
-caching DNS proxy, TCP and UDP portmappers. You can use every proxy as
-a standalone program (socks, proxy, tcppm, udppm, pop3p) or use combined
-program (3proxy). Combined proxy additionally supports features like access
-control, bandwidth limiting, limiting daily/weekly/monthly traffic amount,
-proxy chaining, log rotation, syslog and ODBC logging, etc.
+3Proxy tiny free proxy server previously known as 3[APA3A]
+tiny freeware proxy (pronounce it as "Zaraza tiny freeware
+proxy") is really tiny cross-platform (Win32/Win64&Unix) proxy
+servers set. It includes HTTP proxy with HTTPS and FTP support,
+SOCKSv4/SOCKSv4.5/SOCKSv5 proxy (socks/socks.exe), POP3 proxy, SMTP
+proxy, AIM/ICQ proxy (icqpr/icqpr.exe), MSN messenger / Live messenger
+proxy (msnpr/msnpr.exe), FTP proxy, caching DNS proxy, TCP and UDP
+portmappers. You can use every proxy as a standalone program (socks,
+proxy, tcppm, udppm, pop3p) or use combined program (3proxy). Combined
+proxy additionally supports features like access control, bandwidth
+limiting, limiting daily/weekly/monthly traffic amount, proxy
+chaining, log rotation, syslog and ODBC logging, etc.
diff --git a/network/AdGuardHome/AdGuardHome.SlackBuild b/network/AdGuardHome/AdGuardHome.SlackBuild
new file mode 100644
index 0000000000..f574600f57
--- /dev/null
+++ b/network/AdGuardHome/AdGuardHome.SlackBuild
@@ -0,0 +1,89 @@
+#!/bin/bash
+
+# Slackware build script for AdGuardHome
+
+# Copyright 2019-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=AdGuardHome
+VERSION=${VERSION:-0.107.48}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+       *) 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}
+
+case "$ARCH" in
+    i?86) SUFFIX="linux_386" ;;
+  x86_64) SUFFIX="linux_amd64" ;;
+       *) echo "$ARCH is not supported." >&2
+          exit 1
+          ;;
+esac
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM
+tar xvf $CWD/${PRGNAM}_$SUFFIX.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 -p $PKG/usr/sbin $PKG/etc/rc.d
+install -m 0755 -o root -g root AdGuardHome $PKG/usr/sbin
+install -m 0644 -o root -g root $CWD/rc.AdGuardHome \
+    $PKG/etc/rc.d/rc.AdGuardHome.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 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/network/AdGuardHome/AdGuardHome.info b/network/AdGuardHome/AdGuardHome.info
new file mode 100644
index 0000000000..3088f00175
--- /dev/null
+++ b/network/AdGuardHome/AdGuardHome.info
@@ -0,0 +1,10 @@
+PRGNAM="AdGuardHome"
+VERSION="0.107.48"
+HOMEPAGE="https://adguard.com/adguard-home.html"
+DOWNLOAD="https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.48/AdGuardHome_linux_386.tar.gz"
+MD5SUM="4f2d1bd8af158a5d081d6e46eefe1675"
+DOWNLOAD_x86_64="https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.48/AdGuardHome_linux_amd64.tar.gz"
+MD5SUM_x86_64="574115238a9334cf096ef16dc07feae4"
+REQUIRES=""
+MAINTAINER="Alexander Verbovetsky"
+EMAIL="alik@ejik.org"
diff --git a/network/AdGuardHome/README b/network/AdGuardHome/README
new file mode 100644
index 0000000000..6903da6680
--- /dev/null
+++ b/network/AdGuardHome/README
@@ -0,0 +1,17 @@
+AdGuard Home is a network-wide software for blocking ads and tracking.
+It operates as a DNS server that re-routes tracking domains to a "black
+hole", thus preventing your devices from connecting to those servers.
+
+Key features of AdGuard Home:
+
+* Blocking ads and trackers
+* Customizing blocklists
+* Built-in DHCP server
+* HTTPS for the Admin interface
+* Encrypted DNS upstream servers: DNS-over-HTTPS, DNS-over-TLS, DNSCrypt
+* Running as a DNS-over-HTTPS or DNS-over-TLS server
+* Blocking phishing and malware domains
+* Parental control (blocking adult domains)
+* Force Safe search on search engines
+* Per-client (device) configuration
+* Access settings
diff --git a/network/AdGuardHome/README.SBo b/network/AdGuardHome/README.SBo
new file mode 100644
index 0000000000..843901ae42
--- /dev/null
+++ b/network/AdGuardHome/README.SBo
@@ -0,0 +1,24 @@
+A simple init script /etc/rc.d/rc.AdGuardHome has been provided to run
+AdGuard Home as a daemon.
+
+After first install, run
+# chmod +x /etc/rc.d/rc.AdGuardHome
+# /etc/rc.d/rc.AdGuardHome start
+Then go to the initial configuration wizard at http://localhost:3000
+
+To start AdGuard Home automatically at system start, add the following
+to /etc/rc.d/rc.local:
+
+# Start AdGuard Home
+if [ -x /etc/rc.d/rc.AdGuardHome ]; then
+  rm -f /var/run/AdGuardHome.pid
+  /etc/rc.d/rc.AdGuardHome start
+fi
+
+To properly stop AdGuard Home on system shutdown, add the following to
+/etc/rc.d/rc.local_shutdown:
+
+# Stop AdGuard Home
+if [ -x /etc/rc.d/rc.AdGuardHome ]; then
+  /etc/rc.d/rc.AdGuardHome stop
+fi
diff --git a/network/AdGuardHome/doinst.sh b/network/AdGuardHome/doinst.sh
new file mode 100644
index 0000000000..b842b7ff58
--- /dev/null
+++ b/network/AdGuardHome/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.AdGuardHome.new
diff --git a/network/AdGuardHome/rc.AdGuardHome b/network/AdGuardHome/rc.AdGuardHome
new file mode 100644
index 0000000000..73e09fdccb
--- /dev/null
+++ b/network/AdGuardHome/rc.AdGuardHome
@@ -0,0 +1,55 @@
+#!/bin/bash
+# Start/stop/restart the AdGuard Home
+
+bin=/usr/sbin/AdGuardHome
+config=/etc/AdGuardHome.yaml
+workdir=/var/lib/AdGuardHome
+pidfile=/run/AdGuardHome.pid
+
+start_AdGuardHome() {
+  echo "Starting AdGuard Home... "
+  if [ -f $pidfile ]; then
+      echo "AdGuard Home is already running with PID $(cat ${pidfile})."
+      exit 0
+  fi
+  mkdir -p $workdir
+  nohup $bin --config $config --work-dir $workdir --no-check-update \
+      --pidfile $pidfile 0<&- &>/dev/null &
+}
+
+stop_AdGuardHome() {
+  echo "Stoppping AdGuard Home... "
+  [ -f $pidfile ] && kill $(cat ${pidfile})
+}
+
+restart_AdGuardHome() {
+  stop_AdGuardHome
+  sleep 1
+  start_AdGuardHome
+}
+
+status_AdGuardHome() {
+  if [ -f $pidfile ]; then
+    echo "AdGuard Home is running with PID $(cat ${pidfile})."
+  else
+    echo "AdGuard Home is stopped."
+    exit 1
+  fi
+}
+
+case "$1" in
+'start')
+  start_AdGuardHome
+  ;;
+'stop')
+  stop_AdGuardHome
+  ;;
+'restart')
+  restart_AdGuardHome
+  ;;
+'status')
+  status_AdGuardHome
+  ;;
+*)
+  echo "usage $0 start|stop|restart|status"
+esac
diff --git a/network/AdGuardHome/slack-desc b/network/AdGuardHome/slack-desc
new file mode 100644
index 0000000000..e6984b7aed
--- /dev/null
+++ b/network/AdGuardHome/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+           |-----handy-ruler------------------------------------------------------|
+AdGuardHome: AdGuardHome (Ad blocking DNS server)
+AdGuardHome:
+AdGuardHome: AdGuard Home is a network-wide software for blocking ads and tracking.
+AdGuardHome: It operates as a DNS server that re-routes tracking domains to a
+AdGuardHome: "black hole", thus preventing your devices from connecting to those
+AdGuardHome: servers.
+AdGuardHome:
+AdGuardHome: Homepage: https://adguard.com/adguard-home.html
+AdGuardHome:
+AdGuardHome:
+AdGuardHome:
diff --git a/network/ApacheDirectoryStudio/ApacheDirectoryStudio.SlackBuild b/network/ApacheDirectoryStudio/ApacheDirectoryStudio.SlackBuild
index bd0fb4a30b..a7b19a761e 100644
--- a/network/ApacheDirectoryStudio/ApacheDirectoryStudio.SlackBuild
+++ b/network/ApacheDirectoryStudio/ApacheDirectoryStudio.SlackBuild
@@ -1,23 +1,33 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for ApacheDirectoryStudio
 # Written by Vincent Batts, vbatts@hashbangbash.com
 
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=ApacheDirectoryStudio
 VERSION=${VERSION:-2.0.0.v20130628}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 ARCH=${ARCH:-$(uname -m)}
 
-CWD=$(pwd)
+# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
+# the name of the created package would be, and then exit. This information
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; 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,5 +100,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/network/ApacheDirectoryStudio/ApacheDirectoryStudio.info b/network/ApacheDirectoryStudio/ApacheDirectoryStudio.info
index e9ca4ac34e..f9ff934955 100644
--- a/network/ApacheDirectoryStudio/ApacheDirectoryStudio.info
+++ b/network/ApacheDirectoryStudio/ApacheDirectoryStudio.info
@@ -5,6 +5,6 @@ DOWNLOAD="https://archive.apache.org/dist/directory/studio/dist/2.0.0.v20130628/
 MD5SUM="dba7618834772e30a7e93af7fb7e0b22"
 DOWNLOAD_x86_64="https://archive.apache.org/dist/directory/studio/dist/2.0.0.v20130628/ApacheDirectoryStudio-linux-x86_64-2.0.0.v20130628.tar.gz"
 MD5SUM_x86_64="c4a8a0b22fe352f1509f8f7fe2678f2a"
-REQUIRES="jdk"
+REQUIRES="zulu-openjdk8"
 MAINTAINER="Vincent Batts"
 EMAIL="vbatts@hashbangbash.com"
diff --git a/network/BitchX/BitchX.SlackBuild b/network/BitchX/BitchX.SlackBuild
deleted file mode 100644
index 003ba22a30..0000000000
--- a/network/BitchX/BitchX.SlackBuild
+++ /dev/null
@@ -1,109 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for BitchX
-
-# 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=BitchX
-SRCNAM=${PRGNAM,,}
-VERSION=${VERSION:-1.2.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 {} \;
-
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
-  --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --sysconfdir=/etc \
-  --localstatedir=/var \
-  --mandir=/usr/man \
-  --with-ssl \
-  --with-plugins \
-  --enable-ipv6 \
-  --build=$ARCH-slackware-linux
-
-gmake
-gmake 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
-
-# fix executable
-mv $PKG/usr/bin/$PRGNAM-$VERSION $PKG/usr/bin/$PRGNAM
-
-# fix man page
-rm $PKG/usr/man/man1/BitchX.1.bz2
-gzip -9 doc/$PRGNAM.1
-install -D -m0644 doc/$PRGNAM.1.gz $PKG/usr/man/man1/$PRGNAM.1.gz
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a README COPYRIGHT 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/network/BitchX/BitchX.info b/network/BitchX/BitchX.info
deleted file mode 100644
index 7f61db25ad..0000000000
--- a/network/BitchX/BitchX.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="BitchX"
-VERSION="1.2.1"
-HOMEPAGE="http://bitchx.sourceforge.net/"
-DOWNLOAD="http://sourceforge.net/projects/bitchx/files/ircii-pana/bitchx-1.2.1/bitchx-1.2.1.tar.gz"
-MD5SUM="4da13a2dcfa17847168e50e62be4f67a"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Dimitris Zlatanidis"
-EMAIL="d.zlatanidis@gmail.com"
diff --git a/network/BitchX/README b/network/BitchX/README
deleted file mode 100644
index c3a77681b3..0000000000
--- a/network/BitchX/README
+++ /dev/null
@@ -1,3 +0,0 @@
-BitchX is a free software text-based IRC (Internet Relay Chat) 
-client for UNIX-like systems, originally based on ircII and 
-heavily influenced by EPIC.
diff --git a/network/BitchX/slack-desc b/network/BitchX/slack-desc
deleted file mode 100644
index 68ee263985..0000000000
--- a/network/BitchX/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------------------------------------------------------|
-BitchX: BitchX (IRC client)
-BitchX:
-BitchX: BitchX is a free software text-based IRC (Internet Relay Chat)
-BitchX: client for UNIX-like systems, originally based on ircII and
-BitchX: heavily influenced by EPIC.
-BitchX:
-BitchX: Homepage: http://bitchx.sourceforge.net/
-BitchX:
-BitchX:
-BitchX:
-BitchX:
diff --git a/network/CherryMusic/CherryMusic.SlackBuild b/network/CherryMusic/CherryMusic.SlackBuild
deleted file mode 100644
index 0ec54472d5..0000000000
--- a/network/CherryMusic/CherryMusic.SlackBuild
+++ /dev/null
@@ -1,93 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for CherryMusic
-
-# Copyright 2014-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=CherryMusic
-VERSION=${VERSION:-0.40.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
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -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
-
-install -D -m644 doc/man/cherrymusic.1 $PKG/usr/man/man1/cherrymusic.1
-install -D -m644 doc/man/cherrymusic.conf.5 $PKG/usr/man/man5/cherrymusic.conf.5
-install -D -m644 doc/man/cherrymusicd.8 $PKG/usr/man/man8/cherrymusicd.8
-
-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 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:-tgz}
diff --git a/network/CherryMusic/CherryMusic.info b/network/CherryMusic/CherryMusic.info
deleted file mode 100644
index 7ee7e2722e..0000000000
--- a/network/CherryMusic/CherryMusic.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="CherryMusic"
-VERSION="0.40.0"
-HOMEPAGE="http://www.fomori.org/cherrymusic/"
-DOWNLOAD="https://pypi.python.org/packages/bd/af/118542a136d18a7389b142fc0a1b38842d86af1c938998a9e11de8b73afc/CherryMusic-0.40.0.tar.gz"
-MD5SUM="4e771c2e5a3da2500296893428bfc27c"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="CherryPy"
-MAINTAINER="Dimitris Zlatanidis"
-EMAIL="d.zlatanidis@gmail.com"
diff --git a/network/CherryMusic/README b/network/CherryMusic/README
deleted file mode 100644
index 475e409e77..0000000000
--- a/network/CherryMusic/README
+++ /dev/null
@@ -1,26 +0,0 @@
-CherryMusic (music streaming server)
-
-CherryMusic is a music streaming server based on CherryPy and jPlayer.
-It can be run remotely or on a single computer and is designed to handle
-huge music libraries of 3 TB and more; it also works well with small
-collections. In contrast to MPD, Icecast and the like, CherryMusic allows
-multiple users to log in via HTTP/HTTPS using a web browser, browse and
-search the music database, manage playlists and stream music to the browser.
-
-The CherryMusic server runs on Linux, Windows and OS X, as long as Python
-and SQLite are available. To use the web client, any device with a modern 
-browser will do.
-
-Optional dependencies are:
-
-    Live transcoding: lame, vorbis-tools, flac, faad2, mpg123, opus-tools
-    or ffmpeg (which replaces the aforementioned codecs plus adds WMA
-    decoding)
-
-    Automatic resizing of displayed cover art: imagemagick
-
-    For special character search terms: python-unidecode
-
-    For the GTK system tray icon: python-gobject
-
-    HTTPS support in Python 2: pyOpenSSL (in Python 3 it works out of the box)
diff --git a/network/CherryMusic/slack-desc b/network/CherryMusic/slack-desc
deleted file mode 100644
index 17410f4f20..0000000000
--- a/network/CherryMusic/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------------------------------------------------------|
-CherryMusic: CherryMusic (music streaming server)
-CherryMusic:
-CherryMusic: CherryMusic is a music streaming server based on CherryPy and
-CherryMusic: jPlayer. It can be run remotely or on a single computer and is
-CherryMusic: designed to handle huge music libraries of 3 TB and more; it also
-CherryMusic: works well with small collections. In contrast to MPD, Icecast
-CherryMusic: and the like, CherryMusic allows multiple users to log in via
-CherryMusic: HTTP/HTTPS using a web browser, browse and search the music
-CherryMusic: database, manage playlists and stream music to the browser.
-CherryMusic:
-CherryMusic: Homepage: http://www.fomori.org/cherrymusic/
diff --git a/network/ClusterSSH/ClusterSSH.SlackBuild b/network/ClusterSSH/ClusterSSH.SlackBuild
index 003ae489be..d206a9ad70 100644
--- a/network/ClusterSSH/ClusterSSH.SlackBuild
+++ b/network/ClusterSSH/ClusterSSH.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 #
 # Copyright (c) 2011-2015 LEVAI Daniel
 # All rights reserved.
@@ -22,10 +22,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=ClusterSSH
 VERSION=${VERSION:-4.09}
 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/network/ClusterSSH/ClusterSSH.info b/network/ClusterSSH/ClusterSSH.info
index 1b7cfd3b06..25fc65f056 100644
--- a/network/ClusterSSH/ClusterSSH.info
+++ b/network/ClusterSSH/ClusterSSH.info
@@ -5,8 +5,8 @@ DOWNLOAD="http://downloads.sourceforge.net/clusterssh/App-ClusterSSH-4.09.tar.gz
 MD5SUM="557e8440b246f4122c2decf6cc61730a"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="perl-Try-Tiny perl-x11-protocol perl-File-Which perl-Test-Pod perl-Test-Pod-Coverage perl-CPAN-Changes \
+REQUIRES="perl-Try-Tiny perl-File-Which perl-Test-Pod perl-Test-Pod-Coverage perl-CPAN-Changes \
           perl-tk perl-Test-Trap perl-Exception-Class perl-Readonly perl-Test-DistManifest perl-Test-Differences \
-          perl-File-Slurp perl-Sort-Naturally perl-Test-PerlTidy perl-X11-Protocol-Other"
+          perl-Sort-Naturally perl-Test-PerlTidy perl-X11-Protocol-Other"
 MAINTAINER="LEVAI Daniel"
 EMAIL="leva@ecentrum.hu"
diff --git a/network/ClusterSSH/README b/network/ClusterSSH/README
index 992ddcc0bf..63f1ec1a98 100644
--- a/network/ClusterSSH/README
+++ b/network/ClusterSSH/README
@@ -1,9 +1,10 @@
-ClusterSSH is a tool for making the same change on multiple servers at the same
-time. The 'cssh' command opens an administration console and an xterm to all
-specified hosts. Any text typed into the administration console is replicated
-to all windows. All windows may also be typed into directly.
+ClusterSSH is a tool for making the same change on multiple
+servers at the same time. The 'cssh' command opens an administration
+console and an xterm to all specified hosts. Any text typed into the
+administration console is replicated to all windows. All windows may
+also be typed into directly.
 
-This tool is intended for (but not limited to) cluster administration where the
-same configuration or commands must be run on each node within the cluster.
-Performing these commands all at once via this tool ensures all nodes are kept
-in sync.
+This tool is intended for (but not limited to) cluster administration
+where the same configuration or commands must be run on each node
+within the cluster.  Performing these commands all at once via this
+tool ensures all nodes are kept in sync.
diff --git a/network/DarTui/DarTui.SlackBuild b/network/DarTui/DarTui.SlackBuild
deleted file mode 100644
index b38ff76add..0000000000
--- a/network/DarTui/DarTui.SlackBuild
+++ /dev/null
@@ -1,86 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for DarTui
-
-# 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=DarTui
-VERSION=${VERSION:-1.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=$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.md CHANGELOG.txt 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/network/DarTui/DarTui.info b/network/DarTui/DarTui.info
deleted file mode 100644
index a83e7a3068..0000000000
--- a/network/DarTui/DarTui.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="DarTui"
-VERSION="1.1.0"
-HOMEPAGE="https://github.com/cjlucas/dartui"
-DOWNLOAD="https://pypi.python.org/packages/source/D/DarTui/DarTui-1.1.0.tar.gz"
-MD5SUM="d65058b3b96245dfa56aa363b722ab71"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="web.py rtorrent-python simplejson"
-MAINTAINER="Dimitris Zlatanidis"
-EMAIL="d.zlatanidis@gmail.com"
diff --git a/network/DarTui/README b/network/DarTui/README
deleted file mode 100644
index 81e12892b0..0000000000
--- a/network/DarTui/README
+++ /dev/null
@@ -1 +0,0 @@
-An rTorrent web interface with a focus on simplicity, speed and responsiveness.
diff --git a/network/DarTui/slack-desc b/network/DarTui/slack-desc
deleted file mode 100644
index c1ed5db00e..0000000000
--- a/network/DarTui/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------------------------------------------------------|
-DarTui: DarTui (rTorrent web interface)
-DarTui:
-DarTui: An rTorrent web interface with a focus on simplicity,
-DarTui: speed and responsiveness.
-DarTui:
-DarTui: Homepage: https://github.com/cjlucas/dartui
-DarTui:
-DarTui:
-DarTui:
-DarTui:
-DarTui:
diff --git a/network/DenyHosts/DenyHosts.SlackBuild b/network/DenyHosts/DenyHosts.SlackBuild
index 4d7f9dceb4..7d80c1803c 100644
--- a/network/DenyHosts/DenyHosts.SlackBuild
+++ b/network/DenyHosts/DenyHosts.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 # Slackware build script for denyhosts
 # originally Written by chopp (nix4me@gmail.com)
 # Some portions, methods and/or ideas obtained from:
@@ -35,27 +35,37 @@
 # programs have moved to /usr/sbin. Also iptables support
 # has been added.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=DenyHosts
 LCPRGNAM=denyhosts
 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 ;;
+    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"
@@ -130,4 +140,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/network/EarthReader-Web/EarthReader-Web.SlackBuild b/network/EarthReader-Web/EarthReader-Web.SlackBuild
deleted file mode 100644
index 40e77169a7..0000000000
--- a/network/EarthReader-Web/EarthReader-Web.SlackBuild
+++ /dev/null
@@ -1,86 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for EarthReader-Web
-
-# 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=EarthReader-Web
-VERSION=${VERSION:-0.2.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 {} \;
-
-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
-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/network/EarthReader-Web/EarthReader-Web.info b/network/EarthReader-Web/EarthReader-Web.info
deleted file mode 100644
index ad112581eb..0000000000
--- a/network/EarthReader-Web/EarthReader-Web.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="EarthReader-Web"
-VERSION="0.2.1"
-HOMEPAGE="http://earthreader.org/"
-DOWNLOAD="https://pypi.python.org/packages/source/E/EarthReader-Web/EarthReader-Web-0.2.1.tar.gz"
-MD5SUM="d392961ec1e9d2778b841bd938692553"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="python-libsass Flask libearth waitress"
-MAINTAINER="Dimitris Zlatanidis"
-EMAIL="d.zlatanidis@gmail.com"
diff --git a/network/EarthReader-Web/README b/network/EarthReader-Web/README
deleted file mode 100644
index 91f70e93bc..0000000000
--- a/network/EarthReader-Web/README
+++ /dev/null
@@ -1,7 +0,0 @@
-Earth Reader for Web.
-
-Web frontend of Earth Reader.
-
-We are trying to make the RSS reader possible to run on various
-devices and be synchronized without any particular centralized 
-proprietary services.
diff --git a/network/EarthReader-Web/slack-desc b/network/EarthReader-Web/slack-desc
deleted file mode 100644
index 96778ff272..0000000000
--- a/network/EarthReader-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------------------------------------------------------|
-EarthReader-Web: EarthReader-Web (Earth Reader for Web)
-EarthReader-Web:
-EarthReader-Web: We are trying to make the RSS reader possible to run on various
-EarthReader-Web: devices and be synchronized without any particular centralized
-EarthReader-Web: proprietary services.
-EarthReader-Web:
-EarthReader-Web: Homepage: http://earthreader.org/
-EarthReader-Web:
-EarthReader-Web:
-EarthReader-Web:
-EarthReader-Web:
diff --git a/network/Electrum-DASH/Electrum-DASH.SlackBuild b/network/Electrum-DASH/Electrum-DASH.SlackBuild
deleted file mode 100644
index 982a937dfb..0000000000
--- a/network/Electrum-DASH/Electrum-DASH.SlackBuild
+++ /dev/null
@@ -1,87 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for Electrum-DASH
-
-# Copyright 2016 Reedych <reedych@reedych.pw>
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
-#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
-#  EVENT SHALL AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (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=Electrum-DASH
-VERSION=${VERSION:-2.4.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 {} \;
-
-python setup.py install --root=$PKG
-
-pyrcc4 icons.qrc -o gui/qt/icons_rc.py
-
-find $PKG -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 LICENCE README.rst RELEASE-NOTES $PKG/usr/doc/$PRGNAM-$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/network/Electrum-DASH/Electrum-DASH.info b/network/Electrum-DASH/Electrum-DASH.info
deleted file mode 100644
index d274c05e91..0000000000
--- a/network/Electrum-DASH/Electrum-DASH.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="Electrum-DASH"
-VERSION="2.4.1"
-HOMEPAGE="https://electrum-dash.org/"
-DOWNLOAD="http://ponce.cc/slackware/sources/repo/Electrum-DASH-2.4.1.tar.gz"
-MD5SUM="a2fa80487472e517d6a9418f3460b310"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="SlowAES ecdsa python-qrcode pyasn1-modules python-tlslite python-pbkdf2 protobuf python-jsonrpclib dnspython python-requests python-x11_hash trezor mnemonic"
-MAINTAINER="Reedych"
-EMAIL="reedych@reedych.pw"
diff --git a/network/Electrum-DASH/README b/network/Electrum-DASH/README
deleted file mode 100644
index d3be75b3da..0000000000
--- a/network/Electrum-DASH/README
+++ /dev/null
@@ -1,4 +0,0 @@
-Electrum-DASH is an easy to use Dash client.
-
-There is no waiting time when you start the client, because it does
-not download the Bitcoin blockchain.
diff --git a/network/Electrum-DASH/slack-desc b/network/Electrum-DASH/slack-desc
deleted file mode 100644
index 4167b65d97..0000000000
--- a/network/Electrum-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------------------------------------------------------|
-Electrum-DASH: Electrum-DASH (dash client)
-Electrum-DASH:
-Electrum-DASH: Electrum-DASH is an easy to use Dash client.
-Electrum-DASH:
-Electrum-DASH: There is no waiting time when you start the client, because it does
-Electrum-DASH: not download the Bitcoin blockchain.
-Electrum-DASH:
-Electrum-DASH: Project URL: https://electrum-dash.org/
-Electrum-DASH:
-Electrum-DASH:
-Electrum-DASH:
diff --git a/network/Electrum/Electrum.SlackBuild b/network/Electrum/Electrum.SlackBuild
index d5895bfdab..b53dc90e61 100644
--- a/network/Electrum/Electrum.SlackBuild
+++ b/network/Electrum/Electrum.SlackBuild
@@ -1,9 +1,9 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for Electrum
 
 # Copyright 2014-2018 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
-# Copyright 2019 nomnombtc <nomnombtc@arcor.de>
+# Copyright 2019-2024 nomnombtc <nomnombtc@arcor.de>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -15,7 +15,7 @@
 #  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
 #  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
 #  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
-#  EVENT SHALL AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
 #  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
 #  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
 #  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
@@ -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=Electrum
-VERSION=${VERSION:-3.3.8}
+VERSION=${VERSION:-4.5.4}
 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}
@@ -50,6 +57,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=""
@@ -76,7 +86,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 LICENCE README.rst RELEASE-NOTES $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS LICENCE README.md RELEASE-NOTES $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
@@ -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/network/Electrum/Electrum.info b/network/Electrum/Electrum.info
index 1ebeeb30c9..3a5badf64e 100644
--- a/network/Electrum/Electrum.info
+++ b/network/Electrum/Electrum.info
@@ -1,10 +1,10 @@
 PRGNAM="Electrum"
-VERSION="3.3.8"
+VERSION="4.5.4"
 HOMEPAGE="https://electrum.org/"
-DOWNLOAD="https://download.electrum.org/3.3.8/Electrum-3.3.8.tar.gz"
-MD5SUM="66a1d04927f7cf7bb44a254d8791de96"
+DOWNLOAD="https://download.electrum.org/4.5.4/Electrum-4.5.4.tar.gz"
+MD5SUM="976c372f870cd137432ac59305f88810"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="python3-PyQt5 ecdsa python-qrcode protobuf3 python-jsonrpclib dnspython pyaes secp256k1 python3-certifi python3-six python3-aiohttp python3-aiohttp-socks python3-aiorpcX python-chardet"
+REQUIRES="protobuf3 cryptography secp256k1 python3-aiohttp-socks python3-aiorpcX python-qrcode python-bitstring jsonpatch QDarkStyle"
 MAINTAINER="nomnombtc"
 EMAIL="nomnombtc@arcor.de"
diff --git a/network/Electrum/README b/network/Electrum/README
index 18a07bc14b..17dee0d0d9 100644
--- a/network/Electrum/README
+++ b/network/Electrum/README
@@ -3,6 +3,4 @@ Electrum is an easy to use Bitcoin client.
 There is no waiting time when you start the client, because it does
 not download the Bitcoin blockchain.
 
-NOTE:
-Make sure python3 is installed before building any dependencies
-as we need Python3 bindings.
+zbar is an optional dependency (enables scanning QRCodes).
diff --git a/network/Electrum/doinst.sh b/network/Electrum/doinst.sh
index 5fb28930db..fd1bca3b49 100644
--- a/network/Electrum/doinst.sh
+++ b/network/Electrum/doinst.sh
@@ -1,3 +1,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 -f usr/share/icons/hicolor >/dev/null 2>&1
+  fi
+fi
diff --git a/network/FireWorks/FireWorks.SlackBuild b/network/FireWorks/FireWorks.SlackBuild
index e2993feddb..457a25009e 100644
--- a/network/FireWorks/FireWorks.SlackBuild
+++ b/network/FireWorks/FireWorks.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for FireWorks
 
-# 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=FireWorks
-VERSION=${VERSION:-1.3.4}
-BUILD=${BUILD:-1}
+VERSION=${VERSION:-2.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}
@@ -69,13 +79,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 {} \;
 
-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.rst CHANGES.txt LICENSE PKG-INFO docs/*.rst \
+cp -a README.md CHANGES.txt LICENSE docs/*.html \
     $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
@@ -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/network/FireWorks/FireWorks.info b/network/FireWorks/FireWorks.info
index 10584b6020..3b62f2a824 100644
--- a/network/FireWorks/FireWorks.info
+++ b/network/FireWorks/FireWorks.info
@@ -1,10 +1,10 @@
 PRGNAM="FireWorks"
-VERSION="1.3.4"
+VERSION="2.0.3"
 HOMEPAGE="https://github.com/materialsproject/fireworks"
-DOWNLOAD="https://pypi.python.org/packages/2e/36/15de68d74d5dc4927cdbb92b4ae0a658885eb08f2974894ff30fe000d6bc/FireWorks-1.3.4.tar.gz"
-MD5SUM="7268d2457124d472162406f59ec00452"
+DOWNLOAD="https://files.pythonhosted.org/packages/d1/9a/54d72f7b09995155f513064d1e6207b3ac87f73306b4c0522c3dd68b6a57/FireWorks-2.0.3.tar.gz"
+MD5SUM="418b196f2710938380e374ca85ac12e7"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="pymongo monty python-dateutil python-tabulate flask-paginate gunicorn"
+REQUIRES="pymongo monty python3-dateutil python3-tabulate python3-flask-paginate gunicorn python3-ruamel.yaml tqdm"
 MAINTAINER="Dimitris Zlatanidis"
 EMAIL="d.zlatanidis@gmail.com"
diff --git a/network/FireWorks/README b/network/FireWorks/README
index 1039ff7a8d..7bfbf7feda 100644
--- a/network/FireWorks/README
+++ b/network/FireWorks/README
@@ -7,4 +7,4 @@ Some features that distinguish FireWorks are the capability to program
 dynamic workflows and built-in tools for running high-throughput 
 computations at large computing centers.
 
-Optional dependencies: python-requests, fabric
+Optional dependency: fabric
diff --git a/network/Flootty/Flootty.SlackBuild b/network/Flootty/Flootty.SlackBuild
deleted file mode 100644
index 5b41e1ed1c..0000000000
--- a/network/Flootty/Flootty.SlackBuild
+++ /dev/null
@@ -1,86 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for Flootty
-
-# Copyright 2014-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=Flootty
-VERSION=${VERSION:-3.2.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 {} \;
-
-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/network/Flootty/Flootty.info b/network/Flootty/Flootty.info
deleted file mode 100644
index d774208a20..0000000000
--- a/network/Flootty/Flootty.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="Flootty"
-VERSION="3.2.1"
-HOMEPAGE="https://floobits.com"
-DOWNLOAD="https://pypi.python.org/packages/f3/9c/234dd2fbf0eed5b3537c4224ff5950afe61e4b6556fdec54b8b2e2b3419e/Flootty-3.2.1.tar.gz"
-MD5SUM="9e51d9fa0defd073ec4075546ac4e999"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Dimitris Zlatanidis"
-EMAIL="d.zlatanidis@gmail.com"
diff --git a/network/Flootty/README b/network/Flootty/README
deleted file mode 100644
index d25fcc5240..0000000000
--- a/network/Flootty/README
+++ /dev/null
@@ -1,5 +0,0 @@
-Floobits collaborative terminal.
-Flootty will automatically attempt to join a workspace without specifying
-the term name if there is only one terminal. Flootty is also able to read
-in .floo files which floobits adds to the root directory of every shared
-workspace. Simply call flootty from a shared directory.
diff --git a/network/Flootty/slack-desc b/network/Flootty/slack-desc
deleted file mode 100644
index f2f62f7e3d..0000000000
--- a/network/Flootty/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------------------------------------------------------|
-Flootty: Flootty (Floobits collaborative terminal)
-Flootty:
-Flootty: Flootty will automatically attempt to join a workspace without
-Flootty: specifying the term name if there is only one terminal.
-Flootty:
-Flootty: Homepage:  https://floobits.com
-Flootty:
-Flootty:
-Flootty:
-Flootty:
-Flootty:
diff --git a/network/Free-Cinema/Free-Cinema.SlackBuild b/network/Free-Cinema/Free-Cinema.SlackBuild
deleted file mode 100644
index 831ab3fe46..0000000000
--- a/network/Free-Cinema/Free-Cinema.SlackBuild
+++ /dev/null
@@ -1,86 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for Free-Cinema
-
-# 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=Free-Cinema
-VERSION=${VERSION:-0.3.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
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -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 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/network/Free-Cinema/Free-Cinema.info b/network/Free-Cinema/Free-Cinema.info
deleted file mode 100644
index 13804a56a8..0000000000
--- a/network/Free-Cinema/Free-Cinema.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="Free-Cinema"
-VERSION="0.3.0"
-HOMEPAGE="https://pypi.python.org/pypi/Free-Cinema/0.3.0"
-DOWNLOAD="https://pypi.python.org/packages/source/F/Free-Cinema/Free-Cinema-0.3.0.tar.gz"
-MD5SUM="2164bb23782a422015fc89cdaec75c8b"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="wxPython BeautifulSoup4"
-MAINTAINER="Dimitris Zlatanidis"
-EMAIL="d.zlatanidis@gmail.com"
diff --git a/network/Free-Cinema/README b/network/Free-Cinema/README
deleted file mode 100644
index 5a4e47d07f..0000000000
--- a/network/Free-Cinema/README
+++ /dev/null
@@ -1,8 +0,0 @@
-Search, Download movies via Torrent.
-
-This Program Is made to browse movies to download from the comfort of your
-desktop. You Should Have Torrent Client Download the video file.
-
-After installing run the program by typing "freecinema" without quotes
-and browse the movie you want click download save the torrent file from
-the browser and open it with your torrent client.
diff --git a/network/Free-Cinema/slack-desc b/network/Free-Cinema/slack-desc
deleted file mode 100644
index bc18a423fe..0000000000
--- a/network/Free-Cinema/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------------------------------------------------------|
-Free-Cinema: Free-Cinema (Search, Download movies via Torrent)
-Free-Cinema:
-Free-Cinema: This program is made to browse movies to download from the comfort
-Free-Cinema: of your desktop.
-Free-Cinema:
-Free-Cinema: Homepage: https://pypi.python.org/pypi/Free-Cinema/0.3.0
-Free-Cinema:
-Free-Cinema:
-Free-Cinema:
-Free-Cinema:
-Free-Cinema:
diff --git a/network/GeoIP/GeoIP.SlackBuild b/network/GeoIP/GeoIP.SlackBuild
index 3dd15100e3..a8ec44122e 100644
--- a/network/GeoIP/GeoIP.SlackBuild
+++ b/network/GeoIP/GeoIP.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for GeoIP
 
@@ -30,26 +30,36 @@
 
 # Maintained by David Spencer <baildon.research@googlemail.com>
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=GeoIP
 VERSION=${VERSION:-1.6.12}
-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"
@@ -125,8 +135,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/network/GhostInTheMail/GhostInTheMail.SlackBuild b/network/GhostInTheMail/GhostInTheMail.SlackBuild
index 5e2c240304..a119f26a98 100644
--- a/network/GhostInTheMail/GhostInTheMail.SlackBuild
+++ b/network/GhostInTheMail/GhostInTheMail.SlackBuild
@@ -1,30 +1,40 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for Ghost In The Mail
 
 # Written by majk <majk@konstelacioj.info>
 # Updated by Willy Sudiarto Raharjo <willysr@slackware-id.org>
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=GhostInTheMail
 VERSION=${VERSION:-0.5}
-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"
@@ -53,7 +63,7 @@ find -L . \
  -exec chmod 644 {} \;
 
 LDFLAGS="-lpthread" \
-CFLAGS="$SLKCFLAGS" \
+CFLAGS="$SLKCFLAGS -fcommon" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
@@ -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/network/GhostInTheMail/README b/network/GhostInTheMail/README
index 99cbac6cc6..f871939d00 100644
--- a/network/GhostInTheMail/README
+++ b/network/GhostInTheMail/README
@@ -1,3 +1,3 @@
-Ghost In The Mail is a very basic mail client for Linux, written in C, for GTK.
-It supports attached files. The user can specify the SMTP server, the sender's
-e-mail, and the name.
+Ghost In The Mail is a very basic mail client for Linux, written in C,
+for GTK. It supports attached files. The user can specify the SMTP
+server, the sender's e-mail, and the name.
diff --git a/network/GlobalProtect-openconnect/GlobalProtect-openconnect.SlackBuild b/network/GlobalProtect-openconnect/GlobalProtect-openconnect.SlackBuild
new file mode 100644
index 0000000000..1a38375750
--- /dev/null
+++ b/network/GlobalProtect-openconnect/GlobalProtect-openconnect.SlackBuild
@@ -0,0 +1,112 @@
+#!/bin/bash
+
+# Slackware build script for GlobalProtect-openconnect
+
+# 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=GlobalProtect-openconnect
+SRCNAM=globalprotect-openconnect
+VERSION=${VERSION:-1.4.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}
+
+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 {} \;
+
+cmake -B build \
+    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_CXX_FLAGS_RELEASE=-s
+cmake --build build
+DESTDIR=$PKG cmake --install build
+
+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
+
+install -m755 -D $CWD/rc.gpservice $PKG/etc/rc.d/rc.gpservice.new
+mv $PKG/etc/gpservice/gp.conf $PKG/etc/gpservice/gp.conf.new
+rm -rfv $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-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/network/GlobalProtect-openconnect/GlobalProtect-openconnect.info b/network/GlobalProtect-openconnect/GlobalProtect-openconnect.info
new file mode 100644
index 0000000000..4730fe1a43
--- /dev/null
+++ b/network/GlobalProtect-openconnect/GlobalProtect-openconnect.info
@@ -0,0 +1,10 @@
+PRGNAM="GlobalProtect-openconnect"
+VERSION="1.4.9"
+HOMEPAGE="https://github.com/yuezk/GlobalProtect-openconnect/"
+DOWNLOAD="https://github.com/yuezk/GlobalProtect-openconnect/releases/download/v1.4.9/globalprotect-openconnect-1.4.9.tar.gz"
+MD5SUM="85f3d5f718f06291a52e63bba59405a6"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="openconnect"
+MAINTAINER="Marek Wodzinski"
+EMAIL="majek@w7i.pl"
diff --git a/network/GlobalProtect-openconnect/README b/network/GlobalProtect-openconnect/README
new file mode 100644
index 0000000000..562171c0f4
--- /dev/null
+++ b/network/GlobalProtect-openconnect/README
@@ -0,0 +1,13 @@
+A GlobalProtect VPN client (GUI) for Linux based on Openconnect and
+built with Qt5, supports SAML auth mode, inspired by gp-saml-gui.
+
+Features
+- Similar user experience as the official client in macOS.
+- Supports both SAML and non-SAML authentication modes.
+- Supports automatically selecting the preferred gateway from
+  the multiple gateways.
+- Supports switching gateway from the system tray menu manually.
+
+This is two part application:
+- gpservice - daemon, should be started by /etc/rc.d/rc.gpservice
+- gpclient - client GUI application
diff --git a/network/GlobalProtect-openconnect/doinst.sh b/network/GlobalProtect-openconnect/doinst.sh
new file mode 100644
index 0000000000..f4dab04011
--- /dev/null
+++ b/network/GlobalProtect-openconnect/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
+}
+
+preserve_perms etc/rc.d/rc.gpservice.new
+
+# Does the finished package have config files in etc/?
+config etc/gpservice/gp.conf.new
diff --git a/network/GlobalProtect-openconnect/rc.gpservice b/network/GlobalProtect-openconnect/rc.gpservice
new file mode 100644
index 0000000000..c95aebfff4
--- /dev/null
+++ b/network/GlobalProtect-openconnect/rc.gpservice
@@ -0,0 +1,36 @@
+#!/bin/bash
+#
+# Start/stop gpservice
+# Written by Marek Wodzinski <majek@w7i.pl>
+
+# Start gpservice
+gpservice_start() {
+  if [ -x /usr/bin/gpservice ]; then
+    echo "Starting gpservice."
+    /usr/bin/gpservice &
+  fi
+}
+
+# Stop gpservice
+gpservice_stop() {
+  echo "Stopping gpservice."
+  killall gpservice
+}
+
+case "$1" in
+  start)
+    gpservice_start
+    ;;
+  stop)
+    gpservice_stop
+    ;;
+  restart)
+    gpservice_stop
+    sleep 1
+    gpservice_start
+    ;;
+  *)
+    echo "usage @0 start|stop|restart"
+    exit 1
+    ;;
+esac
diff --git a/network/GlobalProtect-openconnect/slack-desc b/network/GlobalProtect-openconnect/slack-desc
new file mode 100644
index 0000000000..f4d7549db6
--- /dev/null
+++ b/network/GlobalProtect-openconnect/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+                         |-----handy-ruler------------------------------------------------------|
+GlobalProtect-openconnect: GlobalProtect-openconnect (A GlobalProtect VPN client (GUI))
+GlobalProtect-openconnect:
+GlobalProtect-openconnect: A GlobalProtect VPN client (GUI) for Linux based on Openconnect and
+GlobalProtect-openconnect: built with Qt5, supports SAML auth mode, inspired by gp-saml-gui.
+GlobalProtect-openconnect:
+GlobalProtect-openconnect: Features:
+GlobalProtect-openconnect:  Similar user experience as the official client in macOS.
+GlobalProtect-openconnect:  Supports both SAML and non-SAML authentication modes.
+GlobalProtect-openconnect:  Supports automatically selecting the preferred gateway from 
+GlobalProtect-openconnect:   the multiple gateways.
+GlobalProtect-openconnect:  Supports switching gateway from the system tray menu manually.
diff --git a/network/Icecat/Icecat.SlackBuild b/network/Icecat/Icecat.SlackBuild
deleted file mode 100644
index 9824736b9a..0000000000
--- a/network/Icecat/Icecat.SlackBuild
+++ /dev/null
@@ -1,196 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for Icecat
-
-# Copyright 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016  Patrick J. Volkerding, Sebeka, Minnesota, USA
-# Copyright 2017 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.
-
-# Almost all of the code was taken from slackware-14.2/patches/source/mozilla-firefox/
-
-PRGNAM=Icecat
-VERSION=${VERSION:-52.3.0}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-SRCNAM=icecat
-
-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=""
-  OPTIMIZE=" --enable-optimize=-O1 "
-elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-  LIBDIRSUFFIX=""
-  OPTIMIZE=" --enable-optimize=-O1 "
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
-  OPTIMIZE=" --enable-optimize=-O1 "
-elif [ "$ARCH" = "arm" ]; then
-  SLKCFLAGS="-O2 -march=armv4 -mtune=xscale"
-  LIBDIRSUFFIX=""
-  OPTIMIZE=" --enable-optimize=-O1 "
-else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-  OPTIMIZE=" --enable-optimize=-O1 "
-fi
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-
-# Build and install autoconf-2.13 (like PaleMoon)
-cd $TMP
-rm -rf autoconf-2.13
-tar xvf $CWD/autoconf-2.13.tar.xz
-cd autoconf-2.13
-zcat $CWD/autoconf-2.13-consolidated_fixes-1.patch.gz | patch -p1 --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 \
- \( -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/autoconf-tmp
-mkdir -p $TMP/autoconf-tmp
-chmod 700 $TMP/autoconf-tmp
-rm -rf $TMP/autoconf-tmp/*
-mkdir -p $TMP/autoconf-tmp/usr
-
-./configure \
-  --prefix=$TMP/autoconf-tmp/usr \
-  --program-suffix=-2.13 \
-  --infodir=$TMP/autoconf-tmp/usr/info \
-  --mandir=$TMP/autoconf-tmp/usr/man \
-  --build=$ARCH-slackware-linux
-
-make || make -j1
-make install
-PATH=$TMP/autoconf-tmp/usr/bin:$PATH
-
-# Build Icecat
-cd $TMP
-rm -rf $SRCNAM-$VERSION
-tar xvf $CWD/$SRCNAM-$VERSION-gnu1.tar.bz2
-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 {} \;
-
-# Without LANG=C, building the Python environment may fail with:
-# "UnicodeDecodeError: 'ascii' codec can't decode byte 0xe2 in position 36: ordinal not in range(128)"
-export LANG=C
-
-# Link using gold.  This avoids running out of memory on 32-bit systems, and
-# avoids a recurring build failure with GNU ld on other systems.
-chmod 755 $CWD/gold
-export CC="gcc -B$CWD/gold"
-export CXX="g++ -B$CWD/gold"
-export LD="$CWD/gold"
-
-OPTIONS="\
-  --enable-official-branding \
-  --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --with-default-mozilla-five-home=/usr/lib${LIBDIRSUFFIX}/icecat-$VERSION \
-  --with-system-zlib \
-  --enable-alsa \
-  --enable-application=browser \
-  --enable-default-toolkit=cairo-gtk2 \
-  --enable-startup-notification \
-  $OPTIMIZE \
-  --enable-strip \
-  --enable-cpp-rtti \
-  --disable-accessibility \
-  --disable-crashreporter \
-  --disable-debug"
-
-export MOZILLA_OFFICIAL="1"
-export BUILD_OFFICIAL="1"
-export MOZ_PHOENIX="1"
-export MOZ_PACKAGE_JSSHELL="1"
-export CFLAGS="$SLKCFLAGS"
-export CXXFLAGS="$SLKCFLAGS"
-
-# Clear some variables that could break the build
-unset DBUS_SESSION_BUS_ADDRESS ORBIT_SOCKETDIR SESSION_MANAGER \
-  XDG_SESSION_COOKIE XAUTHORITY MAKEFLAGS
-
-# Assemble our .mozconfig
-echo ". \$topsrcdir/browser/config/mozconfig" > .mozconfig
-
-# Write in it the options above
-for option in $OPTIONS; do echo "ac_add_options $option" >> .mozconfig; done
-
-echo "ac_add_options --disable-tests" >> .mozconfig
-make -f client.mk build
-
-make -f client.mk install DESTDIR=$PKG
-
-# Removes unneeded files
-rm -rf $PKG/usr/lib${LIBDIRSUFFIX}/icecat-devel-$VERSION
-rm -rf $PKG/usr/include
-
-mkdir -p $PKG/usr/share/applications
-cat $CWD/$PRGNAM.desktop > $PKG/usr/share/applications/$PRGNAM.desktop
-
-# Need some default icons in the right place:
-for i in 16 22 24 32 48 256; do
-  install -D -m 0644 browser/branding/official/default${i}.png \
-    $PKG/usr/share/icons/hicolor/${i}x${i}/apps/icecat.png
-done
-mkdir -p $PKG/usr/share/pixmaps
-( cd $PKG/usr/share/pixmaps ; ln -sf $PKG/usr/share/icons/hicolor/256x256/apps/icecat.png . )
-install -D -m 644 browser/branding/official/default16.png \
-  $PKG/usr/lib$LIBDIRSUFFIX/icecat-$VERSION/icons/default16.png
-install -D -m 644 browser/branding/official/default16.png \
-  $PKG/usr/lib$LIBDIRSUFFIX/icecat-$VERSION/chrome/icons/default/default16.png
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS CLOBBER Changelog.IceCat LEGAL LICENSE README.IceCat 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/network/Icecat/Icecat.desktop b/network/Icecat/Icecat.desktop
deleted file mode 100644
index c63523edbe..0000000000
--- a/network/Icecat/Icecat.desktop
+++ /dev/null
@@ -1,75 +0,0 @@
-[Desktop Entry]
-Exec=icecat %u
-Icon=icecat
-Type=Application
-Categories=Network;
-Name=IceCat
-GenericName=Web Browser
-GenericName[af]=Web Blaaier
-GenericName[ar]=متصفح ويب
-GenericName[az]=Veb Səyyahı
-GenericName[bg]=Браузър
-GenericName[bn]=ওয়েব ব্রাউজার
-GenericName[br]=Furcher ar Gwiad
-GenericName[bs]=WWW Preglednik
-GenericName[ca]=Fullejador web
-GenericName[cs]=WWW prohlížeč
-GenericName[cy]=Porydd Gwe
-GenericName[da]=Browser
-GenericName[de]=Web-Browser
-GenericName[el]=Περιηγητής Ιστού
-GenericName[eo]=TTT-legilo
-GenericName[es]=Navegador web
-GenericName[et]=Veebilehitseja
-GenericName[eu]=Web arakatzailea
-GenericName[fa]=مرورگر وب
-GenericName[fi]=WWW-selain
-GenericName[fo]=Alnótsfar
-GenericName[fr]=Navigateur web
-GenericName[gl]=Navegador Web
-GenericName[he]=דפדפן אינטרנט
-GenericName[hi]=वेब ब्राउज़र
-GenericName[hr]=Web preglednik
-GenericName[hu]=Webböngésző
-GenericName[is]=Vafri
-GenericName[it]=Browser Web
-GenericName[ja]=ウェブブラウザ
-GenericName[ko]=웹 브라우저
-GenericName[lo]=ເວັບບຣາວເຊີ
-GenericName[lt]=Žiniatinklio naršyklė
-GenericName[lv]=Web Pārlūks
-GenericName[mk]=Прелистувач на Интернет 
-GenericName[mn]=Веб-Хөтөч
-GenericName[nb]=Nettleser
-GenericName[nds]=Nettkieker
-GenericName[nl]=Webbrowser
-GenericName[nn]=Nettlesar
-GenericName[nso]=Seinyakisi sa Web
-GenericName[pa]=ਵੈਬ ਝਲਕਾਰਾ
-GenericName[pl]=Przeglądarka WWW
-GenericName[pt]=Navegador Web
-GenericName[pt_BR]=Navegador Web
-GenericName[ro]=Navigator de web
-GenericName[ru]=Веб-браузер
-GenericName[se]=Fierpmádatlogan
-GenericName[sk]=Webový prehliadač
-GenericName[sl]=Spletni brskalnik
-GenericName[sr]=Веб претраживач
-GenericName[sr@Latn]=Veb pretraživač
-GenericName[ss]=Ibrawuza yeWeb 
-GenericName[sv]=Webbläsare
-GenericName[ta]=வலை உலாவி
-GenericName[tg]=Тафсиргари вэб
-GenericName[th]=เว็บบราวเซอร์
-GenericName[tr]=Web Tarayıcı
-GenericName[uk]=Навігатор Тенет
-GenericName[uz]=Веб-браузер
-GenericName[ven]=Buronza ya Webu
-GenericName[vi]=Trình duyệt Web
-GenericName[wa]=Betchteu waibe
-GenericName[xh]=Umkhangeli zincwadi we Web
-GenericName[zh_CN]=网页浏览器
-GenericName[zh_TW]=網頁瀏覽器
-GenericName[zu]=Umcingi we-Web
-MimeType=text/html;text/xml;application/xhtml+xml;application/vnd.mozilla.xul+xml;text/mml;x-scheme-handler/http;x-scheme-handler/https;
-X-KDE-StartupNotify=true
diff --git a/network/Icecat/Icecat.info b/network/Icecat/Icecat.info
deleted file mode 100644
index 62e08aa3ae..0000000000
--- a/network/Icecat/Icecat.info
+++ /dev/null
@@ -1,14 +0,0 @@
-PRGNAM="Icecat"
-VERSION="52.3.0"
-HOMEPAGE="http://www.gnu.org/software/gnuzilla/"
-DOWNLOAD="http://ftp.gnu.org/gnu/gnuzilla/52.3.0/icecat-52.3.0-gnu1.tar.bz2\
-          http://ponce.cc/slackware/sources/repo/autoconf-2.13.tar.xz \
-          http://ponce.cc/slackware/sources/repo/autoconf-2.13-consolidated_fixes-1.patch.gz"
-MD5SUM="67f1ecc240c4f2624c935c5300392260 \
-        f2994d302cf736e7e71974edfa51da3c \
-        d6cdb231911a8d0b08a25b8dd8c5935c"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Azure Zanculmarktum"
-EMAIL="zanculmarktum@gmail.com"
diff --git a/network/Icecat/README b/network/Icecat/README
deleted file mode 100644
index b747d3c556..0000000000
--- a/network/Icecat/README
+++ /dev/null
@@ -1,6 +0,0 @@
-GNU IceCat is the GNU version of the Firefox browser. Its main advantage
-is an ethical one: it is entirely free software.
-
-This SlackBuild builds the entire project from source. To use the
-upstream binary, see the 'icecat' SlackBuild.  Please uninstall 'icecat'
-before running this SlackBuild.
diff --git a/network/Icecat/gold b/network/Icecat/gold
deleted file mode 100644
index 7b02884de2..0000000000
--- a/network/Icecat/gold
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-/usr/bin/ld.gold "$@"
diff --git a/network/Icecat/slack-desc b/network/Icecat/slack-desc
deleted file mode 100644
index 6103f6a488..0000000000
--- a/network/Icecat/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------------------------------------------------------|
-Icecat: Icecat (GNU version of the Firefox browser)
-Icecat:
-Icecat: GNU IceCat is the GNU version of the Firefox browser. Its main
-Icecat: advantage is an ethical one: it is entirely free software.
-Icecat:
-Icecat:
-Icecat:
-Icecat:
-Icecat:
-Icecat:
-Icecat:
diff --git a/network/LOIC/LOIC.SlackBuild b/network/LOIC/LOIC.SlackBuild
index 3b10d61b2a..c574873879 100644
--- a/network/LOIC/LOIC.SlackBuild
+++ b/network/LOIC/LOIC.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for LOIC
 
@@ -29,15 +29,25 @@
 # caught. This script is released for educational purposes only.              #
 ###############################################################################
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=LOIC
 BINNAM=loic
 VERSION=${VERSION:-2.0.0.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}
@@ -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/network/LOIC/README b/network/LOIC/README
index f6ccb67a39..ad1004e8d8 100644
--- a/network/LOIC/README
+++ b/network/LOIC/README
@@ -1,26 +1,27 @@
 LOIC - the Low Orbit Ion Cannon
 
-LOIC is an open source network attack application, written in C#. LOIC was
-initially developed by Praetox Technologies, but later it was released into the
-public domain
+LOIC is an open source network attack application, written in C#. LOIC
+was initially developed by Praetox Technologies, but later it was
+released into the public domain
 
-LOIC performs a denial-of-service (DoS) attack (or when used by multiple
-individuals, a DDoS attack) on a target site by flooding the server with TCP
-packets, UDP packets, or HTTP requests with the intention of disrupting the
-service of a particular host. People have used LOIC to join voluntary botnets.
+LOIC performs a denial-of-service (DoS) attack (or when used by
+multiple individuals, a DDoS attack) on a target site by flooding
+the server with TCP packets, UDP packets, or HTTP requests with the
+intention of disrupting the service of a particular host. People have
+used LOIC to join voluntary botnets.
 
-This SlackBuild simply builds a package from the binaries. If you would like
-to build it from source, you might want to consider loiq.
+This SlackBuild simply builds a package from the binaries. If you
+would like to build it from source, you might want to consider loiq.
 
 mono is needed to run LOIC:
 
   mono /opt/LOIC/LOIC.exe
 
-A handy script /usr/bin/loic and a basic desktop integration file have been
-included for ease of use.
+A handy script /usr/bin/loic and a basic desktop integration file have
+been included for ease of use.
 
 WARNING:
 
-We are not responsible for the use that you give to this tool. You cannot blame
-us if you use this tool to attack servers you don't own and get caught. This
-script is released for educational purposes only.
+We are not responsible for the use that you give to this tool. You
+cannot blame us if you use this tool to attack servers you don't own
+and get caught. This script is released for educational purposes only.
diff --git a/network/MEGAcmd/MEGAcmd.SlackBuild b/network/MEGAcmd/MEGAcmd.SlackBuild
new file mode 100644
index 0000000000..2f36025842
--- /dev/null
+++ b/network/MEGAcmd/MEGAcmd.SlackBuild
@@ -0,0 +1,121 @@
+#!/bin/bash
+
+# Slackware build script for MEGAcmd
+
+# Copyright 2017,2018 Felipe Bugno <capent@yahoo.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=MEGAcmd
+VERSION=${VERSION:-1.6.3}
+SDK=${SDK:-4.17.1d}
+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}_Linux
+tar xvf $CWD/$PRGNAM-${VERSION}_Linux.tar.?z
+cd $PRGNAM-${VERSION}_Linux/sdk
+tar --strip-components=1 -xvf $CWD/sdk-$SDK.tar.gz
+# Apply fix-ffmpeg-compile.patch ; Thanks to Arch linux.
+patch -p1 < $CWD/fix-ffmpeg-compile.patch
+
+cd ../
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -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 \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --build=$ARCH-slackware-linux
+
+make
+make install DESTDIR=$PKG
+# Fix installdir of megacmd_completion.sh
+rm -rf $PKG/etc
+install -Dm644 src/client/megacmd_completion.sh $PKG/usr/share/bash-completion/completions/megacmd
+
+# Don't ship .la files:
+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
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+  LICENSE README.md UserGuide.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/network/MEGAcmd/MEGAcmd.info b/network/MEGAcmd/MEGAcmd.info
new file mode 100644
index 0000000000..9e2d7a195d
--- /dev/null
+++ b/network/MEGAcmd/MEGAcmd.info
@@ -0,0 +1,12 @@
+PRGNAM="MEGAcmd"
+VERSION="1.6.3"
+HOMEPAGE="https://github.com/meganz/MEGAcmd"
+DOWNLOAD="https://github.com/meganz/MEGAcmd/archive/1.6.3_Linux/MEGAcmd-1.6.3_Linux.tar.gz \
+          https://github.com/meganz/sdk/archive/v4.17.1d/sdk-4.17.1d.tar.gz"
+MD5SUM="9d6d61f0dc029ccc5aceeb3fa643b1bd \
+        09e1926a06ab62ddef9b2dd3846c6ba7"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="FreeImage libmediainfo"
+MAINTAINER="JW(Shinichi Abe)"
+EMAIL="shin1.abe@nifty.com"
diff --git a/network/MEGAcmd/README b/network/MEGAcmd/README
new file mode 100644
index 0000000000..68a51ee253
--- /dev/null
+++ b/network/MEGAcmd/README
@@ -0,0 +1,12 @@
+MEGA Command Line Interactive and Scriptable Application
+
+--------------------------------------------------------
+Short how2:
+$ mega-cmd
+MEGA CMD> help
+
+You can see available commands.
+
+MEGA CMD> login --help
+Usage: login [--auth-code=XXXX] [email [password]] |
+  exportedfolderurl#key | session
diff --git a/network/MEGAcmd/fix-ffmpeg-compile.patch b/network/MEGAcmd/fix-ffmpeg-compile.patch
new file mode 100644
index 0000000000..daa9fd72fe
--- /dev/null
+++ b/network/MEGAcmd/fix-ffmpeg-compile.patch
@@ -0,0 +1,29 @@
+--- a/src/gfx/freeimage.cpp	2023-03-03 22:13:58.000000000 +0000
++++ b/src/gfx/freeimage.cpp	2023-03-14 10:03:10.950216675 +0000
+@@ -212,7 +212,7 @@
+ #ifdef AV_CODEC_CAP_TRUNCATED
+ #define CAP_TRUNCATED AV_CODEC_CAP_TRUNCATED
+ #else
+-#define CAP_TRUNCATED CODEC_CAP_TRUNCATED
++#define CAP_TRUNCATED 0
+ #endif
+ 
+ const char *GfxProviderFreeImage::supportedformatsFfmpeg()
+@@ -313,7 +313,7 @@
+ 
+     // Find decoder for video stream
+     AVCodecID codecId = codecParm->codec_id;
+-    AVCodec* decoder = avcodec_find_decoder(codecId);
++    auto decoder = avcodec_find_decoder(codecId);
+     if (!decoder)
+     {
+         LOG_warn << "Codec not found: " << codecId;
+@@ -330,7 +330,6 @@
+ 
+     // Force seeking to key frames
+     formatContext->seek2any = false;
+-    videoStream->skip_to_keyframe = true;
+     if (decoder->capabilities & CAP_TRUNCATED)
+     {
+         codecContext->flags |= CAP_TRUNCATED;
+
diff --git a/network/MEGAcmd/slack-desc b/network/MEGAcmd/slack-desc
new file mode 100644
index 0000000000..89602d38d7
--- /dev/null
+++ b/network/MEGAcmd/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.  Line
+# up the first '|' above the ':' following the base package name, and the '|'
+# on the right side marks the last column you can put a 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------------------------------------------------------|
+MEGAcmd: MEGAcmd (MEGA Command Line Interactive and Scriptable Application)
+MEGAcmd:
+MEGAcmd: MEGAcmd provides non UI access to MEGA services. It intends to offer 
+MEGAcmd: all the functionality with your MEGA account via commands. 
+MEGAcmd: It features synchronization , backup of local folders into your MEGA 
+MEGAcmd: account and a webdav/streaming server
+MEGAcmd:
+MEGAcmd: Homepage: https://github.com/meganz/MEGAcmd
+MEGAcmd:
+MEGAcmd:
+MEGAcmd:
diff --git a/network/MEGAsync/MEGAsync.SlackBuild b/network/MEGAsync/MEGAsync.SlackBuild
index d15a188abf..4d804db29e 100644
--- a/network/MEGAsync/MEGAsync.SlackBuild
+++ b/network/MEGAsync/MEGAsync.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for MEGASync input plugin
 
@@ -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=MEGAsync
-VERSION=${VERSION:-3.7.1.0}
-SDK=${SDK:-ce7b5f0b390a02ffd1fbfbac741deb5294f7a5df}
+VERSION=${VERSION:-4.5.3.0}
+SDK=${SDK:-3.8.2c}
 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,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 -p1 < $CWD/megasync-4.5.0.0_ffmpeg.patch
 cd src/MEGASync/mega
+patch -p1 < $CWD/megasync-4.5.0.0_pdfium.patch
+
 ./autogen.sh
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
@@ -122,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/network/MEGAsync/MEGAsync.info b/network/MEGAsync/MEGAsync.info
index dca63a1e20..db02860be9 100644
--- a/network/MEGAsync/MEGAsync.info
+++ b/network/MEGAsync/MEGAsync.info
@@ -1,12 +1,12 @@
 PRGNAM="MEGAsync"
-VERSION="3.7.1.0"
+VERSION="4.5.3.0"
 HOMEPAGE="https://github.com/meganz/MEGAsync/"
-DOWNLOAD="https://github.com/meganz/MEGAsync/archive/v3.7.1.0_Linux/MEGAsync-3.7.1.0_Linux.tar.gz \
-          https://github.com/meganz/sdk/archive/ce7b5f0/sdk-ce7b5f0b390a02ffd1fbfbac741deb5294f7a5df.tar.gz"
-MD5SUM="d44da5216693efc7f63ba85b477ea46c \
-        e7716ddf00b1b3f0166cfb8f222d8550"
+DOWNLOAD="https://github.com/meganz/MEGAsync/archive/v4.5.3.0_Linux/MEGAsync-4.5.3.0_Linux.tar.gz \
+          https://github.com/meganz/sdk/archive/v3.8.2c/sdk-3.8.2c.tar.gz"
+MD5SUM="be0f1e070b6990c19d766990758ef997 \
+        ded79c86d1ddbe2572f0562fa1dc15fc"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="libuv libsodium cryptopp FreeImage c-ares libmediainfo"
+REQUIRES="FreeImage libmediainfo"
 MAINTAINER="Felipe Bugno"
 EMAIL="capent@yahoo.com"
diff --git a/network/MEGAsync/megasync-4.5.0.0_ffmpeg.patch b/network/MEGAsync/megasync-4.5.0.0_ffmpeg.patch
new file mode 100644
index 0000000000..a30d4a1eff
--- /dev/null
+++ b/network/MEGAsync/megasync-4.5.0.0_ffmpeg.patch
@@ -0,0 +1,24 @@
+diff -Naur a/src/MEGASync/mega/src/gfx/freeimage.cpp b/src/MEGASync/mega/src/gfx/freeimage.cpp
+--- a/src/MEGASync/mega/src/gfx/freeimage.cpp	2021-05-23 02:28:08.694081111 +0100
++++ b/src/MEGASync/mega/src/gfx/freeimage.cpp	2021-05-23 02:29:56.189964969 +0100
+@@ -188,7 +188,7 @@
+ 
+     // Force seeking to key frames
+     formatContext->seek2any = false;
+-    videoStream->skip_to_keyframe = true;
++    //videoStream->skip_to_keyframe = true;
+     if (decoder->capabilities & CAP_TRUNCATED)
+     {
+         codecContext.flags |= CAP_TRUNCATED;
+diff -Naur a/src/MEGASync/mega/src/gfx/qt.cpp b/src/MEGASync/mega/src/gfx/qt.cpp
+--- a/src/MEGASync/mega/src/gfx/qt.cpp	2021-05-23 02:28:08.694081111 +0100
++++ b/src/MEGASync/mega/src/gfx/qt.cpp	2021-05-23 02:29:36.172545153 +0100
+@@ -1209,7 +1209,7 @@
+ 
+     // Force seeking to key frames
+     formatContext->seek2any = false;
+-    videoStream->skip_to_keyframe = true;
++    //videoStream->skip_to_keyframe = true;
+     if (decoder->capabilities & CAP_TRUNCATED)
+     {
+         codecContext.flags |= CAP_TRUNCATED;
diff --git a/network/MEGAsync/megasync-4.5.0.0_pdfium.patch b/network/MEGAsync/megasync-4.5.0.0_pdfium.patch
new file mode 100644
index 0000000000..141ab30576
--- /dev/null
+++ b/network/MEGAsync/megasync-4.5.0.0_pdfium.patch
@@ -0,0 +1,16 @@
+diff --git a/bindings/qt/sdk.pri b/bindings/qt/sdk.pri
+index 83ddc2e2f..46aa06d33 100644
+--- a/bindings/qt/sdk.pri
++++ b/bindings/qt/sdk.pri
+@@ -255,6 +255,11 @@ CONFIG(USE_PDFIUM) {
+                 DEFINES += HAVE_PDFIUM
+                 LIBS += -lpdfium
+             }
++            else:exists(/usr/include/pdfium/fpdfview.h) {
++                DEFINES += HAVE_PDFIUM
++                INCLUDEPATH += /usr/include/pdfium
++                LIBS += -lpdfium
++            }
+         }
+         else {#win/mac
+             DEFINES += HAVE_PDFIUM
diff --git a/network/NetworkManager-fortisslvpn/NetworkManager-fortisslvpn.SlackBuild b/network/NetworkManager-fortisslvpn/NetworkManager-fortisslvpn.SlackBuild
new file mode 100644
index 0000000000..30c19e973c
--- /dev/null
+++ b/network/NetworkManager-fortisslvpn/NetworkManager-fortisslvpn.SlackBuild
@@ -0,0 +1,113 @@
+#!/bin/bash
+
+# Slackware build script for NetworkManager-fortisslvpn
+
+# Copyright 2020 Gerardo Zamudio <gerardo.zamudio@linux.com> Mexico City, Mexico
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=NetworkManager-fortisslvpn
+VERSION=${VERSION:-1.2.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 the variable PRINT_PACKAGE_NAME is set, then this script will report what
+# the name of the created package would be, and then exit. This information
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; 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 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 {} \;
+
+./autogen.sh
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --mandir=/usr/man \
+  --without-gnome \
+  --without-libnm-glib \
+  --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
+
+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
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/network/NetworkManager-fortisslvpn/NetworkManager-fortisslvpn.info b/network/NetworkManager-fortisslvpn/NetworkManager-fortisslvpn.info
new file mode 100644
index 0000000000..cce73654d2
--- /dev/null
+++ b/network/NetworkManager-fortisslvpn/NetworkManager-fortisslvpn.info
@@ -0,0 +1,10 @@
+PRGNAM="NetworkManager-fortisslvpn"
+VERSION="1.2.10"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/NetworkManager-fortisslvpn"
+DOWNLOAD="https://github.com/GNOME/NetworkManager-fortisslvpn/archive/1.2.10/NetworkManager-fortisslvpn-1.2.10.tar.gz"
+MD5SUM="5a484064654e2428067674e4d9382ec0"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="openfortivpn"
+MAINTAINER="Gerardo Zamudio"
+EMAIL="gerardo.zamudio@linux.com"
diff --git a/network/NetworkManager-fortisslvpn/README b/network/NetworkManager-fortisslvpn/README
new file mode 100644
index 0000000000..7740068ef6
--- /dev/null
+++ b/network/NetworkManager-fortisslvpn/README
@@ -0,0 +1 @@
+Fortinet SSLVPN support for NetworkManager
diff --git a/network/NetworkManager-fortisslvpn/slack-desc b/network/NetworkManager-fortisslvpn/slack-desc
new file mode 100644
index 0000000000..9b57abc7e3
--- /dev/null
+++ b/network/NetworkManager-fortisslvpn/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+                          |-----handy-ruler------------------------------------------------------|
+NetworkManager-fortisslvpn: NetworkManager-fortisslvpn (NetworkManager SSLVPN)
+NetworkManager-fortisslvpn:
+NetworkManager-fortisslvpn: Fortinet SSLVPN support for NetworkManager
+NetworkManager-fortisslvpn:
+NetworkManager-fortisslvpn: This requires the openfortivpn client installed, version 1.10 or newer
+NetworkManager-fortisslvpn:
+NetworkManager-fortisslvpn:
+NetworkManager-fortisslvpn:
+NetworkManager-fortisslvpn:
+NetworkManager-fortisslvpn:
+NetworkManager-fortisslvpn:
diff --git a/network/NetworkManager-l2tp/NetworkManager-l2tp.SlackBuild b/network/NetworkManager-l2tp/NetworkManager-l2tp.SlackBuild
index eb77c952d8..5dd176080c 100644
--- a/network/NetworkManager-l2tp/NetworkManager-l2tp.SlackBuild
+++ b/network/NetworkManager-l2tp/NetworkManager-l2tp.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for NetworkManager-l2tp
 
@@ -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=NetworkManager-l2tp
-SRCNAM=network-manager-l2tp
-VERSION=${VERSION:-1.2.12}
+VERSION=${VERSION:-1.20.0}
 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}
@@ -61,7 +70,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/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
@@ -98,6 +107,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/network/NetworkManager-l2tp/NetworkManager-l2tp.info b/network/NetworkManager-l2tp/NetworkManager-l2tp.info
index 9b55fc92f4..583b10d136 100644
--- a/network/NetworkManager-l2tp/NetworkManager-l2tp.info
+++ b/network/NetworkManager-l2tp/NetworkManager-l2tp.info
@@ -1,8 +1,8 @@
 PRGNAM="NetworkManager-l2tp"
-VERSION="1.2.12"
+VERSION="1.20.0"
 HOMEPAGE="https://github.com/nm-l2tp/network-manager-l2tp"
-DOWNLOAD="https://github.com/nm-l2tp/network-manager-l2tp/archive/1.2.12/network-manager-l2tp-1.2.12.tar.gz"
-MD5SUM="e26824d4ae67ec75b7f19ae0fca4ea36"
+DOWNLOAD="https://github.com/nm-l2tp/network-manager-l2tp/archive/1.20.0/NetworkManager-l2tp-1.20.0.tar.gz"
+MD5SUM="20fce392d44c763e1375b9c7ea8db6d6"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/network/NetworkManager-l2tp/README b/network/NetworkManager-l2tp/README
index d082af1adf..613ce04db3 100644
--- a/network/NetworkManager-l2tp/README
+++ b/network/NetworkManager-l2tp/README
@@ -1,4 +1,5 @@
-NetworkManager-l2tp is a VPN plugin for NetworkManager 1.2 and later which
-provides support for L2TP and L2TP/IPsec (i.e. L2TP over IPsec) connections.
+NetworkManager-l2tp is a VPN plugin for NetworkManager 1.2 and later
+which provides support for L2TP and L2TP/IPsec (i.e. L2TP over IPsec)
+connections.
 
 For L2TP support, it uses xl2tpd
diff --git a/network/NetworkManager-l2tp/slack-desc b/network/NetworkManager-l2tp/slack-desc
index 2c2faf1cf1..2911978127 100644
--- a/network/NetworkManager-l2tp/slack-desc
+++ b/network/NetworkManager-l2tp/slack-desc
@@ -5,15 +5,15 @@
 # You must make exactly 11 lines for the formatting to be correct.  It's also
 # customary to leave one space after the ':' except on otherwise blank lines.
 
-                    |-----handy-ruler------------------------------------------------------|
-network-manager-l2tp: network-manager-l2tp (VPN Plugin for NM)
-network-manager-l2tp:
-network-manager-l2tp: NetworkManager-l2tp is a VPN plugin for NetworkManager 1.2 and later
-network-manager-l2tp: which provides support for L2TP and L2TP/IPsec (i.e. L2TP over IPsec)
-network-manager-l2tp: connections. For L2TP support, it uses xl2tpd
-network-manager-l2tp: ( https://www.xelerance.com/software/xl2tpd/ )
-network-manager-l2tp:
-network-manager-l2tp: https://github.com/nm-l2tp/network-manager-l2tp
-network-manager-l2tp:
-network-manager-l2tp:
-network-manager-l2tp:
+                   |-----handy-ruler------------------------------------------------------|
+NetworkManager-l2tp: NetworkManager-l2tp (VPN Plugin for NM)
+NetworkManager-l2tp:
+NetworkManager-l2tp: NetworkManager-l2tp is a VPN plugin for NetworkManager 1.2 and later
+NetworkManager-l2tp: which provides support for L2TP and L2TP/IPsec (i.e. L2TP over IPsec)
+NetworkManager-l2tp: connections. For L2TP support, it uses xl2tpd
+NetworkManager-l2tp: ( https://www.xelerance.com/software/xl2tpd/ )
+NetworkManager-l2tp:
+NetworkManager-l2tp: https://github.com/nm-l2tp/network-manager-l2tp
+NetworkManager-l2tp:
+NetworkManager-l2tp:
+NetworkManager-l2tp:
diff --git a/network/NetworkManager-openconnect/NetworkManager-openconnect.SlackBuild b/network/NetworkManager-openconnect/NetworkManager-openconnect.SlackBuild
index 4185c2c967..c8b0fec441 100644
--- a/network/NetworkManager-openconnect/NetworkManager-openconnect.SlackBuild
+++ b/network/NetworkManager-openconnect/NetworkManager-openconnect.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for NetworkManager
 
-# Copyright 2010-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,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=NetworkManager-openconnect
-VERSION=${VERSION:-1.2.4}
+VERSION=${VERSION:-1.2.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}
@@ -87,6 +97,7 @@ CXXFLAGS="$SLKCFLAGS" \
   --localstatedir=/var \
   --mandir=/usr/man \
   --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --without-libnm-glib \
   --build=$ARCH-slackware-linux
 
 make
@@ -105,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/network/NetworkManager-openconnect/NetworkManager-openconnect.info b/network/NetworkManager-openconnect/NetworkManager-openconnect.info
index 4d7b1dc2e2..52af8a44ab 100644
--- a/network/NetworkManager-openconnect/NetworkManager-openconnect.info
+++ b/network/NetworkManager-openconnect/NetworkManager-openconnect.info
@@ -1,8 +1,8 @@
 PRGNAM="NetworkManager-openconnect"
-VERSION="1.2.4"
+VERSION="1.2.6"
 HOMEPAGE="http://projects.gnome.org/NetworkManager/"
-DOWNLOAD="http://ftp.gnome.org/pub/GNOME/sources/NetworkManager-openconnect/1.2/NetworkManager-openconnect-1.2.4.tar.xz"
-MD5SUM="c0a5086e495166c52d306132672aa1d3"
+DOWNLOAD="https://download.gnome.org/sources/NetworkManager-openconnect/1.2/NetworkManager-openconnect-1.2.6.tar.xz"
+MD5SUM="59c002f02548ae56e9cbabfea178fb44"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="openconnect"
diff --git a/network/NetworkManager-openvpn/NetworkManager-openvpn.SlackBuild b/network/NetworkManager-openvpn/NetworkManager-openvpn.SlackBuild
deleted file mode 100644
index 46b08ddac2..0000000000
--- a/network/NetworkManager-openvpn/NetworkManager-openvpn.SlackBuild
+++ /dev/null
@@ -1,117 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for NetworkManager-openvpn
-
-# Copyright 2010-2017  Robby Workman, Tuscaloosa, Alabama, 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=NetworkManager-openvpn
-VERSION=${VERSION:-1.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"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
-else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-fi
-
-# Bail out if user or group isn't valid on your system
-# For slackbuilds.org, assigned nm-openvpn uid/gid are 320/320
-# See http://slackbuilds.org/uid_gid.txt
-if ! getent group nm-openvpn 2>&1 > /dev/null; then
-    echo "  You must have a \"nm-openvpn\" group to run this script."
-    echo "    # groupadd -g 320 nm-openvpn"
-    exit 1
-elif ! getent passwd nm-openvpn 2>&1 > /dev/null; then
-    echo "  You must have a \"nm-openvpn\" user to run this script."
-    echo "    # useradd -u 320 -g nm-openvpn -d /var/lib/openvpn/chroot -s /bin/false nm-openvpn"
-    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.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 {} \;
-
-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
-
-# Create the chroot directory
-# From src/nm-openvpn-service-defines.h
-#    /* User name and group to run nm-openvpn-service under */
-#    #define NM_OPENVPN_USER   "nm-openvpn"
-#    #define NM_OPENVPN_GROUP  "nm-openvpn"
-#    #define NM_OPENVPN_CHROOT LOCALSTATEDIR "/lib/openvpn/chroot"
-mkdir -p $PKG/var/lib/openvpn/chroot
-
-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 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
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/network/NetworkManager-openvpn/NetworkManager-openvpn.info b/network/NetworkManager-openvpn/NetworkManager-openvpn.info
deleted file mode 100644
index 85a02339c8..0000000000
--- a/network/NetworkManager-openvpn/NetworkManager-openvpn.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="NetworkManager-openvpn"
-VERSION="1.2.10"
-HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
-DOWNLOAD="https://download.gnome.org/sources/NetworkManager-openvpn/1.2/NetworkManager-openvpn-1.2.10.tar.xz"
-MD5SUM="f118226ed2bfbacfd64ac4d1e0bd0383"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Robby Workman"
-EMAIL="rworkman@slackbuilds.org"
diff --git a/network/NetworkManager-openvpn/README b/network/NetworkManager-openvpn/README
deleted file mode 100644
index f93df9233b..0000000000
--- a/network/NetworkManager-openvpn/README
+++ /dev/null
@@ -1,5 +0,0 @@
-NetworkManager-openvpn (OpenVPN Support for NetworkManager)
-
-You will need an "nm-openvpn" user and group to use this. Suggested:
-# groupadd -g 320 nm-openvpn
-# useradd -u 320 -g nm-openvpn -d /var/lib/openvpn/chroot -s /bin/false nm-openvpn
diff --git a/network/NetworkManager-openvpn/slack-desc b/network/NetworkManager-openvpn/slack-desc
deleted file mode 100644
index 2393b7b408..0000000000
--- a/network/NetworkManager-openvpn/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------------------------------------------------------|
-NetworkManager-openvpn: NetworkManager-openvpn (OpenVPN Support for NetworkManager)
-NetworkManager-openvpn:
-NetworkManager-openvpn: OpenVPN support for NetworkManager
-NetworkManager-openvpn:
-NetworkManager-openvpn:
-NetworkManager-openvpn:
-NetworkManager-openvpn:
-NetworkManager-openvpn:
-NetworkManager-openvpn:
-NetworkManager-openvpn:
-NetworkManager-openvpn:
diff --git a/network/NetworkManager-pptp/NetworkManager-pptp.SlackBuild b/network/NetworkManager-pptp/NetworkManager-pptp.SlackBuild
index 1f169d2a0d..a28442c5e5 100644
--- a/network/NetworkManager-pptp/NetworkManager-pptp.SlackBuild
+++ b/network/NetworkManager-pptp/NetworkManager-pptp.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for NetworkManager-pptp
 
-# Copyright 2010-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,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=NetworkManager-pptp
-VERSION=${VERSION:-1.2.4}
+VERSION=${VERSION:-1.2.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,6 +79,9 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
+# Find the version number for pppd, used to specify the plugin directory:
+PPPD=$(echo /usr/lib${LIBDIRSUFFIX}/pppd/?.?.? | rev | cut -f 1 -d / | rev)
+
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
@@ -78,7 +91,8 @@ CXXFLAGS="$SLKCFLAGS" \
   --localstatedir=/var \
   --mandir=/usr/man \
   --docdir=/usr/doc/$PRGNAM-$VERSION \
-  --with-pppd-plugin-dir=/usr/lib${LIBDIRSUFFIX}/pppd/2.4.5 \
+  --without-libnm-glib \
+  --with-pppd-plugin-dir=/usr/lib${LIBDIRSUFFIX}/pppd/$PPPD \
   --build=$ARCH-slackware-linux
 
 make
@@ -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/network/NetworkManager-pptp/NetworkManager-pptp.info b/network/NetworkManager-pptp/NetworkManager-pptp.info
index 0efbfaf33d..1ef5689fce 100644
--- a/network/NetworkManager-pptp/NetworkManager-pptp.info
+++ b/network/NetworkManager-pptp/NetworkManager-pptp.info
@@ -1,8 +1,8 @@
 PRGNAM="NetworkManager-pptp"
-VERSION="1.2.4"
+VERSION="1.2.8"
 HOMEPAGE="http://projects.gnome.org/NetworkManager/"
-DOWNLOAD="http://ftp.gnome.org/pub/GNOME/sources/NetworkManager-pptp/1.2/NetworkManager-pptp-1.2.4.tar.xz"
-MD5SUM="a05b36c92870e2e248c0c75b2c7ef577"
+DOWNLOAD="https://download.gnome.org/sources/NetworkManager-pptp/1.2/NetworkManager-pptp-1.2.8.tar.xz"
+MD5SUM="305e31d6aac41813d735f27891fce6d8"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="pptp"
diff --git a/network/NetworkManager-ssh/NetworkManager-ssh.SlackBuild b/network/NetworkManager-ssh/NetworkManager-ssh.SlackBuild
index ddb14ee8d5..f2ce60ad58 100644
--- a/network/NetworkManager-ssh/NetworkManager-ssh.SlackBuild
+++ b/network/NetworkManager-ssh/NetworkManager-ssh.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for NetworkManager-ssh
 
@@ -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=NetworkManager-ssh
-VERSION=${VERSION:-1.2.10}
+VERSION=${VERSION:-1.2.12}
 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/network/NetworkManager-ssh/NetworkManager-ssh.info b/network/NetworkManager-ssh/NetworkManager-ssh.info
index 95a35f7eb4..88f5358fad 100644
--- a/network/NetworkManager-ssh/NetworkManager-ssh.info
+++ b/network/NetworkManager-ssh/NetworkManager-ssh.info
@@ -1,8 +1,8 @@
 PRGNAM="NetworkManager-ssh"
-VERSION="1.2.10"
+VERSION="1.2.12"
 HOMEPAGE="https://github.com/danfruehauf/NetworkManager-ssh"
-DOWNLOAD="https://github.com/danfruehauf/NetworkManager-ssh/archive/1.2.10/NetworkManager-ssh-1.2.10.tar.gz"
-MD5SUM="5fe3a26249d77a630f2ef042134fe11a"
+DOWNLOAD="https://github.com/danfruehauf/NetworkManager-ssh/archive/1.2.12/NetworkManager-ssh-1.2.12.tar.gz"
+MD5SUM="c1b66975fd357f119dd111a9bf00f96d"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/network/NetworkManager-ssh/README b/network/NetworkManager-ssh/README
index 732f2f49fb..abf83415e2 100644
--- a/network/NetworkManager-ssh/README
+++ b/network/NetworkManager-ssh/README
@@ -1,5 +1,6 @@
 NetworkManager-ssh (SSH VPN support for NetworkManager)
 
-You will need to add the following line to /etc/dbus-1/system.d/org.freedesktop.NetworkManager.conf:
+You will need to add the following line to
+/etc/dbus-1/system.d/org.freedesktop.NetworkManager.conf:
 
 <allow send_destination="org.freedesktop.NetworkManager.ssh"/>
diff --git a/network/NetworkManager-vpnc/NetworkManager-vpnc.SlackBuild b/network/NetworkManager-vpnc/NetworkManager-vpnc.SlackBuild
index 139ccd3286..36ebf56a8e 100644
--- a/network/NetworkManager-vpnc/NetworkManager-vpnc.SlackBuild
+++ b/network/NetworkManager-vpnc/NetworkManager-vpnc.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for NetworkManager-vpnc
 
-# Copyright 2010-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,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=NetworkManager-vpnc
-VERSION=${VERSION:-1.2.4}
+VERSION=${VERSION:-1.2.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}
@@ -78,6 +88,7 @@ CXXFLAGS="$SLKCFLAGS" \
   --localstatedir=/var \
   --mandir=/usr/man \
   --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --without-libnm-glib \
   --build=$ARCH-slackware-linux
 
 make
@@ -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/network/NetworkManager-vpnc/NetworkManager-vpnc.info b/network/NetworkManager-vpnc/NetworkManager-vpnc.info
index 1aa961eebb..f6c297e0bc 100644
--- a/network/NetworkManager-vpnc/NetworkManager-vpnc.info
+++ b/network/NetworkManager-vpnc/NetworkManager-vpnc.info
@@ -1,8 +1,8 @@
 PRGNAM="NetworkManager-vpnc"
-VERSION="1.2.4"
+VERSION="1.2.6"
 HOMEPAGE="http://projects.gnome.org/NetworkManager/"
-DOWNLOAD="http://ftp.gnome.org/pub/GNOME/sources/NetworkManager-vpnc/1.2/NetworkManager-vpnc-1.2.4.tar.xz"
-MD5SUM="b482a231f25d3857fd320d7c0b25c785"
+DOWNLOAD="https://download.gnome.org/sources/NetworkManager-vpnc/1.2/NetworkManager-vpnc-1.2.6.tar.xz"
+MD5SUM="4e88a3bde38e3921c2adb9983fb9d09f"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="vpnc"
diff --git a/network/PAC/PAC.SlackBuild b/network/PAC/PAC.SlackBuild
index 36d2c298ad..c3d9489c9e 100644
--- a/network/PAC/PAC.SlackBuild
+++ b/network/PAC/PAC.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for PAC (Perl Auto Connector)
 
@@ -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=PAC
 VERSION=${VERSION:-4.5.5.7}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 SRCNAM="$(printf $PRGNAM | tr '[:upper:]' '[:lower:]')"
 
@@ -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}
@@ -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/network/Pafy/Pafy.SlackBuild b/network/Pafy/Pafy.SlackBuild
index 29539c73ba..a5494a4544 100644
--- a/network/Pafy/Pafy.SlackBuild
+++ b/network/Pafy/Pafy.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for Pafy
 
-# Copyright 2014-2018  Dimitris Zlatanidis  Orestiada, Greece
+# Copyright 2014-2019  Dimitris Zlatanidis  Orestiada, Greece
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,11 +22,20 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20200119 bkw:
+# Dimitris: this is B. Watson (urchlay@slackware.uk). I can't reach you
+# by email and you don't use IRC, so I'm "texting" you via this
+# comment. Pafy fails to build unless youtube-dl is installed, so
+# I added it to REQUIRES as a hard dep.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=Pafy
 SRCNAM=${PRGNAM,}
-VERSION=${VERSION:-0.5.4}
+VERSION=${VERSION:-0.5.5}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -36,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}
@@ -89,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/network/Pafy/Pafy.info b/network/Pafy/Pafy.info
index 406ab35285..774982c1fc 100644
--- a/network/Pafy/Pafy.info
+++ b/network/Pafy/Pafy.info
@@ -1,10 +1,10 @@
 PRGNAM="Pafy"
-VERSION="0.5.4"
+VERSION="0.5.5"
 HOMEPAGE="https://github.com/mps-youtube/pafy"
-DOWNLOAD="https://pypi.python.org/packages/41/cb/ec840c79942fb0788982963b61a361ecd10e4e58ad3dcaef4f0e809ce2fe/pafy-0.5.4.tar.gz"
-MD5SUM="092930504c7e4fcea30b7446fa1878c7"
+DOWNLOAD="https://files.pythonhosted.org/packages/7e/02/b70f4d2ad64bbc7d2a00018c6545d9b9039208553358534e73e6dd5bbaf6/pafy-0.5.5.tar.gz"
+MD5SUM="01430bb4876aec3b648b2f52c5ee7bd6"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES=""
+REQUIRES="youtube-dl"
 MAINTAINER="Dimitris Zlatanidis"
 EMAIL="d.zlatanidis@gmail.com"
diff --git a/network/Pafy/README b/network/Pafy/README
index e583af6bff..7597769aa4 100644
--- a/network/Pafy/README
+++ b/network/Pafy/README
@@ -1,13 +1,16 @@
 Pafy (Python API for YouTube content)
 
-Python API for YouTube - Download videos and retrieve metadata from YouTube.
+Python API for YouTube - Download videos and retrieve metadata from
+YouTube.
 
 - Retreive metadata such as viewcount, duration, rating, author,
   thumbnail, keywords.
 - Download video or audio at requested resolution / bitrate / format /
   filesize.
-- Command line tool (ytdl) for downloading directly from the command line.
-- Retrieve the URL to stream the video in a player such as vlc or mplayer.
+- Command line tool (ytdl) for downloading directly from the command
+  line.
+- Retrieve the URL to stream the video in a player such as vlc or
+  mplayer.
 - Works with age-restricted videos and non-embeddable videos.
 - Small, standalone, single importable module file (pafy.py).
 - Select highest quality stream for download or streaming.
@@ -15,5 +18,3 @@ Python API for YouTube - Download videos and retrieve metadata from YouTube.
 - Download video only (no audio) in m4v format.
 - Retreive playlists and playlist metadata.
 - Works with Python 2.6+ and 3.3+.
-
-Optional dependency: youtube-dl
diff --git a/network/PyRSS2Gen/PyRSS2Gen.SlackBuild b/network/PyRSS2Gen/PyRSS2Gen.SlackBuild
deleted file mode 100644
index 2285cf259b..0000000000
--- a/network/PyRSS2Gen/PyRSS2Gen.SlackBuild
+++ /dev/null
@@ -1,55 +0,0 @@
-#!/bin/sh
-# Generated by Alien's SlackBuild Toolkit: http://slackware.com/~alien/AST
-# Copyright 2009-2010  Eric Hameleers, Eindhoven, Netherlands
-# Slackware build script for PyRSS2Gen
-# Written by Lionel Young <redtricycle@gmail.com>
-# Based on http://slackbuilds.org/template.SlackBuild
-
-PRGNAM=PyRSS2Gen
-VERSION=${VERSION:-1.1}
-BUILD=${BUILD:-1}
-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) export ARCH=i486 ;;
-    arm*) export ARCH=arm ;;
-       *) export ARCH=$( uname -m ) ;;
-  esac
-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 .
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -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 build || exit 1
-python setup.py install --root=$PKG || exit 1
-
-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:-tgz}
diff --git a/network/PyRSS2Gen/PyRSS2Gen.info b/network/PyRSS2Gen/PyRSS2Gen.info
deleted file mode 100644
index 0d47049559..0000000000
--- a/network/PyRSS2Gen/PyRSS2Gen.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="PyRSS2Gen"
-VERSION="1.1"
-HOMEPAGE="http://www.dalkescientific.com/Python/PyRSS2Gen.html"
-DOWNLOAD="http://www.dalkescientific.com/Python/PyRSS2Gen-1.1.tar.gz"
-MD5SUM="c56b9453d52b0a70be4f3e95112058aa"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Lionel Young"
-EMAIL="redtricycle@gmail.com"
diff --git a/network/PyRSS2Gen/README b/network/PyRSS2Gen/README
deleted file mode 100644
index f5b22bb47d..0000000000
--- a/network/PyRSS2Gen/README
+++ /dev/null
@@ -1,6 +0,0 @@
-PyRSS2Gen is a Python module that makes it easy to generate valid RSS
-feeds. You can use it to generate RSS feeds for web pages that don't
-have them.
-
-There is also RSSLib which looks like it does the same thing in a slightly
-different way.
diff --git a/network/PyRSS2Gen/slack-desc b/network/PyRSS2Gen/slack-desc
deleted file mode 100644
index a859f9cc7a..0000000000
--- a/network/PyRSS2Gen/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------------------------------------------------------|
-PyRSS2Gen: PyRSS2Gen (python RSS feed generator)
-PyRSS2Gen:
-PyRSS2Gen: PyRSS2Gen is a Python module that makes it easy to generate valid
-PyRSS2Gen: RSS feeds.  You can use it to generate RSS feeds for web pages that
-PyRSS2Gen: don't have them.
-PyRSS2Gen:
-PyRSS2Gen: Home: http://www.dalkescientific.com/Python/PyRSS2Gen.html
-PyRSS2Gen:
-PyRSS2Gen:
-PyRSS2Gen:
-PyRSS2Gen:
diff --git a/network/PySocks/PySocks.SlackBuild b/network/PySocks/PySocks.SlackBuild
index 0c37c92309..cdfc686466 100644
--- a/network/PySocks/PySocks.SlackBuild
+++ b/network/PySocks/PySocks.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for PySocks
 
@@ -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=PySocks
 VERSION=${VERSION:-1.6.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}
@@ -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/network/Pyrit/Pyrit.SlackBuild b/network/Pyrit/Pyrit.SlackBuild
index ff37d2fad8..59656fc3ca 100644
--- a/network/Pyrit/Pyrit.SlackBuild
+++ b/network/Pyrit/Pyrit.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for Pyrit
 
@@ -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=Pyrit
 VERSION=${VERSION:-0.5.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}
@@ -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/network/Pyrit/Pyrit.info b/network/Pyrit/Pyrit.info
index 77776829d3..3311b6a4e2 100644
--- a/network/Pyrit/Pyrit.info
+++ b/network/Pyrit/Pyrit.info
@@ -1,7 +1,7 @@
 PRGNAM="Pyrit"
 VERSION="0.5.0"
 HOMEPAGE="https://github.com/JPaulMora/Pyrit"
-DOWNLOAD="https://github.com/JPaulMora/Pyrit/archive/v0.5.0.tar.gz"
+DOWNLOAD="https://github.com/JPaulMora/Pyrit/archive/v0.5.0/Pyrit-0.5.0.tar.gz"
 MD5SUM="fbc25ae13a5fed2b2e3ffad7ede0dc71"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/network/Pyrit/README b/network/Pyrit/README
index ff63c58df2..c84cc67b07 100644
--- a/network/Pyrit/README
+++ b/network/Pyrit/README
@@ -1,5 +1,6 @@
-Pyrit allows you to create massive databases of pre-computed WPA/WPA2-PSK
-authentication phase in a space-time-tradeoff. By using the computational
-power of Multi-Core CPUs and other platforms through ATI-Stream,Nvidia CUDA
-and OpenCL, it is currently by far the most powerful attack against one of
-the world's most used security-protocols.
+Pyrit allows you to create massive databases of pre-computed
+WPA/WPA2-PSK authentication phase in a space-time-tradeoff. By using
+the computational power of Multi-Core CPUs and other platforms
+through ATI-Stream,Nvidia CUDA and OpenCL, it is currently by
+far the most powerful attack against one of the world's most used
+security-protocols.
diff --git a/network/Quaternion/Quaternion.SlackBuild b/network/Quaternion/Quaternion.SlackBuild
new file mode 100644
index 0000000000..113f01f939
--- /dev/null
+++ b/network/Quaternion/Quaternion.SlackBuild
@@ -0,0 +1,118 @@
+#!/bin/bash
+
+# Slackware build script for Quaternion
+
+# Copyright 2020 Charles Daniels, United States
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=Quaternion
+VERSION=${VERSION:-0.0.9.4e}
+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 {} \;
+
+# -DUSE_INTREE_LIBQMC=0 to use the installed version of libQuotient, rather
+# than building in a submodule. This is preferred both because the relase
+# tarball will not include libQuotient, and to avoid multiple installations.
+
+# -DUSE_KEYCHAIN=0 to disable support for qt5keychain. I could not get this to
+# work even with the qtkeychain package from slackbuilds.org. YMMV.
+
+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 .. \
+    -DUSE_INTREE_LIBQMC=0 \
+    -DUSE_KEYCHAIN=0
+  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 \
+  BUILDING.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
+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/network/Quaternion/Quaternion.info b/network/Quaternion/Quaternion.info
new file mode 100644
index 0000000000..644d2cfac2
--- /dev/null
+++ b/network/Quaternion/Quaternion.info
@@ -0,0 +1,10 @@
+PRGNAM="Quaternion"
+VERSION="0.0.9.4e"
+HOMEPAGE="https://github.com/quotient-im/Quaternion"
+DOWNLOAD="https://github.com/quotient-im/Quaternion/archive/0.0.9.4e/Quaternion-0.0.9.4e.tar.gz"
+MD5SUM="e489f331b49f18e0554b60070e61b7c9"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="libQuotient"
+MAINTAINER="Charles Daniels"
+EMAIL="charles@cdaniels.net"
diff --git a/network/Quaternion/README b/network/Quaternion/README
new file mode 100644
index 0000000000..93bb89e56e
--- /dev/null
+++ b/network/Quaternion/README
@@ -0,0 +1,9 @@
+Quaternion is a cross-platform desktop IM client for the Matrix
+protocol.
+
+SlackBuild notes:
+
+* -DUSE_INTREE_LIBQMC=0 is set to use the system copy of libQuotient.
+  Using the in-tree version requires the sources to be fetched
+  recursively via git, since it's a submodule. You probably don't want
+  to change this.
diff --git a/network/waterfox/doinst.sh b/network/Quaternion/doinst.sh
index 9a8ded3c60..9a8ded3c60 100644
--- a/network/waterfox/doinst.sh
+++ b/network/Quaternion/doinst.sh
diff --git a/network/Quaternion/slack-desc b/network/Quaternion/slack-desc
new file mode 100644
index 0000000000..b8c7bdb2bd
--- /dev/null
+++ b/network/Quaternion/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+          |-----handy-ruler------------------------------------------------------|
+Quaternion: Quaternion (A Qt5-based IM client for Matrix)
+Quaternion:
+Quaternion: Quaternion is a cross-platform desktop IM client for the Matrix
+Quaternion: protocol.
+Quaternion:
+Quaternion: Homepage: https://github.com/quotient-im/Quaternion
+Quaternion:
+Quaternion:
+Quaternion:
+Quaternion:
+Quaternion:
diff --git a/network/QuiteRSS/QuiteRSS.SlackBuild b/network/QuiteRSS/QuiteRSS.SlackBuild
index 25db6d35bc..65e8c6dc8a 100644
--- a/network/QuiteRSS/QuiteRSS.SlackBuild
+++ b/network/QuiteRSS/QuiteRSS.SlackBuild
@@ -1,13 +1,17 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for QuiteRSS
 
 # Written by  Andrey Maraev <andrew.maraev60@yandex.ru>
+# Maintained by Spycrowsoft as of 2020-10-18
+
+cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=QuiteRSS
-VERSION=${VERSION:-0.18.9}
+VERSION=${VERSION:-0.19.4}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -17,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}
@@ -72,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/network/QuiteRSS/QuiteRSS.info b/network/QuiteRSS/QuiteRSS.info
index da08dbe69c..f37df41ce7 100644
--- a/network/QuiteRSS/QuiteRSS.info
+++ b/network/QuiteRSS/QuiteRSS.info
@@ -1,10 +1,10 @@
 PRGNAM="QuiteRSS"
-VERSION="0.18.9"
+VERSION="0.19.4"
 HOMEPAGE="http://quiterss.org/en/node"
-DOWNLOAD="https://quiterss.org/files/0.18.9/QuiteRSS-0.18.9-src.tar.gz"
-MD5SUM="6a1d7b3ad8842d8c9cd745a8076726c2"
+DOWNLOAD="https://quiterss.org/files/0.19.4_/QuiteRSS-0.19.4-src.tar.gz"
+MD5SUM="96a25a33904dadba2daa3ea5c92d4388"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Reedych"
-EMAIL="reedych@ya.ru"
+MAINTAINER="Spycrowsoft"
+EMAIL="spycrowsoft [ at ] gmail [ dot ] com"
diff --git a/network/RSSOwl/README b/network/RSSOwl/README
deleted file mode 100644
index d203b265b5..0000000000
--- a/network/RSSOwl/README
+++ /dev/null
@@ -1,5 +0,0 @@
-RSSOwl (eclipse based RSS reader) A News Reader for Everyone.  RSSOwl lets
-you gather, organize, update, and store information from any compliant
-source in a convenient, easy to use interface, save selected information in
-various formats for offline viewing and sharing, and much more.  RSSOwl is
-open source, licensed under the terms of the Eclipse Public License.
diff --git a/network/RSSOwl/RSSOwl.SlackBuild b/network/RSSOwl/RSSOwl.SlackBuild
deleted file mode 100644
index e74ccf654a..0000000000
--- a/network/RSSOwl/RSSOwl.SlackBuild
+++ /dev/null
@@ -1,93 +0,0 @@
-#!/bin/sh
-#
-# Slackware build script for RSSOwl
-#
-# Written by Vincent Batts, vbatts@hashbangbash.com -2009
-# Maintained by Erik Hanson, erik@slackbuilds.org 2010-2014
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (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=RSSOwl
-VERSION=${VERSION:-2.2.1}
-BUILD=${BUILD:-1}
-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" = "x86_64" ]; then
-  LIBDIRSUFFIX="64"
-  SRC_ARCH="x86_64.zip"
-elif [ "$ARCH" = "i486" ]; then
-  LIBDIRSUFFIX=""
-  SRC_ARCH="x86.zip"
-else
-  printf "$ARCH is not supported...\n"
-  exit 1
-fi
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf rssowl
-unzip $CWD/rssowl-$VERSION.linux.${SRC_ARCH}
-cd rssowl
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -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
-ln -s /usr/lib${LIBDIRSUFFIX}/RSSOwl/RSSOwl $PKG/usr/bin/RSSOwl
-
-mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/$PRGNAM
-cp -av * $PKG/usr/lib${LIBDIRSUFFIX}/$PRGNAM
-
-sed -i 's,libhunspell-1.2.so.0,libhunspell-1.3.so.0,g' $PKG/usr/lib${LIBDIRSUFFIX}/$PRGNAM/xulrunner/libxul.so
-
-mkdir -p $PKG/usr/share/pixmaps
-cp -av icon.xpm $PKG/usr/share/pixmaps/$PRGNAM.xpm
-
-mkdir -p $PKG/usr/share/applications
-cp -v $CWD/$PRGNAM.desktop $PKG/usr/share/applications/
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a about* $PKG/usr/doc/$PRGNAM-$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/network/RSSOwl/RSSOwl.desktop b/network/RSSOwl/RSSOwl.desktop
deleted file mode 100644
index 6de5a6267e..0000000000
--- a/network/RSSOwl/RSSOwl.desktop
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Exec=RSSOwl
-Icon=RSSOwl
-Type=Application
-Categories=Network;
-Name=RSSOwl
-GenericName=RSS News Reader
-MimeType=application/rss+xml;
-X-KDE-StartupNotify=true
-
diff --git a/network/RSSOwl/RSSOwl.info b/network/RSSOwl/RSSOwl.info
deleted file mode 100644
index a34f2b4f5d..0000000000
--- a/network/RSSOwl/RSSOwl.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="RSSOwl"
-VERSION="2.2.1"
-HOMEPAGE="http://www.rssowl.org/"
-DOWNLOAD="http://downloads.sourceforge.net/rssowl/rssowl-2.2.1.linux.x86.zip"
-MD5SUM="7295bbce792dc921ac89781ac717e6f6"
-DOWNLOAD_x86_64="http://downloads.sourceforge.net/rssowl/rssowl-2.2.1.linux.x86_64.zip"
-MD5SUM_x86_64="7751803db518b267b0dca121c1532747"
-REQUIRES="jdk"
-MAINTAINER="Erik Hanson"
-EMAIL="erik@slackbuilds.org"
diff --git a/network/RSSOwl/doinst.sh b/network/RSSOwl/doinst.sh
deleted file mode 100644
index 24e4bc11e0..0000000000
--- a/network/RSSOwl/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
-fi
-
diff --git a/network/RSSOwl/slack-desc b/network/RSSOwl/slack-desc
deleted file mode 100644
index ce1ed4d3db..0000000000
--- a/network/RSSOwl/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------------------------------------------------------|
-RSSOwl: RSSOwl (eclipse based RSS, Atom, and News reader)
-RSSOwl:
-RSSOwl: RSSOwl lets you gather, organize, update, and store information
-RSSOwl: from any compliant source in a convenient, easy to use interface,
-RSSOwl: save selected information in various formats for offline viewing
-RSSOwl: and sharing, and much more.  RSSOwl is open source,
-RSSOwl: licensed under the terms of the Eclipse Public License.
-RSSOwl:
-RSSOwl: Homepage: http://www.rssowl.org/
-RSSOwl:
-RSSOwl:
diff --git a/network/RYMTracks/README b/network/RYMTracks/README
deleted file mode 100644
index 5c60fa958f..0000000000
--- a/network/RYMTracks/README
+++ /dev/null
@@ -1,2 +0,0 @@
-RYMTracks is small helper for all those folks who actively uses and
-contributes for RateYourMusic <http://rateyourmusic.com>
diff --git a/network/RYMTracks/RYMTracks.SlackBuild b/network/RYMTracks/RYMTracks.SlackBuild
deleted file mode 100644
index 5a5514dc17..0000000000
--- a/network/RYMTracks/RYMTracks.SlackBuild
+++ /dev/null
@@ -1,85 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for RYMTracks
-
-# 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=RYMTracks
-VERSION=${VERSION:-0.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 $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 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
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/network/RYMTracks/RYMTracks.info b/network/RYMTracks/RYMTracks.info
deleted file mode 100644
index 3d84d832b9..0000000000
--- a/network/RYMTracks/RYMTracks.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="RYMTracks"
-VERSION="0.1.4"
-HOMEPAGE="https://github.com/9seconds/rymtracks/"
-DOWNLOAD="https://pypi.python.org/packages/source/R/RYMTracks/RYMTracks-0.1.4.tar.gz"
-MD5SUM="722b0cabebbcb25f917947e55b0feb71"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="BeautifulSoup4 lxml isodate docopt nose six nltk numpy python-requests colorama termcolor futures mutagen"
-MAINTAINER="Dimitris Zlatanidis"
-EMAIL="d.zlatanidis@gmail.com"
diff --git a/network/RYMTracks/slack-desc b/network/RYMTracks/slack-desc
deleted file mode 100644
index 1796b91579..0000000000
--- a/network/RYMTracks/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------------------------------------------------------|
-RYMTracks: RYMTracks (Tracklist scraper)
-RYMTracks:
-RYMTracks: RYMTracks scraps given URLs and presents tracklists into
-RYMTracks: copypasteable form for RateYourMusic.com
-RYMTracks:
-RYMTracks: Homepage: https://github.com/9seconds/rymtracks/
-RYMTracks:
-RYMTracks:
-RYMTracks:
-RYMTracks:
-RYMTracks:
diff --git a/network/Signal-Desktop/README b/network/Signal-Desktop/README
deleted file mode 100644
index 738d21f711..0000000000
--- a/network/Signal-Desktop/README
+++ /dev/null
@@ -1,13 +0,0 @@
-Signal Desktop is a chrome packaged app that links with your
-Signal Android or Signal iOS app.
-
-Signal is an encrypted instant messaging and voice calling
-application for Android and iOS. It uses the Internet to
-send one-to-one and group messages, which can include images
-and video messages, and make one-to-one voice calls.
-
-Please be sure to run the SlackBuild with a real root shell
-using 'su -l'.  If the build fails with an access error, remove
-the npm cache:
-
-  rm -rf ~/.npm/
diff --git a/network/Signal-Desktop/Signal-Desktop.SlackBuild b/network/Signal-Desktop/Signal-Desktop.SlackBuild
deleted file mode 100644
index 5682b12be7..0000000000
--- a/network/Signal-Desktop/Signal-Desktop.SlackBuild
+++ /dev/null
@@ -1,84 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for Signal-Desktop
-
-# Copyright 2017 Rodrigo Gimenez <estrod[at]zoho[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=Signal-Desktop
-VERSION=${VERSION:-0.42.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}
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-cd $TMP/$PRGNAM-$VERSION
-chown -R root:root .
-
-patch -Np1 < $CWD/expirejs.patch
-npm install
-node_modules/grunt-cli/bin/grunt
-
-cd dist
-
-install -Ddm755 "$PKG/opt/$PRGNAM"
-cp -r * "$PKG/opt/$PRGNAM"
-
-install -Ddm755 "$PKG/usr/bin"
-echo -e "#!/bin/bash\n/usr/bin/nw /opt/$PRGNAM" > "$PKG/usr/bin/signal"
-chmod +x "$PKG/usr/bin/signal"
-
-install -Ddm755 "$PKG/usr/share/applications"
-cat $CWD/$PRGNAM.desktop > $PKG/usr/share/applications/$PRGNAM.desktop
-
-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
-
-for icon_size in 16 32 48 128 250 256; do
-	icon_dir="$PKG/usr/share/icons/hicolor/${icon_size}x${icon_size}/apps"
-	install -d "$icon_dir"
-	install -m644 "../images/icon_${icon_size}.png" "$icon_dir/$PRGNAM.png"
-done
-
-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/network/Signal-Desktop/Signal-Desktop.desktop b/network/Signal-Desktop/Signal-Desktop.desktop
deleted file mode 100644
index 5274855218..0000000000
--- a/network/Signal-Desktop/Signal-Desktop.desktop
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Name=Signal Desktop
-Comment=Signal Private Messenger for the Desktop
-Exec=/usr/bin/signal
-StartupWMClass=Signal-Desktop
-Icon=Signal-Desktop
-Terminal=false
-Type=Application
-Categories=Network;
diff --git a/network/Signal-Desktop/Signal-Desktop.info b/network/Signal-Desktop/Signal-Desktop.info
deleted file mode 100644
index d0366d1b40..0000000000
--- a/network/Signal-Desktop/Signal-Desktop.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="Signal-Desktop"
-VERSION="0.42.2"
-HOMEPAGE="https://github.com/WhisperSystems/Signal-Desktop"
-DOWNLOAD="https://github.com/WhisperSystems/Signal-Desktop/archive/v0.42.2/Signal-Desktop-0.42.2.tar.gz"
-MD5SUM="97a093a38f7b8d837e40fbc0e84e3585"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="nodejs nwjs rubygem-sass"
-MAINTAINER="Rodrigo Gimenez"
-EMAIL="estrod[at]zoho[dot]com"
diff --git a/network/Signal-Desktop/expirejs.patch b/network/Signal-Desktop/expirejs.patch
deleted file mode 100644
index 02f2ffc2dc..0000000000
--- a/network/Signal-Desktop/expirejs.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -bur Signal-Desktop-0.42.2/Gruntfile.js Signal-Desktop-0.42.2-fix/Gruntfile.js
---- Signal-Desktop-0.42.2/Gruntfile.js	2017-03-30 19:12:25.000000000 -0300
-+++ Signal-Desktop-0.42.2-fix/Gruntfile.js	2017-04-01 08:58:49.662938344 -0300
-@@ -127,9 +127,10 @@
-                 /textsecure-service-staging.whispersystems.org/g,
-                 'textsecure-service-ca.whispersystems.org');
-             } else if (srcpath.match('expire.js')) {
--              var gitinfo = grunt.config.get('gitinfo');
--              var commited = gitinfo.local.branch.current.lastCommitTime;
--              var time = Date.parse(commited) + 1000 * 60 * 60 * 24 * 90;
-+              //var gitinfo = grunt.config.get('gitinfo');
-+              //var commited = gitinfo.local.branch.current.lastCommitTime;
-+              //var time = Date.parse(commited) + 1000 * 60 * 60 * 24 * 90;
-+              var time = NaN;
-               return content.replace(
-                 /var BUILD_EXPIRATION = 0/,
-                 "var BUILD_EXPIRATION = " + time
diff --git a/network/Signal-Desktop/slack-desc b/network/Signal-Desktop/slack-desc
deleted file mode 100644
index ee7eca4ab6..0000000000
--- a/network/Signal-Desktop/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------------------------------------------------------|
-Signal-Desktop: Signal-Desktop (Signal Private Messenger for the Desktop)
-Signal-Desktop:
-Signal-Desktop: Signal is an encrypted instant messaging and voice calling
-Signal-Desktop: application for Android and iOS. It uses the Internet to send
-Signal-Desktop: one-to-one and group messages, which can include images and
-Signal-Desktop: video messages, and make one-to-one voice calls.
-Signal-Desktop:
-Signal-Desktop:
-Signal-Desktop:
-Signal-Desktop:
-Signal-Desktop:
diff --git a/network/SoulseekQt/README b/network/SoulseekQt/README
index 8f42be8f9c..dbfbd01a9d 100644
--- a/network/SoulseekQt/README
+++ b/network/SoulseekQt/README
@@ -1,5 +1,6 @@
-SoulseekQt is the official client software for the Soulseek peer-to-peer
-file-sharing network.
+SoulseekQt is the official client software for the Soulseek
+peer-to-peer file-sharing network.
 
-This SlackBuild creates a Slackware package from the 64- or 32-bit binary
-SoulseekQt package from the official website.
+This SlackBuild creates a Slackware package from the 64-bit
+binary SoulseekQt AppImage from the official website. 32-bit
+version is not provided by upstream.
diff --git a/network/SoulseekQt/SoulseekQt.SlackBuild b/network/SoulseekQt/SoulseekQt.SlackBuild
index 39cfe7fd17..ffcf0113b1 100644
--- a/network/SoulseekQt/SoulseekQt.SlackBuild
+++ b/network/SoulseekQt/SoulseekQt.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for SoulseekQt
 
-# Copyright 2016-2018 Dominik Drobek <dominik.drobek (at) o2.pl>
+# Copyright 2016-2018, 2020, 2022 Dominik Drobek <dominik.drobek (at) o2.pl>
 # 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=SoulseekQt
-VERSION=${VERSION:-20160117}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-20180130}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
-FVER="2016-1-17"
+FVER="2018-1-30"
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -37,15 +40,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" = "x86_64" ]; then
   TGZARCH="64bit"
-elif [ "$ARCH" = "i586" ] || [ "$ARCH" = "i686" ]; then
-  TGZARCH="32bit"
 else
   printf "\n$ARCH is unsupported for $PRGNAM, exiting.\n\n"
   exit 1
@@ -58,19 +63,33 @@ mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
 mkdir -p $TMP/$PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$FVER-$TGZARCH.tgz -C $TMP/$PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$FVER-$TGZARCH-appimage.tgz -C $TMP/$PRGNAM-$VERSION
 cd $PRGNAM-$VERSION
+./$PRGNAM-$FVER-$TGZARCH.AppImage --appimage-extract
+cd squashfs-root/
 chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -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/opt/$PRGNAM
-mkdir -p $PKG/usr/{bin,share/{applications,pixmaps}}
-install -m 755 $PRGNAM-$FVER-$TGZARCH $PKG/opt/$PRGNAM/$PRGNAM
-install -m 644 $CWD/SoulseekQt.png $PKG/usr/share/pixmaps
-install -m 644 $CWD/SoulseekQt.desktop $PKG/usr/share/applications
+mkdir -p $PKG/{usr/bin,usr/share/applications,usr/share/pixmaps,opt}
+cp -r $TMP/$PRGNAM-$VERSION/squashfs-root/ $PKG/opt/$PRGNAM
+cp soulseek.png $PKG/usr/share/pixmaps/$PRGNAM.png
+cp $CWD/$PRGNAM.desktop $PKG/usr/share/applications/
 ln -sf ../../opt/$PRGNAM/$PRGNAM $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
+# provide mock SELinux library
+gcc -s -shared -Wl,-soname,libselinux.so.1 \
+    $CWD/selinux-stub.c -o $PKG/opt/$PRGNAM/lib/libselinux.so.1
+
+# clean up unnecessary files
+rm $PKG/opt/$PRGNAM/{AppRun,.DirIcon,*.AppImage,default.desktop,soulseek.png}
+#rm $PKG/opt/$PRGNAM/lib/libfreetype.so.6 # Arch Linux PKGBUILD deletes this, not sure why
+
+# fix permissions on installed directories
+find $PKG/opt/$PRGNAM -type d -exec chmod 755 {} \;
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
@@ -80,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/network/SoulseekQt/SoulseekQt.info b/network/SoulseekQt/SoulseekQt.info
index 09de463657..96ff443dcb 100644
--- a/network/SoulseekQt/SoulseekQt.info
+++ b/network/SoulseekQt/SoulseekQt.info
@@ -1,10 +1,10 @@
 PRGNAM="SoulseekQt"
-VERSION="20160117"
+VERSION="20180130"
 HOMEPAGE="https://www.slsknet.org/"
-DOWNLOAD="https://www.dropbox.com/s/kebk1b5ib1m3xxw/SoulseekQt-2016-1-17-32bit.tgz"
-MD5SUM="906d99b15ed02d0d66981fffeeea1218"
-DOWNLOAD_x86_64="https://www.dropbox.com/s/7qh902qv2sxyp6p/SoulseekQt-2016-1-17-64bit.tgz"
-MD5SUM_x86_64="c843e748a129e4ad9461280aeb2b957a"
+DOWNLOAD="UNSUPPORTED"
+MD5SUM=""
+DOWNLOAD_x86_64="https://www.slsknet.org/SoulseekQt/Linux/SoulseekQt-2018-1-30-64bit-appimage.tgz"
+MD5SUM_x86_64="1d98331893bc9b9d45ba34f6523353ab"
 REQUIRES=""
 MAINTAINER="Dominik Drobek"
 EMAIL="dominik.drobek (at) o2.pl"
diff --git a/network/SoulseekQt/SoulseekQt.png b/network/SoulseekQt/SoulseekQt.png
deleted file mode 100644
index 35cc7296f7..0000000000
--- a/network/SoulseekQt/SoulseekQt.png
+++ /dev/null
diff --git a/network/SoulseekQt/selinux-stub.c b/network/SoulseekQt/selinux-stub.c
new file mode 100644
index 0000000000..c3903e341e
--- /dev/null
+++ b/network/SoulseekQt/selinux-stub.c
@@ -0,0 +1,4 @@
+int is_selinux_enabled(void)
+{
+    return 0;
+}
diff --git a/network/SpiderOakONE/README b/network/SpiderOakONE/README
new file mode 100644
index 0000000000..eef2963167
--- /dev/null
+++ b/network/SpiderOakONE/README
@@ -0,0 +1 @@
+SpiderOAKONE is a could backup , sync provided by SpiderOAK
diff --git a/network/SpiderOakONE/SpiderOakONE.SlackBuild b/network/SpiderOakONE/SpiderOakONE.SlackBuild
new file mode 100644
index 0000000000..d514cd6259
--- /dev/null
+++ b/network/SpiderOakONE/SpiderOakONE.SlackBuild
@@ -0,0 +1,71 @@
+#!/bin/bash
+
+# Slackware build script for SpiderOak
+
+# Copyright (c) 2019 Alfredo Tomasini <alto.tom@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.
+
+# Written by Alfredo Tomasini <alto.tom@gmail.com>
+# SpiderOakONE-7.5.0-slack_tar_x64.tgz
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM="SpiderOakONE"
+EXTRA="slack_tar_x64"
+VERSION=${VERSION:-7.5.0}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+ARCH=`uname -a | cut -f12 -d\ `
+
+# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
+# the name of the created package would be, and then exit. This information
+# could be useful to other scripts.
+if [ ! -z "${PRINT_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
+rm -rf $TMP/$PRGNAM
+mkdir -p $TMP $PKG $OUTPUT $TMP/$PRGNAM
+cd $TMP/$PRGNAM
+tar xvf $CWD/$PRGNAM-$VERSION-$EXTRA.tgz || tar xvf $CWD/slack_tar_x64
+chown -R root:root .
+
+cp -r * $PKG
+mv $PKG/usr/share/man/ $PKG/usr/
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+mv $PKG/usr/share/doc/SpiderOakONE/* $PKG/usr/doc/$PRGNAM-$VERSION
+rm -rf $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
diff --git a/network/SpiderOakONE/SpiderOakONE.info b/network/SpiderOakONE/SpiderOakONE.info
new file mode 100644
index 0000000000..739af57432
--- /dev/null
+++ b/network/SpiderOakONE/SpiderOakONE.info
@@ -0,0 +1,10 @@
+PRGNAM="SpiderOakONE"
+VERSION="7.5.0"
+HOMEPAGE="https://spideroak.com"
+DOWNLOAD="UNSUPPORTED"
+MD5SUM=""
+DOWNLOAD_x86_64="https://spideroak.com/release/spideroak/slack_tar_x64"
+MD5SUM_x86_64="0c0ed96e7ecb32aa6b138f03871b12fa"
+REQUIRES=""
+MAINTAINER="Alfredo Tomasini"
+EMAIL="alto.tom@gmail.com"
diff --git a/network/SpiderOakONE/slack-desc b/network/SpiderOakONE/slack-desc
new file mode 100644
index 0000000000..1ca689e2de
--- /dev/null
+++ b/network/SpiderOakONE/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+            |-----handy-ruler------------------------------------------------------|
+SpiderOakONE: SpiderOakONE (backup system)
+SpiderOakONE:
+SpiderOakONE: SpiderOakONE is a cloud backup and syncrhonization system from
+SpiderOakONE: spideroak.com
+SpiderOakONE:
+SpiderOakONE: Homepage: https://spideroak.com/
+SpiderOakONE:
+SpiderOakONE:
+SpiderOakONE:
+SpiderOakONE:
+SpiderOakONE:
diff --git a/network/TeamSpeak3/README b/network/TeamSpeak3/README
index 66324e7730..34ed64c4bc 100644
--- a/network/TeamSpeak3/README
+++ b/network/TeamSpeak3/README
@@ -13,4 +13,6 @@ Key features are: client-server architecture, firewall-friendly client
 communication, multiple channels, text chat, file transfer, user
 administration, and cross-platform support.
 
+Starting with 3.6.0, TeamSpeak drops the support for Linux 32-bit.
+
 This script packages the proprietary client software.
diff --git a/network/TeamSpeak3/TeamSpeak3.SlackBuild b/network/TeamSpeak3/TeamSpeak3.SlackBuild
index ec64deec14..53c7aa5463 100644
--- a/network/TeamSpeak3/TeamSpeak3.SlackBuild
+++ b/network/TeamSpeak3/TeamSpeak3.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for TeamSpeak3
 
@@ -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=TeamSpeak3
-VERSION=${VERSION:-3.1.10}
+VERSION=${VERSION:-3.6.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}
@@ -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/network/TeamSpeak3/TeamSpeak3.info b/network/TeamSpeak3/TeamSpeak3.info
index cf6c4526ff..d0b5e8518e 100644
--- a/network/TeamSpeak3/TeamSpeak3.info
+++ b/network/TeamSpeak3/TeamSpeak3.info
@@ -1,10 +1,10 @@
 PRGNAM="TeamSpeak3"
-VERSION="3.1.10"
+VERSION="3.6.1"
 HOMEPAGE="https://www.teamspeak.com/en/"
-DOWNLOAD="http://dl.4players.de/ts/releases/3.1.10/TeamSpeak3-Client-linux_x86-3.1.10.run"
-MD5SUM="07213ba8492ce94f724076f13b007367"
-DOWNLOAD_x86_64="http://dl.4players.de/ts/releases/3.1.10/TeamSpeak3-Client-linux_amd64-3.1.10.run"
-MD5SUM_x86_64="d6ef98f17698c83a51a75aada0ec3985"
+DOWNLOAD="UNSUPPORTED"
+MD5SUM=""
+DOWNLOAD_x86_64="https://files.teamspeak-services.com/releases/client/3.6.1/TeamSpeak3-Client-linux_amd64-3.6.1.run"
+MD5SUM_x86_64="327f66c7923f735b8e9f3425f4c40219"
 REQUIRES=""
 MAINTAINER="Edward W. Koenig"
-EMAIL="kingbeowulf@gmail.com"
+EMAIL="kingbeowulf@linuxgalaxy.org"
diff --git a/network/UDR/README b/network/UDR/README
index 653b521e76..ef8c5ad63b 100644
--- a/network/UDR/README
+++ b/network/UDR/README
@@ -1,3 +1,14 @@
+*** Important remark:
+
+Instead of using this program, it is recommended to change the kernel
+tcp congestion control to bbr by adding the following two lines to
+/etc/sysctl.conf:
+
+net.core.default_qdisc=fq
+net.ipv4.tcp_congestion_control=bbr
+
+*********************
+
 UDR is a wrapper around rsync that enables rsync to use UDT protocol and
 thus improves throughput of large data transfers over long distances.
 
@@ -11,7 +22,7 @@ then places the connection between the rsync client and server.
 To use UDR, prefix the current rsync command used to transfer data with
 'udr', for example:
 
-udr rsync -avz /home/user/dir/ user@example.com:/home/user/dir
+udr rsync -av /home/user/dir/ user@example.com:/home/user/dir
 
 Any rsync options can be used.
 
diff --git a/network/UDR/UDR.SlackBuild b/network/UDR/UDR.SlackBuild
index ecaecb07e6..bbec3789c8 100644
--- a/network/UDR/UDR.SlackBuild
+++ b/network/UDR/UDR.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for UDR
 
-# Copyright 2017, Alexander Verbovetsky, Moscow, Russia
+# Copyright 2017-2024, Alexander Verbovetsky, Moscow, Russia
 # 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=UDR
-VERSION=${VERSION:-0.9.4}
+VERSION=${VERSION:-0.9.4_578b97a}
+GITVERSION=${GITVERSION:-578b97a35769b6d2a99215d6d013bdf49a144164}
 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}
@@ -58,9 +66,9 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG/usr/bin $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-cd $PRGNAM-$VERSION
+rm -rf $PRGNAM-$GITVERSION
+tar xvf $CWD/$PRGNAM-$GITVERSION.tar.gz
+cd $PRGNAM-$GITVERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -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/network/UDR/UDR.info b/network/UDR/UDR.info
index 61c04c6341..9918290df8 100644
--- a/network/UDR/UDR.info
+++ b/network/UDR/UDR.info
@@ -1,8 +1,8 @@
 PRGNAM="UDR"
-VERSION="0.9.4"
-HOMEPAGE="https://github.com/LabAdvComp/UDR"
-DOWNLOAD="https://github.com/LabAdvComp/UDR/archive/v0.9.4/UDR-0.9.4.tar.gz"
-MD5SUM="74a7ebd384156be0fc3d9a08890e098b"
+VERSION="0.9.4_578b97a"
+HOMEPAGE="https://github.com/martinetd/UDR"
+DOWNLOAD="https://github.com/martinetd/UDR/archive/578b97a/UDR-578b97a35769b6d2a99215d6d013bdf49a144164.tar.gz"
+MD5SUM="84dd948f0c20a334492f4dbaa55f68ad"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/network/UDR/slack-desc b/network/UDR/slack-desc
index d665c18bf2..98a3ccf65a 100644
--- a/network/UDR/slack-desc
+++ b/network/UDR/slack-desc
@@ -12,7 +12,7 @@ UDR: UDR is a wrapper around rsync that enables rsync to use UDT protocol
 UDR: and thus improves throughput of large data transfers over long
 UDR: distances.
 UDR:
-UDR: HOMEPAGE: https://github.com/LabAdvComp/UDR
+UDR: HOMEPAGE: https://github.com/martinetd/UDR
 UDR:
 UDR:
 UDR:
diff --git a/network/WhatWeb/README b/network/WhatWeb/README
index 31daf88b70..3ececbb7b4 100644
--- a/network/WhatWeb/README
+++ b/network/WhatWeb/README
@@ -1,4 +1,5 @@
-WhatWeb identifies websites. Its goal is to answer the question, "What is
-that Website?". WhatWeb recognises web technologies including content
-management systems (CMS), blogging platforms, statistic/analytics packages,
- JavaScript libraries, web servers, and embedded devices.
+WhatWeb identifies websites. Its goal is to answer the question,
+"What is that Website?". WhatWeb recognises web technologies
+including content management systems (CMS), blogging platforms,
+statistic/analytics packages, JavaScript libraries, web servers, and
+embedded devices.
diff --git a/network/WhatWeb/WhatWeb.SlackBuild b/network/WhatWeb/WhatWeb.SlackBuild
index 1956cccd80..d8c8f22868 100644
--- a/network/WhatWeb/WhatWeb.SlackBuild
+++ b/network/WhatWeb/WhatWeb.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for <whatweb>
 
@@ -18,10 +18,13 @@
 
 #  0. You just DO WHAT THE FUCK YOU WANT TO.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=WhatWeb
-VERSION=${VERSION:-0.4.9}
+VERSION=${VERSION:-0.5.5}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -31,7 +34,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
+# the name of the created package would be, and then exit. This information
+# could be useful to other scripts.
+if [ ! -z "${PRINT_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/network/WhatWeb/WhatWeb.info b/network/WhatWeb/WhatWeb.info
index 0e72d568b5..8c4ee9de47 100644
--- a/network/WhatWeb/WhatWeb.info
+++ b/network/WhatWeb/WhatWeb.info
@@ -1,10 +1,10 @@
 PRGNAM="WhatWeb"
-VERSION="0.4.9"
+VERSION="0.5.5"
 HOMEPAGE="https://github.com/urbanadventurer/WhatWeb/releases"
-DOWNLOAD="https://github.com/urbanadventurer/WhatWeb/archive/v0.4.9/WhatWeb-0.4.9.tar.gz"
-MD5SUM="31d57457f34f6691ac20639ffdef8ad6"
+DOWNLOAD="https://github.com/urbanadventurer/WhatWeb/archive/v0.5.5/WhatWeb-0.5.5.tar.gz"
+MD5SUM="bc2f2e427e390103121096cda4697849"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
 MAINTAINER="wigums"
-EMAIL="pioneer22675@gmail.com"
+EMAIL="wigums@protonmail.com"
diff --git a/network/WhatWeb/slack-desc b/network/WhatWeb/slack-desc
index c36fad238d..9bb9eb5a5a 100644
--- a/network/WhatWeb/slack-desc
+++ b/network/WhatWeb/slack-desc
@@ -8,12 +8,12 @@
        |-----handy-ruler------------------------------------------------------|
 WhatWeb: WhatWeb (Next generation web scanner)
 WhatWeb:
-WhatWeb: WhatWeb recognises web technologies including content management 
+WhatWeb: WhatWeb recognises web technologies including content management
 WhatWeb: systems (CMS), blogging platforms, statistic/analytics packages,
 WhatWeb: javascript ibraries, web servers, and embedded devices.
-WhatWeb: 
-WhatWeb: 
 WhatWeb:
-WhatWeb: 
-WhatWeb: 
+WhatWeb:
+WhatWeb:
+WhatWeb:
+WhatWeb:
 WhatWeb:
diff --git a/network/WireGuard/README b/network/WireGuard/README
deleted file mode 100644
index 9f532f1d7e..0000000000
--- a/network/WireGuard/README
+++ /dev/null
@@ -1,12 +0,0 @@
-WireGuard is a VPN that uses state-of-the-art cryptography. It is
-designed as a general purpose VPN for running on embedded interfaces
-and super computers alike, fit for many different circumstances.
-
-WireGuard is not yet complete. You should not rely on this code. It has
-not undergone proper degrees of security auditing and the protocol is
-still subject to change.
-
-Optional Dependency
-
-openresolv is an optional runtime dependency -- you need it if you want
-to use to use wg-quick's DNS option.
diff --git a/network/WireGuard/WireGuard.SlackBuild b/network/WireGuard/WireGuard.SlackBuild
deleted file mode 100644
index 9596371d13..0000000000
--- a/network/WireGuard/WireGuard.SlackBuild
+++ /dev/null
@@ -1,105 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for WireGuard
-
-# Copyright 2017 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=WireGuard
-VERSION=${VERSION:-0.0.20181119}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-KERNEL="${KERNEL:-"$(uname -r)"}"
-PKGVER="$(printf %s "${VERSION}_$KERNEL" | 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 $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 {} \;
-
-# We do this in doinst.sh
-sed -i -e '/depmod -a/d' src/Makefile
-
-# If you want this, you can have it :)
-SYSTEMD="${SYSTEMD:-no}"
-
-cd src
-  env -u ARCH CFLAGS="$SLKCFLAGS" make
-  env -u ARCH make install \
-    MANDIR=/usr/man \
-    DESTDIR=$PKG \
-    INSTALL_MOD_PATH=$PKG \
-    WITH_SYSTEMDUNITS="$SYSTEMD"
-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-$PKGVER
-cp -a COPYING README.md contrib/examples $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}
diff --git a/network/WireGuard/WireGuard.info b/network/WireGuard/WireGuard.info
deleted file mode 100644
index bc89830609..0000000000
--- a/network/WireGuard/WireGuard.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="WireGuard"
-VERSION="0.0.20181119"
-HOMEPAGE="https://www.wireguard.com/"
-DOWNLOAD="https://git.zx2c4.com/WireGuard/snapshot/WireGuard-0.0.20181119.tar.xz"
-MD5SUM="d1bafdc59a2bed867879b737c17b66b3"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="David Spencer"
-EMAIL="baildon.research@googlemail.com"
diff --git a/network/WireGuard/doinst.sh b/network/WireGuard/doinst.sh
deleted file mode 100644
index d335d682c8..0000000000
--- a/network/WireGuard/doinst.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-if [ -x sbin/depmod ]; then
-  chroot . /sbin/depmod -a @KERNEL@ 1> /dev/null 2> /dev/null
-fi
diff --git a/network/WireGuard/slack-desc b/network/WireGuard/slack-desc
deleted file mode 100644
index 1605ab22e1..0000000000
--- a/network/WireGuard/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------------------------------------------------------|
-WireGuard: WireGuard (fast, modern, secure VPN)
-WireGuard:
-WireGuard: WireGuard is a VPN that uses state-of-the-art cryptography. It is
-WireGuard: designed as a general purpose VPN for running on embedded interfaces
-WireGuard: and super computers alike, fit for many different circumstances.
-WireGuard:
-WireGuard: https://www.wireguard.com/
-WireGuard:
-WireGuard:
-WireGuard:
-WireGuard:
diff --git a/network/XD/README b/network/XD/README
new file mode 100644
index 0000000000..530e0c7d26
--- /dev/null
+++ b/network/XD/README
@@ -0,0 +1,13 @@
+XD - I2P BitTorrent Client written in GO
+
+Features:
+
+    - i2p only, no chances of cross network contamination,
+      aka no way to leak IP.
+    - works with i2pd and Java I2P using the SAM api
+    - Magnet URIs
+
+Build options:
+
+    - To enable Lokinet, pass "LOKINET=1" to the script.
+    - To disable the web-ui, pass "no-webui" to the script.
diff --git a/network/XD/XD.SlackBuild b/network/XD/XD.SlackBuild
new file mode 100644
index 0000000000..3b09eea3ad
--- /dev/null
+++ b/network/XD/XD.SlackBuild
@@ -0,0 +1,99 @@
+#!/bin/bash
+
+# Slackbuild for XD
+
+# Written by shelldweller <shelldweller@beauxbead.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=XD
+VERSION=${VERSION:-0.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 the variable PRINT_PACKAGE_NAME is set, then this script will report what
+# the name of the created package would be, and then exit. This information
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; 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 breaks the build on 4.x series, was not put here by the author.
+#export GO111MODULE="off"
+make install PREFIX=$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/usr/doc/$PRGNAM-$VERSION
+cp -a CODE_OF_CONDUCT.md LICENSE README.md docs/ \
+  $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 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
diff --git a/network/XD/XD.info b/network/XD/XD.info
new file mode 100644
index 0000000000..732fd7cda6
--- /dev/null
+++ b/network/XD/XD.info
@@ -0,0 +1,10 @@
+PRGNAM="XD"
+VERSION="0.4.2"
+HOMEPAGE="https://github.com/majestrate/XD"
+DOWNLOAD="https://github.com/majestrate/XD/archive/v0.4.2/XD-0.4.2.tar.gz"
+MD5SUM="9de5e84d190c2e6cbe7fd0972e0b4eb8"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="google-go-lang"
+MAINTAINER="shelldweller"
+EMAIL="shelldweller@beauxbead.com"
diff --git a/network/XD/slack-desc b/network/XD/slack-desc
new file mode 100644
index 0000000000..6e4eece61e
--- /dev/null
+++ b/network/XD/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+  |-----handy-ruler------------------------------------------------------|
+XD: XD (I2P BitTorrent Client written in GO)
+XD:
+XD: Features:
+XD:
+XD:    - i2p only, no chances of cross network contamination,
+XD:      aka no way to leak IP.
+XD:
+XD:    - works with i2pd and Java I2P using the SAM api
+XD:
+XD:    - Magnet URIs
+XD:
diff --git a/network/aMule/README b/network/aMule/README
index 86003b568a..d61fc97e92 100644
--- a/network/aMule/README
+++ b/network/aMule/README
@@ -1,11 +1,12 @@
-aMule is a multiplatform ed2k client, fork of the eMule client, using the
-wxWidgets class library. It was originally forked from the xMule project,
-which in turn was forked from the lMule project. This is turn was the
-first fork of eMule to run nativly on Linux and other Unix-like systems.
+aMule is a multiplatform ed2k client, fork of the eMule client, using
+the wxWidgets class library. It was originally forked from the xMule
+project, which in turn was forked from the lMule project. This is
+turn was the first fork of eMule to run nativly on Linux and other
+Unix-like systems.
 
-libupnp-legacy is a optional dependency.
+libupnp is a optional dependency.
 
-You can build optimal features of aMule with following variables;
+You can build optional features of aMule with following variables:
 
 DAEMON=yes Creates amuled
 CMD=yes Creates commandline client
diff --git a/network/aMule/aMule.SlackBuild b/network/aMule/aMule.SlackBuild
index c9a7b6a33b..b910674f18 100644
--- a/network/aMule/aMule.SlackBuild
+++ b/network/aMule/aMule.SlackBuild
@@ -1,13 +1,16 @@
-#!/bin/sh
+#!/bin/bash
 # Slackware build script for aMule
 # Written by Iskar Enev (<iskar.enev[@]gmail.com>)
 # Modified by the SlackBuilds.org project
 # Maintained by Ozan Türkyılmaz ozan.turkyilmaz@gmial.com
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=aMule
-VERSION=${VERSION:-r11003}
+VERSION=${VERSION:-2.3.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}
@@ -55,62 +65,62 @@ fi
 
 if [ "$CMD" = "yes" ]; then
   AMULE_CMD="enable"
-  else
+else
   AMULE_CMD="disable"
 fi
 
 if [ "$WEBSERVER" = "yes" ]; then
   AMULE_WEBSERVER="enable"
-  else
+else
   AMULE_WEBSERVER="disable"
 fi
 
 if [ "$ALC" = "yes" ]; then
   AMULE_ALC="enable"
-  else
+else
   AMULE_ALC="disable"
 fi
 
 if [ "$ALCC" = "yes" ]; then
   AMULE_ALCC="enable"
-  else
+else
   AMULE_ALCC="disable"
 fi
 
 if [ "$XAS" = "yes" ]; then
   AMULE_XAS="enable"
-  else
+else
   AMULE_XAS="disable"
 fi
 
 if  [ "$GEOIP" = "yes" ]; then
   AMULE_GEOIP="enable"
-  else
+else
   AMULE_GEOIP="disable"
 fi
 
 if [ "$MMAP" = "yes" ]; then
   AMULE_MMAP="enable"
-  else
+else
   AMULE_MMAP="disable"
 fi
 
 if [ "$OPTIMIZE" = "yes" ]; then
   AMULE_OPTIMIZE="enable"
-  else
+else
   AMULE_OPTIMIZE="disable"
 fi
 
 if [ "$PLASMAMULE" = "yes" ]; then
   AMULE_PLASMAMULE="enable"
-  else
+else
   AMULE_PLASMAMULE="disable"
 fi
 
 if [ "$GUI" = "yes" ]; then
-	AMULE_GUI="enable"
-	else
-	AMULE_GUI="disable"
+  AMULE_GUI="enable"
+else
+  AMULE_GUI="disable"
 fi
 
 
@@ -130,7 +140,7 @@ find -L . \
  -exec chmod 644 {} \;
 
 CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS -std=gnu++14" \
 ./configure \
   --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
@@ -140,6 +150,7 @@ CXXFLAGS="$SLKCFLAGS" \
   --docdir=/usr/doc/$PRGNAM-$VERSION \
   --with-wx-config=/usr/bin/wx-config \
   --disable-debug \
+  --with-boost \
   --$AMULE_GUI-amule-gui \
   --$AMULE_DAEMON-amule-daemon \
   --$AMULE_CMD-amulecmd \
@@ -169,4 +180,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/network/aMule/aMule.info b/network/aMule/aMule.info
index 4bdfb50f66..a1ffa7d06d 100644
--- a/network/aMule/aMule.info
+++ b/network/aMule/aMule.info
@@ -1,10 +1,10 @@
 PRGNAM="aMule"
-VERSION="r11003"
+VERSION="2.3.3"
 HOMEPAGE="http://www.amule.org"
-DOWNLOAD="http://ponce.cc/slackware/sources/repo/aMule-r11003.tar.xz"
-MD5SUM="83e46e574fc5355da4b531c369211a0a"
+DOWNLOAD="https://downloads.sf.net/amule/aMule-2.3.3.tar.xz"
+MD5SUM="2858a7f693c76c23f1786364d6a80900"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="cryptopp wxPython"
+REQUIRES="wxGTK3"
 MAINTAINER="Ozan Türkyılmaz"
 EMAIL="ozan.turkyilmaz@gmail.com"
diff --git a/network/acme.sh/README b/network/acme.sh/README
index 374de32be7..44518a476a 100644
--- a/network/acme.sh/README
+++ b/network/acme.sh/README
@@ -1,15 +1,24 @@
 An ACME Shell script
 
- - An ACME protocol client written purely in Shell (Unix shell) language.
+ - An ACME protocol client written purely in Shell (Unix shell)
+   language.
  - Full ACME protocol implementation.
  - Support ACME v1 and ACME v2
  - Support ACME v2 wildcard certs
- - Simple, powerful and very easy to use. You only need 3 minutes to learn it.
+ - Simple, powerful and very easy to use. You only need 3 minutes to
+   learn it.
  - Bash, dash and sh compatible.
  - Simplest shell script for Let's Encrypt free certificate client.
- - Purely written in Shell with no dependencies on python or the official Let's Encrypt client.
- - Just one script to issue, renew and install your certificates automatically.
+ - Purely written in Shell with no dependencies on python or the
+   official Let's Encrypt client.
+ - Just one script to issue, renew and install your certificates
+   automatically.
  - DOES NOT require root/sudoer access.
  - Docker friendly
  - IPv6 support
  - Cron job notifications for renewal or error etc.
+
+ Optional dependencies:
+
+* socat - to standalone mode
+
diff --git a/network/acme.sh/acme.sh.SlackBuild b/network/acme.sh/acme.sh.SlackBuild
index 92cec590d9..f209dd254c 100644
--- a/network/acme.sh/acme.sh.SlackBuild
+++ b/network/acme.sh/acme.sh.SlackBuild
@@ -2,7 +2,7 @@
 #
 # Slackware build script for acme.sh
 #
-# Copyright 2019 Corrado Franco (https://conraid.net)
+# Copyright 2019-2023 Corrado Franco (https://corradofranco.it)
 # All rights reserved.
 #
 # This program is free software: you can redistribute it and/or modify
@@ -25,28 +25,28 @@
 #
 # Latest version of this SlackBuild at https://github.com/conraid/SlackBuilds
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=acme.sh
-VERSION=${VERSION:-2.8.2}
+VERSION=${VERSION:-3.0.7}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
-
-DOCFILES="*.md"
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
+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.txz "
+if [ ! -z "${PRINT_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
@@ -64,8 +64,9 @@ find -L . \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 install -Dm755 acme.sh $PKG/usr/bin/acme.sh
-install -Dm755 deploy/*.sh -t $PKG/usr/share/$PRGNAM/deploy/
-install -Dm755 dnsapi/*.sh -t $PKG/usr/share/$PRGNAM/dnsapi/
+install -Dm755 deploy/*.sh -t $PKG/usr/share/$PRGNAM/deploy
+install -Dm755 dnsapi/*.sh -t $PKG/usr/share/$PRGNAM/dnsapi
+install -Dm755 notify/*.sh -t $PKG/usr/share/$PRGNAM/notify
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a *.md $PKG/usr/doc/$PRGNAM-$VERSION || true
@@ -75,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/network/acme.sh/acme.sh.info b/network/acme.sh/acme.sh.info
index a5c66cf618..b1faae45e1 100644
--- a/network/acme.sh/acme.sh.info
+++ b/network/acme.sh/acme.sh.info
@@ -1,8 +1,8 @@
 PRGNAM="acme.sh"
-VERSION="2.8.2"
+VERSION="3.0.7"
 HOMEPAGE="https://acme.sh/"
-DOWNLOAD="https://github.com/Neilpang/acme.sh/archive/2.8.2/acme.sh-2.8.2.tar.gz"
-MD5SUM="750a31f808cb507adf2d772f07ae596a"
+DOWNLOAD="https://github.com/Neilpang/acme.sh/archive/3.0.7/acme.sh-3.0.7.tar.gz"
+MD5SUM="1c2284a3f81f7eddc15e24a17d2e365c"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/network/addrwatch/README b/network/addrwatch/README
new file mode 100644
index 0000000000..e8375ae2e7
--- /dev/null
+++ b/network/addrwatch/README
@@ -0,0 +1,17 @@
+addrwatch (arp traffic montor)
+
+This is a tool similar to arpwatch. It main purpose is to monitor a
+network and log discovered ethernet/ip pairings.
+
+Main features of addrwatch:
+
+* IPv4 and IPv6 address monitoring
+* Monitoring multiple network interfaces with one daemon
+* Monitoring of VLAN tagged (802.1Q) packets.
+* Output to stdout, plain text file, syslog, sqlite3 db, MySQL db
+* IP address usage history preserving output/logging
+
+NOTE:
+
+There is a disparity between features listed in the manual and via
+--help.
diff --git a/network/addrwatch/addrwatch.SlackBuild b/network/addrwatch/addrwatch.SlackBuild
new file mode 100644
index 0000000000..773ab622cf
--- /dev/null
+++ b/network/addrwatch/addrwatch.SlackBuild
@@ -0,0 +1,99 @@
+#!/bin/bash
+
+# Slackware build script for addrwatch
+
+# By Dave Woodfall <dave@slackbuilds.org>
+# Licensed under the WTFPL (http://www.wtfpl.net)
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=addrwatch
+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 the variable PRINT_PACKAGE_NAME is set, then this script will report what
+# the name of the created package would be, and then exit. This information
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; 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 {} \;
+
+./bootstrap.sh
+
+./configure \
+  --prefix=/usr \
+  --bindir=/usr/sbin \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --mandir=/usr/man \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --enable-sqlite3 \
+  --enable-mysql   \
+  --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 *.md scripts $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+chmod -c -x $PKG/usr/doc/$PRGNAM-$VERSION/scripts/*
+
+mkdir -p $PKG/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/network/addrwatch/addrwatch.info b/network/addrwatch/addrwatch.info
new file mode 100644
index 0000000000..ae34ce3ad3
--- /dev/null
+++ b/network/addrwatch/addrwatch.info
@@ -0,0 +1,10 @@
+PRGNAM="addrwatch"
+VERSION="1.0.2"
+HOMEPAGE="https://github.com/fln/addrwatch"
+DOWNLOAD="https://github.com/fln/addrwatch/archive/v1.0.2/addrwatch-1.0.2.tar.gz"
+MD5SUM="ae0262fbf4ecc42ebc7d5cec6d0ad05d"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="D Woodfall"
+EMAIL="dave@slackbuilds.org"
diff --git a/network/addrwatch/slack-desc b/network/addrwatch/slack-desc
new file mode 100644
index 0000000000..3f48b186b1
--- /dev/null
+++ b/network/addrwatch/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+         |-----handy-ruler------------------------------------------------------|
+addrwatch: addrwatch (arp traffic montor)
+addrwatch:
+addrwatch: Main features of addrwatch:
+addrwatch:
+addrwatch: * IPv4 and IPv6 address monitoring
+addrwatch: * Monitoring multiple network interfaces with one daemon
+addrwatch: * Monitoring of VLAN tagged (802.1Q) packets.
+addrwatch: * Output to stdout, plain text file, syslog, sqlite3 db, MySQL db
+addrwatch: * IP address usage history preserving output/logging
+addrwatch:
+addrwatch: https://github.com/fln/addrwatch
diff --git a/network/aggregate/aggregate.SlackBuild b/network/aggregate/aggregate.SlackBuild
index 66c28cb322..f19c3f88e2 100644
--- a/network/aggregate/aggregate.SlackBuild
+++ b/network/aggregate/aggregate.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for aggregate
 
@@ -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=aggregate
 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}
@@ -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/network/aiccu/aiccu.SlackBuild b/network/aiccu/aiccu.SlackBuild
index 125a407244..59efa21992 100644
--- a/network/aiccu/aiccu.SlackBuild
+++ b/network/aiccu/aiccu.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for aiccu
 
@@ -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=aiccu
 VERSION=${VERSION:-20070115}
 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/network/aircrack-ng/aircrack-ng.SlackBuild b/network/aircrack-ng/aircrack-ng.SlackBuild
index 375650b2d9..ab690d470a 100644
--- a/network/aircrack-ng/aircrack-ng.SlackBuild
+++ b/network/aircrack-ng/aircrack-ng.SlackBuild
@@ -1,9 +1,9 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for aircrack-ng
 
 # Originally written by Yalla-One <yallaone@gmail.com>
-# Copyright 2018, 2019 Dominik Drobek <dominik.drobek (at) o2.pl>
+# Copyright 2018-2020 Dominik Drobek <dominik.drobek (at) o2.pl>
 # 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=aircrack-ng
-VERSION=${VERSION:-1.5.2}
+VERSION=${VERSION:-1.7}
 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}
@@ -79,7 +89,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" \
 ./autogen.sh \
   --prefix=/usr \
@@ -102,18 +112,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
 cp -a \
-  AUTHORS ChangeLog INSTALLING LICENSE* README VERSION \
+  AUTHORS ChangeLog INSTALLING LICENSE* README* SECURITY.md \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
-# experimental tools seem to ignore docdir option
-if [ "$AIRCRACK_EXPERIMENTAL" != "no" ]; then
-    mv $PKG/usr/share/doc/$PRGNAM/* $PKG/usr/doc/$PRGNAM-$VERSION
-    rm -r $PKG/usr/share
-fi
+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/network/aircrack-ng/aircrack-ng.info b/network/aircrack-ng/aircrack-ng.info
index 49a1280369..0d318507cc 100644
--- a/network/aircrack-ng/aircrack-ng.info
+++ b/network/aircrack-ng/aircrack-ng.info
@@ -1,8 +1,8 @@
 PRGNAM="aircrack-ng"
-VERSION="1.5.2"
+VERSION="1.7"
 HOMEPAGE="https://www.aircrack-ng.org"
-DOWNLOAD="https://download.aircrack-ng.org/aircrack-ng-1.5.2.tar.gz"
-MD5SUM="2648c192d206e953c67dca64967d2982"
+DOWNLOAD="https://download.aircrack-ng.org/aircrack-ng-1.7.tar.gz"
+MD5SUM="a918ea7146f91d8c799fb770c38f4bec"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/network/airpwn/README b/network/airpwn/README
deleted file mode 100644
index 613361cd54..0000000000
--- a/network/airpwn/README
+++ /dev/null
@@ -1,7 +0,0 @@
-Airpwn is a framework for 802.11 (wireless) packet injection.
-Airpwn listens to incoming wireless packets, and if the data
-matches a pattern specified in the config files, custom content
-is injected "spoofed" from the wireless access point. From the
-perspective of the wireless client, airpwn becomes the server.
-
-This package also installs lorcon (Loss Of Radio CONnectivity).
diff --git a/network/airpwn/airpwn.SlackBuild b/network/airpwn/airpwn.SlackBuild
deleted file mode 100644
index b09a5958d5..0000000000
--- a/network/airpwn/airpwn.SlackBuild
+++ /dev/null
@@ -1,132 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for airpwn
-# Written by Larry Hajali <larryhaja[at]gmail[dot]com>
-# and Klaatu <klaatu@member.fsf.no.psam.org>
-
-PRGNAM=airpwn
-VERSION=${VERSION:-1.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.tgz
-cd $PRGNAM-$VERSION
-tar xvf lorcon-current.tgz
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 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 {} \;
-
-# Remove unneeded directories and change a file to Unix
-find . -type d -name "CVS" | xargs rm -rf {} \;
-find . -type d -name ".cvs" | xargs rm -rf {} \;
-sed -i 's/\r//g' content/ftp_resp
-
-# first install lorcon
-cd lorcon
-  CFLAGS="$SLKCFLAGS" \
-  ./configure \
-    --prefix=/usr \
-    --libdir=/usr/lib${LIBDIRSUFFIX} \
-    --mandir=/usr/man \
-    --datadir=/usr/share/$PRGNAM \
-    --enable-static=no \
-    --build=$ARCH-slackware-linux
-
-  make
-  make install DESTDIR=$PKG
-cd ..
-
-sed -i 's/#include <unistd.h>/#include <unistd.h> #include <wep.h>/' keygen.c
-echo "sed change made"
-ls -lh keygen.c
-
-# Fix airpwn files so we can use Python versions other than 2.4
-PYTHON_VERSION1=$(python -c 'import sys; print sys.version[:3]')
-PYTHON_VERSION2=$(echo $PYTHON_VERSION1 | tr . _)
-
-for FILE in configure.ac conf.h config.h.in; do
-  sed -i "s|python2.4|python${PYTHON_VERSION1}|g" $FILE
-done
-sed -i "s|Python2.4|Python${PYTHON_VERSION1}|g" configure.ac
-sed -i "s|PYTHON2_4|PYTHON${PYTHON_VERSION2}|g" config.h.in
-
-autoreconf -vif
-
-CFLAGS="$SLKCFLAGS" \
-LDFLAGS="-L${PKG}/usr/lib${LIBDIRSUFFIX}" \
-CPPFLAGS="-I${PKG}/usr/include" \
-./configure \
-  --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --mandir=/usr/man \
-  --build=$ARCH-slackware-linux
-
-# fix what libs we link to
-sed -i 's/-lnet/-lnet -lssl -lexpat -lcrypto/' Makefile
-
-# build airpwn
-make
-make install DESTDIR=$PKG
-
-# Install some scripts to help get wireless devices into monitor mode.
-install -m 0755 mac80211_prep.sh $PKG/usr/sbin
-install -m 0755 madwifing_prep.sh $PKG/usr/sbin
-install -m 0755 madwifiold_prep.sh $PKG/usr/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
-
-( 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 \
-  COPYING LICENSE lorcon/{BUGS,README,THANKS,TODO} content conf pyscripts \
-  $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-chmod 0644 $PKG/usr/doc/$PRGNAM-$VERSION/*
-chmod 0755 $PKG/usr/doc/$PRGNAM-$VERSION/{content,conf,pyscripts}
-
-mkdir -p $PKG/install
-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/network/airpwn/airpwn.info b/network/airpwn/airpwn.info
deleted file mode 100644
index 7c8bf62072..0000000000
--- a/network/airpwn/airpwn.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="airpwn"
-VERSION="1.4"
-HOMEPAGE="http://airpwn.sourceforge.net/Airpwn.html"
-DOWNLOAD="http://downloads.sourceforge.net/sourceforge/airpwn/airpwn-1.4.tgz"
-MD5SUM="c5538f5eadc2afa0bf3e873c4bfa2513"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="libnet"
-MAINTAINER="Klaatu"
-EMAIL="klaatu@member.fsf.org"
diff --git a/network/airpwn/slack-desc b/network/airpwn/slack-desc
deleted file mode 100644
index 5e52edb57b..0000000000
--- a/network/airpwn/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------------------------------------------------------|
-airpwn: airpwn (framework for 802.11 packet injection)
-airpwn:
-airpwn: Airpwn is a framework for 802.11 (wireless) packet injection. Airpwn
-airpwn: listens to incoming wireless packets, and if the data matches a
-airpwn: pattern specified in the config files, custom content is injected
-airpwn: "spoofed" from the wireless access point. From the perspective of the
-airpwn: wireless client, airpwn becomes the server.
-airpwn:
-airpwn: Homepage: http://airpwn.sourceforge.net/Airpwn.html
-airpwn:
-airpwn:
diff --git a/network/aldryn-client/aldryn-client.SlackBuild b/network/aldryn-client/aldryn-client.SlackBuild
index c74cfd6146..c9c93237a7 100644
--- a/network/aldryn-client/aldryn-client.SlackBuild
+++ b/network/aldryn-client/aldryn-client.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for aldryn-client
 
@@ -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=aldryn-client
 VERSION=${VERSION:-2.3.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
+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 +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/network/aldryn-client/aldryn-client.info b/network/aldryn-client/aldryn-client.info
index b83629b541..df9b5b0d48 100644
--- a/network/aldryn-client/aldryn-client.info
+++ b/network/aldryn-client/aldryn-client.info
@@ -5,6 +5,6 @@ DOWNLOAD="https://pypi.python.org/packages/a6/1c/ae1e24d6b0c52856564ba982884ae60
 MD5SUM="23a80c5e1419df7e74d79653ac559654"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="click python-tabulate python-requests six"
+REQUIRES="click python2-tabulate"
 MAINTAINER="Dimitris Zlatanidis"
 EMAIL="d.zlatanidis@gmail.com"
diff --git a/network/amap/README b/network/amap/README
index 0d7a00630f..391e96af4a 100644
--- a/network/amap/README
+++ b/network/amap/README
@@ -1,4 +1,5 @@
-Amap is a next-generation scanning tool for pentesters. It attempts to identify
-applications even if they are running on a different port than normal.
-It also identifies non-ascii based applications. This is achieved by sending
-trigger packets, and looking up the responses in a list of response strings.
+Amap is a next-generation scanning tool for pentesters. It attempts
+to identify applications even if they are running on a different port
+than normal. It also identifies non-ascii based applications. This is
+achieved by sending trigger packets, and looking up the responses in a
+list of response strings.
diff --git a/network/amap/amap.SlackBuild b/network/amap/amap.SlackBuild
index 89746776f4..b410bd6c3c 100644
--- a/network/amap/amap.SlackBuild
+++ b/network/amap/amap.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for Amap (Application Mapper)
 #
@@ -23,10 +23,13 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=amap
 VERSION=${VERSION:-5.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}
@@ -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/network/amavisd-new/README b/network/amavisd-new/README
index 6c98d67f35..f18801363c 100644
--- a/network/amavisd-new/README
+++ b/network/amavisd-new/README
@@ -1,5 +1,6 @@
-amavisd-new is an interface between message transfer agent (MTA) and one
-or more content checkers: virus scanners, SpamAssassin and/or dkim signing.
+amavisd-new is an interface between message transfer agent (MTA) and
+one or more content checkers: virus scanners, SpamAssassin and/or dkim
+signing.
 
-Please refer to README.SBo for detailed instructions and dependencies before
-running the build script.
+Please refer to README.SBo for detailed instructions and dependencies
+before running the build script.
diff --git a/network/amavisd-new/README.SBo b/network/amavisd-new/README.SBo
index 92772086eb..89722506e6 100644
--- a/network/amavisd-new/README.SBo
+++ b/network/amavisd-new/README.SBo
@@ -15,7 +15,6 @@ perl-TimeDate
 perl-Net-libIDN
 Net-SSLeay
 perl-Socket6
-perl-IO-Socket-SSL
 perl-IO-Socket-INET6
 perl-Crypt-OpenSSL-Bignum
 perl-Crypt-OpenSSL-Random
diff --git a/network/amavisd-new/amavisd-new.SlackBuild b/network/amavisd-new/amavisd-new.SlackBuild
index b0d31f79dc..3da69eb769 100644
--- a/network/amavisd-new/amavisd-new.SlackBuild
+++ b/network/amavisd-new/amavisd-new.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware Package Build Script for amavisd-new
 # Home Page http://www.ijs.si/software/amavisd/
@@ -25,13 +25,23 @@
 # NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM="amavisd-new"
 VERSION=${VERSION:-2.11.1}
 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}
@@ -55,8 +65,8 @@ if ! grep -q ^amavis: /etc/passwd ; then
   exit 1
 fi
 
-USER=${USER:-amavis}
-GROUP=${GROUP:-amavis}
+AMAVIS_USER=${AMAVIS_USER:-amavis}
+AMAVIS_GROUP=${AMAVIS_GROUP:-amavis}
 
 AMAVIS_HOME=${AMAVIS_HOME:-/var/lib/amavis}
 QUARANTINE_DIR=${QUARANTINE_DIR:-$AMAVIS_HOME/quarantine}
@@ -83,8 +93,6 @@ done
 
 ### amavisd-new home directory
 mkdir -p $PKG/$AMAVIS_HOME/{tmp,var,db,home}
-### amavisd-new runtime directory
-mkdir -p $PKG/var/run/amavis
 
 ### make and populate quarantine directory with subdirectories
 ### this is only useful if you wish to spread out
@@ -104,15 +112,19 @@ install -m 0755 amavis-mc amavis-services amavisd-agent \
 install -m 0640 -D amavisd.conf $PKG/etc/amavisd.conf.new
 
 # change permissions
-chown $USER:$GROUP $PKG/etc/amavisd.conf.new
-chown -R $USER:$GROUP $PKG/$AMAVIS_HOME $PKG/var/run/amavis $PKG/$QUARANTINE_DIR
-chmod -R 0770 $PKG/$AMAVIS_HOME $PKG/var/run/amavis $PKG/$QUARANTINE_DIR
+chown $AMAVIS_USER:$AMAVIS_GROUP $PKG/etc/amavisd.conf.new
+chown -R $AMAVIS_USER:$AMAVIS_GROUP $PKG/$AMAVIS_HOME $PKG/$QUARANTINE_DIR
+chmod -R 0770 $PKG/$AMAVIS_HOME $PKG/$QUARANTINE_DIR
 
 cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 ### install rc script
 install -m 0755 -D $CWD/rc.amavisd-new $PKG/etc/rc.d/rc.amavisd-new.new
+sed -i \
+    -e "s,@AMAVIS_USER@,$AMAVIS_USER,g" \
+    -e "s,@AMAVIS_GROUP@,$AMAVIS_GROUP,g" \
+    $PKG/etc/rc.d/rc.amavisd-new.new
 
 ### install logrotate script
 install -D -m 0644 $CWD/amavisd-new.logrotate $PKG/etc/logrotate.d/amavisd-new.new
@@ -123,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/network/amavisd-new/rc.amavisd-new b/network/amavisd-new/rc.amavisd-new
index f7b7c37adc..24b6610c8f 100644
--- a/network/amavisd-new/rc.amavisd-new
+++ b/network/amavisd-new/rc.amavisd-new
@@ -22,6 +22,8 @@
 
 MC_PID=/var/run/amavis/amavis-mc.pid
 PID=/var/run/amavis/amavisd.pid
+AMAVIS_USER=@AMAVIS_USER@
+AMAVIS_GROUP=@AMAVIS_GROUP@
 
 amavisd_signer_start() {
 	# start amavisd-signer
@@ -46,6 +48,9 @@ amavis_mc_start() {
 	    /usr/sbin/amavis-mc -P $MC_PID
 	else
 	    printf "Starting amavis-mc daemon\n"
+	    mkdir -p $(dirname $MC_PID)
+	    chown $AMAVIS_USER:$AMAVIS_GROUP $(dirname $MC_PID)
+	    chmod 0770 $(dirname $MC_PID)
 	    /usr/sbin/amavis-mc -P $MC_PID
 	fi
 }
@@ -70,6 +75,9 @@ amavisd_start() {
 	    /usr/sbin/amavisd start
 	else
 	    printf "Starting amavisd-new daemon\n"
+	    mkdir -p $(dirname $PID)
+	    chown $AMAVIS_USER:$AMAVIS_GROUP $(dirname $PID)
+	    chmod 0770 $(dirname $PID)
 	    /usr/sbin/amavisd start
 	fi
 }
diff --git a/network/amfora-bin/README b/network/amfora-bin/README
new file mode 100644
index 0000000000..d6c1ff3435
--- /dev/null
+++ b/network/amfora-bin/README
@@ -0,0 +1,21 @@
+amfora-bin (gemini client)
+
+Amfora aims to be the best looking Gemini client with the most
+features... all in the terminal. It does not support Gopher or other
+non-Web protocols. It fully passes Sean Conman's client torture test,
+as well as the Egsam one.
+
+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://github.com/makew0rld/amfora/releases/download/v1.9.2/amfora_1.9.2_linux_arm64
+
+...and its md5sum is: 5f647762170e9e30df6d0744ec8a21bc
+
+Note: currently there is no amfora build that compiles from source.
+If someday someone submits one, be aware that it will likely conflict
+with this build.
diff --git a/network/amfora-bin/amfora-bin.SlackBuild b/network/amfora-bin/amfora-bin.SlackBuild
new file mode 100644
index 0000000000..f285baf99b
--- /dev/null
+++ b/network/amfora-bin/amfora-bin.SlackBuild
@@ -0,0 +1,79 @@
+#!/bin/bash
+
+# Slackware build script for amfora-bin
+
+# 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=amfora-bin
+SRCNAM=amfora
+VERSION=${VERSION:-1.9.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}
+
+EXE=""
+case "$ARCH" in
+  i?86)    EXE=${SRCNAM}_${VERSION}_linux_32-bit ;;
+  x86_64)  EXE=${SRCNAM}_${VERSION}_linux_64-bit ;;
+  aarch64) EXE=${SRCNAM}_${VERSION}_linux_arm64 ;;
+esac
+
+if [ "$EXE" = "" ]; then
+  cat <<EOF
+===================================================
+Sorry, ARCH="$ARCH" is not supported.
+Only i586, i686, x86_64, and aarch64 are supported.
+===================================================
+EOF
+  exit 1
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $PKG
+install -D -m0755 -oroot -groot $CWD/$EXE usr/bin/$SRCNAM
+
+# the binary includes no docs, icon, desktop, anything else. so
+# they're included with the SlackBuild (taken from the git repo at
+# https://github.com/makew0rld/amfora). amfora.png is a scaled-down
+# copy of logo.png.
+
+install -D -m0644 -oroot -groot \
+  $CWD/amfora.desktop usr/share/applications/amfora.desktop
+install -D -m0644 -oroot -groot \
+  $CWD/amfora.png usr/share/icons/hicolor/64x64/apps/amfora.png
+
+PKGDOC=$PKG/usr/doc/$PRGNAM-$VERSION
+mkdir -p $PKGDOC
+install -m0644 -oroot -groot $CWD/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
diff --git a/network/amfora-bin/amfora-bin.info b/network/amfora-bin/amfora-bin.info
new file mode 100644
index 0000000000..43fffb5b69
--- /dev/null
+++ b/network/amfora-bin/amfora-bin.info
@@ -0,0 +1,10 @@
+PRGNAM="amfora-bin"
+VERSION="1.9.2"
+HOMEPAGE="https://github.com/makew0rld/amfora/"
+DOWNLOAD="https://github.com/makew0rld/amfora/releases/download/v1.9.2/amfora_1.9.2_linux_32-bit"
+MD5SUM="206e195bde0fbc2990d8be2c476bfa98"
+DOWNLOAD_x86_64="https://github.com/makew0rld/amfora/releases/download/v1.9.2/amfora_1.9.2_linux_64-bit"
+MD5SUM_x86_64="cc8d0f9a519602c9c8a1b96a7f02bec1"
+REQUIRES=""
+MAINTAINER="B. Watson"
+EMAIL="urchlay@slackware.uk"
diff --git a/network/amfora-bin/amfora.desktop b/network/amfora-bin/amfora.desktop
new file mode 100644
index 0000000000..ba086ea5d0
--- /dev/null
+++ b/network/amfora-bin/amfora.desktop
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Type=Application
+Name=Amfora
+GenericName=Gemini TUI Browser
+Comment=Browse Gemini in the terminal.
+Categories=Network;WebBrowser;ConsoleOnly;
+Keywords=gemini
+Terminal=true
+Exec=amfora %u
+MimeType=x-scheme-handler/gemini;
+Icon=amfora
diff --git a/network/amfora-bin/amfora.png b/network/amfora-bin/amfora.png
new file mode 100644
index 0000000000..099024ee36
--- /dev/null
+++ b/network/amfora-bin/amfora.png
diff --git a/network/amfora-bin/docs/CHANGELOG.md b/network/amfora-bin/docs/CHANGELOG.md
new file mode 100644
index 0000000000..6381acd535
--- /dev/null
+++ b/network/amfora-bin/docs/CHANGELOG.md
@@ -0,0 +1,332 @@
+# Changelog
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
+and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
+## [Unreleased]
+### Added
+- Syntax highlighting for preformatted text blocks with alt text (#252, #263, [wiki page](https://github.com/makeworld-the-better-one/amfora/wiki/Source-Code-Highlighting))
+- [Client certificates](https://github.com/makeworld-the-better-one/amfora/wiki/Client-Certificates) can be restricted to certain paths of a host (#115)
+- `header` config option in `[subscriptions]` to allow disabling the header text on the subscriptions page (#191)
+- Selected link and scroll position stays for non-cached pages (#122)
+- Keybinding to open URL with URL handler instead of configured proxy (#143)
+- `include` theme key to import themes from an external file (#154, #290)
+- Support SOCKS5 proxying by setting `AMFORA_SOCKS5` environment variable (#155)
+- When bookmarking a page, the first level one heading is suggested as the name (#267, #293)
+- Confirmation prompts for URL schemes in new `[url-prompts]` config section (#301, #302)
+
+### Changed
+- Center text automatically, removing `left_margin` from the config (#233)
+- `max_width` defaults to 80 columns instead of 100 (#233)
+- Tabs have the domain of the current page instead of numbers (#202)
+- Closing Amfora with <kbd>q</kbd> was removed in favor of <kbd>Shift-q</kbd> (#243)
+- Paging up or down scrolls by 50% instead of 75%, to match `less` (#303)
+- Update deps, require Go 1.17 (#336)
+- Show local directory index file if available (#319)
+- Updated Project Gemini URLs (#342)
+
+### Fixed
+- Modal can't be closed when opening non-gemini text URLs from the commandline (#283, #284)
+- External programs started by Amfora remain as zombie processes (#219)
+- Prevent link lines (and other types) from being wider than the `max_width` setting (#280)
+- `new:7` on new tab page fails to open link (#306)
+- Slashes aren't decoded in redirect URLs (#322, #324)
+- Typing `localhost` in the bottom bar actually loads localhost instead of searching (#326, #327)
+
+
+## [1.9.2] - 2021-12-10
+### Fixed
+- Preformatted text color showing even when `color = false` (bug since v1.8.0 at least) (#278)
+- Link numbers and link text in color even when `color = false` (regression in v1.9.0) (#278)
+
+
+## [1.9.1] - 2021-12-08
+### Fixed
+- Deadlock when loading an invalid `about:` URL (#277)
+- Crash when rendering text from stdin
+
+
+## [1.9.0] - 2021-12-07
+### Added
+- Support for version 1.1 JSON feeds
+- Copy current URL or selected URL to clipboard (#220, #225)
+  - Uses <kbd>C</kbd> and <kbd>c</kbd> by default
+- Configurable keybindings for scrolling on pages (#211, #222)
+- Ability to save `about:` pages (#210, #236)
+- `bind_beginning` and `bind_end` keybindings
+- Display gemtext from stdin (#205, #242)
+- Specifying `default` in the theme config uses the terminal's default background color, including transparency (#244, #245)
+- Redirects occur automatically if it only adds a trailing slash (#271)
+- Non-gemini links are underlined by default to help color blind users (#189)
+- Text and element colors of default theme change to be black on terminals with light backgrounds (#181)
+- Support paths with spaces in `[url-handlers]` config settings (#214)
+- Display info modal when opening URL with custom application
+- Files can be opened by relative path on the commandline (#231, #257)
+- Support keybindings that use <kbd>Shift</kbd> (#269)
+
+### Changed
+- Bookmarks are stored using XML in the XBEL format, old bookmarks are transferred (#68)
+- Text no longer disappears under the left margin when scrolling (regression in v1.8.0) (#197)
+- Default search engine changed to geminispace.info from gus.guru
+- The user's terminal theme colors are used by default (#181)
+- By default, non-gemini URI schemes are opened in the default application. This requires a config change for previous users, see the [wiki](https://github.com/makeworld-the-better-one/amfora/wiki/Handling-Other-URL-Schemes) (#207)
+- Windows uses paths set by `XDG` variables over `APPDATA` if they are set (#255)
+- Treat status codes like 22 as equivalent to 20 as per the latest spec (#266)
+- Show minimal loading page instead of `about:newtab`  when loading a URL in a new tab (#272)
+
+## Removed
+- Favicon support (#199)
+- The default Amfora theme, get it back [here](https://github.com/makeworld-the-better-one/amfora/blob/master/contrib/themes/amfora.toml) (#181)
+
+### Fixed
+- Help text is now the same color as `regular_text` in the theme config
+- Non-ASCII (multibyte) characters can now be used as keybindings (#198, #200)
+- Possible subscription update race condition on startup
+- Plaintext documents are escaped properly (regression in v1.8.0)
+- Help page scrollbar color matches what's in the theme config
+- Regression where lists would not appear if `bullets = false` (#234, #235)
+- Support multiple bookmarks with the same name
+- Cert change message grammar: "an security" -> "a security" (#274)
+- Display an error modal for status codes that can't be handled
+- Prevent user from getting trapped in the help menu when keybindings are pressed (#241, #261)
+
+
+## [1.8.0] - 2021-02-17
+### Added
+- **Media type handlers** - open non-text files in another application (#121, #134)
+- Ability to set custom keybindings in config (#135)
+- Added scrollbar, by default only appears on pages that go off-screen (#89, #107)
+- More internal about pages, see `about:about` (#160, #187)
+
+### Changed
+- Update cview to `d776e728ef6d2a9990a5cd86a70b31f0678613e2` for large performance and feature updates (#107)
+- Update to tcell v2 (dependency of cview)
+- Display page even if mediatype params are malformed (#141)
+- Sensitive input fields (status code 11) display with asterisks over the text (#106)
+
+### Fixed
+- Don't use cache when URL is typed in bottom bar (#159)
+- Fix downloading of pages that are too large or timed out
+- `about:` URLs can be typed into the bottom bar (#167)
+- Bookmarks modal closes on ESC like the others (#173)
+- Handle empty META string (#176)
+- Whitespace around the URL entered in the bottom bar is stripped (#184)
+- Don't break visiting IPv6 hosts when port 1965 is specified (#195)
+- More reliable start, no more flash of unindented text, or text that stays unindented (#107)
+- Pages with ANSI resets don't use the terminal's default text and background colors (#107)
+- ANSI documents don't leak color into the left margin (#107)
+- Rendering very long documents is now ~96% faster, excluding gemtext parsing (#26, #107)
+- Due to that same change, less memory is used per-page (#26, #107)
+
+
+## [1.7.2] - 2020-12-21
+### Fixed
+- Viewing subscriptions after subscribing to a certain user page won't crash Amfora (#157)
+
+
+## [1.7.1] - 2020-12-21
+### Fixed
+- Fixed bug that caused Amfora to crash when subscribing to a page (#151)
+
+
+## [1.7.0] - 2020-12-20
+### Added
+- **Subscriptions** to feeds and page changes (#61)
+- Opening local files with `file://` URIs (#103, #117)
+- `show_link` option added in config to optionally see the URL (#133)
+- Support for Unicode in domain names (IDNs)
+- Unnecessarily encoded characters in URLs will be decoded (#138)
+- URLs are NFC-normalized before any processing (#138)
+- Links to the wiki in the new tab
+- Cache times out after 30 minutes by default (#110)
+- `about:version` page (#126)
+
+### Changed
+- Updated [go-gemini](https://github.com/makeworld-the-better-one/go-gemini) to v0.11.0
+  - Supports CN-only wildcard certs
+  - Time out when header takes too long
+- Preformatted text is now light yellow by default
+- Downloading a file no longer uses a second request
+- You can go back to the new tab page in history (#96)
+
+### Fixed
+- Single quotes are used in the default config for commands and paths so that Windows paths with backslashes will be parsed correctly
+- Downloading now uses proxies when appropriate
+- User-entered URLs with invalid characters will be percent-encoded (#138)
+- Custom downloads dir is actually used (#148)
+- Empty quote lines no longer disappear
+
+
+## [1.6.0] - 2020-11-04
+### Added
+- **Support client certificates** through config (#112)
+- `ansi` config setting, to disable ANSI colors in pages (#79, #86)
+- Edit current URL with <kbd>e</kbd> (#87)
+- If `emoji_favicons` is enabled, new bookmarks will have the domain's favicon prepended (#69, #90)
+- The `BROWSER` env var is now also checked when opening web links on Unix (#93)
+- More accurate error messages based on server response code
+
+### Changed
+- Disabling the `color` config setting also disables ANSI colors in pages (#79, #86)
+- Updated [go-isemoji](https://github.com/makeworld-the-better-one/go-isemoji) to v1.1.0 to support Emoji 13.1 for favicons
+- The web browser code doesn't check for Xorg anymore, just display variables (#93)
+- Bookmarks can be made to non-gemini URLs (#94)
+- Remove pointless directory fallbacks (#101)
+- Don't load page from cache when redirected to it (#114)
+
+### Fixed
+- XDG user dir file is parsed instead of looking for XDG env vars (#97, #100)
+- Support paths with spaces in HTTP browser config setting (#77)
+- Clicking "Change" on an existing bookmark without changing the text no longer removes it (#91)
+- Display HTTP Error if "Open In Portal" fails (#81)
+- Support ANSI color codes again, but only in preformatted blocks (#59)
+- Make the `..` command work lke it used to in v1.4.0
+
+
+## [1.5.0] - 2020-09-01
+### Added
+- **Proxy support** - see the `[proxies]` section in the config (#66, #80)
+- **Emoji favicons** can now be seen if `emoji_favicons` is enabled in the config (#62)
+- `shift_numbers` key in the config was added, so that non US keyboard users can navigate tabs (#64)
+- <kbd>F1</kbd> and <kbd>F2</kbd> keys for navigating to the previous and next tabs (#64)
+- Resolving any relative path (starts with a `.`) in the bottom bar is supported, not just `..` (#71)
+- You can now set external programs in the config to open other schemes, like `gopher://` or `magnet:` (#74)
+- Auto-redirecting can be enabled - redirect within Gemini up to 5 times automatically (#75) 
+- Help page now documents paging keys (#78)
+- The new tab page can be customized by creating a gemtext file called `newtab.gmi` in the config directory (#67, #83)
+
+### Changed
+- Update to [go-gemini](https://github.com/makeworld-the-better-one/go-gemini) v0.8.4
+
+### Fixed
+- Two digit (and higher) link texts are now in line with one digit ones (#60)
+- Race condition when reloading pages that could have caused the cache to still be used
+- Prevent panic (crash) when the server sends an error with an empty meta string (#73)
+- URLs with with colon-only schemes (like `mailto:`) are properly recognized
+- You can no longer navigate through the history when the help page is open (#55, #78)
+
+
+## [1.4.0] - 2020-07-28
+### Added
+- **Theming** - check out [default-config.toml](./default-config.toml) for details (#46)
+- <kbd>Tab</kbd> now also enters link selecting mode, like <kbd>Enter</kbd> (#48)
+- Number keys can be pressed to navigate to links 1 through 10 (#47)
+- Permanent redirects are cached for the session (#22)
+- `.ansi` is also supported for `text/x-ansi` files, as well as the already supported `.ans`
+
+### Changed
+- Documented <kbd>Ctrl-C</kbd> as "Hard quit"
+- Updated [cview](https://gitlab.com/tslocum/cview/) to latest commit: `cc7796c4ca44e3908f80d93e92e73694562d936a`
+- The bottom bar label now uses the same color as the tabs at the top
+- Tab and blue link colors were changed very slightly to be part of the 256 Xterm colors, for better terminal support
+
+### Fixed
+- You can't change link selection while the page is loading
+- Only one request is made for each URL - `v1.3.0` accidentally made two requests each time (#50)
+- Using the `..` command doesn't keep the query string (#49)
+- Any error that occurs when downloading a file will be displayed, and the partially downloaded file will be deleted
+- Allow for opening a new tab while the current one is loading
+- Pressing Escape after typing in the bottom bar no longer jumps you back to the top of the page
+- Repeated redirects where the last one is cancelled by the user doesn't leave the `Loading...` text in the bottom bar (#53)
+
+
+## [1.3.0] - 2020-07-10
+### Added
+- **Downloading content** (#38)
+- Configurable page size limit - `page_max_size` in config (#30)
+- Configurable page timeout - `page_max_time` in config
+- Link and heading lines are wrapped just like regular text lines
+- Wrapped list items are indented to stay behind the bullet (#35)
+- Certificate expiry date is stored when the cert IDs match (#39)
+- What link was selected is remembered as you browse through history
+- Render ANSI codes in `text/x-ansi` pages, or text pages that end with `.ans` (#45)
+
+### Changed
+- Pages are rewrapped dynamically, whenever the terminal size changes (#33)
+- TOFU warning message mentions how long the previous cert was still valid for (#34)
+
+### Fixed
+- Many potential network and display race conditions eliminated
+- Whether a tab is loading stays indicated when you switch away from it and go back
+- Plain text documents are displayed faithfully (there were some edge conditions)
+- Opening files in portal.mozz.us uses the `http` setting in the config (#42)
+
+
+## [1.2.0] - 2020-07-02
+### Added
+- Alt-Left and Alt-Right for history navigation (#23)
+- You can type `..` in the bottom bar to go up a directory in the URL (#21)
+- Error popup for when input string would result in a too long out-of-spec URL (#25)
+- Paging, using <kbd>d</kbd> and <kbd>u</kbd>, as well as <kbd>Page Up</kbd> and <kbd>Page Down</kbd> (#19)
+- <kbd>Esc</kbd> can exit link highlighting mode (#24)
+- Selected link URL is displayed in the bottom bar (#24)
+- Pressing <kbd>Ctrl-T</kbd> with a link selected opens it in a new tab (#27)
+- Writing `new:N` in the bottom bar will open link number N in a new tab (#27)
+- Quote lines are now in italics (#28)
+
+### Changed
+- Bottom bar now says `URL/Num./Search: ` when space is pressed
+- Update to [go-gemini](https://github.com/makeworld-the-better-one/go-gemini) v0.6.0
+- Help layout doesn't have borders anymore
+- Pages with query strings are still cached (#29)
+- URLs or searches typed in the bottom bar are not loaded from the cache (#29)
+
+### Fixed
+- Actual unicode bullet symbol is used for lists: U+2022
+- Performance when loading very long cached pages improved (#26)
+- Doesn't crash when wrapping certain complex lines (#20)
+- Input fields are always in focus when they appear (#5)
+- Reloading the new tab page doesn't cause an error popup
+- Help table cells are hardwrapped so the text can still be read entirely on an 80-column terminal
+- New tab text is wrapped to terminal width like other pages (#31)
+- TOFU "continue anyway" popup has a question mark at the end
+
+
+## [1.1.0] - 2020-06-24
+### Added
+- **Bookmarks** (#10)
+- **Support over 55 charsets** (#3)
+- **Search using the bottom bar**
+- Add titles to all modals
+- Store ports in TOFU database (#7)
+- Search from bottom bar
+- Wrapping based on terminal width (#1)
+- `left_margin` config option (#1)
+- Right margin for text (#1)
+- Desktop entry file
+- Option to continue anyway when cert doesn't match TOFU database
+- Display all `text/*` documents, not just gemini and plain (#12)
+- Prefer XDG environment variables if they're set, to specify config dir, etc (#11)
+- Version and help commands - `-v`, `--version`, `--help`, `-h` (#14)
+
+### Changed
+- Connection timeout is 15 seconds (was 5s)
+- Hash `SubjectPublicKeyInfo` for TOFU instead (#7)
+- `wrap_width` config option became `max_width` (#1)
+- Make the help table look better
+
+### Removed
+- Opening multiple URLs from the command line
+
+### Fixed
+- Reset bottom bar on error / invalid URL
+- Side scrolling doesn't cut off text on the left side (#1)
+- Mark status code 21 as invalid
+- Bottom bar is not in focus after clicking Enter
+- Badly formed links on pages can no longer crash the browser
+- Disabling color in config affects UI elements (#16)
+- Keep bold for headings even with color disabled
+- Don't make whole link text bold when color is disabled
+- Get domain from URL for TOFU, not from certificate
+
+
+## [1.0.0] - 2020-06-18
+Initial release.
+
+### Added
+- Tabbed browsing
+- TOFU
+- Styled content
+- Basic history for each tab
+- Input
diff --git a/network/amfora-bin/docs/LICENSE b/network/amfora-bin/docs/LICENSE
new file mode 100644
index 0000000000..f288702d2f
--- /dev/null
+++ b/network/amfora-bin/docs/LICENSE
@@ -0,0 +1,674 @@
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <https://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 <https://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
+<https://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
+<https://www.gnu.org/licenses/why-not-lgpl.html>.
diff --git a/network/amfora-bin/docs/NOTES.md b/network/amfora-bin/docs/NOTES.md
new file mode 100644
index 0000000000..d321e3f55a
--- /dev/null
+++ b/network/amfora-bin/docs/NOTES.md
@@ -0,0 +1,15 @@
+# Notes
+
+## Issues
+- URL for each tab should not be stored as a string - in the current code there's lots of reparsing the URL
+
+## Upstream Bugs
+- Bookmark keys aren't deleted, just set to `""`
+  - Waiting on [this viper PR](https://github.com/spf13/viper/pull/519) to be merged
+- [ANSI conversion is messed up](https://code.rocketnine.space/tslocum/cview/issues/48)
+- [WordWrap is broken in some cases](https://code.rocketnine.space/tslocum/cview/issues/27) - close #156 if this is fixed
+- [Prevent panic when reformatting](https://code.rocketnine.space/tslocum/cview/issues/50) - can't reliably reproduce or debug
+- [Unicode bullet symbol mask causes issues with PasswordInput](https://code.rocketnine.space/tslocum/cview/issues/55)
+
+
+## Upstream PRs
diff --git a/network/amfora-bin/docs/README.md b/network/amfora-bin/docs/README.md
new file mode 100644
index 0000000000..4a73792c99
--- /dev/null
+++ b/network/amfora-bin/docs/README.md
@@ -0,0 +1,175 @@
+# Amfora
+
+<img src="logo.png" alt="amphora logo" width="30%">
+<h6>Image modified from: amphora by Alvaro Cabrera from the Noun Project</h6>
+
+
+[![go reportcard](https://goreportcard.com/badge/github.com/makeworld-the-better-one/amfora)](https://goreportcard.com/report/github.com/makeworld-the-better-one/amfora)
+[![license GPLv3](https://img.shields.io/github/license/makeworld-the-better-one/amfora)](https://www.gnu.org/licenses/gpl-3.0.en.html)
+
+<a href="https://raw.githubusercontent.com/makeworld-the-better-one/amfora/master/demo-large.gif">
+<img src="demo-large.gif" alt="Demo GIF" width="80%">
+</a>
+
+###### Recording of v1.0.0
+
+Amfora aims to be the best looking [Gemini](https://geminiquickst.art/) client with the most features... all in the terminal. It does not support Gopher or other non-Web protocols - check out [Bombadillo](http://bombadillo.colorfield.space/) for that.
+
+It also aims to be completely cross platform, with full Windows support. If you're on Windows, I would not recommend using the default terminal software. Use [Windows Terminal](https://www.microsoft.com/en-us/p/windows-terminal/9n0dx20hk701) instead, and make sure it [works with UTF-8](https://akr.am/blog/posts/using-utf-8-in-the-windows-terminal). Note that some of the application colors might not display correctly on Windows, but all functionality will still work.
+
+It fully passes Sean Conman's client torture test, as well as the Egsam one.
+
+## Project Status
+
+Amfora is in maintenance mode. When possible, I’ll make/merge bug fixes, and maybe slowly merge feature PRs by others. See my [blog post](https://www.makeworld.space/2023/08/bye_gemini.html) for details.
+
+## Installation
+
+### Binary
+
+Download a binary from the [releases](https://github.com/makeworld-the-better-one/amfora/releases) page. On Unix-based systems you will have to make the file executable with `chmod +x <filename>`. You can rename the file to just `amfora` for easy access, and move it to `/usr/local/bin/`.
+
+On Windows, make sure you click "Advanced > Run anyway" after double-clicking, or something like that.
+
+Unix systems can install the desktop entry file to get Amfora to appear when they search for applications:
+```bash
+curl -sSL https://raw.githubusercontent.com/makeworld-the-better-one/amfora/master/amfora.desktop -o ~/.local/share/applications/amfora.desktop
+update-desktop-database ~/.local/share/applications
+```
+
+Make sure to click "Watch" in the top right, then "Custom" > "Releases" to get notified about new releases!
+
+
+### Linux
+
+<a href="https://repology.org/project/amfora/versions">
+    <img src="https://repology.org/badge/vertical-allrepos/amfora.svg" alt="Packaging status" align="right">
+</a>
+
+Amfora is packaged in many Linux distros. It's also on [Scoop](https://scoop.sh/) for Windows users.
+
+### macOS (Homebrew)
+
+If you use [Homebrew](https://brew.sh/), you can install Amfora with:
+```
+brew install amfora
+```
+You can update it with:
+```
+brew upgrade amfora
+```
+
+### macOS (MacPorts)
+
+On macOS, Amfora can also be installed through [MacPorts](https://www.macports.org):
+```
+sudo port install amfora
+```
+You can update it with:
+```
+sudo port selfupdate
+sudo port upgrade amfora
+```
+**NOTE:** this installation source is community-maintained. More information [here](https://ports.macports.org/port/amfora/).
+
+### Termux
+
+If you're using [Termux](https://termux.com/) on Android you can't just run Amfora like normal. After installing Amfora, run `pkg install proot`. Then run `termux-chroot` before running the Amfora binary. You can exit out of the chroot after closing Amfora. See [here](https://stackoverflow.com/q/38959067/7361270) for why this is needed.
+
+### From Source
+
+This section is for advanced users who want to install the latest (possibly unstable) version of Amfora.
+
+<details>
+<summary>Click to expand</summary>
+
+**Requirements:**
+- Go 1.15 or later
+- GNU Make
+
+Please note the Makefile does not intend to support Windows, and so there may be issues.
+
+```shell
+git clone https://github.com/makeworld-the-better-one/amfora
+cd amfora
+# git checkout v1.2.3 # Optionally pin to a specific version instead of the latest commit
+make # Might be gmake on macOS
+sudo make install # If you want to install the binary for all users
+```
+
+Because you installed with the Makefile, running `amfora -v` will tell you exactly what commit the binary was built from.
+
+Arch Linux users can also install the latest commit of Amfora from the AUR. It has the package name `amfora-git`, and is maintained by @lovetocode999
+
+```
+yay -S amfora-git
+```
+
+MacOS users can also use [Homebrew](https://brew.sh/) to install the latest commit of Amfora:
+
+```
+brew install --HEAD amfora
+```
+You can update it with:
+```
+brew upgrade --fetch-HEAD amfora
+```
+
+</details>
+
+
+## Features / Roadmap
+Features in *italics* are in the master branch, but not in the latest release.
+
+- [x] URL browsing with TOFU and error handling
+- [x] Tabbed browsing
+- [x] Support ANSI color codes on pages, even for Windows
+- [x] Styled page content (headings, links)
+- [x] Basic forward/backward history, for each tab
+- [x] Input (Status Code 10 & 11)
+- [x] Multiple charset support (over 55)
+- [x] Built-in search (uses geminispace.info by default)
+- [x] Bookmarks
+- [x] Download pages and arbitrary data
+- [x] Theming
+  - Check out the [user contributed themes](https://github.com/makeworld-the-better-one/amfora/tree/master/contrib/themes)!
+- [x] Proxying
+  - Schemes like Gopher or HTTP can be proxied through a Gemini server
+- [x] Client certificate support
+  - [ ] Full client certificate UX within the client
+    - Create transient and permanent certs within the client, per domain
+    - Manage and browse them
+    - Similar to [Kristall](https://github.com/MasterQ32/kristall)
+    - https://lists.orbitalfox.eu/archives/gemini/2020/001400.html
+- [x] Subscriptions
+  - Subscribing to RSS, Atom, and [JSON Feeds](https://jsonfeed.org/) are all supported
+  - So is subscribing to a page, to know when it changes
+- [x] Open non-text files in another application
+  - [x] Ability to stream content instead of downloading it first
+- [x] *Highlighting of preformatted code blocks that list a language in the alt text*
+- [ ] Stream support
+- [ ] Table of contents for pages
+- [ ] Search in pages with <kbd>Ctrl-F</kbd>
+- [ ] Persistent history
+
+
+## Usage & Configuration
+Please see [the wiki](https://github.com/makeworld-the-better-one/amfora/wiki) for an introduction on how to use Amfora and configure it.
+
+## Libraries
+Amfora ❤️ open source!
+
+- [cview](https://code.rocketnine.space/tslocum/cview) for the TUI
+  - It's a fork of [tview](https://github.com/rivo/tview) with PRs merged and active support
+  - It uses [tcell](https://github.com/gdamore/tcell) for low level terminal operations
+- [Viper](https://github.com/spf13/viper) for configuration and TOFU storing
+- [go-gemini](https://github.com/makeworld-the-better-one/go-gemini), my forked and updated Gemini client/server library
+- [progressbar](https://github.com/schollz/progressbar)
+- [go-humanize](https://github.com/dustin/go-humanize)
+- [gofeed](https://github.com/mmcdole/gofeed)
+- [chroma](https://github.com/alecthomas/chroma) for source code syntax highlighting
+- [clipboard](https://github.com/atotto/clipboard)
+- [termenv](https://github.com/muesli/termenv)
+
+## License
+This project is licensed under the GPL v3.0. See the [LICENSE](./LICENSE) file for details.
diff --git a/network/amfora-bin/docs/THANKS.md b/network/amfora-bin/docs/THANKS.md
new file mode 100644
index 0000000000..2ba5025e4e
--- /dev/null
+++ b/network/amfora-bin/docs/THANKS.md
@@ -0,0 +1,32 @@
+# THANKS
+
+Thank you to the following contributors, who have helped make Amfora great. FOSS projects are a community effort, and we would be worse off without you.
+
+* Sotiris Papatheodorou (@sotpapathe)
+* Chloe Kudryavtsev (@CosmicToast)
+* Adrian Hesketh (@a-h)
+* Jansen Price (@sumpygump)
+* Alex Wennerberg (@alexwennerberg)
+* Timur Ismagilov (@bouncepaw)
+* Matt Caroll (@ohiolab)
+* Patryk Niedźwiedziński (@pniedzwiedzinski)
+* Trevor Slocum (@tsclocum)
+* Mattias Jadelius (@jedthehumanoid)
+* Lokesh Krishna (@lokesh-krishna)
+* Jeff (@phaedrus-jaf)
+* Stephen Robinson (@sudobash1)
+* Peter Steinberg (@objectliteral)
+* Thomas Adam (@ThomasAdam)
+* @lostleonardo
+* Himanshu (@singalhimanshu)
+* @regr4
+* Anas Mohamed (@amohamed11)
+* David Jimenez (@dvejmz)
+* Michael McDonagh (@m-mcdonagh)
+* mooff (@awfulcooking)
+* Josias (@justjosias)
+* mntn (@mntn-xyz)
+* Maxime Bouillot (@Arkaeriit)
+* Emily (@emily-is-my-username)
+* Autumn! (@autumnull)
+* William Rehwinkel (@FiskFan1999)
diff --git a/network/Signal-Desktop/doinst.sh b/network/amfora-bin/doinst.sh
index 65c7e2eeb9..65c7e2eeb9 100644
--- a/network/Signal-Desktop/doinst.sh
+++ b/network/amfora-bin/doinst.sh
diff --git a/network/amfora-bin/slack-desc b/network/amfora-bin/slack-desc
new file mode 100644
index 0000000000..134aa428c6
--- /dev/null
+++ b/network/amfora-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------------------------------------------------------|
+amfora-bin: amfora-bin (gemini client)
+amfora-bin:
+amfora-bin: Amfora aims to be the best looking Gemini client with the most
+amfora-bin: features... all in the terminal. It does not support Gopher or other
+amfora-bin: non-Web protocols. It fully passes Sean Conman's client torture test,
+amfora-bin: as well as the Egsam one.
+amfora-bin:
+amfora-bin:
+amfora-bin:
+amfora-bin:
+amfora-bin:
diff --git a/network/ani-cli/README b/network/ani-cli/README
new file mode 100644
index 0000000000..c475d27b95
--- /dev/null
+++ b/network/ani-cli/README
@@ -0,0 +1,9 @@
+ani-cli is an cli tool to browse and watch anime alone
+and with friends.This tool scrapes the site allanime. 
+
+If you encounter No results found and are sure the 
+prompt was correct or any breaking issue, then make 
+sure you are on latest version by typing 
+sudo ani-cli -U to update on Linux. 
+If after this the issue persists then open an 
+issue with upstream developer.
diff --git a/network/ani-cli/ani-cli.SlackBuild b/network/ani-cli/ani-cli.SlackBuild
new file mode 100644
index 0000000000..4ea355891d
--- /dev/null
+++ b/network/ani-cli/ani-cli.SlackBuild
@@ -0,0 +1,75 @@
+#!/bin/bash
+
+# Slackware build script for ani-cli
+
+# 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=ani-cli
+VERSION=${VERSION:-4.8}
+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 {} \;
+
+install -D -m755 $TMP/$PRGNAM-$VERSION/ani-cli -t  $PKG/usr/bin/
+install -D -m644 $TMP/$PRGNAM-$VERSION/ani-cli.1  -t $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 CONTRIBUTING.md disclaimer.md LICENSE README.md hacking.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/network/ani-cli/ani-cli.info b/network/ani-cli/ani-cli.info
new file mode 100644
index 0000000000..4f32cf4d53
--- /dev/null
+++ b/network/ani-cli/ani-cli.info
@@ -0,0 +1,10 @@
+PRGNAM="ani-cli"
+VERSION="4.8"
+HOMEPAGE="https://github.com/pystardust/ani-cli"
+DOWNLOAD="https://github.com/pystardust/ani-cli/archive/v4.8/ani-cli-4.8.tar.gz"
+MD5SUM="5111c94ff8b032192774e22da5494db2"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="aria2 yt-dlp fzf mpv"
+MAINTAINER="Vijay Marcel"
+EMAIL="vijaymarcel@outlook.com"
diff --git a/network/ani-cli/changelog b/network/ani-cli/changelog
new file mode 100644
index 0000000000..d184ac9f4b
--- /dev/null
+++ b/network/ani-cli/changelog
@@ -0,0 +1,13 @@
+Changelog for ani-cli SlackBuild Script
+--------------------------------------------------------------------
+
+26/11/2022:
+
+Added to SBo
+
+09/02/2024:
+
+Updated to version 4.8
+ani-cli now depends on fzf,aria2 instead of axel 
+and yt-dlp apart from mpv.Thanks to Andrew Clemons
+for helping me figure out fzf.
diff --git a/network/ani-cli/slack-desc b/network/ani-cli/slack-desc
new file mode 100644
index 0000000000..e91701f969
--- /dev/null
+++ b/network/ani-cli/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+       |-----handy-ruler------------------------------------------------------|
+ani-cli: ani-cli (Watch Anime in Terminal)
+ani-cli:
+ani-cli: ani-cli is an cli tool to browse and watch anime alone
+ani-cli: and with friends. This tool scrapes the site animixplay.
+ani-cli:
+ani-cli:
+ani-cli:
+ani-cli: Homepage:https://github.com/pystardust/ani-cli
+ani-cli:
+ani-cli:
+ani-cli:
diff --git a/network/anydesk/README b/network/anydesk/README
new file mode 100644
index 0000000000..695e34325e
--- /dev/null
+++ b/network/anydesk/README
@@ -0,0 +1,17 @@
+Connect to a computer remotely, be it from the other end of the
+office or halfway around the world. AnyDesk ensures secure and
+reliable remote desktop connections for IT professionals
+and on-the-go individuals alike. AnyDesk works across all your
+devices and operating systems: Windows, Linux, macOS, iOS, Android,
+FreeBSD and even your Raspberry Pi!
+
+The following can be used to start/stop AnyDesk automatically:
+/etc/rc.d/rc.local
+  if [ -x /etc/rc.d/rc.anydesk ]; then
+    /etc/rc.d/rc.anydesk start
+  fi
+
+/etc/rc.d/rc.local_shutdown
+  if [ -x /etc/rc.d/rc.anydesk ]; then
+    /etc/rc.d/rc.anydesk stop
+  fi
diff --git a/network/anydesk/anydesk.SlackBuild b/network/anydesk/anydesk.SlackBuild
new file mode 100644
index 0000000000..121bae5b0d
--- /dev/null
+++ b/network/anydesk/anydesk.SlackBuild
@@ -0,0 +1,80 @@
+#!/bin/bash
+#
+# Slackware build script for anydesk
+#
+# Copyright 2019 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=anydesk
+VERSION=${VERSION:-6.3.0}
+BUILD=${BUILD:-1}
+RPMBUILD=${RPMBUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+if [ -z "$ARCH" ]; then
+  ARCH=$( uname -m )
+fi
+
+if [ "$ARCH" != "x86_64" ]; then
+  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
+
+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}-${RPMBUILD}_${ARCH}.rpm | cpio -idmv
+cp -r * $PKG
+cd $PKG
+rm -rf usr/share/anydesk
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+cat $CWD/copyright > $PKG/usr/doc/$PRGNAM-$VERSION/copyright
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
+mkdir -p $PKG/etc/rc.d/
+cat $CWD/rc.anydesk > $PKG/etc/rc.d/rc.anydesk.new
+
+cd $PKG
+/sbin/makepkg -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/network/anydesk/anydesk.info b/network/anydesk/anydesk.info
new file mode 100644
index 0000000000..11fb824470
--- /dev/null
+++ b/network/anydesk/anydesk.info
@@ -0,0 +1,10 @@
+PRGNAM="anydesk"
+VERSION="6.3.0"
+HOMEPAGE="https://anydesk.com/"
+DOWNLOAD="UNSUPPORTED"
+MD5SUM=""
+DOWNLOAD_x86_64="https://download.anydesk.com/linux/anydesk_6.3.0-1_x86_64.rpm"
+MD5SUM_x86_64="2c3d1e7d55c46332ad8a20105f6929f3"
+REQUIRES="gtkglext lsb-release"
+MAINTAINER="Reza Talebi"
+EMAIL="reza.talebi.73@outlook.com"
diff --git a/network/anydesk/copyright b/network/anydesk/copyright
new file mode 100644
index 0000000000..5834552ef1
--- /dev/null
+++ b/network/anydesk/copyright
@@ -0,0 +1,399 @@
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: ad-appliance
+Source: <url://example.com>
+
+Files: *
+Copyright: 2017 philandro Software GmbH (info@anydesk.com)
+License: AnyDesk Terms and Conditions
+ A.General Terms and Conditions
+ 1.Provider and applicability
+ 
+ 1.1.AnyDesk Software GmbH (hereinafter referred to as ANYDESK), Friedrichstr. 9, 70174 Stuttgart, (Stuttgart Municipal Court, Commercial Register Division B 741697), shall be the service provider and contracting party with regard to the Customer.
+ 
+ 1.2.These Terms and Conditions shall apply to the contract conclusion itself and to all contractual relationships between ANYDESK and its customers, regardless of the type and scope of services in the context of current and future commercial relationships.
+ 
+ 1.3.The Customer may only transfer its rights and obligations from this agreement to a third party with the prior written consent of ANYDESK.
+ 
+ 1.4.The Terms and Conditions of ANYDESK shall apply exclusively. We herewith object to any deviating or additional terms and conditions of the Customer; they shall only apply if ANYDESK gives its written consent to the same (Section 126 (1) of the German Civil Code [BGB]).
+ 
+ 1.5.Where individual clauses of these Terms and Conditions are invalid in whole or in part this shall not affect the effectiveness of the remaining clauses. The parties undertake to replace the invalid clause with another valid clause which comes as close as possible to the economic purpose of the original provision. The same shall apply to any gaps in provisions with regard to the contract purpose.
+ 
+ 1.6.The contract language is German.
+ 2.Offer of contract and subject of contract
+ 
+ 2.1.The services provided by ANYDESK are addressed exclusively to natural persons or legal entities or partnerships with legal personality which, when entering into legal transactions, act in exercise of their trade, business or profession (Section 14 BGB).
+ 
+ 2.2.The subject of the contract is determined by these General Terms and Conditions, the Supplementary Terms, which shall take precedence within the body of provisions, and the provisions agreed in the Service Specification pertaining to the respective offer. Agreements which deviate from these provisions must be in writing.
+ 
+ 2.3.Unless expressly stipulated otherwise in the offer, ANYDESK shall not be liable for any particular outcome to be achieved by its services.
+ 
+ 2.4.Ancillary agreements and contract amendments are subject to the written consent of the executive management of ANYDESK; they shall not be valid in the absence of such written consent.
+ 
+ 2.5.Unless expressly agreed otherwise in written form, ANYDESK may use the services of suitable third parties in the performance of its contractual obligations.
+ 3.Contract conclusion and preconditions for service performance
+ 
+ 3.1.The product options presented by ANYDESK on the ANYDESK websites constitute a non-binding offer to the Customer to use the ANYDESK software for a specific period of time against payment of a fee. The Customer may purchase licenses for one or more terminals (work stations). The Customer shall enter its contact and invoice details (company, contact person, email and invoice address) and its choice of products in the course of the ordering process. A binding offer by the Customer to conclude a licensing contract is only made upon clicking the button “kostenpflichtig bestellen” (“place binding order with costs“). An email containing confirmation of receipt of the order shall be sent immediately; this does not constitute acceptance of the offer. ANYDESK shall be entitled to accept the Customer’s offer within two working days by sending an order confirmation by email. Where no order confirmation is sent within this time period the Customer’s offer shall be deemed rejected and the Customer no longer be bound by its offer.
+ 
+ 3.2.Upon acceptance of the Customer’s offer by email the Customer shall receive license keys in accordance with the individual contractual agreement and a link to the security-protected login page of my.anydesk.com; following successful initial login and entering of the licensing key all installed “AnyDesk” clients on the appropriate terminals may be used in accordance with the extent of the license. Once opened, the AnyDesk clients connect to the communications servers of ANYDESK to use, via the Internet, software functions to the extent described in detail in the Service Specification and subject to the conditions and system requirements described in the same.
+ 
+ 3.3.Where ANYDESK has provided the Customer with a written offer this shall be deemed accepted if the services offered therein have been approved without change by countersignature; transmission by way of telecommunications technology shall be deemed sufficient compliance with the requirement of written form in this regard (Section 127 (2) BGB). A separate written order confirmation shall only apply where specific reference is made therein (specification of the offer/order and total performance). Unless stipulated otherwise, offers shall apply for two weeks from receipt of the offer. Order confirmations by ANYDESK shall replace the Customer’s order unless a written objection is received within two weeks; ANYDESK shall expressly draw attention to the consequences of no objection being received in the order confirmation.
+ 
+ 3.4.The Customer may only access the user software made available to it simultaneously with the contractually agreed number of terminals (work stations).
+ 4.Customer information: Storage of order details, usage instructions
+ 
+ 4.1.ANYDESK stores the Customer’s order, including details on the contract concluded (e.g. type of product, price, etc.). Customers may access their past orders and the extent of their license via the Internet on my.anydesk.com. These General Terms and Conditions will be transmitted to the Customer with the order confirmation and may also be accessed at anydesk.de/agb.
+ 
+ 4.2.The Customer may at any time save the product description provided on our website for its own purposes, e.g. by taking a screenshot at the time of ordering or alternatively printing the entire page.
+ 
+ 4.3.The Customer may access installation and usage instructions at any time at support.anydesk.com.
+ 5.Customer information: Correcting errors
+ 
+ 5.1.Customers may correct their details online prior to placing an order by using the delete key. ANYDESK shall inform the Customer of further means of correcting details in the course of the order process.
+ 
+ 5.2.The order process may be aborted completely at any time by closing the browser window prior to placing an order.
+ 6.Availability and technical requirements
+ 
+ 6.1.Subject to a different service level being expressly agreed, ANYDESK shall provide to the Customer use at the server-side point of delivery subject to the availability and quality values specified in the Service Specification. ANYDESK shall only be responsible for availability to the extent that any unavailability of the part of the network run by ANYDESK and/or the web or communications server of ANYDESK is due to a fault on ANYDESK's part. ANYDESK shall not be responsible for the data connection between the Customer's respective terminal or IT system and the server-side point of delivery operated by ANYDESK being established and maintained.
+ 
+ 6.2.Regular maintenance measures are required to secure the availability of all services provided; ANYDESK may suspend service performance for defined periods of time in order to carry out such maintenance. ANYDESK shall announce the time and expected duration of maintenance works at least three working days in advance. Wherever possible ANYDESK shall take the Customer's interests into account when planning maintenance works. These regular maintenance times do not constitute impaired availability in terms of the above.
+ 
+ 6.3.Smooth running of the ANYDESK software depends on the hardware and software used by the user on mobile terminals, routers, data communication equipment, etc. meeting the technical minimum requirements applicable to use of the currently offered software version, which are available to the user in the current system requirements specification.
+ 
+ 6.4.The Customer shall be exclusively responsible for the configuration of its IT system. ANYDESK offers a support service on the basis of a separate agreement, for a fee.
+ 
+ 6.5.The Customer shall be responsible for creating a data connection between the terminals intended for use by the Customer and the data delivery point defined by ANYDESK. ANYDESK shall be entitled to newly define the data delivery point at any time if this is necessary to enable smooth use of the services by the Customer. The Customer shall create a connection to the newly defined point of delivery in this event.
+ 7.Customer's obligations
+ 
+ 7.1.
+ The services of ANYDESK may not be misused; in particular, no information or contents may be transmitted and/or temporarily stored on ANYDESK servers which are illegal or immoral, or the duplication, provision, publication or use of which breach applicable law, rights of third parties (e.g. copyrights, patents, trademark rights or data protection rights) or agreements with third parties. The Customer shall prevent the unauthorized access of third parties to protected data stores by taking appropriate measures. The Customer shall scan its data and information for viruses and other damaging components prior to submission and shall use a state-of-the-art anti-virus program for this purpose. In the event of a culpable breach against the above provisions the Customer shall be liable for the resulting damage; the Customer shall indemnify ANYDESK against all claims of third parties which are due to such breach and shall compensate ANYDESK for any costs which arise due to potential infringements of rights.
+ 
+ 7.2.ANYDESK shall be entitled to suspend software functions with immediate effect if a justified suspicion of misuse in terms of Section7.1 and/or use which infringes third-party rights arises. A justified suspicion of illegality and/or infringement of rights shall in particular arise where courts, authorities and/or other third parties inform ANYDESK of the same. ANYDESK shall inform the Customer of the suspension and the reason for the same without delay. The suspension shall be discontinued as soon as the suspicion has been proven to be groundless.
+ 
+ 7.3.Where the Customer collects, processes or uses personal data in the context of use of ANYDESK services and no statutory provision allowing such collection, processing and use applies, the prior consent of the affected parties must always be sought. ANYDESK and its vicarious agents shall in this context be indemnified against all claims of third parties which are based on illegal use of the products and the related servicers by the Customer. If the Customer realizes or ought to realize that a violation of this type is about to occur, it must notify ANYDESK without undue delay. Where in addition sensitive data in terms of Section 3 (9) of the German Federal Data Protection Act (Bundesdatenschutzgesetz) are to be processed by ANYDESK the Customer must inform ANYDESK of this fact in writing without undue delay.
+ 
+ 7.4.Personal access data (user name and password) may not be disclosed to third parties and must be kept safe from access by third parties. For security reasons, they must be changed prior to first use and at regular intervals thereafter. If there is reason to suspect that unauthorized persons have gained access to access data the Customer shall change them without undue delay.
+ 
+ 7.5.The Customer shall be solely responsible for data backup. ANYDESK shall not be under any obligation with regard to retention or safekeeping of data transmitted and processed by the Customer.
+ 
+ 7.6.The Customer shall reimburse ANYDESK any costs incurred for checking its equipment following submission of a fault report if the checks show that the fault was not in ANYDESK's equipment and this could have been recognized by the Customer if it had made a reasonable effort to find the fault.
+ 8.Usage rights and software integration
+ 
+ 8.1.The "AnyDesk" software provided to the Customer for use under the contract is protected by copyright. ANYDESK is exclusively entitled to the commercial exploitation of the software.
+ 
+ 8.2.Upon contract conclusion, ANYDESK shall grant the Customer a non-exclusive usage right limited to the contract term pertaining to the applicable offer, to download the client software of ANYDESK to a contractually specified number of data-processing terminals (work stations) in order to create a connection with the ANYDESK communications server and use the software functions via the Internet to the extent described in detail in the Service Specification and subject to the conditions and system requirements described therein.
+ 
+ 8.3.Notwithstanding the possibility of unrestricted downloads in accordance with the Supplementary Terms "AnyDesk Free“ the Customer shall not have the right to use the software beyond the use permitted under this agreement in any way or to allow third parties to use it or to make it accessible to third parties. Vicarious agents of the Customer who make use of the services without charge shall not be deemed third parties; this includes, for example, the Customer's employees, freelancers within the scope of their assignment, etc. In particular, the Customer shall not be permitted to duplicate, edit, make publicly accessible or sell the software or parts thereof.
+ 
+ 8.4.The Customer shall not be permitted to change, adapt or decompile the software, to decode it, to undertake reverse engineering, or to try to reconstruct or detect a source code or underlying ideas, algorithms, data formats or programming or interoperability interfaces of the product or files contained in the product or created in the course of use of the product, or to reshape the product in any other way into a form readable by humans.
+ 
+ 8.5.The Customer may not circumvent technical measures for the protection of the software or apply or provide processes for their circumvention.
+ 
+ 8.6.The Customer shall pay the fees which become payable through the actions of users which are registered and therefore authorized by the Customer. The same shall apply in the event of unauthorized use by other third parties if and to the extent that this use is due to a fault on the part of the Customer.
+ 9.Remuneration and terms and conditions of payment
+ 
+ 9.1.Unless otherwise agreed, remuneration shall be payable in accordance with the AnyDesk price list applicable at the point of contract conclusion. Objections to invoices for services performed by ANYDESK must be declared within four weeks of receipt of the invoice, in writing, to the address stated on the invoice. Following expiry of the above period the invoice shall be deemed approved by the Customer. ANYDESK shall draw the Customer’s attention to the significance of its conduct when sending the invoice.
+ 
+ 9.2.Fees payable for the use of ANYDESK services shall be paid by means of the payment method agreed for the order. Unless otherwise specified herein, invoices shall be payable immediately without discount. Where no payment date has been agreed, default periods shall be determined by the statutory provisions. Remuneration and ancillary costs are stated strictly as net prices exclusive of the applicable statutory taxes and charges.
+ 
+ 9.3.Monthly fees are charged on a pro-rata basis for the rest of the month, starting with the first day of serviceable provision. Thereafter, fees are payable monthly in advance. Where the fee is charged for parts of a calendar month, it is charged pro-rata for each day. A full monthly fee will be charged if the Customer terminates the contractual relationship effectively before the expiry of one month; this shall not apply to termination for good cause. Other fees, in particular fees depending on usage, are payable after service provision.
+ 
+ 9.4.The Customer shall have a right to offset claims only if its counterclaims have been finally established by a court of law or are undisputed. The Customer may only assert rights of retention for counterclaims from this contractual relationship.
+ 10.Default
+ 
+ 10.1.In the event of payment default on significant amounts, ANYDESK shall be entitled to suspend the services at the Customer's expense.
+ 
+ 10.2.Where monthly payments have been agreed with the Customer, the Customer shall remain under obligation to pay the monthly fees in the event of default. Where the Customer
+ 
+ 10.2.1.defaults on the payment of fees, or a significant part thereof, for two consecutive months, or
+ 
+ 10.2.2.defaults on the payment of fees to an extent equivalent to the basic monthly fees for two months in a continuous period of more than two months, ANYDESK may terminate the contractual relationship without notice.
+ 
+ 10.3.ANYDESK reserves the right to assert further claims due to late payment.
+ 11.Warranties
+ 
+ 11.1.At the current state of technology, it is impossible to guarantee that data communication via the Internet or wireless will be completely safe, free of faults and/or available at all times. ANYDESK therefore does not guarantee the availability of its service at all times and shall not be liable for disappointed trust of the user in its faultless functioning.
+ 
+ 11.2.Technical data, specifications and performance stipulations in public statements, in particular in advertising, do not constitute a warranty as to quality. The functionality of the software is in the first place determined by the contents of the applicable Service Specification and any supplementary agreements made. In other respects, the software must be suitable for the use presupposed under this agreement and otherwise be of the nature common to software of its kind.
+ 
+ 11.3.The Customer shall be provided with the software in a suitable condition for use in accordance with the contract. The duty to maintain does not include adaptation of the software to changed conditions of use and technical and functional developments, such as changes in the IT environment, in particular changes of hardware or of the operating system, adaption to the scope of functions of competing products or creation of compatibility with new data formats.
+ 
+ 11.4.No-fault liability for damages for defects present at the point of contract conclusion is excluded.
+ 
+ 11.5.The Customer shall support ANYDESK in the detection and rectification of defects.
+ 
+ 11.6.In the event of material defects in standard software supplied by third parties or performance by a third-party vicarious agent, ANYDESK shall be entitled, with the effect of releasing it from all liability, to assign claims against suppliers, the manufacturer or other third parties to the Customer for the purposes of rectification or replacement supply, unless this cannot reasonably be expected to be acceptable to the Customer. The above shall also apply where ANYDESK has adapted, configured or otherwise changed the software or hardware in accordance with the Customer's requirements, unless the material defect has been caused by ANYDESK's own performance.
+ 
+ 11.7.The Customer shall inform ANYDESK of defects without undue delay. Warranty claims shall lapse after one year.
+ 12.Liability
+ 
+ 12.1.ANYDESK shall be liable without limitation for all resulting damage due to intent or gross negligence or the absence of a guaranteed property. ANYDESK shall be liable without limitation for ordinary negligence in the event of personal injury or death. In all other respects, ANYDESK shall be liable for ordinary negligence only where a duty is breached the performance of which is essential to the proper implementation of the agreement, the breach of which jeopardizes the purpose of the agreement, and on the performance of which the Customer may regularly rely (so-called cardinal duty). Liability for breach of a cardinal duty shall be limited to foreseeable damage typical of the type of agreement. This shall also apply to loss of profits and loss of expected savings. Liability for other remote consequential harm caused by a defect is excluded.
+ 
+ 12.2.No-fault liability of ANYDESK for damages (Section 536a BGB) for defects present at the time of contract conclusion is excluded.
+ 
+ 12.3.Liability for all other damage is excluded. This applies particularly to data loss or hardware malfunction caused by incompatibility of the existing components on the Customer’s terminals and/or IT systems with the hardware or software which is newly installed or to be amended, and to system malfunction which may be caused by existing faulty configurations or older, interfering drivers which have not been completely removed. This also particularly applies to data loss caused by the failure of the Customer to perform data backup and therefore ensure that lost data may be restored with a reasonable amount of effort.
+ 
+ 12.4.Liability in accordance with the provisions of the German Product Liability Act is unaffected.
+ 13.
+ Data protection
+ 
+ 13.1.
+ The Customer consents to the collection, storage and processing of personal data, provided these data are required to create, define the substance of, or amend the contractual relationship (user data). These personal data shall be used exclusively for the purposes of contract implementation. In the absence of express consent or a statutory basis the Customer's personal data shall not be disclosed to third parties who do not perform an active part in contract implementation. Following completed contract implementation the data shall be blocked to prevent further use. The data shall be deleted following expiry of the retention periods specified under tax and commercial provisions, unless the Customer has expressly consented to their further use.
+ 
+ 13.2.
+ For the purposes of identifying the terminals (work stations) under the agreement, ANYDESK shall, in the course of remote data access and within the scope of the purpose of the agreement, store the IP and MAC addresses of the respective terminals for a period of seven days for the purposes of preventing risks and removing malfunctions; these data are then deleted without trace unless statutory provisions or official orders require otherwise. Unless otherwise stipulated below, ANYDESK has no other direct or administrative access to the transmitted data contents and shall only store them temporarily for the purposes of transmission of the remote access initiated by the Customer.
+ 
+ 13.3.
+ ANYDESK shall, with reference to the respective ANYDESK Customer Identification Number, log the time a program is started and the time and duration of the pertaining session (session protocol); these data are stored in a databank which is not connected to the databank containing the user data of the respective user. ANYDESK shall only log and/or store the contents of the respective data connection (session) on behalf of the Customer if this is part of the agreement, in accordance with the offer chosen by the Customer (session recording).
+ 
+ 13.4.With regard to data storage and/or processing pursuant to Section 13.2 and 13.3 above the Customer undertakes to check whether this could affect personal data of third parties. The Customer shall inform ANYDESK of the results of these checks prior to first use. In the event of processing of personal data of third parties on behalf of the Customer, ANYDESK shall collect, process, use or access personal data exclusively within the scope of the agreement concluded and in accordance with the instructions of the Customer. The Customer shall in this event, prior to first use, conclude a separate agreement on the processing of personal data, which shall form the basis of the Supplementary Terms for Data Processing on Behalf of the Customer. This must be sent, signed without amendment, to ANYDESK by postal service. The agreement to process data on behalf of the Customer shall only enter into force upon receipt of the signed agreement by ANYDESK. Where data is processed on behalf of another the Customer is always the responsible agent with regard to the personal data and is solely responsible for compliance with the provisions of the German Federal Data Protection Act (BDSG).
+ 
+ 13.5.ANYDESK shall also store data on the type of processor, screen resolution, graphics card, operating system and potentially other technical data of the terminal used, exclusively in anonymised form and for purely statistical purposes.
+ 
+ 13.6.Personal data during the ordering process is transmitted via the internet using TLS-based encryption. Credit card data is not stored by ANYDESK, but collected and processed by ANYDESK's payment provider. ANYDESK secures its website and other systems using technical and organizational measures against loss, destruction, access, change or processing of the personal data by unauthorized parties.
+ 
+ 13.7.ANYDESK warrants that technical and organizational security measures in accordance with Section 9 BDSG and the appendix to Section 9 BDSG are in place.
+ 
+ 13.8.In accordance with the German Federal Data Protection Act, the Customer has a right to free information about the data saved about its person and a right to correction, blocking or deletion of these data. The responsible office in this regard is
+ AnyDesk Software GmbH
+ Friedrichstr. 9
+ 70176 Stuttgart
+ datenschutz@anydesk.de
+ 14.Support, updates and upgrades
+ 
+ 14.1.
+ ANYDESK shall provide the Customer with a support email address and a helpdesk phone number available on weekdays from 9 am to 12 pm and 1 pm to 5 pm with regard to its services. The hotline shall exclusively serve the purpose of providing support to the Customer during use of the ANYDESK services to be provided under this agreement.
+ 
+ 14.2.The hotline is also available to other customers. Customer enquiries to the hotline are processed in the order in which they come in. Defects should not be notified to the hotline but directly to the defect team specified in the Service Specification orsupport.anydesk.com .
+ 
+ 14.3.Any software updates will be announced online to all customers upon start of the client software and will be provided online; however, ANYDESK reserves the right to provide extensions to functionalities only to certain types of license (plan options).
+ 
+ 14.4.Moreover, ANYDESK reserves the right at any time to deactivate outdated client software following an update. Any deactivation shall be announced online upon start of the client software with at least six weeks' notice.
+ 15.Amendments to the Terms and Conditions, Service Specifications and prices
+ 
+ 15.1.Where ANYDESK intends to make changes to the General Terms and Conditions or Supplementary Terms, the Service Specification, or the prices, the changes shall – in the case of the services provided under the “Free" option – be notified online upon start of the client software at least six weeks prior to the time of their intended applicability and the Customer be required to give its express consent or declare its express objection. The Customer's decision shall be logged by ANYDESK and stored under the respective Customer ID, IP and MAC address; the provisions of Section 13.1 shall apply in this regard. Where the Customer objects to the intended changes to the General Terms and Conditions or Supplementary Terms, ANYDESK shall be entitled to declare extraordinary termination, to take effect at the time of the changes coming into force. ANYDESK shall make express reference to this consequence in its notification of changes.
+ 
+ 15.2.In all other cases, changes shall be notified to the Customer in writing at least six weeks prior to taking effect. Changes shall entitle the Customer to an extraordinary right of termination at the time of the changes coming into force. If no written notice of termination by the Customer is received within six weeks of issue of the notification of changes the changes shall become integral parts of the agreement upon coming into force. ANYDESK shall make express reference to this consequence in its notification of changes.
+ 16.Contract term, termination and software removal
+ 
+ 16.1.Unless expressly agreed otherwise, the following provisions shall apply with regard to contract terms and notice periods for termination:
+ 
+ 16.1.1.Contracts with a minimum contract term: The minimum contract term shall be one year, to start, subject to agreement to the contrary, upon notification of serviceable access provision to the Customer. The contract shall be terminable in writing by either party subject to a notice period of three months, to take effect at the earliest upon expiry of the minimum contract term. Where no termination is declared the contract term shall in each case be extended by one year. A mere change in the number of users shall not affect the contract term.
+ 
+ 16.1.2.Contracts without a minimum contract term: A contract without a minimum term shall be terminable in writing by either party subject to a notice period of six working days (not including Saturdays), to take effect at the end of a month. In the event that the Customer terminates the contract prior to the expiry of one month after the start of serviceable provision the full monthly fee shall be payable.
+ 
+ 16.2.The above terms and deadlines shall also apply to terminations of parts of services, e.g. a change in the number of users.
+ 
+ 16.3.This shall not affect the right to terminate the contract for good cause.
+ 
+ 16.4.Notice of termination may be given in writing by letter, fax or email.
+ 17.Miscellaneous provisions
+ 
+ 17.1.The entire commercial relationship between ANYDESK and the Customer shall be governed by the law of the Federal Republic of Germany, to the exclusion of UN law on the sale of goods.
+ 
+ 17.2.Where the Customer is a merchant, the exclusive place of jurisdiction for all disputes arising from this agreement shall be the registered business seat of ANYDESK.
+ B.Supplementary Terms "AnyDesk Free"
+ 1.Order of precedence
+ 
+ The services offered under the “Free” option shall be subject to the Supplementary Terms below, which shall take precedence over the General Terms and Conditions (Section A) above, which shall apply in all other respects:
+ 2.Preconditions and subject of service provision
+ 
+ 2.1.
+ The “AnyDesk Free” option is addressed to both consumers in terms of Section 13 of the German Civil Code (BGB) and entrepreneurs in terms of Section 14 BGB.
+ 
+ 2.2.Use of the AnyDesk software is subject only to the download of the same and acceptance of the applicability of the General Terms and Conditions and Supplementary Terms.
+ 
+ 2.3.
+ ANYDESK provides its software on its website for download, without need for registration, to one data processing terminal per Customer. Following saving of the downloaded software to this specific terminal the Customer may start the software to connect to the communications servers of ANYDESK in order to use, via the Internet, software functions to the extent described in detail in the Service Specification and subject to the conditions and system requirements described in the same.
+ 
+ 2.4.The download of the software and the use of its functionalities for an indefinite period is free of charge. However, the Customer shall have no legal claim to the free service described in Section 2.1. ANYDESK does not warrant provision of any particular scope of services and reserves the right to discontinue the service described in Section 2.3 at any time and without stating reasons.
+ 3.Amendments to the Terms and Conditions, Service Specifications and prices
+ 
+ Where the Customer objects to intended changes to the General Terms and Conditions or Supplementary Terms in accordance with Section A.14.1 of the General Terms and Conditions, use shall cease at the specified time of the changes coming into effect. ANYDESK shall make express reference to this consequence in its notification of changes.
+ C.Supplementary Terms "AnyDesk Enterprise"
+ 1.Order of precedence
+ 
+ The services offered under the “Enterprise” option shall be subject to the Supplementary Terms below, which shall take precedence over the General Terms and Conditions (Section A) above, which shall apply in all other respects:
+ 2.Contract conclusion and preconditions for service performance
+ 
+ 2.1.A contract for the use of the "AnyDesk Enterprise" solution shall only arise on the basis of an individual written offer. The written offer by ANYDESK to the Customer shall be deemed accepted if the services offered therein have been approved without change by countersignature; transmission by way of telecommunications technology shall be deemed sufficient compliance with the requirement of written form in this regard (Section 127 (2) of the German Civil Code (BGB)). A separate written order confirmation shall only apply where specific reference is made therein (specification of the offer/order and total performance). Unless stipulated otherwise, offers shall apply for two weeks from receipt of the offer. Order confirmations by ANYDESK shall replace the Customer's order unless a written objection is received within two weeks; ANYDESK shall expressly draw attention to the consequences of no objection being received in the order confirmation.
+ 
+ 2.2.
+ Use of the "AnyDesk Enterprise" plan in the Customer's internal network is, in accordance with the individual specifications of the written offer, dependant on provision of a communications server (hardware appliance) by ANYDESK, a virtual appliance by ANYDESK or the installation of server software on a server of the Customer; following download of the ANYDESK client software to an unlimited number of terminals (work stations) the individual users belonging to the Customer may start the client to connect to the server in the internal network in order to use, via the Internet, software functions in accordance with the individual provisions of the written offer by ANYDESK to the extent described in detail in the Service Specification and subject to the conditions and system requirements described in the same. The Customer may simultaneously access the user software made available to it with an unlimited number of terminals (work stations).
+ 
+ 2.3.ANYDESK shall provide a handbook for the use of the software. Where, in ANYDESK's opinion, an update of the operational software results in a need for training, ANYDESK shall provide additional training sessions on the new features of the software for a fee.
+ 3.Special obligations of the Customer
+ 
+ 3.1.The Customer shall promptly provide ANYDESK with all information and/or data available to it which are required for or relevant to the service provision in question and inform ANYDESK of all incidents and circumstances which are relevant to the contract (e.g. defects or misuse, changes in the Customer’s network or software environment); this obligation shall constitute an essential contractual duty. This shall particularly apply to documents, incidents and circumstances which become known only after ANYDESK has started service provision.
+ 
+ 3.2.The Customer shall be responsible for creating a data connection between the terminals (work stations) intended for use by the Customer and the data delivery point to the ANYDESK communications server defined by ANYDESK.
+ 
+ 3.3.Where, in accordance with Section 2.2, the Customer provides its own communications server, the maintenance of the operating system shall be the sole responsibility of the Customer unless otherwise agreed in writing.
+ 4.Nutzungsrechte und Softwareintegration
+ 
+ 4.1.The server software used by ANYDESK in accordance with the respective written offer to provide a communications server or a virtual appliance in the Customer's internal network is protected by copyright and may only be used by the Customer in accordance with the purpose described in the offer; the server software may not be duplicated, disseminated or made available to third parties in any other form.
+ 
+ 4.2.Furthermore, the Customer shall not be permitted to change, adapt or decompile the server software, to decode it, to undertake reverse engineering, or to try to reconstruct or detect a source code or underlying ideas, algorithms, data formats or programming or interoperability interfaces of the product or files contained in the product or created in the course of use of the product, or to reshape the product in any other way into a form readable by humans.
+ 
+ 4.3.The Customer may not circumvent technical measures for the protection of the software or apply or provide processes for their circumvention.
+ 
+ 4.4.Section A.8 of the General Terms and Conditions shall apply to the client software provided in accordance with the contract.
+ 5.Updates, support and maintenance
+ 
+ ANYDESK offers updates, support and maintenance to the Customer in accordance with the particular terms of the applicable written offer.
+ D.Supplementary Terms and Conditions for "Anydesk Enterprise Software Maintenance"
+ 1.Order of Priority
+ 
+ The services offered under "AnyDesk Software Maintenance" are subject to payment, and subject to the following additional terms and conditions, which take precedence over the above terms and conditions (Par. A) and the Supplemental Terms "AnyDesk Enterprise" (Par. C):
+ 2.Performance Prerequisite and Subject
+ 
+ 2.1.
+ Unless otherwise stated in the written offer, the ANYDESK maintenance service shall include the following services:
+ 
+     The transfer and installation of the latest versions of the program (Updates) as well as patches for the contractual standard software (against a previously agreed fee) through any necessary adjustments to the client's IT system environment.
+     The update of the user documentation. In the event of a significant change in the functionality or operation of the software, completely new documentation is made available.
+     If necessary, after the expiration of the defects warranty period, repair the defect using the latest program version, both within the program code as well as within the documentation. The response time for corrective action is set at a maximum of 10 working days.
+     Both written (including by fax or email) and telephone counseling of clients not referred to in Part A Sect. 11 for defect related issues regarding the application of the software as well as, where appropriate, for recorded programming errors. The telephone consultation service ("Hotline") shall be available weekdays between 09:00-12:00 hours and 13:00-17:00.
+     Written reported errors or repeated service requests are assigned a specific "ticket number" no later than the afternoon of the following business day after receipt. This is done by telephone to the extent possible for the purpose of acceleration. The client must therefore add the name and telephone extension of the investigating officer to any written notification. Response by email is also acceptable in the event of error messages or requests for service by e-mail.
+ 
+ Additional Service Levels are subject to remuneration and possibly subject to separate written agreements between the Parties.
+ 
+ 2.2.Not included in the contractual maintenance services provided by the Contractor are the following services:
+ 
+     Consulting services outside the on-call times as listed under Section 2.1.
+     Maintenance services, which are required as a result of the use of the software on a different hardware system or another operating system.
+     Maintenance services after any type of modification by the client in the program code of the software.
+     The repair of any faults or damage caused by improper handling by the client, the action of any third parties or force majeure.
+     Maintenance services with regard to the compatibility of the contractual software with other computer programs, which are not covered by the Maintenance Agreement.
+     Expansion and / or improvements of the original functionality scope of the contractual software (Upgrades).
+ 
+ These services are the subject of separate written agreements between the Parties, if necessary.
+ 3.Usage Rights
+ 
+ 3.1.In so far as ANYDESK provides the client with the latest available program version in accordance with this Maintenance Agreement, ANYDESK grants the client usage rights thereto in accordance with Part C Section 4.
+ 
+ 3.2.If the client uses contractual matters which are scheduled to be replaced earlier, then his usage rights under the replacement Agreement shall expire.
+ 4.Particular Client Obligations
+ 
+ 4.1.For defining, isolating, detecting and reporting errors, the client must follow the instructions issued by ANYDESK. The client must used checklists provided by ANYDESK as necessary.
+ 
+ 4.2.The client shall make every effort to submit a detailed error report with questions. For this purpose, he must rely on his competent staff.
+ 
+ 4.3.During necessary test runs, either the client or designated competent employees who are fully authorized to identify and make decisions about defects, feature enhancements, reductions in functionality and changes in the program structure will be present. Other work with the computer system is adjusted during the maintenance period as necessary.
+ 
+ 4.4.The client allows ANYDESK remote access to the software by means of telecommunications or Internet. The client shall assume responsibility to provide the necessary connections in accordance with instructions received from ANYDESK.
+ E.Supplementary Terms for Data Processing on Behalf of the Customer (“Auftragsdatenverarbeitung”)
+ 1.Applicability and order of precedence
+ 
+ 1.1.Where the Customer wishes to process personal data in the context of using a service of ANYDESK the Customer shall be required to conclude a separate agreement on the processing of personal data with ANYDESK in accordance with Section 11 of the German Federal Data Protection Act (BDSG). This agreement shall be subject to the Supplementary Terms below, which shall take precedence over the General Terms and Conditions (Section A) above, which shall apply in all other respects:
+ 
+ 1.2.Two copies of this agreement must be signed and sent to the following address:
+ AnyDesk Software GmbH
+ Friedrichstr. 9
+ 70176 Stuttgart
+ 
+ ANYDESK shall return one countersigned copy to the Customer.
+ 2.Subject of the agreement
+ 
+ The subject of this agreement is the regulation of rights and/or duties of the Customer and ANYDESK where, in the context of service provision (in accordance with the General Terms and Conditions and Supplementary Terms), ANYDESK collects, processes and/or uses personal data (hereinafter referred to as “data”) on behalf of the Customer in terms of Section 11 of the German Federal Data Protection Act (BDSG). The agreement shall apply accordingly to the (remote) testing and maintenance of automated procedures or of data processing systems if in doing so the possibility of access to personal data cannot be ruled out.
+ 3.Customer's responsibility and right to instruct
+ 
+ 3.1.The Customer, as the principal in terms of Section 11 BDSG, shall be solely responsible for assessing the permissibility under data protection law of collecting, processing and using personal data and for the observance of the rights of the affected parties. The Customer shall accordingly ensure that the conditions of permissibility of data processing prescribed by statute or regulatory authority are met, i.e., amongst others, that deletion periods and permitted storage terms are observed and all required declarations of consent are demonstrably obtained, in particular if the Customer's data processing assignment concerns sensitive data in terms of Section 3 (9) BDSG. In the event of a culpable breach of the above provisions, the Customer shall be liable for the resulting damage; the Customer shall indemnify ANYDESK against all claims of third parties which are due to such breach and shall compensate ANYDESK for any costs which arise due to po-tential infringements of rights.
+ 
+ 3.2.The subject, type, duration and purpose of the data processing to be undertaken shall be determined by the Customer by its choice of product, the scope of which is determined by the General Terms and Conditions and Supplementary Terms and the data protection requirements pertaining to which are specified in detail in the Appendix to the Supplementary Terms for Data Processing on Behalf of the Customer.
+ 
+ 3.3.Any instructions by the Customer with regard to the processing of personal data which go beyond the contractually agreed services and product features and result in additional efforts on the part of ANYDESK shall attract an appropriate additional fee. ANYDESK shall be entitled to terminate the agreement in the event of instructions the implementation of which by ANYDESK is not possible, or only possible under expense of disproportionately high additional effort. Additional instructions must be in writing.
+ 4.Protection and supervision
+ 
+ 4.1.ANYDESK shall process the data exclusively within the scope of the agreements concluded and shall not use the data for any other purpose; ANYDESK shall, in particular, not be permitted to disclose the data provided to third parties. ANYDESK shall take the required technical and organizational measures in accordance with Section 9 BDSG in order to protect the data, specified in the Appendix to the Supplementary Terms for Data Processing on Behalf of the Customer. Within this specification, ANYDESK may adapt the technical and organizational measures at its discretion in accordance with a due assessment of the circumstances.
+ 
+ 4.2.The Customer may at any time at its own cost check compliance with data protection provisions concerning the data processing undertaken on its behalf, or instruct a third party to carry out such checks. Where applicable, the third party shall demonstrably be obligated to maintain confidentiality. The Customer shall be required to give ANYDESK appropriate notice of individual checks and shall act with consideration towards the business operations of ANYDESK during their implementation.
+ 5.Other rights and obligations
+ 
+ 5.1.The Customer shall be the responsible contact point for the exercise of rights of affected persons, such as correction, deletion and blocking of data. ANYDESK shall ensure in the course of service performance that the Customer is able to meet its obligations with regard to the rights of affected persons. Where an affected person exercises its right to correction, deletion or blocking of data with the Customer and the Customer is unable to implement the request by appropriate selection or change in the settings of particular features ANYDESK shall, in collaboration with the Customer, perform the correction, blocking or deletion, provided implementation of the change by ANYDESK is legally and actually possible.
+ 
+ 5.2.Any documents containing personal data and files which are no longer required shall be destroyed in accordance with data protection provisions, unless statutory duties require otherwise. Where the Customer is in possession of storage media the Customer shall delete from them all personal data in accordance with data protection provisions before returning them to ANYDESK. Where this is not possible the Customer shall inform ANYDESK in writing in good time; ANYDESK shall in this event carry out the deletion of the personal data from the storage media on behalf of the Customer against payment of an additional fee.
+ 
+ 5.3.ANYDESK shall inform the Customer of cases of major operational malfunction, violations of data protection provisions, breaches against terms of this agreement and other significant irregularities related to the processing of the Customer's data. However, the general duty to ascertain whether the data processing is in breach of any data protection provisions shall not be the duty of ANYDESK; where ANYDESK considers this to be the case ANYDESK shall be entitled to suspend implementation of the respective data processing until it is confirmed or changed by the Customer.
+ 
+ 5.4.Where the Customer is under legal duty to supply information on the processing of data to an official body or a natural or legal person ANYDESK shall support the Customer in providing this information. Unless expressly agreed otherwise, ANYDESK shall charge a fee to cover the expense of such support actions.
+ 6.Supervision, maintenance, remote access
+ 
+ 6.1.All checks and maintenance works, in particular those carried out by remote access, shall be documented and logged.
+ 
+ 6.2.Where the possibility of access to personal data in the course of checks and maintenance works using automated processes or data processing equipment – including by way of remote access – may not be excluded, ANYDESK shall only make use of the access to the extent which, both in terms of time and subject matter, is strictly required for the proper implementation of the maintenance works and checks requested.
+ 7.Location and subcontractors
+ 
+ 7.1.ANYDESK stores customer data exclusively on servers physically located in Germany.
+ 
+ 7.2.ANYDESK may use subcontractors for the performance of its responsibilities described herein, which, where applicable, shall be specified in the Appendix to the Supplementary Terms for Data Processing on Behalf of the Customer. Where required, ANYDESK shall enter into contractual agreements with these subcontractors which match the contractual provisions of this agreement.
+ Privacy Statement
+ General
+ 
+ AnyDesk takes privacy very serious. We exercise the utmost care and strictly adhere to the statutory provisions in regards to collecting, processing, using and unnecessary disclosure of data. This statement provides an overview about your rights when using our website and software and what kind of data is collected and for what purpose.
+ Personal Data
+ 
+ Personal data is any information relating to an identified or identifiable natural person. This includes information and details such as your name, your address or other mailing address, or phone number. This also includes an email-Address if it includes such a reference to your name that it makes you identifiable. Information that can not be used to determine your identity is not considered to be personal data. Such information is, for example, body size, gender, age or education.
+ Use and Disclosure of Data
+ 
+ We will use automatically or manually collected personal data related to you to only to respond to your inquiries, to process contracts we have concluded with you, and for technical administration.
+ 
+ We will only disclose personal data to third parties under a limited extent under the following circumstances:
+ 
+     In order to process the payment process at the appropriate payment service
+     If you have explicitly consented to the disclosure of the data
+     If we are legally obligated to disclose the data (e.g. in response to a court or administrative order)
+ 
+ In no case will the data be sold.
+ Deletion of Data
+ 
+ You have the right to revoke your consent to the storage of your personal data at any time. The deletion of your personal data is carried out when you have revoked your consent and storage is no longer necessary for processing of contracts. In any case we will delete your personal data if we do not longer need it for our services or if the storage gets prohibited for legal reasons.
+ Website
+ 
+ As a principle, we ask on our website only to provide us with the data that is immediately necessary for the provision and improvement of our services. In addition, some data is automatically collected for statistical analysis.
+ E-Mails and Newsletters
+ 
+ If you use the email services offered on this website or would like receive our newsletter, your email-address will be stored. Additionally, we may require further information which will enable us to check if you are the owner of the email-address or if its owner agrees to reveive the newsletter. You can revoke your permission for storage and usage of this data and your email-address to deliver newsletters at any time.
+ 
+ Email newsletters can be unsubscribed at any time.
+ Access Protocol
+ 
+ Every access to our website and related resources is logged. The logging is necessary for internal statistical purposes and to ensure data security. Some information from your browser is collected and stored for that matter. This includes:
+ 
+     Browser type and version
+     Operating system
+     The previously visited website
+     The host name of the accessing computer and its IP address
+     Time of the server inquiry
+ 
+ Cookies
+ 
+ Cookies are small text files that can be stored on the computer of the visitor of a website. In a subsequent access to the same website, the information stored there is transferred back to the server. The use of our website is possible without the use of cookies.
+ 
+ Basically, we avoid the use of cookies and restrict them to the following applications:
+ 
+     Management of different user sessions (session tracking)
+     Storage of user settings of our website (e.g. language setting)
+     Use in the context of web analytics
+ 
+ Web analytics tools
+ 
+ This website uses Google Analytics, a web analytics service provided by Google, Inc. (“Google”). Google Analytics uses “cookies”, which are text files placed on your computer, to help the website analyze how users use the site. The information generated by the cookie about your use of the website (including your IP address) will be transmitted to and stored by Google on servers in the United States . Google will use this information for the purpose of evaluating your use of the website, compiling reports on website activity for website operators and providing other services relating to website activity and internet usage. Google may also transfer this information to third parties where required to do so by law, or where such third parties process the information on Google's behalf. Google will not associate your IP address with any other data held by Google. You may refuse the use of cookies by selecting the appropriate settings on your browser, however please note that if you do this you may not be able to use the full functionality of this website. By using this website, you consent to the processing of data about you by Google in the manner and for the purposes set out above.
+ 
+ You can stop the recording and processing of your data usage of this website by Google by downloading and installing the browser plugin available at:
+ http://tools.google.com/dlpage/gaoptout?hl=en
+ Software
+ 
+ To ensure a reliable and safe operation of AnyDesk, to enable some advanced features and to improve our procduct in the future, AnyDesk will automatically collect the following data:
+ 
+     Time of program start
+     IP-address of the machine
+     Statistical information about your computer (e.g. CPU-type, screen resolution)
+     Time and duration of AnyDesk sessions as well as the AnyDesk-IDs of participants
+ 
+ This data is saved in a database which is seperate from the database which contains your personal data.
+ Changes
+ 
+ We reserve the right at any time to modify this privacy statement in compliance with the legal requirements.
+ Contact
+ 
+ For questions about this privacy policy, please contact us via the means specified in the imprint. You can inquire at any time whether and which of your data is stored by us. In addition, you can send us inquiries, deletion and correction requests. Feel free to send suggestions.
diff --git a/network/anydesk/doinst.sh b/network/anydesk/doinst.sh
new file mode 100644
index 0000000000..4a1462ff3a
--- /dev/null
+++ b/network/anydesk/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
+}
+
+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
+
+preserve_perms etc/rc.d/rc.anydesk.new
diff --git a/network/anydesk/rc.anydesk b/network/anydesk/rc.anydesk
new file mode 100644
index 0000000000..38675e3741
--- /dev/null
+++ b/network/anydesk/rc.anydesk
@@ -0,0 +1,80 @@
+#! /bin/sh
+### BEGIN INIT INFO
+# Short-Description: AnyDesk global service
+### END INIT INFO
+
+DESC="AnyDesk global service"
+PRGNAM=anydesk
+DAEMON=/usr/bin/$PRGNAM
+OPTS="--service"
+PID=/var/run/$PRGNAM.pid
+
+# Gracefully exit if the package has been removed.
+test -x $DAEMON || exit 0
+
+
+#
+#	Function that starts the daemon/service.
+#
+anydesk_start(){
+  if [ -s $PID ]; then
+    echo "$DESC is already running: $(cat $PID)"
+    exit 1
+  fi
+
+  if [ -x $DAEMON ]; then
+    echo "Starting $DESC"
+    $DAEMON -- $OPTS &
+    pidof $DAEMON > $PID
+  fi
+}
+#
+#	Function that stops the daemon/service.
+#
+anydesk_stop()
+{
+  if [ -e $PID ]; then
+    kill $(cat $PID)
+    killall $PRGNAM
+    rm -rf $PID
+    echo "$DESC has been stopped."
+  else
+    echo "$DESC is not running."
+  fi
+}
+
+#
+# Function that shows the current status of the daemon/service.
+#
+anydesk_status()
+{
+  if [ -s $PID ]; then
+    echo "$DESC is running: $(cat $PID)"
+  else
+    echo "$DESC is not running."
+  fi
+}
+
+
+case "$1" in
+  start)
+	anydesk_start
+	;;
+  stop)
+	anydesk_stop
+	;;
+  restart|force-reload)
+	anydesk_stop
+	sleep 2
+	anydesk_start
+	;;
+  status)
+	anydesk_status
+	;;
+  *)
+	echo "Usage: $0 {start|stop|restart|force-reload|status}" >&2
+	exit 1
+	;;
+esac
+
+exit 0
diff --git a/network/anydesk/slack-desc b/network/anydesk/slack-desc
new file mode 100644
index 0000000000..fe2b46e17f
--- /dev/null
+++ b/network/anydesk/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+       |-----handy-ruler------------------------------------------------------|
+anydesk: anydesk (Remote Desktop Software)
+anydesk:
+anydesk: Connect to a computer remotely, be it from the other end of the
+anydesk: office or halfway around the world. AnyDesk ensures secure and
+anydesk: reliable remote desktop connections for IT professionals
+anydesk: and on-the-go individuals alike. AnyDesk works across all your
+anydesk: devices and operating systems: Windows, Linux, macOS, iOS, Android,
+anydesk: FreeBSD and even your Raspberry Pi!
+anydesk:
+anydesk: https://anydesk.com/
+anydesk:
diff --git a/network/aoetools/aoetools.SlackBuild b/network/aoetools/aoetools.SlackBuild
index fda7f862a3..17bc652402 100644
--- a/network/aoetools/aoetools.SlackBuild
+++ b/network/aoetools/aoetools.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for aoetools
 #
@@ -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.
 
+# 20220403 bkw: Modified by SlackBuilds.org, BUILD=2:
+# - fix permissions on binaries and man pages.
+# - i486 => i586.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=aoetools
 VERSION=${VERSION:-36}
-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,18 +76,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 {} \+
 
-make
+# 20220403 bkw: -Wl,-s strips the binaries.
+make CFLAGS="$SLKCFLAGS -Wl,-s"
 make install 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
+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
+# 20220403 bkw: permissions were bad (binaries were 700, man pages were 664).
+chmod 755 $PKG/usr/sbin/*
+chmod 644 $PKG/usr/man/man*/*
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
@@ -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/network/apt-mirror/apt-mirror.SlackBuild b/network/apt-mirror/apt-mirror.SlackBuild
index c2c6a1d420..d1fa7c9d12 100644
--- a/network/apt-mirror/apt-mirror.SlackBuild
+++ b/network/apt-mirror/apt-mirror.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for apt-mirror
 
@@ -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=apt-mirror
 VERSION=${VERSION:-0.5.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}
@@ -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/network/argus-clients/argus-clients.SlackBuild b/network/argus-clients/argus-clients.SlackBuild
index 6a39c144e9..c9c7a09f28 100644
--- a/network/argus-clients/argus-clients.SlackBuild
+++ b/network/argus-clients/argus-clients.SlackBuild
@@ -1,28 +1,39 @@
-#!/bin/sh
+#!/bin/bash
 # Slackware build script for argus-clients
 # Written by R. Bailey <GooseYArd@gmail.com>
 #	     Emmanuel N. Millan <emmanueln@gmail.com> - 2018
 
+# 20220410 bkw: Modified by SlackBuilds.org, BUILD=2:
+# - do not install headers in /usr/include with execute permission!
+# - remove useless INSTALL from doc dir.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=argus-clients
-VERSION=${VERSION:-3.0.8.2}
-BUILD=${BUILD:-1}
+VERSION=${VERSION:-3.0.8.3}
+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 \
+  -o -perm 511 \) -exec chmod 755 {} \+ -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" \
@@ -67,16 +78,17 @@ make \
 make install \
   docdir=/usr/doc/$PRGNAM-$VERSION \
   DESTDIR=$PKG
+gzip -9 $PKG/usr/man/man*/*
+
+# 20220410 bkw: wtf, upstream?
+find $PKG/usr/include/argus/ -type f -exec chmod 0644 {} \+
 
 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 COPYING CREDITS INSTALL MANIFEST README VERSION \
+  ChangeLog COPYING CREDITS MANIFEST README VERSION \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
@@ -84,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/network/argus-clients/argus-clients.info b/network/argus-clients/argus-clients.info
index ee56e180d6..5637f19aba 100644
--- a/network/argus-clients/argus-clients.info
+++ b/network/argus-clients/argus-clients.info
@@ -1,8 +1,8 @@
 PRGNAM="argus-clients"
-VERSION="3.0.8.2"
-HOMEPAGE="http://www.qosient.com/argus/index.shtml"
-DOWNLOAD="http://qosient.com/argus/src/argus-clients-3.0.8.2.tar.gz"
-MD5SUM="09f453e3e581587cd69bc2c2b52d5c0a"
+VERSION="3.0.8.3"
+HOMEPAGE="https://www.qosient.com/argus/index.shtml"
+DOWNLOAD="https://qosient.com/argus/src/argus-clients-3.0.8.3.tar.gz"
+MD5SUM="fc3ad12cea5154d3123aa96765e7aee7"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/network/argus/argus.SlackBuild b/network/argus/argus.SlackBuild
index 05e692c8c9..ba81068225 100644
--- a/network/argus/argus.SlackBuild
+++ b/network/argus/argus.SlackBuild
@@ -1,29 +1,39 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for Argus
 # Written by R. Bailey <GooseYArd@gmail.com>
 #	     Emmanuel N. Millan <emmanueln@gmail.com> - 2018
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=argus
 VERSION=${VERSION:-3.0.8.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"
@@ -94,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/network/aria2/aria2.SlackBuild b/network/aria2/aria2.SlackBuild
index 832829f1b4..b5490d1c1e 100644
--- a/network/aria2/aria2.SlackBuild
+++ b/network/aria2/aria2.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 # Slackware build script for aria2
 # Originally written by Marco Cecchetti <mrc.ildp@gmail.com>
 # 2015-2017 maintained by Willy Sudiarto Raharjo <willysr@slackbuilds.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.
 
-PRGNAM=${PRGNAM:-aria2}
-VERSION=${VERSION:-1.34.0}
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=aria2
+VERSION=${VERSION:-1.37.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 HTTPS=${HTTPS:-gnutls}
 XML=${XML:-libxml2}
@@ -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}
@@ -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/network/aria2/aria2.info b/network/aria2/aria2.info
index 8b08114062..a3b09575fc 100644
--- a/network/aria2/aria2.info
+++ b/network/aria2/aria2.info
@@ -1,10 +1,10 @@
 PRGNAM="aria2"
-VERSION="1.34.0"
+VERSION="1.37.0"
 HOMEPAGE="https://aria2.github.io/"
-DOWNLOAD="https://github.com/aria2/aria2/releases/download/release-1.34.0/aria2-1.34.0.tar.xz"
-MD5SUM="923b2f6cab7414a8ef0c05a264e070bb"
+DOWNLOAD="https://github.com/aria2/aria2/releases/download/release-1.37.0/aria2-1.37.0.tar.xz"
+MD5SUM="dd00565c2f671331735089e6b807ece0"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="c-ares"
+REQUIRES=""
 MAINTAINER="Willy Sudiarto Raharjo"
 EMAIL="willysr@slackbuilds.org"
diff --git a/network/arm/README b/network/arm/README
deleted file mode 100644
index 9524822e45..0000000000
--- a/network/arm/README
+++ /dev/null
@@ -1,19 +0,0 @@
-The anonymizing relay monitor (arm) is a terminal status monitor for Tor
-relays, intended for command-line aficionados, ssh connections, and anyone
-stuck with a tty terminal. This works much like top does for system usage,
-providing real time statistics for:
-
-    - bandwidth, cpu, and memory usage
-    - relay's current configuration
-    - logged events
-    - connection details (ip, hostname, fingerprint, and consensus data)
-    - etc.
-
-This SlackBuild will also verify the package's PGP signature
-if the following conditions are met:
-
-    - You have GnuPG installed
-    - You have Damian Johnson's (the author) public PGP key (0x9ABBEEC6)
-      in your trustedkeys.gpg keyring
-    - You have downloaded the sig file from
-      http://www.atagar.com/arm/resources/arm-${VERSION}.tar.bz2.asc
diff --git a/network/arm/arm.SlackBuild b/network/arm/arm.SlackBuild
deleted file mode 100644
index a929bb5c60..0000000000
--- a/network/arm/arm.SlackBuild
+++ /dev/null
@@ -1,73 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for arm
-# Written by pyllyukko - pyllyukko AT maimed dot org
-
-PRGNAM=arm
-VERSION=${VERSION:-1.4.5.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
-
-# The package can be verified with Damian Johnson's PGP key (0x9ABBEEC6).
-# If we have GPG installed, we try to verify the signature.
-if [ -x "/usr/bin/gpg" -a -x "/usr/bin/gpgv" ]
-then
-  set +e
-  # This will check if we have the correct key in our keyring.
-  # For the trustedkeys.gpg, see "man 1 gpgv".
-  /usr/bin/gpg --keyring trustedkeys.gpg --no-default-keyring --list-keys 0x9ABBEEC6 &>/dev/null
-  GPG_RET=${?}
-  # 2 means we don't have his key, 0 means we do.
-  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.bz2.asc" ]
-  then
-    /usr/bin/gpgv "${CWD}/${PRGNAM}-${VERSION}.tar.bz2.asc"
-  fi
-fi
-
-tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
-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 {} \;
-
-# prereq.py checks python version and for required packages
-python src/prereq.py
-python setup.py install --root=$PKG --docPath 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
-
-# Move the man pages. setup.py handles the compressing.
-mv -v ${PKG}/usr/share/man ${PKG}/usr
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
-  ChangeLog 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}
diff --git a/network/arm/arm.info b/network/arm/arm.info
deleted file mode 100644
index 069b14ac90..0000000000
--- a/network/arm/arm.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="arm"
-VERSION="1.4.5.0"
-HOMEPAGE="http://www.atagar.com/arm/"
-DOWNLOAD="http://www.atagar.com/arm/resources/static/arm-1.4.5.0.tar.bz2 http://www.atagar.com/arm/resources/static/arm-1.4.5.0.tar.bz2.asc"
-MD5SUM="f85f306e50b90796ab7097d948e8fcf2 084e40f1c64800c83f2238f510efa0a0"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="pyllyukko"
-EMAIL="pyllyukko AT maimed dot org"
diff --git a/network/arm/slack-desc b/network/arm/slack-desc
deleted file mode 100644
index 6e512ee01b..0000000000
--- a/network/arm/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------------------------------------------------------|
-arm: arm (The anonymizing relay monitor)
-arm:
-arm: The anonymizing relay monitor (arm) is a terminal status monitor for
-arm: Tor relays, intended for command-line aficionados, ssh connections,
-arm: and anyone stuck with a tty terminal. This works much like top does
-arm: for system usage, providing real time statistics for: bandwidth, cpu,
-arm: memory usage, relay's current configuration, logged events,
-arm: connection details (ip, hostname, fingerprint, and consensus data),
-arm: etc.
-arm:
-arm: Homepage: http://www.atagar.com/arm/
diff --git a/network/armcord/README b/network/armcord/README
new file mode 100644
index 0000000000..f723a315a6
--- /dev/null
+++ b/network/armcord/README
@@ -0,0 +1,4 @@
+armcord (Discord custom client)
+
+armcord is a custom client designed to enhance your Discord
+experience while keeping everything lightweight.
diff --git a/network/armcord/armcord.SlackBuild b/network/armcord/armcord.SlackBuild
new file mode 100644
index 0000000000..658c50305e
--- /dev/null
+++ b/network/armcord/armcord.SlackBuild
@@ -0,0 +1,87 @@
+#!/bin/bash
+
+# Slackware build script for armcord
+#
+#~ # Copyright 2022-2023  Matthew Miller <mattallmill@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=armcord
+SRCNAM=ArmCord
+VERSION=${VERSION:-3.2.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}
+
+set -eu
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $PKG
+ar x $CWD/${SRCNAM}_${VERSION}_amd64.deb data.tar.xz 
+tar xvf $PKG/data.tar.xz
+rm $PKG/data.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 $PKG -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
+( cd $PKG/usr/bin ; ln -sf /opt/$SRCNAM/$PRGNAM $PRGNAM )  
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+# Don't need these:
+rm -rf $PKG/usr/share/doc $PKG/usr/share/lintian
+
+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/network/armcord/armcord.desktop b/network/armcord/armcord.desktop
new file mode 100644
index 0000000000..a577c0fc48
--- /dev/null
+++ b/network/armcord/armcord.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Encoding=UTF-8
+Version=1.0
+Type=ArmCord
+Terminal=false
+Exec=/usr/local/bin/armcord
+Name=armcord    
+Icon=/usr/share/icons/armcord_icon.png
\ No newline at end of file
diff --git a/network/armcord/armcord.info b/network/armcord/armcord.info
new file mode 100644
index 0000000000..13005d28c0
--- /dev/null
+++ b/network/armcord/armcord.info
@@ -0,0 +1,10 @@
+PRGNAM="armcord"
+VERSION="3.2.6"
+HOMEPAGE="https://github.com/ArmCord/ArmCord"
+DOWNLOAD="UNSUPPORTED"
+MD5SUM=""
+DOWNLOAD_x86_64="https://github.com/ArmCord/ArmCord/releases/download/v3.2.6/ArmCord_3.2.6_amd64.deb"
+MD5SUM_x86_64="cd0e07b149506c8d19d01005c51324b0"
+REQUIRES=""
+MAINTAINER="Matthew Miller"
+EMAIL="mattallmill@gmail.com"
diff --git a/network/armcord/armcord_icon.png b/network/armcord/armcord_icon.png
new file mode 100644
index 0000000000..70c0b83a96
--- /dev/null
+++ b/network/armcord/armcord_icon.png
diff --git a/network/emesene/doinst.sh b/network/armcord/doinst.sh
index 4a25de5e6f..4a25de5e6f 100644
--- a/network/emesene/doinst.sh
+++ b/network/armcord/doinst.sh
diff --git a/network/armcord/slack-desc b/network/armcord/slack-desc
new file mode 100644
index 0000000000..10345838c4
--- /dev/null
+++ b/network/armcord/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+       |-----handy-ruler------------------------------------------------------|
+armcord: armcord (Discord custom client)
+armcord:
+armcord: armcord is a custom client designed to enhance your Discord
+armcord: experience while keeping everything lightweight.
+armcord:
+armcord:
+armcord: Homepage: https://github.com/ArmCord/ArmCord
+armcord:
+armcord:
+armcord:
+armcord:
diff --git a/network/arno-iptables-firewall/README b/network/arno-iptables-firewall/README
index 57dc9d2018..8c697817da 100644
--- a/network/arno-iptables-firewall/README
+++ b/network/arno-iptables-firewall/README
@@ -1,39 +1,52 @@
-arno-iptables-firewall is a front-end for iptables. Its configuration script
-will set up a secure and restrictive firewall by just asking a few questions.
-This includes configuring internal networks for Internet access via NAT and
-potential network services like http or ssh. Moreover, it provides advanced
-additional features that can be enabled in the well documented configuration
-file.
+arno-iptables-firewall is a front-end for iptables. Its configuration
+script will set up a secure and restrictive firewall by just asking
+a few questions.  This includes configuring internal networks for
+Internet access via NAT, and potential network services like http or
+ssh. Moreover, it provides advanced additional features that can be
+enabled in the well documented configuration file.
 
-NOTE - The setup script will *not* run automatically after your package was
-installed. In order to run the script you have to issue the following command:
+NOTE - The setup script will NOT run automatically after the package
+has been installed. In order to run the script, the following command
+has to be issued:
 
 # arno-iptables-firewall-configure
 
-To enable the startup of the firewall at boot-time you need to create a symlink
-as follows (in order to disable it, either remove the symlink or "chmod -x" the
-startup script):
+In order to start the firewall automatically at boot-time, an
+"rc.firewall" symlink to the startup script has to be created
+in /etc/rc.d/ and of course the startup script itself should be
+executable:
 
-# ln -sv /etc/rc.d/rc.arno-iptables-firewall /etc/rc.d/rc.firewall
-# chmod +x /etc/rc.d/rc.arno-iptables-firewall
+# cd /etc/rc.d/
+# ln -sv rc.arno-iptables-firewall rc.firewall
+# chmod +x rc.arno-iptables-firewall
 
-You can also start the firewall manually with one of the following commands:
+In order to disable startup of the firewall at boot time, remove the
+symlink or the executable bit from the startup script:
 
-# /etc/rc.d/rc.arno-iptables-firewall start
+# rm /etc/rc.d/rc.firewall
+# chmod -x /etc/rc.d/rc.arno-iptables-firewall
+
+The firewall can also be started manually with one of the following
+commands:
 
 # arno-iptables-firewall start
+# /etc/rc.d/rc.arno-iptables-firewall start
+
+Please refer to the man page for more details.
+
 
 IMPORTANT - A few security notes from the upstream author:
 
-1) If possible make sure that the firewall is started before the (ADSL) Internet
-connection is enabled. For a ppp-interface that doesn't exist yet you can use
-the wildcard device called "ppp+" (but you can only use ppp+ if there aren't any
-other ppp interfaces).
+1) If possible make sure that the firewall is started before the
+(ADSL) Internet connection is enabled. For a ppp-interface that
+doesn't exist yet, you can use the wildcard device called "ppp+" (but
+you can only use ppp+ if there aren't any other ppp interfaces).
 
-2) Don't change any (security) settings ('EXPERT SETTINGS') if you don't really
-understand what they mean. Changing them anyway could have a big impact on the
-security of your machine.
+2) Don't change any (security) settings ('EXPERT SETTINGS') if you
+don't really understand what they mean. Changing them anyway could
+have a big impact on the security of your machine.
 
-3) A lot of people complain that their server stopped working after installing
-the firewall. This is the *correct* behaviour for a firewall: blocking *all*
-incoming traffic by default. Configure your OPEN_TCP (e.g.) accordingly.
+3) A lot of people complain that their server stopped working after
+installing the firewall. This is the correct behaviour for a firewall:
+blocking all incoming traffic by default. Configure your OPEN_TCP
+(e.g.) accordingly.
diff --git a/network/arno-iptables-firewall/arno-iptables-firewall.SlackBuild b/network/arno-iptables-firewall/arno-iptables-firewall.SlackBuild
index 3a93a44d14..636bae485c 100644
--- a/network/arno-iptables-firewall/arno-iptables-firewall.SlackBuild
+++ b/network/arno-iptables-firewall/arno-iptables-firewall.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for arno-iptables-firewall
 
-# Copyright 2013-2015 Philip Lacroix <slackph at posteo dot de>
+# Copyright 2013-2020 Philip Lacroix <slackph at posteo dot de>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -25,15 +25,27 @@
 # Thanks to Matteo Bernardini and Robby Workman for their valuable remarks
 # after the first submission of this SlackBuild.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=arno-iptables-firewall
 SRCNAM=aif
-VERSION=${VERSION:-2.0.1e}
-BUILD=${BUILD:-3}
+VERSION=${VERSION:-2.1.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
 
-CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
-PKG=${PKG:-$TMP/package-$PRGNAM}
+PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
 set -e
@@ -56,8 +68,8 @@ chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 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 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 PRGBIN=$PKG/usr/sbin
 PRGETC=$PKG/etc/$PRGNAM
@@ -71,23 +83,25 @@ install -m 0755 -D ./configure.sh $PRGBIN/$PRGNAM-configure
 install -m 0755 ./bin/arno-fwfilter $PRGBIN/
 install -m 0755 ./bin/$PRGNAM $PRGBIN/
 
-# Patch the configuration script. We need this in order to be able to
-# run the script from outside the source directory as well. We're going
-# to (1) change from relative to absolute the paths to the environment
-# file and firewall executable; (2) rename and change the path to the
-# startup script (this is for better consistency with Slackware's init
-# system); (3) change the path to the unmodified copy of the config
-# file, needed to check for existing custom setups. We will NOT create
-# a Slackware-compliant /etc/rc.d/rc.firewall symlink to the startup
-# script, as this should be done manually by the sysadmin. We won't 
-# create any SystemV-style symlinks either. (4) We will allow the script
-# to be run correctly more than once, by removing previously set values
-# if no value is entered: this is to prevent e.g. ports from remaining
-# open, or internal interfaces from remaining enabled with NAT. Finally
-# (5) we append the note, picked from the original installation script
-# and slightly enhanced, that the user will see when configuration is
-# done: this is to inform that an rc.firewall symlink has to be created
-# in order to start up the firewall at boot-time in a proper way.
+# Patch the configuration script. We need this to be able to run the
+# script from outside the source directory as well. We're going to:
+#
+# 1) Change from relative to absolute the paths to the environment file
+#    and the firewall executable.
+# 2) Rename and change the path to the startup script, for consistency with
+#    Slackware's init system.
+# 3) Change the path to the unmodified copy of the config file, needed to
+#    check for already existing setups.
+# 4) Allow the script to be run correctly more than once, by removing
+#    previously set values if no values are entered: this is to prevent,
+#    for example, ports from remaining open, or NAT from remaining enabled.
+# 5) Append the note, copied from the original install script and adapted
+#    to the Slackware system, that users read when configuration is done:
+#    this is mainly to inform that the "rc.firewall" symlink has to be
+#    manually created in order to start up the firewall at boot-time. We
+#    will NOT create the symlink automatically, as this should be done by
+#    the system administrator.
+
 patch $PRGBIN/$PRGNAM-configure < $CWD/files/patch-configuration-script.diff
 
 # Copy and compress man pages.
@@ -110,7 +124,7 @@ done
 # expected by the configuration script for comparison purposes; create
 # link to plugin as in the original script.
 mkdir -p $PRGSHR
-cp -a ./share/$PRGNAM/* $PRGSHR/
+cp -a ./share/$PRGNAM/{environment,plugins} $PRGSHR/
 cp -a $PRGETC/firewall.conf.new $PRGSHR/firewall.conf.orig
 ln -sv /usr/share/$PRGNAM/plugins/traffic-accounting-show $PRGBIN/
 
@@ -134,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-noarch-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/network/arno-iptables-firewall/arno-iptables-firewall.info b/network/arno-iptables-firewall/arno-iptables-firewall.info
index 1bd234e44e..7fb24b23e8 100644
--- a/network/arno-iptables-firewall/arno-iptables-firewall.info
+++ b/network/arno-iptables-firewall/arno-iptables-firewall.info
@@ -1,10 +1,10 @@
 PRGNAM="arno-iptables-firewall"
-VERSION="2.0.1e"
+VERSION="2.1.0"
 HOMEPAGE="https://github.com/arno-iptables-firewall/aif"
-DOWNLOAD="https://github.com/arno-iptables-firewall/aif/archive/2.0.1e.tar.gz"
-MD5SUM="4981a336f55e2db90f594beedcaef47d"
+DOWNLOAD="https://github.com/arno-iptables-firewall/aif/archive/2.1.0/aif-2.1.0.tar.gz"
+MD5SUM="8f890a80bb6e8d2d0681c9a822ae39de"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
 MAINTAINER="Philip Lacroix"
-EMAIL="slackph at bluebottle dot com"
+EMAIL="slackph at posteo dot de"
diff --git a/network/arno-iptables-firewall/files/patch-configuration-file.diff b/network/arno-iptables-firewall/files/patch-configuration-file.diff
index c530647a22..4be4f835ab 100644
--- a/network/arno-iptables-firewall/files/patch-configuration-file.diff
+++ b/network/arno-iptables-firewall/files/patch-configuration-file.diff
@@ -1,16 +1,8 @@
-233c233
-< IP4TABLES="/sbin/iptables"
----
-> IP4TABLES="/usr/sbin/iptables"
-238c238
-< IP6TABLES="/sbin/ip6tables"
----
-> IP6TABLES="/usr/sbin/ip6tables"
-242c242
+256c256
 < ENV_FILE="/usr/local/share/arno-iptables-firewall/environment"
 ---
 > ENV_FILE="/usr/share/arno-iptables-firewall/environment"
-246c246
+260c260
 < PLUGIN_BIN_PATH="/usr/local/share/arno-iptables-firewall/plugins"
 ---
 > PLUGIN_BIN_PATH="/usr/share/arno-iptables-firewall/plugins"
diff --git a/network/arno-iptables-firewall/files/patch-configuration-script.diff b/network/arno-iptables-firewall/files/patch-configuration-script.diff
index dacac17330..800fb9157c 100644
--- a/network/arno-iptables-firewall/files/patch-configuration-script.diff
+++ b/network/arno-iptables-firewall/files/patch-configuration-script.diff
@@ -5,96 +5,145 @@
 > if [ -f /usr/share/arno-iptables-firewall/environment ]; then
 >   . /usr/share/arno-iptables-firewall/environment
 36c36
-<   printf "\033[40m\033[1;31mERROR: Could not read environment file ./share/arno-iptables-firewall/environment!\033[0m\n" >&2
+<   printf "\033[40m\033[1;31mERROR: Could not read environment file ./share/arno-iptables-firewall/environment!\033[0m\n\n" >&2
 ---
->   printf "\033[40m\033[1;31mERROR: Could not read environment file /usr/share/arno-iptables-firewall/environment!\033[0m\n" >&2
-70a71,75
+>   printf "\033[40m\033[1;31mERROR: Could not read environment file /usr/share/arno-iptables-firewall/environment!\033[0m\n\n" >&2
+76a77,81
 >   else
 >     # If no value is entered, remove (unless commented) previously set
->     # values: this is to prevent e.g. ports from remaining open, or
->     # internal interfaces from remaining enabled with NAT.
+>     # values: this is to prevent, for example, ports from remaining open,
+>     # or internal interfaces from remaining enabled with NAT.
 >     sed -i -e "s~^$2=.*$~$2=\"\"~" "$1"
-85c90
+91c96
 < #    else
 ---
 >     else
-86a92,94
->       # This is needed in order to allow the function change_conf_var() 
+92a98,100
+>       # This is needed to allow the function change_conf_var() 
 >       # to remove values for previously set open ports.
 >       change_conf_var "$2" "$3" ""
-216a225,231
+183,186c191,194
+<   echo "Listing available interfaces:"
+<   echo "-----------------------------"
+<   list_interfaces; 
+<   echo "-----------------------------"
+---
+> #  echo "Listing available interfaces:"
+> #  echo "-----------------------------"
+> #  list_interfaces; 
+> #  echo "-----------------------------"
+255a264,270
 >   else
->     # Remove previously set values related to the internal interface, if
->     # no internal interface is entered with this script.
+>     # Remove previously set values related to the internal interface,
+>     # if no internal interface is entered with this script.
 >     change_conf_var "$FIREWALL_CONF" "INT_IF" ""
 >     change_conf_var "$FIREWALL_CONF" "INTERNAL_NET" ""
 >     change_conf_var "$FIREWALL_CONF" "INT_NET_BCAST_ADDRESS" ""
 >     change_conf_var "$FIREWALL_CONF" "NAT" "0"
-218c233
-<   
----
-> 
-220,222c235,237
-<   chmod 755 /etc/init.d/arno-iptables-firewall
-<   chown 0:0 "$FIREWALL_CONF" /etc/init.d/arno-iptables-firewall
-<   chmod 600 "$FIREWALL_CONF"
+259,261c274,276
+<   if [ -e /etc/init.d/arno-iptables-firewall ]; then
+<     chown 0:0 /etc/init.d/arno-iptables-firewall
+<     chmod 755 /etc/init.d/arno-iptables-firewall
 ---
->   chmod 755 /etc/rc.d/rc.arno-iptables-firewall
->   chown 0:0 "$FIREWALL_CONF" /etc/rc.d/rc.arno-iptables-firewall
->   chmod 600 "$FIREWALL_CONF"  
-227c242
+>   if [ -e /etc/rc.d/rc.arno-iptables-firewall ]; then
+>     chown 0:0 /etc/rc.d/rc.arno-iptables-firewall
+>     chmod 755 /etc/rc.d/rc.arno-iptables-firewall
+271c286
 < AIF_VERSION="$(grep "MY_VERSION=" ./bin/arno-iptables-firewall |sed -e "s/^MY_VERSION=\"//" -e "s/\"$//")"
 ---
 > AIF_VERSION="$(grep "MY_VERSION=" /usr/sbin/arno-iptables-firewall |sed -e "s/^MY_VERSION=\"//" -e "s/\"$//")"
-235,251d249
+279,339c294
+< RC_PATH="/etc"
+< # Check for Redhat/SUSE rc.d
+< if [ -d "/etc/rc.d" ]; then
+<   RC_PATH="/etc/rc.d"
+< fi
+< 
 < # Remove any symlinks in rc*.d out of the way
-< rm -f /etc/rc*.d/*arno-iptables-firewall
+< rm -f $RC_PATH/rc0.d/*arno-iptables-firewall
+< rm -f $RC_PATH/rc1.d/*arno-iptables-firewall
+< rm -f $RC_PATH/rc2.d/*arno-iptables-firewall
+< rm -f $RC_PATH/rc3.d/*arno-iptables-firewall
+< rm -f $RC_PATH/rc4.d/*arno-iptables-firewall
+< rm -f $RC_PATH/rc5.d/*arno-iptables-firewall
+< rm -f $RC_PATH/rc6.d/*arno-iptables-firewall
+< rm -f $RC_PATH/rcS.d/*arno-iptables-firewall
 < 
-< if get_user_yn "Do you want to start the firewall at boot (via /etc/init.d/) (Y/N)?" "y"; then
-<   if [ -d /etc/rcS.d ]; then
-<     ln -sv /etc/init.d/arno-iptables-firewall /etc/rcS.d/S41arno-iptables-firewall
+< if get_user_yn "Do you want to start the firewall at boot" "y"; then
+<   DONE=0
+< 
+<   if check_command systemctl; then
+<     if systemctl enable arno-iptables-firewall; then
+<       echo "* Successfully enabled service with systemctl"
+<       DONE=1
+<     fi
+<   elif check_command update-rc.d; then
+<     # Note: Currently update-rc.d doesn't seem to properly use the init script's LSB header, so specify explicitly
+<     if update-rc.d -f arno-iptables-firewall start 11 S . stop 10 0 6 .; then
+<       echo "* Successfully enabled service with update-rc.d"
+<       DONE=1
+<     fi
+<   elif check_command chkconfig; then
+<     if chkconfig --add arno-iptables-firewall && chkconfig arno-iptables-firewall on; then
+<       echo "* Successfully enabled service with chkconfig"
+<       DONE=1
+<     fi
 <   else
-<     ln -sv /etc/init.d/arno-iptables-firewall /etc/rc2.d/S11arno-iptables-firewall
+<     if [ -d "$RC_PATH/rcS.d" ]; then
+<       if ln -sv /etc/init.d/arno-iptables-firewall "$RC_PATH/rcS.d/S11arno-iptables-firewall" &&
+<          ln -sv /etc/init.d/arno-iptables-firewall "$RC_PATH/rc0.d/K10arno-iptables-firewall" &&
+<          ln -sv /etc/init.d/arno-iptables-firewall "$RC_PATH/rc6.d/K10arno-iptables-firewall"; then
+<         echo "* Successfully enabled service through $RC_PATH/rcS.d/ symlink"
+<         DONE=1
+<       fi
+<     elif [ -d "$RC_PATH/rc2.d" ]; then
+<       if ln -sv /etc/init.d/arno-iptables-firewall "$RC_PATH/rc2.d/S09arno-iptables-firewall" &&
+<          ln -sv /etc/init.d/arno-iptables-firewall "$RC_PATH/rc0.d/K91arno-iptables-firewall" &&
+<          ln -sv /etc/init.d/arno-iptables-firewall "$RC_PATH/rc6.d/K91arno-iptables-firewall"; then
+<         echo "* Successfully enabled service through $RC_PATH/rc2.d/ symlink"
+<         DONE=1
+<       fi
+<     else
+<       echo "WARNING: Unable to detect /rc2.d or /rcS.d directories. Skipping runlevel symlinks" >&2
+<     fi
 <   fi
 < 
-<   # Check for insserv. Used for dependency based booting on eg. Debian
-<   INSSERV="$(find_command /sbin/insserv)"
-<   if [ -n "$INSSERV" ]; then
-<     "$INSSERV" arno-iptables-firewall
+<   if [ $DONE -eq 0 ]; then
+<     echo "ERROR: Unable to setup automatic start at boot. Please investigate" >&2
 <   fi
 < fi
 < 
-253c251
-<   change_conf_var /etc/init.d/arno-iptables-firewall "VERBOSE" "1"
+< if [ -e /etc/init.d/arno-iptables-firewall ]; then
+---
+> if [ -e /etc/rc.d/rc.arno-iptables-firewall ]; then
+341c296
+<     change_conf_var /etc/init.d/arno-iptables-firewall "VERBOSE" "1"
 ---
->   change_conf_var /etc/rc.d/rc.arno-iptables-firewall "VERBOSE" "1"
-255c253
-<   change_conf_var /etc/init.d/arno-iptables-firewall "VERBOSE" "0"
+>     change_conf_var /etc/rc.d/rc.arno-iptables-firewall "VERBOSE" "1"
+343c298
+<     change_conf_var /etc/init.d/arno-iptables-firewall "VERBOSE" "0"
 ---
->   change_conf_var /etc/rc.d/rc.arno-iptables-firewall "VERBOSE" "0"
-258c256
+>     change_conf_var /etc/rc.d/rc.arno-iptables-firewall "VERBOSE" "0"
+347c302
 < if diff ./etc/arno-iptables-firewall/firewall.conf "$FIREWALL_CONF" >/dev/null; then
 ---
 > if diff /usr/share/arno-iptables-firewall/firewall.conf.orig "$FIREWALL_CONF" >/dev/null; then
-274a273,291
+362a318,335
 > echo ""
 > echo "-------------------------------------------------------------------------------"
-> echo "** NOTE: 1) You can now (manually) (re)start the firewall by executing       **"
-> echo "**       \"/etc/rc.d/rc.arno-iptables-firewall start\" or                      **"
-> echo "**       \"/etc/rc.d/rc.arno-iptables-firewall restart\"                       **"
-> echo "**       It is recommended however to first review the settings in           **"
-> echo "**       /etc/arno-iptables-firewall/firewall.conf!                          **"
+> echo "** NOTE: 1) After configuration, it is recommended to review the firewall    **"
+> echo "**          settings in /etc/arno-iptables-firewall/firewall.conf            **"
 > echo "**                                                                           **"
-> echo "**       2) In order to start the firewall automatically at boot-time,       **"
-> echo "**       you will need to manually create in /etc/rc.d/ an appropriate       **"
-> echo "**       symlink, named \"rc.firewall\", pointing to the startup script.       **"
-> echo "**       To do that, issue the following command:                            **"
+> echo "**       2) To manually start or restart the firewall, run:                  **"
+> echo "**              /etc/rc.d/rc.arno-iptables-firewall start                    **"
+> echo "**          or  /etc/rc.d/rc.arno-iptables-firewall restart                  **"
 > echo "**                                                                           **"
-> echo "**       ln -sv /etc/rc.d/rc.arno-iptables-firewall /etc/rc.d/rc.firewall    **"
+> echo "**       3) To start the firewall automatically at boot-time, you need an    **"
+> echo "**          appropriate symlink, \"rc.firewall\",  pointing to the startup     **"
+> echo "**          script. Issue the following commands to create the symlink:      **"
+> echo "**              cd /etc/rc.d/                                                **"
+> echo "**              ln -sv rc.arno-iptables-firewall rc.firewall                 **"
 > echo "**                                                                           **"
-> echo "**       Delete the link if you wish to disable firewall startup at boot-    **"
-> echo "**       time, or \"chmod -x\" the startup script for the same result.         **"
+> echo "**       4) To disable startup at boot-time, simply delete the symlink,      **"
+> echo "**          or remove the executable bit from the startup script.            **"
 > echo "-------------------------------------------------------------------------------"
-> echo ""
-277d293
-< 
diff --git a/network/arno-iptables-firewall/files/patch-startup-script.diff b/network/arno-iptables-firewall/files/patch-startup-script.diff
index c31514e260..5a005f25ec 100644
--- a/network/arno-iptables-firewall/files/patch-startup-script.diff
+++ b/network/arno-iptables-firewall/files/patch-startup-script.diff
@@ -1,12 +1,12 @@
 4c4
-< # description: init.d script for Arno's iptables firewall
+< # description: init.d script for Arno's Iptables Firewall(AIF)
 ---
-> # description: rc.d script for Arno's iptables firewall
+> # description: rc.d script for Arno's Iptables Firewall(AIF)
 7c7
 < # Provides:          arno-iptables-firewall
 ---
 > # Provides:          rc.arno-iptables-firewall
-15,21c15,23
+15,21c15,22
 < ############################################################################################
 < # You should put this script in eg. "/etc/init.d/" .                                       #
 < # Furthermore make sure it's executable! -> "chmod 700" or "chmod +x" it                   #
@@ -18,13 +18,12 @@
 > ################################################################################
 > # You should put this script in "/etc/rc.d/".                                  #
 > # Furthermore make sure it's executable! -> "chmod 755" or "chmod +x" it.      #
-> # If you want to run it upon boot, either create an "rc.firewall" link to this #
-> # script ("ln -sv /etc/rc.d/rc.arno-iptables-firewall /etc/rc.d/rc.firewall")  #
-> # or edit the network system startup script "/etc/rc.d/rc.inet2", by renaming  #
-> # both occurrences of "rc.firewall" to match the name ot this script, that is, #
-> # "rc.arno-iptables-firewall".                                                 #
+> # If you want to run it upon boot, create an "rc.firewall" symlink to the      #
+> # rc.arno-iptables-firewall script:                                            #
+> #                                                                              #
+> #         ln -sv /etc/rc.d/rc.arno-iptables-firewall /etc/rc.d/rc.firewall     #
 > ################################################################################
-24c25
+24c26
 < PROGRAM="/usr/local/sbin/arno-iptables-firewall"
 ---
 > PROGRAM="/usr/sbin/arno-iptables-firewall"
diff --git a/network/arno-iptables-firewall/slack-desc b/network/arno-iptables-firewall/slack-desc
index 6bf5e1aefe..f9350be435 100644
--- a/network/arno-iptables-firewall/slack-desc
+++ b/network/arno-iptables-firewall/slack-desc
@@ -11,7 +11,7 @@ arno-iptables-firewall:
 arno-iptables-firewall: arno-iptables-firewall is a front-end for iptables. Its configuration
 arno-iptables-firewall: script will set up a secure and restrictive firewall by just asking a
 arno-iptables-firewall: few questions. This includes the configuration of internal networks
-arno-iptables-firewall: for Internet access via NAT and potential network services like http
+arno-iptables-firewall: for Internet access via NAT, and potential network services like http
 arno-iptables-firewall: or ssh. Moreover, it provides advanced additional features that can be
 arno-iptables-firewall: enabled in the well documented configuration file.
 arno-iptables-firewall:
diff --git a/network/arora/README b/network/arora/README
deleted file mode 100644
index 191890ec62..0000000000
--- a/network/arora/README
+++ /dev/null
@@ -1,4 +0,0 @@
-Arora is a lightweight cross-platform web browser.
-It uses the QtWebKit port of the fully standards-compliant WebKit
-layout engine featuring fast rendering, a powerful JavaScript engine
-and support for Netscape plugins.
diff --git a/network/arora/arora.SlackBuild b/network/arora/arora.SlackBuild
deleted file mode 100644
index 3d01861d7c..0000000000
--- a/network/arora/arora.SlackBuild
+++ /dev/null
@@ -1,94 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for arora
-
-# Copyright 2010 Grigorios Bouzakis <grbzks@xsmail.com>
-# Copyright 2012-2016 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy
-# 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.
-
-PRGNAM=arora
-VERSION=${VERSION:-20150623_7c7514d}
-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
-
-DOCS="AUTHORS ChangeLog LICENSE.GPL2 LICENSE.GPL3 README"
-
-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 {} \;
-
-echo "QMAKE_CXXFLAGS = $SLKCFLAGS" >> src/src.pro
-
-qmake 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
-
-mv $PKG/usr/share/man $PKG/usr/man
-
-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/network/arora/arora.info b/network/arora/arora.info
deleted file mode 100644
index 05a051321e..0000000000
--- a/network/arora/arora.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="arora"
-VERSION="20150623_7c7514d"
-HOMEPAGE="https://github.com/arora/arora"
-DOWNLOAD="http://ponce.cc/slackware/sources/repo/arora-20150623_7c7514d.tar.xz"
-MD5SUM="8efd0f44e2de2ea23ac6f9db27f4e788"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Matteo Bernardini"
-EMAIL="ponce@slackbuilds.org"
diff --git a/network/arora/doinst.sh b/network/arora/doinst.sh
deleted file mode 100644
index 8582f41de0..0000000000
--- a/network/arora/doinst.sh
+++ /dev/null
@@ -1,9 +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/network/arora/slack-desc b/network/arora/slack-desc
deleted file mode 100644
index f17a51736a..0000000000
--- a/network/arora/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------------------------------------------------------|
-arora: arora (web browser)
-arora:
-arora: Arora is a lightweight web browser which uses the QT port of
-arora: the WebKit layout engine, featuring fast rendering, a powerful
-arora: Javascript engine and support for Netscape plugins.
-arora:
-arora: Homepage: http://code.google.com/p/arora
-arora:
-arora:
-arora:
-arora:
diff --git a/network/arp-scan/arp-scan.SlackBuild b/network/arp-scan/arp-scan.SlackBuild
index 1b982b56a9..13e0653c0e 100644
--- a/network/arp-scan/arp-scan.SlackBuild
+++ b/network/arp-scan/arp-scan.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for arp-scan
 
@@ -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=arp-scan
 VERSION=${VERSION:-1.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"
@@ -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/network/arping/arping.SlackBuild b/network/arping/arping.SlackBuild
index 2f212d53a0..9a9b1be25a 100644
--- a/network/arping/arping.SlackBuild
+++ b/network/arping/arping.SlackBuild
@@ -1,8 +1,9 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for arping
 
 # Copyright 2010  Nilton Moura, Rio de Janeiro, RJ, Brasil
+# Copyright 2020  Michael Edie, Tampa, FL, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,26 +23,35 @@
 # 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: no INSTALL in doc dir.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=arping
-VERSION=${VERSION:-2.13}
-BUILD=${BUILD:-1}
+VERSION=${VERSION:-2.20}
+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"
@@ -67,9 +77,9 @@ find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
   -o -perm 511 \) -exec chmod 755 {} \; -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 are renameing the installed files arping2 to aviod conflicts with
+# We are renaming the installed files arping2 to aviod conflicts with
 # Slackware's iputils arping so lets fix the manpages and scan script.
 sed \
   -e "s|\(arping\)|\12|g" \
@@ -101,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 \
-  INSTALL LICENSE README \
+  LICENSE README \
   $PKG/usr/doc/$PRGNAM-$VERSION
 install -m644 extra/arping-scan-net.sh $PKG/usr/doc/$PRGNAM-$VERSION/
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
@@ -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/network/arping/arping.info b/network/arping/arping.info
index 3456f9af31..b2c4f1e781 100644
--- a/network/arping/arping.info
+++ b/network/arping/arping.info
@@ -1,10 +1,10 @@
 PRGNAM="arping"
-VERSION="2.13"
+VERSION="2.20"
 HOMEPAGE="http://www.habets.pp.se/synscan/programs.php?prog=arping"
-DOWNLOAD="http://www.habets.pp.se/synscan/files/arping-2.13.tar.gz"
-MD5SUM="698e4a87d4ea6c8535b07b06d9ed503e"
+DOWNLOAD="http://www.habets.pp.se/synscan/files/arping-2.20.tar.gz"
+MD5SUM="132d2113e35f84dd85ed604074bc075a"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="libnet"
-MAINTAINER="Nilton Moura"
-EMAIL="nmoura@nmoura.eti.br"
+MAINTAINER="Michael Edie"
+EMAIL="michael@edie.io"
diff --git a/network/arpwatch/arpwatch.SlackBuild b/network/arpwatch/arpwatch.SlackBuild
index 513d0cc618..98eca3de00 100644
--- a/network/arpwatch/arpwatch.SlackBuild
+++ b/network/arpwatch/arpwatch.SlackBuild
@@ -1,12 +1,15 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for arpwatch
 # Written by Michal Bialozor <bialyy@o2.pl>
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=arpwatch
 VERSION=${VERSION:-2.1a15}
 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}
@@ -100,4 +110,4 @@ mkdir -p $PKG/etc/rc.d
 cat $CWD/rc.$PRGNAM > $PKG/etc/rc.d/rc.$PRGNAM.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/network/asciinema/asciinema.SlackBuild b/network/asciinema/asciinema.SlackBuild
index db3f23b1a4..d5ffca1ec1 100644
--- a/network/asciinema/asciinema.SlackBuild
+++ b/network/asciinema/asciinema.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for asciinema
 
-# 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=asciinema
-VERSION=${VERSION:-2.0.2}
+VERSION=${VERSION:-2.4.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}
@@ -61,27 +68,27 @@ mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cp $CWD/setup.py $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 \
+  -o -perm 511 \) -exec chmod 755 {} \+ -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
-
-# Fixed doc and manpage path
-sed -i -e "s/share\/doc/doc/" -e "s/share\/man/man/" setup.py
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+
 
 python3 setup.py install --root=$PKG
 
-# install man page
+mkdir -p $PKG/usr/man/man1
+cp man/asciinema.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
+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 $PKG/usr/share/doc/$PRGNAM/* $PKG/usr/doc/$PRGNAM-$VERSION
+rm -rf $PKG/usr/share # nothing here but empty doc/ dir.
+
 cp -a *.md PKG-INFO $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
@@ -90,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/network/asciinema/asciinema.info b/network/asciinema/asciinema.info
index b110415859..874f4c5dd0 100644
--- a/network/asciinema/asciinema.info
+++ b/network/asciinema/asciinema.info
@@ -1,10 +1,10 @@
 PRGNAM="asciinema"
-VERSION="2.0.2"
+VERSION="2.4.0"
 HOMEPAGE="https://asciinema.org"
-DOWNLOAD="https://files.pythonhosted.org/packages/a7/71/771c859795e02c71c187546f34f7535487b97425bc1dad1e5f6ad2651357/asciinema-2.0.2.tar.gz"
-MD5SUM="f3bda18659e40cfd9b37a790f47eaed7"
+DOWNLOAD="https://files.pythonhosted.org/packages/f1/19/45b405438e90ad5b9618f3df62e9b3edaa2b115b530e60bd4b363465c704/asciinema-2.4.0.tar.gz"
+MD5SUM="bcf1b5f337a1e8a7b4839d13e153b5bf"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="python3"
+REQUIRES=""
 MAINTAINER="Dimitris Zlatanidis"
-EMAIL="d.zlatanidis@gmail.com"
+EMAIL="dslackw@gmail.com"
diff --git a/network/asciinema/setup.py b/network/asciinema/setup.py
new file mode 100644
index 0000000000..0ae4555937
--- /dev/null
+++ b/network/asciinema/setup.py
@@ -0,0 +1,5 @@
+from setuptools import setup
+
+
+if __name__ == '__main__':
+    setup()
diff --git a/network/asterisk/README b/network/asterisk/README
index bdd0c78c9c..53eabc8f52 100644
--- a/network/asterisk/README
+++ b/network/asterisk/README
@@ -8,5 +8,4 @@ agencies, worldwide.
 Asterisk now includes an internal version of pjsip. As such, pjsip
 conflicts with this package and should be removed.
 
-Optional dependencies: alembic, dahdi-complete, jansson, libpri,
-                       unixODBC
+Optional dependencies: alembic, dahdi-complete, libpri, unixODBC
diff --git a/network/asterisk/README.SBo b/network/asterisk/README.SBo
index f9720e27d8..0ef4f7bc94 100644
--- a/network/asterisk/README.SBo
+++ b/network/asterisk/README.SBo
@@ -17,7 +17,7 @@ need to install libpri, again before compiling Asterisk.
 
 Examples
 ========
-Be sure to see /usr/doc/asterisk-16.5.0/sample_confs/ after
+Be sure to see /usr/doc/asterisk-16.15.0/sample_confs/ after
 installation for any additional configuration files you may need.
 
 Database Support
@@ -27,7 +27,7 @@ want to install the alembic package. Since version 12.0 the database
 schemas that Asterisk uses are being captured in the form of python
 script files that use alembic to create/update database schemas. The
 asterisk package places these database scripts in the
-/usr/doc/asterisk-16.5.0/ast-db-manage directory.
+/usr/doc/asterisk-16.15.0/ast-db-manage directory.
 
 Build Flags
 ===========
diff --git a/network/asterisk/asterisk.SlackBuild b/network/asterisk/asterisk.SlackBuild
index 3e1e115a70..9ee9071514 100644
--- a/network/asterisk/asterisk.SlackBuild
+++ b/network/asterisk/asterisk.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Copyright 2006, Alan Hicks, Lizella, GA
 # Copyright 2010, 2013, 2015  Mario Preksavec, Zagreb, Croatia
-# Copyright 2018-2019 Chris Walker, Kempner, TX
+# Copyright 2018-2020 Chris Walker, Kempner, TX
 # 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=asterisk
-VERSION=${VERSION:-16.5.0}
+VERSION=${VERSION:-16.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}
@@ -139,6 +149,7 @@ CXXFLAGS="$SLKCFLAGS" \
   --sysconfdir=/etc \
   --localstatedir=/var \
   --mandir=/usr/man \
+  --with-cap \
   --with-download-cache=$CACHEDIR \
   $CONFIGURE_OPTS \
   --build=$ARCH-slackware-linux
@@ -242,17 +253,16 @@ for i in \
 done
 
 mkdir -p $PKG/etc/rc.d
-install -m 0755 contrib/init.d/rc.slackware.asterisk $PKG/etc/rc.d/rc.asterisk.new
-
-# Fix pid file location in rc script
-sed -i 's/asterisk.pid/asterisk\/asterisk.pid/' $PKG/etc/rc.d/rc.asterisk.new
+sed $CWD/rc.asterisk.new \
+    -e "s,@ASTERISKUSR@,$ASTERISKUSR,g" \
+    -e "s,@ASTERISKGRP@,$ASTERISKGRP,g" \
+    > $PKG/etc/rc.d/rc.asterisk.new
 
 # Set file ownership
 chown -R $ASTERISKUSR:$ASTERISKGRP $PKG/usr/lib${LIBDIRSUFFIX}
 chown -R $ASTERISKUSR:$ASTERISKGRP $PKG/var/lib/asterisk
 chown -R $ASTERISKUSR:$ASTERISKGRP $PKG/var/spool/asterisk
 chown -R $ASTERISKUSR:$ASTERISKGRP $PKG/var/log/asterisk
-chown -R $ASTERISKUSR:$ASTERISKGRP $PKG/var/run/asterisk
 chown $ASTERISKUSR:$ASTERISKGRP $PKG/usr/sbin/asterisk
 
 # The voicemail config file needs to writeable by the asterisk user
@@ -265,4 +275,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/network/asterisk/asterisk.info b/network/asterisk/asterisk.info
index c638419f84..90ba627cea 100644
--- a/network/asterisk/asterisk.info
+++ b/network/asterisk/asterisk.info
@@ -1,43 +1,43 @@
 PRGNAM="asterisk"
-VERSION="16.5.0"
+VERSION="16.15.0"
 HOMEPAGE="https://www.asterisk.org"
-DOWNLOAD="http://downloads.asterisk.org/pub/telephony/asterisk/asterisk-16.5.0.tar.gz \
-          http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-en-alaw-1.6.1.tar.gz \
-          http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-en-alaw-1.6.1.tar.gz.sha1 \
-          http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-en-g722-1.6.1.tar.gz \
-          http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-en-g722-1.6.1.tar.gz.sha1 \
-          http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-en-g729-1.6.1.tar.gz \
-          http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-en-g729-1.6.1.tar.gz.sha1 \
-          http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-en-gsm-1.6.1.tar.gz \
-          http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-en-gsm-1.6.1.tar.gz.sha1 \
-          http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-en-ulaw-1.6.1.tar.gz \
-          http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-en-ulaw-1.6.1.tar.gz.sha1 \
-          http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-en-wav-1.6.1.tar.gz \
-          http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-en-wav-1.6.1.tar.gz.sha1 \
-          http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-extra-sounds-en-alaw-1.5.2.tar.gz \
-          http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-extra-sounds-en-alaw-1.5.2.tar.gz.sha1 \
-          http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-extra-sounds-en-g722-1.5.2.tar.gz \
-          http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-extra-sounds-en-g722-1.5.2.tar.gz.sha1 \
-          http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-extra-sounds-en-g729-1.5.2.tar.gz \
-          http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-extra-sounds-en-g729-1.5.2.tar.gz.sha1 \
-          http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-extra-sounds-en-ulaw-1.5.2.tar.gz \
-          http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-extra-sounds-en-ulaw-1.5.2.tar.gz.sha1 \
-          http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-extra-sounds-en-wav-1.5.2.tar.gz \
-          http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-extra-sounds-en-wav-1.5.2.tar.gz.sha1 \
-          http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-moh-opsound-alaw-2.03.tar.gz \
-          http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-moh-opsound-alaw-2.03.tar.gz.sha1 \
-          http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-moh-opsound-g722-2.03.tar.gz \
-          http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-moh-opsound-g722-2.03.tar.gz.sha1 \
-          http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-moh-opsound-g729-2.03.tar.gz \
-          http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-moh-opsound-g729-2.03.tar.gz.sha1 \
-          http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-moh-opsound-ulaw-2.03.tar.gz \
-          http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-moh-opsound-ulaw-2.03.tar.gz.sha1 \
-          http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-moh-opsound-wav-2.03.tar.gz \
-          http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-moh-opsound-wav-2.03.tar.gz.sha1 \
+DOWNLOAD="https://downloads.asterisk.org/pub/telephony/asterisk/releases/asterisk-16.15.0.tar.gz \
+          https://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-en-alaw-1.6.1.tar.gz \
+          https://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-en-alaw-1.6.1.tar.gz.sha1 \
+          https://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-en-g722-1.6.1.tar.gz \
+          https://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-en-g722-1.6.1.tar.gz.sha1 \
+          https://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-en-g729-1.6.1.tar.gz \
+          https://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-en-g729-1.6.1.tar.gz.sha1 \
+          https://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-en-gsm-1.6.1.tar.gz \
+          https://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-en-gsm-1.6.1.tar.gz.sha1 \
+          https://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-en-ulaw-1.6.1.tar.gz \
+          https://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-en-ulaw-1.6.1.tar.gz.sha1 \
+          https://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-en-wav-1.6.1.tar.gz \
+          https://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-en-wav-1.6.1.tar.gz.sha1 \
+          https://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-extra-sounds-en-alaw-1.5.2.tar.gz \
+          https://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-extra-sounds-en-alaw-1.5.2.tar.gz.sha1 \
+          https://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-extra-sounds-en-g722-1.5.2.tar.gz \
+          https://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-extra-sounds-en-g722-1.5.2.tar.gz.sha1 \
+          https://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-extra-sounds-en-g729-1.5.2.tar.gz \
+          https://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-extra-sounds-en-g729-1.5.2.tar.gz.sha1 \
+          https://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-extra-sounds-en-ulaw-1.5.2.tar.gz \
+          https://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-extra-sounds-en-ulaw-1.5.2.tar.gz.sha1 \
+          https://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-extra-sounds-en-wav-1.5.2.tar.gz \
+          https://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-extra-sounds-en-wav-1.5.2.tar.gz.sha1 \
+          https://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-moh-opsound-alaw-2.03.tar.gz \
+          https://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-moh-opsound-alaw-2.03.tar.gz.sha1 \
+          https://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-moh-opsound-g722-2.03.tar.gz \
+          https://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-moh-opsound-g722-2.03.tar.gz.sha1 \
+          https://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-moh-opsound-g729-2.03.tar.gz \
+          https://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-moh-opsound-g729-2.03.tar.gz.sha1 \
+          https://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-moh-opsound-ulaw-2.03.tar.gz \
+          https://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-moh-opsound-ulaw-2.03.tar.gz.sha1 \
+          https://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-moh-opsound-wav-2.03.tar.gz \
+          https://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-moh-opsound-wav-2.03.tar.gz.sha1 \
           https://raw.githubusercontent.com/asterisk/third-party/master/jansson/2.12/jansson-2.12.tar.bz2 \
-          https://raw.githubusercontent.com/asterisk/third-party/master/pjproject/2.8/pjproject-2.8.tar.bz2 \
+          https://raw.githubusercontent.com/asterisk/third-party/master/pjproject/2.10/pjproject-2.10.tar.bz2 \
           http://ponce.cc/slackware/sources/repo/imap.tar.Z"
-MD5SUM="6ee7b77ff819daae0e9ead589f0b2e46 \
+MD5SUM="2f03204a38e8ed49e58474961d43f363 \
         d90e24e30d707e2932cf419cfccff25a \
         3c071029c1ab648367666d1e384394bb \
         e4a9ee348028fc0e47148f783e7f945b \
@@ -71,10 +71,10 @@ MD5SUM="6ee7b77ff819daae0e9ead589f0b2e46 \
         8277e2c693fd056773b1c15e4d52077d \
         011fa4dc9fe35dc3d34ed557bb04263f \
         317dbaf90a9f85ea0ec7b12d080d173d \
-        6487d54213f270d307eaa60efc9f56f3 \
+        4fffc49b461133f0a4143b05a22fb30e \
         d9f7fd4e1d93ad9fca1df8717a79d1c5"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="libedit"
+REQUIRES=""
 MAINTAINER="Chris Walker"
 EMAIL="kris240376@gmail.com"
diff --git a/network/asterisk/rc.asterisk.new b/network/asterisk/rc.asterisk.new
new file mode 100644
index 0000000000..636f4099a0
--- /dev/null
+++ b/network/asterisk/rc.asterisk.new
@@ -0,0 +1,64 @@
+#!/bin/sh
+#
+# Start/stop/restart Asterisk PBX
+#
+# Version: 1.0 - Paul Belanger <pabelanger@gmail.com>
+#
+# 03.29.2005 - Initial Version
+#
+# $Id$
+
+### BEGIN INIT INFO
+# Provides:		asterisk
+# Required-Start:    $network $syslog $named $local_fs $remote_fs
+# Required-Stop:     $network $syslog $named $local_fs $remote_fs
+# Should-Start:      dahdi misdn lcr wanrouter mysql postgresql
+# Should-Stop:       dahdi misdn lcr wanrouter mysql postgresql
+# Default-Start:	2 3 4 5
+# Default-Stop:		0 1 6
+# Short-Description:	Asterisk PBX
+# Description:		the Asterisk Open Source PBX
+### END INIT INFO
+
+asterisk_start() {
+   if [ -x /usr/sbin/asterisk ]; then
+      # Check if Asterisk is already running.  If it is, then bug out, because
+      # starting safe_asterisk when Asterisk is running is very bad.
+      VERSION=`/usr/sbin/asterisk -rx 'core show version' 2>/dev/null`
+	  if [ "`echo $VERSION | cut -c 1-8`" = "Asterisk" ]; then
+         echo "Asterisk is already running.  $0 will exit now."
+         exit 1
+      fi
+
+      echo "Starting Asterisk   /usr/sbin/asterisk"
+      mkdir -p /var/run/asterisk
+      chown @ASTERISKUSR@:@ASTERISKGRP@ /var/run/asterisk
+      /usr/sbin/asterisk
+   fi
+}
+
+asterisk_stop() {
+    # If there is no PID file, ignore this request...
+    if [ -r /var/run/asterisk/asterisk.pid ]; then
+      killall asterisk
+    fi
+}
+
+asterisk_restart() {
+   asterisk_stop
+   asterisk_start
+}
+
+case "$1" in
+   'start')
+      asterisk_start
+      ;;
+   'stop')
+      asterisk_stop
+      ;;
+   'restart')
+      asterisk_restart
+      ;;
+   *)
+      echo "usage $0 start|stop|restart" ;;
+esac
diff --git a/network/asuka/README b/network/asuka/README
new file mode 100644
index 0000000000..e1ee995e8d
--- /dev/null
+++ b/network/asuka/README
@@ -0,0 +1,5 @@
+Asuka is a CLI client for the Gemini protocol.
+It's written in Rust and uses NCurses.
+
+Home page: https://git.sr.ht/~julienxx/asuka
+
diff --git a/network/asuka/asuka.SlackBuild b/network/asuka/asuka.SlackBuild
new file mode 100644
index 0000000000..559aad5feb
--- /dev/null
+++ b/network/asuka/asuka.SlackBuild
@@ -0,0 +1,161 @@
+#!/bin/bash
+
+# Slackware build script for asuka
+
+# Copyright 2022 Julien Blanchard, Bordeaux 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.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=asuka
+VERSION=${VERSION:-0.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
+
+  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"
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  CARGOTARGET="--target i686-unknown-linux-gnu"
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  CARGOTARGET="--target x86_64-unknown-linux-gnu"
+else
+  SLKCFLAGS="-O2"
+  CARGOTARGET=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$VERSION.tar.gz || 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)"
+
+    echo "HERE $ver $dep"
+
+    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/network/asuka/asuka.info b/network/asuka/asuka.info
new file mode 100644
index 0000000000..1023fa80c8
--- /dev/null
+++ b/network/asuka/asuka.info
@@ -0,0 +1,198 @@
+PRGNAM="asuka"
+VERSION="0.8.5"
+HOMEPAGE="https://git.sr.ht/~julienxx/asuka"
+DOWNLOAD="https://git.sr.ht/~julienxx/asuka/archive/0.8.5.tar.gz \
+          https://static.crates.io/crates/ahash/ahash-0.7.6.crate \
+          https://static.crates.io/crates/aho-corasick/aho-corasick-0.7.18.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.73.crate \
+          https://static.crates.io/crates/cfg-if/cfg-if-1.0.0.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.3.crate \
+          https://static.crates.io/crates/crossbeam-channel/crossbeam-channel-0.5.4.crate \
+          https://static.crates.io/crates/crossbeam-utils/crossbeam-utils-0.8.8.crate \
+          https://static.crates.io/crates/cursive/cursive-0.18.0.crate \
+          https://static.crates.io/crates/cursive_core/cursive_core-0.3.2.crate \
+          https://static.crates.io/crates/darling/darling-0.13.4.crate \
+          https://static.crates.io/crates/darling_core/darling_core-0.13.4.crate \
+          https://static.crates.io/crates/darling_macro/darling_macro-0.13.4.crate \
+          https://static.crates.io/crates/dirs/dirs-4.0.0.crate \
+          https://static.crates.io/crates/dirs-sys/dirs-sys-0.3.7.crate \
+          https://static.crates.io/crates/enum-map/enum-map-2.1.0.crate \
+          https://static.crates.io/crates/enum-map-derive/enum-map-derive-0.8.0.crate \
+          https://static.crates.io/crates/enumset/enumset-1.0.11.crate \
+          https://static.crates.io/crates/enumset_derive/enumset_derive-0.6.0.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/foreign-types/foreign-types-0.3.2.crate \
+          https://static.crates.io/crates/foreign-types-shared/foreign-types-shared-0.1.1.crate \
+          https://static.crates.io/crates/form_urlencoded/form_urlencoded-1.0.1.crate \
+          https://static.crates.io/crates/getrandom/getrandom-0.2.6.crate \
+          https://static.crates.io/crates/ident_case/ident_case-1.0.1.crate \
+          https://static.crates.io/crates/idna/idna-0.2.3.crate \
+          https://static.crates.io/crates/instant/instant-0.1.12.crate \
+          https://static.crates.io/crates/itoa/itoa-1.0.1.crate \
+          https://static.crates.io/crates/json/json-0.12.4.crate \
+          https://static.crates.io/crates/lazy_static/lazy_static-1.4.0.crate \
+          https://static.crates.io/crates/libc/libc-0.2.125.crate \
+          https://static.crates.io/crates/log/log-0.4.17.crate \
+          https://static.crates.io/crates/maplit/maplit-1.0.2.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/native-tls/native-tls-0.2.10.crate \
+          https://static.crates.io/crates/ncurses/ncurses-5.101.0.crate \
+          https://static.crates.io/crates/num/num-0.4.0.crate \
+          https://static.crates.io/crates/num-complex/num-complex-0.4.1.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_threads/num_threads-0.1.6.crate \
+          https://static.crates.io/crates/once_cell/once_cell-1.10.0.crate \
+          https://static.crates.io/crates/open/open-2.1.2.crate \
+          https://static.crates.io/crates/openssl/openssl-0.10.40.crate \
+          https://static.crates.io/crates/openssl-macros/openssl-macros-0.1.0.crate \
+          https://static.crates.io/crates/openssl-probe/openssl-probe-0.1.5.crate \
+          https://static.crates.io/crates/openssl-sys/openssl-sys-0.9.73.crate \
+          https://static.crates.io/crates/owning_ref/owning_ref-0.4.1.crate \
+          https://static.crates.io/crates/pathdiff/pathdiff-0.2.1.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.25.crate \
+          https://static.crates.io/crates/proc-macro2/proc-macro2-1.0.37.crate \
+          https://static.crates.io/crates/quote/quote-1.0.18.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/regex-1.5.5.crate \
+          https://static.crates.io/crates/regex-syntax/regex-syntax-0.6.25.crate \
+          https://static.crates.io/crates/remove_dir_all/remove_dir_all-0.5.3.crate \
+          https://static.crates.io/crates/schannel/schannel-0.1.19.crate \
+          https://static.crates.io/crates/security-framework/security-framework-2.6.1.crate \
+          https://static.crates.io/crates/security-framework-sys/security-framework-sys-2.6.1.crate \
+          https://static.crates.io/crates/signal-hook/signal-hook-0.3.13.crate \
+          https://static.crates.io/crates/signal-hook-registry/signal-hook-registry-1.4.0.crate \
+          https://static.crates.io/crates/smawk/smawk-0.3.1.crate \
+          https://static.crates.io/crates/stable_deref_trait/stable_deref_trait-1.2.0.crate \
+          https://static.crates.io/crates/syn/syn-1.0.92.crate \
+          https://static.crates.io/crates/tempfile/tempfile-3.3.0.crate \
+          https://static.crates.io/crates/term_size/term_size-0.3.2.crate \
+          https://static.crates.io/crates/textwrap/textwrap-0.15.0.crate \
+          https://static.crates.io/crates/thiserror/thiserror-1.0.31.crate \
+          https://static.crates.io/crates/thiserror-impl/thiserror-impl-1.0.31.crate \
+          https://static.crates.io/crates/time/time-0.3.9.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-linebreak/unicode-linebreak-0.1.2.crate \
+          https://static.crates.io/crates/unicode-normalization/unicode-normalization-0.1.19.crate \
+          https://static.crates.io/crates/unicode-segmentation/unicode-segmentation-1.9.0.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/url/url-2.2.2.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/wasi/wasi-0.10.2+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/xi-unicode/xi-unicode-0.3.0.crate"
+MD5SUM="a1693edbc029245542c96edfffebe599 \
+        7d2520c6776b66559165d0a666e995ff \
+        425b8fdf70df59998d9b7c89083e48d1 \
+        05d77ef52e90ad161fdd41b252420467 \
+        a295edb6953237ebbdfa8e731229f9a3 \
+        8e3a4d0980acef2c4e74485a45de29a9 \
+        74634128440dbc3766bda76fdf0aaa05 \
+        ae6dd0cd5319220586d8ace4c4be87ce \
+        d05cbf26ed52299487a802688a1d22cb \
+        576ee1b86d4c2abacb63ea19c0121d2f \
+        8d21be2fa5f912232d6c441e8dd78cb1 \
+        4813ec8f041716c38a9fa62cf5a5aafa \
+        adea01876cc06fed2497a0283002e80c \
+        f28e4363b28774af3f8127ed40bcdc9f \
+        c1713950e7088b216d011fc5c2bdd661 \
+        6129e036328e2ec678c8d5d9be3c5e59 \
+        889fdcd1499ef5939caaafab5c09729e \
+        4c21da37e71a52f26c8c5490f3ec4837 \
+        cfd5ddf7977934e060cc6d214519351f \
+        accf4486cb4158e79095ddc7ddd563d4 \
+        29fa19c82eb9a198535b2d4e84b75ad6 \
+        ddcc21bf6fa1316442742d6bb49481c9 \
+        e08921c68133df2e254fe723b368bae3 \
+        8dab3b3ec00dc56cffde0b0c410d47b5 \
+        78c898fdaa3968e23904bf8538c4a271 \
+        667e86b8b8d96ab4e9605627ce7dcc9a \
+        7ee8703970c3fa6a2e37893de742824b \
+        8a9e0a43625da8d29c57e742c4d3d385 \
+        fe77a3f609b6fd8d5b08f3b2ef14d2ad \
+        f50aaf5171cbc0327f8d18a4ec7405fb \
+        5f153f7135dceb02f88266121c836b4e \
+        5c98b89b530b563b6e5f6e1b631c4b35 \
+        b1c4a08cc8222b3fff6d2d6dcf821689 \
+        fba3b040a55c01be7376d3dd5c4d4920 \
+        e83dc3dbd3de1f5f2b4b248c521eeaec \
+        b31bf94ffe7e0f2ada93afae1076eaeb \
+        47580fad08273a52e998f84ef404912e \
+        5ac809692422b722eaded90be3c4d9c2 \
+        94b8bf179385ff071bdc33b58bf047c0 \
+        83c88f2bd69c44122955bf94ad9377a1 \
+        81f3d69af8142596468325954a52dea3 \
+        1081c01b2d9b17a33c3d0156193be592 \
+        6edc86d48078d1603065424c02020da3 \
+        073b4c53e303ccf2a807dfce7f5e986a \
+        44ef8a2279dadf391881a69c60d29197 \
+        0cd34d83344babdcb0aa123b5e672182 \
+        a0de6eabdeb1320350abcbd7c02df6ac \
+        ae2471729f689287aec9da43f8106a4b \
+        0a56079b59a262a80e33d13e6604cc4e \
+        61d02dc8b187712c7ba7838df3d65601 \
+        1babe6b3077bea6540b8fb5ecaadc255 \
+        73212ff5e0f8cd8844081a2461393707 \
+        907244c0d3791f3f981c7cc8e4cad0a3 \
+        e6562b473a131e7df2e99252a63124f8 \
+        6fb245ba04d6859fadef5fe22806355b \
+        c40bb551772810d818857841ea389f1e \
+        f490982aceabdbd515348f63e638a782 \
+        b478ee84018082806ea8da763f0b3f1f \
+        11034ad82271b27907c7f970374864ef \
+        0fa01f3988219987a04c09dae3933d94 \
+        2e69b77050ab91b1d0bb941e843a05cb \
+        2793ed3e6807d79ff72271baec586531 \
+        6b5c7401117316735435311bf551515b \
+        82401c70623ccc1bfc0bcb5c3b0ac8b7 \
+        0538d1da369f3e3f0412aa4d735c1b61 \
+        f505a218806e44b2369671089d65e839 \
+        4b09fe533b3580ace8ae485a477b4532 \
+        ffbaf84e19c894443b584605e668b6ea \
+        b077f27c741a438d0a7a474a41e22a62 \
+        21b43d5721b3a9c16059acb691f4314d \
+        5d5cf081e3f2aad8d9e52deef9e92c18 \
+        5988bad1543264a9f48b542192e7de9a \
+        8b3ee9107af33d280d42485282f7c4a6 \
+        f29a1bb1b5f3f29cedb36f40f720d765 \
+        73d602cc41e3e431bf4fabd129ae1616 \
+        7bfb933cd096d342c9d6f77f5d3c4b94 \
+        a8ae09f39c6e68744ca70bf8db61df71 \
+        ac76b35d8c76c7fa25c73b8863d5d055 \
+        ad3f3c7bb184e63919b633dc35805cf4 \
+        5f0470696baaa4e5953bddbf196998f9 \
+        7bfcad253aff26bc26c5e3521f3ba891 \
+        bd0cd532c61dac2087ecd7e0fef0d011 \
+        e6c3402a883b9a35135ca6af2cc46922 \
+        10291d9a0022076bc0827250816d3476 \
+        2e8e0a121121087295e708b2eb4b54d5 \
+        a42cc2834b2150027d7b427558a87803 \
+        763a3a6901bbb11a6998d29867d39b3c \
+        eb721c4d9e5dba8f93e9de0a80036ec3 \
+        e900a384ac7dbb320fe6a7279fbfef89 \
+        d18d362345c4fe512ef67b738b239fb8 \
+        a061ad1db3e0d839725b037ff8be84e7 \
+        0498c4a11448bfc35dc7bb2caa64c753 \
+        db96b50050277bf05a3c68534bbb9586 \
+        09de9d01e7331ff3da11f58be8bef0df \
+        a78d9b7d812b68bc4b27b4f23d46ced1"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Julien Blanchard"
+EMAIL="julien@typed-hole.org"
diff --git a/network/asuka/slack-desc b/network/asuka/slack-desc
new file mode 100644
index 0000000000..5ad564cbd9
--- /dev/null
+++ b/network/asuka/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+     |-----handy-ruler------------------------------------------------------|
+asuka: asuka (gemini client)
+asuka:
+asuka: Asuka is a CLI client for the Gemini protocol.
+asuka: It's written in Rust and uses NCurses.
+asuka:
+asuka: Home page: https://git.sr.ht/~julienxx/asuka
+asuka:
+asuka:
+asuka:
+asuka:
+asuka:
diff --git a/network/atftp/atftp.SlackBuild b/network/atftp/atftp.SlackBuild
index 404ec9ba26..c32872849d 100644
--- a/network/atftp/atftp.SlackBuild
+++ b/network/atftp/atftp.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for atftp
 
@@ -21,7 +21,11 @@
 # (INCLUDING NEGLIGENCE OR 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>.
+
+# 20230103 bkw: update for v0.8.0.
+# 20210223 bkw: update for v0.7.4.
+# 20191129 bkw: update for v0.7.2.
 
 # 20180629 bkw:
 # - Take over maintenance.
@@ -30,10 +34,13 @@
 # - Expand README with hopefully useful setup info. Include it in
 #   the package since it overrides some of the info from upstream's docs.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=atftp
-VERSION=${VERSION:-0.7.1}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-0.8.0}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -43,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}
@@ -71,11 +82,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 {} \+
+
+[ -e ./configure ] || sh autogen.sh
 
 CC="gcc -fgnu89-inline $SLKCFLAGS" \
 ./configure \
@@ -105,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/network/atftp/atftp.info b/network/atftp/atftp.info
index 07b1601db7..2fb13509cb 100644
--- a/network/atftp/atftp.info
+++ b/network/atftp/atftp.info
@@ -1,10 +1,10 @@
 PRGNAM="atftp"
-VERSION="0.7.1"
+VERSION="0.8.0"
 HOMEPAGE="https://sourceforge.net/projects/atftp"
-DOWNLOAD="https://downloads.sourceforge.net/project/atftp/atftp-0.7.1.tar.gz"
-MD5SUM="367bf401965fbed04585b1229c2191a8"
+DOWNLOAD="https://downloads.sourceforge.net/project/atftp/atftp-0.8.0.tar.gz"
+MD5SUM="852f4c0773ae8c429ec4f74413eabe1b"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
 MAINTAINER="B. Watson"
-EMAIL="yalhcru@gmail.com"
+EMAIL="urchlay@slackware.uk"
diff --git a/network/atheme/README b/network/atheme/README
index e428398e6b..6ef25866eb 100644
--- a/network/atheme/README
+++ b/network/atheme/README
@@ -2,5 +2,3 @@ Atheme is a feature-packed, extremely customisable IRC services
 daemon that is secure, stable and scalable.
 
 The included rc.atheme supports start|stop|restart|hup
-
-Optional dependencies: qrencode (QR code support), cracklib.
diff --git a/network/atheme/atheme.SlackBuild b/network/atheme/atheme.SlackBuild
index e7fc813f59..d4f6f6f05d 100644
--- a/network/atheme/atheme.SlackBuild
+++ b/network/atheme/atheme.SlackBuild
@@ -1,7 +1,7 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for atheme
-# Copyright 2017 David Woodfall <dave@dawoodfall.net>
+# Copyright 2017 David Woodfall <dave@slackbuilds.org>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -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=atheme
 VERSION=${VERSION:-v7.2.10_r2}
 SRCVERSION=${VERSION/_/-}
 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}
@@ -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/network/atheme/atheme.info b/network/atheme/atheme.info
index 17611c035d..b753d45d1d 100644
--- a/network/atheme/atheme.info
+++ b/network/atheme/atheme.info
@@ -6,5 +6,5 @@ MD5SUM="c907900b19e8d2508dd22455dcdce912"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="David Woodfall"
-EMAIL="dave@dawoodfall.net"
+MAINTAINER="D Woodfall"
+EMAIL="dave@slackbuilds.org"
diff --git a/network/authbind/README b/network/authbind/README
index 81624ae1a2..155bbbdabe 100644
--- a/network/authbind/README
+++ b/network/authbind/README
@@ -1,5 +1,5 @@
 authbind (allows unprivileged processes to bind to low-numbered ports)
 
-authbind allows non-root processes to bind to TCP and UDP ports 1 to 512.
-Access is controlled by config files located in /etc/authbind, and can
-be configured per user (or group), per address, and per port.
+authbind allows non-root processes to bind to TCP and UDP ports 1 to
+512.  Access is controlled by config files located in /etc/authbind,
+and can be configured per user (or group), per address, and per port.
diff --git a/network/authbind/authbind.SlackBuild b/network/authbind/authbind.SlackBuild
index 3693884f19..419cce58cb 100644
--- a/network/authbind/authbind.SlackBuild
+++ b/network/authbind/authbind.SlackBuild
@@ -1,15 +1,24 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for authbind
 
-# 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.
 
+# 20230103 bkw: Note to self: There is an authbind_2.1.3.tar.gz
+# available on Debian's download server, but there are no code changes
+# between 2.1.2 and 2.1.3. The only differences are in the Debian
+# packaging stuff (debian/rules and debian/changelog), which we don't
+# use.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=authbind
 VERSION=${VERSION:-2.1.2}
 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}
@@ -47,11 +60,8 @@ 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 {} \;
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
 
 make \
   OPTIMISE="$SLKCFLAGS" \
@@ -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/network/authbind/authbind.info b/network/authbind/authbind.info
index 7746bb9c65..70df284e8b 100644
--- a/network/authbind/authbind.info
+++ b/network/authbind/authbind.info
@@ -1,10 +1,10 @@
 PRGNAM="authbind"
 VERSION="2.1.2"
 HOMEPAGE="http://packages.debian.org/sid/authbind"
-DOWNLOAD="http://ftp.debian.org/debian/pool/main/a/authbind/authbind_2.1.2.tar.gz"
+DOWNLOAD="https://deb.debian.org/debian/pool/main/a/authbind/authbind_2.1.2.tar.gz"
 MD5SUM="e301e83e9683abc3aebf08ebdfe58041"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
 MAINTAINER="B. Watson"
-EMAIL="yalhcru@gmail.com"
+EMAIL="urchlay@slackware.uk"
diff --git a/network/autossh/autossh.SlackBuild b/network/autossh/autossh.SlackBuild
index 3c7dc691b4..d85dbddef4 100644
--- a/network/autossh/autossh.SlackBuild
+++ b/network/autossh/autossh.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for autossh
 
@@ -26,10 +26,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=autossh
 VERSION=${VERSION:-1.4g}
 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}
@@ -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/network/avahi/README b/network/avahi/README
index 8d1e64903a..3057f78a16 100644
--- a/network/avahi/README
+++ b/network/avahi/README
@@ -1,15 +1,14 @@
-Avahi is an implementation of the DNS Service Discovery and Multicast DNS
-specifications for Zeroconf Computing.  It uses D-BUS for communication
-between user applications and a system daemon.  The daemon is used to
-coordinate application efforts in caching replies, necessary to minimize
-the traffic imposed on networks.  This kind of technology is already
-found in Apple MacOS X (branded Rendezvous Bonjour and sometimes Zeroconf)
-and is very convenient.
+Avahi is an implementation of the DNS Service Discovery and Multicast
+DNS specifications for Zeroconf Computing.  It uses D-BUS for
+communication between user applications and a system daemon.  The
+daemon is used to coordinate application efforts in caching replies,
+necessary to minimize the traffic imposed on networks.  This kind
+of technology is already found in Apple MacOS X (branded Rendezvous
+Bonjour and sometimes Zeroconf) and is very convenient.
 
-You will need to have an "avahi" user and group on the target system
-prior to installing the avahi package.  See README.SBo in this directory
-(it is also installed to the package docmentation directory) for more
-information and for setup notes.
+You will need to have an "avahi" user and group on the target
+system prior to installing the avahi package.  See README.SBo in this
+directory (it is also installed to the package docmentation directory)
+for more information and for setup notes.
 
-mono is an optional dependency that also requires gtk-sharp - enable it
-with the following:  "MONO=yes ./avahi.SlackBuild"
+mono support is not working ATM so it's forcibly disabled.
diff --git a/network/avahi/avahi-discover.1 b/network/avahi/avahi-discover.1
new file mode 100644
index 0000000000..085ff1354e
--- /dev/null
+++ b/network/avahi/avahi-discover.1
@@ -0,0 +1,16 @@
+.TH avahi-discover 1 User Manuals
+.SH NAME
+avahi-discover \- Browse for mDNS/DNS-SD services using the Avahi daemon
+.SH SYNOPSIS
+\fBavahi-discover
+\f1
+.SH DESCRIPTION
+Show a real-time graphical browse list for mDNS/DNS-SD network services running on the local LAN using the Avahi daemon.
+.SH OPTIONS
+avahi-discover takes no command line arguments at the moment.
+.SH AUTHORS
+The Avahi Developers <avahi (at) lists (dot) freedesktop (dot) org>; Avahi is available from \fBhttp://avahi.org/\f1
+.SH SEE ALSO
+\fBavahi-daemon(8)\f1, \fBavahi-browse(1)\f1
+.SH COMMENTS
+This man page was written using \fBxml2man(1)\f1 by Oliver Kurth.
diff --git a/network/avahi/avahi.SlackBuild b/network/avahi/avahi.SlackBuild
index 0593618738..e81a77cc29 100644
--- a/network/avahi/avahi.SlackBuild
+++ b/network/avahi/avahi.SlackBuild
@@ -1,12 +1,9 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for avahi
 
-# Written by David Somero <dsomero@hotmail.com>
-# Derived from Slackware's Slackbuilds.
-#
-# Copyright 2008, 2009  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # Copyright 2008-2012  David Somero (dsomero@hotmail.com) Athens, TN, USA
+# Copyright 2008, 2009  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -26,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=7:
+# - don't include empty /run dir in package.
+# - remove useless INSTALL from doc dir.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=avahi
-VERSION=${VERSION:-0.7}
-BUILD=${BUILD:-1}
+VERSION=${VERSION:-0.8}
+BUILD=${BUILD:-7}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -39,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}
@@ -50,6 +58,7 @@ if [ "${MONO:-no}" = "no" ]; then
 else
     MONO="--enable-mono"
 fi
+MONO="--disable-mono" # mono support not working ATM
 
 warn_accounts() {
   echo "  You must have an avahi user and group to run this script. "
@@ -92,13 +101,40 @@ cd $PRGNAM-$VERSION
 chown -R root: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 {} \;
-
-# Thanks to Robby Workman for this patch.
-patch -p1 --verbose < $CWD/fixup_avahi-dnsconfd.action.patch
-
+ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+
+
+# This patch is mine --rworkman
+patch -p1 --verbose < $CWD/patches/fixup_avahi-dnsconfd.action.patch
+
+# Thanks to LFS for this patch
+patch -p1 --verbose < $CWD/patches/ipv6_race_condition_fix.patch
+
+# Thanks to Debian for these patches
+patch -p1 --verbose < $CWD/patches/man-fix-reference-to-avahi-autoipd.action-8-in-avahi-auto.patch
+patch -p1 --verbose < $CWD/patches/man-add-missing-bshell.1-symlink.patch
+patch -p1 --verbose < $CWD/patches/Ship-avahi-discover-1-bssh-1-and-bvnc-1-also-for-GTK3.patch
+patch -p1 --verbose < $CWD/patches/avahi_dns_packet_consume_uint32-fix-potential-undefined-b.patch
+patch -p1 --verbose < $CWD/patches/fix-bytestring-decoding-for-proper-display.patch
+patch -p1 --verbose < $CWD/patches/avahi-discover-Don-t-decode-unicode-strings-only-bytestri.patch
+patch -p1 --verbose < $CWD/patches/Fetch-build-db-from-upstream-git.patch
+patch -p1 --verbose < $CWD/patches/build-db-Use-the-same-database-format-that-the-C-code-exp.patch
+patch -p1 --verbose < $CWD/patches/avahi-daemon-chroot-fix-bogus-assignments-in-assertions.patch
+patch -p1 --verbose < $CWD/patches/avahi-client-fix-resource-leak.patch
+patch -p1 --verbose < $CWD/patches/avoid-infinite-loop-in-avahi-daemon-by-handling-hup-event-in-client-work.patch
+patch -p1 --verbose < $CWD/patches/CVE-2021-3502.patch
+
+# Okay, I had to cheat a bit on the manual pages; there's a commit
+# in git that will fix this, so I just built a git checkout, grabbed
+# the built manual pages, and we'll drop them into place so the build
+# will work for this released version...
+cat $CWD/bssh.1 > man/bssh.1
+cat $CWD/avahi-discover.1 > man/avahi-discover.1
+
+autoreconf -vif
+
+export PYTHON=python3
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
@@ -108,23 +144,23 @@ CXXFLAGS="$SLKCFLAGS" \
   --localstatedir=/var \
   --mandir=/usr/man \
   --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --with-systemdsystemunitdir=no \
   --enable-tests \
   --disable-static \
   --disable-monodoc \
   --disable-autoipd \
+  --enable-compat-libdns_sd \
   --enable-python-dbus \
-  --enable-pygtk\
   --enable-glib \
   --enable-dbus \
   --enable-python \
   --enable-gtk \
   --enable-gtk3 \
-  --enable-qt4 \
+  --enable-qt5 \
+  --disable-qt4 \
   --disable-qt3 \
   --enable-core-docs \
-  --enable-compat-howl \
-  --enable-compat-libdns_sd \
-  --with-dbus-sys=/etc/dbus-1/system.d \
+  --with-dbus-sys=/usr/share/dbus-1/system.d \
   --with-avahi-user=avahi \
   --with-avahi-group=avahi \
   --with-avahi-priv-access-group=netdev \
@@ -135,14 +171,13 @@ CXXFLAGS="$SLKCFLAGS" \
   $MONO
 
 make
-make install DESTDIR=$PKG
+make install-strip DESTDIR=$PKG
 
-# howl and mdnsresponder compatability
-(cd $PKG/usr/include; ln -s avahi-compat-libdns_sd/dns_sd.h dns_sd.h; ln -s avahi-compat-howl howl)
-(cd $PKG/usr/lib$LIBDIRSUFFIX/pkgconfig; ln -s avahi-compat-howl.pc howl.pc)
+# 20220414 bkw: if this dir is empty, it doesn't need to be included
+# in the package.
+rmdir $PKG/run &> /dev/null || true
 
-find $PKG | xargs 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
@@ -150,10 +185,11 @@ for i in $(find $PKG/usr/man -type l); do ln -s $(readlink $i).gz $i.gz; rm $i;
 mv $PKG/etc/rc.d/rc.avahidaemon $PKG/etc/rc.d/rc.avahidaemon.new
 mv $PKG/etc/rc.d/rc.avahidnsconfd $PKG/etc/rc.d/rc.avahidnsconfd.new
 mv $PKG/etc/avahi/avahi-daemon.conf $PKG/etc/avahi/avahi-daemon.conf.new
-mv $PKG/etc/dbus-1/system.d/avahi-dbus.conf \
-  $PKG/etc/dbus-1/system.d/avahi-dbus.conf.new
+
+sed -i "s|#!python3|#!/usr/bin/python3|g" $PKG/usr/bin/avahi-{discover,bookmarks}
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+rm -f docs/INSTALL
 cp -a LICENSE docs/* $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
@@ -162,4 +198,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh  > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/network/avahi/avahi.info b/network/avahi/avahi.info
index ac42de54d2..ced5e61121 100644
--- a/network/avahi/avahi.info
+++ b/network/avahi/avahi.info
@@ -1,10 +1,10 @@
 PRGNAM="avahi"
-VERSION="0.7"
+VERSION="0.8"
 HOMEPAGE="http://avahi.org/"
-DOWNLOAD="https://github.com/lathiat/avahi/releases/download/v0.7/avahi-0.7.tar.gz"
-MD5SUM="d76c59d0882ac6c256d70a2a585362a6"
+DOWNLOAD="https://github.com/lathiat/avahi/releases/download/v0.8/avahi-0.8.tar.gz"
+MD5SUM="229c6aa30674fc43c202b22c5f8c2be7"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="libdaemon"
-MAINTAINER="David Somero"
-EMAIL="dsomero@hotmail.com"
+MAINTAINER="Robby Workman"
+EMAIL="rworkman@slackbuilds.org"
diff --git a/network/avahi/bssh.1 b/network/avahi/bssh.1
new file mode 100644
index 0000000000..913554eb30
--- /dev/null
+++ b/network/avahi/bssh.1
@@ -0,0 +1,36 @@
+.TH bssh/bvnc/bshell 1 User Manuals
+.SH NAME
+bssh/bvnc/bshell \- Browse for SSH/VNC servers on the local network
+.SH SYNOPSIS
+\fBbssh
+
+bvnc
+
+bshell
+\f1
+.SH DESCRIPTION
+bssh/bvnc/bshell browses for SSH/VNC servers on the local network, shows them in a GUI for the user to select one and finally calls ssh/vncviewer after a selection was made.
+
+If the binary is called as bssh only ssh servers will be shown. If the binary is called as bvnc only VNC servers will be shown. If the binary is called as bshell both VNC and SSH servers are shown.
+.SH OPTIONS
+.TP
+\fB-s | --ssh\f1
+Browse for SSH servers (and only SSH servers) regardless under which name the binary is called.
+.TP
+\fB-v | --vnc\f1
+Browse for VNC servers (and only VNC servers) regardless under which name the binary is called.
+.TP
+\fB-S | --shell\f1
+Browse for both VNC and SSH servers regardless under which name the binary is called.
+.TP
+\fB-d | --domain=\f1 \fIDOMAIN\f1
+Browse in the specified domain. If omitted bssh/bvnc/bshell will browse in the default browsing domain (usually .local)
+.TP
+\fB-h | --help\f1
+Show help.
+.SH AUTHORS
+The Avahi Developers <avahi (at) lists (dot) freedesktop (dot) org>; Avahi is available from \fBhttp://avahi.org/\f1
+.SH SEE ALSO
+\fBavahi-browse(1)\f1, \fBssh(1)\f1, \fBvncviewer(1)\f1
+.SH COMMENTS
+This man page was written using \fBxml2man(1)\f1 by Oliver Kurth.
diff --git a/network/avahi/doinst.sh b/network/avahi/doinst.sh
index d22f3fa394..9bf5bd8772 100644
--- a/network/avahi/doinst.sh
+++ b/network/avahi/doinst.sh
@@ -26,7 +26,6 @@ preserve_perms() {
 preserve_perms etc/rc.d/rc.avahidaemon.new
 preserve_perms etc/rc.d/rc.avahidnsconfd.new
 preserve_perms etc/avahi/avahi-daemon.conf.new
-preserve_perms etc/dbus-1/system.d/avahi-dbus.conf.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/network/avahi/patches/CVE-2021-3502.patch b/network/avahi/patches/CVE-2021-3502.patch
new file mode 100644
index 0000000000..7b0449a2e4
--- /dev/null
+++ b/network/avahi/patches/CVE-2021-3502.patch
@@ -0,0 +1,148 @@
+From 9d31939e55280a733d930b15ac9e4dda4497680c Mon Sep 17 00:00:00 2001
+From: Tommi Rantala <tommi.t.rantala@nokia.com>
+Date: Mon, 8 Feb 2021 11:04:43 +0200
+Subject: [PATCH] Fix NULL pointer crashes from #175
+
+avahi-daemon is crashing when running "ping .local".
+The crash is due to failing assertion from NULL pointer.
+Add missing NULL pointer checks to fix it.
+
+Introduced in #175 - merge commit 8f75a045709a780c8cf92a6a21e9d35b593bdecd
+---
+ avahi-core/browse-dns-server.c   | 5 ++++-
+ avahi-core/browse-domain.c       | 5 ++++-
+ avahi-core/browse-service-type.c | 3 +++
+ avahi-core/browse-service.c      | 3 +++
+ avahi-core/browse.c              | 3 +++
+ avahi-core/resolve-address.c     | 5 ++++-
+ avahi-core/resolve-host-name.c   | 5 ++++-
+ avahi-core/resolve-service.c     | 5 ++++-
+ 8 files changed, 29 insertions(+), 5 deletions(-)
+
+diff --git a/avahi-core/browse-dns-server.c b/avahi-core/browse-dns-server.c
+index 049752e9..c2d914fa 100644
+--- a/avahi-core/browse-dns-server.c
++++ b/avahi-core/browse-dns-server.c
+@@ -343,7 +343,10 @@ AvahiSDNSServerBrowser *avahi_s_dns_server_browser_new(
+         AvahiSDNSServerBrowser* b;
+ 
+         b = avahi_s_dns_server_browser_prepare(server, interface, protocol, domain, type, aprotocol, flags, callback, userdata);
++        if (!b)
++            return NULL;
++
+         avahi_s_dns_server_browser_start(b);
+ 
+         return b;
+-}
+\ No newline at end of file
++}
+diff --git a/avahi-core/browse-domain.c b/avahi-core/browse-domain.c
+index f145d56a..06fa70c0 100644
+--- a/avahi-core/browse-domain.c
++++ b/avahi-core/browse-domain.c
+@@ -253,7 +253,10 @@ AvahiSDomainBrowser *avahi_s_domain_browser_new(
+         AvahiSDomainBrowser *b;
+ 
+         b = avahi_s_domain_browser_prepare(server, interface, protocol, domain, type, flags, callback, userdata);
++        if (!b)
++            return NULL;
++
+         avahi_s_domain_browser_start(b);
+ 
+         return b;
+-}
+\ No newline at end of file
++}
+diff --git a/avahi-core/browse-service-type.c b/avahi-core/browse-service-type.c
+index fdd22dcd..b1fc7af8 100644
+--- a/avahi-core/browse-service-type.c
++++ b/avahi-core/browse-service-type.c
+@@ -171,6 +171,9 @@ AvahiSServiceTypeBrowser *avahi_s_service_type_browser_new(
+         AvahiSServiceTypeBrowser *b;
+ 
+         b = avahi_s_service_type_browser_prepare(server, interface, protocol, domain, flags, callback, userdata);
++        if (!b)
++            return NULL;
++
+         avahi_s_service_type_browser_start(b);
+ 
+         return b;
+diff --git a/avahi-core/browse-service.c b/avahi-core/browse-service.c
+index 5531360c..63e0275a 100644
+--- a/avahi-core/browse-service.c
++++ b/avahi-core/browse-service.c
+@@ -184,6 +184,9 @@ AvahiSServiceBrowser *avahi_s_service_browser_new(
+         AvahiSServiceBrowser *b;
+ 
+         b = avahi_s_service_browser_prepare(server, interface, protocol, service_type, domain, flags, callback, userdata);
++        if (!b)
++            return NULL;
++
+         avahi_s_service_browser_start(b);
+ 
+         return b;
+diff --git a/avahi-core/browse.c b/avahi-core/browse.c
+index 2941e579..e8a915e9 100644
+--- a/avahi-core/browse.c
++++ b/avahi-core/browse.c
+@@ -634,6 +634,9 @@ AvahiSRecordBrowser *avahi_s_record_browser_new(
+         AvahiSRecordBrowser *b;
+ 
+         b = avahi_s_record_browser_prepare(server, interface, protocol, key, flags, callback, userdata);
++        if (!b)
++            return NULL;
++
+         avahi_s_record_browser_start_query(b);
+ 
+         return b;
+diff --git a/avahi-core/resolve-address.c b/avahi-core/resolve-address.c
+index ac0b29b1..e61dd242 100644
+--- a/avahi-core/resolve-address.c
++++ b/avahi-core/resolve-address.c
+@@ -286,7 +286,10 @@ AvahiSAddressResolver *avahi_s_address_resolver_new(
+         AvahiSAddressResolver *b;
+ 
+         b = avahi_s_address_resolver_prepare(server, interface, protocol, address, flags, callback, userdata);
++        if (!b)
++            return NULL;
++
+         avahi_s_address_resolver_start(b);
+ 
+         return b;
+-}
+\ No newline at end of file
++}
+diff --git a/avahi-core/resolve-host-name.c b/avahi-core/resolve-host-name.c
+index 808b0e72..4e8e5973 100644
+--- a/avahi-core/resolve-host-name.c
++++ b/avahi-core/resolve-host-name.c
+@@ -318,7 +318,10 @@ AvahiSHostNameResolver *avahi_s_host_name_resolver_new(
+         AvahiSHostNameResolver *b;
+ 
+         b = avahi_s_host_name_resolver_prepare(server, interface, protocol, host_name, aprotocol, flags, callback, userdata);
++        if (!b)
++            return NULL;
++
+         avahi_s_host_name_resolver_start(b);
+ 
+         return b;
+-}
+\ No newline at end of file
++}
+diff --git a/avahi-core/resolve-service.c b/avahi-core/resolve-service.c
+index 66bf3cae..43771763 100644
+--- a/avahi-core/resolve-service.c
++++ b/avahi-core/resolve-service.c
+@@ -519,7 +519,10 @@ AvahiSServiceResolver *avahi_s_service_resolver_new(
+         AvahiSServiceResolver *b;
+ 
+         b = avahi_s_service_resolver_prepare(server, interface, protocol, name, type, domain, aprotocol, flags, callback, userdata);
++        if (!b)
++            return NULL;
++
+         avahi_s_service_resolver_start(b);
+ 
+         return b;
+-}
+\ No newline at end of file
++}
diff --git a/network/avahi/patches/Fetch-build-db-from-upstream-git.patch b/network/avahi/patches/Fetch-build-db-from-upstream-git.patch
new file mode 100644
index 0000000000..eacb6dab5a
--- /dev/null
+++ b/network/avahi/patches/Fetch-build-db-from-upstream-git.patch
@@ -0,0 +1,71 @@
+From: Andreas Henriksson <andreas@fatal.se>
+Date: Sat, 26 Oct 2019 15:49:35 +0200
+Subject: Fetch build-db from upstream git
+
+Fetch the build-db file from:
+https://raw.githubusercontent.com/lathiat/avahi/master/service-type-database/build-db
+
+This file is missing dist tarball, likely caused by changes in:
+https://github.com/lathiat/avahi/pull/134
+
+Carry it as a patch for now.
+---
+ service-type-database/build-db | 49 ++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 49 insertions(+)
+ create mode 100755 service-type-database/build-db
+
+diff --git a/service-type-database/build-db b/service-type-database/build-db
+new file mode 100755
+index 0000000..78ee892
+--- /dev/null
++++ b/service-type-database/build-db
+@@ -0,0 +1,49 @@
++#!/usr/bin/env python
++# -*-python-*-
++# This file is part of avahi.
++#
++# avahi 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 of the
++# License, or (at your option) any later version.
++#
++# avahi 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 Lesser General Public
++# License along with avahi; if not, write to the Free Software
++# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
++# USA.
++
++try:
++    import anydbm as dbm
++except ImportError:
++    import dbm
++
++import sys
++
++if len(sys.argv) > 1:
++    infn = sys.argv[1]
++else:
++    infn = "service-types"
++
++if len(sys.argv) > 2:
++    outfn = sys.argv[2]
++else:
++    outfn = infn + ".db"
++
++db = dbm.open(outfn, "n")
++
++for ln in open(infn, "r"):
++    ln = ln.strip(" \r\n\t")
++    
++    if ln == "" or ln.startswith("#"):
++        continue
++
++    t, n = ln.split(":", 1)
++
++    db[t.strip()] = n.strip()
++
++db.close()
diff --git a/network/avahi/patches/Ship-avahi-discover-1-bssh-1-and-bvnc-1-also-for-GTK3.patch b/network/avahi/patches/Ship-avahi-discover-1-bssh-1-and-bvnc-1-also-for-GTK3.patch
new file mode 100644
index 0000000000..076442706a
--- /dev/null
+++ b/network/avahi/patches/Ship-avahi-discover-1-bssh-1-and-bvnc-1-also-for-GTK3.patch
@@ -0,0 +1,50 @@
+From: Andreas Henriksson <andreas@fatal.se>
+Date: Thu, 24 Aug 2017 17:52:19 +0200
+Subject: Ship avahi-discover(1), bssh(1) and bvnc(1) also for GTK3
+
+These manpages went missing when you disabled gtk2 builds....
+
+Forwarded: https://github.com/lathiat/avahi/pull/142
+Applied-upstream: 0.9, commit:751be804e891aec5701a059144e2f5cbfc981b36
+---
+ man/Makefile.am | 9 +++++----
+ 1 file changed, 5 insertions(+), 4 deletions(-)
+
+diff --git a/man/Makefile.am b/man/Makefile.am
+index 77a27bd..289b942 100644
+--- a/man/Makefile.am
++++ b/man/Makefile.am
+@@ -56,7 +56,7 @@ man_MANS += \
+ 	avahi-publish.1 \
+ 	avahi-set-host-name.1
+ 
+-if HAVE_GTK
++if HAVE_GTK2OR3
+ man_MANS += \
+ 	bssh.1
+ endif
+@@ -64,12 +64,13 @@ endif
+ if HAVE_PYTHON
+ man_MANS += \
+ 	avahi-bookmarks.1
+-if HAVE_GTK
++endif
++
++if HAVE_PYGOBJECT
+ man_MANS += \
+ 	avahi-discover.1
+ endif
+ endif
+-endif
+ 
+ if ENABLE_AUTOIPD
+ if HAVE_LIBDAEMON
+@@ -134,7 +135,7 @@ EXTRA_DIST = \
+ if HAVE_DBUS
+ 
+ BSSH_LN =
+-if HAVE_GTK
++if HAVE_GTK2OR3
+ if HAVE_GLIB
+ BSSH_LN += $(LN_S) bssh.1 bvnc.1 &&
+ BSSH_LN += $(LN_S) bssh.1 bshell.1 &&
diff --git a/network/avahi/patches/avahi-client-fix-resource-leak.patch b/network/avahi/patches/avahi-client-fix-resource-leak.patch
new file mode 100644
index 0000000000..141828a259
--- /dev/null
+++ b/network/avahi/patches/avahi-client-fix-resource-leak.patch
@@ -0,0 +1,22 @@
+From 374245ec1418e7e1e57120fcaf0a12ec695f5f6d Mon Sep 17 00:00:00 2001
+From: Michal Sekletar <msekleta@redhat.com>
+Date: Wed, 24 Oct 2018 15:22:19 +0000
+Subject: [PATCH] avahi-client: fix resource leak
+
+---
+ avahi-client/browser.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/avahi-client/browser.c b/avahi-client/browser.c
+index c978d942..fa4a9a80 100644
+--- a/avahi-client/browser.c
++++ b/avahi-client/browser.c
+@@ -72,6 +72,8 @@ static void parse_domain_file(AvahiDomainBrowser *b) {
+         if (avahi_normalize_name(buf, domain, sizeof(domain)))
+             b->static_browse_domains = avahi_string_list_add(b->static_browse_domains, domain);
+     }
++
++    fclose(f);
+ }
+ 
+ static void domain_browser_ref(AvahiDomainBrowser *db) {
diff --git a/network/avahi/patches/avahi-daemon-chroot-fix-bogus-assignments-in-assertions.patch b/network/avahi/patches/avahi-daemon-chroot-fix-bogus-assignments-in-assertions.patch
new file mode 100644
index 0000000000..9984722893
--- /dev/null
+++ b/network/avahi/patches/avahi-daemon-chroot-fix-bogus-assignments-in-assertions.patch
@@ -0,0 +1,24 @@
+From 4b48927e8e2c721d103018b4ce39a164b6c2898f Mon Sep 17 00:00:00 2001
+From: Michal Sekletar <msekleta@redhat.com>
+Date: Wed, 24 Oct 2018 15:38:48 +0000
+Subject: [PATCH] chroot: fix bogus assignments in assertions
+
+---
+ avahi-daemon/chroot.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/avahi-daemon/chroot.c b/avahi-daemon/chroot.c
+index ccd56be0..871b3b34 100644
+--- a/avahi-daemon/chroot.c
++++ b/avahi-daemon/chroot.c
+@@ -188,8 +188,8 @@ static int recv_fd(int fd) {
+             return -1;
+         }
+ 
+-        assert(h->cmsg_len = CMSG_LEN(sizeof(int)));
+-        assert(h->cmsg_level = SOL_SOCKET);
++        assert(h->cmsg_len == CMSG_LEN(sizeof(int)));
++        assert(h->cmsg_level == SOL_SOCKET);
+         assert(h->cmsg_type == SCM_RIGHTS);
+ 
+         return *((int*)CMSG_DATA(h));
diff --git a/network/avahi/patches/avahi-discover-Don-t-decode-unicode-strings-only-bytestri.patch b/network/avahi/patches/avahi-discover-Don-t-decode-unicode-strings-only-bytestri.patch
new file mode 100644
index 0000000000..56a92addfc
--- /dev/null
+++ b/network/avahi/patches/avahi-discover-Don-t-decode-unicode-strings-only-bytestri.patch
@@ -0,0 +1,41 @@
+From: Simon McVittie <smcv@debian.org>
+Date: Fri, 24 Apr 2020 11:25:41 +0100
+Subject: avahi-discover: Don't decode unicode strings, only bytestrings
+
+Unicode strings (unicode in Python 2, str or unicode in Python 3) don't
+have a decode method; only bytestrings (str or bytes in Python 2,
+bytes in Python 3) have that. Decode exactly the strings that need
+decoding.
+
+Resolves: https://github.com/lathiat/avahi/issues/275
+Signed-off-by: Simon McVittie <smcv@debian.org>
+Forwarded: https://github.com/lathiat/avahi/pull/282
+---
+ avahi-python/avahi-discover/avahi-discover.py | 8 +++++---
+ 1 file changed, 5 insertions(+), 3 deletions(-)
+
+diff --git a/avahi-python/avahi-discover/avahi-discover.py b/avahi-python/avahi-discover/avahi-discover.py
+index 4a2b575..fddf4a5 100755
+--- a/avahi-python/avahi-discover/avahi-discover.py
++++ b/avahi-python/avahi-discover/avahi-discover.py
+@@ -238,15 +238,17 @@ class Main_window:
+                 txts+="<b>" + _("TXT") + " <i>%s</i></b> = %s\n" % (k,v)
+         else:
+             txts = "<b>" + _("TXT Data:") + "</b> <i>" + _("empty") + "</i>"
+-        
+-        txts = txts.decode("utf-8")
++
++        if isinstance(txts, bytes):     # Python 2
++            txts = txts.decode("utf-8")
+ 
+         infos = "<b>" + _("Service Type:") + "</b> %s\n"
+         infos += "<b>" + _("Service Name:") + "</b> %s\n"
+         infos += "<b>" + _("Domain Name:") + "</b> %s\n"
+         infos += "<b>" + _("Interface:") + "</b> %s %s\n"
+         infos += "<b>" + _("Address:") + "</b> %s/%s:%i\n%s"
+-        infos = infos.decode("utf-8")
++        if isinstance(infos, bytes):    # Python 2
++            infos = infos.decode("utf-8")
+         infos = infos % (stype, name, domain, self.siocgifname(interface), self.protoname(protocol), host, address, port, txts.strip())
+         self.info_label.set_markup(infos)
+ 
diff --git a/network/avahi/patches/avahi_dns_packet_consume_uint32-fix-potential-undefined-b.patch b/network/avahi/patches/avahi_dns_packet_consume_uint32-fix-potential-undefined-b.patch
new file mode 100644
index 0000000000..d9ba99f4d8
--- /dev/null
+++ b/network/avahi/patches/avahi_dns_packet_consume_uint32-fix-potential-undefined-b.patch
@@ -0,0 +1,29 @@
+From: traffic-millions <60914101+traffic-millions@users.noreply.github.com>
+Date: Tue, 3 Mar 2020 11:15:48 +0800
+Subject: avahi_dns_packet_consume_uint32: fix potential undefined behavior
+
+avahi_dns_packet_consume_uint32 left shifts uint8_t values by 8, 16 and 24 bits to combine them into a 32-bit value. This produces an undefined behavior warning with gcc -fsanitize when fed input values of 128 or 255 however in testing no actual unexpected behavior occurs in practice and the 32-bit uint32_t is always correctly produced as the final value is immediately stored into a uint32_t and the compiler appears to handle this "correctly".
+
+Cast the intermediate values to uint32_t to prevent this warning and ensure the intended result is explicit.
+
+Closes: #267
+Closes: #268
+Reference: https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=19304
+Origin: upstream, 0.9, commit:b897ca43ac100d326d118e5877da710eb7f836f9
+---
+ avahi-core/dns.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/avahi-core/dns.c b/avahi-core/dns.c
+index 7c38f42..d793b76 100644
+--- a/avahi-core/dns.c
++++ b/avahi-core/dns.c
+@@ -455,7 +455,7 @@ int avahi_dns_packet_consume_uint32(AvahiDnsPacket *p, uint32_t *ret_v) {
+         return -1;
+ 
+     d = (uint8_t*) (AVAHI_DNS_PACKET_DATA(p) + p->rindex);
+-    *ret_v = (d[0] << 24) | (d[1] << 16) | (d[2] << 8) | d[3];
++    *ret_v = ((uint32_t)d[0] << 24) | ((uint32_t)d[1] << 16) | ((uint32_t)d[2] << 8) | (uint32_t)d[3];
+     p->rindex += sizeof(uint32_t);
+ 
+     return 0;
diff --git a/network/avahi/patches/avoid-infinite-loop-in-avahi-daemon-by-handling-hup-event-in-client-work.patch b/network/avahi/patches/avoid-infinite-loop-in-avahi-daemon-by-handling-hup-event-in-client-work.patch
new file mode 100644
index 0000000000..3e0725a602
--- /dev/null
+++ b/network/avahi/patches/avoid-infinite-loop-in-avahi-daemon-by-handling-hup-event-in-client-work.patch
@@ -0,0 +1,37 @@
+From 447affe29991ee99c6b9732fc5f2c1048a611d3b Mon Sep 17 00:00:00 2001
+From: Riccardo Schirone <sirmy15@gmail.com>
+Date: Fri, 26 Mar 2021 11:50:24 +0100
+Subject: [PATCH] Avoid infinite-loop in avahi-daemon by handling HUP event in
+ client_work
+
+If a client fills the input buffer, client_work() disables the
+AVAHI_WATCH_IN event, thus preventing the function from executing the
+`read` syscall the next times it is called. However, if the client then
+terminates the connection, the socket file descriptor receives a HUP
+event, which is not handled, thus the kernel keeps marking the HUP event
+as occurring. While iterating over the file descriptors that triggered
+an event, the client file descriptor will keep having the HUP event and
+the client_work() function is always called with AVAHI_WATCH_HUP but
+without nothing being done, thus entering an infinite loop.
+
+See https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=984938
+---
+ avahi-daemon/simple-protocol.c | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/avahi-daemon/simple-protocol.c b/avahi-daemon/simple-protocol.c
+index 3e0ebb11..6c0274d6 100644
+--- a/avahi-daemon/simple-protocol.c
++++ b/avahi-daemon/simple-protocol.c
+@@ -424,6 +424,11 @@ static void client_work(AvahiWatch *watch, AVAHI_GCC_UNUSED int fd, AvahiWatchEv
+         }
+     }
+ 
++    if (events & AVAHI_WATCH_HUP) {
++        client_free(c);
++        return;
++    }
++
+     c->server->poll_api->watch_update(
+         watch,
+         (c->outbuf_length > 0 ? AVAHI_WATCH_OUT : 0) |
diff --git a/network/avahi/patches/build-db-Use-the-same-database-format-that-the-C-code-exp.patch b/network/avahi/patches/build-db-Use-the-same-database-format-that-the-C-code-exp.patch
new file mode 100644
index 0000000000..3017043d47
--- /dev/null
+++ b/network/avahi/patches/build-db-Use-the-same-database-format-that-the-C-code-exp.patch
@@ -0,0 +1,106 @@
+From: Simon McVittie <smcv@debian.org>
+Date: Thu, 7 May 2020 12:13:56 +0100
+Subject: build-db: Use the same database format that the C code expects
+
+Otherwise, Python 2 anydbm will preferentially choose Berkeley DB format
+(dbhash/bsddb), which is neither GNU gdbm nor traditional Unix (n)dbm.
+
+Signed-off-by: Simon McVittie <smcv@debian.org>
+Fixes: https://github.com/lathiat/avahi/issues/260
+---
+ configure.ac                      | 11 ++++++++---
+ service-type-database/Makefile.am |  4 ++--
+ service-type-database/build-db    | 27 +++++++++++++++++++++------
+ 3 files changed, 31 insertions(+), 11 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 58db8c7..5aea4e7 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -871,9 +871,14 @@ if test "x$HAVE_PYTHON" = "xyes" ; then
+         fi
+ 
+         AM_CHECK_PYMOD(socket,,,[AC_MSG_ERROR(Could not find Python module socket)])
+-        if test "x$HAVE_GDBM" = "xyes" || test "x$HAVE_DBM" = "xyes"; then
+-            AM_CHECK_PYMOD(anydbm,,,[
+-                AM_CHECK_PYMOD(dbm,,,[AC_MSG_ERROR(Could not find Python module dbm)])
++        if test "x$HAVE_GDBM" = "xyes"; then
++            AM_CHECK_PYMOD([dbm.gnu], [], [], [
++                AM_CHECK_PYMOD([gdbm], [], [], [AC_MSG_ERROR(Could not find Python module dbm.gnu or gdbm)])
++            ])
++        fi
++        if test "x$HAVE_DBM" = "xyes"; then
++            AM_CHECK_PYMOD([dbm.ndbm], [], [], [
++                AM_CHECK_PYMOD([dbm], [], [], [AC_MSG_ERROR(Could not find Python module dbm.ndbm or dbm)])
+             ])
+         fi
+     fi
+diff --git a/service-type-database/Makefile.am b/service-type-database/Makefile.am
+index f9fa082..0ead0f6 100644
+--- a/service-type-database/Makefile.am
++++ b/service-type-database/Makefile.am
+@@ -28,7 +28,7 @@ noinst_SCRIPTS=build-db
+ pkglibdata_DATA+=service-types.db
+ 
+ service-types.db: service-types
+-	$(AM_V_GEN)$(PYTHON) build-db $< $@.coming && \
++	$(AM_V_GEN)$(PYTHON) build-db --gnu $< $@.coming && \
+ 	mv $@.coming $@
+ 
+ CLEANFILES = service-types.db
+@@ -44,7 +44,7 @@ service-types.db.pag: service-types.db
+ service-types.db.dir: service-types.db
+ 	$(AM_V_GEN)mv service-types.db.coming.dir service-types.db.dir
+ service-types.db: service-types build-db
+-	$(AM_V_GEN)$(PYTHON) build-db $< $@.coming && \
++	$(AM_V_GEN)$(PYTHON) build-db --ndbm $< $@.coming && \
+ 	if test -f "$@.coming"; then mv $@.coming $@; fi
+ 
+ CLEANFILES = service-types.db*
+diff --git a/service-type-database/build-db b/service-type-database/build-db
+index 78ee892..6415d27 100755
+--- a/service-type-database/build-db
++++ b/service-type-database/build-db
+@@ -17,13 +17,28 @@
+ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+ # USA.
+ 
+-try:
+-    import anydbm as dbm
+-except ImportError:
+-    import dbm
+-
+ import sys
+ 
++if sys.argv[1] == '--gnu':
++    if sys.version_info >= (3,):
++        import dbm.gnu as chosen_dbm
++    else:
++        import gdbm as chosen_dbm
++
++    sys.argv[1:] = sys.argv[2:]
++elif sys.argv[1] == '--ndbm':
++    if sys.version_info >= (3,):
++        import dbm.ndbm as chosen_dbm
++    else:
++        import dbm as chosen_dbm
++
++    sys.argv[1:] = sys.argv[2:]
++else:
++    if sys.version_info >= (3,):
++        import dbm as chosen_dbm
++    else:
++        import anydbm as chosen_dbm
++
+ if len(sys.argv) > 1:
+     infn = sys.argv[1]
+ else:
+@@ -34,7 +49,7 @@ if len(sys.argv) > 2:
+ else:
+     outfn = infn + ".db"
+ 
+-db = dbm.open(outfn, "n")
++db = chosen_dbm.open(outfn, "n")
+ 
+ for ln in open(infn, "r"):
+     ln = ln.strip(" \r\n\t")
diff --git a/network/avahi/patches/fix-bytestring-decoding-for-proper-display.patch b/network/avahi/patches/fix-bytestring-decoding-for-proper-display.patch
new file mode 100644
index 0000000000..bfb826db93
--- /dev/null
+++ b/network/avahi/patches/fix-bytestring-decoding-for-proper-display.patch
@@ -0,0 +1,28 @@
+From: =?utf-8?q?=C3=89ric_Araujo?= <merwok@netwok.org>
+Date: Sat, 29 Feb 2020 19:14:04 -0500
+Subject: fix bytestring decoding for proper display
+
+---
+ avahi-python/avahi-discover/avahi-discover.py | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/avahi-python/avahi-discover/avahi-discover.py b/avahi-python/avahi-discover/avahi-discover.py
+index 0db705d..4a2b575 100755
+--- a/avahi-python/avahi-discover/avahi-discover.py
++++ b/avahi-python/avahi-discover/avahi-discover.py
+@@ -238,12 +238,15 @@ class Main_window:
+                 txts+="<b>" + _("TXT") + " <i>%s</i></b> = %s\n" % (k,v)
+         else:
+             txts = "<b>" + _("TXT Data:") + "</b> <i>" + _("empty") + "</i>"
++        
++        txts = txts.decode("utf-8")
+ 
+         infos = "<b>" + _("Service Type:") + "</b> %s\n"
+         infos += "<b>" + _("Service Name:") + "</b> %s\n"
+         infos += "<b>" + _("Domain Name:") + "</b> %s\n"
+         infos += "<b>" + _("Interface:") + "</b> %s %s\n"
+         infos += "<b>" + _("Address:") + "</b> %s/%s:%i\n%s"
++        infos = infos.decode("utf-8")
+         infos = infos % (stype, name, domain, self.siocgifname(interface), self.protoname(protocol), host, address, port, txts.strip())
+         self.info_label.set_markup(infos)
+ 
diff --git a/network/avahi/fixup_avahi-dnsconfd.action.patch b/network/avahi/patches/fixup_avahi-dnsconfd.action.patch
index 88f9b5f807..88f9b5f807 100644
--- a/network/avahi/fixup_avahi-dnsconfd.action.patch
+++ b/network/avahi/patches/fixup_avahi-dnsconfd.action.patch
diff --git a/network/avahi/patches/ipv6_race_condition_fix.patch b/network/avahi/patches/ipv6_race_condition_fix.patch
new file mode 100644
index 0000000000..3418b1a11c
--- /dev/null
+++ b/network/avahi/patches/ipv6_race_condition_fix.patch
@@ -0,0 +1,51 @@
+Submitted By:            Douglas R. Reno <renodr at linuxfromscratch dot org>
+Date:                    2020-10-19
+Initial Package Version: 0.8
+Upstream Status:         PR, not applied
+Origin:                  Upstream PR (github.com/lathiat/avahi/pull/309)
+Description:             Fixes a race condition when multiple NICs are in use
+                         when IPv6 is enabled. This will exhibit behavior where
+                         messages about withdrawing address records, registering
+                         access records, and new hostname announcements are
+                         spammed to the log every second.
+
+diff -Naurp avahi-0.8.orig/avahi-core/server.c avahi-0.8/avahi-core/server.c
+--- avahi-0.8.orig/avahi-core/server.c	2020-02-16 21:41:24.939967558 -0600
++++ avahi-0.8/avahi-core/server.c	2020-10-19 11:07:22.054861721 -0500
+@@ -193,7 +193,7 @@ static void withdraw_rrset(AvahiServer *
+         withdraw_entry(s, e);
+ }
+ 
+-static void incoming_probe(AvahiServer *s, AvahiRecord *record, AvahiInterface *i) {
++static void incoming_probe(AvahiServer *s, AvahiRecord *record, AvahiInterface *i, int from_local_iface) {
+     AvahiEntry *e, *n;
+     int ours = 0, won = 0, lost = 0;
+ 
+@@ -210,7 +210,7 @@ static void incoming_probe(AvahiServer *
+         if (e->dead)
+             continue;
+ 
+-        if ((cmp = avahi_record_lexicographical_compare(e->record, record)) == 0) {
++        if ((cmp = avahi_record_lexicographical_compare(e->record, record)) == 0 || from_local_iface) {
+             ours = 1;
+             break;
+         } else {
+@@ -639,7 +639,7 @@ static void handle_query_packet(AvahiSer
+             if (!avahi_key_is_pattern(record->key)) {
+                 if (!from_local_iface)
+                     reflect_probe(s, i, record);
+-                incoming_probe(s, record, i);
++                incoming_probe(s, record, i, from_local_iface);
+             }
+ 
+             avahi_record_unref(record);
+@@ -961,8 +961,7 @@ static void dispatch_packet(AvahiServer
+         return;
+ 
+     /* We don't want to reflect local traffic, so we check if this packet is generated locally. */
+-    if (s->config.enable_reflector)
+-        from_local_iface = originates_from_local_iface(s, iface, src_address, port);
++    from_local_iface = originates_from_local_iface(s, iface, src_address, port);
+ 
+     if (avahi_dns_packet_check_valid_multicast(p) < 0) {
+         avahi_log_debug("Received invalid packet.");
diff --git a/network/avahi/patches/man-add-missing-bshell.1-symlink.patch b/network/avahi/patches/man-add-missing-bshell.1-symlink.patch
new file mode 100644
index 0000000000..1bcbbb13e2
--- /dev/null
+++ b/network/avahi/patches/man-add-missing-bshell.1-symlink.patch
@@ -0,0 +1,33 @@
+From: Michael Biebl <biebl@debian.org>
+Date: Sun, 17 Sep 2017 12:52:39 +0200
+Subject: man: add missing bshell.1 symlink
+
+The bshell binary is missing a symlink to its manual page. It should be
+symlinked to the man page for bssh, just like how the bvnc man page is.
+
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=655190
+Forwarded: https://github.com/lathiat/avahi/pull/148
+Applied-upstream: 0.9, commit:f983df44870b602179b493f9c3d113753b378e27
+---
+ man/Makefile.am | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/man/Makefile.am b/man/Makefile.am
+index d38267c..77a27bd 100644
+--- a/man/Makefile.am
++++ b/man/Makefile.am
+@@ -137,12 +137,13 @@ BSSH_LN =
+ if HAVE_GTK
+ if HAVE_GLIB
+ BSSH_LN += $(LN_S) bssh.1 bvnc.1 &&
++BSSH_LN += $(LN_S) bssh.1 bshell.1 &&
+ endif
+ endif
+ install-exec-local:
+ 	mkdir -p $(DESTDIR)/$(mandir)/man1 && \
+ 		cd $(DESTDIR)/$(mandir)/man1 && \
+-		rm -f avahi-resolve-host-name.1 avahi-resolve-address.1 avahi-browse-domains.1 avahi-publish-address.1 avahi-publish-service.1 bvnc.1 && \
++		rm -f avahi-resolve-host-name.1 avahi-resolve-address.1 avahi-browse-domains.1 avahi-publish-address.1 avahi-publish-service.1 bvnc.1 bshell.1 && \
+ 		$(BSSH_LN) \
+ 		$(LN_S) avahi-resolve.1 avahi-resolve-host-name.1 && \
+ 		$(LN_S) avahi-resolve.1 avahi-resolve-address.1 && \
diff --git a/network/avahi/patches/man-fix-reference-to-avahi-autoipd.action-8-in-avahi-auto.patch b/network/avahi/patches/man-fix-reference-to-avahi-autoipd.action-8-in-avahi-auto.patch
new file mode 100644
index 0000000000..94d8d9517a
--- /dev/null
+++ b/network/avahi/patches/man-fix-reference-to-avahi-autoipd.action-8-in-avahi-auto.patch
@@ -0,0 +1,24 @@
+From: Michael Biebl <biebl@debian.org>
+Date: Sun, 17 Sep 2017 10:57:47 +0200
+Subject: man: fix reference to avahi-autoipd.action(8) in avahi-autoipd(8)
+
+Forwarded: https://github.com/lathiat/avahi/pull/147
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=840833
+Applied-upstream: 0.9, commit:1905a6b878064c6cc9bb96a1fc17ef77c75787c6
+---
+ man/avahi-autoipd.8.xml.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/man/avahi-autoipd.8.xml.in b/man/avahi-autoipd.8.xml.in
+index 7137c30..23764a5 100644
+--- a/man/avahi-autoipd.8.xml.in
++++ b/man/avahi-autoipd.8.xml.in
+@@ -150,7 +150,7 @@
+ 
+ 	<section name="See also">
+ 	  <p>
+-        <manref name="autoipd.action" section="8"/>, <manref name="dhclient" section="8"/>
++        <manref name="avahi-autoipd.action" section="8"/>, <manref name="dhclient" section="8"/>
+ 	  </p>
+ 
+       <p>http://avahi.org/wiki/AvahiAutoipd documents how avahi-autoipd is best packaged and integrated into distributions.</p>
diff --git a/network/avahi/patches/series b/network/avahi/patches/series
new file mode 100644
index 0000000000..1246744108
--- /dev/null
+++ b/network/avahi/patches/series
@@ -0,0 +1,13 @@
+avahi-dnsconfd.service-Drop-Also-avahi-daemon.socket.patch
+man-fix-reference-to-avahi-autoipd.action-8-in-avahi-auto.patch
+man-add-missing-bshell.1-symlink.patch
+Ship-avahi-discover-1-bssh-1-and-bvnc-1-also-for-GTK3.patch
+avahi_dns_packet_consume_uint32-fix-potential-undefined-b.patch
+fix-bytestring-decoding-for-proper-display.patch
+avahi-discover-Don-t-decode-unicode-strings-only-bytestri.patch
+Fetch-build-db-from-upstream-git.patch
+build-db-Use-the-same-database-format-that-the-C-code-exp.patch
+avahi-daemon-chroot-fix-bogus-assignments-in-assertions.patch
+avahi-client-fix-resource-leak.patch
+avoid-infinite-loop-in-avahi-daemon-by-handling-hup-event-in-client-work.patch
+CVE-2021-3502.patch
diff --git a/network/awscli-v2/README b/network/awscli-v2/README
new file mode 100644
index 0000000000..17ff6181cd
--- /dev/null
+++ b/network/awscli-v2/README
@@ -0,0 +1,11 @@
+The AWS Command Line Interface (AWS CLI) is a unified tool to 
+manage your AWS services. With just one tool to download and 
+configure, you can control multiple AWS services from the command
+line and automate them through scripts.
+
+The AWS CLI v2 offers several new features including improved 
+installers, new configuration options such as AWS IAM Identity 
+Center (successor to AWS SSO), and various interactive features. 
+
+Note: AWS CLI v2 builds on AWS CLI v1 and includes a number of
+features and enhancements based on community feedback.
diff --git a/network/awscli-v2/awscli-v2.SlackBuild b/network/awscli-v2/awscli-v2.SlackBuild
new file mode 100644
index 0000000000..b8b3f10f5f
--- /dev/null
+++ b/network/awscli-v2/awscli-v2.SlackBuild
@@ -0,0 +1,100 @@
+#!/bin/bash
+
+# Slackware build script for awscli-v2
+
+# Copyright 2023 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=awscli-v2
+SRCNAM=aws-cli
+VERSION=${VERSION:-2.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 the variable PRINT_PACKAGE_NAME is set, then this script will report what
+# the name of the created package would be, and then exit. This information
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; 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 {} \;
+
+python3 -m build --wheel --no-isolation --skip-dependency-check
+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.txt README.rst CHANGELOG.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
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/network/awscli-v2/awscli-v2.info b/network/awscli-v2/awscli-v2.info
new file mode 100644
index 0000000000..3c7c02b430
--- /dev/null
+++ b/network/awscli-v2/awscli-v2.info
@@ -0,0 +1,10 @@
+PRGNAM="awscli-v2"
+VERSION="2.14.1"
+HOMEPAGE="https://aws.amazon.com/cli/"
+DOWNLOAD="https://github.com/aws/aws-cli/archive/2.14.1/aws-cli-2.14.1.tar.gz"
+MD5SUM="f7a5bb039aaff1bc0f385c0f5013f599"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="awscrt colorama cryptography python3-ruamel.yaml python3-ruamel.yaml.clib python3-prompt_toolkit python3-dateutil jmespath"
+MAINTAINER="Dimitris Zlatanidis"
+EMAIL="dslackw@gmail.com"
diff --git a/network/awscli-v2/slack-desc b/network/awscli-v2/slack-desc
new file mode 100644
index 0000000000..9a6a6c7e0c
--- /dev/null
+++ b/network/awscli-v2/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+         |-----handy-ruler------------------------------------------------------|
+awscli-v2: awscli-v2 (CLI to Amazon Web Services)
+awscli-v2:
+awscli-v2: The AWS Command Line Interface (AWS CLI) is a unified tool to manage
+awscli-v2: your AWS services. With just one tool to download and configure, you
+awscli-v2: can control multiple AWS services from the command line and automate
+awscli-v2: them through scripts.
+awscli-v2:
+awscli-v2: Homepage: https://aws.amazon.com/cli/
+awscli-v2:
+awscli-v2:
+awscli-v2:
diff --git a/network/awscli/awscli.SlackBuild b/network/awscli/awscli.SlackBuild
index ac08553c5b..218f536270 100644
--- a/network/awscli/awscli.SlackBuild
+++ b/network/awscli/awscli.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for awscli
 
-# Copyright 2014-2018  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,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=awscli
-VERSION=${VERSION:-1.16.67}
+SRCNAM=aws-cli
+VERSION=${VERSION:-1.32.14}
 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,9 +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
+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,14 +77,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
+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.txt PKG-INFO README.rst $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a LICENSE.txt README.rst $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
@@ -84,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/network/awscli/awscli.info b/network/awscli/awscli.info
index 9164de0bd6..ab324364bb 100644
--- a/network/awscli/awscli.info
+++ b/network/awscli/awscli.info
@@ -1,10 +1,10 @@
 PRGNAM="awscli"
-VERSION="1.16.67"
+VERSION="1.32.14"
 HOMEPAGE="https://aws.amazon.com/cli/"
-DOWNLOAD="https://files.pythonhosted.org/packages/58/7e/327521add7f23d223fec675c56f8e2a9851299fab8b650cc97380ea742e4/awscli-1.16.67.tar.gz"
-MD5SUM="a38a42213df81c94f8c7d9da360be245"
+DOWNLOAD="https://github.com/aws/aws-cli/archive/1.32.14/aws-cli-1.32.14.tar.gz"
+MD5SUM="41a09b4643026ce8f80043a1dd5b9844"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="s3transfer colorama rsa PyYAML"
+REQUIRES="s3transfer colorama python3-rsa"
 MAINTAINER="Dimitris Zlatanidis"
-EMAIL="d.zlatanidis@gmail.com"
+EMAIL="dslackw@gmail.com"
diff --git a/network/awstats/README b/network/awstats/README
index 68693856c0..dd0bf6d1ae 100644
--- a/network/awstats/README
+++ b/network/awstats/README
@@ -1,14 +1,15 @@
-AWStats is a free, powerful and featureful tool that generates advanced web
-streaming, ftp or mail server statistics, graphically.  AWStats works as a
-CGI or from command line and shows you all possible information your log
-contains, in few graphical web pages.  It can analyze log files from all
-major server tools like Apache log files and a lot of other web, proxy,
-wap, streaming servers, mail servers and some ftp servers.
+AWStats is a free, powerful and featureful tool that generates
+advanced web streaming, ftp or mail server statistics, graphically.
+AWStats works as a CGI or from command line and shows you all possible
+information your log contains, in few graphical web pages.  It can
+analyze log files from all major server tools like Apache log files
+and a lot of other web, proxy, wap, streaming servers, mail servers
+and some ftp servers.
 
-There's an automated script (awstats_configure.pl) to prepare the httpd
-config file located in DOCROOT/awstats/ - however, you should not
-need/want to run it; instead, everything should work well if you make the 
-changes listed below.
+There's an automated script (awstats_configure.pl) to prepare the
+httpd config file located in DOCROOT/awstats/ - however, you should
+not need/want to run it; instead, everything should work well if you
+make the changes listed below.
 
 Edit /etc/httpd/httpd.conf (this is a required change to use AWStats):
 Comment this out:     CustomLog "/var/log/httpd/access_log" common
@@ -22,9 +23,9 @@ You need to load mod_cgid.so and mod_cgi.so modules
 
 Then restart httpd:   "/etc/rc.d/rc.httpd restart"
 
-A sample config file will be placed in /etc/awstats; Make some necessary changes
-and please read the necessary steps to start awstats from online page
-starting from step 4:
+A sample config file will be placed in /etc/awstats; Make some
+necessary changes and please read the necessary steps to start awstats
+from online page starting from step 4:
 http://www.awstats.org/docs/awstats_setup.html
 
 If you wish to update the process automatically, please refer to:
diff --git a/network/awstats/awstats.SlackBuild b/network/awstats/awstats.SlackBuild
index 44e2cb0432..76c19e3a45 100644
--- a/network/awstats/awstats.SlackBuild
+++ b/network/awstats/awstats.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware Package Build Script for awstats
 # Home Page http://awstats.sourceforge.net/
@@ -27,19 +27,26 @@
 
 # Modified by the SlackBuilds.org project.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM="awstats"
-VERSION=${VERSION:-7.6}
+VERSION=${VERSION:-7.8}
 # hardcode ARCH
 ARCH=noarch
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 DOCROOT=${DOCROOT:-/var/www/htdocs}
 
 AWUSER=${AWUSER:-root}
 AWGROUP=${AWGROUP:-apache}
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_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 +62,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 {} \;
-
-# Include some security patches from git
-patch -p1 < $CWD/patches/0001-Fix-to-window.opener-vulnerability-in-external-refer.patch
-patch -p1 < $CWD/patches/0001-Fix-to-window.opener-vulnerability-in-browser-OS-and.patch
-patch -p1 < $CWD/patches/0001-FIX-Security-reported-by-cPanel-Security-Team-can-ex.patch
-patch -p1 < $CWD/patches/0001-Fix-another-vulnerability-reported-by-cPanel-Securit.patch
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+
 
 # Patch httpd_conf file supplied by awstats to correct paths
 sed s:@DOCROOT@:$DOCROOT: $CWD/patches/httpd-awstats.conf.patch | patch -p0
@@ -73,6 +74,7 @@ sed s:@DOCROOT@:$DOCROOT: $CWD/patches/awstats_configure.pl.patch | patch -p0
 sed s:@DOCROOT@:$DOCROOT: $CWD/patches/awstats.pl.patch | patch -p0
 
 mkdir -p $PKG/$DOCROOT/awstats $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 mkdir -p $PKG/etc/awstats $PKG/etc/httpd/extra
 mkdir -m 0770 -p $PKG/var/lib/awstats
 
@@ -98,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/network/awstats/awstats.info b/network/awstats/awstats.info
index 742f040917..d6c3919c6c 100644
--- a/network/awstats/awstats.info
+++ b/network/awstats/awstats.info
@@ -1,8 +1,8 @@
 PRGNAM="awstats"
-VERSION="7.6"
+VERSION="7.8"
 HOMEPAGE="http://awstats.sourceforge.net/"
-DOWNLOAD="https://prdownloads.sourceforge.net/awstats/awstats-7.6.tar.gz"
-MD5SUM="c69977f938be594b81fdb5e065846d31"
+DOWNLOAD="https://prdownloads.sourceforge.net/awstats/awstats-7.8.tar.gz"
+MD5SUM="46986723e04b1980389193153915e760"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/network/awstats/patches/0001-FIX-Security-reported-by-cPanel-Security-Team-can-ex.patch b/network/awstats/patches/0001-FIX-Security-reported-by-cPanel-Security-Team-can-ex.patch
deleted file mode 100644
index 1233b642e6..0000000000
--- a/network/awstats/patches/0001-FIX-Security-reported-by-cPanel-Security-Team-can-ex.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-From cf219843a74c951bf5986f3a7fffa3dcf99c3899 Mon Sep 17 00:00:00 2001
-From: Laurent Destailleur <eldy@destailleur.fr>
-Date: Sun, 17 Dec 2017 12:55:48 +0100
-Subject: [PATCH] FIX Security reported by cPanel Security Team (can execute
- arbitraty code)
-
----
- wwwroot/cgi-bin/awstats.pl | 19 ++++++++++++++-----
- 1 file changed, 14 insertions(+), 5 deletions(-)
-
-diff --git a/wwwroot/cgi-bin/awstats.pl b/wwwroot/cgi-bin/awstats.pl
-index 091d6823..fca4900f 100755
---- a/wwwroot/cgi-bin/awstats.pl
-+++ b/wwwroot/cgi-bin/awstats.pl
-@@ -1780,7 +1780,7 @@ sub Read_Config {
- 		}else{if ($Debug){debug("Unable to open config file: $searchdir$SiteConfig", 2);}}
- 	}
- 	
--		#CL - Added to open config if full path is passed to awstats 
-+	#CL - Added to open config if full path is passed to awstats 
- 	if ( !$FileConfig ) {
- 		
- 		my $SiteConfigBis = File::Spec->rel2abs($SiteConfig);
-@@ -2205,7 +2205,10 @@ sub Parse_Config {
- 		}
- 
- 		# Plugins
--		if ( $param =~ /^LoadPlugin/ ) { push @PluginsToLoad, $value; next; }
-+		if ( $param =~ /^LoadPlugin/ ) {
-+			$value =~ s/[^a-zA-Z0-9_\/\.\+:=\?\s%\-]//g;		# Sanitize plugin name and string param because it is used later in an eval.
-+			push @PluginsToLoad, $value; next; 
-+		}
- 
- 	  # Other parameter checks we need to put after MaxNbOfExtra and MinHitExtra
- 		if ( $param =~ /^MaxNbOf(\w+)/ ) { $MaxNbOf{$1} = $value; next; }
-@@ -3251,7 +3254,7 @@ sub Read_Plugins {
- 						}
- 						my $ret;    # To get init return
- 						my $initfunction =
--						  "\$ret=Init_$pluginname('$pluginparam')";
-+						  "\$ret=Init_$pluginname('$pluginparam')";		# Note that pluginname and pluginparam were sanitized when reading cong file entry 'LoadPlugin'
- 						my $initret = eval("$initfunction");
- 						if ( $initret && $initret eq 'xxx' ) {
- 							$initret =
-@@ -17140,7 +17143,10 @@ if ( $ENV{'GATEWAY_INTERFACE'} ) {    # Run from a browser as CGI
- 	# No update but report by default when run from a browser
- 	$UpdateStats = ( $QueryString =~ /update=1/i ? 1 : 0 );
- 
--	if ( $QueryString =~ /config=([^&]+)/i ) { $SiteConfig = &Sanitize("$1"); }
-+	if ( $QueryString =~ /config=([^&]+)/i ) { 
-+		$SiteConfig = &Sanitize("$1");
-+		$SiteConfig =~ s/\.\.//g; 		# Avoid directory transversal
-+	}
- 	if ( $QueryString =~ /diricons=([^&]+)/i ) { $DirIcons = "$1"; }
- 	if ( $QueryString =~ /pluginmode=([^&]+)/i ) {
- 		$PluginMode = &Sanitize( "$1", 1 );
-@@ -17227,7 +17233,10 @@ else {                             # Run from command line
- 	# Update with no report by default when run from command line
- 	$UpdateStats = 1;
- 
--	if ( $QueryString =~ /config=([^&]+)/i ) { $SiteConfig = &Sanitize("$1"); }
-+	if ( $QueryString =~ /config=([^&]+)/i ) { 
-+		$SiteConfig = &Sanitize("$1"); 
-+		$SiteConfig =~ s/\.\.//g; 
-+	}
- 	if ( $QueryString =~ /diricons=([^&]+)/i ) { $DirIcons = "$1"; }
- 	if ( $QueryString =~ /pluginmode=([^&]+)/i ) {
- 		$PluginMode = &Sanitize( "$1", 1 );
--- 
-2.15.1
-
diff --git a/network/awstats/patches/0001-Fix-another-vulnerability-reported-by-cPanel-Securit.patch b/network/awstats/patches/0001-Fix-another-vulnerability-reported-by-cPanel-Securit.patch
deleted file mode 100644
index 3a3e588ff4..0000000000
--- a/network/awstats/patches/0001-Fix-another-vulnerability-reported-by-cPanel-Securit.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-From 06c0ab29c1e5059d9e0279c6b64d573d619e1651 Mon Sep 17 00:00:00 2001
-From: Laurent Destailleur <eldy@destailleur.fr>
-Date: Wed, 27 Dec 2017 13:39:57 +0100
-Subject: [PATCH] Fix another vulnerability reported by cPanel Security Team
- (can execute arbitraty code)
-
----
- wwwroot/cgi-bin/awstats.pl | 14 +++++++++-----
- 1 file changed, 9 insertions(+), 5 deletions(-)
-
-diff --git a/wwwroot/cgi-bin/awstats.pl b/wwwroot/cgi-bin/awstats.pl
-index fca4900f..4f14c6ee 100755
---- a/wwwroot/cgi-bin/awstats.pl
-+++ b/wwwroot/cgi-bin/awstats.pl
-@@ -17145,7 +17145,6 @@ if ( $ENV{'GATEWAY_INTERFACE'} ) {    # Run from a browser as CGI
- 
- 	if ( $QueryString =~ /config=([^&]+)/i ) { 
- 		$SiteConfig = &Sanitize("$1");
--		$SiteConfig =~ s/\.\.//g; 		# Avoid directory transversal
- 	}
- 	if ( $QueryString =~ /diricons=([^&]+)/i ) { $DirIcons = "$1"; }
- 	if ( $QueryString =~ /pluginmode=([^&]+)/i ) {
-@@ -17191,10 +17190,13 @@ if ( $ENV{'GATEWAY_INTERFACE'} ) {    # Run from a browser as CGI
- 	# If migrate
- 	if ( $QueryString =~ /(^|-|&|&amp;)migrate=([^&]+)/i ) {
- 		$MigrateStats = &Sanitize("$2");
-+
- 		$MigrateStats =~ /^(.*)$PROG(\d{0,2})(\d\d)(\d\d\d\d)(.*)\.txt$/;
--		$SiteConfig = $5 ? $5 : 'xxx';
-+		$SiteConfig = &Sanitize($5 ? $5 : 'xxx');
- 		$SiteConfig =~ s/^\.//;    # SiteConfig is used to find config file
- 	}
-+
-+	$SiteConfig =~ s/\.\.//g; 		# Avoid directory transversal
- }
- else {                             # Run from command line
- 	$DebugMessages = 1;
-@@ -17204,9 +17206,10 @@ else {                             # Run from command line
- 
- 		# If migrate
- 		if ( $ARGV[$_] =~ /(^|-|&|&amp;)migrate=([^&]+)/i ) {
--			$MigrateStats = "$2";
-+			$MigrateStats = &Sanitize("$2");
-+
- 			$MigrateStats =~ /^(.*)$PROG(\d{0,2})(\d\d)(\d\d\d\d)(.*)\.txt$/;
--			$SiteConfig = $5 ? $5 : 'xxx';
-+			$SiteConfig = &Sanitize($5 ? $5 : 'xxx');
- 			$SiteConfig =~ s/^\.//;    # SiteConfig is used to find config file
- 			next;
- 		}
-@@ -17235,7 +17238,6 @@ else {                             # Run from command line
- 
- 	if ( $QueryString =~ /config=([^&]+)/i ) { 
- 		$SiteConfig = &Sanitize("$1"); 
--		$SiteConfig =~ s/\.\.//g; 
- 	}
- 	if ( $QueryString =~ /diricons=([^&]+)/i ) { $DirIcons = "$1"; }
- 	if ( $QueryString =~ /pluginmode=([^&]+)/i ) {
-@@ -17301,6 +17303,8 @@ else {                             # Run from command line
- 		$ShowDirectOrigin = 1;
- 		$QueryString =~ s/showdirectorigin[^&]*//i;
- 	}
-+	
-+	$SiteConfig =~ s/\.\.//g; 
- }
- if ( $QueryString =~ /(^|&|&amp;)staticlinks/i ) {
- 	$StaticLinks = "$PROG.$SiteConfig";
--- 
-2.15.1
-
diff --git a/network/awstats/patches/0001-Fix-to-window.opener-vulnerability-in-browser-OS-and.patch b/network/awstats/patches/0001-Fix-to-window.opener-vulnerability-in-browser-OS-and.patch
deleted file mode 100644
index c79804b141..0000000000
--- a/network/awstats/patches/0001-Fix-to-window.opener-vulnerability-in-browser-OS-and.patch
+++ /dev/null
@@ -1,2781 +0,0 @@
-From 6e35dd403b3ccc6ee3a61988f7cf7fd22deb7322 Mon Sep 17 00:00:00 2001
-From: qssam <Sam.Webb@quiet-storm.net>
-Date: Tue, 7 Feb 2017 17:10:34 +0000
-Subject: [PATCH] Fix to window.opener vulnerability in browser, OS and search
- engine links
-
-Reference: https://mathiasbynens.github.io/rel-noopener/
----
- wwwroot/cgi-bin/lib/browsers.pm          |   30 +-
- wwwroot/cgi-bin/lib/browsers_phone.pm    |   30 +-
- wwwroot/cgi-bin/lib/operating_systems.pm |  170 +--
- wwwroot/cgi-bin/lib/search_engines.pm    | 2248 +++++++++++++++---------------
- 4 files changed, 1239 insertions(+), 1239 deletions(-)
-
-diff --git a/wwwroot/cgi-bin/lib/browsers.pm b/wwwroot/cgi-bin/lib/browsers.pm
-index 0551b9fe..fdf3dfb2 100644
---- a/wwwroot/cgi-bin/lib/browsers.pm
-+++ b/wwwroot/cgi-bin/lib/browsers.pm
-@@ -383,27 +383,27 @@
- 'abilon','Abilon (RSS Reader)',
- 'aggrevator', 'Aggrevator (RSS Reader)',
- 'aiderss', 'AideRSS (RSS Reader)',
--'akregator','<a href="http://akregator.sourceforge.net/" title="Browser home page [new window]" target="_blank">Akregator (RSS Reader)</a>',  
--'applesyndication','<a href="http://www.apple.com/macosx/features/safari/" title="Browser home page [new window]" target="_blank">AppleSyndication (RSS Reader)</a>',
-+'akregator','<a href="http://akregator.sourceforge.net/" title="Browser home page [new window]" target="_blank" rel="noopener noreferrer">Akregator (RSS Reader)</a>',  
-+'applesyndication','<a href="http://www.apple.com/macosx/features/safari/" title="Browser home page [new window]" target="_blank" rel="noopener noreferrer">AppleSyndication (RSS Reader)</a>',
- 'betanews_reader','Betanews Reader (RSS Reader)',
--'blogbridge','<a href="http://www.blogbridge.com/" title="Browser home page [new window]" target="_blank">BlogBridge (RSS Reader)</a>',
-+'blogbridge','<a href="http://www.blogbridge.com/" title="Browser home page [new window]" target="_blank" rel="noopener noreferrer">BlogBridge (RSS Reader)</a>',
- 'cyndicate','Cyndicate (RSS Reader)',
- 'feeddemon', 'FeedDemon (RSS Reader)',
- 'feedreader', 'FeedReader (RSS Reader)',
--'feedtools','<a href="http://sporkmonger.com/projects/feedtools/" title="Browser home page [new window]" target="_blank">FeedTools (RSS Reader)</a>',
--'greatnews','<a href="http://www.curiostudio.com/" title="Browser home page [new window]" target="_blank">GreatNews (RSS Reader)</a>',
--'gregarius','<a href="http://devlog.gregarius.net/docs/ua" title="Browser home page [new window]" target="_blank">Gregarius (RSS Reader)</a>',
--'hatena_rss','<a href="http://r.hatena.ne.jp/" title="Browser home page [new window]" target="_blank">Hatena (RSS Reader)</a>',
-+'feedtools','<a href="http://sporkmonger.com/projects/feedtools/" title="Browser home page [new window]" target="_blank" rel="noopener noreferrer">FeedTools (RSS Reader)</a>',
-+'greatnews','<a href="http://www.curiostudio.com/" title="Browser home page [new window]" target="_blank" rel="noopener noreferrer">GreatNews (RSS Reader)</a>',
-+'gregarius','<a href="http://devlog.gregarius.net/docs/ua" title="Browser home page [new window]" target="_blank" rel="noopener noreferrer">Gregarius (RSS Reader)</a>',
-+'hatena_rss','<a href="http://r.hatena.ne.jp/" title="Browser home page [new window]" target="_blank" rel="noopener noreferrer">Hatena (RSS Reader)</a>',
- 'jetbrains_omea', 'Omea (RSS Reader)',
--'liferea','<a href="http://liferea.sourceforge.net/" title="Browser home page [new window]" target="_blank">Liferea (RSS Reader)</a>',
-+'liferea','<a href="http://liferea.sourceforge.net/" title="Browser home page [new window]" target="_blank" rel="noopener noreferrer">Liferea (RSS Reader)</a>',
- 'netnewswire', 'NetNewsWire (RSS Reader)',
- 'newsfire', 'NewsFire (RSS Reader)',
- 'newsgator', 'NewsGator (RSS Reader)',
- 'newzcrawler', 'NewzCrawler (RSS Reader)',
- 'plagger', 'Plagger (RSS Reader)',
- 'pluck', 'Pluck (RSS Reader)',
--'potu','<a href="http://www.potu.com/" title="Potu Rss-Reader home page [new window]" target="_blank">Potu (RSS Reader)</a>',
--'pubsub\-rss\-reader','<a href="http://www.pubsub.com/" title="Browser home page [new window]" target="_blank">PubSub (RSS Reader)</a>',
-+'potu','<a href="http://www.potu.com/" title="Potu Rss-Reader home page [new window]" target="_blank" rel="noopener noreferrer">Potu (RSS Reader)</a>',
-+'pubsub\-rss\-reader','<a href="http://www.pubsub.com/" title="Browser home page [new window]" target="_blank" rel="noopener noreferrer">PubSub (RSS Reader)</a>',
- 'pulpfiction', 'PulpFiction (RSS Reader)',
- 'rssbandit', 'RSS Bandit (RSS Reader)',
- 'rssreader', 'RssReader (RSS Reader)',
-@@ -415,7 +415,7 @@
- 'shrook', 'Shrook (RSS Reader)',
- 'straw', 'Straw (RSS Reader)',
- 'syndirella', 'Syndirella (RSS Reader)',
--'vienna', '<a href="http://www.vienna-rss.org/" title="Vienna RSS-Reader [new window]" target="_blank">Vienna (RSS Reader)</a>',
-+'vienna', '<a href="http://www.vienna-rss.org/" title="Vienna RSS-Reader [new window]" target="_blank" rel="noopener noreferrer">Vienna (RSS Reader)</a>',
- 'wizz\srss\snews\sreader','Wizz RSS News Reader (RSS Reader)',
- # PDA/Phonecell browsers
- 'alcatel','Alcatel Browser (PDA/Phone browser)',
-@@ -450,9 +450,9 @@
- 'webtv','WebTV browser',
- 'democracy','Democracy',
- # Anonymous Proxy Browsers (can be used as grabbers as well...)
--'cjb\.net','<a href="http://proxy.cjb.net/" title="Browser home page [new window]" target="_blank">CJB.NET Proxy</a>',
--'ossproxy','<a href="http://www.marketscore.com/FAQ.Aspx" title="OSSProxy home page [new window]" target="_blank">OSSProxy</a>',
--'smallproxy','<a href="http://www.smallproxy.ru/" title="SmallProxy home page [new window]" target="_blank">SmallProxy</a>',
-+'cjb\.net','<a href="http://proxy.cjb.net/" title="Browser home page [new window]" target="_blank" rel="noopener noreferrer">CJB.NET Proxy</a>',
-+'ossproxy','<a href="http://www.marketscore.com/FAQ.Aspx" title="OSSProxy home page [new window]" target="_blank" rel="noopener noreferrer">OSSProxy</a>',
-+'smallproxy','<a href="http://www.smallproxy.ru/" title="SmallProxy home page [new window]" target="_blank" rel="noopener noreferrer">SmallProxy</a>',
- # Other kind of browsers
- 'adobeair','AdobeAir',
- 'apt','Debian APT',
-@@ -462,7 +462,7 @@
- 'curl','Curl',
- 'csscheck','WDG CSS Validator',
- 'httrack','HTTrack',
--'fdm','<a href="http://www.freedownloadmanager.org/" title="Browser home page [new window]" target="_blank">FDM Free Download Manager</a>',
-+'fdm','<a href="http://www.freedownloadmanager.org/" title="Browser home page [new window]" target="_blank" rel="noopener noreferrer">FDM Free Download Manager</a>',
- 'javaws','Java Web Start',
- 'wget','Wget',
- 'fget','FGet',
-diff --git a/wwwroot/cgi-bin/lib/browsers_phone.pm b/wwwroot/cgi-bin/lib/browsers_phone.pm
-index 60918216..384536b5 100644
---- a/wwwroot/cgi-bin/lib/browsers_phone.pm
-+++ b/wwwroot/cgi-bin/lib/browsers_phone.pm
-@@ -762,27 +762,27 @@
- 'abilon','Abilon (RSS Reader)',
- 'aggrevator', 'Aggrevator (RSS Reader)',
- 'aiderss', 'AideRSS (RSS Reader)',
--'akregator','<a href="http://akregator.sourceforge.net/" title="Browser home page [new window]" target="_blank">Akregator (RSS Reader)</a>',  
--'applesyndication','<a href="http://www.apple.com/macosx/features/safari/" title="Browser home page [new window]" target="_blank">AppleSyndication (RSS Reader)</a>',
-+'akregator','<a href="http://akregator.sourceforge.net/" title="Browser home page [new window]" target="_blank" rel="noopener noreferrer">Akregator (RSS Reader)</a>',  
-+'applesyndication','<a href="http://www.apple.com/macosx/features/safari/" title="Browser home page [new window]" target="_blank" rel="noopener noreferrer">AppleSyndication (RSS Reader)</a>',
- 'betanews_reader','Betanews Reader (RSS Reader)',
--'blogbridge','<a href="http://www.blogbridge.com/" title="Browser home page [new window]" target="_blank">BlogBridge (RSS Reader)</a>',
-+'blogbridge','<a href="http://www.blogbridge.com/" title="Browser home page [new window]" target="_blank" rel="noopener noreferrer">BlogBridge (RSS Reader)</a>',
- 'cyndicate','Cyndicate (RSS Reader)',
- 'feeddemon', 'FeedDemon (RSS Reader)',
- 'feedreader', 'FeedReader (RSS Reader)',
--'feedtools','<a href="http://sporkmonger.com/projects/feedtools/" title="Browser home page [new window]" target="_blank">FeedTools (RSS Reader)</a>',
--'greatnews','<a href="http://www.curiostudio.com/" title="Browser home page [new window]" target="_blank">GreatNews (RSS Reader)</a>',
--'gregarius','<a href="http://devlog.gregarius.net/docs/ua" title="Browser home page [new window]" target="_blank">Gregarius (RSS Reader)</a>',
--'hatena_rss','<a href="http://r.hatena.ne.jp/" title="Browser home page [new window]" target="_blank">Hatena (RSS Reader)</a>',
-+'feedtools','<a href="http://sporkmonger.com/projects/feedtools/" title="Browser home page [new window]" target="_blank" rel="noopener noreferrer">FeedTools (RSS Reader)</a>',
-+'greatnews','<a href="http://www.curiostudio.com/" title="Browser home page [new window]" target="_blank" rel="noopener noreferrer">GreatNews (RSS Reader)</a>',
-+'gregarius','<a href="http://devlog.gregarius.net/docs/ua" title="Browser home page [new window]" target="_blank" rel="noopener noreferrer">Gregarius (RSS Reader)</a>',
-+'hatena_rss','<a href="http://r.hatena.ne.jp/" title="Browser home page [new window]" target="_blank" rel="noopener noreferrer">Hatena (RSS Reader)</a>',
- 'jetbrains_omea', 'Omea (RSS Reader)',
--'liferea','<a href="http://liferea.sourceforge.net/" title="Browser home page [new window]" target="_blank">Liferea (RSS Reader)</a>',
-+'liferea','<a href="http://liferea.sourceforge.net/" title="Browser home page [new window]" target="_blank" rel="noopener noreferrer">Liferea (RSS Reader)</a>',
- 'netnewswire', 'NetNewsWire (RSS Reader)',
- 'newsfire', 'NewsFire (RSS Reader)',
- 'newsgator', 'NewsGator (RSS Reader)',
- 'newzcrawler', 'NewzCrawler (RSS Reader)',
- 'plagger', 'Plagger (RSS Reader)',
- 'pluck', 'Pluck (RSS Reader)',
--'potu','<a href="http://www.potu.com/" title="Potu Rss-Reader home page [new window]" target="_blank">Potu (RSS Reader)</a>',
--'pubsub\-rss\-reader','<a href="http://www.pubsub.com/" title="Browser home page [new window]" target="_blank">PubSub (RSS Reader)</a>',
-+'potu','<a href="http://www.potu.com/" title="Potu Rss-Reader home page [new window]" target="_blank" rel="noopener noreferrer">Potu (RSS Reader)</a>',
-+'pubsub\-rss\-reader','<a href="http://www.pubsub.com/" title="Browser home page [new window]" target="_blank" rel="noopener noreferrer">PubSub (RSS Reader)</a>',
- 'pulpfiction', 'PulpFiction (RSS Reader)',
- 'rssbandit', 'RSS Bandit (RSS Reader)',
- 'rssreader', 'RssReader (RSS Reader)',
-@@ -794,7 +794,7 @@
- 'shrook', 'Shrook (RSS Reader)',
- 'straw', 'Straw (RSS Reader)',
- 'syndirella', 'Syndirella (RSS Reader)',
--'vienna', '<a href="http://www.vienna-rss.org/" title="Vienna RSS-Reader [new window]" target="_blank">Vienna (RSS Reader)</a>',
-+'vienna', '<a href="http://www.vienna-rss.org/" title="Vienna RSS-Reader [new window]" target="_blank" rel="noopener noreferrer">Vienna (RSS Reader)</a>',
- 'wizz\srss\snews\sreader','Wizz RSS News Reader (RSS Reader)',
- # PDA/Phonecell browsers
- 'alcatel\-be4','Alcatel BE4 (phone)',
-@@ -1213,9 +1213,9 @@
- 'webtv','WebTV browser',
- 'democracy','Democracy',
- # Anonymous Proxy Browsers (can be used as grabbers as well...)
--'cjb\.net','<a href="http://proxy.cjb.net/" title="Browser home page [new window]" target="_blank">CJB.NET Proxy</a>',
--'ossproxy','<a href="http://www.marketscore.com/FAQ.Aspx" title="OSSProxy home page [new window]" target="_blank">OSSProxy</a>',
--'smallproxy','<a href="http://www.smallproxy.ru/" title="SmallProxy home page [new window]" target="_blank">SmallProxy</a>',
-+'cjb\.net','<a href="http://proxy.cjb.net/" title="Browser home page [new window]" target="_blank" rel="noopener noreferrer">CJB.NET Proxy</a>',
-+'ossproxy','<a href="http://www.marketscore.com/FAQ.Aspx" title="OSSProxy home page [new window]" target="_blank" rel="noopener noreferrer">OSSProxy</a>',
-+'smallproxy','<a href="http://www.smallproxy.ru/" title="SmallProxy home page [new window]" target="_blank" rel="noopener noreferrer">SmallProxy</a>',
- # Other kind of browsers
- 'adobeair','AdobeAir',
- 'apt','Debian APT',
-@@ -1225,7 +1225,7 @@
- 'curl','Curl',
- 'csscheck','WDG CSS Validator',
- 'httrack','HTTrack',
--'fdm','<a href="http://www.freedownloadmanager.org/" title="Browser home page [new window]" target="_blank">FDM Free Download Manager</a>',
-+'fdm','<a href="http://www.freedownloadmanager.org/" title="Browser home page [new window]" target="_blank" rel="noopener noreferrer">FDM Free Download Manager</a>',
- 'javaws','Java Web Start',
- 'wget','Wget',
- 'fget','FGet',
-diff --git a/wwwroot/cgi-bin/lib/operating_systems.pm b/wwwroot/cgi-bin/lib/operating_systems.pm
-index a57a3424..249a1764 100644
---- a/wwwroot/cgi-bin/lib/operating_systems.pm
-+++ b/wwwroot/cgi-bin/lib/operating_systems.pm
-@@ -260,103 +260,103 @@
- #-----------------------------------------------------------
- %OSHashLib      = (
- # Windows family OS
--'win10','<a href="http://www.microsoft.com/windows10/" title="Windows 10 home page [new window]" target="_blank">Windows 10</a>',
--'win8.1','<a href="http://www.microsoft.com/windows8/" title="Windows 8.1 home page [new window]" target="_blank">Windows 8.1</a>',
--'win8','<a href="http://www.microsoft.com/windows8/" title="Windows 8 home page [new window]" target="_blank">Windows 8</a>',
--'win7','<a href="http://windows.microsoft.com/en-US/windows7/products/home/" title="Windows 7 home page [new window]" target="_blank">Windows 7</a>',
--'winlong','<a href="http://www.microsoft.com/windows/" title="Windows Vista home page [new window]" target="_blank">Windows Vista (LongHorn)</a>',
--'win2008','<a href="http://www.microsoft.com/windowsserver2008/" title="Windows 2008 home page [new window]" target="_blank">Windows 2008</a>',
--'win2012','<a href="http://www.microsoft.com/en-us/server-cloud/windows-server/2012-default.aspx/" title="Windows Server 2012 home page [new window]" target="_blank">Windows Server 2012</a>',
--'winvista','<a href="http://www.microsoft.com/windowsvista/" title="Windows Vista home page [new window]" target="_blank">Windows Vista</a>',
--'win2003','<a href="http://www.microsoft.com/windowsserver2003/" title="Windows 2003 home page [new window]" target="_blank">Windows 2003</a>',
--'winxp','<a href="http://www.microsoft.com/windowsxp/" title="Windows XP home page [new window]" target="_blank">Windows XP</a>',
--'winme','<a href="http://support.microsoft.com/ph/6519/" title="Windows ME support page [new window]" target="_blank">Windows ME</a>',
--'win2000','<a href="http://support.microsoft.com/ph/1131" title="Windows 2000 support page [new window]" target="_blank">Windows 2000</a>',
--'winnt','<a href="http://support.microsoft.com/default.aspx?pr=ntw40" title="Windows NT support page [new window]" target="_blank">Windows NT</a>',
--'win98','<a href="http://support.microsoft.com/w98" title="Windows 98 support page [new window]" target="_blank">Windows 98</a>',
--'win95','<a href="http://support.microsoft.com/ph/7864" title="Windows 95 support page [new window]" target="_blank">Windows 95</a>',
--'win16','<a href="http://www.microsoft.com/windows/WinHistoryDesktop.mspx#E1B" title="Windows 3.xx history page [new window]" target="_blank">Windows 3.xx</a>',
--'wince','<a href="http://www.microsoft.com/windowsmobile/" title="Windows Mobile home page [new window]" target="_blank">Windows Mobile</a>',
--'winphone','<a href="http://www.microsoft.com/windowsphone/" title="Windows Phone home page [new window]" target="_blank">Windows Phone</a>',
-+'win10','<a href="http://www.microsoft.com/windows10/" title="Windows 10 home page [new window]" target="_blank" rel="noopener noreferrer">Windows 10</a>',
-+'win8.1','<a href="http://www.microsoft.com/windows8/" title="Windows 8.1 home page [new window]" target="_blank" rel="noopener noreferrer">Windows 8.1</a>',
-+'win8','<a href="http://www.microsoft.com/windows8/" title="Windows 8 home page [new window]" target="_blank" rel="noopener noreferrer">Windows 8</a>',
-+'win7','<a href="http://windows.microsoft.com/en-US/windows7/products/home/" title="Windows 7 home page [new window]" target="_blank" rel="noopener noreferrer">Windows 7</a>',
-+'winlong','<a href="http://www.microsoft.com/windows/" title="Windows Vista home page [new window]" target="_blank" rel="noopener noreferrer">Windows Vista (LongHorn)</a>',
-+'win2008','<a href="http://www.microsoft.com/windowsserver2008/" title="Windows 2008 home page [new window]" target="_blank" rel="noopener noreferrer">Windows 2008</a>',
-+'win2012','<a href="http://www.microsoft.com/en-us/server-cloud/windows-server/2012-default.aspx/" title="Windows Server 2012 home page [new window]" target="_blank" rel="noopener noreferrer">Windows Server 2012</a>',
-+'winvista','<a href="http://www.microsoft.com/windowsvista/" title="Windows Vista home page [new window]" target="_blank" rel="noopener noreferrer">Windows Vista</a>',
-+'win2003','<a href="http://www.microsoft.com/windowsserver2003/" title="Windows 2003 home page [new window]" target="_blank" rel="noopener noreferrer">Windows 2003</a>',
-+'winxp','<a href="http://www.microsoft.com/windowsxp/" title="Windows XP home page [new window]" target="_blank" rel="noopener noreferrer">Windows XP</a>',
-+'winme','<a href="http://support.microsoft.com/ph/6519/" title="Windows ME support page [new window]" target="_blank" rel="noopener noreferrer">Windows ME</a>',
-+'win2000','<a href="http://support.microsoft.com/ph/1131" title="Windows 2000 support page [new window]" target="_blank" rel="noopener noreferrer">Windows 2000</a>',
-+'winnt','<a href="http://support.microsoft.com/default.aspx?pr=ntw40" title="Windows NT support page [new window]" target="_blank" rel="noopener noreferrer">Windows NT</a>',
-+'win98','<a href="http://support.microsoft.com/w98" title="Windows 98 support page [new window]" target="_blank" rel="noopener noreferrer">Windows 98</a>',
-+'win95','<a href="http://support.microsoft.com/ph/7864" title="Windows 95 support page [new window]" target="_blank" rel="noopener noreferrer">Windows 95</a>',
-+'win16','<a href="http://www.microsoft.com/windows/WinHistoryDesktop.mspx#E1B" title="Windows 3.xx history page [new window]" target="_blank" rel="noopener noreferrer">Windows 3.xx</a>',
-+'wince','<a href="http://www.microsoft.com/windowsmobile/" title="Windows Mobile home page [new window]" target="_blank" rel="noopener noreferrer">Windows Mobile</a>',
-+'winphone','<a href="http://www.microsoft.com/windowsphone/" title="Windows Phone home page [new window]" target="_blank" rel="noopener noreferrer">Windows Phone</a>',
- 'winunknown','Windows (unknown version)',
--'winxbox','<a href="http://www.xbox.com/" title="Microsoft XBOX home page [new window]" target="_blank">Microsoft XBOX</a>',
-+'winxbox','<a href="http://www.xbox.com/" title="Microsoft XBOX home page [new window]" target="_blank" rel="noopener noreferrer">Microsoft XBOX</a>',
- # Macintosh OS
--'macosx12','<a href="http://www.apple.com/macosx/" title="Mac OS X home page [new window]" target="_blank">Mac OS X 10.12 Sierra</a>',
--'macosx11','<a href="http://www.apple.com/macosx/" title="Mac OS X home page [new window]" target="_blank">Mac OS X 10.11 El Capitan</a>',
--'macosx10','<a href="http://www.apple.com/macosx/" title="Mac OS X home page [new window]" target="_blank">Mac OS X 10.10 Yosemite</a>',
--'macosx9','<a href="http://www.apple.com/macosx/" title="Mac OS X home page [new window]" target="_blank">Mac OS X 10.9 Mavericks</a>',
--'macosx8','<a href="http://www.apple.com/macosx/" title="Mac OS X home page [new window]" target="_blank">Mac OS X 10.8 Mountain Lion</a>',
--'macosx7','<a href="http://www.apple.com/macosx/" title="Mac OS X home page [new window]" target="_blank">Mac OS X 10.7 Lion</a>',
--'macosx6','<a href="http://www.apple.com/macosx/" title="Mac OS X home page [new window]" target="_blank">Mac OS X 10.6 Snow Leopard</a>',
--'macosx5','<a href="http://www.apple.com/macosx/" title="Mac OS X home page [new window]" target="_blank">Mac OS X 10.5 Leopard</a>',
--'macosx4','<a href="http://www.apple.com/macosx/" title="Mac OS X home page [new window]" target="_blank">Mac OS X 10.4 Tiger</a>',
--'macosx','<a href="http://www.apple.com/macosx/" title="Mac OS X home page [new window]" target="_blank">Mac OS X others</a>',
--'macintosh','<a href="http://www.apple.com/" title="Mac OS home page [new window]" target="_blank">Mac OS</a>',
-+'macosx12','<a href="http://www.apple.com/macosx/" title="Mac OS X home page [new window]" target="_blank" rel="noopener noreferrer">Mac OS X 10.12 Sierra</a>',
-+'macosx11','<a href="http://www.apple.com/macosx/" title="Mac OS X home page [new window]" target="_blank" rel="noopener noreferrer">Mac OS X 10.11 El Capitan</a>',
-+'macosx10','<a href="http://www.apple.com/macosx/" title="Mac OS X home page [new window]" target="_blank" rel="noopener noreferrer">Mac OS X 10.10 Yosemite</a>',
-+'macosx9','<a href="http://www.apple.com/macosx/" title="Mac OS X home page [new window]" target="_blank" rel="noopener noreferrer">Mac OS X 10.9 Mavericks</a>',
-+'macosx8','<a href="http://www.apple.com/macosx/" title="Mac OS X home page [new window]" target="_blank" rel="noopener noreferrer">Mac OS X 10.8 Mountain Lion</a>',
-+'macosx7','<a href="http://www.apple.com/macosx/" title="Mac OS X home page [new window]" target="_blank" rel="noopener noreferrer">Mac OS X 10.7 Lion</a>',
-+'macosx6','<a href="http://www.apple.com/macosx/" title="Mac OS X home page [new window]" target="_blank" rel="noopener noreferrer">Mac OS X 10.6 Snow Leopard</a>',
-+'macosx5','<a href="http://www.apple.com/macosx/" title="Mac OS X home page [new window]" target="_blank" rel="noopener noreferrer">Mac OS X 10.5 Leopard</a>',
-+'macosx4','<a href="http://www.apple.com/macosx/" title="Mac OS X home page [new window]" target="_blank" rel="noopener noreferrer">Mac OS X 10.4 Tiger</a>',
-+'macosx','<a href="http://www.apple.com/macosx/" title="Mac OS X home page [new window]" target="_blank" rel="noopener noreferrer">Mac OS X others</a>',
-+'macintosh','<a href="http://www.apple.com/" title="Mac OS home page [new window]" target="_blank" rel="noopener noreferrer">Mac OS</a>',
- # Linux
--'linuxandroid','<a href="http://code.google.com/android/" title="Google Android home page [new window]" target="_blank">Google Android</a>',
--'linuxasplinux','<a href="http://www.asplinux.ru/" title="ASPLinux home page [new window]" target="_blank">ASPLinux</a>',
--'linuxcentos','<a href="http://www.centos.org/" title="Centos home page [new window]" target="_blank">Centos</a>',
--'linuxdebian','<a href="http://www.debian.org/" title="Debian home page [new window]" target="_blank">Debian</a>',
--'linuxfedora','<a href="http://fedora.redhat.com/" title="Fedora home page [new window]" target="_blank">Fedora</a>',
--'linuxgentoo','<a href="http://www.gentoo.org/" title="Gentoo home page [new window]" target="_blank">Gentoo</a>',
--'linuxmandr','<a href="http://www.mandriva.com/" title="Mandriva (former Mandrake) home page [new window]" target="_blank">Mandriva (or Mandrake)</a>',
--'linuxmomonga','<a href="http://www.momonga-linux.org/" title="Momonga Linux home page [new window]" target="_blank">Momonga Linux</a>',
--'linuxpclinuxos','<a href="http://www.pclinuxos.com/" title="PCLinuxOS home page [new window]" target="_blank">PCLinuxOS</a>',
--'linuxredhat','<a href="http://www.redhat.com/" title="Red Hat home page [new window]" target="_blank">Red Hat</a>',
--'linuxsuse','<a href="http://www.novell.com/linux/suse/" title="Suse home page [new window]" target="_blank">Suse</a>',
--'linuxubuntu','<a href="http://www.ubuntulinux.org/" title="Ubuntu home page [new window]" target="_blank">Ubuntu</a>',
--'linuxvector','<a href="http://vectorlinux.com/" title="VectorLinux home page [new window]" target="_blank">VectorLinux</a>',
--'linuxvine','<a href="http://www.vinelinux.org/index-en.html" title="Vine Linux home page [new window]" target="_blank">Vine Linux</a>',
--'linuxwhitebox','<a href="http://whiteboxlinux.org/" title="White Box Linux home page [new window]" target="_blank">White Box Linux</a>',
--'linuxzenwalk','<a href="http://www.zenwalk.org/" title="Zenwalk GNU Linux home page [new window]" target="_blank">Zenwalk GNU Linux</a>',
--'linux','<a href="http://www.distrowatch.com/" title="Linux DistroWatch home page. Useful if you find the associated user agent string in your logs. [new window]" target="_blank">Linux (Unknown/unspecified)</a>',
-+'linuxandroid','<a href="http://code.google.com/android/" title="Google Android home page [new window]" target="_blank" rel="noopener noreferrer">Google Android</a>',
-+'linuxasplinux','<a href="http://www.asplinux.ru/" title="ASPLinux home page [new window]" target="_blank" rel="noopener noreferrer">ASPLinux</a>',
-+'linuxcentos','<a href="http://www.centos.org/" title="Centos home page [new window]" target="_blank" rel="noopener noreferrer">Centos</a>',
-+'linuxdebian','<a href="http://www.debian.org/" title="Debian home page [new window]" target="_blank" rel="noopener noreferrer">Debian</a>',
-+'linuxfedora','<a href="http://fedora.redhat.com/" title="Fedora home page [new window]" target="_blank" rel="noopener noreferrer">Fedora</a>',
-+'linuxgentoo','<a href="http://www.gentoo.org/" title="Gentoo home page [new window]" target="_blank" rel="noopener noreferrer">Gentoo</a>',
-+'linuxmandr','<a href="http://www.mandriva.com/" title="Mandriva (former Mandrake) home page [new window]" target="_blank" rel="noopener noreferrer">Mandriva (or Mandrake)</a>',
-+'linuxmomonga','<a href="http://www.momonga-linux.org/" title="Momonga Linux home page [new window]" target="_blank" rel="noopener noreferrer">Momonga Linux</a>',
-+'linuxpclinuxos','<a href="http://www.pclinuxos.com/" title="PCLinuxOS home page [new window]" target="_blank" rel="noopener noreferrer">PCLinuxOS</a>',
-+'linuxredhat','<a href="http://www.redhat.com/" title="Red Hat home page [new window]" target="_blank" rel="noopener noreferrer">Red Hat</a>',
-+'linuxsuse','<a href="http://www.novell.com/linux/suse/" title="Suse home page [new window]" target="_blank" rel="noopener noreferrer">Suse</a>',
-+'linuxubuntu','<a href="http://www.ubuntulinux.org/" title="Ubuntu home page [new window]" target="_blank" rel="noopener noreferrer">Ubuntu</a>',
-+'linuxvector','<a href="http://vectorlinux.com/" title="VectorLinux home page [new window]" target="_blank" rel="noopener noreferrer">VectorLinux</a>',
-+'linuxvine','<a href="http://www.vinelinux.org/index-en.html" title="Vine Linux home page [new window]" target="_blank" rel="noopener noreferrer">Vine Linux</a>',
-+'linuxwhitebox','<a href="http://whiteboxlinux.org/" title="White Box Linux home page [new window]" target="_blank" rel="noopener noreferrer">White Box Linux</a>',
-+'linuxzenwalk','<a href="http://www.zenwalk.org/" title="Zenwalk GNU Linux home page [new window]" target="_blank" rel="noopener noreferrer">Zenwalk GNU Linux</a>',
-+'linux','<a href="http://www.distrowatch.com/" title="Linux DistroWatch home page. Useful if you find the associated user agent string in your logs. [new window]" target="_blank" rel="noopener noreferrer">Linux (Unknown/unspecified)</a>',
- 'linux','GNU Linux (Unknown or unspecified distribution)',
- # Hurd
--'gnu','<a href="http://www.gnu.org/software/hurd/hurd.html" title="GNU Hurd home page [new window]" target="_blank">GNU Hurd</a>',
-+'gnu','<a href="http://www.gnu.org/software/hurd/hurd.html" title="GNU Hurd home page [new window]" target="_blank" rel="noopener noreferrer">GNU Hurd</a>',
- # BSDs
--'bsdi','<a href="http://en.wikipedia.org/wiki/BSDi" title="BSDi home page [new window]" target="_blank">BSDi</a>',
--'bsdkfreebsd','<a href="http://www.debian.org/ports/kfreebsd-gnu/" title="Debian GNU/kFreeBSD" target="_blank">GNU/kFreeBSD</a>',
--'freebsd','<a href="http://www.freebsd.org/" title="FreeBSD home page [new window]" target="_blank">FreeBSD</a>',    # For backard compatibility
--'bsdfreebsd','<a href="http://www.freebsd.org/" title="FreeBSD home page [new window]" target="_blank">FreeBSD</a>',
--'openbsd','<a href="http://www.openbsd.org/" title="OpenBSD home page [new window]" target="_blank">OpenBSD</a>',    # For backard compatibility
--'bsdopenbsd','<a href="http://www.openbsd.org/" title="OpenBSD home page [new window]" target="_blank">OpenBSD</a>',
--'netbsd','<a href="http://www.netbsd.org/" title="NetBSD home page [new window]" target="_blank">NetBSD</a>', # For backard compatibility
--'bsdnetbsd','<a href="http://www.netbsd.org/" title="NetBSD home page [new window]" target="_blank">NetBSD</a>',
--'bsddflybsd','<a href="http://www.dragonflybsd.org/" title="DragonFlyBSD home page [new window]" target="_blank">DragonFlyBSD</a>',
-+'bsdi','<a href="http://en.wikipedia.org/wiki/BSDi" title="BSDi home page [new window]" target="_blank" rel="noopener noreferrer">BSDi</a>',
-+'bsdkfreebsd','<a href="http://www.debian.org/ports/kfreebsd-gnu/" title="Debian GNU/kFreeBSD" target="_blank" rel="noopener noreferrer">GNU/kFreeBSD</a>',
-+'freebsd','<a href="http://www.freebsd.org/" title="FreeBSD home page [new window]" target="_blank" rel="noopener noreferrer">FreeBSD</a>',    # For backard compatibility
-+'bsdfreebsd','<a href="http://www.freebsd.org/" title="FreeBSD home page [new window]" target="_blank" rel="noopener noreferrer">FreeBSD</a>',
-+'openbsd','<a href="http://www.openbsd.org/" title="OpenBSD home page [new window]" target="_blank" rel="noopener noreferrer">OpenBSD</a>',    # For backard compatibility
-+'bsdopenbsd','<a href="http://www.openbsd.org/" title="OpenBSD home page [new window]" target="_blank" rel="noopener noreferrer">OpenBSD</a>',
-+'netbsd','<a href="http://www.netbsd.org/" title="NetBSD home page [new window]" target="_blank" rel="noopener noreferrer">NetBSD</a>', # For backard compatibility
-+'bsdnetbsd','<a href="http://www.netbsd.org/" title="NetBSD home page [new window]" target="_blank" rel="noopener noreferrer">NetBSD</a>',
-+'bsddflybsd','<a href="http://www.dragonflybsd.org/" title="DragonFlyBSD home page [new window]" target="_blank" rel="noopener noreferrer">DragonFlyBSD</a>',
- # Other Unix, Unix-like
--'aix','<a href="http://www-1.ibm.com/servers/aix/" title="Aix home page [new window]" target="_blank">Aix</a>',
--'sunos','<a href="http://www.sun.com/software/solaris/" title="Sun Solaris home page [new window]" target="_blank">Sun Solaris</a>',
--'irix','<a href="http://www.sgi.com/products/software/irix/" title="Irix home page [new window]" target="_blank">Irix</a>',
--'osf','<a href="http://www.tru64.org/" title="OSF Unix home page [new window]" target="_blank">OSF Unix</a>',
--'hp\-ux','<a href="http://www.hp.com/products1/unix/operating/" title="HP UX home page [new window]" target="_blank">HP UX</a>',
-+'aix','<a href="http://www-1.ibm.com/servers/aix/" title="Aix home page [new window]" target="_blank" rel="noopener noreferrer">Aix</a>',
-+'sunos','<a href="http://www.sun.com/software/solaris/" title="Sun Solaris home page [new window]" target="_blank" rel="noopener noreferrer">Sun Solaris</a>',
-+'irix','<a href="http://www.sgi.com/products/software/irix/" title="Irix home page [new window]" target="_blank" rel="noopener noreferrer">Irix</a>',
-+'osf','<a href="http://www.tru64.org/" title="OSF Unix home page [new window]" target="_blank" rel="noopener noreferrer">OSF Unix</a>',
-+'hp\-ux','<a href="http://www.hp.com/products1/unix/operating/" title="HP UX home page [new window]" target="_blank" rel="noopener noreferrer">HP UX</a>',
- 'unix','Unknown Unix system',
- # iOS
--'ios_iphone','<a href="http://www.apple.com/iphone/ios" title="Apple iPhone home page [new window]" target="_blank">iOS (iPhone)</a>',
--'ios_ipad','<a href="http://www.apple.com/ipad/ios" title="Apple iPad home page [new window]" target="_blank">iOS (iPad)</a>',
--'ios_ipod','<a href="http://www.apple.com/ipod/ios" title="Apple iPod home page [new window]" target="_blank">iOS (iPod)</a>',
-+'ios_iphone','<a href="http://www.apple.com/iphone/ios" title="Apple iPhone home page [new window]" target="_blank" rel="noopener noreferrer">iOS (iPhone)</a>',
-+'ios_ipad','<a href="http://www.apple.com/ipad/ios" title="Apple iPad home page [new window]" target="_blank" rel="noopener noreferrer">iOS (iPad)</a>',
-+'ios_ipod','<a href="http://www.apple.com/ipod/ios" title="Apple iPod home page [new window]" target="_blank" rel="noopener noreferrer">iOS (iPod)</a>',
- # Other famous OS
--'beos','<a href="http://www.beincorporated.com/" title="BeOS home page [new window]" target="_blank">BeOS</a>',
--'os/2','<a href="http://www.ibm.com/software/os/warp/" title="OS/2 home page [new window]" target="_blank">OS/2</a>',
--'amigaos','<a href="http://www.amiga.com/amigaos/" title="AmigaOS home page [new window]" target="_blank">AmigaOS</a>',
--'atari','<a href="http://www.atarimuseum.com/computers/computers.html" title="Atari home page [new window]" target="_blank">Atari</a>',
--'vms','<a href="http://h71000.www7.hp.com/" title="VMS home page [new window]" target="_blank">VMS</a>',
--'commodore','<a href="http://en.wikipedia.org/wiki/Commodore_64" title="Commodore 64 wikipedia page [new window]" target="_blank">Commodore 64</a>',
--'j2me','<a href="http://mobile.java.com/" title="Java Mobile home page [new window]" target="_blank">Java Mobile</a>',
--'java','<a href="http://www.java.com/" title="Java home page [new window]" target="_blank">Java</a>',
--'qnx','<a href="http://www.qnx.com/products/neutrino_rtos/" title="QNX home page [new window]" target="_blank">QNX</a>',
--'inferno','<a href="http://www.vitanuova.com/inferno/" title="Inferno home page [new window]" target="_blank">Inferno</a>',
--'palmos','<a href="http://www.palm.com/" title="Palm OS home page [new window]" target="_blank">Palm OS</a>',
--'syllable','<a href="http://www.syllable.org/" title="Syllable home page [new window]" target="_blank">Syllable</a>',
-+'beos','<a href="http://www.beincorporated.com/" title="BeOS home page [new window]" target="_blank" rel="noopener noreferrer">BeOS</a>',
-+'os/2','<a href="http://www.ibm.com/software/os/warp/" title="OS/2 home page [new window]" target="_blank" rel="noopener noreferrer">OS/2</a>',
-+'amigaos','<a href="http://www.amiga.com/amigaos/" title="AmigaOS home page [new window]" target="_blank" rel="noopener noreferrer">AmigaOS</a>',
-+'atari','<a href="http://www.atarimuseum.com/computers/computers.html" title="Atari home page [new window]" target="_blank" rel="noopener noreferrer">Atari</a>',
-+'vms','<a href="http://h71000.www7.hp.com/" title="VMS home page [new window]" target="_blank" rel="noopener noreferrer">VMS</a>',
-+'commodore','<a href="http://en.wikipedia.org/wiki/Commodore_64" title="Commodore 64 wikipedia page [new window]" target="_blank" rel="noopener noreferrer">Commodore 64</a>',
-+'j2me','<a href="http://mobile.java.com/" title="Java Mobile home page [new window]" target="_blank" rel="noopener noreferrer">Java Mobile</a>',
-+'java','<a href="http://www.java.com/" title="Java home page [new window]" target="_blank" rel="noopener noreferrer">Java</a>',
-+'qnx','<a href="http://www.qnx.com/products/neutrino_rtos/" title="QNX home page [new window]" target="_blank" rel="noopener noreferrer">QNX</a>',
-+'inferno','<a href="http://www.vitanuova.com/inferno/" title="Inferno home page [new window]" target="_blank" rel="noopener noreferrer">Inferno</a>',
-+'palmos','<a href="http://www.palm.com/" title="Palm OS home page [new window]" target="_blank" rel="noopener noreferrer">Palm OS</a>',
-+'syllable','<a href="http://www.syllable.org/" title="Syllable home page [new window]" target="_blank" rel="noopener noreferrer">Syllable</a>',
- # Miscellaneous OS
- 'blackberry','BlackBerry',
--'cp/m','<a href="http://www.digitalresearch.biz/CPM.HTM" title="CP/M home page [new window]" target="_blank">CP/M</a>',
--'crayos','<a href="http://www.cray.com/" title="CrayOS home page [new window]" target="_blank">CrayOS</a>',
--'dreamcast','<a href="http://www.sega.com/" title="Dreamcast home page [new window]" target="_blank">Dreamcast</a>',
--'riscos','<a href="http://www.riscos.com/" title="RISC OS home page [new window]" target="_blank">RISC OS</a>',
--'symbian','<a href="http://www.symbian.com/" title="Symbian OS home page [new window]" target="_blank">Symbian OS</a>',
--'webtv','<a href="http://www.webtv.com/" title="WebTV home page [new window]" target="_blank">WebTV</a>',
--'psp', '<a href="http://www.playstation.com/" title="Sony PlayStation home page [new window]" target="_blank">Sony PlayStation</a>',
--'wii', '<a href="http://wii.opera.com/" title="Opera for Nintendo Wii home page [new window]" target="_blank">Nintendo Wii</a>'
-+'cp/m','<a href="http://www.digitalresearch.biz/CPM.HTM" title="CP/M home page [new window]" target="_blank" rel="noopener noreferrer">CP/M</a>',
-+'crayos','<a href="http://www.cray.com/" title="CrayOS home page [new window]" target="_blank" rel="noopener noreferrer">CrayOS</a>',
-+'dreamcast','<a href="http://www.sega.com/" title="Dreamcast home page [new window]" target="_blank" rel="noopener noreferrer">Dreamcast</a>',
-+'riscos','<a href="http://www.riscos.com/" title="RISC OS home page [new window]" target="_blank" rel="noopener noreferrer">RISC OS</a>',
-+'symbian','<a href="http://www.symbian.com/" title="Symbian OS home page [new window]" target="_blank" rel="noopener noreferrer">Symbian OS</a>',
-+'webtv','<a href="http://www.webtv.com/" title="WebTV home page [new window]" target="_blank" rel="noopener noreferrer">WebTV</a>',
-+'psp', '<a href="http://www.playstation.com/" title="Sony PlayStation home page [new window]" target="_blank" rel="noopener noreferrer">Sony PlayStation</a>',
-+'wii', '<a href="http://wii.opera.com/" title="Opera for Nintendo Wii home page [new window]" target="_blank" rel="noopener noreferrer">Nintendo Wii</a>'
- );
- 
- 
-diff --git a/wwwroot/cgi-bin/lib/search_engines.pm b/wwwroot/cgi-bin/lib/search_engines.pm
-index c1e3c243..e8361f23 100644
---- a/wwwroot/cgi-bin/lib/search_engines.pm
-+++ b/wwwroot/cgi-bin/lib/search_engines.pm
-@@ -4234,1057 +4234,1057 @@
- %SearchEnginesHashLib=(

- # Search engine output links or not as the case may be

- 

--'www_google_co_uk','<a href="http://www.google.co.uk/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google United Kingdom</a>',

--'images_google_co_uk','<a href="http://images.google.co.uk/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google United Kingdom ( images )</a>',

--'translate_google_co_uk','<a href="http://translate.google.co.uk/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Translate United Kingdom</a>',

--'google_co_uk','<a href="http://google.co.uk/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google United Kingdom ( catchall )</a>',

--'www_google_com','<a href="http://www.google.com/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google .com</a>',

--'images_google_com','<a href="http://images.google.com/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google .com ( images )</a>',

--'translate_google_com','<a href="http://translate.google.com/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Translate .com</a>',

--'google_com','<a href="http://google.com/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google .com ( catchall )</a>',

--'www_google_de','<a href="http://www.google.de/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Germany</a>',

--'images_google_de','<a href="http://images.google.de/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Germany ( images )</a>',

--'translate_google_de','<a href="http://translate.google.de/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Translate Germany</a>',

--'google_de','<a href="http://google.de/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Germany ( catchall )</a>',

--'www_google_fr','<a href="http://www.google.fr/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google France</a>',

--'images_google_fr','<a href="http://images.google.fr/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google France ( images )</a>',

--'translate_google_fr','<a href="http://translate.google.fr/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Translate France</a>',

--'google_fr','<a href="http://google.fr/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google France ( catchall )</a>',

--'www_google_ca','<a href="http://www.google.ca/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Canada</a>',

--'images_google_ca','<a href="http://images.google.ca/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Canada ( images )</a>',

--'translate_google_ca','<a href="http://translate.google.ca/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Translate Canada</a>',

--'google_ca','<a href="http://google.ca/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Canada ( catchall )</a>',

--'www_google_es','<a href="http://www.google.es/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Spain</a>',

--'images_google_es','<a href="http://images.google.es/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Spain ( images )</a>',

--'translate_google_es','<a href="http://translate.google.es/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Translate Spain</a>',

--'google_es','<a href="http://google.es/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Spain ( catchall )</a>',

--'www_google_com_au','<a href="http://www.google.com.au/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Australia</a>',

--'images_google_com_au','<a href="http://images.google.com.au/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Australia ( images )</a>',

--'translate_google_com_au','<a href="http://translate.google.com.au/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Translate Australia</a>',

--'google_com_au','<a href="http://google.com.au/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Australia ( catchall )</a>',

--'www_google_nl','<a href="http://www.google.nl/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Netherlands</a>',

--'images_google_nl','<a href="http://images.google.nl/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Netherlands ( images )</a>',

--'translate_google_nl','<a href="http://translate.google.nl/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Translate Netherlands</a>',

--'google_nl','<a href="http://google.nl/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Netherlands ( catchall )</a>',

--'www_google_gr','<a href="http://www.google.gr/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Greece</a>',

--'images_google_gr','<a href="http://images.google.gr/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Greece ( images )</a>',

--'translate_google_gr','<a href="http://translate.google.gr/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Translate Greece</a>',

--'google_gr','<a href="http://google.gr/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Greece ( catchall )</a>',

--'www_google_se','<a href="http://www.google.se/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Sweden</a>',

--'images_google_se','<a href="http://images.google.se/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Sweden ( images )</a>',

--'translate_google_se','<a href="http://translate.google.se/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Translate Sweden</a>',

--'google_se','<a href="http://google.se/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Sweden ( catchall )</a>',

--'www_google_ie','<a href="http://www.google.ie/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Ireland</a>',

--'images_google_ie','<a href="http://images.google.ie/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Ireland ( images )</a>',

--'translate_google_ie','<a href="http://translate.google.ie/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Translate Ireland</a>',

--'google_ie','<a href="http://google.ie/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Ireland ( catchall )</a>',

--'www_google_it','<a href="http://www.google.it/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Italy</a>',

--'images_google_it','<a href="http://images.google.it/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Italy ( images )</a>',

--'translate_google_it','<a href="http://translate.google.it/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Translate Italy</a>',

--'google_it','<a href="http://google.it/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Italy ( catchall )</a>',

--'www_google_no','<a href="http://www.google.no/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Norway</a>',

--'images_google_no','<a href="http://images.google.no/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Norway ( images )</a>',

--'translate_google_no','<a href="http://translate.google.no/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Translate Norway</a>',

--'google_no','<a href="http://google.no/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Norway ( catchall )</a>',

--'www_google_com_tr','<a href="http://www.google.com.tr/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Turkey</a>',

--'images_google_com_tr','<a href="http://images.google.com.tr/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Turkey ( images )</a>',

--'translate_google_com_tr','<a href="http://translate.google.com.tr/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Translate Turkey</a>',

--'google_com_tr','<a href="http://google.com.tr/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Turkey ( catchall )</a>',

--'www_google_co_in','<a href="http://www.google.co.in/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google India</a>',

--'images_google_co_in','<a href="http://images.google.co.in/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google India ( images )</a>',

--'translate_google_co_in','<a href="http://translate.google.co.in/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Translate India</a>',

--'google_co_in','<a href="http://google.co.in/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google India ( catchall )</a>',

--'www_google_pt','<a href="http://www.google.pt/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Portugal</a>',

--'images_google_pt','<a href="http://images.google.pt/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Portugal ( images )</a>',

--'translate_google_pt','<a href="http://translate.google.pt/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Translate Portugal</a>',

--'google_pt','<a href="http://google.pt/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Portugal ( catchall )</a>',

--'www_google_hr','<a href="http://www.google.hr/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Croatia</a>',

--'images_google_hr','<a href="http://images.google.hr/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Croatia ( images )</a>',

--'translate_google_hr','<a href="http://translate.google.hr/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Translate Croatia</a>',

--'google_hr','<a href="http://google.hr/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Croatia ( catchall )</a>',

--'www_google_co_nz','<a href="http://www.google.co.nz/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google New Zealand</a>',

--'images_google_co_nz','<a href="http://images.google.co.nz/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google New Zealand ( images )</a>',

--'translate_google_co_nz','<a href="http://translate.google.co.nz/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Translate New Zealand</a>',

--'google_co_nz','<a href="http://google.co.nz/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google New Zealand ( catchall )</a>',

--'www_google_pl','<a href="http://www.google.pl/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Poland</a>',

--'images_google_pl','<a href="http://images.google.pl/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Poland ( images )</a>',

--'translate_google_pl','<a href="http://translate.google.pl/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Translate Poland</a>',

--'google_pl','<a href="http://google.pl/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Poland ( catchall )</a>',

--'www_google_ac','<a href="http://www.google.ac/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Ascension Island</a>',

--'images_google_ac','<a href="http://images.google.ac/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Ascension Island ( images )</a>',

--'translate_google_ac','<a href="http://translate.google.ac/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Translate Ascension Island</a>',

--'google_ac','<a href="http://google.ac/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Ascension Island ( catchall )</a>',

--'www_google_ad','<a href="http://www.google.ad/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Andorra</a>',

--'images_google_ad','<a href="http://images.google.ad/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Andorra ( images )</a>',

--'translate_google_ad','<a href="http://translate.google.ad/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Translate Andorra</a>',

--'google_ad','<a href="http://google.ad/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Andorra ( catchall )</a>',

--'www_google_ae','<a href="http://www.google.ae/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google United Arab Emirates</a>',

--'images_google_ae','<a href="http://images.google.ae/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google United Arab Emirates ( images )</a>',

--'translate_google_ae','<a href="http://translate.google.ae/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Translate United Arab Emirates</a>',

--'google_ae','<a href="http://google.ae/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google United Arab Emirates ( catchall )</a>',

--'www_google_al','<a href="http://www.google.al/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Albania</a>',

--'images_google_al','<a href="http://images.google.al/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Albania ( images )</a>',

--'translate_google_al','<a href="http://translate.google.al/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Translate Albania</a>',

--'google_al','<a href="http://google.al/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Albania ( catchall )</a>',

--'www_google_am','<a href="http://www.google.am/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Armenia</a>',

--'images_google_am','<a href="http://images.google.am/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Armenia ( images )</a>',

--'translate_google_am','<a href="http://translate.google.am/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Translate Armenia</a>',

--'google_am','<a href="http://google.am/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Armenia ( catchall )</a>',

--'www_google_as','<a href="http://www.google.as/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google American Samoa</a>',

--'images_google_as','<a href="http://images.google.as/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google American Samoa ( images )</a>',

--'translate_google_as','<a href="http://translate.google.as/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Translate American Samoa</a>',

--'google_as','<a href="http://google.as/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google American Samoa ( catchall )</a>',

--'www_google_at','<a href="http://www.google.at/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Austria</a>',

--'images_google_at','<a href="http://images.google.at/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Austria ( images )</a>',

--'translate_google_at','<a href="http://translate.google.at/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Translate Austria</a>',

--'google_at','<a href="http://google.at/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Austria ( catchall )</a>',

--'www_google_az','<a href="http://www.google.az/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Azerbaijan</a>',

--'images_google_az','<a href="http://images.google.az/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Azerbaijan ( images )</a>',

--'translate_google_az','<a href="http://translate.google.az/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Translate Azerbaijan</a>',

--'google_az','<a href="http://google.az/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Azerbaijan ( catchall )</a>',

--'www_google_ba','<a href="http://www.google.ba/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Bosnia and Herzegovina</a>',

--'images_google_ba','<a href="http://images.google.ba/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Bosnia and Herzegovina ( images )</a>',

--'translate_google_ba','<a href="http://translate.google.ba/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Translate Bosnia and Herzegovina</a>',

--'google_ba','<a href="http://google.ba/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Bosnia and Herzegovina ( catchall )</a>',

--'www_google_be','<a href="http://www.google.be/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Belgium</a>',

--'images_google_be','<a href="http://images.google.be/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Belgium ( images )</a>',

--'translate_google_be','<a href="http://translate.google.be/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Translate Belgium</a>',

--'google_be','<a href="http://google.be/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Belgium ( catchall )</a>',

--'www_google_bf','<a href="http://www.google.bf/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Burkina Faso</a>',

--'images_google_bf','<a href="http://images.google.bf/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Burkina Faso ( images )</a>',

--'translate_google_bf','<a href="http://translate.google.bf/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Translate Burkina Faso</a>',

--'google_bf','<a href="http://google.bf/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Burkina Faso ( catchall )</a>',

--'www_google_bg','<a href="http://www.google.bg/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Bulgaria</a>',

--'images_google_bg','<a href="http://images.google.bg/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Bulgaria ( images )</a>',

--'translate_google_bg','<a href="http://translate.google.bg/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Translate Bulgaria</a>',

--'google_bg','<a href="http://google.bg/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Bulgaria ( catchall )</a>',

--'www_google_bi','<a href="http://www.google.bi/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Burundi</a>',

--'images_google_bi','<a href="http://images.google.bi/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Burundi ( images )</a>',

--'translate_google_bi','<a href="http://translate.google.bi/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Translate Burundi</a>',

--'google_bi','<a href="http://google.bi/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Burundi ( catchall )</a>',

--'www_google_bj','<a href="http://www.google.bj/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Benin</a>',

--'images_google_bj','<a href="http://images.google.bj/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Benin ( images )</a>',

--'translate_google_bj','<a href="http://translate.google.bj/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Translate Benin</a>',

--'google_bj','<a href="http://google.bj/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Benin ( catchall )</a>',

--'www_google_bs','<a href="http://www.google.bs/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Bahamas</a>',

--'images_google_bs','<a href="http://images.google.bs/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Bahamas ( images )</a>',

--'translate_google_bs','<a href="http://translate.google.bs/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Translate Bahamas</a>',

--'google_bs','<a href="http://google.bs/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Bahamas ( catchall )</a>',

--'www_google_bt','<a href="http://www.google.bt/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Bhutan</a>',

--'images_google_bt','<a href="http://images.google.bt/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Bhutan ( images )</a>',

--'translate_google_bt','<a href="http://translate.google.bt/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Translate Bhutan</a>',

--'google_bt','<a href="http://google.bt/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Bhutan ( catchall )</a>',

--'www_google_by','<a href="http://www.google.by/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Belarus</a>',

--'images_google_by','<a href="http://images.google.by/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Belarus ( images )</a>',

--'translate_google_by','<a href="http://translate.google.by/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Translate Belarus</a>',

--'google_by','<a href="http://google.by/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Belarus ( catchall )</a>',

--'www_google_cat','<a href="http://www.google.cat/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Catalan Countries</a>',

--'images_google_cat','<a href="http://images.google.cat/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Catalan Countries ( images )</a>',

--'translate_google_cat','<a href="http://translate.google.cat/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Translate Catalan Countries</a>',

--'google_cat','<a href="http://google.cat/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Catalan Countries ( catchall )</a>',

--'www_google_cc','<a href="http://www.google.cc/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Cocos (Keeling) Islands</a>',

--'images_google_cc','<a href="http://images.google.cc/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Cocos (Keeling) Islands ( images )</a>',

--'translate_google_cc','<a href="http://translate.google.cc/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Translate Cocos (Keeling) Islands</a>',

--'google_cc','<a href="http://google.cc/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Cocos (Keeling) Islands ( catchall )</a>',

--'www_google_cd','<a href="http://www.google.cd/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Democratic Republic of the Congo</a>',

--'images_google_cd','<a href="http://images.google.cd/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Democratic Republic of the Congo ( images )</a>',

--'translate_google_cd','<a href="http://translate.google.cd/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Translate Democratic Republic of the Congo</a>',

--'google_cd','<a href="http://google.cd/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Democratic Republic of the Congo ( catchall )</a>',

--'www_google_cf','<a href="http://www.google.cf/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Central African Republic</a>',

--'images_google_cf','<a href="http://images.google.cf/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Central African Republic ( images )</a>',

--'translate_google_cf','<a href="http://translate.google.cf/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Translate Central African Republic</a>',

--'google_cf','<a href="http://google.cf/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Central African Republic ( catchall )</a>',

--'www_google_cg','<a href="http://www.google.cg/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Republic of the Congo</a>',

--'images_google_cg','<a href="http://images.google.cg/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Republic of the Congo ( images )</a>',

--'translate_google_cg','<a href="http://translate.google.cg/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Translate Republic of the Congo</a>',

--'google_cg','<a href="http://google.cg/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Republic of the Congo ( catchall )</a>',

--'www_google_ch','<a href="http://www.google.ch/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Switzerland</a>',

--'images_google_ch','<a href="http://images.google.ch/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Switzerland ( images )</a>',

--'translate_google_ch','<a href="http://translate.google.ch/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Translate Switzerland</a>',

--'google_ch','<a href="http://google.ch/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Switzerland ( catchall )</a>',

--'www_google_ci','<a href="http://www.google.ci/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Ivory Coast</a>',

--'images_google_ci','<a href="http://images.google.ci/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Ivory Coast ( images )</a>',

--'translate_google_ci','<a href="http://translate.google.ci/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Translate Ivory Coast</a>',

--'google_ci','<a href="http://google.ci/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Ivory Coast ( catchall )</a>',

--'www_google_cl','<a href="http://www.google.cl/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Chile</a>',

--'images_google_cl','<a href="http://images.google.cl/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Chile ( images )</a>',

--'translate_google_cl','<a href="http://translate.google.cl/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Translate Chile</a>',

--'google_cl','<a href="http://google.cl/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Chile ( catchall )</a>',

--'www_google_cm','<a href="http://www.google.cm/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Cameroon</a>',

--'images_google_cm','<a href="http://images.google.cm/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Cameroon ( images )</a>',

--'translate_google_cm','<a href="http://translate.google.cm/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Translate Cameroon</a>',

--'google_cm','<a href="http://google.cm/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Cameroon ( catchall )</a>',

--'www_google_cn','<a href="http://www.google.cn/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google China</a>',

--'images_google_cn','<a href="http://images.google.cn/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google China ( images )</a>',

--'translate_google_cn','<a href="http://translate.google.cn/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Translate China</a>',

--'google_cn','<a href="http://google.cn/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google China ( catchall )</a>',

--'www_google_co_ao','<a href="http://www.google.co.ao/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Angola</a>',

--'images_google_co_ao','<a href="http://images.google.co.ao/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Angola ( images )</a>',

--'translate_google_co_ao','<a href="http://translate.google.co.ao/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Translate Angola</a>',

--'google_co_ao','<a href="http://google.co.ao/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Angola ( catchall )</a>',

--'www_google_co_bw','<a href="http://www.google.co.bw/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Botswana</a>',

--'images_google_co_bw','<a href="http://images.google.co.bw/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Botswana ( images )</a>',

--'translate_google_co_bw','<a href="http://translate.google.co.bw/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Translate Botswana</a>',

--'google_co_bw','<a href="http://google.co.bw/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Botswana ( catchall )</a>',

--'www_google_co_ck','<a href="http://www.google.co.ck/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Cook Islands</a>',

--'images_google_co_ck','<a href="http://images.google.co.ck/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Cook Islands ( images )</a>',

--'translate_google_co_ck','<a href="http://translate.google.co.ck/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Translate Cook Islands</a>',

--'google_co_ck','<a href="http://google.co.ck/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Cook Islands ( catchall )</a>',

--'www_google_co_cr','<a href="http://www.google.co.cr/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Costa Rica</a>',

--'images_google_co_cr','<a href="http://images.google.co.cr/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Costa Rica ( images )</a>',

--'translate_google_co_cr','<a href="http://translate.google.co.cr/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Translate Costa Rica</a>',

--'google_co_cr','<a href="http://google.co.cr/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Costa Rica ( catchall )</a>',

--'www_google_co_id','<a href="http://www.google.co.id/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Indonesia</a>',

--'images_google_co_id','<a href="http://images.google.co.id/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Indonesia ( images )</a>',

--'translate_google_co_id','<a href="http://translate.google.co.id/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Translate Indonesia</a>',

--'google_co_id','<a href="http://google.co.id/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Indonesia ( catchall )</a>',

--'www_google_co_il','<a href="http://www.google.co.il/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Israel</a>',

--'images_google_co_il','<a href="http://images.google.co.il/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Israel ( images )</a>',

--'translate_google_co_il','<a href="http://translate.google.co.il/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Translate Israel</a>',

--'google_co_il','<a href="http://google.co.il/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Israel ( catchall )</a>',

--'www_google_co_jp','<a href="http://www.google.co.jp/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Japan</a>',

--'images_google_co_jp','<a href="http://images.google.co.jp/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Japan ( images )</a>',

--'translate_google_co_jp','<a href="http://translate.google.co.jp/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Translate Japan</a>',

--'google_co_jp','<a href="http://google.co.jp/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Japan ( catchall )</a>',

--'www_google_co_ke','<a href="http://www.google.co.ke/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Kenya</a>',

--'images_google_co_ke','<a href="http://images.google.co.ke/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Kenya ( images )</a>',

--'translate_google_co_ke','<a href="http://translate.google.co.ke/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Translate Kenya</a>',

--'google_co_ke','<a href="http://google.co.ke/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Kenya ( catchall )</a>',

--'www_google_co_kr','<a href="http://www.google.co.kr/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google South Korea</a>',

--'images_google_co_kr','<a href="http://images.google.co.kr/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google South Korea ( images )</a>',

--'translate_google_co_kr','<a href="http://translate.google.co.kr/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Translate South Korea</a>',

--'google_co_kr','<a href="http://google.co.kr/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google South Korea ( catchall )</a>',

--'www_google_co_ls','<a href="http://www.google.co.ls/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Lesotho</a>',

--'images_google_co_ls','<a href="http://images.google.co.ls/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Lesotho ( images )</a>',

--'translate_google_co_ls','<a href="http://translate.google.co.ls/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Translate Lesotho</a>',

--'google_co_ls','<a href="http://google.co.ls/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Lesotho ( catchall )</a>',

--'www_google_co_ma','<a href="http://www.google.co.ma/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Morocco</a>',

--'images_google_co_ma','<a href="http://images.google.co.ma/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Morocco ( images )</a>',

--'translate_google_co_ma','<a href="http://translate.google.co.ma/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Translate Morocco</a>',

--'google_co_ma','<a href="http://google.co.ma/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Morocco ( catchall )</a>',

--'www_google_co_mz','<a href="http://www.google.co.mz/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Mozambique</a>',

--'images_google_co_mz','<a href="http://images.google.co.mz/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Mozambique ( images )</a>',

--'translate_google_co_mz','<a href="http://translate.google.co.mz/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Translate Mozambique</a>',

--'google_co_mz','<a href="http://google.co.mz/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Mozambique ( catchall )</a>',

--'www_google_co_th','<a href="http://www.google.co.th/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Thailand</a>',

--'images_google_co_th','<a href="http://images.google.co.th/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Thailand ( images )</a>',

--'translate_google_co_th','<a href="http://translate.google.co.th/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Translate Thailand</a>',

--'google_co_th','<a href="http://google.co.th/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Thailand ( catchall )</a>',

--'www_google_co_tz','<a href="http://www.google.co.tz/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Tanzania</a>',

--'images_google_co_tz','<a href="http://images.google.co.tz/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Tanzania ( images )</a>',

--'translate_google_co_tz','<a href="http://translate.google.co.tz/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Translate Tanzania</a>',

--'google_co_tz','<a href="http://google.co.tz/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Tanzania ( catchall )</a>',

--'www_google_co_ug','<a href="http://www.google.co.ug/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Uganda</a>',

--'images_google_co_ug','<a href="http://images.google.co.ug/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Uganda ( images )</a>',

--'translate_google_co_ug','<a href="http://translate.google.co.ug/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Translate Uganda</a>',

--'google_co_ug','<a href="http://google.co.ug/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Uganda ( catchall )</a>',

--'www_google_co_uz','<a href="http://www.google.co.uz/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Uzbekistan</a>',

--'images_google_co_uz','<a href="http://images.google.co.uz/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Uzbekistan ( images )</a>',

--'translate_google_co_uz','<a href="http://translate.google.co.uz/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Translate Uzbekistan</a>',

--'google_co_uz','<a href="http://google.co.uz/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Uzbekistan ( catchall )</a>',

--'www_google_co_ve','<a href="http://www.google.co.ve/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Venezuela</a>',

-+'www_google_co_uk','<a href="http://www.google.co.uk/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google United Kingdom</a>',

-+'images_google_co_uk','<a href="http://images.google.co.uk/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google United Kingdom ( images )</a>',

-+'translate_google_co_uk','<a href="http://translate.google.co.uk/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Translate United Kingdom</a>',

-+'google_co_uk','<a href="http://google.co.uk/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google United Kingdom ( catchall )</a>',

-+'www_google_com','<a href="http://www.google.com/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google .com</a>',

-+'images_google_com','<a href="http://images.google.com/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google .com ( images )</a>',

-+'translate_google_com','<a href="http://translate.google.com/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Translate .com</a>',

-+'google_com','<a href="http://google.com/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google .com ( catchall )</a>',

-+'www_google_de','<a href="http://www.google.de/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Germany</a>',

-+'images_google_de','<a href="http://images.google.de/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Germany ( images )</a>',

-+'translate_google_de','<a href="http://translate.google.de/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Translate Germany</a>',

-+'google_de','<a href="http://google.de/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Germany ( catchall )</a>',

-+'www_google_fr','<a href="http://www.google.fr/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google France</a>',

-+'images_google_fr','<a href="http://images.google.fr/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google France ( images )</a>',

-+'translate_google_fr','<a href="http://translate.google.fr/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Translate France</a>',

-+'google_fr','<a href="http://google.fr/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google France ( catchall )</a>',

-+'www_google_ca','<a href="http://www.google.ca/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Canada</a>',

-+'images_google_ca','<a href="http://images.google.ca/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Canada ( images )</a>',

-+'translate_google_ca','<a href="http://translate.google.ca/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Translate Canada</a>',

-+'google_ca','<a href="http://google.ca/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Canada ( catchall )</a>',

-+'www_google_es','<a href="http://www.google.es/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Spain</a>',

-+'images_google_es','<a href="http://images.google.es/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Spain ( images )</a>',

-+'translate_google_es','<a href="http://translate.google.es/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Translate Spain</a>',

-+'google_es','<a href="http://google.es/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Spain ( catchall )</a>',

-+'www_google_com_au','<a href="http://www.google.com.au/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Australia</a>',

-+'images_google_com_au','<a href="http://images.google.com.au/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Australia ( images )</a>',

-+'translate_google_com_au','<a href="http://translate.google.com.au/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Translate Australia</a>',

-+'google_com_au','<a href="http://google.com.au/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Australia ( catchall )</a>',

-+'www_google_nl','<a href="http://www.google.nl/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Netherlands</a>',

-+'images_google_nl','<a href="http://images.google.nl/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Netherlands ( images )</a>',

-+'translate_google_nl','<a href="http://translate.google.nl/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Translate Netherlands</a>',

-+'google_nl','<a href="http://google.nl/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Netherlands ( catchall )</a>',

-+'www_google_gr','<a href="http://www.google.gr/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Greece</a>',

-+'images_google_gr','<a href="http://images.google.gr/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Greece ( images )</a>',

-+'translate_google_gr','<a href="http://translate.google.gr/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Translate Greece</a>',

-+'google_gr','<a href="http://google.gr/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Greece ( catchall )</a>',

-+'www_google_se','<a href="http://www.google.se/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Sweden</a>',

-+'images_google_se','<a href="http://images.google.se/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Sweden ( images )</a>',

-+'translate_google_se','<a href="http://translate.google.se/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Translate Sweden</a>',

-+'google_se','<a href="http://google.se/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Sweden ( catchall )</a>',

-+'www_google_ie','<a href="http://www.google.ie/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Ireland</a>',

-+'images_google_ie','<a href="http://images.google.ie/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Ireland ( images )</a>',

-+'translate_google_ie','<a href="http://translate.google.ie/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Translate Ireland</a>',

-+'google_ie','<a href="http://google.ie/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Ireland ( catchall )</a>',

-+'www_google_it','<a href="http://www.google.it/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Italy</a>',

-+'images_google_it','<a href="http://images.google.it/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Italy ( images )</a>',

-+'translate_google_it','<a href="http://translate.google.it/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Translate Italy</a>',

-+'google_it','<a href="http://google.it/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Italy ( catchall )</a>',

-+'www_google_no','<a href="http://www.google.no/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Norway</a>',

-+'images_google_no','<a href="http://images.google.no/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Norway ( images )</a>',

-+'translate_google_no','<a href="http://translate.google.no/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Translate Norway</a>',

-+'google_no','<a href="http://google.no/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Norway ( catchall )</a>',

-+'www_google_com_tr','<a href="http://www.google.com.tr/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Turkey</a>',

-+'images_google_com_tr','<a href="http://images.google.com.tr/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Turkey ( images )</a>',

-+'translate_google_com_tr','<a href="http://translate.google.com.tr/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Translate Turkey</a>',

-+'google_com_tr','<a href="http://google.com.tr/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Turkey ( catchall )</a>',

-+'www_google_co_in','<a href="http://www.google.co.in/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google India</a>',

-+'images_google_co_in','<a href="http://images.google.co.in/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google India ( images )</a>',

-+'translate_google_co_in','<a href="http://translate.google.co.in/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Translate India</a>',

-+'google_co_in','<a href="http://google.co.in/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google India ( catchall )</a>',

-+'www_google_pt','<a href="http://www.google.pt/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Portugal</a>',

-+'images_google_pt','<a href="http://images.google.pt/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Portugal ( images )</a>',

-+'translate_google_pt','<a href="http://translate.google.pt/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Translate Portugal</a>',

-+'google_pt','<a href="http://google.pt/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Portugal ( catchall )</a>',

-+'www_google_hr','<a href="http://www.google.hr/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Croatia</a>',

-+'images_google_hr','<a href="http://images.google.hr/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Croatia ( images )</a>',

-+'translate_google_hr','<a href="http://translate.google.hr/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Translate Croatia</a>',

-+'google_hr','<a href="http://google.hr/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Croatia ( catchall )</a>',

-+'www_google_co_nz','<a href="http://www.google.co.nz/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google New Zealand</a>',

-+'images_google_co_nz','<a href="http://images.google.co.nz/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google New Zealand ( images )</a>',

-+'translate_google_co_nz','<a href="http://translate.google.co.nz/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Translate New Zealand</a>',

-+'google_co_nz','<a href="http://google.co.nz/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google New Zealand ( catchall )</a>',

-+'www_google_pl','<a href="http://www.google.pl/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Poland</a>',

-+'images_google_pl','<a href="http://images.google.pl/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Poland ( images )</a>',

-+'translate_google_pl','<a href="http://translate.google.pl/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Translate Poland</a>',

-+'google_pl','<a href="http://google.pl/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Poland ( catchall )</a>',

-+'www_google_ac','<a href="http://www.google.ac/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Ascension Island</a>',

-+'images_google_ac','<a href="http://images.google.ac/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Ascension Island ( images )</a>',

-+'translate_google_ac','<a href="http://translate.google.ac/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Translate Ascension Island</a>',

-+'google_ac','<a href="http://google.ac/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Ascension Island ( catchall )</a>',

-+'www_google_ad','<a href="http://www.google.ad/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Andorra</a>',

-+'images_google_ad','<a href="http://images.google.ad/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Andorra ( images )</a>',

-+'translate_google_ad','<a href="http://translate.google.ad/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Translate Andorra</a>',

-+'google_ad','<a href="http://google.ad/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Andorra ( catchall )</a>',

-+'www_google_ae','<a href="http://www.google.ae/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google United Arab Emirates</a>',

-+'images_google_ae','<a href="http://images.google.ae/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google United Arab Emirates ( images )</a>',

-+'translate_google_ae','<a href="http://translate.google.ae/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Translate United Arab Emirates</a>',

-+'google_ae','<a href="http://google.ae/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google United Arab Emirates ( catchall )</a>',

-+'www_google_al','<a href="http://www.google.al/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Albania</a>',

-+'images_google_al','<a href="http://images.google.al/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Albania ( images )</a>',

-+'translate_google_al','<a href="http://translate.google.al/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Translate Albania</a>',

-+'google_al','<a href="http://google.al/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Albania ( catchall )</a>',

-+'www_google_am','<a href="http://www.google.am/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Armenia</a>',

-+'images_google_am','<a href="http://images.google.am/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Armenia ( images )</a>',

-+'translate_google_am','<a href="http://translate.google.am/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Translate Armenia</a>',

-+'google_am','<a href="http://google.am/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Armenia ( catchall )</a>',

-+'www_google_as','<a href="http://www.google.as/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google American Samoa</a>',

-+'images_google_as','<a href="http://images.google.as/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google American Samoa ( images )</a>',

-+'translate_google_as','<a href="http://translate.google.as/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Translate American Samoa</a>',

-+'google_as','<a href="http://google.as/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google American Samoa ( catchall )</a>',

-+'www_google_at','<a href="http://www.google.at/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Austria</a>',

-+'images_google_at','<a href="http://images.google.at/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Austria ( images )</a>',

-+'translate_google_at','<a href="http://translate.google.at/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Translate Austria</a>',

-+'google_at','<a href="http://google.at/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Austria ( catchall )</a>',

-+'www_google_az','<a href="http://www.google.az/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Azerbaijan</a>',

-+'images_google_az','<a href="http://images.google.az/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Azerbaijan ( images )</a>',

-+'translate_google_az','<a href="http://translate.google.az/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Translate Azerbaijan</a>',

-+'google_az','<a href="http://google.az/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Azerbaijan ( catchall )</a>',

-+'www_google_ba','<a href="http://www.google.ba/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Bosnia and Herzegovina</a>',

-+'images_google_ba','<a href="http://images.google.ba/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Bosnia and Herzegovina ( images )</a>',

-+'translate_google_ba','<a href="http://translate.google.ba/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Translate Bosnia and Herzegovina</a>',

-+'google_ba','<a href="http://google.ba/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Bosnia and Herzegovina ( catchall )</a>',

-+'www_google_be','<a href="http://www.google.be/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Belgium</a>',

-+'images_google_be','<a href="http://images.google.be/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Belgium ( images )</a>',

-+'translate_google_be','<a href="http://translate.google.be/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Translate Belgium</a>',

-+'google_be','<a href="http://google.be/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Belgium ( catchall )</a>',

-+'www_google_bf','<a href="http://www.google.bf/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Burkina Faso</a>',

-+'images_google_bf','<a href="http://images.google.bf/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Burkina Faso ( images )</a>',

-+'translate_google_bf','<a href="http://translate.google.bf/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Translate Burkina Faso</a>',

-+'google_bf','<a href="http://google.bf/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Burkina Faso ( catchall )</a>',

-+'www_google_bg','<a href="http://www.google.bg/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Bulgaria</a>',

-+'images_google_bg','<a href="http://images.google.bg/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Bulgaria ( images )</a>',

-+'translate_google_bg','<a href="http://translate.google.bg/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Translate Bulgaria</a>',

-+'google_bg','<a href="http://google.bg/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Bulgaria ( catchall )</a>',

-+'www_google_bi','<a href="http://www.google.bi/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Burundi</a>',

-+'images_google_bi','<a href="http://images.google.bi/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Burundi ( images )</a>',

-+'translate_google_bi','<a href="http://translate.google.bi/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Translate Burundi</a>',

-+'google_bi','<a href="http://google.bi/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Burundi ( catchall )</a>',

-+'www_google_bj','<a href="http://www.google.bj/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Benin</a>',

-+'images_google_bj','<a href="http://images.google.bj/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Benin ( images )</a>',

-+'translate_google_bj','<a href="http://translate.google.bj/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Translate Benin</a>',

-+'google_bj','<a href="http://google.bj/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Benin ( catchall )</a>',

-+'www_google_bs','<a href="http://www.google.bs/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Bahamas</a>',

-+'images_google_bs','<a href="http://images.google.bs/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Bahamas ( images )</a>',

-+'translate_google_bs','<a href="http://translate.google.bs/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Translate Bahamas</a>',

-+'google_bs','<a href="http://google.bs/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Bahamas ( catchall )</a>',

-+'www_google_bt','<a href="http://www.google.bt/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Bhutan</a>',

-+'images_google_bt','<a href="http://images.google.bt/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Bhutan ( images )</a>',

-+'translate_google_bt','<a href="http://translate.google.bt/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Translate Bhutan</a>',

-+'google_bt','<a href="http://google.bt/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Bhutan ( catchall )</a>',

-+'www_google_by','<a href="http://www.google.by/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Belarus</a>',

-+'images_google_by','<a href="http://images.google.by/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Belarus ( images )</a>',

-+'translate_google_by','<a href="http://translate.google.by/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Translate Belarus</a>',

-+'google_by','<a href="http://google.by/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Belarus ( catchall )</a>',

-+'www_google_cat','<a href="http://www.google.cat/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Catalan Countries</a>',

-+'images_google_cat','<a href="http://images.google.cat/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Catalan Countries ( images )</a>',

-+'translate_google_cat','<a href="http://translate.google.cat/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Translate Catalan Countries</a>',

-+'google_cat','<a href="http://google.cat/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Catalan Countries ( catchall )</a>',

-+'www_google_cc','<a href="http://www.google.cc/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Cocos (Keeling) Islands</a>',

-+'images_google_cc','<a href="http://images.google.cc/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Cocos (Keeling) Islands ( images )</a>',

-+'translate_google_cc','<a href="http://translate.google.cc/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Translate Cocos (Keeling) Islands</a>',

-+'google_cc','<a href="http://google.cc/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Cocos (Keeling) Islands ( catchall )</a>',

-+'www_google_cd','<a href="http://www.google.cd/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Democratic Republic of the Congo</a>',

-+'images_google_cd','<a href="http://images.google.cd/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Democratic Republic of the Congo ( images )</a>',

-+'translate_google_cd','<a href="http://translate.google.cd/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Translate Democratic Republic of the Congo</a>',

-+'google_cd','<a href="http://google.cd/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Democratic Republic of the Congo ( catchall )</a>',

-+'www_google_cf','<a href="http://www.google.cf/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Central African Republic</a>',

-+'images_google_cf','<a href="http://images.google.cf/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Central African Republic ( images )</a>',

-+'translate_google_cf','<a href="http://translate.google.cf/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Translate Central African Republic</a>',

-+'google_cf','<a href="http://google.cf/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Central African Republic ( catchall )</a>',

-+'www_google_cg','<a href="http://www.google.cg/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Republic of the Congo</a>',

-+'images_google_cg','<a href="http://images.google.cg/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Republic of the Congo ( images )</a>',

-+'translate_google_cg','<a href="http://translate.google.cg/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Translate Republic of the Congo</a>',

-+'google_cg','<a href="http://google.cg/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Republic of the Congo ( catchall )</a>',

-+'www_google_ch','<a href="http://www.google.ch/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Switzerland</a>',

-+'images_google_ch','<a href="http://images.google.ch/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Switzerland ( images )</a>',

-+'translate_google_ch','<a href="http://translate.google.ch/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Translate Switzerland</a>',

-+'google_ch','<a href="http://google.ch/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Switzerland ( catchall )</a>',

-+'www_google_ci','<a href="http://www.google.ci/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Ivory Coast</a>',

-+'images_google_ci','<a href="http://images.google.ci/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Ivory Coast ( images )</a>',

-+'translate_google_ci','<a href="http://translate.google.ci/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Translate Ivory Coast</a>',

-+'google_ci','<a href="http://google.ci/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Ivory Coast ( catchall )</a>',

-+'www_google_cl','<a href="http://www.google.cl/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Chile</a>',

-+'images_google_cl','<a href="http://images.google.cl/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Chile ( images )</a>',

-+'translate_google_cl','<a href="http://translate.google.cl/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Translate Chile</a>',

-+'google_cl','<a href="http://google.cl/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Chile ( catchall )</a>',

-+'www_google_cm','<a href="http://www.google.cm/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Cameroon</a>',

-+'images_google_cm','<a href="http://images.google.cm/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Cameroon ( images )</a>',

-+'translate_google_cm','<a href="http://translate.google.cm/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Translate Cameroon</a>',

-+'google_cm','<a href="http://google.cm/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Cameroon ( catchall )</a>',

-+'www_google_cn','<a href="http://www.google.cn/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google China</a>',

-+'images_google_cn','<a href="http://images.google.cn/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google China ( images )</a>',

-+'translate_google_cn','<a href="http://translate.google.cn/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Translate China</a>',

-+'google_cn','<a href="http://google.cn/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google China ( catchall )</a>',

-+'www_google_co_ao','<a href="http://www.google.co.ao/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Angola</a>',

-+'images_google_co_ao','<a href="http://images.google.co.ao/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Angola ( images )</a>',

-+'translate_google_co_ao','<a href="http://translate.google.co.ao/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Translate Angola</a>',

-+'google_co_ao','<a href="http://google.co.ao/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Angola ( catchall )</a>',

-+'www_google_co_bw','<a href="http://www.google.co.bw/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Botswana</a>',

-+'images_google_co_bw','<a href="http://images.google.co.bw/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Botswana ( images )</a>',

-+'translate_google_co_bw','<a href="http://translate.google.co.bw/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Translate Botswana</a>',

-+'google_co_bw','<a href="http://google.co.bw/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Botswana ( catchall )</a>',

-+'www_google_co_ck','<a href="http://www.google.co.ck/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Cook Islands</a>',

-+'images_google_co_ck','<a href="http://images.google.co.ck/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Cook Islands ( images )</a>',

-+'translate_google_co_ck','<a href="http://translate.google.co.ck/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Translate Cook Islands</a>',

-+'google_co_ck','<a href="http://google.co.ck/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Cook Islands ( catchall )</a>',

-+'www_google_co_cr','<a href="http://www.google.co.cr/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Costa Rica</a>',

-+'images_google_co_cr','<a href="http://images.google.co.cr/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Costa Rica ( images )</a>',

-+'translate_google_co_cr','<a href="http://translate.google.co.cr/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Translate Costa Rica</a>',

-+'google_co_cr','<a href="http://google.co.cr/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Costa Rica ( catchall )</a>',

-+'www_google_co_id','<a href="http://www.google.co.id/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Indonesia</a>',

-+'images_google_co_id','<a href="http://images.google.co.id/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Indonesia ( images )</a>',

-+'translate_google_co_id','<a href="http://translate.google.co.id/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Translate Indonesia</a>',

-+'google_co_id','<a href="http://google.co.id/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Indonesia ( catchall )</a>',

-+'www_google_co_il','<a href="http://www.google.co.il/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Israel</a>',

-+'images_google_co_il','<a href="http://images.google.co.il/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Israel ( images )</a>',

-+'translate_google_co_il','<a href="http://translate.google.co.il/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Translate Israel</a>',

-+'google_co_il','<a href="http://google.co.il/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Israel ( catchall )</a>',

-+'www_google_co_jp','<a href="http://www.google.co.jp/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Japan</a>',

-+'images_google_co_jp','<a href="http://images.google.co.jp/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Japan ( images )</a>',

-+'translate_google_co_jp','<a href="http://translate.google.co.jp/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Translate Japan</a>',

-+'google_co_jp','<a href="http://google.co.jp/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Japan ( catchall )</a>',

-+'www_google_co_ke','<a href="http://www.google.co.ke/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Kenya</a>',

-+'images_google_co_ke','<a href="http://images.google.co.ke/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Kenya ( images )</a>',

-+'translate_google_co_ke','<a href="http://translate.google.co.ke/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Translate Kenya</a>',

-+'google_co_ke','<a href="http://google.co.ke/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Kenya ( catchall )</a>',

-+'www_google_co_kr','<a href="http://www.google.co.kr/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google South Korea</a>',

-+'images_google_co_kr','<a href="http://images.google.co.kr/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google South Korea ( images )</a>',

-+'translate_google_co_kr','<a href="http://translate.google.co.kr/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Translate South Korea</a>',

-+'google_co_kr','<a href="http://google.co.kr/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google South Korea ( catchall )</a>',

-+'www_google_co_ls','<a href="http://www.google.co.ls/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Lesotho</a>',

-+'images_google_co_ls','<a href="http://images.google.co.ls/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Lesotho ( images )</a>',

-+'translate_google_co_ls','<a href="http://translate.google.co.ls/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Translate Lesotho</a>',

-+'google_co_ls','<a href="http://google.co.ls/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Lesotho ( catchall )</a>',

-+'www_google_co_ma','<a href="http://www.google.co.ma/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Morocco</a>',

-+'images_google_co_ma','<a href="http://images.google.co.ma/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Morocco ( images )</a>',

-+'translate_google_co_ma','<a href="http://translate.google.co.ma/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Translate Morocco</a>',

-+'google_co_ma','<a href="http://google.co.ma/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Morocco ( catchall )</a>',

-+'www_google_co_mz','<a href="http://www.google.co.mz/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Mozambique</a>',

-+'images_google_co_mz','<a href="http://images.google.co.mz/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Mozambique ( images )</a>',

-+'translate_google_co_mz','<a href="http://translate.google.co.mz/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Translate Mozambique</a>',

-+'google_co_mz','<a href="http://google.co.mz/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Mozambique ( catchall )</a>',

-+'www_google_co_th','<a href="http://www.google.co.th/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Thailand</a>',

-+'images_google_co_th','<a href="http://images.google.co.th/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Thailand ( images )</a>',

-+'translate_google_co_th','<a href="http://translate.google.co.th/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Translate Thailand</a>',

-+'google_co_th','<a href="http://google.co.th/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Thailand ( catchall )</a>',

-+'www_google_co_tz','<a href="http://www.google.co.tz/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Tanzania</a>',

-+'images_google_co_tz','<a href="http://images.google.co.tz/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Tanzania ( images )</a>',

-+'translate_google_co_tz','<a href="http://translate.google.co.tz/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Translate Tanzania</a>',

-+'google_co_tz','<a href="http://google.co.tz/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Tanzania ( catchall )</a>',

-+'www_google_co_ug','<a href="http://www.google.co.ug/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Uganda</a>',

-+'images_google_co_ug','<a href="http://images.google.co.ug/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Uganda ( images )</a>',

-+'translate_google_co_ug','<a href="http://translate.google.co.ug/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Translate Uganda</a>',

-+'google_co_ug','<a href="http://google.co.ug/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Uganda ( catchall )</a>',

-+'www_google_co_uz','<a href="http://www.google.co.uz/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Uzbekistan</a>',

-+'images_google_co_uz','<a href="http://images.google.co.uz/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Uzbekistan ( images )</a>',

-+'translate_google_co_uz','<a href="http://translate.google.co.uz/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Translate Uzbekistan</a>',

-+'google_co_uz','<a href="http://google.co.uz/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Uzbekistan ( catchall )</a>',

-+'www_google_co_ve','<a href="http://www.google.co.ve/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Venezuela</a>',

- 

--'images_google_co_ve','<a href="http://images.google.co.ve/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Venezuela ( images )</a>',

--'translate_google_co_ve','<a href="http://translate.google.co.ve/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Translate Venezuela</a>',

--'google_co_ve','<a href="http://google.co.ve/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Venezuela ( catchall )</a>',

--'www_google_co_vi','<a href="http://www.google.co.vi/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google United States Virgin Islands</a>',

--'images_google_co_vi','<a href="http://images.google.co.vi/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google United States Virgin Islands ( images )</a>',

--'translate_google_co_vi','<a href="http://translate.google.co.vi/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Translate United States Virgin Islands</a>',

--'google_co_vi','<a href="http://google.co.vi/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google United States Virgin Islands ( catchall )</a>',

--'www_google_co_za','<a href="http://www.google.co.za/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google South Africa</a>',

--'images_google_co_za','<a href="http://images.google.co.za/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google South Africa ( images )</a>',

--'translate_google_co_za','<a href="http://translate.google.co.za/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Translate South Africa</a>',

--'google_co_za','<a href="http://google.co.za/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google South Africa ( catchall )</a>',

--'www_google_co_zm','<a href="http://www.google.co.zm/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Zambia</a>',

--'images_google_co_zm','<a href="http://images.google.co.zm/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Zambia ( images )</a>',

--'translate_google_co_zm','<a href="http://translate.google.co.zm/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Translate Zambia</a>',

--'google_co_zm','<a href="http://google.co.zm/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Zambia ( catchall )</a>',

--'www_google_co_zw','<a href="http://www.google.co.zw/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Zimbabwe</a>',

--'images_google_co_zw','<a href="http://images.google.co.zw/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Zimbabwe ( images )</a>',

--'translate_google_co_zw','<a href="http://translate.google.co.zw/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Translate Zimbabwe</a>',

--'google_co_zw','<a href="http://google.co.zw/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Zimbabwe ( catchall )</a>',

--'www_google_com_af','<a href="http://www.google.com.af/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Afghanistan</a>',

--'images_google_com_af','<a href="http://images.google.com.af/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Afghanistan ( images )</a>',

--'translate_google_com_af','<a href="http://translate.google.com.af/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Translate Afghanistan</a>',

--'google_com_af','<a href="http://google.com.af/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Afghanistan ( catchall )</a>',

--'www_google_com_ag','<a href="http://www.google.com.ag/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Antigua and Barbuda</a>',

--'images_google_com_ag','<a href="http://images.google.com.ag/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Antigua and Barbuda ( images )</a>',

--'translate_google_com_ag','<a href="http://translate.google.com.ag/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Translate Antigua and Barbuda</a>',

--'google_com_ag','<a href="http://google.com.ag/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Antigua and Barbuda ( catchall )</a>',

--'www_google_com_ai','<a href="http://www.google.com.ai/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Anguilla</a>',

--'images_google_com_ai','<a href="http://images.google.com.ai/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Anguilla ( images )</a>',

--'translate_google_com_ai','<a href="http://translate.google.com.ai/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Translate Anguilla</a>',

--'google_com_ai','<a href="http://google.com.ai/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Anguilla ( catchall )</a>',

--'www_google_com_ar','<a href="http://www.google.com.ar/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Argentina</a>',

--'images_google_com_ar','<a href="http://images.google.com.ar/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Argentina ( images )</a>',

--'translate_google_com_ar','<a href="http://translate.google.com.ar/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Translate Argentina</a>',

--'google_com_ar','<a href="http://google.com.ar/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Argentina ( catchall )</a>',

--'www_google_com_bd','<a href="http://www.google.com.bd/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Bangladesh</a>',

--'images_google_com_bd','<a href="http://images.google.com.bd/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Bangladesh ( images )</a>',

--'translate_google_com_bd','<a href="http://translate.google.com.bd/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Translate Bangladesh</a>',

--'google_com_bd','<a href="http://google.com.bd/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Bangladesh ( catchall )</a>',

--'www_google_com_bh','<a href="http://www.google.com.bh/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Bahrain</a>',

--'images_google_com_bh','<a href="http://images.google.com.bh/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Bahrain ( images )</a>',

--'translate_google_com_bh','<a href="http://translate.google.com.bh/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Translate Bahrain</a>',

--'google_com_bh','<a href="http://google.com.bh/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Bahrain ( catchall )</a>',

--'www_google_com_bn','<a href="http://www.google.com.bn/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Brunei</a>',

--'images_google_com_bn','<a href="http://images.google.com.bn/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Brunei ( images )</a>',

--'translate_google_com_bn','<a href="http://translate.google.com.bn/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Translate Brunei</a>',

--'google_com_bn','<a href="http://google.com.bn/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Brunei ( catchall )</a>',

--'www_google_com_bo','<a href="http://www.google.com.bo/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Bolivia</a>',

--'images_google_com_bo','<a href="http://images.google.com.bo/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Bolivia ( images )</a>',

--'translate_google_com_bo','<a href="http://translate.google.com.bo/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Translate Bolivia</a>',

--'google_com_bo','<a href="http://google.com.bo/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Bolivia ( catchall )</a>',

--'www_google_com_br','<a href="http://www.google.com.br/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Brazil</a>',

--'images_google_com_br','<a href="http://images.google.com.br/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Brazil ( images )</a>',

--'translate_google_com_br','<a href="http://translate.google.com.br/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Translate Brazil</a>',

--'google_com_br','<a href="http://google.com.br/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Brazil ( catchall )</a>',

--'www_google_com_bz','<a href="http://www.google.com.bz/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Belize</a>',

--'images_google_com_bz','<a href="http://images.google.com.bz/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Belize ( images )</a>',

--'translate_google_com_bz','<a href="http://translate.google.com.bz/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Translate Belize</a>',

--'google_com_bz','<a href="http://google.com.bz/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Belize ( catchall )</a>',

--'www_google_com_co','<a href="http://www.google.com.co/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Colombia</a>',

--'images_google_com_co','<a href="http://images.google.com.co/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Colombia ( images )</a>',

--'translate_google_com_co','<a href="http://translate.google.com.co/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Translate Colombia</a>',

--'google_com_co','<a href="http://google.com.co/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Colombia ( catchall )</a>',

--'www_google_com_cu','<a href="http://www.google.com.cu/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Cuba</a>',

--'images_google_com_cu','<a href="http://images.google.com.cu/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Cuba ( images )</a>',

--'translate_google_com_cu','<a href="http://translate.google.com.cu/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Translate Cuba</a>',

--'google_com_cu','<a href="http://google.com.cu/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Cuba ( catchall )</a>',

--'www_google_com_cy','<a href="http://www.google.com.cy/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Cyprus</a>',

--'images_google_com_cy','<a href="http://images.google.com.cy/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Cyprus ( images )</a>',

--'translate_google_com_cy','<a href="http://translate.google.com.cy/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Translate Cyprus</a>',

--'google_com_cy','<a href="http://google.com.cy/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Cyprus ( catchall )</a>',

--'www_google_com_do','<a href="http://www.google.com.do/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Dominican Republic</a>',

--'images_google_com_do','<a href="http://images.google.com.do/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Dominican Republic ( images )</a>',

--'translate_google_com_do','<a href="http://translate.google.com.do/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Translate Dominican Republic</a>',

--'google_com_do','<a href="http://google.com.do/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Dominican Republic ( catchall )</a>',

--'www_google_com_ec','<a href="http://www.google.com.ec/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Ecuador</a>',

--'images_google_com_ec','<a href="http://images.google.com.ec/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Ecuador ( images )</a>',

--'translate_google_com_ec','<a href="http://translate.google.com.ec/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Translate Ecuador</a>',

--'google_com_ec','<a href="http://google.com.ec/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Ecuador ( catchall )</a>',

--'www_google_com_eg','<a href="http://www.google.com.eg/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Egypt</a>',

--'images_google_com_eg','<a href="http://images.google.com.eg/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Egypt ( images )</a>',

--'translate_google_com_eg','<a href="http://translate.google.com.eg/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Translate Egypt</a>',

--'google_com_eg','<a href="http://google.com.eg/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Egypt ( catchall )</a>',

--'www_google_com_et','<a href="http://www.google.com.et/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Ethiopia</a>',

--'images_google_com_et','<a href="http://images.google.com.et/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Ethiopia ( images )</a>',

--'translate_google_com_et','<a href="http://translate.google.com.et/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Translate Ethiopia</a>',

--'google_com_et','<a href="http://google.com.et/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Ethiopia ( catchall )</a>',

--'www_google_com_fj','<a href="http://www.google.com.fj/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Fiji</a>',

--'images_google_com_fj','<a href="http://images.google.com.fj/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Fiji ( images )</a>',

--'translate_google_com_fj','<a href="http://translate.google.com.fj/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Translate Fiji</a>',

--'google_com_fj','<a href="http://google.com.fj/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Fiji ( catchall )</a>',

--'www_google_com_gh','<a href="http://www.google.com.gh/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Ghana</a>',

--'images_google_com_gh','<a href="http://images.google.com.gh/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Ghana ( images )</a>',

--'translate_google_com_gh','<a href="http://translate.google.com.gh/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Translate Ghana</a>',

--'google_com_gh','<a href="http://google.com.gh/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Ghana ( catchall )</a>',

--'www_google_com_gi','<a href="http://www.google.com.gi/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Gibraltar</a>',

--'images_google_com_gi','<a href="http://images.google.com.gi/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Gibraltar ( images )</a>',

--'translate_google_com_gi','<a href="http://translate.google.com.gi/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Translate Gibraltar</a>',

--'google_com_gi','<a href="http://google.com.gi/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Gibraltar ( catchall )</a>',

--'www_google_com_gt','<a href="http://www.google.com.gt/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Guatemala</a>',

--'images_google_com_gt','<a href="http://images.google.com.gt/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Guatemala ( images )</a>',

--'translate_google_com_gt','<a href="http://translate.google.com.gt/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Translate Guatemala</a>',

--'google_com_gt','<a href="http://google.com.gt/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Guatemala ( catchall )</a>',

--'www_google_com_hk','<a href="http://www.google.com.hk/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Hong Kong</a>',

--'images_google_com_hk','<a href="http://images.google.com.hk/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Hong Kong ( images )</a>',

--'translate_google_com_hk','<a href="http://translate.google.com.hk/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Translate Hong Kong</a>',

--'google_com_hk','<a href="http://google.com.hk/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Hong Kong ( catchall )</a>',

--'www_google_com_jm','<a href="http://www.google.com.jm/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Jamaica</a>',

--'images_google_com_jm','<a href="http://images.google.com.jm/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Jamaica ( images )</a>',

--'translate_google_com_jm','<a href="http://translate.google.com.jm/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Translate Jamaica</a>',

--'google_com_jm','<a href="http://google.com.jm/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Jamaica ( catchall )</a>',

--'www_google_com_kh','<a href="http://www.google.com.kh/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Cambodia</a>',

--'images_google_com_kh','<a href="http://images.google.com.kh/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Cambodia ( images )</a>',

--'translate_google_com_kh','<a href="http://translate.google.com.kh/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Translate Cambodia</a>',

--'google_com_kh','<a href="http://google.com.kh/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Cambodia ( catchall )</a>',

--'www_google_com_kw','<a href="http://www.google.com.kw/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Kuwait</a>',

--'images_google_com_kw','<a href="http://images.google.com.kw/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Kuwait ( images )</a>',

--'translate_google_com_kw','<a href="http://translate.google.com.kw/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Translate Kuwait</a>',

--'google_com_kw','<a href="http://google.com.kw/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Kuwait ( catchall )</a>',

--'www_google_com_lb','<a href="http://www.google.com.lb/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Lebanon</a>',

--'images_google_com_lb','<a href="http://images.google.com.lb/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Lebanon ( images )</a>',

--'translate_google_com_lb','<a href="http://translate.google.com.lb/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Translate Lebanon</a>',

--'google_com_lb','<a href="http://google.com.lb/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Lebanon ( catchall )</a>',

--'www_google_com_lc','<a href="http://www.google.com.lc/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Saint Lucia</a>',

--'images_google_com_lc','<a href="http://images.google.com.lc/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Saint Lucia ( images )</a>',

--'translate_google_com_lc','<a href="http://translate.google.com.lc/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Translate Saint Lucia</a>',

--'google_com_lc','<a href="http://google.com.lc/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Saint Lucia ( catchall )</a>',

--'www_google_com_ly','<a href="http://www.google.com.ly/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Libya</a>',

--'images_google_com_ly','<a href="http://images.google.com.ly/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Libya ( images )</a>',

--'translate_google_com_ly','<a href="http://translate.google.com.ly/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Translate Libya</a>',

--'google_com_ly','<a href="http://google.com.ly/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Libya ( catchall )</a>',

--'www_google_com_mm','<a href="http://www.google.com.mm/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Myanmar</a>',

--'images_google_com_mm','<a href="http://images.google.com.mm/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Myanmar ( images )</a>',

--'translate_google_com_mm','<a href="http://translate.google.com.mm/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Translate Myanmar</a>',

--'google_com_mm','<a href="http://google.com.mm/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Myanmar ( catchall )</a>',

--'www_google_com_mt','<a href="http://www.google.com.mt/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Malta</a>',

--'images_google_com_mt','<a href="http://images.google.com.mt/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Malta ( images )</a>',

--'translate_google_com_mt','<a href="http://translate.google.com.mt/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Translate Malta</a>',

--'google_com_mt','<a href="http://google.com.mt/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Malta ( catchall )</a>',

--'www_google_com_mx','<a href="http://www.google.com.mx/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Mexico</a>',

--'images_google_com_mx','<a href="http://images.google.com.mx/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Mexico ( images )</a>',

--'translate_google_com_mx','<a href="http://translate.google.com.mx/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Translate Mexico</a>',

--'google_com_mx','<a href="http://google.com.mx/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Mexico ( catchall )</a>',

--'www_google_com_my','<a href="http://www.google.com.my/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Malaysia</a>',

--'images_google_com_my','<a href="http://images.google.com.my/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Malaysia ( images )</a>',

--'translate_google_com_my','<a href="http://translate.google.com.my/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Translate Malaysia</a>',

--'google_com_my','<a href="http://google.com.my/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Malaysia ( catchall )</a>',

--'www_google_com_na','<a href="http://www.google.com.na/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Namibia</a>',

--'images_google_com_na','<a href="http://images.google.com.na/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Namibia ( images )</a>',

--'translate_google_com_na','<a href="http://translate.google.com.na/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Translate Namibia</a>',

--'google_com_na','<a href="http://google.com.na/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Namibia ( catchall )</a>',

--'www_google_com_nf','<a href="http://www.google.com.nf/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Norfolk Island</a>',

--'images_google_com_nf','<a href="http://images.google.com.nf/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Norfolk Island ( images )</a>',

--'translate_google_com_nf','<a href="http://translate.google.com.nf/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Translate Norfolk Island</a>',

--'google_com_nf','<a href="http://google.com.nf/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Norfolk Island ( catchall )</a>',

--'www_google_com_ng','<a href="http://www.google.com.ng/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Nigeria</a>',

--'images_google_com_ng','<a href="http://images.google.com.ng/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Nigeria ( images )</a>',

--'translate_google_com_ng','<a href="http://translate.google.com.ng/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Translate Nigeria</a>',

--'google_com_ng','<a href="http://google.com.ng/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Nigeria ( catchall )</a>',

--'www_google_com_ni','<a href="http://www.google.com.ni/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Nicaragua</a>',

--'images_google_com_ni','<a href="http://images.google.com.ni/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Nicaragua ( images )</a>',

--'translate_google_com_ni','<a href="http://translate.google.com.ni/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Translate Nicaragua</a>',

--'google_com_ni','<a href="http://google.com.ni/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Nicaragua ( catchall )</a>',

--'www_google_com_np','<a href="http://www.google.com.np/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Nepal</a>',

--'images_google_com_np','<a href="http://images.google.com.np/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Nepal ( images )</a>',

--'translate_google_com_np','<a href="http://translate.google.com.np/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Translate Nepal</a>',

--'google_com_np','<a href="http://google.com.np/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Nepal ( catchall )</a>',

--'www_google_com_om','<a href="http://www.google.com.om/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Oman</a>',

--'images_google_com_om','<a href="http://images.google.com.om/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Oman ( images )</a>',

--'translate_google_com_om','<a href="http://translate.google.com.om/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Translate Oman</a>',

--'google_com_om','<a href="http://google.com.om/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Oman ( catchall )</a>',

--'www_google_com_pa','<a href="http://www.google.com.pa/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Panama</a>',

--'images_google_com_pa','<a href="http://images.google.com.pa/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Panama ( images )</a>',

--'translate_google_com_pa','<a href="http://translate.google.com.pa/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Translate Panama</a>',

--'google_com_pa','<a href="http://google.com.pa/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Panama ( catchall )</a>',

--'www_google_com_pe','<a href="http://www.google.com.pe/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Peru</a>',

--'images_google_com_pe','<a href="http://images.google.com.pe/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Peru ( images )</a>',

--'translate_google_com_pe','<a href="http://translate.google.com.pe/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Translate Peru</a>',

--'google_com_pe','<a href="http://google.com.pe/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Peru ( catchall )</a>',

--'www_google_com_pg','<a href="http://www.google.com.pg/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Papua New Guinea</a>',

--'images_google_com_pg','<a href="http://images.google.com.pg/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Papua New Guinea ( images )</a>',

--'translate_google_com_pg','<a href="http://translate.google.com.pg/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Translate Papua New Guinea</a>',

--'google_com_pg','<a href="http://google.com.pg/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Papua New Guinea ( catchall )</a>',

--'www_google_com_ph','<a href="http://www.google.com.ph/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Philippines</a>',

--'images_google_com_ph','<a href="http://images.google.com.ph/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Philippines ( images )</a>',

--'translate_google_com_ph','<a href="http://translate.google.com.ph/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Translate Philippines</a>',

--'google_com_ph','<a href="http://google.com.ph/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Philippines ( catchall )</a>',

--'www_google_com_pk','<a href="http://www.google.com.pk/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Pakistan</a>',

--'images_google_com_pk','<a href="http://images.google.com.pk/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Pakistan ( images )</a>',

--'translate_google_com_pk','<a href="http://translate.google.com.pk/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Translate Pakistan</a>',

--'google_com_pk','<a href="http://google.com.pk/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Pakistan ( catchall )</a>',

--'www_google_com_pr','<a href="http://www.google.com.pr/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Puerto Rico</a>',

--'images_google_com_pr','<a href="http://images.google.com.pr/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Puerto Rico ( images )</a>',

--'translate_google_com_pr','<a href="http://translate.google.com.pr/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Translate Puerto Rico</a>',

--'google_com_pr','<a href="http://google.com.pr/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Puerto Rico ( catchall )</a>',

--'www_google_com_py','<a href="http://www.google.com.py/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Paraguay</a>',

--'images_google_com_py','<a href="http://images.google.com.py/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Paraguay ( images )</a>',

--'translate_google_com_py','<a href="http://translate.google.com.py/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Translate Paraguay</a>',

--'google_com_py','<a href="http://google.com.py/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Paraguay ( catchall )</a>',

--'www_google_com_qa','<a href="http://www.google.com.qa/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Qatar</a>',

--'images_google_com_qa','<a href="http://images.google.com.qa/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Qatar ( images )</a>',

--'translate_google_com_qa','<a href="http://translate.google.com.qa/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Translate Qatar</a>',

--'google_com_qa','<a href="http://google.com.qa/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Qatar ( catchall )</a>',

--'www_google_com_sa','<a href="http://www.google.com.sa/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Saudi Arabia</a>',

--'images_google_com_sa','<a href="http://images.google.com.sa/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Saudi Arabia ( images )</a>',

--'translate_google_com_sa','<a href="http://translate.google.com.sa/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Translate Saudi Arabia</a>',

--'google_com_sa','<a href="http://google.com.sa/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Saudi Arabia ( catchall )</a>',

--'www_google_com_sb','<a href="http://www.google.com.sb/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Solomon Islands</a>',

--'images_google_com_sb','<a href="http://images.google.com.sb/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Solomon Islands ( images )</a>',

--'translate_google_com_sb','<a href="http://translate.google.com.sb/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Translate Solomon Islands</a>',

--'google_com_sb','<a href="http://google.com.sb/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Solomon Islands ( catchall )</a>',

--'www_google_com_sg','<a href="http://www.google.com.sg/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Singapore</a>',

--'images_google_com_sg','<a href="http://images.google.com.sg/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Singapore ( images )</a>',

--'translate_google_com_sg','<a href="http://translate.google.com.sg/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Translate Singapore</a>',

--'google_com_sg','<a href="http://google.com.sg/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Singapore ( catchall )</a>',

--'www_google_com_sl','<a href="http://www.google.com.sl/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Sierra Leone</a>',

--'images_google_com_sl','<a href="http://images.google.com.sl/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Sierra Leone ( images )</a>',

--'translate_google_com_sl','<a href="http://translate.google.com.sl/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Translate Sierra Leone</a>',

--'google_com_sl','<a href="http://google.com.sl/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Sierra Leone ( catchall )</a>',

--'www_google_com_sv','<a href="http://www.google.com.sv/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google El Salvador</a>',

--'images_google_com_sv','<a href="http://images.google.com.sv/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google El Salvador ( images )</a>',

--'translate_google_com_sv','<a href="http://translate.google.com.sv/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Translate El Salvador</a>',

--'google_com_sv','<a href="http://google.com.sv/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google El Salvador ( catchall )</a>',

--'www_google_com_tj','<a href="http://www.google.com.tj/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Tajikistan</a>',

--'images_google_com_tj','<a href="http://images.google.com.tj/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Tajikistan ( images )</a>',

--'translate_google_com_tj','<a href="http://translate.google.com.tj/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Translate Tajikistan</a>',

--'google_com_tj','<a href="http://google.com.tj/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Tajikistan ( catchall )</a>',

--'www_google_com_tw','<a href="http://www.google.com.tw/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Taiwan</a>',

--'images_google_com_tw','<a href="http://images.google.com.tw/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Taiwan ( images )</a>',

--'translate_google_com_tw','<a href="http://translate.google.com.tw/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Translate Taiwan</a>',

--'google_com_tw','<a href="http://google.com.tw/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Taiwan ( catchall )</a>',

--'www_google_com_ua','<a href="http://www.google.com.ua/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Ukraine</a>',

--'images_google_com_ua','<a href="http://images.google.com.ua/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Ukraine ( images )</a>',

--'translate_google_com_ua','<a href="http://translate.google.com.ua/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Translate Ukraine</a>',

--'google_com_ua','<a href="http://google.com.ua/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Ukraine ( catchall )</a>',

--'www_google_com_uy','<a href="http://www.google.com.uy/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Uruguay</a>',

--'images_google_com_uy','<a href="http://images.google.com.uy/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Uruguay ( images )</a>',

--'translate_google_com_uy','<a href="http://translate.google.com.uy/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Translate Uruguay</a>',

--'google_com_uy','<a href="http://google.com.uy/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Uruguay ( catchall )</a>',

--'www_google_com_vc','<a href="http://www.google.com.vc/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Saint Vincent and the Grenadines</a>',

--'images_google_com_vc','<a href="http://images.google.com.vc/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Saint Vincent and the Grenadines ( images )</a>',

--'translate_google_com_vc','<a href="http://translate.google.com.vc/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Translate Saint Vincent and the Grenadines</a>',

--'google_com_vc','<a href="http://google.com.vc/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Saint Vincent and the Grenadines ( catchall )</a>',

--'www_google_com_vn','<a href="http://www.google.com.vn/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Vietnam</a>',

--'images_google_com_vn','<a href="http://images.google.com.vn/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Vietnam ( images )</a>',

--'translate_google_com_vn','<a href="http://translate.google.com.vn/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Translate Vietnam</a>',

--'google_com_vn','<a href="http://google.com.vn/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Vietnam ( catchall )</a>',

--'www_google_cv','<a href="http://www.google.cv/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Cape Verde</a>',

--'images_google_cv','<a href="http://images.google.cv/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Cape Verde ( images )</a>',

--'translate_google_cv','<a href="http://translate.google.cv/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Translate Cape Verde</a>',

--'google_cv','<a href="http://google.cv/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Cape Verde ( catchall )</a>',

--'www_google_cz','<a href="http://www.google.cz/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Czech Republic</a>',

--'images_google_cz','<a href="http://images.google.cz/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Czech Republic ( images )</a>',

--'translate_google_cz','<a href="http://translate.google.cz/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Translate Czech Republic</a>',

--'google_cz','<a href="http://google.cz/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Czech Republic ( catchall )</a>',

--'www_google_dj','<a href="http://www.google.dj/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Djibouti</a>',

--'images_google_dj','<a href="http://images.google.dj/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Djibouti ( images )</a>',

--'translate_google_dj','<a href="http://translate.google.dj/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Translate Djibouti</a>',

--'google_dj','<a href="http://google.dj/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Djibouti ( catchall )</a>',

--'www_google_dk','<a href="http://www.google.dk/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Denmark</a>',

--'images_google_dk','<a href="http://images.google.dk/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Denmark ( images )</a>',

--'translate_google_dk','<a href="http://translate.google.dk/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Translate Denmark</a>',

--'google_dk','<a href="http://google.dk/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Denmark ( catchall )</a>',

--'www_google_dm','<a href="http://www.google.dm/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Dominica</a>',

--'images_google_dm','<a href="http://images.google.dm/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Dominica ( images )</a>',

--'translate_google_dm','<a href="http://translate.google.dm/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Translate Dominica</a>',

--'google_dm','<a href="http://google.dm/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Dominica ( catchall )</a>',

--'www_google_dz','<a href="http://www.google.dz/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Algeria</a>',

--'images_google_dz','<a href="http://images.google.dz/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Algeria ( images )</a>',

--'translate_google_dz','<a href="http://translate.google.dz/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Translate Algeria</a>',

--'google_dz','<a href="http://google.dz/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Algeria ( catchall )</a>',

--'www_google_ee','<a href="http://www.google.ee/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Estonia</a>',

--'images_google_ee','<a href="http://images.google.ee/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Estonia ( images )</a>',

--'translate_google_ee','<a href="http://translate.google.ee/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Translate Estonia</a>',

--'google_ee','<a href="http://google.ee/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Estonia ( catchall )</a>',

--'www_google_fi','<a href="http://www.google.fi/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Finland</a>',

--'images_google_fi','<a href="http://images.google.fi/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Finland ( images )</a>',

--'translate_google_fi','<a href="http://translate.google.fi/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Translate Finland</a>',

--'google_fi','<a href="http://google.fi/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Finland ( catchall )</a>',

--'www_google_fm','<a href="http://www.google.fm/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Federated States of Micronesia</a>',

--'images_google_fm','<a href="http://images.google.fm/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Federated States of Micronesia ( images )</a>',

--'translate_google_fm','<a href="http://translate.google.fm/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Translate Federated States of Micronesia</a>',

--'google_fm','<a href="http://google.fm/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Federated States of Micronesia ( catchall )</a>',

--'www_google_ga','<a href="http://www.google.ga/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Gabon</a>',

--'images_google_ga','<a href="http://images.google.ga/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Gabon ( images )</a>',

--'translate_google_ga','<a href="http://translate.google.ga/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Translate Gabon</a>',

--'google_ga','<a href="http://google.ga/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Gabon ( catchall )</a>',

--'www_google_ge','<a href="http://www.google.ge/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Georgia</a>',

--'images_google_ge','<a href="http://images.google.ge/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Georgia ( images )</a>',

--'translate_google_ge','<a href="http://translate.google.ge/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Translate Georgia</a>',

--'google_ge','<a href="http://google.ge/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Georgia ( catchall )</a>',

--'www_google_gf','<a href="http://www.google.gf/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google French Guiana</a>',

--'images_google_gf','<a href="http://images.google.gf/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google French Guiana ( images )</a>',

--'translate_google_gf','<a href="http://translate.google.gf/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Translate French Guiana</a>',

--'google_gf','<a href="http://google.gf/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google French Guiana ( catchall )</a>',

--'www_google_gg','<a href="http://www.google.gg/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Guernsey</a>',

--'images_google_gg','<a href="http://images.google.gg/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Guernsey ( images )</a>',

--'translate_google_gg','<a href="http://translate.google.gg/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Translate Guernsey</a>',

--'google_gg','<a href="http://google.gg/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Guernsey ( catchall )</a>',

--'www_google_gl','<a href="http://www.google.gl/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Greenland</a>',

--'images_google_gl','<a href="http://images.google.gl/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Greenland ( images )</a>',

--'translate_google_gl','<a href="http://translate.google.gl/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Translate Greenland</a>',

--'google_gl','<a href="http://google.gl/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Greenland ( catchall )</a>',

--'www_google_gm','<a href="http://www.google.gm/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Gambia</a>',

--'images_google_gm','<a href="http://images.google.gm/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Gambia ( images )</a>',

--'translate_google_gm','<a href="http://translate.google.gm/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Translate Gambia</a>',

--'google_gm','<a href="http://google.gm/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Gambia ( catchall )</a>',

--'www_google_gp','<a href="http://www.google.gp/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Guadeloupe</a>',

--'images_google_gp','<a href="http://images.google.gp/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Guadeloupe ( images )</a>',

--'translate_google_gp','<a href="http://translate.google.gp/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Translate Guadeloupe</a>',

--'google_gp','<a href="http://google.gp/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Guadeloupe ( catchall )</a>',

--'www_google_gy','<a href="http://www.google.gy/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Guyana</a>',

--'images_google_gy','<a href="http://images.google.gy/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Guyana ( images )</a>',

--'translate_google_gy','<a href="http://translate.google.gy/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Translate Guyana</a>',

--'google_gy','<a href="http://google.gy/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Guyana ( catchall )</a>',

--'www_google_hn','<a href="http://www.google.hn/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Honduras</a>',

--'images_google_hn','<a href="http://images.google.hn/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Honduras ( images )</a>',

--'translate_google_hn','<a href="http://translate.google.hn/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Translate Honduras</a>',

--'google_hn','<a href="http://google.hn/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Honduras ( catchall )</a>',

--'www_google_ht','<a href="http://www.google.ht/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Haiti</a>',

--'images_google_ht','<a href="http://images.google.ht/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Haiti ( images )</a>',

--'translate_google_ht','<a href="http://translate.google.ht/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Translate Haiti</a>',

--'google_ht','<a href="http://google.ht/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Haiti ( catchall )</a>',

--'www_google_hu','<a href="http://www.google.hu/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Hungary</a>',

--'images_google_hu','<a href="http://images.google.hu/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Hungary ( images )</a>',

--'translate_google_hu','<a href="http://translate.google.hu/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Translate Hungary</a>',

--'google_hu','<a href="http://google.hu/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Hungary ( catchall )</a>',

--'www_google_im','<a href="http://www.google.im/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Isle of Man</a>',

--'images_google_im','<a href="http://images.google.im/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Isle of Man ( images )</a>',

--'translate_google_im','<a href="http://translate.google.im/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Translate Isle of Man</a>',

--'google_im','<a href="http://google.im/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Isle of Man ( catchall )</a>',

--'www_google_io','<a href="http://www.google.io/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google British Indian Ocean Territory</a>',

--'images_google_io','<a href="http://images.google.io/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google British Indian Ocean Territory ( images )</a>',

--'translate_google_io','<a href="http://translate.google.io/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Translate British Indian Ocean Territory</a>',

--'google_io','<a href="http://google.io/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google British Indian Ocean Territory ( catchall )</a>',

--'www_google_iq','<a href="http://www.google.iq/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Iraq</a>',

--'images_google_iq','<a href="http://images.google.iq/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Iraq ( images )</a>',

--'translate_google_iq','<a href="http://translate.google.iq/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Translate Iraq</a>',

--'google_iq','<a href="http://google.iq/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Iraq ( catchall )</a>',

--'www_google_is','<a href="http://www.google.is/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Iceland</a>',

--'images_google_is','<a href="http://images.google.is/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Iceland ( images )</a>',

--'translate_google_is','<a href="http://translate.google.is/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Translate Iceland</a>',

--'google_is','<a href="http://google.is/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Iceland ( catchall )</a>',

--'www_google_je','<a href="http://www.google.je/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Jersey</a>',

--'images_google_je','<a href="http://images.google.je/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Jersey ( images )</a>',

--'translate_google_je','<a href="http://translate.google.je/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Translate Jersey</a>',

--'google_je','<a href="http://google.je/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Jersey ( catchall )</a>',

--'www_google_jo','<a href="http://www.google.jo/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Jordan</a>',

--'images_google_jo','<a href="http://images.google.jo/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Jordan ( images )</a>',

--'translate_google_jo','<a href="http://translate.google.jo/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Translate Jordan</a>',

--'google_jo','<a href="http://google.jo/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Jordan ( catchall )</a>',

--'www_google_kg','<a href="http://www.google.kg/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Kyrgyzstan</a>',

--'images_google_kg','<a href="http://images.google.kg/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Kyrgyzstan ( images )</a>',

--'translate_google_kg','<a href="http://translate.google.kg/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Translate Kyrgyzstan</a>',

--'google_kg','<a href="http://google.kg/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Kyrgyzstan ( catchall )</a>',

--'www_google_ki','<a href="http://www.google.ki/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Kiribati</a>',

--'images_google_ki','<a href="http://images.google.ki/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Kiribati ( images )</a>',

--'translate_google_ki','<a href="http://translate.google.ki/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Translate Kiribati</a>',

--'google_ki','<a href="http://google.ki/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Kiribati ( catchall )</a>',

--'www_google_kz','<a href="http://www.google.kz/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Kazakhstan</a>',

--'images_google_kz','<a href="http://images.google.kz/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Kazakhstan ( images )</a>',

--'translate_google_kz','<a href="http://translate.google.kz/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Translate Kazakhstan</a>',

--'google_kz','<a href="http://google.kz/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Kazakhstan ( catchall )</a>',

--'www_google_la','<a href="http://www.google.la/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Laos</a>',

--'images_google_la','<a href="http://images.google.la/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Laos ( images )</a>',

--'translate_google_la','<a href="http://translate.google.la/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Translate Laos</a>',

--'google_la','<a href="http://google.la/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Laos ( catchall )</a>',

--'www_google_li','<a href="http://www.google.li/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Liechtenstein</a>',

--'images_google_li','<a href="http://images.google.li/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Liechtenstein ( images )</a>',

--'translate_google_li','<a href="http://translate.google.li/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Translate Liechtenstein</a>',

--'google_li','<a href="http://google.li/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Liechtenstein ( catchall )</a>',

--'www_google_lk','<a href="http://www.google.lk/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Sri Lanka</a>',

--'images_google_lk','<a href="http://images.google.lk/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Sri Lanka ( images )</a>',

--'translate_google_lk','<a href="http://translate.google.lk/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Translate Sri Lanka</a>',

--'google_lk','<a href="http://google.lk/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Sri Lanka ( catchall )</a>',

--'www_google_lt','<a href="http://www.google.lt/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Lithuania</a>',

--'images_google_lt','<a href="http://images.google.lt/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Lithuania ( images )</a>',

--'translate_google_lt','<a href="http://translate.google.lt/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Translate Lithuania</a>',

--'google_lt','<a href="http://google.lt/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Lithuania ( catchall )</a>',

--'www_google_lu','<a href="http://www.google.lu/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Luxembourg</a>',

--'images_google_lu','<a href="http://images.google.lu/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Luxembourg ( images )</a>',

--'translate_google_lu','<a href="http://translate.google.lu/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Translate Luxembourg</a>',

--'google_lu','<a href="http://google.lu/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Luxembourg ( catchall )</a>',

--'www_google_lv','<a href="http://www.google.lv/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Latvia</a>',

--'images_google_lv','<a href="http://images.google.lv/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Latvia ( images )</a>',

--'translate_google_lv','<a href="http://translate.google.lv/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Translate Latvia</a>',

--'google_lv','<a href="http://google.lv/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Latvia ( catchall )</a>',

--'www_google_md','<a href="http://www.google.md/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Moldova</a>',

--'images_google_md','<a href="http://images.google.md/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Moldova ( images )</a>',

--'translate_google_md','<a href="http://translate.google.md/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Translate Moldova</a>',

--'google_md','<a href="http://google.md/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Moldova ( catchall )</a>',

--'www_google_me','<a href="http://www.google.me/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Montenegro</a>',

--'images_google_me','<a href="http://images.google.me/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Montenegro ( images )</a>',

--'translate_google_me','<a href="http://translate.google.me/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Translate Montenegro</a>',

--'google_me','<a href="http://google.me/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Montenegro ( catchall )</a>',

--'www_google_mg','<a href="http://www.google.mg/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Madagascar</a>',

--'images_google_mg','<a href="http://images.google.mg/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Madagascar ( images )</a>',

--'translate_google_mg','<a href="http://translate.google.mg/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Translate Madagascar</a>',

--'google_mg','<a href="http://google.mg/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Madagascar ( catchall )</a>',

--'www_google_mk','<a href="http://www.google.mk/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Macedonia</a>',

--'images_google_mk','<a href="http://images.google.mk/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Macedonia ( images )</a>',

--'translate_google_mk','<a href="http://translate.google.mk/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Translate Macedonia</a>',

--'google_mk','<a href="http://google.mk/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Macedonia ( catchall )</a>',

--'www_google_ml','<a href="http://www.google.ml/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Mali</a>',

--'images_google_ml','<a href="http://images.google.ml/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Mali ( images )</a>',

--'translate_google_ml','<a href="http://translate.google.ml/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Translate Mali</a>',

--'google_ml','<a href="http://google.ml/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Mali ( catchall )</a>',

--'www_google_mn','<a href="http://www.google.mn/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Mongolia</a>',

--'images_google_mn','<a href="http://images.google.mn/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Mongolia ( images )</a>',

--'translate_google_mn','<a href="http://translate.google.mn/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Translate Mongolia</a>',

--'google_mn','<a href="http://google.mn/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Mongolia ( catchall )</a>',

--'www_google_ms','<a href="http://www.google.ms/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Montserrat</a>',

--'images_google_ms','<a href="http://images.google.ms/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Montserrat ( images )</a>',

--'translate_google_ms','<a href="http://translate.google.ms/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Translate Montserrat</a>',

--'google_ms','<a href="http://google.ms/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Montserrat ( catchall )</a>',

--'www_google_mu','<a href="http://www.google.mu/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Mauritius</a>',

--'images_google_mu','<a href="http://images.google.mu/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Mauritius ( images )</a>',

--'translate_google_mu','<a href="http://translate.google.mu/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Translate Mauritius</a>',

--'google_mu','<a href="http://google.mu/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Mauritius ( catchall )</a>',

--'www_google_mv','<a href="http://www.google.mv/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Maldives</a>',

--'images_google_mv','<a href="http://images.google.mv/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Maldives ( images )</a>',

--'translate_google_mv','<a href="http://translate.google.mv/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Translate Maldives</a>',

--'google_mv','<a href="http://google.mv/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Maldives ( catchall )</a>',

--'www_google_mw','<a href="http://www.google.mw/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Malawi</a>',

--'images_google_mw','<a href="http://images.google.mw/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Malawi ( images )</a>',

--'translate_google_mw','<a href="http://translate.google.mw/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Translate Malawi</a>',

--'google_mw','<a href="http://google.mw/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Malawi ( catchall )</a>',

--'www_google_ne','<a href="http://www.google.ne/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Niger</a>',

--'images_google_ne','<a href="http://images.google.ne/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Niger ( images )</a>',

--'translate_google_ne','<a href="http://translate.google.ne/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Translate Niger</a>',

--'google_ne','<a href="http://google.ne/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Niger ( catchall )</a>',

--'www_google_nr','<a href="http://www.google.nr/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Nauru</a>',

--'images_google_nr','<a href="http://images.google.nr/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Nauru ( images )</a>',

--'translate_google_nr','<a href="http://translate.google.nr/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Translate Nauru</a>',

--'google_nr','<a href="http://google.nr/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Nauru ( catchall )</a>',

--'www_google_nu','<a href="http://www.google.nu/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Niue</a>',

--'images_google_nu','<a href="http://images.google.nu/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Niue ( images )</a>',

--'translate_google_nu','<a href="http://translate.google.nu/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Translate Niue</a>',

--'google_nu','<a href="http://google.nu/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Niue ( catchall )</a>',

--'www_google_pn','<a href="http://www.google.pn/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Pitcairn Islands</a>',

--'images_google_pn','<a href="http://images.google.pn/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Pitcairn Islands ( images )</a>',

--'translate_google_pn','<a href="http://translate.google.pn/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Translate Pitcairn Islands</a>',

--'google_pn','<a href="http://google.pn/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Pitcairn Islands ( catchall )</a>',

--'www_google_ps','<a href="http://www.google.ps/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Palestine</a>',

--'images_google_ps','<a href="http://images.google.ps/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Palestine[4] ( images )</a>',

--'translate_google_ps','<a href="http://translate.google.ps/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Translate Palestine[4]</a>',

--'google_ps','<a href="http://google.ps/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Palestine[4] ( catchall )</a>',

--'www_google_ro','<a href="http://www.google.ro/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Romania</a>',

--'images_google_ro','<a href="http://images.google.ro/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Romania ( images )</a>',

--'translate_google_ro','<a href="http://translate.google.ro/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Translate Romania</a>',

--'google_ro','<a href="http://google.ro/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Romania ( catchall )</a>',

--'www_google_rs','<a href="http://www.google.rs/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Serbia</a>',

--'images_google_rs','<a href="http://images.google.rs/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Serbia ( images )</a>',

--'translate_google_rs','<a href="http://translate.google.rs/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Translate Serbia</a>',

--'google_rs','<a href="http://google.rs/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Serbia ( catchall )</a>',

--'www_google_ru','<a href="http://www.google.ru/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Russia</a>',

--'images_google_ru','<a href="http://images.google.ru/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Russia ( images )</a>',

--'translate_google_ru','<a href="http://translate.google.ru/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Translate Russia</a>',

--'google_ru','<a href="http://google.ru/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Russia ( catchall )</a>',

--'www_google_rw','<a href="http://www.google.rw/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Rwanda</a>',

--'images_google_rw','<a href="http://images.google.rw/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Rwanda ( images )</a>',

--'translate_google_rw','<a href="http://translate.google.rw/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Translate Rwanda</a>',

--'google_rw','<a href="http://google.rw/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Rwanda ( catchall )</a>',

--'www_google_sc','<a href="http://www.google.sc/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Seychelles</a>',

--'images_google_sc','<a href="http://images.google.sc/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Seychelles ( images )</a>',

--'translate_google_sc','<a href="http://translate.google.sc/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Translate Seychelles</a>',

--'google_sc','<a href="http://google.sc/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Seychelles ( catchall )</a>',

--'www_google_sh','<a href="http://www.google.sh/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Saint Helena and Ascension and Tristan da Cunha</a>',

--'images_google_sh','<a href="http://images.google.sh/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Saint Helena and Ascension and Tristan da Cunha ( images )</a>',

--'translate_google_sh','<a href="http://translate.google.sh/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Translate Saint Helena and Ascension and Tristan da Cunha</a>',

--'google_sh','<a href="http://google.sh/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Saint Helena and Ascension and Tristan da Cunha ( catchall )</a>',

--'www_google_si','<a href="http://www.google.si/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Slovenia</a>',

--'images_google_si','<a href="http://images.google.si/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Slovenia ( images )</a>',

--'translate_google_si','<a href="http://translate.google.si/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Translate Slovenia</a>',

--'google_si','<a href="http://google.si/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Slovenia ( catchall )</a>',

--'www_google_sk','<a href="http://www.google.sk/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Slovakia</a>',

--'images_google_sk','<a href="http://images.google.sk/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Slovakia ( images )</a>',

--'translate_google_sk','<a href="http://translate.google.sk/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Translate Slovakia</a>',

--'google_sk','<a href="http://google.sk/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Slovakia ( catchall )</a>',

--'www_google_sm','<a href="http://www.google.sm/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google San Marino</a>',

--'images_google_sm','<a href="http://images.google.sm/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google San Marino ( images )</a>',

--'translate_google_sm','<a href="http://translate.google.sm/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Translate San Marino</a>',

--'google_sm','<a href="http://google.sm/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google San Marino ( catchall )</a>',

--'www_google_sn','<a href="http://www.google.sn/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Senegal</a>',

--'images_google_sn','<a href="http://images.google.sn/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Senegal ( images )</a>',

--'translate_google_sn','<a href="http://translate.google.sn/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Translate Senegal</a>',

--'google_sn','<a href="http://google.sn/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Senegal ( catchall )</a>',

--'www_google_so','<a href="http://www.google.so/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Somalia</a>',

--'images_google_so','<a href="http://images.google.so/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Somalia ( images )</a>',

--'translate_google_so','<a href="http://translate.google.so/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Translate Somalia</a>',

--'google_so','<a href="http://google.so/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Somalia ( catchall )</a>',

--'www_google_sr','<a href="http://www.google.sr/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Suriname</a>',

--'images_google_sr','<a href="http://images.google.sr/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Suriname ( images )</a>',

--'translate_google_sr','<a href="http://translate.google.sr/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Translate Suriname</a>',

--'google_sr','<a href="http://google.sr/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Suriname ( catchall )</a>',

--'www_google_st','<a href="http://www.google.st/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Sao Tome and Principe</a>',

--'images_google_st','<a href="http://images.google.st/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Sao Tome and Principe ( images )</a>',

--'translate_google_st','<a href="http://translate.google.st/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Translate Sao Tome and Principe</a>',

--'google_st','<a href="http://google.st/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Sao Tome and Principe ( catchall )</a>',

--'www_google_td','<a href="http://www.google.td/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Chad</a>',

--'images_google_td','<a href="http://images.google.td/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Chad ( images )</a>',

--'translate_google_td','<a href="http://translate.google.td/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Translate Chad</a>',

--'google_td','<a href="http://google.td/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Chad ( catchall )</a>',

--'www_google_tg','<a href="http://www.google.tg/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Togo</a>',

--'images_google_tg','<a href="http://images.google.tg/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Togo ( images )</a>',

--'translate_google_tg','<a href="http://translate.google.tg/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Translate Togo</a>',

--'google_tg','<a href="http://google.tg/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Togo ( catchall )</a>',

--'www_google_tk','<a href="http://www.google.tk/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Tokelau</a>',

--'images_google_tk','<a href="http://images.google.tk/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Tokelau ( images )</a>',

--'translate_google_tk','<a href="http://translate.google.tk/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Translate Tokelau</a>',

--'google_tk','<a href="http://google.tk/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Tokelau ( catchall )</a>',

--'www_google_tl','<a href="http://www.google.tl/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Timor-Leste</a>',

--'images_google_tl','<a href="http://images.google.tl/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Timor-Leste ( images )</a>',

--'translate_google_tl','<a href="http://translate.google.tl/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Translate Timor-Leste</a>',

--'google_tl','<a href="http://google.tl/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Timor-Leste ( catchall )</a>',

--'www_google_tm','<a href="http://www.google.tm/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Turkmenistan</a>',

--'images_google_tm','<a href="http://images.google.tm/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Turkmenistan ( images )</a>',

--'translate_google_tm','<a href="http://translate.google.tm/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Translate Turkmenistan</a>',

--'google_tm','<a href="http://google.tm/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Turkmenistan ( catchall )</a>',

--'www_google_tn','<a href="http://www.google.tn/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Tunisia</a>',

--'images_google_tn','<a href="http://images.google.tn/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Tunisia ( images )</a>',

--'translate_google_tn','<a href="http://translate.google.tn/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Translate Tunisia</a>',

--'google_tn','<a href="http://google.tn/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Tunisia ( catchall )</a>',

--'www_google_to','<a href="http://www.google.to/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Tonga</a>',

--'images_google_to','<a href="http://images.google.to/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Tonga ( images )</a>',

--'translate_google_to','<a href="http://translate.google.to/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Translate Tonga</a>',

--'google_to','<a href="http://google.to/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Tonga ( catchall )</a>',

--'www_google_tt','<a href="http://www.google.tt/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Trinidad and Tobago</a>',

--'images_google_tt','<a href="http://images.google.tt/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Trinidad and Tobago ( images )</a>',

--'translate_google_tt','<a href="http://translate.google.tt/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Translate Trinidad and Tobago</a>',

--'google_tt','<a href="http://google.tt/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Trinidad and Tobago ( catchall )</a>',

--'www_google_us','<a href="http://www.google.us/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google United States</a>',

--'images_google_us','<a href="http://images.google.us/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google United States ( images )</a>',

--'translate_google_us','<a href="http://translate.google.us/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Translate United States</a>',

--'google_us','<a href="http://google.us/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google United States ( catchall )</a>',

--'www_google_vg','<a href="http://www.google.vg/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google British Virgin Islands</a>',

--'images_google_vg','<a href="http://images.google.vg/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google British Virgin Islands ( images )</a>',

--'translate_google_vg','<a href="http://translate.google.vg/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Translate British Virgin Islands</a>',

--'google_vg','<a href="http://google.vg/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google British Virgin Islands ( catchall )</a>',

--'www_google_vu','<a href="http://www.google.vu/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Vanuatu</a>',

--'images_google_vu','<a href="http://images.google.vu/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Vanuatu ( images )</a>',

--'translate_google_vu','<a href="http://translate.google.vu/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Translate Vanuatu</a>',

--'google_vu','<a href="http://google.vu/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Vanuatu ( catchall )</a>',

--'www_google_ws','<a href="http://www.google.ws/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Samoa</a>',

--'images_google_ws','<a href="http://images.google.ws/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Samoa ( images )</a>',

--'translate_google_ws','<a href="http://translate.google.ws/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Translate Samoa</a>',

--'google_ws','<a href="http://google.ws/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Samoa ( catchall )</a>',

-+'images_google_co_ve','<a href="http://images.google.co.ve/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Venezuela ( images )</a>',

-+'translate_google_co_ve','<a href="http://translate.google.co.ve/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Translate Venezuela</a>',

-+'google_co_ve','<a href="http://google.co.ve/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Venezuela ( catchall )</a>',

-+'www_google_co_vi','<a href="http://www.google.co.vi/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google United States Virgin Islands</a>',

-+'images_google_co_vi','<a href="http://images.google.co.vi/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google United States Virgin Islands ( images )</a>',

-+'translate_google_co_vi','<a href="http://translate.google.co.vi/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Translate United States Virgin Islands</a>',

-+'google_co_vi','<a href="http://google.co.vi/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google United States Virgin Islands ( catchall )</a>',

-+'www_google_co_za','<a href="http://www.google.co.za/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google South Africa</a>',

-+'images_google_co_za','<a href="http://images.google.co.za/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google South Africa ( images )</a>',

-+'translate_google_co_za','<a href="http://translate.google.co.za/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Translate South Africa</a>',

-+'google_co_za','<a href="http://google.co.za/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google South Africa ( catchall )</a>',

-+'www_google_co_zm','<a href="http://www.google.co.zm/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Zambia</a>',

-+'images_google_co_zm','<a href="http://images.google.co.zm/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Zambia ( images )</a>',

-+'translate_google_co_zm','<a href="http://translate.google.co.zm/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Translate Zambia</a>',

-+'google_co_zm','<a href="http://google.co.zm/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Zambia ( catchall )</a>',

-+'www_google_co_zw','<a href="http://www.google.co.zw/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Zimbabwe</a>',

-+'images_google_co_zw','<a href="http://images.google.co.zw/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Zimbabwe ( images )</a>',

-+'translate_google_co_zw','<a href="http://translate.google.co.zw/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Translate Zimbabwe</a>',

-+'google_co_zw','<a href="http://google.co.zw/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Zimbabwe ( catchall )</a>',

-+'www_google_com_af','<a href="http://www.google.com.af/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Afghanistan</a>',

-+'images_google_com_af','<a href="http://images.google.com.af/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Afghanistan ( images )</a>',

-+'translate_google_com_af','<a href="http://translate.google.com.af/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Translate Afghanistan</a>',

-+'google_com_af','<a href="http://google.com.af/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Afghanistan ( catchall )</a>',

-+'www_google_com_ag','<a href="http://www.google.com.ag/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Antigua and Barbuda</a>',

-+'images_google_com_ag','<a href="http://images.google.com.ag/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Antigua and Barbuda ( images )</a>',

-+'translate_google_com_ag','<a href="http://translate.google.com.ag/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Translate Antigua and Barbuda</a>',

-+'google_com_ag','<a href="http://google.com.ag/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Antigua and Barbuda ( catchall )</a>',

-+'www_google_com_ai','<a href="http://www.google.com.ai/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Anguilla</a>',

-+'images_google_com_ai','<a href="http://images.google.com.ai/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Anguilla ( images )</a>',

-+'translate_google_com_ai','<a href="http://translate.google.com.ai/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Translate Anguilla</a>',

-+'google_com_ai','<a href="http://google.com.ai/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Anguilla ( catchall )</a>',

-+'www_google_com_ar','<a href="http://www.google.com.ar/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Argentina</a>',

-+'images_google_com_ar','<a href="http://images.google.com.ar/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Argentina ( images )</a>',

-+'translate_google_com_ar','<a href="http://translate.google.com.ar/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Translate Argentina</a>',

-+'google_com_ar','<a href="http://google.com.ar/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Argentina ( catchall )</a>',

-+'www_google_com_bd','<a href="http://www.google.com.bd/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Bangladesh</a>',

-+'images_google_com_bd','<a href="http://images.google.com.bd/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Bangladesh ( images )</a>',

-+'translate_google_com_bd','<a href="http://translate.google.com.bd/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Translate Bangladesh</a>',

-+'google_com_bd','<a href="http://google.com.bd/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Bangladesh ( catchall )</a>',

-+'www_google_com_bh','<a href="http://www.google.com.bh/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Bahrain</a>',

-+'images_google_com_bh','<a href="http://images.google.com.bh/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Bahrain ( images )</a>',

-+'translate_google_com_bh','<a href="http://translate.google.com.bh/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Translate Bahrain</a>',

-+'google_com_bh','<a href="http://google.com.bh/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Bahrain ( catchall )</a>',

-+'www_google_com_bn','<a href="http://www.google.com.bn/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Brunei</a>',

-+'images_google_com_bn','<a href="http://images.google.com.bn/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Brunei ( images )</a>',

-+'translate_google_com_bn','<a href="http://translate.google.com.bn/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Translate Brunei</a>',

-+'google_com_bn','<a href="http://google.com.bn/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Brunei ( catchall )</a>',

-+'www_google_com_bo','<a href="http://www.google.com.bo/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Bolivia</a>',

-+'images_google_com_bo','<a href="http://images.google.com.bo/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Bolivia ( images )</a>',

-+'translate_google_com_bo','<a href="http://translate.google.com.bo/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Translate Bolivia</a>',

-+'google_com_bo','<a href="http://google.com.bo/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Bolivia ( catchall )</a>',

-+'www_google_com_br','<a href="http://www.google.com.br/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Brazil</a>',

-+'images_google_com_br','<a href="http://images.google.com.br/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Brazil ( images )</a>',

-+'translate_google_com_br','<a href="http://translate.google.com.br/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Translate Brazil</a>',

-+'google_com_br','<a href="http://google.com.br/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Brazil ( catchall )</a>',

-+'www_google_com_bz','<a href="http://www.google.com.bz/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Belize</a>',

-+'images_google_com_bz','<a href="http://images.google.com.bz/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Belize ( images )</a>',

-+'translate_google_com_bz','<a href="http://translate.google.com.bz/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Translate Belize</a>',

-+'google_com_bz','<a href="http://google.com.bz/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Belize ( catchall )</a>',

-+'www_google_com_co','<a href="http://www.google.com.co/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Colombia</a>',

-+'images_google_com_co','<a href="http://images.google.com.co/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Colombia ( images )</a>',

-+'translate_google_com_co','<a href="http://translate.google.com.co/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Translate Colombia</a>',

-+'google_com_co','<a href="http://google.com.co/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Colombia ( catchall )</a>',

-+'www_google_com_cu','<a href="http://www.google.com.cu/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Cuba</a>',

-+'images_google_com_cu','<a href="http://images.google.com.cu/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Cuba ( images )</a>',

-+'translate_google_com_cu','<a href="http://translate.google.com.cu/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Translate Cuba</a>',

-+'google_com_cu','<a href="http://google.com.cu/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Cuba ( catchall )</a>',

-+'www_google_com_cy','<a href="http://www.google.com.cy/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Cyprus</a>',

-+'images_google_com_cy','<a href="http://images.google.com.cy/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Cyprus ( images )</a>',

-+'translate_google_com_cy','<a href="http://translate.google.com.cy/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Translate Cyprus</a>',

-+'google_com_cy','<a href="http://google.com.cy/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Cyprus ( catchall )</a>',

-+'www_google_com_do','<a href="http://www.google.com.do/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Dominican Republic</a>',

-+'images_google_com_do','<a href="http://images.google.com.do/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Dominican Republic ( images )</a>',

-+'translate_google_com_do','<a href="http://translate.google.com.do/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Translate Dominican Republic</a>',

-+'google_com_do','<a href="http://google.com.do/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Dominican Republic ( catchall )</a>',

-+'www_google_com_ec','<a href="http://www.google.com.ec/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Ecuador</a>',

-+'images_google_com_ec','<a href="http://images.google.com.ec/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Ecuador ( images )</a>',

-+'translate_google_com_ec','<a href="http://translate.google.com.ec/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Translate Ecuador</a>',

-+'google_com_ec','<a href="http://google.com.ec/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Ecuador ( catchall )</a>',

-+'www_google_com_eg','<a href="http://www.google.com.eg/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Egypt</a>',

-+'images_google_com_eg','<a href="http://images.google.com.eg/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Egypt ( images )</a>',

-+'translate_google_com_eg','<a href="http://translate.google.com.eg/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Translate Egypt</a>',

-+'google_com_eg','<a href="http://google.com.eg/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Egypt ( catchall )</a>',

-+'www_google_com_et','<a href="http://www.google.com.et/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Ethiopia</a>',

-+'images_google_com_et','<a href="http://images.google.com.et/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Ethiopia ( images )</a>',

-+'translate_google_com_et','<a href="http://translate.google.com.et/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Translate Ethiopia</a>',

-+'google_com_et','<a href="http://google.com.et/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Ethiopia ( catchall )</a>',

-+'www_google_com_fj','<a href="http://www.google.com.fj/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Fiji</a>',

-+'images_google_com_fj','<a href="http://images.google.com.fj/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Fiji ( images )</a>',

-+'translate_google_com_fj','<a href="http://translate.google.com.fj/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Translate Fiji</a>',

-+'google_com_fj','<a href="http://google.com.fj/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Fiji ( catchall )</a>',

-+'www_google_com_gh','<a href="http://www.google.com.gh/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Ghana</a>',

-+'images_google_com_gh','<a href="http://images.google.com.gh/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Ghana ( images )</a>',

-+'translate_google_com_gh','<a href="http://translate.google.com.gh/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Translate Ghana</a>',

-+'google_com_gh','<a href="http://google.com.gh/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Ghana ( catchall )</a>',

-+'www_google_com_gi','<a href="http://www.google.com.gi/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Gibraltar</a>',

-+'images_google_com_gi','<a href="http://images.google.com.gi/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Gibraltar ( images )</a>',

-+'translate_google_com_gi','<a href="http://translate.google.com.gi/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Translate Gibraltar</a>',

-+'google_com_gi','<a href="http://google.com.gi/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Gibraltar ( catchall )</a>',

-+'www_google_com_gt','<a href="http://www.google.com.gt/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Guatemala</a>',

-+'images_google_com_gt','<a href="http://images.google.com.gt/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Guatemala ( images )</a>',

-+'translate_google_com_gt','<a href="http://translate.google.com.gt/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Translate Guatemala</a>',

-+'google_com_gt','<a href="http://google.com.gt/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Guatemala ( catchall )</a>',

-+'www_google_com_hk','<a href="http://www.google.com.hk/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Hong Kong</a>',

-+'images_google_com_hk','<a href="http://images.google.com.hk/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Hong Kong ( images )</a>',

-+'translate_google_com_hk','<a href="http://translate.google.com.hk/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Translate Hong Kong</a>',

-+'google_com_hk','<a href="http://google.com.hk/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Hong Kong ( catchall )</a>',

-+'www_google_com_jm','<a href="http://www.google.com.jm/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Jamaica</a>',

-+'images_google_com_jm','<a href="http://images.google.com.jm/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Jamaica ( images )</a>',

-+'translate_google_com_jm','<a href="http://translate.google.com.jm/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Translate Jamaica</a>',

-+'google_com_jm','<a href="http://google.com.jm/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Jamaica ( catchall )</a>',

-+'www_google_com_kh','<a href="http://www.google.com.kh/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Cambodia</a>',

-+'images_google_com_kh','<a href="http://images.google.com.kh/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Cambodia ( images )</a>',

-+'translate_google_com_kh','<a href="http://translate.google.com.kh/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Translate Cambodia</a>',

-+'google_com_kh','<a href="http://google.com.kh/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Cambodia ( catchall )</a>',

-+'www_google_com_kw','<a href="http://www.google.com.kw/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Kuwait</a>',

-+'images_google_com_kw','<a href="http://images.google.com.kw/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Kuwait ( images )</a>',

-+'translate_google_com_kw','<a href="http://translate.google.com.kw/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Translate Kuwait</a>',

-+'google_com_kw','<a href="http://google.com.kw/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Kuwait ( catchall )</a>',

-+'www_google_com_lb','<a href="http://www.google.com.lb/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Lebanon</a>',

-+'images_google_com_lb','<a href="http://images.google.com.lb/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Lebanon ( images )</a>',

-+'translate_google_com_lb','<a href="http://translate.google.com.lb/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Translate Lebanon</a>',

-+'google_com_lb','<a href="http://google.com.lb/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Lebanon ( catchall )</a>',

-+'www_google_com_lc','<a href="http://www.google.com.lc/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Saint Lucia</a>',

-+'images_google_com_lc','<a href="http://images.google.com.lc/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Saint Lucia ( images )</a>',

-+'translate_google_com_lc','<a href="http://translate.google.com.lc/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Translate Saint Lucia</a>',

-+'google_com_lc','<a href="http://google.com.lc/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Saint Lucia ( catchall )</a>',

-+'www_google_com_ly','<a href="http://www.google.com.ly/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Libya</a>',

-+'images_google_com_ly','<a href="http://images.google.com.ly/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Libya ( images )</a>',

-+'translate_google_com_ly','<a href="http://translate.google.com.ly/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Translate Libya</a>',

-+'google_com_ly','<a href="http://google.com.ly/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Libya ( catchall )</a>',

-+'www_google_com_mm','<a href="http://www.google.com.mm/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Myanmar</a>',

-+'images_google_com_mm','<a href="http://images.google.com.mm/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Myanmar ( images )</a>',

-+'translate_google_com_mm','<a href="http://translate.google.com.mm/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Translate Myanmar</a>',

-+'google_com_mm','<a href="http://google.com.mm/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Myanmar ( catchall )</a>',

-+'www_google_com_mt','<a href="http://www.google.com.mt/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Malta</a>',

-+'images_google_com_mt','<a href="http://images.google.com.mt/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Malta ( images )</a>',

-+'translate_google_com_mt','<a href="http://translate.google.com.mt/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Translate Malta</a>',

-+'google_com_mt','<a href="http://google.com.mt/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Malta ( catchall )</a>',

-+'www_google_com_mx','<a href="http://www.google.com.mx/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Mexico</a>',

-+'images_google_com_mx','<a href="http://images.google.com.mx/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Mexico ( images )</a>',

-+'translate_google_com_mx','<a href="http://translate.google.com.mx/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Translate Mexico</a>',

-+'google_com_mx','<a href="http://google.com.mx/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Mexico ( catchall )</a>',

-+'www_google_com_my','<a href="http://www.google.com.my/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Malaysia</a>',

-+'images_google_com_my','<a href="http://images.google.com.my/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Malaysia ( images )</a>',

-+'translate_google_com_my','<a href="http://translate.google.com.my/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Translate Malaysia</a>',

-+'google_com_my','<a href="http://google.com.my/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Malaysia ( catchall )</a>',

-+'www_google_com_na','<a href="http://www.google.com.na/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Namibia</a>',

-+'images_google_com_na','<a href="http://images.google.com.na/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Namibia ( images )</a>',

-+'translate_google_com_na','<a href="http://translate.google.com.na/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Translate Namibia</a>',

-+'google_com_na','<a href="http://google.com.na/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Namibia ( catchall )</a>',

-+'www_google_com_nf','<a href="http://www.google.com.nf/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Norfolk Island</a>',

-+'images_google_com_nf','<a href="http://images.google.com.nf/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Norfolk Island ( images )</a>',

-+'translate_google_com_nf','<a href="http://translate.google.com.nf/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Translate Norfolk Island</a>',

-+'google_com_nf','<a href="http://google.com.nf/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Norfolk Island ( catchall )</a>',

-+'www_google_com_ng','<a href="http://www.google.com.ng/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Nigeria</a>',

-+'images_google_com_ng','<a href="http://images.google.com.ng/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Nigeria ( images )</a>',

-+'translate_google_com_ng','<a href="http://translate.google.com.ng/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Translate Nigeria</a>',

-+'google_com_ng','<a href="http://google.com.ng/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Nigeria ( catchall )</a>',

-+'www_google_com_ni','<a href="http://www.google.com.ni/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Nicaragua</a>',

-+'images_google_com_ni','<a href="http://images.google.com.ni/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Nicaragua ( images )</a>',

-+'translate_google_com_ni','<a href="http://translate.google.com.ni/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Translate Nicaragua</a>',

-+'google_com_ni','<a href="http://google.com.ni/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Nicaragua ( catchall )</a>',

-+'www_google_com_np','<a href="http://www.google.com.np/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Nepal</a>',

-+'images_google_com_np','<a href="http://images.google.com.np/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Nepal ( images )</a>',

-+'translate_google_com_np','<a href="http://translate.google.com.np/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Translate Nepal</a>',

-+'google_com_np','<a href="http://google.com.np/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Nepal ( catchall )</a>',

-+'www_google_com_om','<a href="http://www.google.com.om/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Oman</a>',

-+'images_google_com_om','<a href="http://images.google.com.om/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Oman ( images )</a>',

-+'translate_google_com_om','<a href="http://translate.google.com.om/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Translate Oman</a>',

-+'google_com_om','<a href="http://google.com.om/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Oman ( catchall )</a>',

-+'www_google_com_pa','<a href="http://www.google.com.pa/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Panama</a>',

-+'images_google_com_pa','<a href="http://images.google.com.pa/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Panama ( images )</a>',

-+'translate_google_com_pa','<a href="http://translate.google.com.pa/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Translate Panama</a>',

-+'google_com_pa','<a href="http://google.com.pa/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Panama ( catchall )</a>',

-+'www_google_com_pe','<a href="http://www.google.com.pe/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Peru</a>',

-+'images_google_com_pe','<a href="http://images.google.com.pe/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Peru ( images )</a>',

-+'translate_google_com_pe','<a href="http://translate.google.com.pe/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Translate Peru</a>',

-+'google_com_pe','<a href="http://google.com.pe/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Peru ( catchall )</a>',

-+'www_google_com_pg','<a href="http://www.google.com.pg/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Papua New Guinea</a>',

-+'images_google_com_pg','<a href="http://images.google.com.pg/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Papua New Guinea ( images )</a>',

-+'translate_google_com_pg','<a href="http://translate.google.com.pg/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Translate Papua New Guinea</a>',

-+'google_com_pg','<a href="http://google.com.pg/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Papua New Guinea ( catchall )</a>',

-+'www_google_com_ph','<a href="http://www.google.com.ph/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Philippines</a>',

-+'images_google_com_ph','<a href="http://images.google.com.ph/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Philippines ( images )</a>',

-+'translate_google_com_ph','<a href="http://translate.google.com.ph/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Translate Philippines</a>',

-+'google_com_ph','<a href="http://google.com.ph/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Philippines ( catchall )</a>',

-+'www_google_com_pk','<a href="http://www.google.com.pk/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Pakistan</a>',

-+'images_google_com_pk','<a href="http://images.google.com.pk/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Pakistan ( images )</a>',

-+'translate_google_com_pk','<a href="http://translate.google.com.pk/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Translate Pakistan</a>',

-+'google_com_pk','<a href="http://google.com.pk/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Pakistan ( catchall )</a>',

-+'www_google_com_pr','<a href="http://www.google.com.pr/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Puerto Rico</a>',

-+'images_google_com_pr','<a href="http://images.google.com.pr/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Puerto Rico ( images )</a>',

-+'translate_google_com_pr','<a href="http://translate.google.com.pr/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Translate Puerto Rico</a>',

-+'google_com_pr','<a href="http://google.com.pr/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Puerto Rico ( catchall )</a>',

-+'www_google_com_py','<a href="http://www.google.com.py/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Paraguay</a>',

-+'images_google_com_py','<a href="http://images.google.com.py/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Paraguay ( images )</a>',

-+'translate_google_com_py','<a href="http://translate.google.com.py/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Translate Paraguay</a>',

-+'google_com_py','<a href="http://google.com.py/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Paraguay ( catchall )</a>',

-+'www_google_com_qa','<a href="http://www.google.com.qa/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Qatar</a>',

-+'images_google_com_qa','<a href="http://images.google.com.qa/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Qatar ( images )</a>',

-+'translate_google_com_qa','<a href="http://translate.google.com.qa/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Translate Qatar</a>',

-+'google_com_qa','<a href="http://google.com.qa/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Qatar ( catchall )</a>',

-+'www_google_com_sa','<a href="http://www.google.com.sa/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Saudi Arabia</a>',

-+'images_google_com_sa','<a href="http://images.google.com.sa/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Saudi Arabia ( images )</a>',

-+'translate_google_com_sa','<a href="http://translate.google.com.sa/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Translate Saudi Arabia</a>',

-+'google_com_sa','<a href="http://google.com.sa/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Saudi Arabia ( catchall )</a>',

-+'www_google_com_sb','<a href="http://www.google.com.sb/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Solomon Islands</a>',

-+'images_google_com_sb','<a href="http://images.google.com.sb/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Solomon Islands ( images )</a>',

-+'translate_google_com_sb','<a href="http://translate.google.com.sb/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Translate Solomon Islands</a>',

-+'google_com_sb','<a href="http://google.com.sb/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Solomon Islands ( catchall )</a>',

-+'www_google_com_sg','<a href="http://www.google.com.sg/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Singapore</a>',

-+'images_google_com_sg','<a href="http://images.google.com.sg/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Singapore ( images )</a>',

-+'translate_google_com_sg','<a href="http://translate.google.com.sg/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Translate Singapore</a>',

-+'google_com_sg','<a href="http://google.com.sg/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Singapore ( catchall )</a>',

-+'www_google_com_sl','<a href="http://www.google.com.sl/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Sierra Leone</a>',

-+'images_google_com_sl','<a href="http://images.google.com.sl/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Sierra Leone ( images )</a>',

-+'translate_google_com_sl','<a href="http://translate.google.com.sl/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Translate Sierra Leone</a>',

-+'google_com_sl','<a href="http://google.com.sl/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Sierra Leone ( catchall )</a>',

-+'www_google_com_sv','<a href="http://www.google.com.sv/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google El Salvador</a>',

-+'images_google_com_sv','<a href="http://images.google.com.sv/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google El Salvador ( images )</a>',

-+'translate_google_com_sv','<a href="http://translate.google.com.sv/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Translate El Salvador</a>',

-+'google_com_sv','<a href="http://google.com.sv/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google El Salvador ( catchall )</a>',

-+'www_google_com_tj','<a href="http://www.google.com.tj/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Tajikistan</a>',

-+'images_google_com_tj','<a href="http://images.google.com.tj/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Tajikistan ( images )</a>',

-+'translate_google_com_tj','<a href="http://translate.google.com.tj/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Translate Tajikistan</a>',

-+'google_com_tj','<a href="http://google.com.tj/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Tajikistan ( catchall )</a>',

-+'www_google_com_tw','<a href="http://www.google.com.tw/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Taiwan</a>',

-+'images_google_com_tw','<a href="http://images.google.com.tw/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Taiwan ( images )</a>',

-+'translate_google_com_tw','<a href="http://translate.google.com.tw/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Translate Taiwan</a>',

-+'google_com_tw','<a href="http://google.com.tw/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Taiwan ( catchall )</a>',

-+'www_google_com_ua','<a href="http://www.google.com.ua/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Ukraine</a>',

-+'images_google_com_ua','<a href="http://images.google.com.ua/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Ukraine ( images )</a>',

-+'translate_google_com_ua','<a href="http://translate.google.com.ua/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Translate Ukraine</a>',

-+'google_com_ua','<a href="http://google.com.ua/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Ukraine ( catchall )</a>',

-+'www_google_com_uy','<a href="http://www.google.com.uy/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Uruguay</a>',

-+'images_google_com_uy','<a href="http://images.google.com.uy/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Uruguay ( images )</a>',

-+'translate_google_com_uy','<a href="http://translate.google.com.uy/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Translate Uruguay</a>',

-+'google_com_uy','<a href="http://google.com.uy/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Uruguay ( catchall )</a>',

-+'www_google_com_vc','<a href="http://www.google.com.vc/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Saint Vincent and the Grenadines</a>',

-+'images_google_com_vc','<a href="http://images.google.com.vc/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Saint Vincent and the Grenadines ( images )</a>',

-+'translate_google_com_vc','<a href="http://translate.google.com.vc/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Translate Saint Vincent and the Grenadines</a>',

-+'google_com_vc','<a href="http://google.com.vc/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Saint Vincent and the Grenadines ( catchall )</a>',

-+'www_google_com_vn','<a href="http://www.google.com.vn/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Vietnam</a>',

-+'images_google_com_vn','<a href="http://images.google.com.vn/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Vietnam ( images )</a>',

-+'translate_google_com_vn','<a href="http://translate.google.com.vn/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Translate Vietnam</a>',

-+'google_com_vn','<a href="http://google.com.vn/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Vietnam ( catchall )</a>',

-+'www_google_cv','<a href="http://www.google.cv/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Cape Verde</a>',

-+'images_google_cv','<a href="http://images.google.cv/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Cape Verde ( images )</a>',

-+'translate_google_cv','<a href="http://translate.google.cv/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Translate Cape Verde</a>',

-+'google_cv','<a href="http://google.cv/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Cape Verde ( catchall )</a>',

-+'www_google_cz','<a href="http://www.google.cz/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Czech Republic</a>',

-+'images_google_cz','<a href="http://images.google.cz/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Czech Republic ( images )</a>',

-+'translate_google_cz','<a href="http://translate.google.cz/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Translate Czech Republic</a>',

-+'google_cz','<a href="http://google.cz/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Czech Republic ( catchall )</a>',

-+'www_google_dj','<a href="http://www.google.dj/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Djibouti</a>',

-+'images_google_dj','<a href="http://images.google.dj/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Djibouti ( images )</a>',

-+'translate_google_dj','<a href="http://translate.google.dj/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Translate Djibouti</a>',

-+'google_dj','<a href="http://google.dj/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Djibouti ( catchall )</a>',

-+'www_google_dk','<a href="http://www.google.dk/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Denmark</a>',

-+'images_google_dk','<a href="http://images.google.dk/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Denmark ( images )</a>',

-+'translate_google_dk','<a href="http://translate.google.dk/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Translate Denmark</a>',

-+'google_dk','<a href="http://google.dk/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Denmark ( catchall )</a>',

-+'www_google_dm','<a href="http://www.google.dm/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Dominica</a>',

-+'images_google_dm','<a href="http://images.google.dm/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Dominica ( images )</a>',

-+'translate_google_dm','<a href="http://translate.google.dm/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Translate Dominica</a>',

-+'google_dm','<a href="http://google.dm/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Dominica ( catchall )</a>',

-+'www_google_dz','<a href="http://www.google.dz/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Algeria</a>',

-+'images_google_dz','<a href="http://images.google.dz/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Algeria ( images )</a>',

-+'translate_google_dz','<a href="http://translate.google.dz/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Translate Algeria</a>',

-+'google_dz','<a href="http://google.dz/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Algeria ( catchall )</a>',

-+'www_google_ee','<a href="http://www.google.ee/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Estonia</a>',

-+'images_google_ee','<a href="http://images.google.ee/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Estonia ( images )</a>',

-+'translate_google_ee','<a href="http://translate.google.ee/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Translate Estonia</a>',

-+'google_ee','<a href="http://google.ee/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Estonia ( catchall )</a>',

-+'www_google_fi','<a href="http://www.google.fi/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Finland</a>',

-+'images_google_fi','<a href="http://images.google.fi/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Finland ( images )</a>',

-+'translate_google_fi','<a href="http://translate.google.fi/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Translate Finland</a>',

-+'google_fi','<a href="http://google.fi/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Finland ( catchall )</a>',

-+'www_google_fm','<a href="http://www.google.fm/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Federated States of Micronesia</a>',

-+'images_google_fm','<a href="http://images.google.fm/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Federated States of Micronesia ( images )</a>',

-+'translate_google_fm','<a href="http://translate.google.fm/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Translate Federated States of Micronesia</a>',

-+'google_fm','<a href="http://google.fm/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Federated States of Micronesia ( catchall )</a>',

-+'www_google_ga','<a href="http://www.google.ga/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Gabon</a>',

-+'images_google_ga','<a href="http://images.google.ga/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Gabon ( images )</a>',

-+'translate_google_ga','<a href="http://translate.google.ga/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Translate Gabon</a>',

-+'google_ga','<a href="http://google.ga/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Gabon ( catchall )</a>',

-+'www_google_ge','<a href="http://www.google.ge/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Georgia</a>',

-+'images_google_ge','<a href="http://images.google.ge/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Georgia ( images )</a>',

-+'translate_google_ge','<a href="http://translate.google.ge/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Translate Georgia</a>',

-+'google_ge','<a href="http://google.ge/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Georgia ( catchall )</a>',

-+'www_google_gf','<a href="http://www.google.gf/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google French Guiana</a>',

-+'images_google_gf','<a href="http://images.google.gf/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google French Guiana ( images )</a>',

-+'translate_google_gf','<a href="http://translate.google.gf/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Translate French Guiana</a>',

-+'google_gf','<a href="http://google.gf/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google French Guiana ( catchall )</a>',

-+'www_google_gg','<a href="http://www.google.gg/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Guernsey</a>',

-+'images_google_gg','<a href="http://images.google.gg/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Guernsey ( images )</a>',

-+'translate_google_gg','<a href="http://translate.google.gg/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Translate Guernsey</a>',

-+'google_gg','<a href="http://google.gg/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Guernsey ( catchall )</a>',

-+'www_google_gl','<a href="http://www.google.gl/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Greenland</a>',

-+'images_google_gl','<a href="http://images.google.gl/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Greenland ( images )</a>',

-+'translate_google_gl','<a href="http://translate.google.gl/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Translate Greenland</a>',

-+'google_gl','<a href="http://google.gl/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Greenland ( catchall )</a>',

-+'www_google_gm','<a href="http://www.google.gm/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Gambia</a>',

-+'images_google_gm','<a href="http://images.google.gm/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Gambia ( images )</a>',

-+'translate_google_gm','<a href="http://translate.google.gm/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Translate Gambia</a>',

-+'google_gm','<a href="http://google.gm/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Gambia ( catchall )</a>',

-+'www_google_gp','<a href="http://www.google.gp/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Guadeloupe</a>',

-+'images_google_gp','<a href="http://images.google.gp/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Guadeloupe ( images )</a>',

-+'translate_google_gp','<a href="http://translate.google.gp/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Translate Guadeloupe</a>',

-+'google_gp','<a href="http://google.gp/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Guadeloupe ( catchall )</a>',

-+'www_google_gy','<a href="http://www.google.gy/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Guyana</a>',

-+'images_google_gy','<a href="http://images.google.gy/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Guyana ( images )</a>',

-+'translate_google_gy','<a href="http://translate.google.gy/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Translate Guyana</a>',

-+'google_gy','<a href="http://google.gy/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Guyana ( catchall )</a>',

-+'www_google_hn','<a href="http://www.google.hn/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Honduras</a>',

-+'images_google_hn','<a href="http://images.google.hn/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Honduras ( images )</a>',

-+'translate_google_hn','<a href="http://translate.google.hn/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Translate Honduras</a>',

-+'google_hn','<a href="http://google.hn/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Honduras ( catchall )</a>',

-+'www_google_ht','<a href="http://www.google.ht/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Haiti</a>',

-+'images_google_ht','<a href="http://images.google.ht/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Haiti ( images )</a>',

-+'translate_google_ht','<a href="http://translate.google.ht/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Translate Haiti</a>',

-+'google_ht','<a href="http://google.ht/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Haiti ( catchall )</a>',

-+'www_google_hu','<a href="http://www.google.hu/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Hungary</a>',

-+'images_google_hu','<a href="http://images.google.hu/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Hungary ( images )</a>',

-+'translate_google_hu','<a href="http://translate.google.hu/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Translate Hungary</a>',

-+'google_hu','<a href="http://google.hu/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Hungary ( catchall )</a>',

-+'www_google_im','<a href="http://www.google.im/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Isle of Man</a>',

-+'images_google_im','<a href="http://images.google.im/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Isle of Man ( images )</a>',

-+'translate_google_im','<a href="http://translate.google.im/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Translate Isle of Man</a>',

-+'google_im','<a href="http://google.im/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Isle of Man ( catchall )</a>',

-+'www_google_io','<a href="http://www.google.io/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google British Indian Ocean Territory</a>',

-+'images_google_io','<a href="http://images.google.io/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google British Indian Ocean Territory ( images )</a>',

-+'translate_google_io','<a href="http://translate.google.io/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Translate British Indian Ocean Territory</a>',

-+'google_io','<a href="http://google.io/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google British Indian Ocean Territory ( catchall )</a>',

-+'www_google_iq','<a href="http://www.google.iq/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Iraq</a>',

-+'images_google_iq','<a href="http://images.google.iq/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Iraq ( images )</a>',

-+'translate_google_iq','<a href="http://translate.google.iq/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Translate Iraq</a>',

-+'google_iq','<a href="http://google.iq/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Iraq ( catchall )</a>',

-+'www_google_is','<a href="http://www.google.is/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Iceland</a>',

-+'images_google_is','<a href="http://images.google.is/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Iceland ( images )</a>',

-+'translate_google_is','<a href="http://translate.google.is/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Translate Iceland</a>',

-+'google_is','<a href="http://google.is/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Iceland ( catchall )</a>',

-+'www_google_je','<a href="http://www.google.je/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Jersey</a>',

-+'images_google_je','<a href="http://images.google.je/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Jersey ( images )</a>',

-+'translate_google_je','<a href="http://translate.google.je/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Translate Jersey</a>',

-+'google_je','<a href="http://google.je/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Jersey ( catchall )</a>',

-+'www_google_jo','<a href="http://www.google.jo/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Jordan</a>',

-+'images_google_jo','<a href="http://images.google.jo/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Jordan ( images )</a>',

-+'translate_google_jo','<a href="http://translate.google.jo/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Translate Jordan</a>',

-+'google_jo','<a href="http://google.jo/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Jordan ( catchall )</a>',

-+'www_google_kg','<a href="http://www.google.kg/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Kyrgyzstan</a>',

-+'images_google_kg','<a href="http://images.google.kg/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Kyrgyzstan ( images )</a>',

-+'translate_google_kg','<a href="http://translate.google.kg/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Translate Kyrgyzstan</a>',

-+'google_kg','<a href="http://google.kg/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Kyrgyzstan ( catchall )</a>',

-+'www_google_ki','<a href="http://www.google.ki/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Kiribati</a>',

-+'images_google_ki','<a href="http://images.google.ki/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Kiribati ( images )</a>',

-+'translate_google_ki','<a href="http://translate.google.ki/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Translate Kiribati</a>',

-+'google_ki','<a href="http://google.ki/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Kiribati ( catchall )</a>',

-+'www_google_kz','<a href="http://www.google.kz/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Kazakhstan</a>',

-+'images_google_kz','<a href="http://images.google.kz/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Kazakhstan ( images )</a>',

-+'translate_google_kz','<a href="http://translate.google.kz/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Translate Kazakhstan</a>',

-+'google_kz','<a href="http://google.kz/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Kazakhstan ( catchall )</a>',

-+'www_google_la','<a href="http://www.google.la/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Laos</a>',

-+'images_google_la','<a href="http://images.google.la/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Laos ( images )</a>',

-+'translate_google_la','<a href="http://translate.google.la/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Translate Laos</a>',

-+'google_la','<a href="http://google.la/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Laos ( catchall )</a>',

-+'www_google_li','<a href="http://www.google.li/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Liechtenstein</a>',

-+'images_google_li','<a href="http://images.google.li/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Liechtenstein ( images )</a>',

-+'translate_google_li','<a href="http://translate.google.li/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Translate Liechtenstein</a>',

-+'google_li','<a href="http://google.li/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Liechtenstein ( catchall )</a>',

-+'www_google_lk','<a href="http://www.google.lk/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Sri Lanka</a>',

-+'images_google_lk','<a href="http://images.google.lk/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Sri Lanka ( images )</a>',

-+'translate_google_lk','<a href="http://translate.google.lk/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Translate Sri Lanka</a>',

-+'google_lk','<a href="http://google.lk/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Sri Lanka ( catchall )</a>',

-+'www_google_lt','<a href="http://www.google.lt/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Lithuania</a>',

-+'images_google_lt','<a href="http://images.google.lt/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Lithuania ( images )</a>',

-+'translate_google_lt','<a href="http://translate.google.lt/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Translate Lithuania</a>',

-+'google_lt','<a href="http://google.lt/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Lithuania ( catchall )</a>',

-+'www_google_lu','<a href="http://www.google.lu/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Luxembourg</a>',

-+'images_google_lu','<a href="http://images.google.lu/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Luxembourg ( images )</a>',

-+'translate_google_lu','<a href="http://translate.google.lu/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Translate Luxembourg</a>',

-+'google_lu','<a href="http://google.lu/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Luxembourg ( catchall )</a>',

-+'www_google_lv','<a href="http://www.google.lv/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Latvia</a>',

-+'images_google_lv','<a href="http://images.google.lv/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Latvia ( images )</a>',

-+'translate_google_lv','<a href="http://translate.google.lv/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Translate Latvia</a>',

-+'google_lv','<a href="http://google.lv/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Latvia ( catchall )</a>',

-+'www_google_md','<a href="http://www.google.md/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Moldova</a>',

-+'images_google_md','<a href="http://images.google.md/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Moldova ( images )</a>',

-+'translate_google_md','<a href="http://translate.google.md/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Translate Moldova</a>',

-+'google_md','<a href="http://google.md/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Moldova ( catchall )</a>',

-+'www_google_me','<a href="http://www.google.me/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Montenegro</a>',

-+'images_google_me','<a href="http://images.google.me/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Montenegro ( images )</a>',

-+'translate_google_me','<a href="http://translate.google.me/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Translate Montenegro</a>',

-+'google_me','<a href="http://google.me/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Montenegro ( catchall )</a>',

-+'www_google_mg','<a href="http://www.google.mg/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Madagascar</a>',

-+'images_google_mg','<a href="http://images.google.mg/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Madagascar ( images )</a>',

-+'translate_google_mg','<a href="http://translate.google.mg/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Translate Madagascar</a>',

-+'google_mg','<a href="http://google.mg/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Madagascar ( catchall )</a>',

-+'www_google_mk','<a href="http://www.google.mk/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Macedonia</a>',

-+'images_google_mk','<a href="http://images.google.mk/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Macedonia ( images )</a>',

-+'translate_google_mk','<a href="http://translate.google.mk/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Translate Macedonia</a>',

-+'google_mk','<a href="http://google.mk/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Macedonia ( catchall )</a>',

-+'www_google_ml','<a href="http://www.google.ml/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Mali</a>',

-+'images_google_ml','<a href="http://images.google.ml/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Mali ( images )</a>',

-+'translate_google_ml','<a href="http://translate.google.ml/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Translate Mali</a>',

-+'google_ml','<a href="http://google.ml/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Mali ( catchall )</a>',

-+'www_google_mn','<a href="http://www.google.mn/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Mongolia</a>',

-+'images_google_mn','<a href="http://images.google.mn/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Mongolia ( images )</a>',

-+'translate_google_mn','<a href="http://translate.google.mn/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Translate Mongolia</a>',

-+'google_mn','<a href="http://google.mn/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Mongolia ( catchall )</a>',

-+'www_google_ms','<a href="http://www.google.ms/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Montserrat</a>',

-+'images_google_ms','<a href="http://images.google.ms/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Montserrat ( images )</a>',

-+'translate_google_ms','<a href="http://translate.google.ms/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Translate Montserrat</a>',

-+'google_ms','<a href="http://google.ms/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Montserrat ( catchall )</a>',

-+'www_google_mu','<a href="http://www.google.mu/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Mauritius</a>',

-+'images_google_mu','<a href="http://images.google.mu/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Mauritius ( images )</a>',

-+'translate_google_mu','<a href="http://translate.google.mu/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Translate Mauritius</a>',

-+'google_mu','<a href="http://google.mu/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Mauritius ( catchall )</a>',

-+'www_google_mv','<a href="http://www.google.mv/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Maldives</a>',

-+'images_google_mv','<a href="http://images.google.mv/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Maldives ( images )</a>',

-+'translate_google_mv','<a href="http://translate.google.mv/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Translate Maldives</a>',

-+'google_mv','<a href="http://google.mv/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Maldives ( catchall )</a>',

-+'www_google_mw','<a href="http://www.google.mw/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Malawi</a>',

-+'images_google_mw','<a href="http://images.google.mw/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Malawi ( images )</a>',

-+'translate_google_mw','<a href="http://translate.google.mw/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Translate Malawi</a>',

-+'google_mw','<a href="http://google.mw/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Malawi ( catchall )</a>',

-+'www_google_ne','<a href="http://www.google.ne/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Niger</a>',

-+'images_google_ne','<a href="http://images.google.ne/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Niger ( images )</a>',

-+'translate_google_ne','<a href="http://translate.google.ne/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Translate Niger</a>',

-+'google_ne','<a href="http://google.ne/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Niger ( catchall )</a>',

-+'www_google_nr','<a href="http://www.google.nr/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Nauru</a>',

-+'images_google_nr','<a href="http://images.google.nr/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Nauru ( images )</a>',

-+'translate_google_nr','<a href="http://translate.google.nr/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Translate Nauru</a>',

-+'google_nr','<a href="http://google.nr/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Nauru ( catchall )</a>',

-+'www_google_nu','<a href="http://www.google.nu/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Niue</a>',

-+'images_google_nu','<a href="http://images.google.nu/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Niue ( images )</a>',

-+'translate_google_nu','<a href="http://translate.google.nu/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Translate Niue</a>',

-+'google_nu','<a href="http://google.nu/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Niue ( catchall )</a>',

-+'www_google_pn','<a href="http://www.google.pn/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Pitcairn Islands</a>',

-+'images_google_pn','<a href="http://images.google.pn/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Pitcairn Islands ( images )</a>',

-+'translate_google_pn','<a href="http://translate.google.pn/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Translate Pitcairn Islands</a>',

-+'google_pn','<a href="http://google.pn/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Pitcairn Islands ( catchall )</a>',

-+'www_google_ps','<a href="http://www.google.ps/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Palestine</a>',

-+'images_google_ps','<a href="http://images.google.ps/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Palestine[4] ( images )</a>',

-+'translate_google_ps','<a href="http://translate.google.ps/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Translate Palestine[4]</a>',

-+'google_ps','<a href="http://google.ps/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Palestine[4] ( catchall )</a>',

-+'www_google_ro','<a href="http://www.google.ro/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Romania</a>',

-+'images_google_ro','<a href="http://images.google.ro/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Romania ( images )</a>',

-+'translate_google_ro','<a href="http://translate.google.ro/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Translate Romania</a>',

-+'google_ro','<a href="http://google.ro/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Romania ( catchall )</a>',

-+'www_google_rs','<a href="http://www.google.rs/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Serbia</a>',

-+'images_google_rs','<a href="http://images.google.rs/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Serbia ( images )</a>',

-+'translate_google_rs','<a href="http://translate.google.rs/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Translate Serbia</a>',

-+'google_rs','<a href="http://google.rs/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Serbia ( catchall )</a>',

-+'www_google_ru','<a href="http://www.google.ru/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Russia</a>',

-+'images_google_ru','<a href="http://images.google.ru/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Russia ( images )</a>',

-+'translate_google_ru','<a href="http://translate.google.ru/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Translate Russia</a>',

-+'google_ru','<a href="http://google.ru/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Russia ( catchall )</a>',

-+'www_google_rw','<a href="http://www.google.rw/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Rwanda</a>',

-+'images_google_rw','<a href="http://images.google.rw/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Rwanda ( images )</a>',

-+'translate_google_rw','<a href="http://translate.google.rw/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Translate Rwanda</a>',

-+'google_rw','<a href="http://google.rw/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Rwanda ( catchall )</a>',

-+'www_google_sc','<a href="http://www.google.sc/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Seychelles</a>',

-+'images_google_sc','<a href="http://images.google.sc/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Seychelles ( images )</a>',

-+'translate_google_sc','<a href="http://translate.google.sc/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Translate Seychelles</a>',

-+'google_sc','<a href="http://google.sc/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Seychelles ( catchall )</a>',

-+'www_google_sh','<a href="http://www.google.sh/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Saint Helena and Ascension and Tristan da Cunha</a>',

-+'images_google_sh','<a href="http://images.google.sh/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Saint Helena and Ascension and Tristan da Cunha ( images )</a>',

-+'translate_google_sh','<a href="http://translate.google.sh/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Translate Saint Helena and Ascension and Tristan da Cunha</a>',

-+'google_sh','<a href="http://google.sh/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Saint Helena and Ascension and Tristan da Cunha ( catchall )</a>',

-+'www_google_si','<a href="http://www.google.si/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Slovenia</a>',

-+'images_google_si','<a href="http://images.google.si/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Slovenia ( images )</a>',

-+'translate_google_si','<a href="http://translate.google.si/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Translate Slovenia</a>',

-+'google_si','<a href="http://google.si/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Slovenia ( catchall )</a>',

-+'www_google_sk','<a href="http://www.google.sk/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Slovakia</a>',

-+'images_google_sk','<a href="http://images.google.sk/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Slovakia ( images )</a>',

-+'translate_google_sk','<a href="http://translate.google.sk/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Translate Slovakia</a>',

-+'google_sk','<a href="http://google.sk/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Slovakia ( catchall )</a>',

-+'www_google_sm','<a href="http://www.google.sm/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google San Marino</a>',

-+'images_google_sm','<a href="http://images.google.sm/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google San Marino ( images )</a>',

-+'translate_google_sm','<a href="http://translate.google.sm/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Translate San Marino</a>',

-+'google_sm','<a href="http://google.sm/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google San Marino ( catchall )</a>',

-+'www_google_sn','<a href="http://www.google.sn/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Senegal</a>',

-+'images_google_sn','<a href="http://images.google.sn/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Senegal ( images )</a>',

-+'translate_google_sn','<a href="http://translate.google.sn/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Translate Senegal</a>',

-+'google_sn','<a href="http://google.sn/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Senegal ( catchall )</a>',

-+'www_google_so','<a href="http://www.google.so/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Somalia</a>',

-+'images_google_so','<a href="http://images.google.so/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Somalia ( images )</a>',

-+'translate_google_so','<a href="http://translate.google.so/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Translate Somalia</a>',

-+'google_so','<a href="http://google.so/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Somalia ( catchall )</a>',

-+'www_google_sr','<a href="http://www.google.sr/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Suriname</a>',

-+'images_google_sr','<a href="http://images.google.sr/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Suriname ( images )</a>',

-+'translate_google_sr','<a href="http://translate.google.sr/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Translate Suriname</a>',

-+'google_sr','<a href="http://google.sr/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Suriname ( catchall )</a>',

-+'www_google_st','<a href="http://www.google.st/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Sao Tome and Principe</a>',

-+'images_google_st','<a href="http://images.google.st/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Sao Tome and Principe ( images )</a>',

-+'translate_google_st','<a href="http://translate.google.st/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Translate Sao Tome and Principe</a>',

-+'google_st','<a href="http://google.st/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Sao Tome and Principe ( catchall )</a>',

-+'www_google_td','<a href="http://www.google.td/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Chad</a>',

-+'images_google_td','<a href="http://images.google.td/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Chad ( images )</a>',

-+'translate_google_td','<a href="http://translate.google.td/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Translate Chad</a>',

-+'google_td','<a href="http://google.td/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Chad ( catchall )</a>',

-+'www_google_tg','<a href="http://www.google.tg/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Togo</a>',

-+'images_google_tg','<a href="http://images.google.tg/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Togo ( images )</a>',

-+'translate_google_tg','<a href="http://translate.google.tg/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Translate Togo</a>',

-+'google_tg','<a href="http://google.tg/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Togo ( catchall )</a>',

-+'www_google_tk','<a href="http://www.google.tk/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Tokelau</a>',

-+'images_google_tk','<a href="http://images.google.tk/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Tokelau ( images )</a>',

-+'translate_google_tk','<a href="http://translate.google.tk/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Translate Tokelau</a>',

-+'google_tk','<a href="http://google.tk/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Tokelau ( catchall )</a>',

-+'www_google_tl','<a href="http://www.google.tl/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Timor-Leste</a>',

-+'images_google_tl','<a href="http://images.google.tl/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Timor-Leste ( images )</a>',

-+'translate_google_tl','<a href="http://translate.google.tl/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Translate Timor-Leste</a>',

-+'google_tl','<a href="http://google.tl/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Timor-Leste ( catchall )</a>',

-+'www_google_tm','<a href="http://www.google.tm/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Turkmenistan</a>',

-+'images_google_tm','<a href="http://images.google.tm/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Turkmenistan ( images )</a>',

-+'translate_google_tm','<a href="http://translate.google.tm/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Translate Turkmenistan</a>',

-+'google_tm','<a href="http://google.tm/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Turkmenistan ( catchall )</a>',

-+'www_google_tn','<a href="http://www.google.tn/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Tunisia</a>',

-+'images_google_tn','<a href="http://images.google.tn/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Tunisia ( images )</a>',

-+'translate_google_tn','<a href="http://translate.google.tn/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Translate Tunisia</a>',

-+'google_tn','<a href="http://google.tn/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Tunisia ( catchall )</a>',

-+'www_google_to','<a href="http://www.google.to/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Tonga</a>',

-+'images_google_to','<a href="http://images.google.to/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Tonga ( images )</a>',

-+'translate_google_to','<a href="http://translate.google.to/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Translate Tonga</a>',

-+'google_to','<a href="http://google.to/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Tonga ( catchall )</a>',

-+'www_google_tt','<a href="http://www.google.tt/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Trinidad and Tobago</a>',

-+'images_google_tt','<a href="http://images.google.tt/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Trinidad and Tobago ( images )</a>',

-+'translate_google_tt','<a href="http://translate.google.tt/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Translate Trinidad and Tobago</a>',

-+'google_tt','<a href="http://google.tt/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Trinidad and Tobago ( catchall )</a>',

-+'www_google_us','<a href="http://www.google.us/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google United States</a>',

-+'images_google_us','<a href="http://images.google.us/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google United States ( images )</a>',

-+'translate_google_us','<a href="http://translate.google.us/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Translate United States</a>',

-+'google_us','<a href="http://google.us/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google United States ( catchall )</a>',

-+'www_google_vg','<a href="http://www.google.vg/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google British Virgin Islands</a>',

-+'images_google_vg','<a href="http://images.google.vg/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google British Virgin Islands ( images )</a>',

-+'translate_google_vg','<a href="http://translate.google.vg/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Translate British Virgin Islands</a>',

-+'google_vg','<a href="http://google.vg/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google British Virgin Islands ( catchall )</a>',

-+'www_google_vu','<a href="http://www.google.vu/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Vanuatu</a>',

-+'images_google_vu','<a href="http://images.google.vu/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Vanuatu ( images )</a>',

-+'translate_google_vu','<a href="http://translate.google.vu/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Translate Vanuatu</a>',

-+'google_vu','<a href="http://google.vu/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Vanuatu ( catchall )</a>',

-+'www_google_ws','<a href="http://www.google.ws/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Samoa</a>',

-+'images_google_ws','<a href="http://images.google.ws/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Samoa ( images )</a>',

-+'translate_google_ws','<a href="http://translate.google.ws/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Translate Samoa</a>',

-+'google_ws','<a href="http://google.ws/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Samoa ( catchall )</a>',

- 

--'google_cache','<a href="http://www.google.com/help/features.html#cached" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google (cache)</a>',

--'google_froogle','<a href="http://froogle.google.com/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Froogle (Google)</a>',

--'google_groups','<a href="http://groups.google.com/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google (Groups)</a>',

--'google_maps','<a href="http://maps.google.co.uk/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Maps</a>',

--'googleByIP','<a href="http://173.194.35.177/" rel="nofollow" title="Google (Access by IP-Address) [new window]" target="_blank">Google (Access by IP-Address)</a>',

--'google_catchall','<a href="http://www.google.com/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google catchall sites not specified</a>',

--'google_products','<a href="http://www.google.com/products" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google (Products)</a>',

--'google_translate','<a href="http://translate.google.com/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Google Translate ( catchall )</a>',

--'google4counter','<a href="http://www.4-counter.com/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">4-counter (Google)</a>',

-+'google_cache','<a href="http://www.google.com/help/features.html#cached" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google (cache)</a>',

-+'google_froogle','<a href="http://froogle.google.com/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Froogle (Google)</a>',

-+'google_groups','<a href="http://groups.google.com/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google (Groups)</a>',

-+'google_maps','<a href="http://maps.google.co.uk/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Maps</a>',

-+'googleByIP','<a href="http://173.194.35.177/" rel="nofollow noopener noreferrer" title="Google (Access by IP-Address) [new window]" target="_blank">Google (Access by IP-Address)</a>',

-+'google_catchall','<a href="http://www.google.com/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google catchall sites not specified</a>',

-+'google_products','<a href="http://www.google.com/products" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google (Products)</a>',

-+'google_translate','<a href="http://translate.google.com/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Google Translate ( catchall )</a>',

-+'google4counter','<a href="http://www.4-counter.com/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">4-counter (Google)</a>',

- 

- '1klik','1Klik',

--'1search','<a href="http://1search-board.com/" rel="nofollow" target="_blank">1search-board.com</a>',

--'1und1_de','<a href="http://suche.1und1.de/" rel="nofollow" title="1&amp;1 Suche [new window]" target="_blank">1&1 Suche (subdomain "suche")</a>',

--'3721','<a href="http://www.3721.com/" rel="nofollow" target="_blank">3721</a>',

--'a9', '<a href="http://www.a9.com/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">A9</a>',

-+'1search','<a href="http://1search-board.com/" rel="nofollow noopener noreferrer" target="_blank">1search-board.com</a>',

-+'1und1_de','<a href="http://suche.1und1.de/" rel="nofollow noopener noreferrer" title="1&amp;1 Suche [new window]" target="_blank">1&1 Suche (subdomain "suche")</a>',

-+'3721','<a href="http://www.3721.com/" rel="nofollow noopener noreferrer" target="_blank">3721</a>',

-+'a9', '<a href="http://www.a9.com/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">A9</a>',

- 'abacho','Abacho',

- 'accoona','<a href="http://cn.accoona.com">Accoona</a>',

--'alexa','<a href="http://www.alexa.com/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Alexa</a>',

--'aliceit','<a href="http://www.alice.it/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">alice.it</a>',

--'aliceitmaster','<a href="http://www.alice.it/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">search.alice.it.master</a>',

-+'alexa','<a href="http://www.alexa.com/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Alexa</a>',

-+'aliceit','<a href="http://www.alice.it/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">alice.it</a>',

-+'aliceitmaster','<a href="http://www.alice.it/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">search.alice.it.master</a>',

- 'allesklar','allesklar.de',

--'allgameshome','<a href="http://my.allgameshome.com/" rel="nofollow" title="AllGamesHome [new window]" target="_blank">AllGamesHome</a>',

--'alltheweb','<a href="http://www.alltheweb.com/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">AllTheWeb</a>',

-+'allgameshome','<a href="http://my.allgameshome.com/" rel="nofollow noopener noreferrer" title="AllGamesHome [new window]" target="_blank">AllGamesHome</a>',

-+'alltheweb','<a href="http://www.alltheweb.com/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">AllTheWeb</a>',

- 'alot','alot',

--'altavista','<a href="http://www.altavista.com/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">AltaVista</a>',

-+'altavista','<a href="http://www.altavista.com/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">AltaVista</a>',

- 'amazon','amazon',

--'androidsearch','<a href="http://www.androidsearch.com/" rel="nofollow" title="androidsearch.com [new window]" target="_blank">androidsearch.com</a>',

--'answerbus','<a href="http://www.answerbus.com/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Answerbus</a>',

--'anzwers','<a href="http://anzwers.com.au/" title="anzwers.com.au home page [new window]" rel="nofollow" target="_blank">anzwers.com.au</a>',

-+'androidsearch','<a href="http://www.androidsearch.com/" rel="nofollow noopener noreferrer" title="androidsearch.com [new window]" target="_blank">androidsearch.com</a>',

-+'answerbus','<a href="http://www.answerbus.com/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Answerbus</a>',

-+'anzwers','<a href="http://anzwers.com.au/" title="anzwers.com.au home page [new window]" rel="nofollow noopener noreferrer" target="_blank">anzwers.com.au</a>',

- 'aol_o2suche_de','AOL O2Suche (de)', 

--'aolcatchall','<a href="http://search.aol.com/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">AOL catchall countries</a>',

--'aolcom','<a href="http://search.aol.com/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">AOL .com</a>',

--'aolde','<a href="http://suche.aol.de/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">AOL .de</a>',

-+'aolcatchall','<a href="http://search.aol.com/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">AOL catchall countries</a>',

-+'aolcom','<a href="http://search.aol.com/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">AOL .com</a>',

-+'aolde','<a href="http://suche.aol.de/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">AOL .de</a>',

- 'aolfr','AOL (fr)', 

--'aolpl','<a href="http://search.aol.pl/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">AOL .pl</a>',

--'aolsearchde','<a href="http://de.aolsearch.com/" rel="nofollow" title="AOL Search Home Page [new window]" target="_blank">AOL Search de</a>',

--'aoluk','<a href="http://search.aol.co.uk/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">AOL .uk</a>',

-+'aolpl','<a href="http://search.aol.pl/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">AOL .pl</a>',

-+'aolsearchde','<a href="http://de.aolsearch.com/" rel="nofollow noopener noreferrer" title="AOL Search Home Page [new window]" target="_blank">AOL Search de</a>',

-+'aoluk','<a href="http://search.aol.co.uk/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">AOL .uk</a>',

- 'aport','Aport',

--'arianna','<a href="http://arianna.libero.it/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Arianna</a>',

--'asevenboard','<a href="http://asevenboard.com/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">asevenboard</a>',

--'askcatchall','<a href="http://www.ask.com/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Ask catchall sites</a>',

--'askde','<a href="http://de.ask.com/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Ask Deutschland</a>',

--'askes','<a href="http://es.ask.com/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Ask Espana</a>', # break out Ask country specific engines.

--'askfr','<a href="http://fr.ask.com/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Ask France</a>',

-+'arianna','<a href="http://arianna.libero.it/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Arianna</a>',

-+'asevenboard','<a href="http://asevenboard.com/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">asevenboard</a>',

-+'askcatchall','<a href="http://www.ask.com/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Ask catchall sites</a>',

-+'askde','<a href="http://de.ask.com/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Ask Deutschland</a>',

-+'askes','<a href="http://es.ask.com/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Ask Espana</a>', # break out Ask country specific engines.

-+'askfr','<a href="http://fr.ask.com/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Ask France</a>',

- 'askimages','ask images',

--'askit','<a href="http://it.ask.com/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Ask Italia</a>',

--'askjp','<a href="http://www.ask.jp/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Ask Japan</a>',

--'asknl','<a href="http://nl.ask.com/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Ask Nederland</a>',

--'askuk','<a href="http://uk.ask.com/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Ask UK</a>',

-+'askit','<a href="http://it.ask.com/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Ask Italia</a>',

-+'askjp','<a href="http://www.ask.jp/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Ask Japan</a>',

-+'asknl','<a href="http://nl.ask.com/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Ask Nederland</a>',

-+'askuk','<a href="http://uk.ask.com/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Ask UK</a>',

- 'atlanticbb','atlanticbb',

- 'atlas','Atlas.cz',

- 'atomz','Atomz',

--'att','<a href="http://www.att.net/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">AT&T search (powered by Google)</a>',

-+'att','<a href="http://www.att.net/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">AT&T search (powered by Google)</a>',

- 'auone','auone',

--'avantfind','<a href="http://www.avantfind.com/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Avantfind</a>',

-+'avantfind','<a href="http://www.avantfind.com/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Avantfind</a>',

- 'avg','avg',

--'babylon','<a href="http://search.babylon.com/" title="search.babylon.com" rel="nofollow" target="_blank">Babylon</a>',

--'baidu','<a href="http://www.baidu.com/" rel="nofollow" target="_blank">Baidu</a>',

-+'babylon','<a href="http://search.babylon.com/" title="search.babylon.com" rel="nofollow noopener noreferrer" target="_blank">Babylon</a>',

-+'baidu','<a href="http://www.baidu.com/" rel="nofollow noopener noreferrer" target="_blank">Baidu</a>',

- 'bbc','BBC', 

--'benefind','<a href="http://www.benefind.de/" rel="nofollow" title="benefind Home Page [new window]" target="_blank">benefind</a>',

--'biglotron','<a href="http://www.biglotron.com/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Biglotron</a>',

--'bing','<a href="http://www.bing.com/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Bing</a>',

-+'benefind','<a href="http://www.benefind.de/" rel="nofollow noopener noreferrer" title="benefind Home Page [new window]" target="_blank">benefind</a>',

-+'biglotron','<a href="http://www.biglotron.com/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Biglotron</a>',

-+'bing','<a href="http://www.bing.com/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Bing</a>',

- 'blekko','blekko',

--'blingo','<a href="http://www.blingo.com/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Blingo</a>',

-+'blingo','<a href="http://www.blingo.com/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Blingo</a>',

- 'bluewin','bluewin',

- 'bt','BT',

--'bungeebonesdotcom','<a href="http://BungeeBones.com/search.php/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">BungeeBones</a>',

--'centraldatabase','<a href="http://search.centraldatabase.org/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">GPU p2p search</a>',

-+'bungeebonesdotcom','<a href="http://BungeeBones.com/search.php/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">BungeeBones</a>',

-+'centraldatabase','<a href="http://search.centraldatabase.org/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">GPU p2p search</a>',

- 'centrum','Centrum.cz', 

- 'centurylink','centurylink',

--'certifiedtoolbarsearch','<a href="http://search.certified-toolbar.com/" rel="nofollow" title="Certified-Toolbar Search [new window]" target="_blank">Certified-Toolbar Search</a>',

-+'certifiedtoolbarsearch','<a href="http://search.certified-toolbar.com/" rel="nofollow noopener noreferrer" title="Certified-Toolbar Search [new window]" target="_blank">Certified-Toolbar Search</a>',

- 'charter','charter',

- 'chatzum','chatzum',

- 'checkparams','checkparams',

--'chelloat','<a href="http://www.chello.at/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Chello Austria</a>',

--'chellobe','<a href="http://www.chello.be/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Chello Belgium</a>',

--'chellocom','<a href="http://www.chello.com/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Chello (Country not recognized)</a>',

--'chellocz','<a href="http://www.chello.cz/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Chello Czech Republic</a>',

--'chellofr','<a href="http://www.chello.fr/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Chello France</a>',

--'chellohu','<a href="http://www.chello.hu/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Chello Hungary</a>',

--'chellonl','<a href="http://www.chello.nl/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Chello Netherlands</a>',

--'chellono','<a href="http://www.chello.no/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Chello Norway</a>',

--'chellopl','<a href="http://www.chello.pl/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Chello Poland</a>',

--'chellose','<a href="http://www.chello.se/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Chello Sweden</a>',

--'chellosk','<a href="http://www.chello.sk/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Chello Slovakia</a>',

--'clarosearch','<a href="http://www.claro-search.com/" rel="nofollow" title="Search Engine Home Page [new window]" target="_blank">Claro Search</a>',

-+'chelloat','<a href="http://www.chello.at/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Chello Austria</a>',

-+'chellobe','<a href="http://www.chello.be/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Chello Belgium</a>',

-+'chellocom','<a href="http://www.chello.com/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Chello (Country not recognized)</a>',

-+'chellocz','<a href="http://www.chello.cz/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Chello Czech Republic</a>',

-+'chellofr','<a href="http://www.chello.fr/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Chello France</a>',

-+'chellohu','<a href="http://www.chello.hu/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Chello Hungary</a>',

-+'chellonl','<a href="http://www.chello.nl/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Chello Netherlands</a>',

-+'chellono','<a href="http://www.chello.no/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Chello Norway</a>',

-+'chellopl','<a href="http://www.chello.pl/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Chello Poland</a>',

-+'chellose','<a href="http://www.chello.se/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Chello Sweden</a>',

-+'chellosk','<a href="http://www.chello.sk/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Chello Slovakia</a>',

-+'clarosearch','<a href="http://www.claro-search.com/" rel="nofollow noopener noreferrer" title="Search Engine Home Page [new window]" target="_blank">Claro Search</a>',

- 'clinck','clinck',

- 'clubinternet', 'Club-internet',

--'clusty','<a href="http://www.clusty.com/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Clusty</a>',

-+'clusty','<a href="http://www.clusty.com/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Clusty</a>',

- 'comcast','comcast',

--'comettoolbar','<a href="http://as.starware.com/dp/search" title="Comet toolbar search home page [new window]" rel="nofollow" target="_blank">Comet toolbar search</a>',

-+'comettoolbar','<a href="http://as.starware.com/dp/search" title="Comet toolbar search home page [new window]" rel="nofollow noopener noreferrer" target="_blank">Comet toolbar search</a>',

- 'conduit','conduit',

--'copernic','<a href="http://www.copernic.com/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Copernic</a>',

--'crawler','<a href="http://www.crawler.com/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">crawler.com</a>',

-+'copernic','<a href="http://www.copernic.com/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Copernic</a>',

-+'crawler','<a href="http://www.crawler.com/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">crawler.com</a>',

- 'ctrouve','C\'est trouve', 

--'dalesearch','<a href="http://www.dalesearch.com/" rel="nofollow" title="Dale Search [new window]" target="_blank">Dale Search</a>',

-+'dalesearch','<a href="http://www.dalesearch.com/" rel="nofollow noopener noreferrer" title="Dale Search [new window]" target="_blank">Dale Search</a>',

- 'danielsen','Thor (danielsen.com)', 

- 'daum','daum',

--'de_dolphin_com','<a href="http://de.dolphin.com/" rel="nofollow" title="Dolphin Search search page [new window]" target="_blank">Dolphin Search</a>',

--'de_wiki_gov_cn','<a href="http://de.wiki.gov.cn/" rel="nofollow" title="Wiki Sucher [new window]" target="_blank">Wiki Sucher</a>',

-+'de_dolphin_com','<a href="http://de.dolphin.com/" rel="nofollow noopener noreferrer" title="Dolphin Search search page [new window]" target="_blank">Dolphin Search</a>',

-+'de_wiki_gov_cn','<a href="http://de.wiki.gov.cn/" rel="nofollow noopener noreferrer" title="Wiki Sucher [new window]" target="_blank">Wiki Sucher</a>',

- 'dejanews','DejaNews',

--'delicious','<a href="http://del.icio.us/" title="del.icio.us home page [new window]" rel="nofollow" target="_blank">del.icio.us</a> (Social Bookmark)',

-+'delicious','<a href="http://del.icio.us/" title="del.icio.us home page [new window]" rel="nofollow noopener noreferrer" target="_blank">del.icio.us</a> (Social Bookmark)',

- 'delta-search','delta-search',

--'digg','<a href="http://www.digg.com/" title="Digg home page [new window]" rel="nofollow" target="_blank">Digg</a> (Social Bookmark)',

--'dmoz','<a href="http://dmoz.org/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">DMOZ</a>',

--'dodajpl','<a href="http://www.dodaj.pl/" title="Dodaj.pl home page [new window]" rel="nofollow" target="_blank">Dodaj.pl</a>',

--'dogpile','<a href="http://www.dogpile.com/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Dogpile</a>',

--'duckduckgo','<a href="http://r.duckduckgo.com/" rel="nofollow" title="DuckDuckGo Home Page [new window]" target="_blank">DuckDuckGo</a>',

-+'digg','<a href="http://www.digg.com/" title="Digg home page [new window]" rel="nofollow noopener noreferrer" target="_blank">Digg</a> (Social Bookmark)',

-+'dmoz','<a href="http://dmoz.org/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">DMOZ</a>',

-+'dodajpl','<a href="http://www.dodaj.pl/" title="Dodaj.pl home page [new window]" rel="nofollow noopener noreferrer" target="_blank">Dodaj.pl</a>',

-+'dogpile','<a href="http://www.dogpile.com/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Dogpile</a>',

-+'duckduckgo','<a href="http://r.duckduckgo.com/" rel="nofollow noopener noreferrer" title="DuckDuckGo Home Page [new window]" target="_blank">DuckDuckGo</a>',

- 'earthlink', 'Earth Link',

--'easysearch','<a href="http://heatherjeffery.easysearch.org.uk/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">easysearch</a>',

-+'easysearch','<a href="http://heatherjeffery.easysearch.org.uk/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">easysearch</a>',

- 'ecosia','ecosia',

- 'edderkoppen','Edderkoppen', 

- 'engine','Cade', 

--'eniro','<a href="http://www.eniro.no/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Eniro</a>',

--'enirose','<a href="http://www.eniro.se/" title="Eniro Sverige home page [new window]" rel="nofollow" target="_blank">Eniro Sverige</a>',

-+'eniro','<a href="http://www.eniro.no/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Eniro</a>',

-+'enirose','<a href="http://www.eniro.se/" title="Eniro Sverige home page [new window]" rel="nofollow noopener noreferrer" target="_blank">Eniro Sverige</a>',

- 'ereadingsource','ereadingsource',

--'etools_ch','<a href="http://www.etools.ch/" rel="nofollow" title="eTools.ch [new window]" target="_blank">eTools.ch</a>',

-+'etools_ch','<a href="http://www.etools.ch/" rel="nofollow noopener noreferrer" title="eTools.ch [new window]" target="_blank">eTools.ch</a>',

- 'euroseek','Euroseek',

- 'everyclick','everyclick',

--'excite','<a href="http://www.excite.com/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Excite</a>',

-+'excite','<a href="http://www.excite.com/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Excite</a>',

- 'facemoods','facemoods',

--'fastbot_de','<a href="http://fastbot.de/" rel="nofollow" title="Fastbot.de [new window]" target="_blank">Fastbot.de (Does not provide search keyphrases; using found page instead)</a>',

--'fbdownloader','<a href="http://search.fbdownloader.com/" rel="nofollow" title="FBDownloader Home Page [new window]" target="_blank">FBDownloader (fbdownloader)</a>',

--'fdownloadr_com','<a href="http://search.fdownloadr.com/" rel="nofollow" title="FBDownloader Home Page [new window]" target="_blank">FBDownloader (fdownloadr)</a>',

--'find1friend','<a href="http://find1friend.com/" rel="nofollow" title="Find1Friend [new window]" target="_blank">Find1Friend</a>',

-+'fastbot_de','<a href="http://fastbot.de/" rel="nofollow noopener noreferrer" title="Fastbot.de [new window]" target="_blank">Fastbot.de (Does not provide search keyphrases; using found page instead)</a>',

-+'fbdownloader','<a href="http://search.fbdownloader.com/" rel="nofollow noopener noreferrer" title="FBDownloader Home Page [new window]" target="_blank">FBDownloader (fbdownloader)</a>',

-+'fdownloadr_com','<a href="http://search.fdownloadr.com/" rel="nofollow noopener noreferrer" title="FBDownloader Home Page [new window]" target="_blank">FBDownloader (fdownloadr)</a>',

-+'find1friend','<a href="http://find1friend.com/" rel="nofollow noopener noreferrer" title="Find1Friend [new window]" target="_blank">Find1Friend</a>',

- 'findamo','findamo',

- 'findarticles','Find Articles',

- 'finddk','Find', 

- 'fireball','fireball',

--'flipora','<a href="http://static.flipora.com/" rel="nofollow" title="Flipora Home Page [new window]" target="_blank">Flipora</a>',

-+'flipora','<a href="http://static.flipora.com/" rel="nofollow noopener noreferrer" title="Flipora Home Page [new window]" target="_blank">Flipora</a>',

- 'foxstart','foxstart',

- 'francite','Francite', 

- 'free', 'Free.fr', 

--'freenet_de','<a href="http://suche.freenet.de/" rel="nofollow" title="suche.freenet.de [new window]" target="_blank">suche.freenet.de</a>',

-+'freenet_de','<a href="http://suche.freenet.de/" rel="nofollow noopener noreferrer" title="suche.freenet.de [new window]" target="_blank">suche.freenet.de</a>',

- 'freeserve','Freeserve', 

- 'funmoods','funmoods',

--'gazetapl','<a href="http://szukaj.gazeta.pl/" title="Gazeta.pl home page [new window]" rel="nofollow" target="_blank">Gazeta.pl</a>',

--'genieo','<a href="http://search.genieo.com/" rel="nofollow" title="Genieo home page [new window]" target="_blank">Genieo</a>',

--'gerypl','<a href="http://szukaj.gery.pl/" title="Gery.pl home page [new window]" rel="nofollow" target="_blank">Gery.pl</a>',

-+'gazetapl','<a href="http://szukaj.gazeta.pl/" title="Gazeta.pl home page [new window]" rel="nofollow noopener noreferrer" target="_blank">Gazeta.pl</a>',

-+'genieo','<a href="http://search.genieo.com/" rel="nofollow noopener noreferrer" title="Genieo home page [new window]" target="_blank">Genieo</a>',

-+'gerypl','<a href="http://szukaj.gery.pl/" title="Gery.pl home page [new window]" rel="nofollow noopener noreferrer" target="_blank">Gery.pl</a>',

- 'globososo','Globososo',

--'gmxsuche','<a href="http://suche.gmx.net/" rel="nofollow" title="GMX Suche Home Page [new window]" target="_blank">GMX Suche</a>',

--'gmxsuche_at','<a href="http://suche.gmx.at/" rel="nofollow" title="GMX Suche Oesterreich Home Page [new window]" target="_blank">GMX Suche Oesterreich</a>',

-+'gmxsuche','<a href="http://suche.gmx.net/" rel="nofollow noopener noreferrer" title="GMX Suche Home Page [new window]" target="_blank">GMX Suche</a>',

-+'gmxsuche_at','<a href="http://suche.gmx.at/" rel="nofollow noopener noreferrer" title="GMX Suche Oesterreich Home Page [new window]" target="_blank">GMX Suche Oesterreich</a>',

- 'go','Go.com',

--'go_mail_ru','<a href="http://go.mail.ru/" rel="nofollow" title="GMX Suche Oesterreich Home Page [new window]" target="_blank">Go.Mail.ru</a>',

-+'go_mail_ru','<a href="http://go.mail.ru/" rel="nofollow noopener noreferrer" title="GMX Suche Oesterreich Home Page [new window]" target="_blank">Go.Mail.ru</a>',

- 'go2net','Go2Net (Metamoteur)',

- 'godado','Godado.it',

- 'goliat','Goliat', 

--'goodsearch','<a href="http://www.goodsearch.com/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">GoodSearch</a>',

--'gotuneed','<a href="http://www.gotuneed.com/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">got u need</a>',

--'govome','<a href="http://www.govome.com/" rel="nofollow" title="Govome [new window]" target="_blank">Govome</a>',

-+'goodsearch','<a href="http://www.goodsearch.com/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">GoodSearch</a>',

-+'gotuneed','<a href="http://www.gotuneed.com/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">got u need</a>',

-+'govome','<a href="http://www.govome.com/" rel="nofollow noopener noreferrer" title="Govome [new window]" target="_blank">Govome</a>',

- 'haku','Ihmemaa',

- 'handycafe','handycafe',

- 'heureka','Heureka', 

--'hogapl','<a href="http://www.hoga.pl/" title="Hoga.pl home page [new window]" rel="nofollow" target="_blank">Hoga.pl</a>',

--'holasearch','<a href="http://www.holasearch.com" rel="nofollow" title="Hola Search Home Page [new window]" target="_blank">Hola Search</a>',

-+'hogapl','<a href="http://www.hoga.pl/" title="Hoga.pl home page [new window]" rel="nofollow noopener noreferrer" target="_blank">Hoga.pl</a>',

-+'holasearch','<a href="http://www.holasearch.com" rel="nofollow noopener noreferrer" title="Hola Search Home Page [new window]" target="_blank">Hola Search</a>',

- 'hotbot','Hotbot',

- 'hp_my_aol','hp my aol',

- 'hubwe','hubwe',

--'iask','<a href="http://www.iask.com/" rel="nofollow" target="_blank">Iask</a>',

--'iboats','<a href="http://forums.iboats.com/" title="forum home page [new window]" rel="nofollow" target="_blank">Iboats</a>',

--'icerocket','<a href="http://www.icerocket.com/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Icerocket (Blog)</a>',

--'ichiro','<a href="http://search.goo.ne.jp/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Ichiro</a>',

--'icq','<a href="http://www.icq.com/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">icq</a>',

-+'iask','<a href="http://www.iask.com/" rel="nofollow noopener noreferrer" target="_blank">Iask</a>',

-+'iboats','<a href="http://forums.iboats.com/" title="forum home page [new window]" rel="nofollow noopener noreferrer" target="_blank">Iboats</a>',

-+'icerocket','<a href="http://www.icerocket.com/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Icerocket (Blog)</a>',

-+'ichiro','<a href="http://search.goo.ne.jp/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Ichiro</a>',

-+'icq','<a href="http://www.icq.com/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">icq</a>',

- 'ilse','Ilse',

--'iminent','<a href="http://start.iminent.com/" rel="nofollow" title="Iminent Home Page [new window]" target="_blank">Iminent</a>',

-+'iminent','<a href="http://start.iminent.com/" rel="nofollow noopener noreferrer" title="Iminent Home Page [new window]" target="_blank">Iminent</a>',

- 'inbox','inbox',

- 'incredibar','incredibar',

- 'incredimail','incredimail',

- 'indexhu','Index', 

--'ineffabile','<a href="http://www.ineffabile.it/" title="Ineffabile.it home page [new window]" rel="nofollow" target="_blank">Ineffabile.it</a> (Social Bookmark)',

-+'ineffabile','<a href="http://www.ineffabile.it/" title="Ineffabile.it home page [new window]" rel="nofollow noopener noreferrer" target="_blank">Ineffabile.it</a> (Social Bookmark)',

- 'infoseek','Infoseek',

- 'infospace','InfoSpace',

--'infouk','<a href="http://info.co.uk/" title="home page [new window]" rel="nofollow" target="_blank">Info UK</a>',

--'inspsearch','<a href="http://airzip.inspsearch.com/" rel="nofollow" title="airzip.inspsearch.com [new window]" target="_blank">airzip.inspsearch.com</a>',

--'int_search_myway_com','<a href="http://int.search.myway.com/" rel="nofollow" title="MyWay search page [new window]" target="_blank">MyWay</a>',

--'interiapl','<a href="http://www.google.interia.pl/" title="Interia.pl home page [new window]" rel="nofollow" target="_blank">Interia.pl</a>',

-+'infouk','<a href="http://info.co.uk/" title="home page [new window]" rel="nofollow noopener noreferrer" target="_blank">Info UK</a>',

-+'inspsearch','<a href="http://airzip.inspsearch.com/" rel="nofollow noopener noreferrer" title="airzip.inspsearch.com [new window]" target="_blank">airzip.inspsearch.com</a>',

-+'int_search_myway_com','<a href="http://int.search.myway.com/" rel="nofollow noopener noreferrer" title="MyWay search page [new window]" target="_blank">MyWay</a>',

-+'interiapl','<a href="http://www.google.interia.pl/" title="Interia.pl home page [new window]" rel="nofollow noopener noreferrer" target="_blank">Interia.pl</a>',

- 'internetto','Internetto Kereso',

--'isearch_nation_com','<a href="http://isearch.nation.com/" rel="nofollow" title="Nation Search [new window]" target="_blank">Nation Search</a>',

--'iune','<a href="http://www.i-une.com/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">i-une</a>',

--'ixquick','<a href="http://www.ixquick.com/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">ix quick</a>', 

-+'isearch_nation_com','<a href="http://isearch.nation.com/" rel="nofollow noopener noreferrer" title="Nation Search [new window]" target="_blank">Nation Search</a>',

-+'iune','<a href="http://www.i-une.com/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">i-une</a>',

-+'ixquick','<a href="http://www.ixquick.com/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">ix quick</a>', 

- 'izito_catchall','izito ( catchall )', 

--'izito_de','<a href="http://www.izito.de/" rel="nofollow" title="iZito Deutschland [new window]" target="_blank">izito .de</a>', 

--'izito_uk','<a href="http://www.izito.co.uk/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">izito .uk</a>', 

-+'izito_de','<a href="http://www.izito.de/" rel="nofollow noopener noreferrer" title="iZito Deutschland [new window]" target="_blank">izito .de</a>', 

-+'izito_uk','<a href="http://www.izito.co.uk/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">izito .uk</a>', 

- 'jubii','Jubii', 

- 'jumpyit','Jumpy.it',

--'juno','<a href="http://search.juno.com/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">juno</a>', 

-+'juno','<a href="http://search.juno.com/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">juno</a>', 

- 'jyxo','Jyxo.cz', 

--'kartoo','<a href="http://www.kartoo.com/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Kartoo</a>',

--'katalogonetpl','<a href="http://katalog.onet.pl/" title="Katalog.Onet.pl home page [new window]" rel="nofollow" target="_blank">Katalog.Onet.pl</a>',

--'kataweb','<a href="http://www.kataweb.it/ricerca/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Kataweb</a>',

--'keresolap_hu','<a href="http://keresolap.hu/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Tango keresolap</a>',

-+'kartoo','<a href="http://www.kartoo.com/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Kartoo</a>',

-+'katalogonetpl','<a href="http://katalog.onet.pl/" title="Katalog.Onet.pl home page [new window]" rel="nofollow noopener noreferrer" target="_blank">Katalog.Onet.pl</a>',

-+'kataweb','<a href="http://www.kataweb.it/ricerca/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Kataweb</a>',

-+'keresolap_hu','<a href="http://keresolap.hu/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Tango keresolap</a>',

- 'kvasir','kvasir',

- 'kvitters','kvitters',

- 'lapkereso_hu','Startlapkereso', 

- 'lbb','LBB', 

--'ledix','<a href="http://www.ledix.net/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Ledix</a>',

--'libero','<a href="http://www.libero.it/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Libero IT</a>',

-+'ledix','<a href="http://www.ledix.net/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Ledix</a>',

-+'libero','<a href="http://www.libero.it/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Libero IT</a>',

- 'libertysurf', 'Libertysurf', 

--'live','<a href="http://www.live.com/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Microsoft Windows Live</a>',

--'localmoxie','<a href="http://www.localmoxie.com/" rel="nofollow" title="Local Moxie [new window]" target="_blank">Local Moxie</a>',

-+'live','<a href="http://www.live.com/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Microsoft Windows Live</a>',

-+'localmoxie','<a href="http://www.localmoxie.com/" rel="nofollow noopener noreferrer" title="Local Moxie [new window]" target="_blank">Local Moxie</a>',

- 'looksmart_catchall','looksmart ( catchall )',

- 'looksmart_co_uk','looksmart .co.uk',

--'lycos','<a href="http://www.lycos.com/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Lycos</a>',

-+'lycos','<a href="http://www.lycos.com/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Lycos</a>',

- 'mamma','Mamma',

- 'meinestadt','meinestadt.de', 

- 'metabot', 'MetaBot',

- 'metacrawler','metacrawler',

- 'metacrawler_de','metacrawler.de',

--'metager','<a href="http://www.metager.de" rel="nofollow" title="MetaGer Home Page [new window]" target="_blank">MetaGer</a>',

-+'metager','<a href="http://www.metager.de" rel="nofollow noopener noreferrer" title="MetaGer Home Page [new window]" target="_blank">MetaGer</a>',

- 'metahannover','uni-hannover.de',

- 'metasearch','metasearch',

- 'metaspinner','metaspinner',

--'metasuche_ch','<a href="http://www.metasuche.ch/" rel="nofollow" title="Metasuche search page [new window]" target="_blank">Metasuche.ch</a>',

-+'metasuche_ch','<a href="http://www.metasuche.ch/" rel="nofollow noopener noreferrer" title="Metasuche search page [new window]" target="_blank">Metasuche.ch</a>',

- 'metaua','meta.ua',

- 'miner','Meta Miner',

--'mirago','<a href="http://www.mirago.com/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Mirago (country unknown)</a>',

--'miragobe','<a href="http://www.mirago.be/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Mirago Belgium</a>',

--'miragoch','<a href="http://www.mirago.ch/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Mirago Switzerland</a>',

--'miragocouk','<a href="http://zone.mirago.co.uk/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Mirago UK</a>',

--'miragode','<a href="http://www.mirago.de/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Mirago Germany</a>',

--'miragodk','<a href="http://www.mirago.dk/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Mirago Denmark</a>',

--'miragoes','<a href="http://es.mirago.com/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Mirago Spain</a>',

--'miragofr','<a href="http://www.mirago.fr/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Mirago France</a>',

--'miragoit','<a href="http://www.mirago.it/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Mirago Italy</a>',

--'miragonl','<a href="http://www.mirago.nl/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Mirago Netherlands</a>',

--'miragono','<a href="http://no.mirago.com/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Mirago Norway</a>',

--'miragose','<a href="http://www.mirago.se/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Mirago Sweden</a>',

-+'mirago','<a href="http://www.mirago.com/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Mirago (country unknown)</a>',

-+'miragobe','<a href="http://www.mirago.be/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Mirago Belgium</a>',

-+'miragoch','<a href="http://www.mirago.ch/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Mirago Switzerland</a>',

-+'miragocouk','<a href="http://zone.mirago.co.uk/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Mirago UK</a>',

-+'miragode','<a href="http://www.mirago.de/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Mirago Germany</a>',

-+'miragodk','<a href="http://www.mirago.dk/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Mirago Denmark</a>',

-+'miragoes','<a href="http://es.mirago.com/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Mirago Spain</a>',

-+'miragofr','<a href="http://www.mirago.fr/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Mirago France</a>',

-+'miragoit','<a href="http://www.mirago.it/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Mirago Italy</a>',

-+'miragonl','<a href="http://www.mirago.nl/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Mirago Netherlands</a>',

-+'miragono','<a href="http://no.mirago.com/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Mirago Norway</a>',

-+'miragose','<a href="http://www.mirago.se/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Mirago Sweden</a>',

- 'mitrasites','mitrasites',

--'mozbot','<a href="http://www.mozbot.fr/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Mozbot</a>',

--'msn','<a href="http://search.msn.com/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Microsoft MSN Search</a>',

--'mys_yoursearch_me','<a href="http://mys.yoursearch.me/" rel="nofollow" title="Yoursearch.me search page [new window]" target="_blank">Yoursearch.me</a>',

--'mysearch','<a href="http://www.mysearch.com" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">My Search</a>',

--'mysearchdial','<a href="http://start.mysearchdial.com/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">mysearchdial</a>',

--'mysearchresults','<a href="http://www.mysearchresults.com" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">mysearchresults</a>',

--'myway','<a href="http://search.myway.com" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">myway</a>',

--'mywebsearch','<a href="http://search.mywebsearch.com/" title="MyWebSearch home page [new window]" rel="nofollow" target="_blank">MyWebSearch</a>',

-+'mozbot','<a href="http://www.mozbot.fr/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Mozbot</a>',

-+'msn','<a href="http://search.msn.com/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Microsoft MSN Search</a>',

-+'mys_yoursearch_me','<a href="http://mys.yoursearch.me/" rel="nofollow noopener noreferrer" title="Yoursearch.me search page [new window]" target="_blank">Yoursearch.me</a>',

-+'mysearch','<a href="http://www.mysearch.com" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">My Search</a>',

-+'mysearchdial','<a href="http://start.mysearchdial.com/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">mysearchdial</a>',

-+'mysearchresults','<a href="http://www.mysearchresults.com" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">mysearchresults</a>',

-+'myway','<a href="http://search.myway.com" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">myway</a>',

-+'mywebsearch','<a href="http://search.mywebsearch.com/" title="MyWebSearch home page [new window]" rel="nofollow noopener noreferrer" target="_blank">MyWebSearch</a>',

- 'najdi','Najdi.to',

- 'nation','nation', 

--'navigationshilfe_t_online','<a href="http://navigationshilfe.t-online.de/" title="MyWebSearch home page [new window]" rel="nofollow" target="_blank">T-Online Navigationshilfe</a>',

-+'navigationshilfe_t_online','<a href="http://navigationshilfe.t-online.de/" title="MyWebSearch home page [new window]" rel="nofollow noopener noreferrer" target="_blank">T-Online Navigationshilfe</a>',

- 'nbci','NBCI',

--'netease', '<a href="http://www.163.com/" rel="nofollow" target="_blank">NetEase</a>',

--'netluchs','<a href="http://www.netluchs.de/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Netluchs</a>',

--'netscape','<a href="http://www.netscape.com/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Netscape</a>',

--'netsprintpl','<a href="http://www.netsprint.pl/" title="NetSprint.pl home page [new window]" rel="nofollow" target="_blank">NetSprint.pl</a>',

-+'netease', '<a href="http://www.163.com/" rel="nofollow noopener noreferrer" target="_blank">NetEase</a>',

-+'netluchs','<a href="http://www.netluchs.de/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Netluchs</a>',

-+'netscape','<a href="http://www.netscape.com/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Netscape</a>',

-+'netsprintpl','<a href="http://www.netsprint.pl/" title="NetSprint.pl home page [new window]" rel="nofollow noopener noreferrer" target="_blank">NetSprint.pl</a>',

- 'netstjernen','Netstjernen',

--'netzero','<a href="http://search.netzero.net/" title="home page [new window]" rel="nofollow" target="_blank">netzero</a>',

-+'netzero','<a href="http://search.netzero.net/" title="home page [new window]" rel="nofollow noopener noreferrer" target="_blank">netzero</a>',

- 'northernlight','NorthernLight',

--'nortonsavesearch','<a href="http://int.search-results.com/" rel="nofollow" title="Norton Safe Search Home Page [new window]" target="_blank">Norton Safe Search</a>',

--'nusearch','<a href="http://www.nusearch.com/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Nusearch</a>',

--'o2pl','<a href="http://szukaj2.o2.pl/" title="o2.pl home page [new window]" rel="nofollow" target="_blank">o2.pl</a>',

-+'nortonsavesearch','<a href="http://int.search-results.com/" rel="nofollow noopener noreferrer" title="Norton Safe Search Home Page [new window]" target="_blank">Norton Safe Search</a>',

-+'nusearch','<a href="http://www.nusearch.com/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Nusearch</a>',

-+'o2pl','<a href="http://szukaj2.o2.pl/" title="o2.pl home page [new window]" rel="nofollow noopener noreferrer" target="_blank">o2.pl</a>',

- 'ofir','Ofir',

--'oneseek_de','<a href="http://www.oneseek.de" rel="nofollow" title="Metasuchmaschine OneSeek.de [new window]" target="_blank">Metasuchmaschine OneSeek.de</a>',

--'onetpl','<a href="http://szukaj.onet.pl/" title="Onet.pl home page [new window]" rel="nofollow" target="_blank">Onet.pl</a>',

-+'oneseek_de','<a href="http://www.oneseek.de" rel="nofollow noopener noreferrer" title="Metasuchmaschine OneSeek.de [new window]" target="_blank">Metasuchmaschine OneSeek.de</a>',

-+'onetpl','<a href="http://szukaj.onet.pl/" title="Onet.pl home page [new window]" rel="nofollow noopener noreferrer" target="_blank">Onet.pl</a>',

- 'opasia','Opasia', 

- 'orange','orange',

- 'orangeworld','orangeworld',

-@@ -5293,216 +5293,216 @@
- 'overture','Overture',

- 'passagen','Evreka',

- 'pch','pch',

--'peoplecheck_de','<a href="http://peoplecheck.de/" rel="nofollow" title="PeopleCheck.de [new window]" target="_blank">PeopleCheck.de</a>',

--'picsearch','<a href="http://www.picsearch.de/" rel="nofollow" title="picsearch [new window]" target="_blank">picsearch</a>',

-+'peoplecheck_de','<a href="http://peoplecheck.de/" rel="nofollow noopener noreferrer" title="PeopleCheck.de [new window]" target="_blank">PeopleCheck.de</a>',

-+'picsearch','<a href="http://www.picsearch.de/" rel="nofollow noopener noreferrer" title="picsearch [new window]" target="_blank">picsearch</a>',

- 'pictures','pictures',

--'plusnetwork','<a href="http://www.searchplusnetwork.com/" title="Search Plus Network" rel="nofollow" target="_blank">Search Plus Network</a>',

--'pogodak','<a href="http://www.pogodak.com" title="Pogodak search engine home page [new window]" rel="nofollow" target="_blank">Pogodak.com</a>',

--'polskapl','<a href="http://szukaj.polska.pl/" title="Polska home page [new window]" rel="nofollow" target="_blank">Polska</a>',

--'polymeta_hu','<a href="http://www.polymeta.hu/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Polymeta</a>',

--'preciobarato_xyz','<a href="http://preciobarato.xyz/" rel="nofollow" title="preciobarato.xyz offline on Oct 2 2015 [new window]" target="_blank">preciobarato xyz</a>',

--'questionanswering','<a href="http://www.questionanswering.com/" title="Questionanswering home page [new window]" rel="nofollow" target="_blank">Questionanswering</a>',

-+'plusnetwork','<a href="http://www.searchplusnetwork.com/" title="Search Plus Network" rel="nofollow noopener noreferrer" target="_blank">Search Plus Network</a>',

-+'pogodak','<a href="http://www.pogodak.com" title="Pogodak search engine home page [new window]" rel="nofollow noopener noreferrer" target="_blank">Pogodak.com</a>',

-+'polskapl','<a href="http://szukaj.polska.pl/" title="Polska home page [new window]" rel="nofollow noopener noreferrer" target="_blank">Polska</a>',

-+'polymeta_hu','<a href="http://www.polymeta.hu/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Polymeta</a>',

-+'preciobarato_xyz','<a href="http://preciobarato.xyz/" rel="nofollow noopener noreferrer" title="preciobarato.xyz offline on Oct 2 2015 [new window]" target="_blank">preciobarato xyz</a>',

-+'questionanswering','<a href="http://www.questionanswering.com/" title="Questionanswering home page [new window]" rel="nofollow noopener noreferrer" target="_blank">Questionanswering</a>',

- 'quick','Quick.cz', 

--'qwant_com','<a href="https://www.qwant.com/" rel="nofollow" title="qwant.com [new window]" target="_blank">qwant.com</a>',

--'rakuten','<a href="http://websearch.rakuten.co.jp" rel="nofollow" title="websearch.rakuten.co.jp [new window]" target="_blank">websearch.rakuten.co.jp</a>',

-+'qwant_com','<a href="https://www.qwant.com/" rel="nofollow noopener noreferrer" title="qwant.com [new window]" target="_blank">qwant.com</a>',

-+'rakuten','<a href="http://websearch.rakuten.co.jp" rel="nofollow noopener noreferrer" title="websearch.rakuten.co.jp [new window]" target="_blank">websearch.rakuten.co.jp</a>',

- 'rambler','Rambler',

- 'redbox','RedBox.cz',

- 'rr','rr',

- 

--'safehomepage_com','<a href="http://searches.safehomepage.com/" rel="nofollow" title="safehomepage.com [new window]" target="_blank">safehomepage.com</a>',

--'sagool','<a href="http://sagool.jp/" title="Sagool home page [new window]" rel="nofollow" target="_blank">Sagool</a>',

--'sapo','<a href="http://www.sapo.pt/" title="Sapo search engine home page [new window]" rel="nofollow" target="_blank">Sapo</a>',

--'schoenerbrausen','<a href="http://www.schoenerbrausen.de/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Schoenerbrausen/</a>',

--'scroogle','<a href="http://www.scroogle.org/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Scroogle</a>',

--'search.com','<a href="http://www.search.com/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Search.com</a>',

--'search_1und1_de','<a href="http://search.1und1.de/" rel="nofollow" title="1&amp;1 Suche [new window]" target="_blank">1&1 Suche (subdomain "search")</a>',

--'search_foxtab_com','<a href="http://search.foxtab.com/" rel="nofollow" title="Foxtab Search [new window]" target="_blank">Foxtab Search</a>',

--'search_socialdownloadr_com','<a href="http://search.socialdownloadr.com/" rel="nofollow" title="Socialdownloadr search page [new window]" target="_blank">Socialdownloadr</a>',

--'search_zonealarm_com','<a href="http://search.zonealarm.com/" rel="nofollow" title="Zone Alarm Search [new window]" target="_blank">Zone Alarm Search</a>',

-+'safehomepage_com','<a href="http://searches.safehomepage.com/" rel="nofollow noopener noreferrer" title="safehomepage.com [new window]" target="_blank">safehomepage.com</a>',

-+'sagool','<a href="http://sagool.jp/" title="Sagool home page [new window]" rel="nofollow noopener noreferrer" target="_blank">Sagool</a>',

-+'sapo','<a href="http://www.sapo.pt/" title="Sapo search engine home page [new window]" rel="nofollow noopener noreferrer" target="_blank">Sapo</a>',

-+'schoenerbrausen','<a href="http://www.schoenerbrausen.de/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Schoenerbrausen/</a>',

-+'scroogle','<a href="http://www.scroogle.org/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Scroogle</a>',

-+'search.com','<a href="http://www.search.com/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Search.com</a>',

-+'search_1und1_de','<a href="http://search.1und1.de/" rel="nofollow noopener noreferrer" title="1&amp;1 Suche [new window]" target="_blank">1&1 Suche (subdomain "search")</a>',

-+'search_foxtab_com','<a href="http://search.foxtab.com/" rel="nofollow noopener noreferrer" title="Foxtab Search [new window]" target="_blank">Foxtab Search</a>',

-+'search_socialdownloadr_com','<a href="http://search.socialdownloadr.com/" rel="nofollow noopener noreferrer" title="Socialdownloadr search page [new window]" target="_blank">Socialdownloadr</a>',

-+'search_zonealarm_com','<a href="http://search.zonealarm.com/" rel="nofollow noopener noreferrer" title="Zone Alarm Search [new window]" target="_blank">Zone Alarm Search</a>',

- 'searchalgo','searchalgo',

--'searchalot','<a href="http://www.searchalot.com/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Searchalot</a>',

-+'searchalot','<a href="http://www.searchalot.com/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Searchalot</a>',

- 'searchch','search ch',

- 'searchcompletion','searchcompletion',

--'searches_qone8_com','<a href="http://searches.qone8.com/" rel="nofollow" title="Omiga-Plus [new window]" target="_blank">Omiga-Plus</a>',

--'searchesnavigator','<a href="http://searchesnavigator.com/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">searchesnavigator</a>',

--'searchfunmoods','<a href="http://sr.searchfunmoods.com/" rel="nofollow" title="Funmoods [new window]" target="_blank">Funmoods</a>',

--'searchgol','<a href="http://www.searchgol.com/" rel="nofollow" title="Search-Gol [new window]" target="_blank">Search-Gol</a>',

--'searchlistingsite','<a href="http://searchlistingsite.com/" title="home page" rel="nofollow" target="_blank">SearchLlistingSite</a>',

-+'searches_qone8_com','<a href="http://searches.qone8.com/" rel="nofollow noopener noreferrer" title="Omiga-Plus [new window]" target="_blank">Omiga-Plus</a>',

-+'searchesnavigator','<a href="http://searchesnavigator.com/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">searchesnavigator</a>',

-+'searchfunmoods','<a href="http://sr.searchfunmoods.com/" rel="nofollow noopener noreferrer" title="Funmoods [new window]" target="_blank">Funmoods</a>',

-+'searchgol','<a href="http://www.searchgol.com/" rel="nofollow noopener noreferrer" title="Search-Gol [new window]" target="_blank">Search-Gol</a>',

-+'searchlistingsite','<a href="http://searchlistingsite.com/" title="home page" rel="nofollow noopener noreferrer" target="_blank">SearchLlistingSite</a>',

- 'searchmobileonline','searchmobileonline',

--'searchresults','<a href="http://www1.search-results.com/" rel="nofollow" title="Search-results Home Page [new window]" target="_blank">Search-results</a>',

--'search-results_mobi','<a href="http://search-results.mobi/" rel="nofollow" title="search-results.mobi [new window]" target="_blank">search-results.mobi</a>',

--'searchresultscom','<a href="http://www.search-results.com/" title="search-results" rel="nofollow" target="_blank">search-results.com ( all sites )</a>',

--'searchresultsmobi','<a href="http://www.search-results.mobi/" title="search-results" rel="nofollow" target="_blank">search-results.mobi</a>',

-+'searchresults','<a href="http://www1.search-results.com/" rel="nofollow noopener noreferrer" title="Search-results Home Page [new window]" target="_blank">Search-results</a>',

-+'search-results_mobi','<a href="http://search-results.mobi/" rel="nofollow noopener noreferrer" title="search-results.mobi [new window]" target="_blank">search-results.mobi</a>',

-+'searchresultscom','<a href="http://www.search-results.com/" title="search-results" rel="nofollow noopener noreferrer" target="_blank">search-results.com ( all sites )</a>',

-+'searchresultsmobi','<a href="http://www.search-results.mobi/" title="search-results" rel="nofollow noopener noreferrer" target="_blank">search-results.mobi</a>',

- 'searchsafer','searchsafer',

- 'searchy','searchy.co.uk',

--'searchya','<a href="http://www.searchya.com/" rel="nofollow" title="Searchya [new window]" target="_blank">Searchya</a>',

--'segnalo','<a href="http://segnalo.alice.it/" title="Segnalo home page [new window]" rel="nofollow" target="_blank">Segnalo</a> (Social Bookmark)',

-+'searchya','<a href="http://www.searchya.com/" rel="nofollow noopener noreferrer" title="Searchya [new window]" target="_blank">Searchya</a>',

-+'segnalo','<a href="http://segnalo.alice.it/" title="Segnalo home page [new window]" rel="nofollow noopener noreferrer" target="_blank">Segnalo</a> (Social Bookmark)',

- 'semalt','semalt',

--'sensis','<a href="http://www.sensis.com.au/" title="Segnalo home page [new window]" rel="nofollow" target="_blank">Sensis AU</a>',

-+'sensis','<a href="http://www.sensis.com.au/" title="Segnalo home page [new window]" rel="nofollow noopener noreferrer" target="_blank">Sensis AU</a>',

- 'seznam','Seznam', 

--'shawca','<a href="http://start.shaw.ca/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Shaw.ca</a>',

-+'shawca','<a href="http://start.shaw.ca/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Shaw.ca</a>',

- 'shinyseek\.it','Shinyseek.it',

--'shoppstop','<a href="http://www.shoppstop.com/" rel="nofollow" title="ShoppStop [new window]" target="_blank">ShoppStop</a>',

--'sify','<a href="http://search.sify.com/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Sify</a>',

-+'shoppstop','<a href="http://www.shoppstop.com/" rel="nofollow noopener noreferrer" title="ShoppStop [new window]" target="_blank">ShoppStop</a>',

-+'sify','<a href="http://search.sify.com/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Sify</a>',

- 'sky','sky',

--'smartsuggestor','<a href="http://search.smartsuggestor.com/" title="home page" rel="nofollow" target="_blank">smartsuggestor</a>',

--'smde','<a href="http://www.sm.de/" rel="nofollow" title="SM.de - Die SuchMaschine [new window]" target="_blank">SM.de - Die SuchMaschine</a>',

-+'smartsuggestor','<a href="http://search.smartsuggestor.com/" title="home page" rel="nofollow noopener noreferrer" target="_blank">smartsuggestor</a>',

-+'smde','<a href="http://www.sm.de/" rel="nofollow noopener noreferrer" title="SM.de - Die SuchMaschine [new window]" target="_blank">SM.de - Die SuchMaschine</a>',

- 'snapdo','snapdo',

- 'softonic','softonic',

--'sogou','<a href="http://www.sogou.com/" rel="nofollow" target="_blank">SoGou</a>',

-+'sogou','<a href="http://www.sogou.com/" rel="nofollow noopener noreferrer" target="_blank">SoGou</a>',

- 'sol','SOL', 

--'soso','<a href="http://www.soso.com/" rel="nofollow" target="_blank">SoSo</a>',

--'speedbit','<a href="http://go.speedbit.com/" rel="nofollow" title="Speedbit [new window]" target="_blank">Speedbit</a>',

--'sphere','<a href="http://www.sphere.com/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Sphere (Blog)</a>',

-+'soso','<a href="http://www.soso.com/" rel="nofollow noopener noreferrer" target="_blank">SoSo</a>',

-+'speedbit','<a href="http://go.speedbit.com/" rel="nofollow noopener noreferrer" title="Speedbit [new window]" target="_blank">Speedbit</a>',

-+'sphere','<a href="http://www.sphere.com/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Sphere (Blog)</a>',

- 'splut','Splut', 

- 'spotjockey','Spotjockey', 

- 'spray','Spray',

- 'start','start.no',

--'startlap_hu','<a href="http://kereso.startlap.hu/" rel="nofollow" title="Search Engine Home Page [new window]" target="_blank">Startlab Kereso</a>',

-+'startlap_hu','<a href="http://kereso.startlap.hu/" rel="nofollow noopener noreferrer" title="Search Engine Home Page [new window]" target="_blank">Startlab Kereso</a>',

- 'startpage','startpage.com',

- 'startsiden','startsiden',

--'startxxl','<a href="http://www.startxxl.com/" rel="nofollow" title="StartXXL Home Page [new window]" target="_blank">StartXXL</a>',

--'steadysearch','<a href="http://www.avantfind.com/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Avantfind</a>',

--'stumbleupon','<a href="http://www.stumbleupon.com/" title="Stumbleupon home page [new window]" rel="nofollow" target="_blank">Stumbleupon</a> (Social Bookmark)',

--'sucheaolde','<a href="http://sucheaol.aol.de/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">SucheAOL .de</a>',

--'sumaja','<a href="http://www.sumaja.de/" rel="nofollow" title="Sumaja [new window]" target="_blank">Sumaja</a>',

--'supereva','<a href="http://search.supereva.com/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Supereva</a>',

--'surfcanyon_com','<a href="http://search.surfcanyon.com/" rel="nofollow" title="SurfCanyon [new window]" target="_blank">SurfCanyon</a>',

-+'startxxl','<a href="http://www.startxxl.com/" rel="nofollow noopener noreferrer" title="StartXXL Home Page [new window]" target="_blank">StartXXL</a>',

-+'steadysearch','<a href="http://www.avantfind.com/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Avantfind</a>',

-+'stumbleupon','<a href="http://www.stumbleupon.com/" title="Stumbleupon home page [new window]" rel="nofollow noopener noreferrer" target="_blank">Stumbleupon</a> (Social Bookmark)',

-+'sucheaolde','<a href="http://sucheaol.aol.de/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">SucheAOL .de</a>',

-+'sumaja','<a href="http://www.sumaja.de/" rel="nofollow noopener noreferrer" title="Sumaja [new window]" target="_blank">Sumaja</a>',

-+'supereva','<a href="http://search.supereva.com/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Supereva</a>',

-+'surfcanyon_com','<a href="http://search.surfcanyon.com/" rel="nofollow noopener noreferrer" title="SurfCanyon [new window]" target="_blank">SurfCanyon</a>',

- 'sweetim','sweetim',

--'sweetpacks','<a href="http://www.sweetpacks-search.com/" rel="nofollow" title="Sweetpacks [new window]" target="_blank">Sweetpacks</a>',

--'swik','<a href="http://swik.net/" title="Swik home page [new window]" rel="nofollow" target="_blank">Swik</a> (Social Bookmark)',

--'swisscows_ch','<a href="https://swisscows.ch/" rel="nofollow" title="Swisscows search page [new window]" target="_blank">Swisscows</a>',

--'sympatico','<a href="http://sympatico.msn.ca/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Sympatico</a>',

--'szukaczpl','<a href="http://www.szukacz.pl/" title="Szukacz home page [new window]" rel="nofollow" target="_blank">Szukacz</a>',

-+'sweetpacks','<a href="http://www.sweetpacks-search.com/" rel="nofollow noopener noreferrer" title="Sweetpacks [new window]" target="_blank">Sweetpacks</a>',

-+'swik','<a href="http://swik.net/" title="Swik home page [new window]" rel="nofollow noopener noreferrer" target="_blank">Swik</a> (Social Bookmark)',

-+'swisscows_ch','<a href="https://swisscows.ch/" rel="nofollow noopener noreferrer" title="Swisscows search page [new window]" target="_blank">Swisscows</a>',

-+'sympatico','<a href="http://sympatico.msn.ca/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Sympatico</a>',

-+'szukaczpl','<a href="http://www.szukacz.pl/" title="Szukacz home page [new window]" rel="nofollow noopener noreferrer" target="_blank">Szukacz</a>',

- 't_online_catchall','T-Online ( catchall )',

--'t_online_de','<a href="http://suche.t-online.de" title="Szukacz home page [new window]" rel="nofollow" target="_blank">T-Online .de</a>',

-+'t_online_de','<a href="http://suche.t-online.de" title="Szukacz home page [new window]" rel="nofollow noopener noreferrer" target="_blank">T-Online .de</a>',

- 'talktalk_uk','talktalk uk',

--'tango_hu','<a href="http://tango.hu/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Tango</a>',

-+'tango_hu','<a href="http://tango.hu/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Tango</a>',

- 'tbask','tb.ask ?',

--'teecnoit','<a href="http://www.teecno.it/" title="Teecno home page [new window]" rel="nofollow" target="_blank">Teecno</a>',

--'teoma','<a href="http://search.ask.com/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Teoma</a>',

--'terra','<a href="http://www.terra.es/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Terra</a>',

-+'teecnoit','<a href="http://www.teecno.it/" title="Teecno home page [new window]" rel="nofollow noopener noreferrer" target="_blank">Teecno</a>',

-+'teoma','<a href="http://search.ask.com/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Teoma</a>',

-+'terra','<a href="http://www.terra.es/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Terra</a>',

- 'tesco','tesco',

--'theallsearches','<a href="http://theallsearches.com/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">theallsearches</a>',

-+'theallsearches','<a href="http://theallsearches.com/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">theallsearches</a>',

- 'three','three',

--'tiscali','<a href="http://search.tiscali.com/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Tiscali</a>',

--'tixuma_de','<a href="http://www.tixuma.de/" rel="nofollow" title="Tixuma Deutschland [new window]" target="_blank">Tixuma Deutschland</a>',

-+'tiscali','<a href="http://search.tiscali.com/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Tiscali</a>',

-+'tixuma_de','<a href="http://www.tixuma.de/" rel="nofollow noopener noreferrer" title="Tixuma Deutschland [new window]" target="_blank">Tixuma Deutschland</a>',

- 'toile','Toile du Quebec',

- 'toshiba','toshiba',

- 'turtle','Turtle',

- 'tyfon','Tyfon', 

--'uk_foxstart_com','<a href="http://uk.foxstart.com/" rel="nofollow" title="Foxstart search page [new window]" target="_blank">Foxstart.com</a>',

-+'uk_foxstart_com','<a href="http://uk.foxstart.com/" rel="nofollow noopener noreferrer" title="Foxstart search page [new window]" target="_blank">Foxstart.com</a>',

- 'ukdirectory','UK Directory', 

- 'ukindex','UKIndex', 

- 'ukplus','UK Plus', 

--'umfis','<a href="http://www.umfis.de/" rel="nofollow" title="UMFIS-Online Das Umweltfirmen-Informationssystem der IHKs in Deutschland [new window]" target="_blank">UMFIS-Online Das Umweltfirmen-Informationssystem der IHKs in Deutschland</a>',

--'umuwa_de','<a href="http://umuwa.de/" rel="nofollow" title="Umuwa Deutschland [new window]" target="_blank">Umuwa Deutschland</a>',

-+'umfis','<a href="http://www.umfis.de/" rel="nofollow noopener noreferrer" title="UMFIS-Online Das Umweltfirmen-Informationssystem der IHKs in Deutschland [new window]" target="_blank">UMFIS-Online Das Umweltfirmen-Informationssystem der IHKs in Deutschland</a>',

-+'umuwa_de','<a href="http://umuwa.de/" rel="nofollow noopener noreferrer" title="Umuwa Deutschland [new window]" target="_blank">Umuwa Deutschland</a>',

- 'vindex','Vindex',

--'virgilio','<a href="http://www.virgilio.it/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Virgilio</a>',

--'virginmedia','<a href="http://search.virginmedia.com/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Virgin Media</a>',

--'vi-view_com','<a href="http://searches.vi-view.com/" rel="nofollow" title="vi-view.com [new window]" target="_blank">vi-view.com</a>',

--'vivisimo','<a href="http://www.vivisimo.com/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Vivisimo</a>',

-+'virgilio','<a href="http://www.virgilio.it/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Virgilio</a>',

-+'virginmedia','<a href="http://search.virginmedia.com/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Virgin Media</a>',

-+'vi-view_com','<a href="http://searches.vi-view.com/" rel="nofollow noopener noreferrer" title="vi-view.com [new window]" target="_blank">vi-view.com</a>',

-+'vivisimo','<a href="http://www.vivisimo.com/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Vivisimo</a>',

- 'vlips_de','vlips .de',

--'vnet','<a href="http://114.vnet.cn/" rel="nofollow" target="_blank">VNet</a>',

--'voila','<a href="http://www.voila.fr/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Voila</a>',

-+'vnet','<a href="http://114.vnet.cn/" rel="nofollow noopener noreferrer" target="_blank">VNet</a>',

-+'voila','<a href="http://www.voila.fr/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Voila</a>',

- 'wahoo','Wahoo', 

--'webalta','<a href="http://www.webalta.ru/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">webalta.ru</a>',

--'webcrawler','<a href="http://www.webcrawler.com/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">WebCrawler</a>',

-+'webalta','<a href="http://www.webalta.ru/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">webalta.ru</a>',

-+'webcrawler','<a href="http://www.webcrawler.com/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">WebCrawler</a>',

- 'webde','Web.de',

- 'webmania','webmania.hu', 

- 'whorush_com','whorush com',

--'windowssearch_com','<a href="http://www.windowssearch.com/search?q=AWStats" rel="nofollow" title="Example page [new window]" target="_blank">windowssearch.com</a>',

-+'windowssearch_com','<a href="http://www.windowssearch.com/search?q=AWStats" rel="nofollow noopener noreferrer" title="Example page [new window]" target="_blank">windowssearch.com</a>',

- 'wisenut','WISENut', 

--'wow_utop_it','<a href="http://wow.utop.it/" rel="nofollow" title="wow.utop.it [new window]" target="_blank">wow.utop.it</a>',

--'wowpl','<a href="http://szukaj.wow.pl/" title="Wow.pl home page [new window]" rel="nofollow" target="_blank">Wow.pl</a>',

--'wowsearch','<a href="http://de.wow.com/" rel="nofollow" title="Wow Search Home Page [new window]" target="_blank">Wow Search</a>',

--'wowuk','<a href="http://uk.wow.com/" title="uk.Wow home page [new window]" rel="nofollow" target="_blank">uk.wow.com</a>',

--'wp','<a href="http://szukaj.wp.pl/" title="Wirtualna Polska home page [new window]" rel="nofollow" target="_blank">Wirtualna Polska</a>',

--'www_buenosearch_com','<a href="http://www.buenosearch.com/" rel="nofollow" title="BuenoSearch [new window]" target="_blank">BuenoSearch</a>',

--'www_dregol_com','<a href="http://www.dregol.com/" rel="nofollow" title="Dregol Search [new window]" target="_blank">Dregol Search</a>',

--'www_wow_com','<a href="http://www.wow.com/" rel="nofollow" title="www.wow.com [new window]" target="_blank">WOW.com</a>',

--'wwweasel','<a href="http://wwweasel.de/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">WWWeasel</a>',

-+'wow_utop_it','<a href="http://wow.utop.it/" rel="nofollow noopener noreferrer" title="wow.utop.it [new window]" target="_blank">wow.utop.it</a>',

-+'wowpl','<a href="http://szukaj.wow.pl/" title="Wow.pl home page [new window]" rel="nofollow noopener noreferrer" target="_blank">Wow.pl</a>',

-+'wowsearch','<a href="http://de.wow.com/" rel="nofollow noopener noreferrer" title="Wow Search Home Page [new window]" target="_blank">Wow Search</a>',

-+'wowuk','<a href="http://uk.wow.com/" title="uk.Wow home page [new window]" rel="nofollow noopener noreferrer" target="_blank">uk.wow.com</a>',

-+'wp','<a href="http://szukaj.wp.pl/" title="Wirtualna Polska home page [new window]" rel="nofollow noopener noreferrer" target="_blank">Wirtualna Polska</a>',

-+'www_buenosearch_com','<a href="http://www.buenosearch.com/" rel="nofollow noopener noreferrer" title="BuenoSearch [new window]" target="_blank">BuenoSearch</a>',

-+'www_dregol_com','<a href="http://www.dregol.com/" rel="nofollow noopener noreferrer" title="Dregol Search [new window]" target="_blank">Dregol Search</a>',

-+'www_wow_com','<a href="http://www.wow.com/" rel="nofollow noopener noreferrer" title="www.wow.com [new window]" target="_blank">WOW.com</a>',

-+'wwweasel','<a href="http://wwweasel.de/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">WWWeasel</a>',

- 

--'ar_images_search_yahoo_com','<a href="http://ar.images.search.yahoo.com/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Yahoo : ar.images.search.yahoo.com</a>',

--'ar_search_yahoo_com','<a href="http://ar.search.yahoo.com/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Yahoo : ar.search.yahoo.com</a>',

--'at_images_search_yahoo_com','<a href="http://at.images.search.yahoo.com/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Yahoo : at.images.search.yahoo.com</a>',

--'at_search_yahoo_com','<a href="http://at.search.yahoo.com/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Yahoo : at.search.yahoo.com</a>',

--'au_images_search_yahoo_com','<a href="http://au.images.search.yahoo.com/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Yahoo : au.images.search.yahoo.com</a>',

--'au_search_yahoo_com','<a href="http://au.search.yahoo.com/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Yahoo : au.search.yahoo.com</a>',

--'br_images_search_yahoo_com','<a href="http://br.images.search.yahoo.com/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Yahoo : br.images.search.yahoo.com</a>',

--'br_search_yahoo_com','<a href="http://br.search.yahoo.com/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Yahoo : br.search.yahoo.com</a>',

--'ca_images_search_yahoo_com','<a href="http://ca.images.search.yahoo.com/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Yahoo : ca.images.search.yahoo.com</a>',

--'ca_search_yahoo_com','<a href="http://ca.search.yahoo.com/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Yahoo : ca.search.yahoo.com</a>',

--'ca_yhs4_search_yahoo_com','<a href="http://ca.yhs4.search.yahoo.com/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Yahoo : ca.yhs4.search.yahoo.com</a>',

--'ch_images_search_yahoo_com','<a href="http://ch.images.search.yahoo.com/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Yahoo : ch.images.search.yahoo.com</a>',

--'ch_yhs4_search_yahoo_com','<a href="http://ch.yhs4.search.yahoo.com/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Yahoo : ch.yhs4.search.yahoo.com</a>',

--'de_search_yahoo_com','<a href="http://de.search.yahoo.com/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Yahoo : de.search.yahoo.com</a>',

--'de_yhs4_search_yahoo_com','<a href="http://de.yhs4.search.yahoo.com/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Yahoo : de.yhs4.search.yahoo.com</a>',

--'es_images_search_yahoo_com','<a href="http://es.images.search.yahoo.com/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Yahoo : es.images.search.yahoo.com</a>',

--'es_search_yahoo_com','<a href="http://es.search.yahoo.com/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Yahoo : es.search.yahoo.com</a>',

--'es_yhs4_search_yahoo_com','<a href="http://es.yhs4.search.yahoo.com/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Yahoo : es.yhs4.search.yahoo.com</a>',

--'espanol_images_search_yahoo_com','<a href="http://espanol.images.search.yahoo.com/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Yahoo : espanol.images.search.yahoo.com</a>',

--'espanol_search_yahoo_com','<a href="http://espanol.search.yahoo.com/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Yahoo : espanol.search.yahoo.com</a>',

--'fr_images_search_yahoo_com','<a href="http://fr.images.search.yahoo.com/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Yahoo : fr.images.search.yahoo.com</a>',

--'fr_search_yahoo_com','<a href="http://fr.search.yahoo.com/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Yahoo : fr.search.yahoo.com</a>',

--'fr_yhs4_search_yahoo_com','<a href="http://fr.yhs4.search.yahoo.com/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Yahoo : fr.yhs4.search.yahoo.com</a>',

--'gr_search_yahoo_com','<a href="http://gr.search.yahoo.com/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Yahoo : gr.search.yahoo.com</a>',

--'gr_yhs4_search_yahoo_com','<a href="http://gr.yhs4.search.yahoo.com/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Yahoo : gr.yhs4.search.yahoo.com</a>',

--'hk_image_search_yahoo_com','<a href="http://hk.image.search.yahoo.com/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Yahoo : hk.image.search.yahoo.com</a>',

--'hk_images_search_yahoo_com','<a href="http://hk.images.search.yahoo.com/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Yahoo : hk.images.search.yahoo.com</a>',

--'hk_search_yahoo_com','<a href="http://hk.search.yahoo.com/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Yahoo : hk.search.yahoo.com</a>',

--'id_images_search_yahoo_com','<a href="http://id.images.search.yahoo.com/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Yahoo : id.images.search.yahoo.com</a>',

--'id_search_yahoo_com','<a href="http://id.search.yahoo.com/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Yahoo : id.search.yahoo.com</a>',

--'id_yhs4_search_yahoo_com','<a href="http://id.yhs4.search.yahoo.com/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Yahoo : id.yhs4.search.yahoo.com</a>',

--'ie_search_yahoo_com','<a href="http://ie.search.yahoo.com/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Yahoo : ie.search.yahoo.com</a>',

--'image_search_yahoo_co_jp','<a href="http://image.search.yahoo.co.jp/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Yahoo : image.search.yahoo.co.jp</a>',

--'images_search_yahoo_com','<a href="http://images.search.yahoo.com/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Yahoo : images.search.yahoo.com</a>',

--'in_images_search_yahoo_com','<a href="http://in.images.search.yahoo.com/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Yahoo : in.images.search.yahoo.com</a>',

--'in_search_yahoo_com','<a href="http://in.search.yahoo.com/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Yahoo : in.search.yahoo.com</a>',

--'in_yhs4_search_yahoo_com','<a href="http://in.yhs4.search.yahoo.com/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Yahoo : in.yhs4.search.yahoo.com</a>',

--'it_images_search_yahoo_com','<a href="http://it.images.search.yahoo.com/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Yahoo : it.images.search.yahoo.com</a>',

--'it_search_yahoo_com','<a href="http://it.search.yahoo.com/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Yahoo : it.search.yahoo.com</a>',

--'it_yhs4_search_yahoo_com','<a href="http://it.yhs4.search.yahoo.com/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Yahoo : it.yhs4.search.yahoo.com</a>',

--'kr_search_yahoo_com','<a href="http://kr.search.yahoo.com/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Yahoo : kr.search.yahoo.com</a>',

--'malaysia_images_search_yahoo_com','<a href="http://malaysia.images.search.yahoo.com/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Yahoo : malaysia.images.search.yahoo.com</a>',

--'malaysia_search_yahoo_com','<a href="http://malaysia.search.yahoo.com/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Yahoo : malaysia.search.yahoo.com</a>',

--'mx_images_search_yahoo_com','<a href="http://mx.images.search.yahoo.com/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Yahoo : mx.images.search.yahoo.com</a>',

--'mx_search_yahoo_com','<a href="http://mx.search.yahoo.com/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Yahoo : mx.search.yahoo.com</a>',

--'nl_images_search_yahoo_com','<a href="http://nl.images.search.yahoo.com/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Yahoo : nl.images.search.yahoo.com</a>',

--'nl_search_yahoo_com','<a href="http://nl.search.yahoo.com/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Yahoo : nl.search.yahoo.com</a>',

--'nl_yhs4_search_yahoo_com','<a href="http://nl.yhs4.search.yahoo.com/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Yahoo : nl.yhs4.search.yahoo.com</a>',

--'no_search_yahoo_com','<a href="http://no.search.yahoo.com/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Yahoo : no.search.yahoo.com</a>',

--'nz_search_yahoo_com','<a href="http://nz.search.yahoo.com/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Yahoo : nz.search.yahoo.com</a>',

--'pe_images_search_yahoo_com','<a href="http://pe.images.search.yahoo.com/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Yahoo : pe.images.search.yahoo.com</a>',

--'ph_images_search_yahoo_com','<a href="http://ph.images.search.yahoo.com/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Yahoo : ph.images.search.yahoo.com</a>',

--'ph_search_yahoo_com','<a href="http://ph.search.yahoo.com/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Yahoo : ph.search.yahoo.com</a>',

--'ph_yhs4_search_yahoo_com','<a href="http://ph.yhs4.search.yahoo.com/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Yahoo : ph.yhs4.search.yahoo.com</a>',

--'pl_yhs4_search_yahoo_com','<a href="http://pl.yhs4.search.yahoo.com/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Yahoo : pl.yhs4.search.yahoo.com</a>',

--'qc_images_search_yahoo_com','<a href="http://qc.images.search.yahoo.com/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Yahoo : qc.images.search.yahoo.com</a>',

--'qc_search_yahoo_com','<a href="http://qc.search.yahoo.com/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Yahoo : qc.search.yahoo.com</a>',

--'r_search_yahoo_com','<a href="http://r.search.yahoo.com/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Yahoo : r.search.yahoo.com</a>',

--'ru_images_search_yahoo_com','<a href="http://ru.images.search.yahoo.com/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Yahoo : ru.images.search.yahoo.com</a>',

--'se_images_search_yahoo_com','<a href="http://se.images.search.yahoo.com/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Yahoo : se.images.search.yahoo.com</a>',

--'se_search_yahoo_com','<a href="http://se.search.yahoo.com/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Yahoo : se.search.yahoo.com</a>',

--'se_yhs4_search_yahoo_com','<a href="http://se.yhs4.search.yahoo.com/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Yahoo : se.yhs4.search.yahoo.com</a>',

--'search_yahoo_co_jp','<a href="http://search.yahoo.co.jp/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Yahoo : search.yahoo.co.jp</a>',

--'search_yahoo_com','<a href="http://search.yahoo.com/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Yahoo : search.yahoo.com</a>',

--'sg_images_search_yahoo_com','<a href="http://sg.images.search.yahoo.com/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Yahoo : sg.images.search.yahoo.com</a>',

--'sg_search_yahoo_com','<a href="http://sg.search.yahoo.com/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Yahoo : sg.search.yahoo.com</a>',

--'sg_yhs4_search_yahoo_com','<a href="http://sg.yhs4.search.yahoo.com/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Yahoo : sg.yhs4.search.yahoo.com</a>',

--'tr_yhs4_search_yahoo_com','<a href="http://tr.yhs4.search.yahoo.com/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Yahoo : tr.yhs4.search.yahoo.com</a>',

--'tw_image_search_yahoo_com','<a href="http://tw.image.search.yahoo.com/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Yahoo : tw.image.search.yahoo.com</a>',

--'tw_images_search_yahoo_com','<a href="http://tw.images.search.yahoo.com/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Yahoo : tw.images.search.yahoo.com</a>',

--'tw_search_yahoo_com','<a href="http://tw.search.yahoo.com/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Yahoo : tw.search.yahoo.com</a>',

--'uk_images_search_yahoo_com','<a href="http://uk.images.search.yahoo.com/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Yahoo : uk.images.search.yahoo.com</a>',

--'uk_search_yahoo_com','<a href="http://uk.search.yahoo.com/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Yahoo : uk.search.yahoo.com</a>',

--'uk_yhs_search_yahoo_com','<a href="http://uk.yhs.search.yahoo.com/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Yahoo : uk.yhs.search.yahoo.com</a>',

--'uk_yhs4_search_yahoo_com','<a href="http://uk.yhs4.search.yahoo.com/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Yahoo : uk.yhs4.search.yahoo.com</a>',

--'us_search_yahoo_com','<a href="http://us.search.yahoo.com/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Yahoo : us.search.yahoo.com</a>',

--'us_yhs4_search_yahoo_com','<a href="http://us.yhs4.search.yahoo.com/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Yahoo : us.yhs4.search.yahoo.com</a>',

--'vn_images_search_yahoo_com','<a href="http://vn.images.search.yahoo.com/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Yahoo : vn.images.search.yahoo.com</a>',

-+'ar_images_search_yahoo_com','<a href="http://ar.images.search.yahoo.com/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Yahoo : ar.images.search.yahoo.com</a>',

-+'ar_search_yahoo_com','<a href="http://ar.search.yahoo.com/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Yahoo : ar.search.yahoo.com</a>',

-+'at_images_search_yahoo_com','<a href="http://at.images.search.yahoo.com/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Yahoo : at.images.search.yahoo.com</a>',

-+'at_search_yahoo_com','<a href="http://at.search.yahoo.com/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Yahoo : at.search.yahoo.com</a>',

-+'au_images_search_yahoo_com','<a href="http://au.images.search.yahoo.com/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Yahoo : au.images.search.yahoo.com</a>',

-+'au_search_yahoo_com','<a href="http://au.search.yahoo.com/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Yahoo : au.search.yahoo.com</a>',

-+'br_images_search_yahoo_com','<a href="http://br.images.search.yahoo.com/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Yahoo : br.images.search.yahoo.com</a>',

-+'br_search_yahoo_com','<a href="http://br.search.yahoo.com/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Yahoo : br.search.yahoo.com</a>',

-+'ca_images_search_yahoo_com','<a href="http://ca.images.search.yahoo.com/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Yahoo : ca.images.search.yahoo.com</a>',

-+'ca_search_yahoo_com','<a href="http://ca.search.yahoo.com/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Yahoo : ca.search.yahoo.com</a>',

-+'ca_yhs4_search_yahoo_com','<a href="http://ca.yhs4.search.yahoo.com/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Yahoo : ca.yhs4.search.yahoo.com</a>',

-+'ch_images_search_yahoo_com','<a href="http://ch.images.search.yahoo.com/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Yahoo : ch.images.search.yahoo.com</a>',

-+'ch_yhs4_search_yahoo_com','<a href="http://ch.yhs4.search.yahoo.com/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Yahoo : ch.yhs4.search.yahoo.com</a>',

-+'de_search_yahoo_com','<a href="http://de.search.yahoo.com/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Yahoo : de.search.yahoo.com</a>',

-+'de_yhs4_search_yahoo_com','<a href="http://de.yhs4.search.yahoo.com/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Yahoo : de.yhs4.search.yahoo.com</a>',

-+'es_images_search_yahoo_com','<a href="http://es.images.search.yahoo.com/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Yahoo : es.images.search.yahoo.com</a>',

-+'es_search_yahoo_com','<a href="http://es.search.yahoo.com/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Yahoo : es.search.yahoo.com</a>',

-+'es_yhs4_search_yahoo_com','<a href="http://es.yhs4.search.yahoo.com/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Yahoo : es.yhs4.search.yahoo.com</a>',

-+'espanol_images_search_yahoo_com','<a href="http://espanol.images.search.yahoo.com/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Yahoo : espanol.images.search.yahoo.com</a>',

-+'espanol_search_yahoo_com','<a href="http://espanol.search.yahoo.com/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Yahoo : espanol.search.yahoo.com</a>',

-+'fr_images_search_yahoo_com','<a href="http://fr.images.search.yahoo.com/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Yahoo : fr.images.search.yahoo.com</a>',

-+'fr_search_yahoo_com','<a href="http://fr.search.yahoo.com/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Yahoo : fr.search.yahoo.com</a>',

-+'fr_yhs4_search_yahoo_com','<a href="http://fr.yhs4.search.yahoo.com/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Yahoo : fr.yhs4.search.yahoo.com</a>',

-+'gr_search_yahoo_com','<a href="http://gr.search.yahoo.com/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Yahoo : gr.search.yahoo.com</a>',

-+'gr_yhs4_search_yahoo_com','<a href="http://gr.yhs4.search.yahoo.com/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Yahoo : gr.yhs4.search.yahoo.com</a>',

-+'hk_image_search_yahoo_com','<a href="http://hk.image.search.yahoo.com/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Yahoo : hk.image.search.yahoo.com</a>',

-+'hk_images_search_yahoo_com','<a href="http://hk.images.search.yahoo.com/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Yahoo : hk.images.search.yahoo.com</a>',

-+'hk_search_yahoo_com','<a href="http://hk.search.yahoo.com/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Yahoo : hk.search.yahoo.com</a>',

-+'id_images_search_yahoo_com','<a href="http://id.images.search.yahoo.com/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Yahoo : id.images.search.yahoo.com</a>',

-+'id_search_yahoo_com','<a href="http://id.search.yahoo.com/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Yahoo : id.search.yahoo.com</a>',

-+'id_yhs4_search_yahoo_com','<a href="http://id.yhs4.search.yahoo.com/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Yahoo : id.yhs4.search.yahoo.com</a>',

-+'ie_search_yahoo_com','<a href="http://ie.search.yahoo.com/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Yahoo : ie.search.yahoo.com</a>',

-+'image_search_yahoo_co_jp','<a href="http://image.search.yahoo.co.jp/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Yahoo : image.search.yahoo.co.jp</a>',

-+'images_search_yahoo_com','<a href="http://images.search.yahoo.com/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Yahoo : images.search.yahoo.com</a>',

-+'in_images_search_yahoo_com','<a href="http://in.images.search.yahoo.com/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Yahoo : in.images.search.yahoo.com</a>',

-+'in_search_yahoo_com','<a href="http://in.search.yahoo.com/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Yahoo : in.search.yahoo.com</a>',

-+'in_yhs4_search_yahoo_com','<a href="http://in.yhs4.search.yahoo.com/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Yahoo : in.yhs4.search.yahoo.com</a>',

-+'it_images_search_yahoo_com','<a href="http://it.images.search.yahoo.com/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Yahoo : it.images.search.yahoo.com</a>',

-+'it_search_yahoo_com','<a href="http://it.search.yahoo.com/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Yahoo : it.search.yahoo.com</a>',

-+'it_yhs4_search_yahoo_com','<a href="http://it.yhs4.search.yahoo.com/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Yahoo : it.yhs4.search.yahoo.com</a>',

-+'kr_search_yahoo_com','<a href="http://kr.search.yahoo.com/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Yahoo : kr.search.yahoo.com</a>',

-+'malaysia_images_search_yahoo_com','<a href="http://malaysia.images.search.yahoo.com/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Yahoo : malaysia.images.search.yahoo.com</a>',

-+'malaysia_search_yahoo_com','<a href="http://malaysia.search.yahoo.com/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Yahoo : malaysia.search.yahoo.com</a>',

-+'mx_images_search_yahoo_com','<a href="http://mx.images.search.yahoo.com/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Yahoo : mx.images.search.yahoo.com</a>',

-+'mx_search_yahoo_com','<a href="http://mx.search.yahoo.com/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Yahoo : mx.search.yahoo.com</a>',

-+'nl_images_search_yahoo_com','<a href="http://nl.images.search.yahoo.com/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Yahoo : nl.images.search.yahoo.com</a>',

-+'nl_search_yahoo_com','<a href="http://nl.search.yahoo.com/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Yahoo : nl.search.yahoo.com</a>',

-+'nl_yhs4_search_yahoo_com','<a href="http://nl.yhs4.search.yahoo.com/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Yahoo : nl.yhs4.search.yahoo.com</a>',

-+'no_search_yahoo_com','<a href="http://no.search.yahoo.com/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Yahoo : no.search.yahoo.com</a>',

-+'nz_search_yahoo_com','<a href="http://nz.search.yahoo.com/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Yahoo : nz.search.yahoo.com</a>',

-+'pe_images_search_yahoo_com','<a href="http://pe.images.search.yahoo.com/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Yahoo : pe.images.search.yahoo.com</a>',

-+'ph_images_search_yahoo_com','<a href="http://ph.images.search.yahoo.com/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Yahoo : ph.images.search.yahoo.com</a>',

-+'ph_search_yahoo_com','<a href="http://ph.search.yahoo.com/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Yahoo : ph.search.yahoo.com</a>',

-+'ph_yhs4_search_yahoo_com','<a href="http://ph.yhs4.search.yahoo.com/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Yahoo : ph.yhs4.search.yahoo.com</a>',

-+'pl_yhs4_search_yahoo_com','<a href="http://pl.yhs4.search.yahoo.com/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Yahoo : pl.yhs4.search.yahoo.com</a>',

-+'qc_images_search_yahoo_com','<a href="http://qc.images.search.yahoo.com/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Yahoo : qc.images.search.yahoo.com</a>',

-+'qc_search_yahoo_com','<a href="http://qc.search.yahoo.com/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Yahoo : qc.search.yahoo.com</a>',

-+'r_search_yahoo_com','<a href="http://r.search.yahoo.com/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Yahoo : r.search.yahoo.com</a>',

-+'ru_images_search_yahoo_com','<a href="http://ru.images.search.yahoo.com/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Yahoo : ru.images.search.yahoo.com</a>',

-+'se_images_search_yahoo_com','<a href="http://se.images.search.yahoo.com/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Yahoo : se.images.search.yahoo.com</a>',

-+'se_search_yahoo_com','<a href="http://se.search.yahoo.com/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Yahoo : se.search.yahoo.com</a>',

-+'se_yhs4_search_yahoo_com','<a href="http://se.yhs4.search.yahoo.com/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Yahoo : se.yhs4.search.yahoo.com</a>',

-+'search_yahoo_co_jp','<a href="http://search.yahoo.co.jp/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Yahoo : search.yahoo.co.jp</a>',

-+'search_yahoo_com','<a href="http://search.yahoo.com/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Yahoo : search.yahoo.com</a>',

-+'sg_images_search_yahoo_com','<a href="http://sg.images.search.yahoo.com/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Yahoo : sg.images.search.yahoo.com</a>',

-+'sg_search_yahoo_com','<a href="http://sg.search.yahoo.com/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Yahoo : sg.search.yahoo.com</a>',

-+'sg_yhs4_search_yahoo_com','<a href="http://sg.yhs4.search.yahoo.com/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Yahoo : sg.yhs4.search.yahoo.com</a>',

-+'tr_yhs4_search_yahoo_com','<a href="http://tr.yhs4.search.yahoo.com/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Yahoo : tr.yhs4.search.yahoo.com</a>',

-+'tw_image_search_yahoo_com','<a href="http://tw.image.search.yahoo.com/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Yahoo : tw.image.search.yahoo.com</a>',

-+'tw_images_search_yahoo_com','<a href="http://tw.images.search.yahoo.com/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Yahoo : tw.images.search.yahoo.com</a>',

-+'tw_search_yahoo_com','<a href="http://tw.search.yahoo.com/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Yahoo : tw.search.yahoo.com</a>',

-+'uk_images_search_yahoo_com','<a href="http://uk.images.search.yahoo.com/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Yahoo : uk.images.search.yahoo.com</a>',

-+'uk_search_yahoo_com','<a href="http://uk.search.yahoo.com/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Yahoo : uk.search.yahoo.com</a>',

-+'uk_yhs_search_yahoo_com','<a href="http://uk.yhs.search.yahoo.com/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Yahoo : uk.yhs.search.yahoo.com</a>',

-+'uk_yhs4_search_yahoo_com','<a href="http://uk.yhs4.search.yahoo.com/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Yahoo : uk.yhs4.search.yahoo.com</a>',

-+'us_search_yahoo_com','<a href="http://us.search.yahoo.com/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Yahoo : us.search.yahoo.com</a>',

-+'us_yhs4_search_yahoo_com','<a href="http://us.yhs4.search.yahoo.com/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Yahoo : us.yhs4.search.yahoo.com</a>',

-+'vn_images_search_yahoo_com','<a href="http://vn.images.search.yahoo.com/" title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Yahoo : vn.images.search.yahoo.com</a>',

- 

--'yahoo_mindset','<a href="http://mindset.research.yahoo.com/" rel="nofollow" title="Search Engine Home Page [new window]" target="_blank">Yahoo! Mindset</a>',

-+'yahoo_mindset','<a href="http://mindset.research.yahoo.com/" rel="nofollow noopener noreferrer" title="Search Engine Home Page [new window]" target="_blank">Yahoo! Mindset</a>',

- 

- 'images_search_yahoo_catchall','Yahoo : images search ( catchall )',

- 'yhs4_search_yahoo_catchall','Yahoo : yhs4 search ( catchall )',

-@@ -5510,21 +5510,21 @@
- 'yahoo_catchall','Yahoo : ( catchall )',

- 

- 'yandex','yandex ( catchall )',

--'yandexcom','<a href="http://yandex.com/" rel="nofollow" title="Search Engine Home Page [new window]" target="_blank">Yandex .com</a>',

--'yandexcomtr','<a href="http://yandex.com.tr/" rel="nofollow" title="Search Engine Home Page [new window]" target="_blank">Yandex .com.tr</a>',

--'yandexkz','<a href="http://yandex.kz/" rel="nofollow" title="Search Engine Home Page [new window]" target="_blank">Yandex .kz</a>',

--'yandexru','<a href="http://yandex.ru/" rel="nofollow" title="Search Engine Home Page [new window]" target="_blank">Yandex .ru</a>',

--'yandexua','<a href="http://yandex.ua/" rel="nofollow" title="Search Engine Home Page [new window]" target="_blank">Yandex .ua</a>',

--'yell','<a href="http://www.yell.com/" title="Yell Home Page [new window]" rel="nofollow" target="_blank">Yell</a>',

--'yourbestsearch','<a href="http://yourbestsearch.net/" title="Home Page [new window]" rel="nofollow" target="_blank">YourBest Search</a>',

-+'yandexcom','<a href="http://yandex.com/" rel="nofollow noopener noreferrer" title="Search Engine Home Page [new window]" target="_blank">Yandex .com</a>',

-+'yandexcomtr','<a href="http://yandex.com.tr/" rel="nofollow noopener noreferrer" title="Search Engine Home Page [new window]" target="_blank">Yandex .com.tr</a>',

-+'yandexkz','<a href="http://yandex.kz/" rel="nofollow noopener noreferrer" title="Search Engine Home Page [new window]" target="_blank">Yandex .kz</a>',

-+'yandexru','<a href="http://yandex.ru/" rel="nofollow noopener noreferrer" title="Search Engine Home Page [new window]" target="_blank">Yandex .ru</a>',

-+'yandexua','<a href="http://yandex.ua/" rel="nofollow noopener noreferrer" title="Search Engine Home Page [new window]" target="_blank">Yandex .ua</a>',

-+'yell','<a href="http://www.yell.com/" title="Yell Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Yell</a>',

-+'yourbestsearch','<a href="http://yourbestsearch.net/" title="Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">YourBest Search</a>',

- 'youtube','youtube',

- 'zapmeta_catchall','zapmeta ( catchall )',

- 'zapmeta_ch','zapmeta ch',

- 'zapmeta_com','zapmeta com',

- 'zapmeta_de','zapmeta de',

--'zhongsou','<a href="http://www.zhongsou.com/" rel="nofollow" target="_blank">ZhongSou</a>',

--'zoeken','<a href="http://www.zoeken.nl/" rel="nofollow" target="_blank">Zoeken</a>',

--'zoznam','<a href="http://www.zoznam.sk/" title="Zoznam search engine home page [new window]" rel="nofollow" target="_blank">Zoznam</a>',

-+'zhongsou','<a href="http://www.zhongsou.com/" rel="nofollow noopener noreferrer" target="_blank">ZhongSou</a>',

-+'zoeken','<a href="http://www.zoeken.nl/" rel="nofollow noopener noreferrer" target="_blank">Zoeken</a>',

-+'zoznam','<a href="http://www.zoznam.sk/" title="Zoznam search engine home page [new window]" rel="nofollow noopener noreferrer" target="_blank">Zoznam</a>',

- 

- # Generic search engines

- 'search','Unknown search engines'

--- 
-2.15.1
-
diff --git a/network/awstats/patches/0001-Fix-to-window.opener-vulnerability-in-external-refer.patch b/network/awstats/patches/0001-Fix-to-window.opener-vulnerability-in-external-refer.patch
deleted file mode 100644
index b899ab5b19..0000000000
--- a/network/awstats/patches/0001-Fix-to-window.opener-vulnerability-in-external-refer.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From b421096d5596f1c6ade078fa0b1103deefc3a5ed Mon Sep 17 00:00:00 2001
-From: qssam <Sam.Webb@quiet-storm.net>
-Date: Tue, 7 Feb 2017 16:49:10 +0000
-Subject: [PATCH] Fix to window.opener vulnerability in external referral site
- links
-
-Reference: https://mathiasbynens.github.io/rel-noopener/
----
- wwwroot/cgi-bin/awstats.pl | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/wwwroot/cgi-bin/awstats.pl b/wwwroot/cgi-bin/awstats.pl
-index 75f0ed95..8bde5c03 100755
---- a/wwwroot/cgi-bin/awstats.pl
-+++ b/wwwroot/cgi-bin/awstats.pl
-@@ -8892,7 +8892,7 @@ sub HTMLShowURLInfo {
- 			{    # URL seems to be extracted from a proxy log file
- 				print "<a href=\""
- 				  . XMLEncode("$newkey")
--				  . "\" target=\"url\" rel=\"nofollow\">"
-+				  . "\" target=\"url\" rel=\"nofollow noopener noreferrer\">"
- 				  . XMLEncode($nompage) . "</a>";
- 			}
- 			elsif ( $newkey =~ /^\// )
-@@ -8907,7 +8907,7 @@ sub HTMLShowURLInfo {
- 				}
- 				print "<a href=\""
- 				  . XMLEncode("$urlprot://$SiteDomain$newkey")
--				  . "\" target=\"url\" rel=\"nofollow\">"
-+				  . "\" target=\"url\" rel=\"nofollow noopener noreferrer\">"
- 				  . XMLEncode($nompage) . "</a>";
- 			}
- 			else {
--- 
-2.15.1
-
diff --git a/network/axel/README b/network/axel/README
index a1f6e0a8e7..3368633451 100644
--- a/network/axel/README
+++ b/network/axel/README
@@ -1,7 +1,7 @@
 Axel accelerates the HTTP/FTP downloading process by using multiple
-connections for one file. It can use multiple mirrors for a download. Axel
-has no dependencies and is lightweight, so it might be useful as a wget
-clone on byte-critical systems. Axel is the perfect utility for those
-connections to wherever you are downloading from that may have a limit
-on ftp stream speeds, http sessions that burst and slow down, or servers
-with a slow connection.
+connections for one file. It can use multiple mirrors for a download.
+Axel has no dependencies and is lightweight, so it might be useful as a
+wget clone on byte-critical systems. Axel is the perfect utility for
+those connections to wherever you are downloading from that may have a
+limit on ftp stream speeds, http sessions that burst and slow down, or
+servers with a slow connection.
diff --git a/network/axel/axel.SlackBuild b/network/axel/axel.SlackBuild
index 722c1baa07..48564656ae 100644
--- a/network/axel/axel.SlackBuild
+++ b/network/axel/axel.SlackBuild
@@ -1,10 +1,10 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for axel
 
 # Copyright 2008  Antonio Hernández Blas <hba.nihilismus@gmail.com>
 # Copyright 2011  Matthew "mfillpot" Fillpot
-# Copyright 2018-2019  Jostein Berntsen <jbernts@broadpark.no>
+# Copyright 2018-2022  Jostein Berntsen <jvbernts@online.no>
 # 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.
 
+# 20220403 bkw: Modified by SlackBuilds.org, BUILD=2:
+# - strip the binary.
+# - remove useless INSTALL from package doc dir.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=axel
-VERSION=${VERSION:-2.17.3}
-BUILD=${BUILD:-1}
+VERSION=${VERSION:-2.17.11}
+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}
@@ -67,9 +78,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 {} \+
 
 ./configure \
   --prefix=/usr \
@@ -78,18 +89,15 @@ find -L . \
 
 CFLAGS="$SLKCFLAGS" \
   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
+make install-strip DESTDIR=$PKG
+gzip -9 $PKG/usr/man/man*/*
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a ABOUT-NLS AUTHORS CONTRIBUTING.md COPYING CREDITS INSTALL NEWS README VERSION $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a CONTRIBUTING.md COPYING NEWS README.md 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
-cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/network/axel/axel.info b/network/axel/axel.info
index 63ecfa99fb..411b0eeb0a 100644
--- a/network/axel/axel.info
+++ b/network/axel/axel.info
@@ -1,10 +1,10 @@
 PRGNAM="axel"
-VERSION="2.17.3"
+VERSION="2.17.11"
 HOMEPAGE="https://github.com/axel-download-accelerator/axel"
-DOWNLOAD="https://github.com/axel-download-accelerator/axel/releases/download/v2.17.3/axel-2.17.3.tar.gz"
-MD5SUM="52c3603a8323f03927145db50a0889dc"
+DOWNLOAD="https://github.com/axel-download-accelerator/axel/releases/download/v2.17.11/axel-2.17.11.tar.gz"
+MD5SUM="a03b18bc96fda568c6273e7affecbcc8"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
 MAINTAINER="Jostein Berntsen"
-EMAIL="jbernts@broadpark.no"
+EMAIL="jvbernts@online.no"
diff --git a/network/axel/doinst.sh b/network/axel/doinst.sh
deleted file mode 100644
index fa6f314c12..0000000000
--- a/network/axel/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/axelrc.new
diff --git a/network/b43-firmware/README b/network/b43-firmware/README
index aff7ccc233..7a9e71e93e 100644
--- a/network/b43-firmware/README
+++ b/network/b43-firmware/README
@@ -1,4 +1,7 @@
 Broadcom's wireless chip(s) firmware.
 
-See project homepage http://linuxwireless.org/en/users/Drivers/b43
+See project homepage
+
+https://wireless.wiki.kernel.org/en/users/drivers/b43
+
 for technical details and copyright information.
diff --git a/network/b43-firmware/b43-firmware.SlackBuild b/network/b43-firmware/b43-firmware.SlackBuild
index eb5a71f8df..7d79575fd8 100644
--- a/network/b43-firmware/b43-firmware.SlackBuild
+++ b/network/b43-firmware/b43-firmware.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for b43
 
@@ -25,13 +25,23 @@
 
 # Modified by Robby Workman <rworkman@slackbuilds.org>
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=b43-firmware
 VERSION=${VERSION:-6.30.163.46}
 ARCH=fw
 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}
@@ -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/network/b43-fwcutter/b43-fwcutter.SlackBuild b/network/b43-fwcutter/b43-fwcutter.SlackBuild
index 1646b2a46a..0be9437363 100644
--- a/network/b43-fwcutter/b43-fwcutter.SlackBuild
+++ b/network/b43-fwcutter/b43-fwcutter.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for b43-fwcutter
 
@@ -25,26 +25,36 @@
 
 # Maintained by Robby Workman <rworkman@slackbuilds.org>
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=b43-fwcutter
 VERSION=${VERSION:-019}
 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/network/badwolf/README b/network/badwolf/README
new file mode 100644
index 0000000000..b69a755b63
--- /dev/null
+++ b/network/badwolf/README
@@ -0,0 +1,17 @@
+badwolf is a minimalist browser that cares about privacy, it is based on
+WebKitGTK and thus also accepts WebKitGTK (and dependencies) flags and
+environment variables.
+
+Runtime configuration specific to badwolf will probably get added at a
+later release.
+
+Features include:
+* No browser-level tracking, multiple ephemeral isolated sessions per
+  new unrelated tabs, JavaScript off by default.
+* Small codebase (~1500 LoC), reuses existing components when available
+  or makes it available.
+* WebKitGTK native extensions, Interface customizable through CSS.
+* Stable User-Interface; The common shortcuts are available (and
+  documented), no vi-modal edition or single-key shortcuts are used.
+* Dialogs are only used when required, javascript popups open in a
+  background tab.
diff --git a/network/badwolf/badwolf.SlackBuild b/network/badwolf/badwolf.SlackBuild
new file mode 100644
index 0000000000..2b4f850571
--- /dev/null
+++ b/network/badwolf/badwolf.SlackBuild
@@ -0,0 +1,102 @@
+#!/bin/bash
+
+# Slackware build script for badwolf
+
+# Copyright 2023 Bloyburt
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=badwolf
+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 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -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" \
+PREFIX=usr \
+BINDIR=${PREFIX}/bin \
+MANDIR=${PREFIX}/man \
+DOCDIR=${PREFIX}/doc/badwolf-${VERSION} \
+DATADIR=${PREFIX}/share/badwolf \
+APPSDIR=${PREFIX}/share/applications \
+./configure
+
+ninja
+DESTDIR=$PKG ninja 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
+
+# Docs are already installed by the build system
+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/network/badwolf/badwolf.info b/network/badwolf/badwolf.info
new file mode 100644
index 0000000000..1c5e3bb1d3
--- /dev/null
+++ b/network/badwolf/badwolf.info
@@ -0,0 +1,10 @@
+PRGNAM="badwolf"
+VERSION="1.3.0"
+HOMEPAGE="https://hacktivis.me/projects/badwolf"
+DOWNLOAD="https://hacktivis.me/releases/badwolf-1.3.0.tar.gz"
+MD5SUM="9d222680f8dc274c77f530d8581c2d52"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="webkit2gtk"
+MAINTAINER="Bloyburt"
+EMAIL="alexpen@startmail.com"
diff --git a/network/badwolf/doinst.sh b/network/badwolf/doinst.sh
new file mode 100644
index 0000000000..a993650058
--- /dev/null
+++ b/network/badwolf/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/network/badwolf/slack-desc b/network/badwolf/slack-desc
new file mode 100644
index 0000000000..07e5898534
--- /dev/null
+++ b/network/badwolf/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+       |-----handy-ruler------------------------------------------------------|
+badwolf: badwolf (Minimalist and privacy-oriented webkit browser)
+badwolf:
+badwolf: badwolf is a minimalist browser that cares about privacy, it is based
+badwolf: on WebKitGTK and thus also accepts WebKitGTK (and dependencies) flags
+badwolf: and environment variables.
+badwolf:
+badwolf: Homepage: https://hacktivis.me/projects/badwolf
+badwolf:
+badwolf:
+badwolf:
+badwolf:
diff --git a/network/baikal/README b/network/baikal/README
new file mode 100644
index 0000000000..5c7d8a4370
--- /dev/null
+++ b/network/baikal/README
@@ -0,0 +1,15 @@
+Baïkal offers an extensive web interface with easy management of
+users, address books and calendars. It is fast and simple to install
+and only needs a basic php capable server and MySQL or SQLite.
+It allows to seamlessly access your contacts and calendars via iOS, 
+Mac OS X, DAVx5 on Android, Mozilla Thunderbird and every other 
+CalDAV and CardDAV capable application.
+
+Use the baikal-apache.conf from the doc directory as starting point.
+Administration is done with a web administration panel, e.g. 
+https://dav.<yourserver>/admin/
+Calendars my be shared by browsing to
+https://dav.<yourserver>/dav.php/calendars/<user>/<calendarname>/
+
+After upgrading to a newer version, browse to the administration panel
+and follow the steps.
diff --git a/network/baikal/baikal.SlackBuild b/network/baikal/baikal.SlackBuild
new file mode 100644
index 0000000000..ff3fd56296
--- /dev/null
+++ b/network/baikal/baikal.SlackBuild
@@ -0,0 +1,109 @@
+#!/bin/bash
+
+# Slackware build script for baikal
+
+# Copyright 2022-2024  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.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=baikal
+VERSION=${VERSION:-0.9.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
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM
+unzip $CWD/$PRGNAM-$VERSION.zip
+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/{usr/share/$PRGNAM,etc/httpd/extra}
+chown -R apache $PKG/usr/share/$PRGNAM
+cp -R Core config html Specific vendor $PKG/usr/share/$PRGNAM
+chown -R apache $PKG/usr/share/$PRGNAM/{config,Specific}
+# Remove cruft
+find $PKG -empty -delete
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+  README.md LICENSE \
+  $PKG/usr/doc/$PRGNAM-$VERSION
+# apache example config
+cat << EOF > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM-apache.conf
+# Example(adjusted) vhost taken https://sabre.io/baikal/install/
+#Alias /baikal /usr/share/baikal/html
+
+#<VirtualHost *:443>
+<VirtualHost *:80>
+
+    DocumentRoot /usr/share/baikal/html/
+    ServerName dav.example.org
+
+    RewriteEngine on
+    # Generally already set by global Apache configuration
+    # RewriteRule .* - [E=HTTP_AUTHORIZATION:%{HTTP:Authorization}]
+    RewriteRule /.well-known/carddav /dav.php [R=308,L]
+    RewriteRule /.well-known/caldav  /dav.php [R=308,L]
+
+    <Directory /usr/share/baikal/html/>
+        Options None
+        AllowOverride None
+        Require all granted
+    </Directory>
+
+    <IfModule mod_expires.c>
+        ExpiresActive Off
+    </IfModule>
+
+#    SSLEngine on
+#    SSLCertificateFile    /etc/letsencrypt/live/dav.example.org/fullchain.pem
+#    SSLCertificateKeyFile /etc/letsencrypt/live/dav.example.org/privkey.pem
+
+</VirtualHost>
+EOF
+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/network/baikal/baikal.info b/network/baikal/baikal.info
new file mode 100644
index 0000000000..574b0a9847
--- /dev/null
+++ b/network/baikal/baikal.info
@@ -0,0 +1,10 @@
+PRGNAM="baikal"
+VERSION="0.9.5"
+HOMEPAGE="https://sabre.io/baikal/"
+DOWNLOAD="https://github.com/sabre-io/Baikal/releases/download/0.9.5/baikal-0.9.5.zip"
+MD5SUM="47ad5c6ef9e5e87b7bd0028ad1008fbe"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Johannes Schoepfer"
+EMAIL="slackbuilds@schoepfer.info"
diff --git a/network/baikal/slack-desc b/network/baikal/slack-desc
new file mode 100644
index 0000000000..a72bcfac29
--- /dev/null
+++ b/network/baikal/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+      |-----handy-ruler------------------------------------------------------|
+baikal: baikal (lightweight CalDAV+CardDAV server)
+baikal:
+baikal: Baikal offers an extensive web interface with easy management of
+baikal: users, address books and calendars. It is fast and simple to install
+baikal: and only needs a basic php capable server and MySQL or SQLite.
+baikal: It allows to seamlessly access your contacts and calendars via iOS, 
+baikal: Mac OS X, DAVx5 on Android, Mozilla Thunderbird and every other 
+baikal: CalDAV and CardDAV capable application.
+baikal:
+baikal: https://sabre.io/baikal/
+baikal:
diff --git a/network/barnyard2/barnyard2-1.13-free.patch b/network/barnyard2/barnyard2-1.13-free.patch
new file mode 100644
index 0000000000..216fe480de
--- /dev/null
+++ b/network/barnyard2/barnyard2-1.13-free.patch
@@ -0,0 +1,11 @@
+--- a/src/output-plugins/spo_alert_unixsock.c
++++ b/src/output-plugins/spo_alert_unixsock.c
+@@ -56,6 +56,8 @@
+ #include "spo_alert_unixsock.h"
+ #include "barnyard2.h"
+ 
++#include <stdlib.h>
++
+ #define UNSOCK_FILE "barnyard2_alert"
+ 
+ 
diff --git a/network/barnyard2/barnyard2-1.13-pcap-1.9.0.patch b/network/barnyard2/barnyard2-1.13-pcap-1.9.0.patch
new file mode 100644
index 0000000000..87aec539ca
--- /dev/null
+++ b/network/barnyard2/barnyard2-1.13-pcap-1.9.0.patch
@@ -0,0 +1,38 @@
+--- a/src/output-plugins/spo_alert_fwsam.c
++++ b/src/output-plugins/spo_alert_fwsam.c
+@@ -115,7 +115,7 @@
+ #include <sys/filio.h>
+ #endif
+ 
+-typedef int SOCKET;
++typedef int BY2_SOCKET;
+ 
+ #ifndef INVALID_SOCKET
+ #define INVALID_SOCKET  -1
+@@ -961,7 +961,7 @@
+     FWsamPacket sampacket;
+     FWsamStation *station=NULL;
+     FWsamList *fwsamlist;
+-    SOCKET stationsocket;
++    BY2_SOCKET stationsocket;
+     int i,len,deletestation,stationtry=0;
+     char *encbuf,*decbuf;
+     static unsigned long lastbsip[FWSAM_REPET_BLOCKS];
+@@ -1387,7 +1387,7 @@
+ void FWsamCheckOut(FWsamStation *station)
+ {
+     FWsamPacket sampacket;
+-    SOCKET stationsocket;
++    BY2_SOCKET stationsocket;
+     int i,len;
+     char *encbuf,*decbuf;
+ 
+@@ -1538,7 +1538,7 @@
+     int i,len,stationok=TRUE;
+     FWsamPacket sampacket;
+     char *encbuf,*decbuf;
+-    SOCKET stationsocket;
++    BY2_SOCKET stationsocket;
+ 
+ 
+     /* create a socket for the station */
diff --git a/network/barnyard2/barnyard2.SlackBuild b/network/barnyard2/barnyard2.SlackBuild
index da57397e9c..35af68dd6a 100644
--- a/network/barnyard2/barnyard2.SlackBuild
+++ b/network/barnyard2/barnyard2.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for barnyard2
 # Snort binary log processor
@@ -25,10 +25,13 @@
 
 # Revision date 2012/09/15
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=barnyard2
 VERSION=${VERSION:-1.13}
 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}
@@ -65,6 +75,9 @@ cd $TMP
 rm -rf $PRGNAM-2-$VERSION
 tar xvf $CWD/$PRGNAM-2-$VERSION.tar.gz
 cd $PRGNAM-2-$VERSION
+# thanks gentoo maintainers
+patch -p1 < $CWD/barnyard2-1.13-free.patch
+patch -p1 < $CWD/barnyard2-1.13-pcap-1.9.0.patch
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -117,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/network/barnyard2/barnyard2.info b/network/barnyard2/barnyard2.info
index 5600ea402c..fb7d0def5a 100644
--- a/network/barnyard2/barnyard2.info
+++ b/network/barnyard2/barnyard2.info
@@ -1,6 +1,6 @@
 PRGNAM="barnyard2"
 VERSION="1.13"
-HOMEPAGE="http://www.securixlive.com/barnyard2/"
+HOMEPAGE="https://github.com/firnsy/barnyard2"
 DOWNLOAD="https://github.com/firnsy/barnyard2/archive/v2-1.13/barnyard2-2-1.13.tar.gz"
 MD5SUM="212066058364f18a4806720b271ffd87"
 DOWNLOAD_x86_64=""
diff --git a/network/barnyard2/slack-desc b/network/barnyard2/slack-desc
index a632466edf..1472d5b551 100644
--- a/network/barnyard2/slack-desc
+++ b/network/barnyard2/slack-desc
@@ -14,6 +14,6 @@ barnyard2: tool for the parsing of Snort's binary log files to a variety of
 barnyard2: output plugins, capable of asynchronously processing, while Snort
 barnyard2: continues it's job.
 barnyard2:
-barnyard2: Homepage: http://www.securixlive.com/barnyard2/
+barnyard2: Homepage: https://github.com/firnsy/barnyard2
 barnyard2:
 barnyard2:
diff --git a/network/barrier/barrier-2.4.0-cert-creation.patch b/network/barrier/barrier-2.4.0-cert-creation.patch
new file mode 100644
index 0000000000..817ed63fff
--- /dev/null
+++ b/network/barrier/barrier-2.4.0-cert-creation.patch
@@ -0,0 +1,11 @@
+--- src/lib/net/SecureUtils.cpp	2021-11-01 21:46:43.000000000 +0100
++++ src/lib/net/SecureUtils.cpp	2024-02-06 22:12:48.553673626 +0100
+@@ -190,7 +190,7 @@
+ 
+     X509_sign(cert, private_key, EVP_sha256());
+ 
+-    auto fp = fopen_utf8_path(path.c_str(), "r");
++    auto fp = fopen_utf8_path(path.c_str(), "w");
+     if (!fp) {
+         throw std::runtime_error("Could not open certificate output path");
+     }
diff --git a/network/barrier/barrier-2.4.0-gcc-13.patch b/network/barrier/barrier-2.4.0-gcc-13.patch
new file mode 100644
index 0000000000..5b17590491
--- /dev/null
+++ b/network/barrier/barrier-2.4.0-gcc-13.patch
@@ -0,0 +1,38 @@
+https://bugs.gentoo.org/895088
+https://github.com/debauchee/barrier/pull/1886
+
+From d376d23d534e053a160c32ee1170d237a2f3d6bd Mon Sep 17 00:00:00 2001
+From: "Benjamin A. Beasley" <code@musicinmybrain.net>
+Date: Thu, 26 Jan 2023 09:25:59 -0500
+Subject: [PATCH] Add missing #include directives needed for GCC 13
+
+---
+ src/lib/base/String.h         | 1 +
+ src/lib/net/FingerprintData.h | 1 +
+ 2 files changed, 2 insertions(+)
+
+diff --git a/src/lib/base/String.h b/src/lib/base/String.h
+index 9c5a53bac4..fa37f8f0dc 100644
+--- a/src/lib/base/String.h
++++ b/src/lib/base/String.h
+@@ -18,6 +18,7 @@
+ 
+ #pragma once
+ 
++#include <cstdint>
+ #include "common/common.h"
+ #include "common/stdstring.h"
+ 
+diff --git a/src/lib/net/FingerprintData.h b/src/lib/net/FingerprintData.h
+index 938a69538d..522a481353 100644
+--- a/src/lib/net/FingerprintData.h
++++ b/src/lib/net/FingerprintData.h
+@@ -18,6 +18,7 @@
+ #ifndef BARRIER_LIB_NET_FINGERPRINT_DATA_H
+ #define BARRIER_LIB_NET_FINGERPRINT_DATA_H
+ 
++#include <cstdint>
+ #include <string>
+ #include <vector>
+ 
+
diff --git a/network/barrier/barrier-2.4.0-includes.patch b/network/barrier/barrier-2.4.0-includes.patch
new file mode 100644
index 0000000000..048a3b0680
--- /dev/null
+++ b/network/barrier/barrier-2.4.0-includes.patch
@@ -0,0 +1,39 @@
+From aa0a2998e8894716644ea5fb29fc6f0165add956 Mon Sep 17 00:00:00 2001
+From: James Le Cuirot <chewi@gentoo.org>
+Date: Tue, 2 Nov 2021 20:59:51 +0000
+Subject: [PATCH] Add missing cstddef includes for NULL
+
+---
+ src/lib/base/Event.cpp | 2 ++
+ src/lib/base/Event.h   | 2 ++
+ 2 files changed, 4 insertions(+)
+
+diff --git a/src/lib/base/Event.cpp b/src/lib/base/Event.cpp
+index cc548fc6..08c5e98f 100644
+--- a/src/lib/base/Event.cpp
++++ b/src/lib/base/Event.cpp
+@@ -19,6 +19,8 @@
+ #include "base/Event.h"
+ #include "base/EventQueue.h"
+ 
++#include <cstddef>
++
+ //
+ // Event
+ //
+diff --git a/src/lib/base/Event.h b/src/lib/base/Event.h
+index 38a2cf11..cb00dccb 100644
+--- a/src/lib/base/Event.h
++++ b/src/lib/base/Event.h
+@@ -21,6 +21,8 @@
+ #include "common/basic_types.h"
+ #include "common/stdmap.h"
+ 
++#include <cstddef>
++
+ class EventData {
+ public:
+     EventData() { }
+-- 
+2.32.0
+
diff --git a/network/barrier/barrier.SlackBuild b/network/barrier/barrier.SlackBuild
index b03281061c..ff2bd84449 100644
--- a/network/barrier/barrier.SlackBuild
+++ b/network/barrier/barrier.SlackBuild
@@ -1,7 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 #
 # Slackware build script for Barrier (Synergy fork)
 # Written by Mario Antunes (mariolpantunes@gmail.com)
+# Updated 2024 Ruben Schuller <sb@rbn.im>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -21,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=barrier
-VERSION=${VERSION:-2.1.2}
-BUILD=${BUILD:-1}
+VERSION=${VERSION:-2.4.0}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -34,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}
@@ -61,6 +72,12 @@ cd $TMP
 rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
+
+# these are submodules in the barrier git repository.
+tar -v -C ./ext/gulrak-filesystem --strip-components=1 -x -f $CWD/filesystem*.tar.gz
+tar -v -C ./ext/gmock --strip-components=1 -x -f $CWD/googlemock*.tar.gz
+tar -v -C ./ext/gtest --strip-components=1 -x -f $CWD/googletest*.tar.gz
+
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -68,9 +85,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 {} \;
 
+# borrowed from gentoo https://gitweb.gentoo.org/repo/gentoo.git/tree/x11-misc/barrier/files
+patch -p1 < $CWD/barrier-2.4.0-includes.patch
+patch -p1 < $CWD/barrier-2.4.0-gcc-13.patch
+patch -p0 < $CWD/barrier-2.4.0-cert-creation.patch
+
 mkdir -p build
 cd build
-  cmake \
+cmake \
+    -DBARRIER_BUILD_INSTALLER=OFF \
+    -DBARRIER_BUILD_TESTS=OFF \
     -DCMAKE_C_FLAGS="$SLKCFLAGS" \
     -DCMAKE_CXX_FLAGS="$SLKCFLAGS" \
     -DCMAKE_BUILD_TYPE="Release" \
@@ -91,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/network/barrier/barrier.info b/network/barrier/barrier.info
index 1382632fdb..c776bebf23 100644
--- a/network/barrier/barrier.info
+++ b/network/barrier/barrier.info
@@ -1,10 +1,10 @@
 PRGNAM="barrier"
-VERSION="2.1.2"
+VERSION="2.4.0"
 HOMEPAGE="https://github.com/debauchee/barrier"
-DOWNLOAD="https://github.com/debauchee/barrier/archive/v2.1.2/barrier-2.1.2.tar.gz"
-MD5SUM="8cc0d40bc7da7f7e33c8c063157084b5"
+DOWNLOAD="https://github.com/debauchee/barrier/archive/v2.4.0/barrier-2.4.0.tar.gz https://github.com/gulrak/filesystem/archive/614bbe87b80435d87ab8791564370e0c1d13627d/filesystem.tar.gz https://github.com/google/googlemock/archive/7d33fee11ec480beae4c28ad09ca56d974140a72/googlemock.tar.gz https://github.com/google/googletest/archive/800f5422ac9d9e0ad59cd860a2ef3a679588acb4/googletest.tar.gz"
+MD5SUM="6f9b98a12a53cf8d0aa3b6b159aeb64f 3f5cfad2938ce8c3b8c8b9c4e49abc90 918ca93e15d4f589beb278d9b0093f1f b0b23c6e3137c995ed842b6fbae37e7b"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="avahi qt5"
-MAINTAINER="M�rio Antunes"
-EMAIL="mariolpantunes@gmail.com"
+REQUIRES="avahi"
+MAINTAINER="Ruben Schuller"
+EMAIL="sb@rbn.im"
diff --git a/network/base/README b/network/base/README
deleted file mode 100644
index 97b416357f..0000000000
--- a/network/base/README
+++ /dev/null
@@ -1,6 +0,0 @@
-BASE is the Basic Analysis and Security Engine.  It is based on code 
-from the Analysis Console for Intrusion Databases (ACID) project.
-This application provides a web frontend to query and analyze the alerts
-coming from a Snort IDS system.
-
-See the included README.SLACKWARE for information on setting up BASE.
diff --git a/network/base/README.SLACKWARE b/network/base/README.SLACKWARE
deleted file mode 100644
index 08d5dc0929..0000000000
--- a/network/base/README.SLACKWARE
+++ /dev/null
@@ -1,48 +0,0 @@
-README.SLACKWARE
-================
-
-
-0) Before installing BASE
--------------------------
-
-0.1 Necessary packages
-
-BASE requires a running installation of Snort, saving events to a database,
-either directly or through Barnyard{,2}, and adodb.
-
-I tested this with:
-  - snort-2.8.6.1
-  - barnyard2-1.8
-  - adodb-5.11
-
-Snort (with our without Barnyard) should be working fine, saving alerts to
-your database before attempting to install or configure BASE.
-
-0.2 Necessary PHP modules
-
-For the graphics to work, you will need to get some modules from the PEAR
-library.
-
-You can download & install them with a few simple commands, presuming you
-have a working internet connection. If you do not have internet access on
-the system where you are setting up BASE, check the pear instructions on how
-to download the packages and install them on a separate box.
-
-  # pear install Image_Color-1.0.4
-  # pear install Image_Canvas-0.3.2
-  # pear install Image_Graph-0.7.2
-
-
-1) Configuring BASE
--------------------
-
-After installing the BASE package, point your webbrowser to:
-
-  http://<yourserver>/base
-
-and follow the five steps to configure BASE.
-The last step is to copy the created configuration settings from your browser
-and save it as:
-
-  /var/www/htdocs/base/base_conf.php
-
diff --git a/network/base/base.SlackBuild b/network/base/base.SlackBuild
deleted file mode 100644
index 465a1aa775..0000000000
--- a/network/base/base.SlackBuild
+++ /dev/null
@@ -1,58 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for base:
-# Basic Analysis and Security Engine
-
-# Written by Niels Horn <niels.horn@gmail.com>
-# revision date 2010/09/22
-
-PRGNAM=base
-VERSION=${VERSION:-1.4.5}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-ARCH=noarch
-
-DOCROOT=${DOCROOT:-/var/www/htdocs}
-PHPUSER=${PHPUSER:-root}
-PHPGROUP=${PHPGROUP:-apache}
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-set -e
-
-rm -rf $TMP/$PRGNAM-$VERSION $PKG
-mkdir -p $TMP $PKG $OUTPUT
-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 {} \;
-
-# "Install" to $DOCROOT/base
-mkdir -p $PKG/$DOCROOT/$PRGNAM
-cp -a \
-  *.php base_conf.php.dist admin help images includes languages setup styles \
-  $PKG/$DOCROOT/$PRGNAM/
-chown -R $PHPUSER:$PHPGROUP $PKG/$DOCROOT/$PRGNAM
-
-# Copy docs
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
-  docs/* sql \
-  $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
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/network/base/base.info b/network/base/base.info
deleted file mode 100644
index 33f3e04fc3..0000000000
--- a/network/base/base.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="base"
-VERSION="1.4.5"
-HOMEPAGE="https://sourceforge.net/projects/secureideas/"
-DOWNLOAD="https://downloads.sourceforge.net/secureideas/base-1.4.5.tar.gz"
-MD5SUM="2ce7de089b7b860f8230731f94a02044"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="adodb snort"
-MAINTAINER="Niels Horn"
-EMAIL="niels.horn@gmail.com"
diff --git a/network/base/slack-desc b/network/base/slack-desc
deleted file mode 100644
index c5e4589610..0000000000
--- a/network/base/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------------------------------------------------------|
-base: base (web front-end for Snort)
-base:
-base: BASE is the Basic Analysis and Security Engine. It is based on the
-base: code from the Analysis Console for Intrusion Databases (ACID) project.
-base: This application provides a web front-end to query and analyze the
-base: alerts coming from a Snort IDS system.
-base:
-base: Homepage: https://sourceforge.net/projects/secureideas/
-base:
-base:
-base:
diff --git a/network/basilisk-bin/basilisk-bin.SlackBuild b/network/basilisk-bin/basilisk-bin.SlackBuild
index 28a8b50471..cb8c1af715 100644
--- a/network/basilisk-bin/basilisk-bin.SlackBuild
+++ b/network/basilisk-bin/basilisk-bin.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for basilisk-bin
 # Copyright 2018 Skaendo <skaendo at excite dot com>
-# Copyright 2018 Vasily Sora USA
+# Copyright 2018,2022 Vasily Sora 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=basilisk-bin
 SRCNAM=basilisk
-VERSION=${VERSION:-2018.12.18}
+VERSION=${VERSION:-2022.01.27}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
 case "$( uname -m )" in
@@ -36,7 +39,14 @@ case "$( uname -m )" in
 esac
 fi
 
-CWD=$(pwd)
+# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
+# the name of the created package would be, and then exit. This information
+# could be useful to other scripts.
+if [ ! -z "${PRINT_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 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $SRCNAM
-tar xvf $CWD/$SRCNAM-latest.linux64.tar.bz2
+tar xvf $CWD/$SRCNAM-latest.linux64.tar.xz
 cd $SRCNAM
 chown -R root:root .
 find -L . \
@@ -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/network/basilisk-bin/basilisk-bin.info b/network/basilisk-bin/basilisk-bin.info
index 5a6b4c9c94..a9010df534 100644
--- a/network/basilisk-bin/basilisk-bin.info
+++ b/network/basilisk-bin/basilisk-bin.info
@@ -1,10 +1,10 @@
 PRGNAM="basilisk-bin"
-VERSION="2018.12.18"
+VERSION="2022.01.27"
 HOMEPAGE="https://www.basilisk-browser.org"
 DOWNLOAD="UNSUPPORTED"
 MD5SUM=""
-DOWNLOAD_x86_64="http://us.basilisk-browser.org/release/basilisk-latest.linux64.tar.bz2"
-MD5SUM_x86_64="e0d89d7b48349d7622947291fbe3b1ca"
+DOWNLOAD_x86_64="http://repo.schotynet.org/sources/basilisk-bin/basilisk-latest.linux64.tar.xz"
+MD5SUM_x86_64="9d3728f8fdea1f1a2174d5d5346aa807"
 REQUIRES=""
 MAINTAINER="khronosschoty"
 EMAIL="khronosschoty@posteo.org"
diff --git a/network/basilisk/README b/network/basilisk/README
deleted file mode 100644
index 608efa0cc3..0000000000
--- a/network/basilisk/README
+++ /dev/null
@@ -1,20 +0,0 @@
-Basilisk (Web browser -- BUILD FROM SOURCE)
-
-Note: this builds Basilisk from source and conflicts with the binary
-repackage also found on SBo.
-
-Basilisk is a demonstration program for the Unified XUL Platform (XUP).
-It is a hard fork from the Mozilla code repository (mozilla-central)
-with an ESR-52 fork point.
-
-Some build time options:
-
-  GTK=gtk2 ./basilisk.SlackBuild
-
-will override the default and build with gtk2 instead of gtk3.
-
-jack-audio-connection-kit is an optional dependency and, if detected,
-automatically built. If this is undesirable you can blacklist jack, by
-passing the variable:
-
-  BLACKLIST_JACK=yes ./basilisk.SlackBuild
diff --git a/network/basilisk/autoconf-2.13-consolidated_fixes-1.patch.gz b/network/basilisk/autoconf-2.13-consolidated_fixes-1.patch.gz
deleted file mode 100644
index 1be2c680e0..0000000000
--- a/network/basilisk/autoconf-2.13-consolidated_fixes-1.patch.gz
+++ /dev/null
diff --git a/network/basilisk/basilisk.SlackBuild b/network/basilisk/basilisk.SlackBuild
deleted file mode 100644
index 8d0dc79ace..0000000000
--- a/network/basilisk/basilisk.SlackBuild
+++ /dev/null
@@ -1,246 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for basilisk
-
-# Copyright 2018 Vasily Sora 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 SlackBuilds.org
-
-PRGNAM=basilisk
-SRCNAM=${SRCNAM:-UXP}
-VERSION=${VERSION:-2018.12.18}
-RELEASEVER=${RELEASEVER:-52.9.$VERSION}
-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}
-
-OBJ=${OBJ:-obj-$PRGNAM}
-GTK=${GTK:-gtk3}
-EME=${EME:---enable-eme=widevine}
-
-# You can try changing the optimization level to simply "-O2" if your processor
-# doesn't support sse2 instructions.
-# "-Os" might help if you experience segfaults.
-OPTIMIZE=${OPTIMIZE:-"-O2 -msse2 -mfpmath=sse"}
-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
-
-# The default is to build with official branding. This SlackBuild is used to
-# produce officially approved third party "contributed builds" of Basilisk.
-# This SlackBuild can also be used to produce unapproved packages -- which
-# requires the use of the "unofficial" branding.
-BRANDING=${BRANDING:---enable-official-branding}
-if [ "$BRANDING" = "unofficial" ]; then
-  BRANDING="--disable-official-branding --with-branding=browser/branding/unofficial"
-fi
-
-rm -rf $PKG $TMP/gold $TMP/$OBJ
-mkdir -p $TMP $PKG $OUTPUT $TMP/gold $TMP/$OBJ
-
-DEBUG=" --enable-strip --disable-debug --disable-debug-symbols --enable-release"
-if [ "${ENABLE_DEBUG:-no}" = "yes" ]; then
-  DEBUG=" --disable-strip --disable-install-strip --enable-debug --enable-debug-symbols "
-  # On IA32, use gold since GNU ld runs out of memory linking libxul.so
-  # when debug is turned on
-  if [ "$ARCH" = "i586" -o "$ARCH" = "i686" ]; then
-    echo "#!/bin/bash" >> $TMP/gold/gold
-    echo "/usr/bin/ld.gold \"\$@\"" >> $TMP/gold/gold
-    cp $TMP/gold/gold $TMP/gold/ld
-    chmod +x $TMP/gold/*
-    PATH="$TMP/gold:$PATH"
-    export CC="$CC -B$TMP/gold"
-    export CXX="$CXX -B$TMP/gold"
-  fi
-fi
-
-set -e
-
-# We need to use the incredibly ancient autoconf-2.13 for this  :/
-# (Taken from Slackware's Firefox build Script)
-cd $TMP
-rm -rf autoconf-2.13
-tar xvf $CWD/autoconf-2.13.tar.xz
-cd autoconf-2.13
-zcat $CWD/autoconf-2.13-consolidated_fixes-1.patch.gz | patch -p1 --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 \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-# Build a temporary copy of autoconf-2.13 only to be used to compile
-# Basilisk, since it somewhat inexplicably requires this ancient version:
-rm -rf $TMP/autoconf-tmp
-mkdir -p $TMP/autoconf-tmp
-# This will be at the beginning of the $PATH, so protect against nonsense
-# happening in $TMP:
-chmod 700 $TMP/autoconf-tmp
-rm -rf $TMP/autoconf-tmp/*
-mkdir -p $TMP/autoconf-tmp/usr
-
-./configure \
-  --prefix=$TMP/autoconf-tmp/usr \
-  --program-suffix=-2.13 \
-  --infodir=$TMP/autoconf-tmp/usr/info \
-  --mandir=$TMP/autoconf-tmp/usr/man \
-  --build=$ARCH-slackware-linux
-
-make || make -j1
-make install
-PATH=$TMP/autoconf-tmp/usr/bin:$PATH
-
-# Build basilisk
-cd $TMP
-rm -rf $SRCNAM-$VERSION
-tar -xvf $CWD/$SRCNAM-$VERSION.tar.gz
-cd $SRCNAM-$VERSION
-
-# Set the proper version number, but do not rely on "$BASILISK_VERSION" since doing so will
-# set the version number to whenever a build takes place, rather then when a release was made.
-echo "$RELEASEVER" > application/basilisk/config/version.txt
-echo "$VERSION" > application/basilisk/config/version_display.txt
-
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-# Without LANG=C, building the Python environment may fail with:
-# "UnicodeDecodeError: 'ascii' codec can't decode byte 0xe2 in position 36: ordinal not in range(128)"
-export LANG=C
-
-export MOZCONFIG="$TMP/$SRCNAM-$VERSION/.mozconfig"
-export MOZILLA_OFFICIAL=1
-export MOZ_MAKE_FLAGS=$MAKEFLAGS
-export CFLAGS="$SLKCFLAGS"
-export CXXFLAGS="$SLKCFLAGS"
-export BUILDING_RELEASE=1
-export MOZ_ADDON_SIGNING=
-export MOZ_REQUIRE_SIGNING=
-export MOZ_TELEMETRY_REPORTING=
-export PYTHON=/usr/bin/python2
-
-# Our building options, in a configure-like display ;)
-OPTIONS="\
-  ${BRANDING} \
-  --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --with-default-mozilla-five-home=/usr/lib${LIBDIRSUFFIX}/$PRGNAM-$RELEASEVER \
-  --x-libraries=/usr/lib${LIBDIRSUFFIX} \
-  --enable-default-toolkit=cairo-$GTK \
-  $DEBUG \
-  $DEVTOOLS \
-  $EME \
-  --enable-application=browser \
-  --disable-crashreporter \
-  --disable-updater \
-  --disable-tests \
-  --enable-jemalloc \
-  --with-pthreads"
-
-echo "mk_add_options MOZ_OBJDIR=$TMP/$OBJ" > .mozconfig
-
-# Write in the .mozconfig the options above
-for option in $OPTIONS; do echo "ac_add_options $option" >> .mozconfig; done
-echo "ac_add_options --enable-optimize=\"$OPTIMIZE\"" >> .mozconfig
-
-if ! pkg-config --exists libpulse; then
-echo "ac_add_options --disable-pulseaudio" >> .mozconfig; fi
-
-if pkg-config --exists jack && [ "${BLACKLIST_JACK:-no}" != "yes" ]; then
-echo "ac_add_options --enable-jack" >> .mozconfig; fi
-
-python2 mach build
-
-## Clean up; and package Basilisk.
-mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/mozilla/plugins
-cd $TMP/$OBJ
-make install DESTDIR=$PKG
-
-cd $PKG
-
-# We don't need these (just symlinks anyway):
-rm -rf usr/lib${LIBDIRSUFFIX}/$PRGNAM-devel-$RELEASEVER
-
-# Avoid duplicate binaries; details: https://bugzilla.mozilla.org/show_bug.cgi?id=658850
-# Basilisk package scripts appear to attempt this, on other 'distros'; those scripts,
-# however, appear to fail on Slackware.
-rm -f usr/lib${LIBDIRSUFFIX}/$PRGNAM-$RELEASEVER/$PRGNAM-bin
-
-# Use system provided Hunspell, if desired.
-if [ "${USE_SYSTEM_HUNSPELL}" = "yes" ]; then
-  rm -rfv usr/lib${LIBDIRSUFFIX}/$PRGNAM-$RELEASEVER/dictionaries
-  cp -vsr /usr/share/hunspell usr/lib${LIBDIRSUFFIX}/$PRGNAM-$RELEASEVER/dictionaries
-fi
-
-# Install icons:
-for PX in 16 32 48 ; do
-  mkdir -p $PKG/usr/share/icons/hicolor/${PX}x${PX}/apps
-  ln -s /usr/lib${LIBDIRSUFFIX}/$PRGNAM-$RELEASEVER/browser/chrome/icons/default/default${PX}.png \
-        $PKG/usr/share/icons/hicolor/${PX}x${PX}/apps/$PRGNAM-$VERSION.png
-done
-# ... and the 128px icon file too:
-mkdir -p $PKG/usr/share/icons/hicolor/128x128/apps
-ln -s /usr/lib${LIBDIRSUFFIX}/$PRGNAM-$RELEASEVER/browser/icons/mozicon128.png \
-      $PKG/usr/share/icons/hicolor/128x128/apps/$PRGNAM-$VERSION.png
-
-# Install .desktop file
-mkdir -p $PKG/usr/share/applications
-sed "s|@VERSION@|$VERSION|" $CWD/$PRGNAM.desktop \
-  > $PKG/usr/share/applications/$PRGNAM.desktop
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
-  $TMP/$SRCNAM-$VERSION/LEGAL $TMP/$SRCNAM-$VERSION/LICENSE $TMP/$SRCNAM-$VERSION/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
-
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/network/basilisk/basilisk.desktop b/network/basilisk/basilisk.desktop
deleted file mode 100644
index 8a99bb38e0..0000000000
--- a/network/basilisk/basilisk.desktop
+++ /dev/null
@@ -1,13 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Name=basilisk Web Browser
-Comment=Browse the World Wide Web
-Keywords=Internet;WWW;Browser;Web;Explorer
-Exec=basilisk %u
-Terminal=false
-X-MultipleArgs=false
-Type=Application
-Icon=basilisk-@VERSION@
-Categories=Network;WebBrowser
-MimeType=text/html;text/xml;application/xhtml+xml;application/xml;application/rss+xml;application/rdf+xml;image/gif;image/jpeg;image/png;x-scheme-handler/http;x-scheme-handler/https;x-scheme-handler/ftp;x-scheme-handler/chrome;video/webm;application/x-xpinstall;
-StartupNotify=true
diff --git a/network/basilisk/basilisk.info b/network/basilisk/basilisk.info
deleted file mode 100644
index 4a97b3db63..0000000000
--- a/network/basilisk/basilisk.info
+++ /dev/null
@@ -1,12 +0,0 @@
-PRGNAM="basilisk"
-VERSION="2018.12.18"
-HOMEPAGE="https://github.com/MoonchildProductions/UXP"
-DOWNLOAD="https://github.com/MoonchildProductions/UXP/archive/v2018.12.18/UXP-2018.12.18.tar.gz \
-          http://ponce.cc/slackware/sources/repo/autoconf-2.13.tar.xz"
-MD5SUM="2aa9f8fa041686da08ea76b8188caa3e \
-        f2994d302cf736e7e71974edfa51da3c"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="ffmpeg"
-MAINTAINER="khronosschoty"
-EMAIL="khronosschoty@posteo.org"
diff --git a/network/basilisk/doinst.sh b/network/basilisk/doinst.sh
deleted file mode 100644
index afea6d71dc..0000000000
--- a/network/basilisk/doinst.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-if [ -x /usr/bin/update-desktop-database ]; then
-  /usr/bin/update-desktop-database 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/network/basilisk/slack-desc b/network/basilisk/slack-desc
deleted file mode 100644
index 25926a7da4..0000000000
--- a/network/basilisk/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------------------------------------------------------|
-basilisk: basilisk (Web browser -- BUILD FROM SOURCE)
-basilisk:
-basilisk: Basilisk is a demonstration program for the Unified XUL Platform
-basilisk: (XUP). It is a hard fork from the Mozilla code repository
-basilisk: (mozilla-central) with an ESR-52 fork point.
-basilisk:
-basilisk:
-basilisk:
-basilisk: https://github.com/MoonchildProductions/UXP
-basilisk:
-basilisk:
diff --git a/network/beegfs/README b/network/beegfs/README
new file mode 100644
index 0000000000..0ba7cbe88c
--- /dev/null
+++ b/network/beegfs/README
@@ -0,0 +1,32 @@
+BeeGFS aka. beegfs is a parallel filesystem that runs on
+vanilla Linux kernel.
+Officially supported filesystems for underlying local storage are
+ext4, xfs, and zfs.
+
+BeeGFS can be accessed through TCP and RDMA links.
+
+Each file on beegfs can be stored in a specific storage pool.
+Hard links and data/metadata mirroring are supported.
+
+Authorization is required for production use of features such as
+mirroring, quota enforcement (not quota tracking), and
+more than one storage pools, etc.
+Refer to the file "LICENSE.txt" for details.
+
+openzfs is an optional run-time dependency.
+
+Set BEEGFS_CTL_SUID to YES to install the beegfs-ctl program
+setUID to root:
+
+    env BEEGFS_CTL_SETUID=YES ./beegfs.SlackBuild
+
+The client driver is kernel-dependent, so a re-compile of
+this package is necessary for client nodes after a kernel-update.
+
+Set KERNEL to the kernel version the client driver to be built for:
+
+    env KERNEL=5.15.117 ./beegfs.SlackBuild
+
+The default ./beegfs.SlackBuild is equivalent to
+
+    env BEEGFS_CTL_SETUID=NO KERNEL=`uname -r` ./beegfs.SlackBuild
diff --git a/network/beegfs/beegfs.SlackBuild b/network/beegfs/beegfs.SlackBuild
new file mode 100644
index 0000000000..32e78d13c9
--- /dev/null
+++ b/network/beegfs/beegfs.SlackBuild
@@ -0,0 +1,180 @@
+#!/bin/bash
+
+# Slackware build script for beegfs
+
+# Copyright 2023,2024 GUAN Xin <guanx.bac@gmail.com> from Beijing
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=beegfs
+VERSION=${VERSION:-7.4.3}
+VERSION_MAJOR=$(echo $VERSION | cut -d. -f1,1)
+BUILD=${BUILD:-2}
+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
+
+BEEGFS_CTL_SETUID=${BEEGFS_CTL_SETUID:-no}
+
+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 {} \;
+
+make BEEGFS_CFLAGS="$SLKCFLAGS" USER_CXXFLAGS="$SLKCFLAGS" BEEGFS_VERSION=$VERSION common-all
+make BEEGFS_CFLAGS="$SLKCFLAGS" USER_CXXFLAGS="$SLKCFLAGS" BEEGFS_VERSION=$VERSION DESTDIR=$PKG common-install
+install -o 0 -g 0 -d -m 0755 $PKG/etc/rc.d/init.d
+install -o 0 -g 0 -p -m 0755 -t $PKG/etc/rc.d/init.d common_package/build/dist/etc/init.d/*
+install -o 0 -g 0 -d -m 0755 $PKG/etc/beegfs/lib
+install -o 0 -g 0 -p -m 0755 -t $PKG/etc/beegfs/lib common_package/scripts/etc/beegfs/lib/*
+
+make BEEGFS_CFLAGS="$SLKCFLAGS" USER_CXXFLAGS="$SLKCFLAGS" BEEGFS_VERSION=$VERSION daemons
+make BEEGFS_CFLAGS="$SLKCFLAGS" USER_CXXFLAGS="$SLKCFLAGS" BEEGFS_VERSION=$VERSION DESTDIR=$PKG daemons-install
+install -o 0 -g 0 -d -m 0755 $PKG/etc/rc.d/init.d
+install -o 0 -g 0 -d -m 0755 $PKG/etc/default
+install -o 0 -g 0 -d -m 0755 $PKG/etc/beegfs
+install -o 0 -g 0 -d -m 0755 $PKG/opt/beegfs/sbin
+for i in mgmtd meta storage helperd; do
+  install -o 0 -g 0 -p -m 0755 -t $PKG/etc/rc.d/init.d $i/build/dist/etc/init.d/*
+  install -o 0 -g 0 -p -m 0644 -t $PKG/etc/default $i/build/dist/etc/default/*
+  install -o 0 -g 0 -p -m 0600 -t $PKG/etc/beegfs $i/build/dist/etc/beegfs-$i.conf
+done
+for i in mgmtd meta storage; do
+    install -o 0 -g 0 -p -m 0755 -t $PKG/opt/beegfs/sbin $i/build/dist/sbin/*
+done
+
+make BEEGFS_CFLAGS="$SLKCFLAGS" USER_CXXFLAGS="$SLKCFLAGS" BEEGFS_VERSION=$VERSION utils
+make BEEGFS_CFLAGS="$SLKCFLAGS" USER_CXXFLAGS="$SLKCFLAGS" BEEGFS_VERSION=$VERSION DESTDIR=$PKG utils-install
+if [ "`echo $BEEGFS_CTL_SETUID | tr 'a-z' 'A-Z'`" = YES ]; then
+  chown 0:0 $PKG/opt/beegfs/sbin/beegfs-ctl
+  chmod 4755 $PKG/opt/beegfs/sbin/beegfs-ctl
+fi
+install -o 0 -g 0 -d -m 0755 $PKG/etc/bash_completion.d
+install -o 0 -g 0 -p -m 0644 -t $PKG/etc/bash_completion.d utils/scripts/etc/bash_completion.d/*
+install -o 0 -g 0 -d -m 0755 $PKG/etc/rc.d/init.d
+install -o 0 -g 0 -p -m 0755 -t $PKG/etc/rc.d/init.d mon/build/dist/etc/init.d/*
+install -o 0 -g 0 -d -m 0755 $PKG/etc/default
+install -o 0 -g 0 -p -m 0644 -t $PKG/etc/default mon/build/dist/etc/default/*
+install -o 0 -g 0 -d -m 0755 $PKG/etc/beegfs
+install -o 0 -g 0 -p -m 0600 -t $PKG/etc/beegfs mon/build/dist/etc/beegfs-mon.auth
+install -o 0 -g 0 -p -m 0600 -t $PKG/etc/beegfs mon/build/dist/etc/beegfs-mon.conf
+install -o 0 -g 0 -d -m 0755 $PKG/usr/bin
+for i in beegfs-check-servers beegfs-df beegfs-net; do
+  install -o 0 -g 0 -p -m 0755 -t $PKG/usr/bin utils/scripts/$i
+done
+ln -sf /opt/beegfs/sbin/beegfs-ctl $PKG/usr/bin
+ln -sf /opt/beegfs/sbin/beegfs-fsck $PKG/usr/bin
+install -o 0 -g 0 -d -m 0755 $PKG/sbin
+install -o 0 -g 0 -p -m 0755 -t $PKG/sbin utils/scripts/fsck.beegfs
+
+install -o 0 -g 0 -d -m 0755 $PKG/opt/beegfs/src/client/client_module_$VERSION_MAJOR
+cp -at $PKG/opt/beegfs/src/client/client_module_$VERSION_MAJOR client_module/build client_module/include client_module/source
+rm -fr $PKG/opt/beegfs/src/client/client_module_$VERSION_MAJOR/build/dist
+chown -R 0:0 $PKG/opt/beegfs/src/client/client_module_$VERSION_MAJOR
+chmod -R og-w $PKG/opt/beegfs/src/client/client_module_$VERSION_MAJOR
+install -o 0 -g 0 -d -m 0755 $PKG/etc/rc.d/init.d
+install -o 0 -g 0 -p -m 0755 -t $PKG/etc/rc.d/init.d client_module/build/dist/etc/init.d/*
+install -o 0 -g 0 -d -m 0755 $PKG/etc/default
+install -o 0 -g 0 -p -m 0644 -t $PKG/etc/default client_module/build/dist/etc/default/*
+install -o 0 -g 0 -d -m 0755 $PKG/etc/beegfs
+install -o 0 -g 0 -p -m 0644 -t $PKG/etc/beegfs client_module/build/dist/etc/beegfs-client-autobuild.conf
+install -o 0 -g 0 -p -m 0644 -t $PKG/etc/beegfs client_module/build/dist/etc/beegfs-client-build.mk
+install -o 0 -g 0 -p -m 0755 -t $PKG/etc/beegfs client_module/build/dist/etc/beegfs-client-mount-hook.example
+install -o 0 -g 0 -p -m 0600 -t $PKG/etc/beegfs client_module/build/dist/etc/beegfs-client.conf
+install -o 0 -g 0 -p -m 0600 -t $PKG/etc/beegfs client_module/build/dist/etc/beegfs-mounts.conf
+install -o 0 -g 0 -d -m 0755 $PKG/etc/beegfs/lib
+install -o 0 -g 0 -p -m 0755 -t $PKG/etc/beegfs/lib client_module/scripts/etc/beegfs/lib/*
+make -C client_module/build BEEGFS_VERSION=$VERSION KRELEASE=$KERNEL
+make BEEGFS_VERSION=$VERSION DESTDIR=$PKG PREFIX= KVER=$KERNEL KRELEASE=$KERNEL client-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
+cp -a LICENSE.txt README.md $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+# beegfs-client-devel files
+cp -at $PKG/usr client_devel/include
+cp -at $PKG/usr/doc/$PRGNAM-$VERSION client_devel/build/dist/usr/share/doc/beegfs-client-devel
+cat > $PKG/usr/doc/$PRGNAM-$VERSION/beegfs-client-devel/examples/Makefile << EOF
+% : %.cpp
+	\$(CXX) -O2 -Wall -I/opt/beegfs/src/client/client_module_$VERSION_MAJOR/include -o \$@ \$<
+EOF
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+( cd $PKG
+  find etc -type f -regextype posix-extended -regex '^etc/(default/.+|beegfs/.+\.(conf|auth))$' \
+    -exec mv {} {}.new \; \
+    -exec printf 'config %s.new\n' {} >> $PKG/install/doinst.sh \;
+  printf '\n' >> $PKG/install/doinst.sh
+)
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$PKGVER-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/network/beegfs/beegfs.info b/network/beegfs/beegfs.info
new file mode 100644
index 0000000000..7ee36d3999
--- /dev/null
+++ b/network/beegfs/beegfs.info
@@ -0,0 +1,10 @@
+PRGNAM="beegfs"
+VERSION="7.4.3"
+HOMEPAGE="https://www.beegfs.io/"
+DOWNLOAD="UNSUPPORTED"
+MD5SUM=""
+DOWNLOAD_x86_64="https://github.com/ThinkParQ/beegfs/archive/7.4.3/beegfs-7.4.3.tar.gz"
+MD5SUM_x86_64="a96c1deee976db763ef324af6f3593bc"
+REQUIRES="rdma-core"
+MAINTAINER="GUAN Xin"
+EMAIL="guanx.bac@gmail.com"
diff --git a/network/beegfs/doinst.sh b/network/beegfs/doinst.sh
new file mode 100644
index 0000000000..19a6ff6ac8
--- /dev/null
+++ b/network/beegfs/doinst.sh
@@ -0,0 +1,13 @@
+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...
+}
+
diff --git a/network/beegfs/slack-desc b/network/beegfs/slack-desc
new file mode 100644
index 0000000000..3a42f5feb0
--- /dev/null
+++ b/network/beegfs/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+      |-----handy-ruler------------------------------------------------------|
+beegfs: beegfs (a parallel filesystem)
+beegfs:
+beegfs: beegfs is a parallel filesystem that runs on vanilla Linux kernel.
+beegfs: Officially supported filesystems for underlying local storage are
+beegfs: ext4, xfs, and zfs.
+beegfs:
+beegfs: Each file on beegfs can be stored in a specific storage pool.
+beegfs:
+beegfs: beegfs can be accessed through TCP and RDMA links.
+beegfs:
+beegfs: Home: https://www.beegfs.io/
diff --git a/network/bip/README b/network/bip/README
index 582c62282f..f41a697bdc 100644
--- a/network/bip/README
+++ b/network/bip/README
@@ -1,6 +1,7 @@
-Bip is an irc proxy with SSL support, which means it keeps connected to
-your preferred IRC servers, can store the logs for you, and even send
-them back to your IRC client(s) upon connection.  You may want to use
-bip to keep your logfiles (in a unique format and on a unique computer)
-whatever your client is, when you connect from multiple workstations, or
-when you simply want to have a playback of what was said when you were away.
+Bip is an irc proxy with SSL support, which means it keeps connected
+to your preferred IRC servers, can store the logs for you, and even
+send them back to your IRC client(s) upon connection.  You may want
+to use bip to keep your logfiles (in a unique format and on a unique
+computer) whatever your client is, when you connect from multiple
+workstations, or when you simply want to have a playback of what was
+said when you were away.
diff --git a/network/bip/bip.SlackBuild b/network/bip/bip.SlackBuild
index 93d6aac4df..1ee6c2b089 100644
--- a/network/bip/bip.SlackBuild
+++ b/network/bip/bip.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for Bip
 
@@ -24,27 +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=bip
-VERSION=${VERSION:-0.9.0_rc3}
-SRCVER=${SRCVER:-0.9.0-rc3}
+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=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 +71,9 @@ 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
+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 \
@@ -72,7 +81,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=duplicate-decl-specifier" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
@@ -101,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/network/bip/bip.info b/network/bip/bip.info
index 36947c5630..78add35b6b 100644
--- a/network/bip/bip.info
+++ b/network/bip/bip.info
@@ -1,8 +1,8 @@
 PRGNAM="bip"
-VERSION="0.9.0_rc3"
+VERSION="0.9.0"
 HOMEPAGE="https://bip.milkypond.org/"
-DOWNLOAD="https://projects.duckcorp.org/attachments/download/87/bip-0.9.0-rc3.tar.gz"
-MD5SUM="f4c9af03b591d475396424e212fa41e2"
+DOWNLOAD="https://projects.duckcorp.org/attachments/download/101/bip-0.9.0.tar.gz"
+MD5SUM="2ef0fbf8c6a2e351bb6ce82ca8a5afd2"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/network/bird/README b/network/bird/README
deleted file mode 100644
index 0bd65b9886..0000000000
--- a/network/bird/README
+++ /dev/null
@@ -1,6 +0,0 @@
-Bird Internet routing suite.
-
-The BIRD project aims to develop a fully functional dynamic IP routing daemon
-primarily targeted on (but not limited to) UNIX-like systems and distributed
-under the GNU General Public License.
-
diff --git a/network/bird/bird.SlackBuild b/network/bird/bird.SlackBuild
deleted file mode 100644
index cd85b8b870..0000000000
--- a/network/bird/bird.SlackBuild
+++ /dev/null
@@ -1,79 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for bird
-# Written by Axel Scheepers <axel.scheepers@xs4all.nl>
-
-PRGNAM=bird
-VERSION=${VERSION:-1.3.11}
-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 xzvf $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 -fgnu89-inline" \
-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 -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a README TODO ChangeLog NEWS doc/*.html $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/gpl-2.0.txt > $PKG/usr/doc/$PRGNAM-$VERSION/LICENSE
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mv $PKG/etc/bird.conf $PKG/etc/bird.conf.new
-
-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/network/bird/bird.info b/network/bird/bird.info
deleted file mode 100644
index 830c070e7a..0000000000
--- a/network/bird/bird.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="bird"
-VERSION="1.3.11"
-HOMEPAGE="http://bird.network.cz/"
-DOWNLOAD="http://ponce.cc/slackware/sources/repo/bird-1.3.11.tar.gz"
-MD5SUM="8ad2eb997fb8251bc5b24cf32619571b"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Axel Scheepers"
-EMAIL="axel.scheepers@xs4all.nl"
diff --git a/network/bird/doinst.sh b/network/bird/doinst.sh
deleted file mode 100644
index 07dc704305..0000000000
--- a/network/bird/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/bird.conf.new
diff --git a/network/bird/gpl-2.0.txt b/network/bird/gpl-2.0.txt
deleted file mode 100644
index d159169d10..0000000000
--- a/network/bird/gpl-2.0.txt
+++ /dev/null
@@ -1,339 +0,0 @@
-                    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 Lesser 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/network/bird/slack-desc b/network/bird/slack-desc
deleted file mode 100644
index 1ff72e77e6..0000000000
--- a/network/bird/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------------------------------------------------------|
-bird: bird (internet routing suite)
-bird:
-bird: The BIRD project aims to develop a fully functional dynamic IP
-bird: routing daemon primarily targeted on (but not limited to) UNIX-like
-bird: systems and distributed under the GNU General Public License.
-bird:
-bird: Homepage: http://bird.network.cz
-bird:
-bird:
-bird:
-bird:
diff --git a/network/bitchx/BitchX.desktop b/network/bitchx/BitchX.desktop
new file mode 100644
index 0000000000..3aaf1634cd
--- /dev/null
+++ b/network/bitchx/BitchX.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Version=1.0
+Name=BitchX
+GenericName=IRC Client
+Comment=The bitch of IRC!
+Icon=BitchX
+Exec=BitchX
+Terminal=true
+Type=Application
+Categories=Network;IRCClient;
diff --git a/network/bitchx/README b/network/bitchx/README
new file mode 100644
index 0000000000..cbf0731bdb
--- /dev/null
+++ b/network/bitchx/README
@@ -0,0 +1,15 @@
+bitchx (IRC client)
+
+BitchX is a free software text-based IRC (Internet Relay Chat)
+client for UNIX-like systems, originally based on ircII and heavily
+influenced by EPIC.
+
+The original BitchX hasn't been updated since 2014. This build is for
+a fork by TheApacheCats that has many bugfixes and enhancements, and
+was last updated in 2019.
+
+The executable and man page are called BitchX (not bitchx).
+
+Optional: BitchX makes use of MS-DOS-style (codepage 437) graphics for
+its title screen. You can install misc/cp437 and run "cp347 BitchX"
+to see the title screen as it was intended.
diff --git a/network/bitchx/bitchx.SlackBuild b/network/bitchx/bitchx.SlackBuild
new file mode 100644
index 0000000000..a8ecee895f
--- /dev/null
+++ b/network/bitchx/bitchx.SlackBuild
@@ -0,0 +1,119 @@
+#!/bin/bash
+
+# Slackware build script for bitchx
+
+# Written by B. Watson (urchlay@slackware.uk)
+
+# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
+
+# 20220315 bkw: the old BitchX was removed a few weeks ago because it
+# won't compile on Slackware 15.0. This build is for a fork that's a
+# lot more up to date. I asked the maintainer of the old package if he
+# was OK with me submitting a new bitchx, and he gave his blessing.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=bitchx
+VERSION=${VERSION:-1.2.1_2019}
+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=BitchX
+SRCVER=${VERSION/_/-}
+
+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 /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
+
+# 20220301 bkw: --docdir is unrecognized.
+# The SHLIB_LD and LDFLAGS build everything stripped.
+
+SHLIB_LD="gcc -shared -Wl,-s" \
+LDFLAGS="-Wl,-s" \
+CFLAGS="$SLKCFLAGS -fcommon" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --mandir=/usr/man \
+  --without-gtk \
+  --with-ssl \
+  --with-plugins \
+  --enable-ipv6 \
+  --enable-tcl \
+  --disable-sound \
+  --disable-static \
+  --build=$ARCH-slackware-linux
+
+make
+make install DESTDIR=$PKG
+
+# 20220302 bkw: man page is installed bzipped, works but it's weird.
+bunzip2 ${M:=$PKG/usr/man/man1/$SRCNAM.1}.bz2
+gzip -9 $M
+
+# 20220302 bkw: .desktop file by SlackBuild author. Sure, why not?
+mkdir -p ${A:=$PKG/usr/share/applications}
+cat $CWD/$SRCNAM.desktop > $A/$SRCNAM.desktop
+
+# 20220302 bkw: since we have a .desktop, we need icons.
+mkdir -p ${I:=$PKG/usr/share/icons/hicolor}/{32x32,64x64}/apps
+convert -background none -extent 64x64 -gravity center \
+        doc/misc/bitch52.xpm $I/64x64/apps/$SRCNAM.png
+convert -background none doc/$SRCNAM.xpm $I/32x32/apps/$SRCNAM.png
+
+mkdir -p ${P:=$PKG/usr/share/pixmaps}
+ln -s ../icons/hicolor/64x64/apps/$SRCNAM.png $P
+
+mkdir -p ${PKGDOC:=$PKG/usr/doc/$PRGNAM-$VERSION}
+rm -f doc/$SRCNAM.1 # man page installed elsewhere
+cp -a COPYRIGHT Changelog IPv6-support README 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/network/bitchx/bitchx.info b/network/bitchx/bitchx.info
new file mode 100644
index 0000000000..c099bafb82
--- /dev/null
+++ b/network/bitchx/bitchx.info
@@ -0,0 +1,10 @@
+PRGNAM="bitchx"
+VERSION="1.2.1_2019"
+HOMEPAGE="https://github.com/TheApacheCats/BitchX/"
+DOWNLOAD="https://github.com/TheApacheCats/BitchX/archive/1.2.1-2019/BitchX-1.2.1-2019.tar.gz"
+MD5SUM="12157f123551b55364fa8a144e5b6a9c"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="B. Watson"
+EMAIL="urchlay@slackware.uk"
diff --git a/network/bitchx/doinst.sh b/network/bitchx/doinst.sh
new file mode 100644
index 0000000000..3e5691a052
--- /dev/null
+++ b/network/bitchx/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/network/bitchx/slack-desc b/network/bitchx/slack-desc
new file mode 100644
index 0000000000..746dab1dc3
--- /dev/null
+++ b/network/bitchx/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+      |-----handy-ruler------------------------------------------------------|
+bitchx: bitchx (IRC client)
+bitchx:
+bitchx: BitchX is a free software text-based IRC (Internet Relay Chat)
+bitchx: client for UNIX-like systems, originally based on ircII and heavily
+bitchx: influenced by EPIC.
+bitchx:
+bitchx:
+bitchx:
+bitchx:
+bitchx:
+bitchx:
diff --git a/network/bitcoin/README b/network/bitcoin/README
index 7075d3ee89..913c5d54b7 100644
--- a/network/bitcoin/README
+++ b/network/bitcoin/README
@@ -9,10 +9,8 @@ of a P2P network to check for double-spending.
 This Bitcoin client builds the backbone of the bitcoin network.
 It downloads, verifies and distributes the blockchain to other
 peers in the network. It uses lots of diskspace and bandwidth.
-If you just want to send and receive Bitcoins you should look at
-a light client like Electrum.
+If you just want to send and receive Bitcoins you can also look
+at a light client like Electrum.
 
 Please make sure to read the release notes first before upgrading:
-https://bitcoincore.org/en/releases/0.18.1/
-
-qrencode is an optional but strongly recommended dependency.
+https://bitcoincore.org/en/releases/26.0/
diff --git a/network/bitcoin/bitcoin.SlackBuild b/network/bitcoin/bitcoin.SlackBuild
index 9f9353e4b4..ebb653e67a 100644
--- a/network/bitcoin/bitcoin.SlackBuild
+++ b/network/bitcoin/bitcoin.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for bitcoin
 
-# Copyright 2012 nomnombtc <nomnombtc@arcor.de>
+# Copyright 2012-2023 nomnombtc <nomnombtc@arcor.de>
 # 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=bitcoin
-VERSION=${VERSION:-0.18.1}
+VERSION=${VERSION:-26.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}
@@ -49,6 +56,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=""
@@ -73,7 +83,7 @@ find -L . \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 # build bitcoin-core
-[ -f autogen.sh ] && sh autogen.sh
+[ -f autogen.sh ] && ./autogen.sh
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
@@ -83,15 +93,15 @@ CXXFLAGS="$SLKCFLAGS" \
   --mandir=/usr/man \
   $QRCODE \
   --with-gui=qt5 \
-  --build=$ARCH-slackware-linux \
-  --host=$ARCH-slackware-linux
+  --disable-bench \
+  --disable-tests \
+  --disable-static \
+  --build=$ARCH-slackware-linux
 
 make
 make install DESTDIR=$PKG
 
-# Remove the "test" binaries. Alternatively, you can explicitly disable tests
-# by adding "--enable-tests=no" to the above configure command.
-rm $PKG/usr/bin/test*
+rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la
 
 mkdir -p $PKG/usr/share/{applications,pixmaps}
 
@@ -115,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/network/bitcoin/bitcoin.info b/network/bitcoin/bitcoin.info
index c06c153c13..54997f0fff 100644
--- a/network/bitcoin/bitcoin.info
+++ b/network/bitcoin/bitcoin.info
@@ -1,10 +1,10 @@
 PRGNAM="bitcoin"
-VERSION="0.18.1"
+VERSION="26.0"
 HOMEPAGE="https://bitcoincore.org"
-DOWNLOAD="https://bitcoincore.org/bin/bitcoin-core-0.18.1/bitcoin-0.18.1.tar.gz"
-MD5SUM="be159bfefb78018e331d0dd7c01ef415"
+DOWNLOAD="https://bitcoincore.org/bin/bitcoin-core-26.0/bitcoin-26.0.tar.gz"
+MD5SUM="40698e9246558f0582afdc680add2cf2"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="protobuf qt5"
+REQUIRES=""
 MAINTAINER="nomnombtc"
 EMAIL="nomnombtc@arcor.de"
diff --git a/network/bitlbee-discord/bitlbee-discord.SlackBuild b/network/bitlbee-discord/bitlbee-discord.SlackBuild
index 6f5522dca2..ab5f0f3b4d 100644
--- a/network/bitlbee-discord/bitlbee-discord.SlackBuild
+++ b/network/bitlbee-discord/bitlbee-discord.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for bitlbee-discord
 
@@ -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=bitlbee-discord
 VERSION=${VERSION:-0.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}
@@ -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/network/bitlbee-steam/bitlbee-steam.SlackBuild b/network/bitlbee-steam/bitlbee-steam.SlackBuild
index 7aef45cc77..9630ee65fe 100644
--- a/network/bitlbee-steam/bitlbee-steam.SlackBuild
+++ b/network/bitlbee-steam/bitlbee-steam.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for "bitlbee-steam".
 
@@ -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=bitlbee-steam
 VERSION=${VERSION:-1.4.2}
 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}
@@ -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/network/bitlbee/README b/network/bitlbee/README
index f0063c3c44..5beb5423a4 100644
--- a/network/bitlbee/README
+++ b/network/bitlbee/README
@@ -1,15 +1,16 @@
-BitlBee is an IRC instant messaging gateway licensed under the terms of
-the GPL.  It communicates with the end user via the IRC protocol whilst
-interacting with popular chat networks such as AIM, ICQ, MSN, Yahoo,
-and Jabber. The user's buddies appear as normal IRC users in a channel,
-and conversations use the private message facility of IRC.
+BitlBee is an IRC instant messaging gateway licensed under the terms
+of the GPL.  It communicates with the end user via the IRC protocol
+whilst interacting with popular chat networks such as AIM, ICQ, MSN,
+Yahoo, and Jabber. The user's buddies appear as normal IRC users in a
+channel, and conversations use the private message facility of IRC.
 
-After your installation you will need to configure bitlbee. There are
-two ways starting bitlbee: Either as a forked daemon (preferred), or
-the old way of starting it through inetd (mostly deprecated these days).
+After your installation you will need to configure bitlbee. There
+are two ways starting bitlbee: Either as a forked daemon (preferred),
+or the old way of starting it through inetd (mostly deprecated these
+days).
 
-Bitlbee now includes a standard rc.bitlbee. To have this start on bootup,
-add the following code to /etc/rc.d/rc.local for example
+Bitlbee now includes a standard rc.bitlbee. To have this start on
+bootup, add the following code to /etc/rc.d/rc.local for example
 
   if [ -x /etc/rc.d/rc.bitlbee ]; then
     /etc/rc.d/rc.bitlbee start
@@ -30,10 +31,10 @@ Slackware and run the script as follows:
 
   OTR=yes ./bitlbee.SlackBuild
 
-From version 3.2 bitlbee offers some form of skype support, even though
-this will not ever be part of bitlbee proper. Please see the documentation
-in protocols/skype in the source package for information. You can run the
-script as following:
+From version 3.2 bitlbee offers some form of skype support, even
+though this will not ever be part of bitlbee proper. Please see
+the documentation in protocols/skype in the source package for
+information. You can run the script as following:
 
   SKYPE=yes ./bitlbee.SlackBuild
 
diff --git a/network/bitlbee/bitlbee.SlackBuild b/network/bitlbee/bitlbee.SlackBuild
index 055323d899..356c6e5504 100644
--- a/network/bitlbee/bitlbee.SlackBuild
+++ b/network/bitlbee/bitlbee.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for "bitlbee".
 
@@ -25,20 +25,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=bitlbee
 VERSION=${VERSION:-3.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}
@@ -46,8 +56,8 @@ OUTPUT=${OUTPUT:-/tmp}
 BITLBEE_USER=${BITLBEE_USER:-250}
 BITLBEE_GROUP=${BITLBEE_GROUP:-250}
 
-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"
@@ -174,4 +184,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/network/bluejeans/bluejeans.SlackBuild b/network/bluejeans/bluejeans.SlackBuild
index 5544a07e03..7b5a72f5e1 100644
--- a/network/bluejeans/bluejeans.SlackBuild
+++ b/network/bluejeans/bluejeans.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for bluejeans
 
-# Copyright 2019 Igor Alexandrov <igor.s.alexandrov@gmail.com>
+# Copyright 2019-2021 Igor Alexandrov <igor.alexandrov@outlook.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=bluejeans
-VERSION=${VERSION:-1.37.22}
+VERSION=${VERSION:-2.22.0.87}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$(uname -m)" in
@@ -35,52 +38,55 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
+# the name of the created package would be, and then exit. This information
+# could be useful to other scripts.
+if [ ! -z "${PRINT_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=BlueJeans
+EXECNAM=bluejeans-v2
+
 if [ "$ARCH" != "x86_64" ]; then
   echo "$ARCH is not supported for $PRGNAM-$VERSION"
-  exit -1
+  exit 1
 fi
 
-set -e
+set -eu
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $PKG
-rpm2cpio $CWD/$PRGNAM-$VERSION.$ARCH.rpm | cpio -idmv
-
+rpm2cpio $CWD/${SRCNAM}_${VERSION}.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 {} \;
+  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+    -o -perm 511 \) -exec chmod 755 {} \; -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 . -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 755 opt/bluejeans/bluejeans
-patchelf --replace-needed libudev.so.0 libudev.so opt/bluejeans/bluejeans-bin
-
-mkdir -p usr/{bin,doc/$PRGNAM-$VERSION,share/{applications,icons}}
+sed -i \
+  's#Categories=AudioVideo;#Categories=Network;#
+   s#^Exec=.*$#Exec=/usr/bin/bluejeans %U#' \
+  usr/share/applications/bluejeans-v2.desktop
 
-ln -s ../../opt/$PRGNAM/$PRGNAM usr/bin
-ln -s ../../../opt/$PRGNAM/$PRGNAM.desktop usr/share/applications
-ln -s ../../../opt/$PRGNAM/credits.html usr/doc/$PRGNAM-$VERSION
-cat $CWD/slack-desc > $PKG/usr/doc/$PRGNAM-$VERSION/slack-desc
+mkdir -p usr/{bin,doc/$PRGNAM-$VERSION}
+ln -s ../../opt/$SRCNAM/$EXECNAM usr/bin/$PRGNAM
+ln -s ../../../opt/$SRCNAM/LICENSE.electron.txt usr/doc/$PRGNAM-$VERSION
+ln -s ../../../opt/$SRCNAM/LICENSES.chromium.html usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-(cd opt/$PRGNAM/icons; find . -type d -exec mkdir -p ../../../usr/share/icons/{} \;)
-for i in $(find opt/$PRGNAM/icons -type f); do
-  sd=$(echo $i | cut -d/ -f4-)
-  ln -s ../../$(echo $sd | sed 's:[^/][^/]*:..:g')/$i usr/share/icons/$sd
-done
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
-/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/network/bluejeans/bluejeans.info b/network/bluejeans/bluejeans.info
index ca91f442e1..b972c16a09 100644
--- a/network/bluejeans/bluejeans.info
+++ b/network/bluejeans/bluejeans.info
@@ -1,10 +1,10 @@
 PRGNAM="bluejeans"
-VERSION="1.37.22"
+VERSION="2.22.0.87"
 HOMEPAGE="https://www.bluejeans.com"
 DOWNLOAD="UNSUPPORTED"
 MD5SUM=""
-DOWNLOAD_x86_64="https://swdl.bluejeans.com/desktop/linux/1.37/1.37.22/bluejeans-1.37.22.x86_64.rpm"
-MD5SUM_x86_64="fa34e81272a0fc37ef03daa3ff881f15"
-REQUIRES="patchelf"
+DOWNLOAD_x86_64="https://swdl.bluejeans.com/desktop-app/linux/2.22.0/BlueJeans_2.22.0.87.rpm"
+MD5SUM_x86_64="6518ca795e5517c7e5cd653b7b7d02d2"
+REQUIRES=""
 MAINTAINER="Igor Alexandrov"
-EMAIL="igor.s.alexandrov@gmail.com"
+EMAIL="igor.alexandrov@outlook.com"
diff --git a/network/bmon/README b/network/bmon/README
index a409d75ab8..9822bcb388 100644
--- a/network/bmon/README
+++ b/network/bmon/README
@@ -1,8 +1,11 @@
-bmon is a portable bandwidth monitor and rate estimator running on
-various operating systems. It supports various input methods for different
-architectures. Various output modes exist including an interactive curses
-interface, lightweight HTML output but also formatable ASCII output.
+bmon (portable bandwidth monitor and rate estimator)
 
-Statistics may be distributed over a network using multicast or unicast
-and collected at some point to generate a summary of statistics for a
-set of nodes.
+bmon is a portable bandwidth monitor and rate estimator running
+on various operating systems. It supports various input methods
+for different architectures. Various output modes exist including
+an interactive curses interface, lightweight HTML output but also
+formatable ASCII output.
+
+Statistics may be distributed over a network using multicast
+or unicast and collected at some point to generate a summary of
+statistics for a set of nodes.
diff --git a/network/bmon/bmon.SlackBuild b/network/bmon/bmon.SlackBuild
index f1147256c5..117d7b3362 100644
--- a/network/bmon/bmon.SlackBuild
+++ b/network/bmon/bmon.SlackBuild
@@ -1,17 +1,20 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for bmon
 
-# Written by B. Watson (yalhcru at gmail dot 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 github URL
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=bmon
 VERSION=${VERSION:-4.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 {} \+
 
 autoreconf -if
 
@@ -80,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/network/bmon/bmon.info b/network/bmon/bmon.info
index afcf8ecee2..11e676c211 100644
--- a/network/bmon/bmon.info
+++ b/network/bmon/bmon.info
@@ -7,4 +7,4 @@ DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="confuse"
 MAINTAINER="B. Watson"
-EMAIL="yalhcru@gmail.com"
+EMAIL="urchlay@slackware.uk"
diff --git a/network/bollux/README b/network/bollux/README
new file mode 100644
index 0000000000..da116fcd80
--- /dev/null
+++ b/network/bollux/README
@@ -0,0 +1,14 @@
+bollux (bash Gemini client)
+
+bollux is a cli client for the new Gemini protocol implemented in
+bash.
+
+CAPABILITIES
+
+- make requests
+- receive files
+- use dd to show a nice little download status
+- use less to display text/* files
+- link navigation
+- man page
+- configuration
diff --git a/network/bollux/bollux.SlackBuild b/network/bollux/bollux.SlackBuild
new file mode 100644
index 0000000000..cb75aba58a
--- /dev/null
+++ b/network/bollux/bollux.SlackBuild
@@ -0,0 +1,75 @@
+#!/bin/bash
+#
+# Slackware build script for bollux.
+#
+# Copyright 2020 Matthew Graybosch
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  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 noarch (it's just a shell script).
+# - fix permissions on man pages.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=bollux
+VERSION=${VERSION:-0.2.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
+rm -rf $TMP/$PRGNAM-$VERSION
+cd $TMP
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz || $CWD/$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+chmod 0644 *
+
+# 20220404 bkw: don't use 'make install', it's less code to do
+# this way than it is to clean up the mess.
+mkdir -p $PKG/usr/bin $PKG/usr/man/man{1,5}
+install -m0755 $PRGNAM $PKG/usr/bin
+gzip -9c < $PRGNAM.1 > $PKG/usr/man/man1/$PRGNAM.1.gz
+gzip -9c < $PRGNAM.conf.5 > $PKG/usr/man/man5/$PRGNAM.conf.5.gz
+
+DOCS="LICENSE README.md test.gmi"
+
+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/network/bollux/bollux.info b/network/bollux/bollux.info
new file mode 100644
index 0000000000..71b8e70c8c
--- /dev/null
+++ b/network/bollux/bollux.info
@@ -0,0 +1,10 @@
+PRGNAM="bollux"
+VERSION="0.2.2"
+HOMEPAGE="https://git.sr.ht/~acdw/bollux"
+DOWNLOAD="https://git.sr.ht/~acdw/bollux/archive/0.2.2.tar.gz"
+MD5SUM="035c8066266cd40d2ceb28b13030c5d2"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Matthew Graybosch"
+EMAIL="contact@matthewgraybosch.com"
diff --git a/network/bollux/slack-desc b/network/bollux/slack-desc
new file mode 100644
index 0000000000..00731e0164
--- /dev/null
+++ b/network/bollux/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+      |-----handy-ruler------------------------------------------------------|
+bollux: bollux (bash Gemini client)
+bollux:
+bollux: bollux is a cli client for the new Gemini protocol
+bollux: implemented in bash using basic shell tools.
+bollux:
+bollux: Home Page: https://git.sr.ht/~acdw/bollux
+bollux:
+bollux:
+bollux:
+bollux:
+bollux:
diff --git a/network/bombadillo/README b/network/bombadillo/README
new file mode 100644
index 0000000000..0f0da2a237
--- /dev/null
+++ b/network/bombadillo/README
@@ -0,0 +1,21 @@
+Bombadillo is a non-web browser, designed for a growing list of
+protocols operating outside of the web.
+
+Bombadillo is operated from your terminal, allowing you to browse
+content, follow links, and engage in the non-web with ease.
+The main features of Bombadillo are:
+ - Seamless browsing between multiple protocols, including Gopher,
+Gemini, Finger, and your local file system
+ - Additional support for telnet and the web through third-party
+applications - http/https connection support is opt-in, and is
+configurable in a few different ways
+ - Privacy focused - does not store usage or browsing data, will only
+store items you instruct it to (bookmarks, gemini certificates,
+settings and downloaded files)
+ - Does not send/transmit anything to anyone that you do not instruct
+it to
+ - Uses Vi/Vim-inspired keybindings and an easy command system
+ - Navigable history within a session (no storage of session data)
+ - Supports bookmarks
+ - Gemini Protocol support includes secure communication over TLS,
+and uses a TOFU-style certificate system
diff --git a/network/bombadillo/bombadillo.SlackBuild b/network/bombadillo/bombadillo.SlackBuild
new file mode 100644
index 0000000000..e5151b3dbe
--- /dev/null
+++ b/network/bombadillo/bombadillo.SlackBuild
@@ -0,0 +1,103 @@
+#!/bin/bash
+#
+# Slackware build script for bombadillo.
+#
+# Copyright 2021 Ivan Rozhkov, Russian Federation.
+# All rights reserved.
+#
+# 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=bombadillo
+VERSION=${VERSION:-2.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 the variable PRINT_PACKAGE_NAME is set, then this script will report what
+# the name of the created package would be, and then exit. This information
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; 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 || tar xvf $CWD/$VERSION.tar.gz
+cd $PRGNAM
+
+sed -i '/update-desktop-database/d' Makefile
+
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -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 -j1 \
+ DESTDIR=$PKG \
+ PREFIX=/usr \
+ MANDIR=/usr/man \
+  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/
+cp -a \
+ DEVELOPING.md \
+ LICENSE \
+ README.md \
+ 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
+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/network/bombadillo/bombadillo.info b/network/bombadillo/bombadillo.info
new file mode 100644
index 0000000000..9d374e9feb
--- /dev/null
+++ b/network/bombadillo/bombadillo.info
@@ -0,0 +1,10 @@
+PRGNAM="bombadillo"
+VERSION="2.3.3"
+HOMEPAGE="https://bombadillo.colorfield.space/"
+DOWNLOAD="https://tildegit.org/sloum/bombadillo/archive/2.3.3.tar.gz"
+MD5SUM="a112fdd9f388c62d9a67e47b9f8108c3"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="google-go-lang"
+MAINTAINER="Ivan Rozhkov"
+EMAIL="ris@disroot.org"
diff --git a/network/bombadillo/doinst.sh b/network/bombadillo/doinst.sh
new file mode 100644
index 0000000000..e9dd46ae9f
--- /dev/null
+++ b/network/bombadillo/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/network/bombadillo/slack-desc b/network/bombadillo/slack-desc
new file mode 100644
index 0000000000..95ebc03080
--- /dev/null
+++ b/network/bombadillo/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+          |-----handy-ruler------------------------------------------------------|
+bombadillo: bombadillo (bombadillo non-web browser)
+bombadillo:
+bombadillo: bombadillo is a non-web browser for the terminal. It features a
+bombadillo: full terminal user interface, vim-like keybindings, document
+bombadillo: pager, configurable settings, and a robust command selection.
+bombadillo: bombadillo supports the following protocols as first class
+bombadillo: citizens: gopher, gemini, finger, and local (a user's file
+bombadillo: system). Support for telnet, http and https is also available via
+bombadillo: integration with third party applications.
+bombadillo:
+bombadillo: http://bombadillo.colorfield.space/
diff --git a/network/bottle/README b/network/bottle/README
index f64ed2a768..fb045a510e 100644
--- a/network/bottle/README
+++ b/network/bottle/README
@@ -1,5 +1,3 @@
-bottle is a fast and simple micro-framework for small web applications. It
-offers request dispatching (Routes) with url parameter support, templates,
-a built-in HTTP Server and adapters for many third party WSGI/HTTP-server and
-template engines - all in a single file and with no dependencies other than
-the Python Standard Library.
+bottle is a fast, simple and lightweight WSGI micro web-framework
+for Python.  It is distributed as a single file module and has no
+dependencies other than the Python Standard Library.
diff --git a/network/bottle/bottle.SlackBuild b/network/bottle/bottle.SlackBuild
index ac59df529a..7043352813 100644
--- a/network/bottle/bottle.SlackBuild
+++ b/network/bottle/bottle.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for bottle
 
-# Copyright 2015-2017 Philip Lacroix <slackph at posteo dot de>
+# Copyright 2015-2023 Philip Lacroix <slackph at posteo dot de>
 # 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=bottle
-VERSION=${VERSION:-0.12.13}
+VERSION=${VERSION:-0.12.23}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -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-$PRGNAM}
+PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
 set -e
@@ -53,8 +60,8 @@ chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 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 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
 
@@ -65,11 +72,11 @@ PRGDOC=$PKG/usr/doc/$PRGNAM-$VERSION
 
 # Install documentation.
 mkdir -p $PRGDOC
-cp -a README.rst PKG-INFO $PRGDOC/
+cp -a AUTHORS README.rst LICENSE $PRGDOC/
 cat $CWD/$PRGNAM.SlackBuild > $PRGDOC/$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/network/bottle/bottle.info b/network/bottle/bottle.info
index 49e70de934..e2539a1e47 100644
--- a/network/bottle/bottle.info
+++ b/network/bottle/bottle.info
@@ -1,8 +1,8 @@
 PRGNAM="bottle"
-VERSION="0.12.13"
-HOMEPAGE="http://bottlepy.org/docs/dev/"
-DOWNLOAD="https://pypi.python.org/packages/bd/99/04dc59ced52a8261ee0f965a8968717a255ea84a36013e527944dbf3468c/bottle-0.12.13.tar.gz"
-MD5SUM="d2fe1b48c1d49217e78bf326b1cad437"
+VERSION="0.12.23"
+HOMEPAGE="https://bottlepy.org/docs/dev/"
+DOWNLOAD="https://github.com/bottlepy/bottle/archive/0.12.23/bottle-0.12.23.tar.gz"
+MD5SUM="01d9bb5079000cf64cdac6f1a174ae29"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/network/boxcryptor/README b/network/boxcryptor/README
deleted file mode 100644
index 703f39ac1c..0000000000
--- a/network/boxcryptor/README
+++ /dev/null
@@ -1,7 +0,0 @@
-Boxcryptor protects your files in the cloud no matter if you use
-Dropbox, Google Drive, Microsoft OneDrive, SugarSync, Box, or any
-other major cloud storage provider. It also supports all the
-clouds that use WebDAV standard such as Cubby, Strato HiDrive,
-and ownCloud.
-
-`kdesu` is a runtime dependency.
diff --git a/network/boxcryptor/boxcryptor.SlackBuild b/network/boxcryptor/boxcryptor.SlackBuild
deleted file mode 100644
index 40bd5e7b8d..0000000000
--- a/network/boxcryptor/boxcryptor.SlackBuild
+++ /dev/null
@@ -1,92 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for boxcryptor
-
-# Ryan P.C. McQuen | Everett, 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
-# <https://www.gnu.org/licenses/>.
-
-PRGNAM=boxcryptor
-SRCNAM=Boxcryptor
-VERSION=${VERSION:-2.2.410.162}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-DOCS="README"
-
-if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-    *) export ARCH=$( uname -m ) ;;
-  esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
-else
-  echo "Your architecture is not supported."
-  exit 1
-fi
-
-SHORTARCH=`getconf LONG_BIT`
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM
-mkdir -p $PRGNAM
-cd $PRGNAM
-tar -xvpf $CWD/$SRCNAM\_Portable\_Linux$SHORTARCH\_$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 \
- \( -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/opt/
-mkdir -p $PKG/usr/bin/
-mv ../$PRGNAM/ $PKG/opt/
-
-## we make our own script
-cat <<EOT > $PKG/usr/bin/${PRGNAM}
-#!/bin/sh
-## This has to be run with sudo
-## until i can find a way around the
-## permissions debacle.
-kdesu /opt/${PRGNAM}/${SRCNAM}\_Portable.sh "\$@"
-EOT
-chmod 755 $PKG/usr/bin/${PRGNAM}
-
-
-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/network/boxcryptor/boxcryptor.info b/network/boxcryptor/boxcryptor.info
deleted file mode 100644
index 5b3e392b9d..0000000000
--- a/network/boxcryptor/boxcryptor.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="boxcryptor"
-VERSION="2.2.410.162"
-HOMEPAGE="https://boxcryptor.com"
-DOWNLOAD="UNSUPPORTED"
-MD5SUM=""
-DOWNLOAD_x86_64="http://ponce.cc/slackware/sources/repo/Boxcryptor_Portable_Linux64_2.2.410.162.tar.gz"
-MD5SUM_x86_64="74fe13e5946ad1e3bcc8176206f3e68d"
-REQUIRES=""
-MAINTAINER="orphaned - no maintainer"
-EMAIL="nobody@nowhere"
diff --git a/network/boxcryptor/slack-desc b/network/boxcryptor/slack-desc
deleted file mode 100644
index 6ec762f795..0000000000
--- a/network/boxcryptor/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------------------------------------------------------|
-boxcryptor: boxcryptor (cloud encryption service)
-boxcryptor:
-boxcryptor: Boxcryptor protects your files in the cloud no matter if you use
-boxcryptor: Dropbox, Google Drive, Microsoft OneDrive, SugarSync, Box, or any
-boxcryptor: other major cloud storage provider.
-boxcryptor:
-boxcryptor:
-boxcryptor:
-boxcryptor:
-boxcryptor: https://boxcryptor.com
-boxcryptor:
diff --git a/network/bozohttpd/bozohttpd.SlackBuild b/network/bozohttpd/bozohttpd.SlackBuild
index efe8bdbadf..18e3d5e69a 100644
--- a/network/bozohttpd/bozohttpd.SlackBuild
+++ b/network/bozohttpd/bozohttpd.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for bozohttpd
 
@@ -22,7 +22,13 @@
 #  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>.
+
+# 20240206 bkw: Update for v20240126.
+# 20230103 bkw: Update for v20220517.
+# 20210911 bkw: Update for v20210227.
+# 20201102 bkw: Update for v20201014.
+# 20191201 bkw: Update for v20190228.
 
 # 20181203 bkw:
 # - Update for v20181125.
@@ -43,10 +49,13 @@
 # - Tweak man page, de-NetBSDify the pathnames.
 # - Simplify script a bit.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=bozohttpd
-VERSION=${VERSION:-20181125}
+VERSION=${VERSION:-20240126}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -56,23 +65,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
@@ -132,6 +141,11 @@ case "$LUA" in
       ;;
 esac
 
+# 20220207 bkw: due to 15.0's newer gcc, non-lua and lua 5.2 builds
+# were failing (and I didn't notice right away because I keep lua 5.3
+# installed).
+sed -i '1i#include <stdint.h>' $PRGNAM.c
+
 echo "=== LUA='$LUA'"
 if [ "$LUA" != "no" ] && lua$LUA -v &>/dev/null; then
   LUAOPT="-I/usr/include/lua$LUA"
@@ -157,7 +171,7 @@ if [ -n "$DEFFILE" ]; then
   DEFINES="$( echo $( sed 's,#.*$,,' "$DEFFILE" ) )"
   echo "=== using defines from $DEFFILE: '$DEFINES'"
 else
-  DEFINES="-DDO_HTPASSWD"
+  DEFINES="-DDO_HTPASSWD -DNO_BLOCKLIST_SUPPORT"
 fi
 
 # 20180629 bkw: The man page was written for NetBSD, where I guess
@@ -182,6 +196,9 @@ sed -i \
 # Probably doesn't hurt anything, but might cause problems later.
 # More worrisome is missing crypt() prototype (causes implicit pointer
 # to int casts, baaaaad, especially on 64-bit).
+# 20240206 bkw: rather than try to figure out why #define _XOPEN_SOURCE
+# doesn't provide a prototype for strptime(), and #define _GNU_SOURCE
+# doesn't give us vasprintf(), just put the damn prototypes in the patch.
 patch -p1 < $CWD/fix_warnings.diff
 
 # Fix build (from Arch Linux' AUR).
@@ -203,4 +220,4 @@ mkdir -p $PKG/install
 sed "s,@WITHLUA@,$WITHLUA," $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/network/bozohttpd/bozohttpd.info b/network/bozohttpd/bozohttpd.info
index 2d275dca86..b8e85c3dae 100644
--- a/network/bozohttpd/bozohttpd.info
+++ b/network/bozohttpd/bozohttpd.info
@@ -1,10 +1,10 @@
 PRGNAM="bozohttpd"
-VERSION="20181125"
-HOMEPAGE="http://www.eterna.com.au/bozohttpd/"
-DOWNLOAD="http://www.eterna.com.au/bozohttpd/bozohttpd-20181125.tar.bz2"
-MD5SUM="e9ee8f82ebcf9ef9b293c6af32672082"
+VERSION="20240126"
+HOMEPAGE="http://eterna23.net/bozohttpd/"
+DOWNLOAD="https://cdn.netbsd.org/pub/pkgsrc/distfiles/LOCAL_PORTS/bozohttpd-20240126.tar.bz2"
+MD5SUM="be23cc851dc706dfe56ba186e9dae2bb"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
 MAINTAINER="B. Watson"
-EMAIL="yalhcru@gmail.com"
+EMAIL="urchlay@slackware.uk"
diff --git a/network/bozohttpd/defines.default b/network/bozohttpd/defines.default
index ef1e392ea2..6f2a8e4a72 100644
--- a/network/bozohttpd/defines.default
+++ b/network/bozohttpd/defines.default
@@ -33,3 +33,6 @@
 
 # SSL support (-z, -Z options). Uncomment to disable:
 # -DNO_SSL_SUPPORT
+
+# blocklist(8) support. This is BSD-specific (for now?), DON'T comment out:
+-DNO_BLOCKLIST_SUPPORT
diff --git a/network/bozohttpd/fix_warnings.diff b/network/bozohttpd/fix_warnings.diff
index 72b566edf1..1a94ba656d 100644
--- a/network/bozohttpd/fix_warnings.diff
+++ b/network/bozohttpd/fix_warnings.diff
@@ -1,7 +1,7 @@
-diff -Naur bozohttpd-20170201/auth-bozo.c bozohttpd-20170201.patched/auth-bozo.c
---- bozohttpd-20170201/auth-bozo.c	2017-01-31 23:21:23.000000000 -0500
-+++ bozohttpd-20170201.patched/auth-bozo.c	2018-06-29 15:42:59.076820050 -0400
-@@ -34,9 +34,12 @@
+diff -Naur bozohttpd-20240126/auth-bozo.c bozohttpd-20240126.patched/auth-bozo.c
+--- bozohttpd-20240126/auth-bozo.c	2024-02-04 00:55:04.000000000 -0500
++++ bozohttpd-20240126.patched/auth-bozo.c	2024-02-06 23:34:21.493549206 -0500
+@@ -34,11 +34,15 @@
  
  #ifdef DO_HTPASSWD
  
@@ -13,24 +13,35 @@ diff -Naur bozohttpd-20170201/auth-bozo.c bozohttpd-20170201.patched/auth-bozo.c
 +#include <strings.h>
  #include <stdlib.h>
  #include <unistd.h>
++#include <crypt.h>
  
-diff -Naur bozohttpd-20170201/bozohttpd.c bozohttpd-20170201.patched/bozohttpd.c
---- bozohttpd-20170201/bozohttpd.c	2017-01-31 23:21:23.000000000 -0500
-+++ bozohttpd-20170201.patched/bozohttpd.c	2018-06-29 15:08:08.066873176 -0400
-@@ -132,6 +132,10 @@
+ #include "bozohttpd.h"
+ 
+diff -Naur bozohttpd-20240126/bozohttpd.c bozohttpd-20240126.patched/bozohttpd.c
+--- bozohttpd-20240126/bozohttpd.c	2024-02-04 00:55:04.000000000 -0500
++++ bozohttpd-20240126.patched/bozohttpd.c	2024-02-06 23:45:26.157486654 -0500
+@@ -122,6 +122,8 @@
   * And so it begins ..
   */
  
-+/* need this for vasprintf(): */
-+#define _GNU_SOURCE
 +#include <stdio.h>
 +
  #include <sys/param.h>
  #include <sys/socket.h>
  #include <sys/time.h>
-diff -Naur bozohttpd-20170201/lua-bozo.c bozohttpd-20170201.patched/lua-bozo.c
---- bozohttpd-20170201/lua-bozo.c	2017-01-31 23:21:23.000000000 -0500
-+++ bozohttpd-20170201.patched/lua-bozo.c	2018-06-29 15:43:38.424819051 -0400
+@@ -145,6 +147,9 @@
+ #include <time.h>
+ #include <unistd.h>
+ 
++extern char *strptime(const char *restrict s, const char *restrict format, struct tm *restrict tm);
++extern int vasprintf(char **restrict strp, const char *restrict fmt, va_list ap);
++
+ #include "bozohttpd.h"
+ 
+ #ifndef SSL_TIMEOUT
+diff -Naur bozohttpd-20240126/lua-bozo.c bozohttpd-20240126.patched/lua-bozo.c
+--- bozohttpd-20240126/lua-bozo.c	2024-02-04 00:55:04.000000000 -0500
++++ bozohttpd-20240126.patched/lua-bozo.c	2024-02-06 23:16:22.339650764 -0500
 @@ -32,6 +32,9 @@
  
  #ifndef NO_LUA_SUPPORT
@@ -41,9 +52,9 @@ diff -Naur bozohttpd-20170201/lua-bozo.c bozohttpd-20170201.patched/lua-bozo.c
  #include <sys/param.h>
  
  #include <lua.h>
-diff -Naur bozohttpd-20170201/ssl-bozo.c bozohttpd-20170201.patched/ssl-bozo.c
---- bozohttpd-20170201/ssl-bozo.c	2017-01-31 23:21:23.000000000 -0500
-+++ bozohttpd-20170201.patched/ssl-bozo.c	2018-06-29 15:07:50.813873614 -0400
+diff -Naur bozohttpd-20240126/ssl-bozo.c bozohttpd-20240126.patched/ssl-bozo.c
+--- bozohttpd-20240126/ssl-bozo.c	2024-02-04 00:55:04.000000000 -0500
++++ bozohttpd-20240126.patched/ssl-bozo.c	2024-02-06 23:16:22.339650764 -0500
 @@ -32,6 +32,9 @@
  
  /* this code implements SSL and backend IO for bozohttpd */
@@ -53,4 +64,4 @@ diff -Naur bozohttpd-20170201/ssl-bozo.c bozohttpd-20170201.patched/ssl-bozo.c
 +
  #include <stdarg.h>
  #include <stdio.h>
- #include <syslog.h>
+ #include <string.h>
diff --git a/network/bpfmon/README b/network/bpfmon/README
new file mode 100644
index 0000000000..578ffa5b34
--- /dev/null
+++ b/network/bpfmon/README
@@ -0,0 +1,6 @@
+BPF based visual packet rate monitor.
+While tcpdump shows what packets are going through the network,
+bpfmon will show how much in terms of bytes per second and packets
+per second in a nice pseudo-graphical terminal interface.
+bpfmon also supports monitoring an iptables rule that is selected
+by command line option or selected from a menu.
diff --git a/network/bpfmon/bpfmon.SlackBuild b/network/bpfmon/bpfmon.SlackBuild
new file mode 100644
index 0000000000..5331c3663c
--- /dev/null
+++ b/network/bpfmon/bpfmon.SlackBuild
@@ -0,0 +1,98 @@
+#!/bin/bash
+
+# Slackware build script for bpfmon
+
+# 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.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=bpfmon
+VERSION=${VERSION:-2.51}
+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 {} \;
+
+sed -i "s|share/man|man|" Makefile
+
+CFLAGS="$SLKCFLAGS" \
+make install DESTDIR=$PKG PREFIX=/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
+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/network/bpfmon/bpfmon.info b/network/bpfmon/bpfmon.info
new file mode 100644
index 0000000000..f7db79bf56
--- /dev/null
+++ b/network/bpfmon/bpfmon.info
@@ -0,0 +1,10 @@
+PRGNAM="bpfmon"
+VERSION="2.51"
+HOMEPAGE="https://github.com/bbonev/bpfmon"
+DOWNLOAD="https://github.com/bbonev/bpfmon/releases/download/v2.51/bpfmon-2.51.tar.xz"
+MD5SUM="54c105b49808ac8b8ad7af0dba6f73b9"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="yascreen"
+MAINTAINER="Matteo Bernardini"
+EMAIL="ponce@slackbuilds.org"
diff --git a/network/bpfmon/slack-desc b/network/bpfmon/slack-desc
new file mode 100644
index 0000000000..579a413f52
--- /dev/null
+++ b/network/bpfmon/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+      |-----handy-ruler------------------------------------------------------|
+bpfmon: bpfmon (network packet monitor)
+bpfmon:
+bpfmon: BPF based visual packet rate monitor.
+bpfmon: While tcpdump shows what packets are going through the network,
+bpfmon: bpfmon will show how much in terms of bytes per second and packets
+bpfmon: per second in a nice pseudo-graphical terminal interface.
+bpfmon: bpfmon also supports monitoring an iptables rule that is selected
+bpfmon: by command line option or selected from a menu.
+bpfmon:
+bpfmon: homepage: https://github.com/bbonev/bpfmon
+bpfmon:
diff --git a/network/brave-browser/README b/network/brave-browser/README
index 45d71fb02a..71ec3bbdb6 100644
--- a/network/brave-browser/README
+++ b/network/brave-browser/README
@@ -1,15 +1,6 @@
-Brave is on a mission to fix the Web by giving users a safer, faster,
-and better browsing experience – while growing support for content
-creators through a new attention-based ecosystem of rewards.
+Brave is a free and open-source web browser developed by Brave
+Software, Inc. based on the Chromium web browser.
 
-Much more than a browser, Brave is a new way of thinking about how the
-Web works.
-
-Brave is open source, and built by a team of privacy focused,
-performance oriented pioneers of the Web, founded by the inventor
-of Javascript and co-founder of Mozilla.
-
-Brave is 64-bit software.
-
-This SlackBuild does not build Brave from source, it simply repackages
+Note:
+This SlackBuild does not build Brave from source, it repackages
 the binary.
diff --git a/network/brave-browser/brave-browser.SlackBuild b/network/brave-browser/brave-browser.SlackBuild
index 9278d74e4e..9d3e673b63 100644
--- a/network/brave-browser/brave-browser.SlackBuild
+++ b/network/brave-browser/brave-browser.SlackBuild
@@ -1,7 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for brave-browser
 
+# Copyright 2019-2024 Andrew Payne <phalange@komputermatrix.com>
 # Copyright 2018-2019 Donald Cooley South Haven, Indiana USA
 # All rights reserved.
 #
@@ -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=brave-browser
-VERSION=${VERSION:-0.67.125}
+VERSION=${VERSION:-1.64.122}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+DEBBUILD=${DEBBUILD:-1}
 
 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}
@@ -54,7 +66,7 @@ cd $TMP
 rm -rf $PRGNAM-$VERSION
 mkdir -p $PRGNAM-$VERSION
 cd $PRGNAM-$VERSION
-rpm2cpio < $CWD/${PRGNAM}-${VERSION}-${BUILD}.${ARCH}.rpm | cpio -imdv
+rpm2cpio < $CWD/${PRGNAM}-${VERSION}-${DEBBUILD}.${ARCH}.rpm | cpio -imdv
 chown -R root:root .
 find -L . \
 \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -62,25 +74,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 {} \;
 
-cp -ap usr opt $PKG/
+# brave has its own symlinks from opt to bin
+cp -ap {opt,usr} $PKG/
 
-# Slackware doesn't ship a GNOME desktop so I don't see any reason for gnome-control-center
+# Slackware doesn't ship GNOME desktop
 rm -rf $PKG/usr/share/gnome-control-center
 
-# Move icon into place
+# move icon into place
 mkdir -p $PKG/usr/share/pixmaps
-cp opt/brave.com/brave/*.xpm $PKG/usr/share/pixmaps/brave-browser.xpm
+cp -a opt/brave.com/brave/product_logo_32.xpm \
+   $PKG/usr/share/pixmaps/brave-browser.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
 
-# Place man page(s) where The Man likes 'em
+# move man pages into place
 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 $PKG/opt/brave.com/brave/LICENSE \
+   $PKG/usr/doc/$PRGNAM-$VERSION/
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
@@ -88,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/network/brave-browser/brave-browser.info b/network/brave-browser/brave-browser.info
index f982dcc8ba..d68bee1d94 100644
--- a/network/brave-browser/brave-browser.info
+++ b/network/brave-browser/brave-browser.info
@@ -1,10 +1,10 @@
 PRGNAM="brave-browser"
-VERSION="0.67.125"
+VERSION="1.64.122"
 HOMEPAGE="https://brave.com"
 DOWNLOAD="UNSUPPORTED"
 MD5SUM=""
-DOWNLOAD_x86_64="https://github.com/brave/brave-browser/releases/download/v0.67.125/brave-browser-0.67.125-1.x86_64.rpm"
-MD5SUM_x86_64="e3dbf6b0d360ba3b4e19164a3e9f56b1"
+DOWNLOAD_x86_64="https://github.com/brave/brave-browser/releases/download/v1.64.122/brave-browser-1.64.122-1.x86_64.rpm"
+MD5SUM_x86_64="4f1cea9538b7813f87b3e32b15dcf71c"
 REQUIRES=""
-MAINTAINER="Donald Cooley"
-EMAIL="chytraeu@sdf.org"
+MAINTAINER="Andrew Payne"
+EMAIL="phalange@komputermatrix.com"
diff --git a/network/brave-browser/doinst.sh b/network/brave-browser/doinst.sh
index 2675e13764..57c1cdfc42 100644
--- a/network/brave-browser/doinst.sh
+++ b/network/brave-browser/doinst.sh
@@ -1,5 +1,5 @@
 if [ -x /usr/bin/update-desktop-database ]; then
-          /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
+    /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
 fi
 
 if [ -x /usr/bin/update-mime-database ]; then
diff --git a/network/brave-browser/slack-desc b/network/brave-browser/slack-desc
index fb3dc60d85..28f48b7b68 100644
--- a/network/brave-browser/slack-desc
+++ b/network/brave-browser/slack-desc
@@ -6,14 +6,14 @@
 # customary to leave one space after the ':' except on otherwise blank lines.
 
              |-----handy-ruler------------------------------------------------------|
-brave-browser: brave-browser (a safer, faster, and better Web browsing experience)
+brave-browser: brave-browser (open source web browser)
+brave-browser:
+brave-browser: Brave is a free and open-source web browser developed by Brave
+brave-browser: Software, Inc. based on the Chromium web browser.
+brave-browser:
+brave-browser:
+brave-browser:
+brave-browser:
+brave-browser:
+brave-browser: Homepage: https://brave-browser.com
 brave-browser:
-brave-browser: Brave is on a mission to fix the Web by giving users a safer, faster,
-brave-browser: and better browsing experience - while growing support for content
-brave-browser: creators through a new attention-based ecosystem of rewards.
-brave-browser: Much more than a browser, Brave is a new way of thinking about how
-brave-browser: the Web works.
-brave-browser: Brave is open source, and built by a team of privacy focused,
-brave-browser: performance oriented pioneers of the Web, founded by the inventor of
-brave-browser: Javascript and co-founder of Mozilla.
-brave-browser: https://brave-browser.com
diff --git a/network/bro/bro.SlackBuild b/network/bro/bro.SlackBuild
deleted file mode 100644
index f714a62bac..0000000000
--- a/network/bro/bro.SlackBuild
+++ /dev/null
@@ -1,101 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for bro
-
-# Copyright 2018 Michael Edie 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.
-
-PRGNAM=bro
-VERSION=${VERSION:-2.6.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 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
-  --prefix=/opt/$PRGNAM
-
-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
-
-BIN="bro broccoli-config bro-config broctl bro-cut capstats trace-summary"
-mkdir -p $PKG/usr/bin
-for i in $BIN
-  do ln -sf /opt/$PRGNAM/bin/$i $PKG/usr/bin/$i
-done
-
-mv $PKG/opt/$PRGNAM/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 CHANGES README COPYING NEWS 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/network/bro/bro.info b/network/bro/bro.info
deleted file mode 100644
index 4b2f654d72..0000000000
--- a/network/bro/bro.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="bro"
-VERSION="2.6.2"
-HOMEPAGE="https://www.zeek.org"
-DOWNLOAD="https://www.zeek.org/downloads/bro-2.6.2.tar.gz"
-MD5SUM="38fa8313b25f4dff8723b3c47265ece1"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Michael Edie"
-EMAIL="michael@sawbox.net"
diff --git a/network/bro/slack-desc b/network/bro/slack-desc
deleted file mode 100644
index 6a49889bbd..0000000000
--- a/network/bro/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------------------------------------------------------|
-bro: Zeek (The Zeek Network Security Monitor)
-bro:
-bro: Zeek is an open source intrusion detection system (IDS).
-bro: It is different from traditional IDS tools in that it is
-bro: focused on network analysis. In other words, it is used
-bro: to monitor traffic traversing a network to identify anomalies.
-bro:
-bro:
-bro: https://www.bro.org
-bro:
-bro:
diff --git a/network/broadcom-sta/README b/network/broadcom-sta/README
deleted file mode 100644
index c14eef70a7..0000000000
--- a/network/broadcom-sta/README
+++ /dev/null
@@ -1,35 +0,0 @@
-The broadcom-sta package includes the kernel module 'wl', which contains
-a Broadcom-provided proprietary kernel driver known to support the
-listed chipsets.
-
-BCM4311  (PCI ID 14e4:4311, 14e4:4312, 14e4:4313)
-BCM4312  (PCI ID 14e4:4315)
-BCM4313  (PCI ID 14e4:4727)
-BCM4321  (PCI ID 14e4:4328, 14e4:4329, 14e4:432a)
-BCM4322  (PCI ID 14e4:432b, 14e4:432c, 14e4:432d)
-BCM43142 (PCI ID 14e4:4365)
-BCM43224 (PCI ID 14e4:4353)
-BCM43225 (PCI ID 14e4:4357)
-BCM43227 (PCI ID 14e4:4358)
-BCM43228 (PCI ID 14e4:4359)
-BCM4331  (PCI ID 14e4:4331)
-BCM4360  (PCI ID 14e4:43a0)
-BCM4352  (PCI ID 14e4:43b1)
-
-Some of these devices are also supported by the free b43 and brcm80211
-drivers.  In order to avoid conflicts /etc/modprobe.d/b43_blacklist.conf
-disables these drivers.
-
-Read the included LICENSE.txt file (placed in /usr/doc) before using the
-proprietary driver.
-
-To build the module for a kernel that isn't currently running on the
-system, pass that kernel's "uname -r" output such as:
-
-    KERNEL=4.4.67 ./broadcom-sta.SlackBuild
-
-If you would like to name your interface wlan0 instead of eth1, either
-rename the device in /etc/udev/rules.d/70-persistent-net.rules or build
-the package with:
-
-    IFNAME=wlan ./broadcom-sta.SlackBuild
diff --git a/network/broadcom-sta/broadcom-sta.SlackBuild b/network/broadcom-sta/broadcom-sta.SlackBuild
deleted file mode 100644
index e533023942..0000000000
--- a/network/broadcom-sta/broadcom-sta.SlackBuild
+++ /dev/null
@@ -1,132 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for broadcom-sta
-
-# Copyright 2015-2019 Andreas Voegele <andreas@andreasvoegele.com>
-#
-# 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.
-#
-# 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.
-
-PRGNAM=broadcom-sta
-VERSION=${VERSION:-6.30.223.271}
-BUILD=${BUILD:-3}
-TAG=${TAG:-_SBo}
-
-KERNEL=${KERNEL:-$( uname -r )}
-IFNAME=${IFNAME:-eth}
-
-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}
-
-case "$ARCH" in
-  i?86)
-    SRCNAM=hybrid-v35-nodebug-pcoem
-    ;;
-  x86_64)
-    SRCNAM=hybrid-v35_64-nodebug-pcoem
-    ;;
-  *)
-    echo "$ARCH is not supported..."
-    exit 1
-    ;;
-esac
-
-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/$SRCNAM-$( echo $VERSION | tr . _ ).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 {} \;
-
-if [ "$IFNAME" != "eth" ]; then
-  sed -i "/BRCM_WLAN_IFNAME/s/eth/$IFNAME/" src/wl/sys/wl_linux.c
-fi
-
-patch -p2 < $CWD/patches/04-user_ioctl.patch
-patch -p2 < $CWD/patches/05-remove-time-and-date-macros.patch
-patch -p2 < $CWD/patches/13-broadcom-sta-6.30.223.248-linux-3.18-null-pointer-crash.patch
-patch -p2 < $CWD/patches/14-rdtscl.patch
-#patch -p2 < $CWD/patches/15-linux47.patch
-if [ -n "${KERNEL##[23].*}" -a -n "${KERNEL##4.[0-6].*}" ]; then
-  sed -i.orig 's/IEEE80211_BAND_\([25]\)GHZ/NL80211_BAND_\1GHZ/g' \
-    src/wl/sys/wl_cfg80211_hybrid.c
-fi
-patch -p2 < $CWD/patches/16-linux48.patch
-patch -p2 < $CWD/patches/17-fix-kernel-warnings.patch
-patch -p2 < $CWD/patches/18-linux411.patch
-patch -p2 < $CWD/patches/19-linux412.patch
-patch -p2 < $CWD/patches/20-linux414.patch
-patch -p2 < $CWD/patches/21-linux415.patch
-patch -p1 < $CWD/patches/009-fix_mac_profile_discrepancy.patch
-
-# See https://lkml.org/lkml/2019/3/1/643
-sed -i 's/get_ds()/KERNEL_DS/g' src/wl/sys/wl_iw.c
-sed -i 's/get_ds()/KERNEL_DS/g' src/wl/sys/wl_cfg80211_hybrid.c
-
-env -u ARCH make -C /lib/modules/$KERNEL/build M=$(pwd) clean
-env -u ARCH make -C /lib/modules/$KERNEL/build M=$(pwd)
-
-mkdir -p $PKG/lib/modules/$KERNEL/kernel/extra
-cp wl.ko $PKG/lib/modules/$KERNEL/kernel/extra
-
-mkdir -p $PKG/etc/modprobe.d
-cat $CWD/b43_blacklist.conf.new > $PKG/etc/modprobe.d/b43_blacklist.conf.new
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a lib/LICENSE.txt $CWD/README_$VERSION.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 << EOF > $PKG/install/doinst.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/modprobe.d/b43_blacklist.conf.new
-
-# A good idea whenever kernel modules are added or changed:
-if [ -x sbin/depmod ]; then
-  chroot . /sbin/depmod -a $KERNEL 1> /dev/null 2> /dev/null
-fi
-EOF
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-${VERSION}_$( echo $KERNEL | tr - _ )-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/network/broadcom-sta/broadcom-sta.info b/network/broadcom-sta/broadcom-sta.info
deleted file mode 100644
index 4d85e3f60e..0000000000
--- a/network/broadcom-sta/broadcom-sta.info
+++ /dev/null
@@ -1,14 +0,0 @@
-PRGNAM="broadcom-sta"
-VERSION="6.30.223.271"
-HOMEPAGE="https://www.broadcom.com/support/802.11"
-DOWNLOAD="https://docs.broadcom.com/docs-and-downloads/docs/linux_sta/README_6.30.223.271.txt \
-          https://docs.broadcom.com/docs-and-downloads/docs/linux_sta/hybrid-v35-nodebug-pcoem-6_30_223_271.tar.gz"
-MD5SUM="e3dab6d9dea12b6487ccf24d012e0350 \
-        4e75f4cb7d87f690f9659ffc478495f0"
-DOWNLOAD_x86_64="https://docs.broadcom.com/docs-and-downloads/docs/linux_sta/README_6.30.223.271.txt \
-                 https://docs.broadcom.com/docs-and-downloads/docs/linux_sta/hybrid-v35_64-nodebug-pcoem-6_30_223_271.tar.gz"
-MD5SUM_x86_64="e3dab6d9dea12b6487ccf24d012e0350 \
-               115903050c41d466161784d4c843f4f9"
-REQUIRES=""
-MAINTAINER="Andreas Voegele"
-EMAIL="andreas@andreasvoegele.com"
diff --git a/network/broadcom-sta/patches/009-fix_mac_profile_discrepancy.patch b/network/broadcom-sta/patches/009-fix_mac_profile_discrepancy.patch
deleted file mode 100644
index 835bfb7bb6..0000000000
--- a/network/broadcom-sta/patches/009-fix_mac_profile_discrepancy.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Don't disconnect from certain roamable networks broadcasting multiple
-SSIDs. See https://bugs.archlinux.org/task/61090 for more information.
-
-diff -ur a/src/wl/sys/wl_cfg80211_hybrid.c b/src/wl/sys/wl_cfg80211_hybrid.c
---- a/src/wl/sys/wl_cfg80211_hybrid.c	2015-09-19 00:47:15.000000000 +0200
-+++ b/src/wl/sys/wl_cfg80211_hybrid.c	2019-05-30 11:41:12.168748142 +0200
-@@ -1446,7 +1446,6 @@
- 
- 	if (memcmp(mac, wl->profile->bssid, ETHER_ADDR_LEN)) {
- 		WL_ERR(("Wrong Mac address, mac = %pM   profile =%pM\n", mac, wl->profile->bssid));
--		return -ENOENT;
- 	}
- 
- 	err = wl_dev_ioctl(dev, WLC_GET_RATE, &rate, sizeof(rate));
diff --git a/network/broadcom-sta/patches/04-user_ioctl.patch b/network/broadcom-sta/patches/04-user_ioctl.patch
deleted file mode 100644
index 902a7d9f7d..0000000000
--- a/network/broadcom-sta/patches/04-user_ioctl.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Description: Allow normal users to send ioctl requests
-Author: Cyril Lacoux <clacoux@easter-eggs.com>
-Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=672677
-Last-Update: 2012-11-19
-
-Index: broadcom-sta/amd64/src/wl/sys/wl_linux.c
-===================================================================
---- broadcom-sta.orig/amd64/src/wl/sys/wl_linux.c
-+++ broadcom-sta/amd64/src/wl/sys/wl_linux.c
-@@ -1661,11 +1661,7 @@ wl_ioctl(struct net_device *dev, struct
- 	}
- 
- 	WL_LOCK(wl);
--	if (!capable(CAP_NET_ADMIN)) {
--		bcmerror = BCME_EPERM;
--	} else {
--		bcmerror = wlc_ioctl(wl->wlc, ioc.cmd, buf, ioc.len, wlif->wlcif);
--	}
-+	bcmerror = wlc_ioctl(wl->wlc, ioc.cmd, buf, ioc.len, wlif->wlcif);
- 	WL_UNLOCK(wl);
- 
- done1:
diff --git a/network/broadcom-sta/patches/13-broadcom-sta-6.30.223.248-linux-3.18-null-pointer-crash.patch b/network/broadcom-sta/patches/13-broadcom-sta-6.30.223.248-linux-3.18-null-pointer-crash.patch
deleted file mode 100644
index 9e7e811308..0000000000
--- a/network/broadcom-sta/patches/13-broadcom-sta-6.30.223.248-linux-3.18-null-pointer-crash.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-From: Hugo Osvaldo Barrera <hugo@barrera.io>
-
-Downloaded from https://gist.github.com/hobarrera/ac0e6225210ac5bb13f6#file-broadcom-sta-6-30-223-248-linux-3-18-null-pointer-crash-patch
-
---
-Index: broadcom-sta/amd64/src/wl/sys/wl_linux.c
-===================================================================
---- broadcom-sta.orig/amd64/src/wl/sys/wl_linux.c
-+++ broadcom-sta/amd64/src/wl/sys/wl_linux.c
-@@ -2162,8 +2162,8 @@ wl_start(struct sk_buff *skb, struct net
- 	wlif = WL_DEV_IF(dev);
- 	wl = WL_INFO(dev);
- 
-+	skb->prev = NULL;
- 	if (WL_ALL_PASSIVE_ENAB(wl) || (WL_RTR() && WL_CONFIG_SMP())) {
--		skb->prev = NULL;
- 
- 		TXQ_LOCK(wl);
- 
diff --git a/network/broadcom-sta/patches/14-rdtscl.patch b/network/broadcom-sta/patches/14-rdtscl.patch
deleted file mode 100644
index 0558e98402..0000000000
--- a/network/broadcom-sta/patches/14-rdtscl.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Since Linux 4.3, rdtscl() is no longer available and native_read_tsc()
-is renamed to rdtsc(). Move the macro contents in-line and call the
-new function. References:
-
-https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit?id=fe47ae6e1a5005b2e82f7eab57b5c3820453293a
-https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit?id=4ea1636b04dbd66536fa387bae2eea463efc705b
-
-diff -ru a/src/shared/linux_osl.c b/src/shared/linux_osl.c
---- a/amd64/src/shared/linux_osl.c	2015-09-19 01:47:15.000000000 +0300
-+++ b/amd64/src/shared/linux_osl.c	2015-11-21 15:20:30.585902518 +0200
-@@ -932,7 +932,11 @@
- 	uint cycles;
- 
- #if defined(__i386__)
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 3, 0)
-+	cycles = (u32)rdtsc();
-+#else
- 	rdtscl(cycles);
-+#endif
- #else
- 	cycles = 0;
- #endif 
diff --git a/network/broadcom-sta/patches/15-linux47.patch b/network/broadcom-sta/patches/15-linux47.patch
deleted file mode 100644
index af0d04eb13..0000000000
--- a/network/broadcom-sta/patches/15-linux47.patch
+++ /dev/null
@@ -1,122 +0,0 @@
-From: Felix Yan <felixonmars@archlinux.org>
-Date: Mon, 20 Jun 2016 11:18:00 +0800
-Subject: linux47
-Origin: https://github.com/archlinuxcn/repo/tree/f4d6cff1cacf8dad13006fade5f96bc2cf020a9b/broadcom-wl-dkms
-
-Since Linux 4.7, the enum ieee80211_band is no longer used
-
-This shall cause no problem's since both enums ieee80211_band
-and nl80211_band were added in the same commit:
-https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit?id=13ae75b103e07304a34ab40c9136e9f53e06475c
-
-This patch refactors the references of IEEE80211_BAND_* to NL80211_BAND_*
-
-Reference:
-https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit?id=57fbcce37be7c1d2622b56587c10ade00e96afa3
-
-This patch is based on
-https://github.com/archlinuxcn/repo/tree/f4d6cff1cacf8dad13006fade5f96bc2cf020a9b/broadcom-wl-dkms .
----
- amd64/src/wl/sys/wl_cfg80211_hybrid.c | 24 ++++++++++++------------
- 1 file changed, 12 insertions(+), 12 deletions(-)
-
-diff --git a/amd64/src/wl/sys/wl_cfg80211_hybrid.c b/amd64/src/wl/sys/wl_cfg80211_hybrid.c
-index 7b606e0..cc5422d 100644
---- a/amd64/src/wl/sys/wl_cfg80211_hybrid.c
-+++ b/amd64/src/wl/sys/wl_cfg80211_hybrid.c
-@@ -236,7 +236,7 @@ static s8 wl_dbg_estr[][WL_DBG_ESTR_MAX] = {
- #endif				
- 
- #define CHAN2G(_channel, _freq, _flags) {			\
--	.band			= IEEE80211_BAND_2GHZ,		\
-+	.band			= NL80211_BAND_2GHZ,		\
- 	.center_freq		= (_freq),			\
- 	.hw_value		= (_channel),			\
- 	.flags			= (_flags),			\
-@@ -245,7 +245,7 @@ static s8 wl_dbg_estr[][WL_DBG_ESTR_MAX] = {
- }
- 
- #define CHAN5G(_channel, _flags) {				\
--	.band			= IEEE80211_BAND_5GHZ,		\
-+	.band			= NL80211_BAND_5GHZ,		\
- 	.center_freq		= 5000 + (5 * (_channel)),	\
- 	.hw_value		= (_channel),			\
- 	.flags			= (_flags),			\
-@@ -379,7 +379,7 @@ static struct ieee80211_channel __wl_5ghz_n_channels[] = {
- };
- 
- static struct ieee80211_supported_band __wl_band_2ghz = {
--	.band = IEEE80211_BAND_2GHZ,
-+	.band = NL80211_BAND_2GHZ,
- 	.channels = __wl_2ghz_channels,
- 	.n_channels = ARRAY_SIZE(__wl_2ghz_channels),
- 	.bitrates = wl_g_rates,
-@@ -387,7 +387,7 @@ static struct ieee80211_supported_band __wl_band_2ghz = {
- };
- 
- static struct ieee80211_supported_band __wl_band_5ghz_a = {
--	.band = IEEE80211_BAND_5GHZ,
-+	.band = NL80211_BAND_5GHZ,
- 	.channels = __wl_5ghz_a_channels,
- 	.n_channels = ARRAY_SIZE(__wl_5ghz_a_channels),
- 	.bitrates = wl_a_rates,
-@@ -395,7 +395,7 @@ static struct ieee80211_supported_band __wl_band_5ghz_a = {
- };
- 
- static struct ieee80211_supported_band __wl_band_5ghz_n = {
--	.band = IEEE80211_BAND_5GHZ,
-+	.band = NL80211_BAND_5GHZ,
- 	.channels = __wl_5ghz_n_channels,
- 	.n_channels = ARRAY_SIZE(__wl_5ghz_n_channels),
- 	.bitrates = wl_a_rates,
-@@ -1876,8 +1876,8 @@ static s32 wl_alloc_wdev(struct device *dev, struct wireless_dev **rwdev)
- 	wdev->wiphy->max_num_pmkids = WL_NUM_PMKIDS_MAX;
- #endif
- 	wdev->wiphy->interface_modes = BIT(NL80211_IFTYPE_STATION) | BIT(NL80211_IFTYPE_ADHOC);
--	wdev->wiphy->bands[IEEE80211_BAND_2GHZ] = &__wl_band_2ghz;
--	wdev->wiphy->bands[IEEE80211_BAND_5GHZ] = &__wl_band_5ghz_a; 
-+	wdev->wiphy->bands[NL80211_BAND_2GHZ] = &__wl_band_2ghz;
-+	wdev->wiphy->bands[NL80211_BAND_5GHZ] = &__wl_band_5ghz_a; 
- 	wdev->wiphy->signal_type = CFG80211_SIGNAL_TYPE_MBM;
- 	wdev->wiphy->cipher_suites = __wl_cipher_suites;
- 	wdev->wiphy->n_cipher_suites = ARRAY_SIZE(__wl_cipher_suites);
-@@ -2000,7 +2000,7 @@ static s32 wl_inform_single_bss(struct wl_cfg80211_priv *wl, struct wl_bss_info
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 39)
- 	freq = ieee80211_channel_to_frequency(notif_bss_info->channel,
- 		(notif_bss_info->channel <= CH_MAX_2G_CHANNEL) ?
--		IEEE80211_BAND_2GHZ : IEEE80211_BAND_5GHZ);
-+		NL80211_BAND_2GHZ : NL80211_BAND_5GHZ);
- #else
- 	freq = ieee80211_channel_to_frequency(notif_bss_info->channel);
- #endif
-@@ -2116,7 +2116,7 @@ wl_notify_connect_status(struct wl_cfg80211_priv *wl, struct net_device *ndev,
- 				return err;
- 			}
- 			chan = wf_chspec_ctlchan(chanspec);
--			band = (chan <= CH_MAX_2G_CHANNEL) ? IEEE80211_BAND_2GHZ : IEEE80211_BAND_5GHZ;
-+			band = (chan <= CH_MAX_2G_CHANNEL) ? NL80211_BAND_2GHZ : NL80211_BAND_5GHZ;
- 			freq = ieee80211_channel_to_frequency(chan, band);
- 			channel = ieee80211_get_channel(wiphy, freq);
- 			cfg80211_ibss_joined(ndev, (u8 *)&wl->bssid, channel, GFP_KERNEL);
-@@ -2250,10 +2250,10 @@ static void wl_ch_to_chanspec(struct ieee80211_channel *chan, struct wl_join_par
- 		join_params->params.chanspec_list[0] =
- 		    ieee80211_frequency_to_channel(chan->center_freq);
- 
--		if (chan->band == IEEE80211_BAND_2GHZ) {
-+		if ( (int) chan->band == (int) NL80211_BAND_2GHZ) {
- 			chanspec |= WL_CHANSPEC_BAND_2G;
- 		}
--		else if (chan->band == IEEE80211_BAND_5GHZ) {
-+		else if ( (int) chan->band == (int) NL80211_BAND_5GHZ) {
- 			chanspec |= WL_CHANSPEC_BAND_5G;
- 		}
- 		else {
-@@ -2885,7 +2885,7 @@ static s32 wl_update_wiphybands(struct wl_cfg80211_priv *wl)
- 
- 	if (phy == 'n' || phy == 'a' || phy == 'v') {
- 		wiphy = wl_to_wiphy(wl);
--		wiphy->bands[IEEE80211_BAND_5GHZ] = &__wl_band_5ghz_n;
-+		wiphy->bands[NL80211_BAND_5GHZ] = &__wl_band_5ghz_n;
- 	}
- 
- 	return err;
diff --git a/network/broadcom-sta/patches/16-linux48.patch b/network/broadcom-sta/patches/16-linux48.patch
deleted file mode 100644
index 63bdc56e3e..0000000000
--- a/network/broadcom-sta/patches/16-linux48.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-From: koos vriezen <koos.vriezen@gmail.com>
-Date: Mon, 3 Oct 2016 10:54:11 +0200
-Subject: linux48
-Origin: https://bugs.debian.org/
-
-Looking at the patch for kernel 4.8, I came up with the attached patch
-(and I send this mail while running it :)
-     
-Thanks,
-Koos Vriezen
----
- amd64/src/wl/sys/wl_cfg80211_hybrid.c | 25 +++++++++++++++++++++++--
- 1 file changed, 23 insertions(+), 2 deletions(-)
-
-diff --git a/amd64/src/wl/sys/wl_cfg80211_hybrid.c b/amd64/src/wl/sys/wl_cfg80211_hybrid.c
-index cc5422d..05b9fd3 100644
---- a/amd64/src/wl/sys/wl_cfg80211_hybrid.c
-+++ b/amd64/src/wl/sys/wl_cfg80211_hybrid.c
-@@ -2386,8 +2386,15 @@ wl_bss_connect_done(struct wl_cfg80211_priv *wl, struct net_device *ndev,
- 	s32 err = 0;
- 
- 	if (wl->scan_request) {
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0)
-+		struct cfg80211_scan_info info = {
-+			.aborted = true
-+		};
- 		WL_DBG(("%s: Aborting scan\n", __FUNCTION__));
--		cfg80211_scan_done(wl->scan_request, true);     
-+		cfg80211_scan_done(wl->scan_request, &info);
-+#else
-+		cfg80211_scan_done(wl->scan_request, true);
-+#endif
- 		wl->scan_request = NULL;
- 	}
- 
-@@ -2488,7 +2495,14 @@ wl_notify_scan_status(struct wl_cfg80211_priv *wl, struct net_device *ndev,
- 
- scan_done_out:
- 	if (wl->scan_request) {
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0)
-+		struct cfg80211_scan_info info = {
-+			.aborted = false
-+		};
-+		cfg80211_scan_done(wl->scan_request, &info);
-+#else
- 		cfg80211_scan_done(wl->scan_request, false);
-+#endif
- 		wl->scan_request = NULL;
- 	}
- 	rtnl_unlock();
-@@ -2913,7 +2927,14 @@ s32 wl_cfg80211_down(struct net_device *ndev)
- 	s32 err = 0;
- 
- 	if (wl->scan_request) {
--		cfg80211_scan_done(wl->scan_request, true);	
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0)
-+		struct cfg80211_scan_info info = {
-+			.aborted = true
-+		};
-+		cfg80211_scan_done(wl->scan_request, &info);
-+#else
-+		cfg80211_scan_done(wl->scan_request, true);
-+#endif
- 		wl->scan_request = NULL;
- 	}
- 
diff --git a/network/broadcom-sta/patches/17-fix-kernel-warnings.patch b/network/broadcom-sta/patches/17-fix-kernel-warnings.patch
deleted file mode 100644
index c8a2ae8199..0000000000
--- a/network/broadcom-sta/patches/17-fix-kernel-warnings.patch
+++ /dev/null
@@ -1,172 +0,0 @@
-From: Luis Ortega <luiorpe1@gmail.com>
-Date: Sun, 6 Nov 2016 12:15:10 +0100
-Subject: fix-kernel-warnings
-Origin: https://bugs.debian.org/843387
-
----
- amd64/src/wl/sys/wl_cfg80211_hybrid.c | 87 ++++++++++++++++++++++++-----------
- 1 file changed, 60 insertions(+), 27 deletions(-)
-
-diff --git a/amd64/src/wl/sys/wl_cfg80211_hybrid.c b/amd64/src/wl/sys/wl_cfg80211_hybrid.c
-index 05b9fd3..551fe1f 100644
---- a/amd64/src/wl/sys/wl_cfg80211_hybrid.c
-+++ b/amd64/src/wl/sys/wl_cfg80211_hybrid.c
-@@ -1968,7 +1968,7 @@ static s32 wl_inform_single_bss(struct wl_cfg80211_priv *wl, struct wl_bss_info
- 
- 	if (dtoh32(bi->length) > WL_BSS_INFO_MAX) {
- 		WL_DBG(("Beacon is larger than buffer. Discarding\n"));
--		return err;
-+		return -E2BIG;
- 	}
- 	notif_bss_info = kzalloc(sizeof(*notif_bss_info) + sizeof(*mgmt) - sizeof(u8) +
- 	                         WL_BSS_INFO_MAX, GFP_KERNEL);
-@@ -1992,9 +1992,15 @@ static s32 wl_inform_single_bss(struct wl_cfg80211_priv *wl, struct wl_bss_info
- 	beacon_proberesp->capab_info = cpu_to_le16(bi->capability);
- 	wl_rst_ie(wl);
- 
--	wl_mrg_ie(wl, ((u8 *) bi) + bi->ie_offset, bi->ie_length);
--	wl_cp_ie(wl, beacon_proberesp->variable, WL_BSS_INFO_MAX -
-+	err = wl_mrg_ie(wl, ((u8 *) bi) + bi->ie_offset, bi->ie_length);
-+	if (err)
-+		goto inform_single_bss_out;
-+
-+	err = wl_cp_ie(wl, beacon_proberesp->variable, WL_BSS_INFO_MAX -
- 	         offsetof(struct wl_cfg80211_bss_info, frame_buf));
-+	if (err)
-+		goto inform_single_bss_out;
-+
- 	notif_bss_info->frame_len = offsetof(struct ieee80211_mgmt, u.beacon.variable) +
- 	                            wl_get_ielen(wl);
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 39)
-@@ -2006,14 +2012,14 @@ static s32 wl_inform_single_bss(struct wl_cfg80211_priv *wl, struct wl_bss_info
- #endif
- 	if (freq == 0) {
- 		WL_ERR(("Invalid channel, fail to chcnage channel to freq\n"));
--		kfree(notif_bss_info);
--		return -EINVAL;
-+		err = -EINVAL;
-+		goto inform_single_bss_out;
- 	}
- 	channel = ieee80211_get_channel(wiphy, freq);
- 	if (unlikely(!channel)) {
- 		WL_ERR(("ieee80211_get_channel error\n"));
--		kfree(notif_bss_info);
--		return -EINVAL;
-+		err = -EINVAL;
-+		goto inform_single_bss_out;
- 	}
- 
- 	WL_DBG(("SSID : \"%s\", rssi %d, channel %d, capability : 0x04%x, bssid %pM\n",
-@@ -2021,28 +2027,37 @@ static s32 wl_inform_single_bss(struct wl_cfg80211_priv *wl, struct wl_bss_info
- 		mgmt->u.beacon.capab_info, &bi->BSSID));
- 
- 	signal = notif_bss_info->rssi * 100;
--	cbss = cfg80211_inform_bss_frame(wiphy, channel, mgmt,
--	    le16_to_cpu(notif_bss_info->frame_len), signal, GFP_KERNEL);
--	if (unlikely(!cbss)) {
--		WL_ERR(("cfg80211_inform_bss_frame error\n"));
--		kfree(notif_bss_info);
--		return -EINVAL;
--	}
- 
--	notify_ie = (u8 *)bi + le16_to_cpu(bi->ie_offset);
--	notify_ielen = le32_to_cpu(bi->ie_length);
-+	if (!wl->scan_request) {
-+		cbss = cfg80211_inform_bss_frame(wiphy, channel, mgmt,
-+			le16_to_cpu(notif_bss_info->frame_len), signal, GFP_KERNEL);
-+		if (unlikely(!cbss)) {
-+			WL_ERR(("cfg80211_inform_bss_frame error\n"));
-+			err = -ENOMEM;
-+			goto inform_single_bss_out;
-+		}
-+	} else {
-+		notify_ie = (u8 *)bi + le16_to_cpu(bi->ie_offset);
-+		notify_ielen = le32_to_cpu(bi->ie_length);
- #if LINUX_VERSION_CODE < KERNEL_VERSION(3, 18, 0)
--	cbss = cfg80211_inform_bss(wiphy, channel, (const u8 *)(bi->BSSID.octet),
--		0, beacon_proberesp->capab_info, beacon_proberesp->beacon_int,
--		(const u8 *)notify_ie, notify_ielen, signal, GFP_KERNEL);
-+		cbss = cfg80211_inform_bss(wiphy, channel, (const u8 *)(bi->BSSID.octet),
-+			0, beacon_proberesp->capab_info, beacon_proberesp->beacon_int,
-+			(const u8 *)notify_ie, notify_ielen, signal, GFP_KERNEL);
- #else
--	cbss = cfg80211_inform_bss(wiphy, channel, CFG80211_BSS_FTYPE_UNKNOWN, (const u8 *)(bi->BSSID.octet),
--		0, beacon_proberesp->capab_info, beacon_proberesp->beacon_int,
--		(const u8 *)notify_ie, notify_ielen, signal, GFP_KERNEL);
-+		cbss = cfg80211_inform_bss(wiphy, channel,
-+				wl->active_scan ?
-+				CFG80211_BSS_FTYPE_PRESP : CFG80211_BSS_FTYPE_BEACON,
-+				(const u8 *)(bi->BSSID.octet), 0,
-+				beacon_proberesp->capab_info,
-+				beacon_proberesp->beacon_int,
-+				(const u8 *)notify_ie, notify_ielen, signal, GFP_KERNEL);
- #endif
--
--	if (unlikely(!cbss))
--		return -ENOMEM;
-+		if (unlikely(!cbss)) {
-+			WL_ERR(("cfg80211_inform_bss error\n"));
-+			err = -ENOMEM;
-+			goto inform_single_bss_out;
-+		}
-+	}
- 
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 9, 0)
- 	cfg80211_put_bss(wiphy, cbss);
-@@ -2050,6 +2065,7 @@ static s32 wl_inform_single_bss(struct wl_cfg80211_priv *wl, struct wl_bss_info
- 	cfg80211_put_bss(cbss);
- #endif
- 
-+inform_single_bss_out:
- 	kfree(notif_bss_info);
- 
- 	return err;
-@@ -2316,6 +2332,9 @@ static s32 wl_update_bss_info(struct wl_cfg80211_priv *wl)
- 		if (err)
- 			goto update_bss_info_out;
- 
-+		bss = cfg80211_get_bss(wl_to_wiphy(wl), NULL, (s8 *)&wl->bssid,
-+		      ssid->SSID, ssid->SSID_len, WLAN_CAPABILITY_ESS, WLAN_CAPABILITY_ESS);
-+
- 		ie = ((u8 *)bi) + bi->ie_offset;
- 		ie_len = bi->ie_length;
- 	} else {
-@@ -2328,11 +2347,18 @@ static s32 wl_update_bss_info(struct wl_cfg80211_priv *wl)
- 		ie_len = bss->len_information_elements;
- #endif
- 		wl->conf->channel = *bss->channel;
-+	}
-+
-+	if (bss) {
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 9, 0)
- 		cfg80211_put_bss(wiphy, bss);
- #else
- 		cfg80211_put_bss(bss);
- #endif
-+	} else {
-+		WL_DBG(("Could not update BSS\n"));
-+		err = -EINVAL;
-+		goto update_bss_info_out;
- 	}
- 
- 	tim = bcm_parse_tlvs(ie, ie_len, WLAN_EID_TIM);
-@@ -2360,10 +2386,17 @@ wl_bss_roaming_done(struct wl_cfg80211_priv *wl, struct net_device *ndev,
- 	struct wl_cfg80211_connect_info *conn_info = wl_to_conn(wl);
- 	s32 err = 0;
- 
--	wl_get_assoc_ies(wl);
-+	err = wl_get_assoc_ies(wl);
-+	if (err)
-+		return err;
-+
- 	memcpy(wl->profile->bssid, &e->addr, ETHER_ADDR_LEN);
- 	memcpy(&wl->bssid, &e->addr, ETHER_ADDR_LEN);
--	wl_update_bss_info(wl);
-+
-+	err = wl_update_bss_info(wl);
-+	if (err)
-+		return err;
-+
- 	cfg80211_roamed(ndev,
- #if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 39)
- 			&wl->conf->channel,	 
diff --git a/network/broadcom-sta/patches/18-linux411.patch b/network/broadcom-sta/patches/18-linux411.patch
deleted file mode 100644
index bc9a9508be..0000000000
--- a/network/broadcom-sta/patches/18-linux411.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From: koos vriezen <koos.vriezen@gmail.com>
-Date: Mon, 1 May 2017 18:28:01 +0200
-Subject: Compile fix with kernel 4.11
-Origin: http://bugs.debian.org/861807
-Forwarded: no
-Reviewed-By: Eduard Bloch <blade@debian.org>
-Last-Update: 2017-05-04
-
- I use the attached patch to get this module compiled with 4.11. Works
- for me since last sunday.
- Apparently https://aur.archlinux.org/cgit/aur.git/tree/linux411.patch?h=broadcom-wl
- has come with a different patch for the removed last_rx field in
- netdevice. But judging the commit log
- https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/patch/include/linux/netdevice.h?id=4a7c972644c1151f6dd34ff4b5f7eacb239e22ee
- and the fact that last_rx isn't used elsewhere I came up with just
- ifdef it out.
----
- amd64/src/wl/sys/wl_cfg80211_hybrid.c | 3 +++
- amd64/src/wl/sys/wl_linux.c           | 2 ++
- 2 files changed, 5 insertions(+)
-
-diff --git a/amd64/src/wl/sys/wl_cfg80211_hybrid.c b/amd64/src/wl/sys/wl_cfg80211_hybrid.c
-index 551fe1f..83930ec 100644
---- a/amd64/src/wl/sys/wl_cfg80211_hybrid.c
-+++ b/amd64/src/wl/sys/wl_cfg80211_hybrid.c
-@@ -30,6 +30,9 @@
- #include <linux/kthread.h>
- #include <linux/netdevice.h>
- #include <linux/ieee80211.h>
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0)
-+#include <linux/sched/signal.h>
-+#endif
- #include <net/cfg80211.h>
- #include <linux/nl80211.h>
- #include <net/rtnetlink.h>
-diff --git a/amd64/src/wl/sys/wl_linux.c b/amd64/src/wl/sys/wl_linux.c
-index b7fbe28..77dc327 100644
---- a/amd64/src/wl/sys/wl_linux.c
-+++ b/amd64/src/wl/sys/wl_linux.c
-@@ -2912,7 +2912,9 @@ wl_monitor(wl_info_t *wl, wl_rxsts_t *rxsts, void *p)
- 	if (skb == NULL) return;
- 
- 	skb->dev = wl->monitor_dev;
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
- 	skb->dev->last_rx = jiffies;
-+#endif
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 22)
- 	skb_reset_mac_header(skb);
- #else
diff --git a/network/broadcom-sta/patches/19-linux412.patch b/network/broadcom-sta/patches/19-linux412.patch
deleted file mode 100644
index c88b9e1023..0000000000
--- a/network/broadcom-sta/patches/19-linux412.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-From: koos vriezen <koos.vriezen@gmail.com>
-Date: Mon, 3 Jul 2017 09:57:21 +0200
-Subject: linux412
-Origin: https://bugs.debian.org/867258
-
----
- amd64/src/wl/sys/wl_cfg80211_hybrid.c | 29 +++++++++++++++++++++++++----
- 1 file changed, 25 insertions(+), 4 deletions(-)
-
-diff --git a/amd64/src/wl/sys/wl_cfg80211_hybrid.c b/amd64/src/wl/sys/wl_cfg80211_hybrid.c
-index 83930ec..1ec2ef3 100644
---- a/amd64/src/wl/sys/wl_cfg80211_hybrid.c
-+++ b/amd64/src/wl/sys/wl_cfg80211_hybrid.c
-@@ -53,7 +53,11 @@ u32 wl_dbg_level = WL_DBG_ERR;
- #endif
- 
- static s32 wl_cfg80211_change_iface(struct wiphy *wiphy, struct net_device *ndev,
--           enum nl80211_iftype type, u32 *flags, struct vif_params *params);
-+           enum nl80211_iftype type,
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 12, 0)
-+           u32 *flags,
-+#endif
-+	   struct vif_params *params);
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 6, 0)
- static s32
- wl_cfg80211_scan(struct wiphy *wiphy,
-@@ -466,8 +470,11 @@ wl_dev_ioctl(struct net_device *dev, u32 cmd, void *arg, u32 len)
- 
- static s32
- wl_cfg80211_change_iface(struct wiphy *wiphy, struct net_device *ndev,
--                         enum nl80211_iftype type, u32 *flags,
--   struct vif_params *params)
-+                         enum nl80211_iftype type,
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 12, 0)
-+                         u32 *flags,
-+#endif
-+                         struct vif_params *params)
- {
- 	struct wl_cfg80211_priv *wl = wiphy_to_wl(wiphy);
- 	struct wireless_dev *wdev;
-@@ -2387,6 +2394,15 @@ wl_bss_roaming_done(struct wl_cfg80211_priv *wl, struct net_device *ndev,
-                     const wl_event_msg_t *e, void *data)
- {
- 	struct wl_cfg80211_connect_info *conn_info = wl_to_conn(wl);
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0)
-+	struct cfg80211_roam_info roam_info = {
-+		.bssid = wl->profile->bssid,
-+		.req_ie = conn_info->req_ie,
-+		.req_ie_len = conn_info->req_ie_len,
-+		.resp_ie = conn_info->resp_ie,
-+		.resp_ie_len = conn_info->resp_ie_len,
-+	};
-+#endif
- 	s32 err = 0;
- 
- 	err = wl_get_assoc_ies(wl);
-@@ -2401,12 +2417,17 @@ wl_bss_roaming_done(struct wl_cfg80211_priv *wl, struct net_device *ndev,
- 		return err;
- 
- 	cfg80211_roamed(ndev,
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0)
-+			&roam_info,
-+#else
- #if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 39)
- 			&wl->conf->channel,	 
- #endif
- 			(u8 *)&wl->bssid,
- 			conn_info->req_ie, conn_info->req_ie_len,
--			conn_info->resp_ie, conn_info->resp_ie_len, GFP_KERNEL);
-+			conn_info->resp_ie, conn_info->resp_ie_len,
-+#endif
-+			GFP_KERNEL);
- 	WL_DBG(("Report roaming result\n"));
- 
- 	set_bit(WL_STATUS_CONNECTED, &wl->status);
diff --git a/network/broadcom-sta/patches/20-linux414.patch b/network/broadcom-sta/patches/20-linux414.patch
deleted file mode 100644
index f785a99edb..0000000000
--- a/network/broadcom-sta/patches/20-linux414.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From: Gerardo Esteban Malazdrewicz <gerardo@malazdrewicz.com.ar>
-Date: Fri, 29 Dec 2017 23:44:24 -0400
-Subject: linux414
-Origin: https://bugs.debian.org/885885
-
-linux 4.14 changed the kernel_read function prototype.
-
----
- amd64/src/shared/linux_osl.c | 12 +++++++++++-
- 1 file changed, 11 insertions(+), 1 deletion(-)
-
-diff --git a/amd64/src/shared/linux_osl.c b/amd64/src/shared/linux_osl.c
-index 9adc392..3aa48bf 100644
---- a/amd64/src/shared/linux_osl.c
-+++ b/amd64/src/shared/linux_osl.c
-@@ -1076,11 +1076,21 @@ osl_os_get_image_block(char *buf, int len, void *image)
- {
- 	struct file *fp = (struct file *)image;
- 	int rdlen;
-+	loff_t pos;
- 
- 	if (!image)
- 		return 0;
- 
--	rdlen = kernel_read(fp, fp->f_pos, buf, len);
-+	pos = fp->f_pos;
-+	rdlen = kernel_read(fp, 
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 14, 0)
-+			pos, 
-+#endif
-+			buf, len
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 14, 0)
-+			,&pos 
-+#endif
-+	);
- 	if (rdlen > 0)
- 		fp->f_pos += rdlen;
- 
diff --git a/network/broadcom-sta/patches/21-linux415.patch b/network/broadcom-sta/patches/21-linux415.patch
deleted file mode 100644
index 2cd8c2532e..0000000000
--- a/network/broadcom-sta/patches/21-linux415.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From: Gerardo Esteban Malazdrewicz <gerardo@malazdrewicz.com.ar>
-Date: Sat, 30 Dec 2017 12:32:29 -0400
-Subject: linux415
-Origin: https://bugs.debian.org/885885
-
-linux 4.15 deprecated the init_timer function.
-
----
- amd64/src/wl/sys/wl_linux.c | 28 ++++++++++++++++++++++++----
- 1 file changed, 24 insertions(+), 4 deletions(-)
-
-diff --git a/amd64/src/wl/sys/wl_linux.c b/amd64/src/wl/sys/wl_linux.c
-index 77dc327..ab7b883 100644
---- a/amd64/src/wl/sys/wl_linux.c
-+++ b/amd64/src/wl/sys/wl_linux.c
-@@ -93,7 +93,13 @@ struct iw_statistics *wl_get_wireless_stats(struct net_device *dev);
- 
- #include <wlc_wowl.h>
- 
--static void wl_timer(ulong data);
-+static void wl_timer(
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0)
-+		struct timer_list *tl
-+#else
-+		ulong data
-+#endif
-+		);
- static void _wl_timer(wl_timer_t *t);
- static struct net_device *wl_alloc_linux_if(wl_if_t *wlif);
- 
-@@ -2295,9 +2301,19 @@ wl_timer_task(wl_task_t *task)
- }
- 
- static void
--wl_timer(ulong data)
--{
--	wl_timer_t *t = (wl_timer_t *)data;
-+wl_timer(
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0)
-+		struct timer_list *tl
-+#else
-+		ulong data
-+#endif
-+) {
-+	wl_timer_t *t =
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0)
-+		from_timer(t, tl, timer);
-+#else
-+		(wl_timer_t *)data;
-+#endif
- 
- 	if (!WL_ALL_PASSIVE_ENAB(t->wl))
- 		_wl_timer(t);
-@@ -2349,9 +2365,13 @@ wl_init_timer(wl_info_t *wl, void (*fn)(void *arg), void *arg, const char *tname
- 
- 	bzero(t, sizeof(wl_timer_t));
- 
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0)
-+	timer_setup(&t->timer, wl_timer, 0);
-+#else
- 	init_timer(&t->timer);
- 	t->timer.data = (ulong) t;
- 	t->timer.function = wl_timer;
-+#endif
- 	t->wl = wl;
- 	t->fn = fn;
- 	t->arg = arg;
diff --git a/network/broadcom-sta/slack-desc b/network/broadcom-sta/slack-desc
deleted file mode 100644
index 02000f4c14..0000000000
--- a/network/broadcom-sta/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------------------------------------------------------|
-broadcom-sta: broadcom-sta (Broadcom wireless drivers)
-broadcom-sta:
-broadcom-sta: Proprietary driver for Broadcom's BCM4311, BCM4312, BCM4313, BCM4321,
-broadcom-sta: BCM4322, BCM43142, BCM43224, BCM43225, BCM43227, BCM43228, BCM4331,
-broadcom-sta: BCM4360 and BCM4352 wireless network cards. Includes a kernel module
-broadcom-sta: named 'wl'.
-broadcom-sta:
-broadcom-sta: For more information, see:
-broadcom-sta: https://www.broadcom.com/support/802.11
-broadcom-sta:
-broadcom-sta:
diff --git a/network/broadcom-wl/README b/network/broadcom-wl/README
new file mode 100644
index 0000000000..4cb4973932
--- /dev/null
+++ b/network/broadcom-wl/README
@@ -0,0 +1,40 @@
+This package was formerly hosted on slackbuilds.org as the
+'broadcom-sta' package and was based upon a Debian patchset. I've re-
+based this package on the Arch Linux package and patchset, and as
+result, renamed it to 'broadcom-wl' to match.
+
+The broadcom-wl package includes the kernel module 'wl', which contains
+a Broadcom-provided proprietary kernel driver known to support the
+listed chipsets.
+
+BCM4311  (PCI ID 14e4:4311, 14e4:4312, 14e4:4313)
+BCM4312  (PCI ID 14e4:4315)
+BCM4313  (PCI ID 14e4:4727)
+BCM4321  (PCI ID 14e4:4328, 14e4:4329, 14e4:432a)
+BCM4322  (PCI ID 14e4:432b, 14e4:432c, 14e4:432d)
+BCM43142 (PCI ID 14e4:4365)
+BCM43224 (PCI ID 14e4:4353)
+BCM43225 (PCI ID 14e4:4357)
+BCM43227 (PCI ID 14e4:4358)
+BCM43228 (PCI ID 14e4:4359)
+BCM4331  (PCI ID 14e4:4331)
+BCM4360  (PCI ID 14e4:43a0)
+BCM4352  (PCI ID 14e4:43b1)
+
+Some of these devices are also supported by the free b43 and brcm80211
+drivers.  In order to avoid conflicts /etc/modprobe.d/b43_blacklist.conf
+disables these drivers.
+
+Read the included LICENSE.txt file (placed in /usr/doc) before using the
+proprietary driver.
+
+To build the module for a kernel that isn't currently running on the
+system, pass that kernel's "uname -r" output such as:
+
+    KERNEL=4.4.67 ./broadcom-wl.SlackBuild
+
+If you would like to name your interface eth1 instead of wlan0, either
+rename the device in /etc/udev/rules.d/70-persistent-net.rules or build
+the package with:
+
+    IFNAME=eth ./broadcom-wl.SlackBuild
diff --git a/network/broadcom-sta/b43_blacklist.conf.new b/network/broadcom-wl/b43_blacklist.conf.new
index 76c457bc43..76c457bc43 100644
--- a/network/broadcom-sta/b43_blacklist.conf.new
+++ b/network/broadcom-wl/b43_blacklist.conf.new
diff --git a/network/broadcom-wl/broadcom-wl.SlackBuild b/network/broadcom-wl/broadcom-wl.SlackBuild
new file mode 100644
index 0000000000..6a37971946
--- /dev/null
+++ b/network/broadcom-wl/broadcom-wl.SlackBuild
@@ -0,0 +1,128 @@
+#!/bin/bash
+
+# Slackware build script for broadcom-wl
+#
+# SlackBuild formerly known as 'broadcom-sta' on slackbuilds.org
+#
+# Changed the name of the package to match the patchset in use, this is
+# re-based on patches for Arch Linux. See:
+# https://gitlab.archlinux.org/archlinux/packaging/packages/broadcom-wl-dkms
+#
+# Copyright 2015-2019 Andreas Voegele <andreas@andreasvoegele.com>
+# Copyright 2022-23 Jay Lanagan (j@lngn.net), Detroit, MI, USA.
+#
+# 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.
+#
+# 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=broadcom-wl
+VERSION=${VERSION:-6.30.223.271}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+KERNEL=${KERNEL:-$( uname -r )}
+IFNAME=${IFNAME:-wlan}
+
+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}
+
+case "$ARCH" in
+  i?86)
+    SRCNAM=hybrid-v35-nodebug-pcoem
+    ;;
+  x86_64)
+    SRCNAM=hybrid-v35_64-nodebug-pcoem
+    ;;
+  *)
+    echo "$ARCH is not supported..."
+    exit 1
+    ;;
+esac
+
+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/$SRCNAM-$( echo $VERSION | tr . _ ).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 {} \;
+
+if [ "$IFNAME" != "eth" ]; then
+  sed -i "/BRCM_WLAN_IFNAME/s/eth/$IFNAME/" src/wl/sys/wl_linux.c
+fi
+
+patch -p2 < $CWD/patches/000-remove-time_date-macros.patch || exit 1
+patch -p1 < $CWD/patches/001-null-pointer-fix.patch || exit 1
+patch -p1 < $CWD/patches/002-rdtscl.patch || exit 1
+patch -p1 < $CWD/patches/003-linux47.patch || exit 1
+patch -p1 < $CWD/patches/004-linux48.patch || exit 1
+patch -p1 < $CWD/patches/005-debian-fix-kernel-warnings.patch || exit 1
+patch -p1 < $CWD/patches/006-linux411.patch || exit 1
+patch -p1 < $CWD/patches/007-linux412.patch || exit 1
+patch -p1 < $CWD/patches/008-linux415.patch || exit 1
+patch -p1 < $CWD/patches/009-fix_mac_profile_discrepancy.patch || exit 1
+patch -p1 < $CWD/patches/010-linux56.patch || exit 1
+patch -p1 < $CWD/patches/011-linux59.patch || exit 1
+patch -p1 < $CWD/patches/012-linux517.patch || exit 1
+patch -p1 < $CWD/patches/013-linux518.patch || exit 1
+patch -p1 < $CWD/patches/014-linux414.patch || exit 1
+patch -p1 < $CWD/patches/015-linux600.patch || exit 1
+patch -p1 < $CWD/patches/016-linux601.patch || exit 1
+
+# See https://lkml.org/lkml/2019/3/1/643
+sed -i 's/get_ds()/KERNEL_DS/g' src/wl/sys/wl_iw.c
+sed -i 's/get_ds()/KERNEL_DS/g' src/wl/sys/wl_cfg80211_hybrid.c
+
+env -u ARCH make -C /lib/modules/$KERNEL/build M=$(pwd) clean
+env -u ARCH make -C /lib/modules/$KERNEL/build M=$(pwd)
+
+mkdir -p $PKG/lib/modules/$KERNEL/kernel/extra
+cp wl.ko $PKG/lib/modules/$KERNEL/kernel/extra
+
+mkdir -p $PKG/etc/modprobe.d
+cat $CWD/b43_blacklist.conf.new > $PKG/etc/modprobe.d/b43_blacklist.conf.new
+
+mkdir -p $PKG/usr/doc/$PRGNAM-${VERSION}_$( echo $KERNEL | tr - _ )
+cp -a lib/LICENSE.txt $PKG/usr/doc/$PRGNAM-${VERSION}_$( echo $KERNEL | tr - _ )
+chmod 644 $PKG/usr/doc/$PRGNAM-${VERSION}_$( echo $KERNEL | tr - _ )/*
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-${VERSION}_$( echo $KERNEL | tr - _ )/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-${VERSION}_$( echo $KERNEL | tr - _ )-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/network/broadcom-wl/broadcom-wl.info b/network/broadcom-wl/broadcom-wl.info
new file mode 100644
index 0000000000..4000c07708
--- /dev/null
+++ b/network/broadcom-wl/broadcom-wl.info
@@ -0,0 +1,14 @@
+PRGNAM="broadcom-wl"
+VERSION="6.30.223.271"
+HOMEPAGE="https://www.broadcom.com/support/802.11"
+DOWNLOAD="https://docs.broadcom.com/docs-and-downloads/docs/linux_sta/README_6.30.223.271.txt \
+          https://docs.broadcom.com/docs-and-downloads/docs/linux_sta/hybrid-v35-nodebug-pcoem-6_30_223_271.tar.gz"
+MD5SUM="e3dab6d9dea12b6487ccf24d012e0350 \
+        4e75f4cb7d87f690f9659ffc478495f0"
+DOWNLOAD_x86_64="https://docs.broadcom.com/docs-and-downloads/docs/linux_sta/README_6.30.223.271.txt \
+                 https://docs.broadcom.com/docs-and-downloads/docs/linux_sta/hybrid-v35_64-nodebug-pcoem-6_30_223_271.tar.gz"
+MD5SUM_x86_64="e3dab6d9dea12b6487ccf24d012e0350 \
+               115903050c41d466161784d4c843f4f9"
+REQUIRES=""
+MAINTAINER="Jay Lanagan"
+EMAIL="j@lngn.net"
diff --git a/network/broadcom-wl/doinst.sh.gz b/network/broadcom-wl/doinst.sh.gz
new file mode 100644
index 0000000000..10b4e4f29a
--- /dev/null
+++ b/network/broadcom-wl/doinst.sh.gz
diff --git a/network/broadcom-sta/patches/05-remove-time-and-date-macros.patch b/network/broadcom-wl/patches/000-remove-time_date-macros.patch
index 3cd3fc845b..3cd3fc845b 100644
--- a/network/broadcom-sta/patches/05-remove-time-and-date-macros.patch
+++ b/network/broadcom-wl/patches/000-remove-time_date-macros.patch
diff --git a/network/broadcom-wl/patches/001-null-pointer-fix.patch b/network/broadcom-wl/patches/001-null-pointer-fix.patch
new file mode 100644
index 0000000000..adef19f30a
--- /dev/null
+++ b/network/broadcom-wl/patches/001-null-pointer-fix.patch
@@ -0,0 +1,27 @@
+Description: Fixing null pointer crash
+
+Origin: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=773713
+Bug-Ubuntu: https://launchpad.net/bugs/1415880
+Last-Update: 2015-08-18
+
+---
+ src/wl/sys/wl_linux.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/wl/sys/wl_linux.c b/src/wl/sys/wl_linux.c
+index 860b935..295156f 100644
+--- a/src/wl/sys/wl_linux.c
++++ b/src/wl/sys/wl_linux.c
+@@ -2157,8 +2157,8 @@ wl_start(struct sk_buff *skb, struct net_device *dev)
+ 	wlif = WL_DEV_IF(dev);
+ 	wl = WL_INFO(dev);
+ 
++	skb->prev = NULL;
+ 	if (WL_ALL_PASSIVE_ENAB(wl) || (WL_RTR() && WL_CONFIG_SMP())) {
+-		skb->prev = NULL;
+ 
+ 		TXQ_LOCK(wl);
+ 
+-- 
+1.9.1
+
diff --git a/network/broadcom-wl/patches/002-rdtscl.patch b/network/broadcom-wl/patches/002-rdtscl.patch
new file mode 100644
index 0000000000..1b9862cc3d
--- /dev/null
+++ b/network/broadcom-wl/patches/002-rdtscl.patch
@@ -0,0 +1,22 @@
+Since Linux 4.3, rdtscl() is no longer available and native_read_tsc()
+is renamed to rdtsc(). Move the macro contents in-line and call the
+new function. References:
+
+https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit?id=fe47ae6e1a5005b2e82f7eab57b5c3820453293a
+https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit?id=4ea1636b04dbd66536fa387bae2eea463efc705b
+
+diff -ru a/src/shared/linux_osl.c b/src/shared/linux_osl.c
+--- a/src/shared/linux_osl.c	2015-09-19 01:47:15.000000000 +0300
++++ b/src/shared/linux_osl.c	2015-11-21 15:20:30.585902518 +0200
+@@ -932,7 +932,11 @@
+ 	uint cycles;
+ 
+ #if defined(__i386__)
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 3, 0)
++	cycles = (u32)rdtsc();
++#else
+ 	rdtscl(cycles);
++#endif
+ #else
+ 	cycles = 0;
+ #endif 
diff --git a/network/broadcom-wl/patches/003-linux47.patch b/network/broadcom-wl/patches/003-linux47.patch
new file mode 100644
index 0000000000..566680a091
--- /dev/null
+++ b/network/broadcom-wl/patches/003-linux47.patch
@@ -0,0 +1,109 @@
+Since Linux 4.7, the enum ieee80211_band is no longer used
+
+This shall cause no problem's since both enums ieee80211_band
+and nl80211_band were added in the same commit:
+https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit?id=13ae75b103e07304a34ab40c9136e9f53e06475c
+
+This patch refactors the references of IEEE80211_BAND_* to NL80211_BAND_*
+
+Reference:
+https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit?id=57fbcce37be7c1d2622b56587c10ade00e96afa3
+
+--- a/src/wl/sys/wl_cfg80211_hybrid.c	2016-06-13 11:57:36.159340297 -0500
++++ b/src/wl/sys/wl_cfg80211_hybrid.c	2016-06-13 11:58:18.442323435 -0500
+@@ -236,7 +236,7 @@
+ #endif				
+ 
+ #define CHAN2G(_channel, _freq, _flags) {			\
+-	.band			= IEEE80211_BAND_2GHZ,		\
++	.band			= NL80211_BAND_2GHZ,		\
+ 	.center_freq		= (_freq),			\
+ 	.hw_value		= (_channel),			\
+ 	.flags			= (_flags),			\
+@@ -245,7 +245,7 @@
+ }
+ 
+ #define CHAN5G(_channel, _flags) {				\
+-	.band			= IEEE80211_BAND_5GHZ,		\
++	.band			= NL80211_BAND_5GHZ,		\
+ 	.center_freq		= 5000 + (5 * (_channel)),	\
+ 	.hw_value		= (_channel),			\
+ 	.flags			= (_flags),			\
+@@ -379,7 +379,7 @@
+ };
+ 
+ static struct ieee80211_supported_band __wl_band_2ghz = {
+-	.band = IEEE80211_BAND_2GHZ,
++	.band = NL80211_BAND_2GHZ,
+ 	.channels = __wl_2ghz_channels,
+ 	.n_channels = ARRAY_SIZE(__wl_2ghz_channels),
+ 	.bitrates = wl_g_rates,
+@@ -387,7 +387,7 @@
+ };
+ 
+ static struct ieee80211_supported_band __wl_band_5ghz_a = {
+-	.band = IEEE80211_BAND_5GHZ,
++	.band = NL80211_BAND_5GHZ,
+ 	.channels = __wl_5ghz_a_channels,
+ 	.n_channels = ARRAY_SIZE(__wl_5ghz_a_channels),
+ 	.bitrates = wl_a_rates,
+@@ -395,7 +395,7 @@
+ };
+ 
+ static struct ieee80211_supported_band __wl_band_5ghz_n = {
+-	.band = IEEE80211_BAND_5GHZ,
++	.band = NL80211_BAND_5GHZ,
+ 	.channels = __wl_5ghz_n_channels,
+ 	.n_channels = ARRAY_SIZE(__wl_5ghz_n_channels),
+ 	.bitrates = wl_a_rates,
+@@ -1876,8 +1876,8 @@
+ 	wdev->wiphy->max_num_pmkids = WL_NUM_PMKIDS_MAX;
+ #endif
+ 	wdev->wiphy->interface_modes = BIT(NL80211_IFTYPE_STATION) | BIT(NL80211_IFTYPE_ADHOC);
+-	wdev->wiphy->bands[IEEE80211_BAND_2GHZ] = &__wl_band_2ghz;
+-	wdev->wiphy->bands[IEEE80211_BAND_5GHZ] = &__wl_band_5ghz_a; 
++	wdev->wiphy->bands[NL80211_BAND_2GHZ] = &__wl_band_2ghz;
++	wdev->wiphy->bands[NL80211_BAND_5GHZ] = &__wl_band_5ghz_a; 
+ 	wdev->wiphy->signal_type = CFG80211_SIGNAL_TYPE_MBM;
+ 	wdev->wiphy->cipher_suites = __wl_cipher_suites;
+ 	wdev->wiphy->n_cipher_suites = ARRAY_SIZE(__wl_cipher_suites);
+@@ -2000,7 +2000,7 @@
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 39)
+ 	freq = ieee80211_channel_to_frequency(notif_bss_info->channel,
+ 		(notif_bss_info->channel <= CH_MAX_2G_CHANNEL) ?
+-		IEEE80211_BAND_2GHZ : IEEE80211_BAND_5GHZ);
++		NL80211_BAND_2GHZ : NL80211_BAND_5GHZ);
+ #else
+ 	freq = ieee80211_channel_to_frequency(notif_bss_info->channel);
+ #endif
+@@ -2116,7 +2116,7 @@
+ 				return err;
+ 			}
+ 			chan = wf_chspec_ctlchan(chanspec);
+-			band = (chan <= CH_MAX_2G_CHANNEL) ? IEEE80211_BAND_2GHZ : IEEE80211_BAND_5GHZ;
++			band = (chan <= CH_MAX_2G_CHANNEL) ? NL80211_BAND_2GHZ : NL80211_BAND_5GHZ;
+ 			freq = ieee80211_channel_to_frequency(chan, band);
+ 			channel = ieee80211_get_channel(wiphy, freq);
+ 			cfg80211_ibss_joined(ndev, (u8 *)&wl->bssid, channel, GFP_KERNEL);
+@@ -2250,10 +2250,10 @@
+ 		join_params->params.chanspec_list[0] =
+ 		    ieee80211_frequency_to_channel(chan->center_freq);
+ 
+-		if (chan->band == IEEE80211_BAND_2GHZ) {
++		if (chan->band == NL80211_BAND_2GHZ) {
+ 			chanspec |= WL_CHANSPEC_BAND_2G;
+ 		}
+-		else if (chan->band == IEEE80211_BAND_5GHZ) {
++		else if (chan->band == NL80211_BAND_5GHZ) {
+ 			chanspec |= WL_CHANSPEC_BAND_5G;
+ 		}
+ 		else {
+@@ -2885,7 +2885,7 @@
+ 
+ 	if (phy == 'n' || phy == 'a' || phy == 'v') {
+ 		wiphy = wl_to_wiphy(wl);
+-		wiphy->bands[IEEE80211_BAND_5GHZ] = &__wl_band_5ghz_n;
++		wiphy->bands[NL80211_BAND_5GHZ] = &__wl_band_5ghz_n;
+ 	}
+ 
+ 	return err;
diff --git a/network/broadcom-wl/patches/004-linux48.patch b/network/broadcom-wl/patches/004-linux48.patch
new file mode 100644
index 0000000000..20e8a9ae49
--- /dev/null
+++ b/network/broadcom-wl/patches/004-linux48.patch
@@ -0,0 +1,64 @@
+From d3f93542326a06d920c6eb89b703384290d37b8b Mon Sep 17 00:00:00 2001
+From: Alberto Milone <alberto.milone@canonical.com>
+Date: Fri, 2 Sep 2016 17:35:34 +0200
+Subject: [PATCH 1/1] Add support for Linux 4.8
+
+Orginal author: Krzysztof Kolasa
+---
+ src/wl/sys/wl_cfg80211_hybrid.c | 22 ++++++++++++++++++++++
+ 1 file changed, 22 insertions(+)
+
+diff --git a/src/wl/sys/wl_cfg80211_hybrid.c b/src/wl/sys/wl_cfg80211_hybrid.c
+index 2fc71fe..ec5e472 100644
+--- a/src/wl/sys/wl_cfg80211_hybrid.c
++++ b/src/wl/sys/wl_cfg80211_hybrid.c
+@@ -2388,8 +2388,16 @@ wl_bss_connect_done(struct wl_cfg80211_priv *wl, struct net_device *ndev,
+ 	s32 err = 0;
+ 
+ 	if (wl->scan_request) {
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0)
++		struct cfg80211_scan_info info = {
++			.aborted = true,
++		};
++		WL_DBG(("%s: Aborting scan\n", __FUNCTION__));
++		cfg80211_scan_done(wl->scan_request, &info);
++#else
+ 		WL_DBG(("%s: Aborting scan\n", __FUNCTION__));
+ 		cfg80211_scan_done(wl->scan_request, true);     
++#endif
+ 		wl->scan_request = NULL;
+ 	}
+ 
+@@ -2490,7 +2498,14 @@ wl_notify_scan_status(struct wl_cfg80211_priv *wl, struct net_device *ndev,
+ 
+ scan_done_out:
+ 	if (wl->scan_request) {
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0)
++		struct cfg80211_scan_info info = {
++			.aborted = false,
++		};
++		cfg80211_scan_done(wl->scan_request, &info);
++#else
+ 		cfg80211_scan_done(wl->scan_request, false);
++#endif
+ 		wl->scan_request = NULL;
+ 	}
+ 	rtnl_unlock();
+@@ -2909,7 +2924,14 @@ s32 wl_cfg80211_down(struct net_device *ndev)
+ 	s32 err = 0;
+ 
+ 	if (wl->scan_request) {
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0)
++		struct cfg80211_scan_info info = {
++			.aborted = true,
++		};
++		cfg80211_scan_done(wl->scan_request, &info);
++#else
+ 		cfg80211_scan_done(wl->scan_request, true);	
++#endif
+ 		wl->scan_request = NULL;
+ 	}
+ 
+-- 
+2.7.4
+
diff --git a/network/broadcom-wl/patches/005-debian-fix-kernel-warnings.patch b/network/broadcom-wl/patches/005-debian-fix-kernel-warnings.patch
new file mode 100644
index 0000000000..e9bf66a959
--- /dev/null
+++ b/network/broadcom-wl/patches/005-debian-fix-kernel-warnings.patch
@@ -0,0 +1,161 @@
+--- a/src/wl/sys/wl_cfg80211_hybrid.c
++++ b/src/wl/sys/wl_cfg80211_hybrid.c
+@@ -1968,7 +1968,7 @@
+ 
+ 	if (dtoh32(bi->length) > WL_BSS_INFO_MAX) {
+ 		WL_DBG(("Beacon is larger than buffer. Discarding\n"));
+-		return err;
++		return -E2BIG;
+ 	}
+ 	notif_bss_info = kzalloc(sizeof(*notif_bss_info) + sizeof(*mgmt) - sizeof(u8) +
+ 	                         WL_BSS_INFO_MAX, GFP_KERNEL);
+@@ -1992,9 +1992,15 @@
+ 	beacon_proberesp->capab_info = cpu_to_le16(bi->capability);
+ 	wl_rst_ie(wl);
+ 
+-	wl_mrg_ie(wl, ((u8 *) bi) + bi->ie_offset, bi->ie_length);
+-	wl_cp_ie(wl, beacon_proberesp->variable, WL_BSS_INFO_MAX -
++	err = wl_mrg_ie(wl, ((u8 *) bi) + bi->ie_offset, bi->ie_length);
++	if (err)
++		goto inform_single_bss_out;
++
++	err = wl_cp_ie(wl, beacon_proberesp->variable, WL_BSS_INFO_MAX -
+ 	         offsetof(struct wl_cfg80211_bss_info, frame_buf));
++	if (err)
++		goto inform_single_bss_out;
++
+ 	notif_bss_info->frame_len = offsetof(struct ieee80211_mgmt, u.beacon.variable) +
+ 	                            wl_get_ielen(wl);
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 39)
+@@ -2006,14 +2012,14 @@
+ #endif
+ 	if (freq == 0) {
+ 		WL_ERR(("Invalid channel, fail to chcnage channel to freq\n"));
+-		kfree(notif_bss_info);
+-		return -EINVAL;
++		err = -EINVAL;
++		goto inform_single_bss_out;
+ 	}
+ 	channel = ieee80211_get_channel(wiphy, freq);
+ 	if (unlikely(!channel)) {
+ 		WL_ERR(("ieee80211_get_channel error\n"));
+-		kfree(notif_bss_info);
+-		return -EINVAL;
++		err = -EINVAL;
++		goto inform_single_bss_out;
+ 	}
+ 
+ 	WL_DBG(("SSID : \"%s\", rssi %d, channel %d, capability : 0x04%x, bssid %pM\n",
+@@ -2021,28 +2027,37 @@
+ 		mgmt->u.beacon.capab_info, &bi->BSSID));
+ 
+ 	signal = notif_bss_info->rssi * 100;
+-	cbss = cfg80211_inform_bss_frame(wiphy, channel, mgmt,
+-	    le16_to_cpu(notif_bss_info->frame_len), signal, GFP_KERNEL);
+-	if (unlikely(!cbss)) {
+-		WL_ERR(("cfg80211_inform_bss_frame error\n"));
+-		kfree(notif_bss_info);
+-		return -EINVAL;
+-	}
+ 
+-	notify_ie = (u8 *)bi + le16_to_cpu(bi->ie_offset);
+-	notify_ielen = le32_to_cpu(bi->ie_length);
++	if (!wl->scan_request) {
++		cbss = cfg80211_inform_bss_frame(wiphy, channel, mgmt,
++			le16_to_cpu(notif_bss_info->frame_len), signal, GFP_KERNEL);
++		if (unlikely(!cbss)) {
++			WL_ERR(("cfg80211_inform_bss_frame error\n"));
++			err = -ENOMEM;
++			goto inform_single_bss_out;
++		}
++	} else {
++		notify_ie = (u8 *)bi + le16_to_cpu(bi->ie_offset);
++		notify_ielen = le32_to_cpu(bi->ie_length);
+ #if LINUX_VERSION_CODE < KERNEL_VERSION(3, 18, 0)
+-	cbss = cfg80211_inform_bss(wiphy, channel, (const u8 *)(bi->BSSID.octet),
+-		0, beacon_proberesp->capab_info, beacon_proberesp->beacon_int,
+-		(const u8 *)notify_ie, notify_ielen, signal, GFP_KERNEL);
++		cbss = cfg80211_inform_bss(wiphy, channel, (const u8 *)(bi->BSSID.octet),
++			0, beacon_proberesp->capab_info, beacon_proberesp->beacon_int,
++			(const u8 *)notify_ie, notify_ielen, signal, GFP_KERNEL);
+ #else
+-	cbss = cfg80211_inform_bss(wiphy, channel, CFG80211_BSS_FTYPE_UNKNOWN, (const u8 *)(bi->BSSID.octet),
+-		0, beacon_proberesp->capab_info, beacon_proberesp->beacon_int,
+-		(const u8 *)notify_ie, notify_ielen, signal, GFP_KERNEL);
++		cbss = cfg80211_inform_bss(wiphy, channel,
++				wl->active_scan ?
++				CFG80211_BSS_FTYPE_PRESP : CFG80211_BSS_FTYPE_BEACON,
++				(const u8 *)(bi->BSSID.octet), 0,
++				beacon_proberesp->capab_info,
++				beacon_proberesp->beacon_int,
++				(const u8 *)notify_ie, notify_ielen, signal, GFP_KERNEL);
+ #endif
+-
+-	if (unlikely(!cbss))
+-		return -ENOMEM;
++		if (unlikely(!cbss)) {
++			WL_ERR(("cfg80211_inform_bss error\n"));
++			err = -ENOMEM;
++			goto inform_single_bss_out;
++		}
++	}
+ 
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 9, 0)
+ 	cfg80211_put_bss(wiphy, cbss);
+@@ -2050,6 +2065,7 @@
+ 	cfg80211_put_bss(cbss);
+ #endif
+ 
++inform_single_bss_out:
+ 	kfree(notif_bss_info);
+ 
+ 	return err;
+@@ -2316,6 +2332,9 @@
+ 		if (err)
+ 			goto update_bss_info_out;
+ 
++		bss = cfg80211_get_bss(wl_to_wiphy(wl), NULL, (s8 *)&wl->bssid,
++		      ssid->SSID, ssid->SSID_len, WLAN_CAPABILITY_ESS, WLAN_CAPABILITY_ESS);
++
+ 		ie = ((u8 *)bi) + bi->ie_offset;
+ 		ie_len = bi->ie_length;
+ 	} else {
+@@ -2328,11 +2347,18 @@
+ 		ie_len = bss->len_information_elements;
+ #endif
+ 		wl->conf->channel = *bss->channel;
++	}
++
++	if (bss) {
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 9, 0)
+ 		cfg80211_put_bss(wiphy, bss);
+ #else
+ 		cfg80211_put_bss(bss);
+ #endif
++	} else {
++		WL_DBG(("Could not update BSS\n"));
++		err = -EINVAL;
++		goto update_bss_info_out;
+ 	}
+ 
+ 	tim = bcm_parse_tlvs(ie, ie_len, WLAN_EID_TIM);
+@@ -2360,10 +2386,17 @@
+ 	struct wl_cfg80211_connect_info *conn_info = wl_to_conn(wl);
+ 	s32 err = 0;
+ 
+-	wl_get_assoc_ies(wl);
++	err = wl_get_assoc_ies(wl);
++	if (err)
++		return err;
++
+ 	memcpy(wl->profile->bssid, &e->addr, ETHER_ADDR_LEN);
+ 	memcpy(&wl->bssid, &e->addr, ETHER_ADDR_LEN);
+-	wl_update_bss_info(wl);
++
++	err = wl_update_bss_info(wl);
++	if (err)
++		return err;
++
+ 	cfg80211_roamed(ndev,
+ #if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 39)
+ 			&wl->conf->channel,	 
diff --git a/network/broadcom-wl/patches/006-linux411.patch b/network/broadcom-wl/patches/006-linux411.patch
new file mode 100644
index 0000000000..7a2e8c0c6c
--- /dev/null
+++ b/network/broadcom-wl/patches/006-linux411.patch
@@ -0,0 +1,27 @@
+diff -u sys0/wl_cfg80211_hybrid.c sys/wl_cfg80211_hybrid.c
+--- a/src/wl/sys/wl_cfg80211_hybrid.c
++++ b/src/wl/sys/wl_cfg80211_hybrid.c
+@@ -39,6 +39,10 @@
+ #include <proto/802.11.h>
+ #include <wl_cfg80211_hybrid.h>
+ 
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0)
++#include <linux/sched/signal.h>
++#endif
++
+ #define EVENT_TYPE(e) dtoh32((e)->event_type)
+ #define EVENT_FLAGS(e) dtoh16((e)->flags)
+ #define EVENT_STATUS(e) dtoh32((e)->status)
+diff -u sys0/wl_linux.c sys/wl_linux.c
+--- a/src/wl/sys/wl_linux.c
++++ b/src/wl/sys/wl_linux.c
+@@ -2915,7 +2915,9 @@
+ 	if (skb == NULL) return;
+ 
+ 	skb->dev = wl->monitor_dev;
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ 	skb->dev->last_rx = jiffies;
++#endif
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 22)
+ 	skb_reset_mac_header(skb);
+ #else
diff --git a/network/broadcom-wl/patches/007-linux412.patch b/network/broadcom-wl/patches/007-linux412.patch
new file mode 100644
index 0000000000..1673f063cd
--- /dev/null
+++ b/network/broadcom-wl/patches/007-linux412.patch
@@ -0,0 +1,78 @@
+From 0b888bf115612074df99654140a1980111c29748 Mon Sep 17 00:00:00 2001
+From: Antoine Cotten <tonio.cotten@gmail.com>
+Date: Fri, 7 Jul 2017 15:17:47 +0200
+Subject: [PATCH] Apply patch from Debian bug #867258
+
+Compile fix with kernel 4.12
+https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=867258
+---
+ src/wl/sys/wl_cfg80211_hybrid.c | 29 +++++++++++++++++++++++++----
+ 1 file changed, 25 insertions(+), 4 deletions(-)
+
+diff --git a/src/wl/sys/wl_cfg80211_hybrid.c b/src/wl/sys/wl_cfg80211_hybrid.c
+index c46944a..1a9840a 100644
+--- a/src/wl/sys/wl_cfg80211_hybrid.c
++++ b/src/wl/sys/wl_cfg80211_hybrid.c
+@@ -53,7 +53,11 @@ u32 wl_dbg_level = WL_DBG_ERR;
+ #endif
+ 
+ static s32 wl_cfg80211_change_iface(struct wiphy *wiphy, struct net_device *ndev,
+-           enum nl80211_iftype type, u32 *flags, struct vif_params *params);
++           enum nl80211_iftype type,
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 12, 0)
++           u32 *flags,
++#endif
++	   struct vif_params *params);
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 6, 0)
+ static s32
+ wl_cfg80211_scan(struct wiphy *wiphy,
+@@ -466,8 +470,11 @@ wl_dev_ioctl(struct net_device *dev, u32 cmd, void *arg, u32 len)
+ 
+ static s32
+ wl_cfg80211_change_iface(struct wiphy *wiphy, struct net_device *ndev,
+-                         enum nl80211_iftype type, u32 *flags,
+-   struct vif_params *params)
++                         enum nl80211_iftype type,
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 12, 0)
++                         u32 *flags,
++#endif
++                         struct vif_params *params)
+ {
+ 	struct wl_cfg80211_priv *wl = wiphy_to_wl(wiphy);
+ 	struct wireless_dev *wdev;
+@@ -2387,6 +2394,15 @@ wl_bss_roaming_done(struct wl_cfg80211_priv *wl, struct net_device *ndev,
+                     const wl_event_msg_t *e, void *data)
+ {
+ 	struct wl_cfg80211_connect_info *conn_info = wl_to_conn(wl);
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0)
++	struct cfg80211_roam_info roam_info = {
++		.bssid = wl->profile->bssid,
++		.req_ie = conn_info->req_ie,
++		.req_ie_len = conn_info->req_ie_len,
++		.resp_ie = conn_info->resp_ie,
++		.resp_ie_len = conn_info->resp_ie_len,
++	};
++#endif
+ 	s32 err = 0;
+ 
+ 	err = wl_get_assoc_ies(wl);
+@@ -2401,12 +2417,17 @@ wl_bss_roaming_done(struct wl_cfg80211_priv *wl, struct net_device *ndev,
+ 		return err;
+ 
+ 	cfg80211_roamed(ndev,
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0)
++			&roam_info,
++#else
+ #if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 39)
+ 			&wl->conf->channel,	 
+ #endif
+ 			(u8 *)&wl->bssid,
+ 			conn_info->req_ie, conn_info->req_ie_len,
+-			conn_info->resp_ie, conn_info->resp_ie_len, GFP_KERNEL);
++			conn_info->resp_ie, conn_info->resp_ie_len,
++#endif
++			GFP_KERNEL);
+ 	WL_DBG(("Report roaming result\n"));
+ 
+ 	set_bit(WL_STATUS_CONNECTED, &wl->status);
+
diff --git a/network/broadcom-wl/patches/008-linux415.patch b/network/broadcom-wl/patches/008-linux415.patch
new file mode 100644
index 0000000000..1bced2f68a
--- /dev/null
+++ b/network/broadcom-wl/patches/008-linux415.patch
@@ -0,0 +1,46 @@
+--- a/src/wl/sys/wl_linux.c	2017-07-17 00:11:24.000000000 +0100
++++ b/src/wl/sys/wl_linux.c	2018-01-27 09:49:47.057799596 +0000
+@@ -93,7 +93,11 @@
+ 
+ #include <wlc_wowl.h>
+ 
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0)
++static void wl_timer(struct timer_list *tl);
++#else
+ static void wl_timer(ulong data);
++#endif
+ static void _wl_timer(wl_timer_t *t);
+ static struct net_device *wl_alloc_linux_if(wl_if_t *wlif);
+ 
+@@ -2297,10 +2301,17 @@
+ 	atomic_dec(&t->wl->callbacks);
+ }
+ 
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0)
++static void
++wl_timer(struct timer_list *tl)
++{
++	wl_timer_t *t = (wl_timer_t *)tl;
++#else
+ static void
+ wl_timer(ulong data)
+ {
+ 	wl_timer_t *t = (wl_timer_t *)data;
++#endif
+ 
+ 	if (!WL_ALL_PASSIVE_ENAB(t->wl))
+ 		_wl_timer(t);
+@@ -2352,9 +2363,13 @@
+ 
+ 	bzero(t, sizeof(wl_timer_t));
+ 
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0)
++	timer_setup(&t->timer, wl_timer, 0);
++#else
+ 	init_timer(&t->timer);
+ 	t->timer.data = (ulong) t;
+ 	t->timer.function = wl_timer;
++#endif
+ 	t->wl = wl;
+ 	t->fn = fn;
+ 	t->arg = arg;
diff --git a/network/broadcom-wl/patches/009-fix_mac_profile_discrepancy.patch b/network/broadcom-wl/patches/009-fix_mac_profile_discrepancy.patch
new file mode 100644
index 0000000000..4260eba505
--- /dev/null
+++ b/network/broadcom-wl/patches/009-fix_mac_profile_discrepancy.patch
@@ -0,0 +1,14 @@
+--- a/src/wl/sys/wl_cfg80211_hybrid.c	2015-09-19 00:47:30.000000000 +0200
++++ b/src/wl/sys/wl_cfg80211_hybrid.c	2018-11-14 14:06:03.313487995 +0100
+@@ -1444,11 +1444,10 @@
+ 	s32 rate;
+ 	s32 err = 0;
+ 
+ 	if (memcmp(mac, wl->profile->bssid, ETHER_ADDR_LEN)) {
+ 		WL_ERR(("Wrong Mac address, mac = %pM   profile =%pM\n", mac, wl->profile->bssid));
+-		return -ENOENT;
+ 	}
+ 
+ 	err = wl_dev_ioctl(dev, WLC_GET_RATE, &rate, sizeof(rate));
+ 	if (err) {
+ 		WL_DBG(("Could not get rate (%d)\n", err));
diff --git a/network/broadcom-wl/patches/010-linux56.patch b/network/broadcom-wl/patches/010-linux56.patch
new file mode 100644
index 0000000000..f8d5783819
--- /dev/null
+++ b/network/broadcom-wl/patches/010-linux56.patch
@@ -0,0 +1,55 @@
+diff --git a/src/shared/linux_osl.c b/src/shared/linux_osl.c
+index 6157d18..8237ec7 100644
+--- a/src/shared/linux_osl.c
++++ b/src/shared/linux_osl.c
+@@ -942,7 +942,7 @@ osl_getcycles(void)
+ void *
+ osl_reg_map(uint32 pa, uint size)
+ {
+-	return (ioremap_nocache((unsigned long)pa, (unsigned long)size));
++	return (ioremap((unsigned long)pa, (unsigned long)size));
+ }
+ 
+ void
+diff --git a/src/wl/sys/wl_linux.c b/src/wl/sys/wl_linux.c
+index 0d05100..2ed1f0d 100644
+--- a/src/wl/sys/wl_linux.c
++++ b/src/wl/sys/wl_linux.c
+@@ -582,7 +582,7 @@ wl_attach(uint16 vendor, uint16 device, ulong regs,
+ 	}
+ 	wl->bcm_bustype = bustype;
+ 
+-	if ((wl->regsva = ioremap_nocache(dev->base_addr, PCI_BAR0_WINSZ)) == NULL) {
++	if ((wl->regsva = ioremap(dev->base_addr, PCI_BAR0_WINSZ)) == NULL) {
+ 		WL_ERROR(("wl%d: ioremap() failed\n", unit));
+ 		goto fail;
+ 	}
+@@ -772,7 +772,7 @@ wl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
+ 	if ((val & 0x0000ff00) != 0)
+ 		pci_write_config_dword(pdev, 0x40, val & 0xffff00ff);
+ 		bar1_size = pci_resource_len(pdev, 2);
+-		bar1_addr = (uchar *)ioremap_nocache(pci_resource_start(pdev, 2),
++		bar1_addr = (uchar *)ioremap(pci_resource_start(pdev, 2),
+ 			bar1_size);
+ 	wl = wl_attach(pdev->vendor, pdev->device, pci_resource_start(pdev, 0), PCI_BUS, pdev,
+ 		pdev->irq, bar1_addr, bar1_size);
+@@ -3335,12 +3335,19 @@ wl_proc_write(struct file *filp, const char __user *buff, size_t length, loff_t
+ }
+ 
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 10, 0)
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 6, 0)
++static struct proc_ops wl_fops = {
++        .proc_read     = wl_proc_read,
++        .proc_write    = wl_proc_write,
++};
++#else
+ static const struct file_operations wl_fops = {
+ 	.owner	= THIS_MODULE,
+ 	.read	= wl_proc_read,
+ 	.write	= wl_proc_write,
+ };
+ #endif
++#endif
+ 
+ static int
+ wl_reg_proc_entry(wl_info_t *wl)
diff --git a/network/broadcom-wl/patches/011-linux59.patch b/network/broadcom-wl/patches/011-linux59.patch
new file mode 100644
index 0000000000..6ef476464c
--- /dev/null
+++ b/network/broadcom-wl/patches/011-linux59.patch
@@ -0,0 +1,211 @@
+From f3d652840f8dd959395065a1cf67ca40b04ec69b Mon Sep 17 00:00:00 2001
+From: Joan Bruguera <joanbrugueram@gmail.com>
+Date: Tue, 13 Oct 2020 19:35:55 +0200
+Subject: [PATCH] Get rid of get_fs/set_fs calls in Broadcom WL driver.
+
+Tentative patch for broadcom-wl 6.30.223.271 driver for Linux 5.10 (tested -rc1 up to 5.10.1)
+
+Applies on top of all the patches applied to broadcom-wl-dkms 6.30.223.271-23 on Arch Linux.
+
+NB: Some checks in wlc_ioctl_internal are likely superfluous,
+    but I'm not familiar enough with the driver to remove them with confidence.
+
+See also: https://lwn.net/Articles/722267/
+          https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=47058bb54b57962b3958a936ddbc59355e4c5504
+          https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=5e6e9852d6f76e01b2e6803c74258afa5b432bc5
+
+Signed-off-by: Joan Bruguera <joanbrugueram@gmail.com>
+---
+ src/wl/sys/wl_cfg80211_hybrid.c | 25 ++-------------------
+ src/wl/sys/wl_iw.c              | 25 ++-------------------
+ src/wl/sys/wl_linux.c           | 40 ++++++++++++++++++++++++++++-----
+ src/wl/sys/wl_linux.h           |  2 ++
+ src/wl/sys/wlc_pub.h            |  1 +
+ 5 files changed, 42 insertions(+), 51 deletions(-)
+
+diff --git a/src/wl/sys/wl_cfg80211_hybrid.c b/src/wl/sys/wl_cfg80211_hybrid.c
+index 7b606e0..1e0adb7 100644
+--- a/src/wl/sys/wl_cfg80211_hybrid.c
++++ b/src/wl/sys/wl_cfg80211_hybrid.c
+@@ -38,6 +38,7 @@
+ #include <wlioctl.h>
+ #include <proto/802.11.h>
+ #include <wl_cfg80211_hybrid.h>
++#include <wl_linux.h>
+ 
+ #define EVENT_TYPE(e) dtoh32((e)->event_type)
+ #define EVENT_FLAGS(e) dtoh16((e)->flags)
+@@ -435,30 +436,7 @@ static void key_endian_to_host(struct wl_wsec_key *key)
+ static s32
+ wl_dev_ioctl(struct net_device *dev, u32 cmd, void *arg, u32 len)
+ {
+-	struct ifreq ifr;
+-	struct wl_ioctl ioc;
+-	mm_segment_t fs;
+-	s32 err = 0;
+-
+-	BUG_ON(len < sizeof(int));
+-
+-	memset(&ioc, 0, sizeof(ioc));
+-	ioc.cmd = cmd;
+-	ioc.buf = arg;
+-	ioc.len = len;
+-	strcpy(ifr.ifr_name, dev->name);
+-	ifr.ifr_data = (caddr_t)&ioc;
+-
+-	fs = get_fs();
+-	set_fs(get_ds());
+-#if defined(WL_USE_NETDEV_OPS)
+-	err = dev->netdev_ops->ndo_do_ioctl(dev, &ifr, SIOCDEVPRIVATE);
+-#else
+-	err = dev->do_ioctl(dev, &ifr, SIOCDEVPRIVATE);
+-#endif
+-	set_fs(fs);
+-
+-	return err;
++	return wlc_ioctl_internal(dev, cmd, arg, len);
+ }
+ 
+ static s32
+diff --git a/src/wl/sys/wl_iw.c b/src/wl/sys/wl_iw.c
+index c4c610b..e346b15 100644
+--- a/src/wl/sys/wl_iw.c
++++ b/src/wl/sys/wl_iw.c
+@@ -37,6 +37,7 @@ typedef const struct si_pub	si_t;
+ 
+ #include <wl_dbg.h>
+ #include <wl_iw.h>
++#include <wl_linux.h>
+ 
+ extern bool wl_iw_conn_status_str(uint32 event_type, uint32 status,
+ 	uint32 reason, char* stringBuf, uint buflen);
+@@ -103,29 +104,7 @@ dev_wlc_ioctl(
+ 	int len
+ )
+ {
+-	struct ifreq ifr;
+-	wl_ioctl_t ioc;
+-	mm_segment_t fs;
+-	int ret;
+-
+-	memset(&ioc, 0, sizeof(ioc));
+-	ioc.cmd = cmd;
+-	ioc.buf = arg;
+-	ioc.len = len;
+-
+-	strcpy(ifr.ifr_name, dev->name);
+-	ifr.ifr_data = (caddr_t) &ioc;
+-
+-	fs = get_fs();
+-	set_fs(get_ds());
+-#if defined(WL_USE_NETDEV_OPS)
+-	ret = dev->netdev_ops->ndo_do_ioctl(dev, &ifr, SIOCDEVPRIVATE);
+-#else
+-	ret = dev->do_ioctl(dev, &ifr, SIOCDEVPRIVATE);
+-#endif
+-	set_fs(fs);
+-
+-	return ret;
++	return wlc_ioctl_internal(dev, cmd, arg, len);
+ }
+ 
+ static int
+diff --git a/src/wl/sys/wl_linux.c b/src/wl/sys/wl_linux.c
+index 947cef3..f04c148 100644
+--- a/src/wl/sys/wl_linux.c
++++ b/src/wl/sys/wl_linux.c
+@@ -1643,10 +1643,7 @@ wl_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
+ 		goto done2;
+ 	}
+ 
+-	if (segment_eq(get_fs(), KERNEL_DS))
+-		buf = ioc.buf;
+-
+-	else if (ioc.buf) {
++	if (ioc.buf) {
+ 		if (!(buf = (void *) MALLOC(wl->osh, MAX(ioc.len, WLC_IOCTL_MAXLEN)))) {
+ 			bcmerror = BCME_NORESOURCE;
+ 			goto done2;
+@@ -1667,7 +1664,7 @@ wl_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
+ 	WL_UNLOCK(wl);
+ 
+ done1:
+-	if (ioc.buf && (ioc.buf != buf)) {
++	if (ioc.buf) {
+ 		if (copy_to_user(ioc.buf, buf, ioc.len))
+ 			bcmerror = BCME_BADADDR;
+ 		MFREE(wl->osh, buf, MAX(ioc.len, WLC_IOCTL_MAXLEN));
+@@ -1680,6 +1677,39 @@ done2:
+ 	return (OSL_ERROR(bcmerror));
+ }
+ 
++int
++wlc_ioctl_internal(struct net_device *dev, int cmd, void *buf, int len)
++{
++	wl_info_t *wl;
++	wl_if_t *wlif;
++	int bcmerror;
++
++	if (!dev)
++		return -ENETDOWN;
++
++	wl = WL_INFO(dev);
++	wlif = WL_DEV_IF(dev);
++	if (wlif == NULL || wl == NULL || wl->dev == NULL)
++		return -ENETDOWN;
++
++	bcmerror = 0;
++
++	WL_TRACE(("wl%d: wlc_ioctl_internal: cmd 0x%x\n", wl->pub->unit, cmd));
++
++	WL_LOCK(wl);
++	if (!capable(CAP_NET_ADMIN)) {
++		bcmerror = BCME_EPERM;
++	} else {
++		bcmerror = wlc_ioctl(wl->wlc, cmd, buf, len, wlif->wlcif);
++	}
++	WL_UNLOCK(wl);
++
++	ASSERT(VALID_BCMERROR(bcmerror));
++	if (bcmerror != 0)
++		wl->pub->bcmerror = bcmerror;
++	return (OSL_ERROR(bcmerror));
++}
++
+ static struct net_device_stats*
+ wl_get_stats(struct net_device *dev)
+ {
+diff --git a/src/wl/sys/wl_linux.h b/src/wl/sys/wl_linux.h
+index 5b1048e..c8c1f41 100644
+--- a/src/wl/sys/wl_linux.h
++++ b/src/wl/sys/wl_linux.h
+@@ -22,6 +22,7 @@
+ #define _wl_linux_h_
+ 
+ #include <wlc_types.h>
++#include <wlc_pub.h>
+ 
+ typedef struct wl_timer {
+ 	struct timer_list 	timer;
+@@ -187,6 +188,7 @@ extern irqreturn_t wl_isr(int irq, void *dev_id, struct pt_regs *ptregs);
+ extern int __devinit wl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent);
+ extern void wl_free(wl_info_t *wl);
+ extern int  wl_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd);
++extern int wlc_ioctl_internal(struct net_device *dev, int cmd, void *buf, int len);
+ extern struct net_device * wl_netdev_get(wl_info_t *wl);
+ 
+ #endif 
+diff --git a/src/wl/sys/wlc_pub.h b/src/wl/sys/wlc_pub.h
+index 53a98b8..2b5a029 100644
+--- a/src/wl/sys/wlc_pub.h
++++ b/src/wl/sys/wlc_pub.h
+@@ -24,6 +24,7 @@
+ 
+ #include <wlc_types.h>
+ #include <wlc_utils.h>
++#include <siutils.h>
+ #include "proto/802.11.h"
+ #include "proto/bcmevent.h"
+ 
+--
+2.28.0
diff --git a/network/broadcom-wl/patches/012-linux517.patch b/network/broadcom-wl/patches/012-linux517.patch
new file mode 100644
index 0000000000..6f23316691
--- /dev/null
+++ b/network/broadcom-wl/patches/012-linux517.patch
@@ -0,0 +1,80 @@
+From 31b7849092c43805c7fbaf7518b99874aa1b310c Mon Sep 17 00:00:00 2001
+From: Joan Bruguera <joanbrugueram@gmail.com>
+Date: Wed, 12 Jan 2022 20:49:20 +0100
+Subject: [PATCH] Tentative fix for broadcom-wl 6.30.223.271 driver for Linux 5.17-rc1
+
+Set netdev->dev_addr through dev_addr_mod + PDE_DATA fix
+
+Since Linux 5.17 netdev->dev_addr is const and must be changed through
+dev_addr_mod, otherwise a warning is logged in dmesg and bad things may happen.
+
+NB: The #if is not wrong, dev_addr_mod is defined since Linux 5.15-rc1
+
+Plus a trivial fix for PDE_DATA.
+
+Applies on top of all the patches applied to broadcom-wl-dkms 6.30.223.271-28 on Arch Linux.
+
+See also: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=adeef3e32146a8d2a73c399dc6f5d76a449131b1
+          https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=359745d78351c6f5442435f81549f0207ece28aa
+---
+ src/wl/sys/wl_linux.c | 16 +++++++++++++---
+ 1 file changed, 13 insertions(+), 3 deletions(-)
+
+diff --git a/src/wl/sys/wl_linux.c b/src/wl/sys/wl_linux.c
+index e491df7..e4614fb 100644
+--- a/src/wl/sys/wl_linux.c
++++ b/src/wl/sys/wl_linux.c
+@@ -93,6 +93,10 @@ struct iw_statistics *wl_get_wireless_stats(struct net_device *dev);
+ 
+ #include <wlc_wowl.h>
+ 
++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 17, 0))
++#define PDE_DATA pde_data
++#endif
++
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0)
+ static void wl_timer(struct timer_list *tl);
+ #else
+@@ -490,6 +494,12 @@ wl_if_setup(struct net_device *dev)
+ #endif
+ }
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 15, 0)
++static inline void eth_hw_addr_set(struct net_device *dev, const void *addr) {
++	memcpy(dev->dev_addr, addr, ETHER_ADDR_LEN);
++}
++#endif
++
+ static wl_info_t *
+ wl_attach(uint16 vendor, uint16 device, ulong regs,
+ 	uint bustype, void *btparam, uint irq, uchar* bar1_addr, uint32 bar1_size)
+@@ -634,7 +644,7 @@ wl_attach(uint16 vendor, uint16 device, ulong regs,
+ 			WL_ERROR(("wl%d: Error setting MAC ADDRESS\n", unit));
+ 	}
+ #endif 
+-	bcopy(&wl->pub->cur_etheraddr, dev->dev_addr, ETHER_ADDR_LEN);
++	eth_hw_addr_set(dev, wl->pub->cur_etheraddr.octet);
+ 
+ 	online_cpus = 1;
+ 
+@@ -1835,7 +1845,7 @@ wl_set_mac_address(struct net_device *dev, void *addr)
+ 
+ 	WL_LOCK(wl);
+ 
+-	bcopy(sa->sa_data, dev->dev_addr, ETHER_ADDR_LEN);
++	eth_hw_addr_set(dev, sa->sa_data);
+ 	err = wlc_iovar_op(wl->wlc, "cur_etheraddr", NULL, 0, sa->sa_data, ETHER_ADDR_LEN,
+ 		IOV_SET, (WL_DEV_IF(dev))->wlcif);
+ 	WL_UNLOCK(wl);
+@@ -3010,7 +3020,7 @@ _wl_add_monitor_if(wl_task_t *task)
+ 	else
+ 		dev->type = ARPHRD_IEEE80211_RADIOTAP;
+ 
+-	bcopy(wl->dev->dev_addr, dev->dev_addr, ETHER_ADDR_LEN);
++	eth_hw_addr_set(dev, wl->dev->dev_addr);
+ 
+ #if defined(WL_USE_NETDEV_OPS)
+ 	dev->netdev_ops = &wl_netdev_monitor_ops;
+-- 
+2.35.1
+
diff --git a/network/broadcom-wl/patches/013-linux518.patch b/network/broadcom-wl/patches/013-linux518.patch
new file mode 100644
index 0000000000..d837429a68
--- /dev/null
+++ b/network/broadcom-wl/patches/013-linux518.patch
@@ -0,0 +1,71 @@
+diff -u -r a/src/shared/linux_osl.c b/src/shared/linux_osl.c
+--- a/src/shared/linux_osl.c	2022-05-24 20:51:15.662604980 +0000
++++ b/src/shared/linux_osl.c	2022-05-24 21:13:38.264472425 +0000
+@@ -599,6 +599,8 @@
+ 	va = kmalloc(size, GFP_ATOMIC | __GFP_ZERO);
+ 	if (va)
+ 		*pap = (ulong)__virt_to_phys(va);
++#elif LINUX_VERSION_CODE >= KERNEL_VERSION(5, 18, 0)
++	va = dma_alloc_coherent(&((struct pci_dev *)osh->pdev)->dev, size, (dma_addr_t*)pap, GFP_ATOMIC);
+ #else
+ 	va = pci_alloc_consistent(osh->pdev, size, (dma_addr_t*)pap);
+ #endif
+@@ -612,6 +614,8 @@
+ 
+ #ifdef __ARM_ARCH_7A__
+ 	kfree(va);
++#elif LINUX_VERSION_CODE >= KERNEL_VERSION(5, 18, 0)
++	dma_free_coherent(&((struct pci_dev *)osh->pdev)->dev, size, va, (dma_addr_t)pa);
+ #else
+ 	pci_free_consistent(osh->pdev, size, va, (dma_addr_t)pa);
+ #endif
+@@ -623,7 +627,11 @@
+ 	int dir;
+ 
+ 	ASSERT((osh && (osh->magic == OS_HANDLE_MAGIC)));
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 18, 0)
++	dir = (direction == DMA_TX)? DMA_TO_DEVICE: DMA_FROM_DEVICE;
++#else
+ 	dir = (direction == DMA_TX)? PCI_DMA_TODEVICE: PCI_DMA_FROMDEVICE;
++#endif
+ 
+ #if defined(__ARM_ARCH_7A__) && defined(BCMDMASGLISTOSL)
+ 	if (dmah != NULL) {
+@@ -641,7 +649,11 @@
+ 				ASSERT(totsegs + nsegs <= MAX_DMA_SEGS);
+ 				sg->page_link = 0;
+ 				sg_set_buf(sg, PKTDATA(osh, skb), PKTLEN(osh, skb));
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 18, 0)
++				dma_map_single(&((struct pci_dev *)osh->pdev)->dev, PKTDATA(osh, skb), PKTLEN(osh, skb), dir);
++#else
+ 				pci_map_single(osh->pdev, PKTDATA(osh, skb), PKTLEN(osh, skb), dir);
++#endif
+ 			}
+ 			totsegs += nsegs;
+ 			totlen += PKTLEN(osh, skb);
+@@ -656,7 +668,11 @@
+ 	}
+ #endif 
+ 
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 18, 0)
++	return (dma_map_single(&((struct pci_dev *)osh->pdev)->dev, va, size, dir));
++#else
+ 	return (pci_map_single(osh->pdev, va, size, dir));
++#endif
+ }
+ 
+ void BCMFASTPATH
+@@ -665,8 +681,13 @@
+ 	int dir;
+ 
+ 	ASSERT((osh && (osh->magic == OS_HANDLE_MAGIC)));
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 18, 0)
++	dir = (direction == DMA_TX)? DMA_TO_DEVICE: DMA_FROM_DEVICE;
++	dma_unmap_single(&((struct pci_dev *)osh->pdev)->dev, (uint32)pa, size, dir);
++#else
+ 	dir = (direction == DMA_TX)? PCI_DMA_TODEVICE: PCI_DMA_FROMDEVICE;
+ 	pci_unmap_single(osh->pdev, (uint32)pa, size, dir);
++#endif
+ }
+ 
+ #if defined(BCMDBG_ASSERT)
diff --git a/network/broadcom-wl/patches/014-linux414.patch b/network/broadcom-wl/patches/014-linux414.patch
new file mode 100644
index 0000000000..0576aa5cf9
--- /dev/null
+++ b/network/broadcom-wl/patches/014-linux414.patch
@@ -0,0 +1,37 @@
+From: Gerardo Esteban Malazdrewicz <gerardo@malazdrewicz.com.ar>
+Date: Fri, 29 Dec 2017 23:44:24 -0400
+Subject: linux414
+Origin: https://bugs.debian.org/885885
+
+linux 4.14 changed the kernel_read function prototype.
+---
+ src/shared/linux_osl.c | 12 +++++++++++-
+ 1 files changed, 12 insertions(+), 1 deletion(-)
+
+diff --git a/src/shared/linux_osl.c b/src/shared/linux_osl.c
+index 9adc392..b24a973 100644
+--- a/src/shared/linux_osl.c
++++ b/src/shared/linux_osl.c
+@@ -1076,11 +1076,21 @@ osl_os_get_image_block(char *buf, int len, void *image)
+ {
+ 	struct file *fp = (struct file *)image;
+ 	int rdlen;
++	loff_t pos;
+ 
+ 	if (!image)
+ 		return 0;
+ 
+-	rdlen = kernel_read(fp, fp->f_pos, buf, len);
++	pos = fp->f_pos;
++	rdlen = kernel_read(fp,
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 14, 0)
++			pos,
++#endif
++			buf, len
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 14, 0)
++			,&pos
++#endif
++	);
+ 	if (rdlen > 0)
+ 		fp->f_pos += rdlen;
+ 
diff --git a/network/broadcom-wl/patches/015-linux600.patch b/network/broadcom-wl/patches/015-linux600.patch
new file mode 100644
index 0000000000..8645907bba
--- /dev/null
+++ b/network/broadcom-wl/patches/015-linux600.patch
@@ -0,0 +1,31 @@
+From 933540c63f33e6ac2825d65c4b681ef3387d9146 Mon Sep 17 00:00:00 2001
+From: Antoine Cotten <hello@acotten.com>
+Date: Mon, 15 Aug 2022 17:53:51 +0200
+Subject: [PATCH] cfg80211_roam_info compat for MLO APIs in Linux >= 6.0
+
+The 'bssid' struct field is now under 'links.bssid'.
+
+See also: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=efbabc11650040c64884ff3019b88c7bcc0ceb1d
+
+Original patch by Joan Bruguera:
+https://gist.github.com/joanbm/207210d74637870c01ef5a3c262a597d
+---
+ src/wl/sys/wl_cfg80211_hybrid.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/src/wl/sys/wl_cfg80211_hybrid.c b/src/wl/sys/wl_cfg80211_hybrid.c
+index 5e9e6d3..5ec35c5 100644
+--- a/src/wl/sys/wl_cfg80211_hybrid.c
++++ b/src/wl/sys/wl_cfg80211_hybrid.c
+@@ -2412,7 +2412,11 @@ wl_bss_roaming_done(struct wl_cfg80211_priv *wl, struct net_device *ndev,
+ 	struct wl_cfg80211_connect_info *conn_info = wl_to_conn(wl);
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0)
+ 	struct cfg80211_roam_info roam_info = {
++#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 0, 0)
+ 		.bssid = wl->profile->bssid,
++#else
++		.links[0].bssid = wl->profile->bssid,
++#endif
+ 		.req_ie = conn_info->req_ie,
+ 		.req_ie_len = conn_info->req_ie_len,
+ 		.resp_ie = conn_info->resp_ie,
diff --git a/network/broadcom-wl/patches/016-linux601.patch b/network/broadcom-wl/patches/016-linux601.patch
new file mode 100644
index 0000000000..721967d275
--- /dev/null
+++ b/network/broadcom-wl/patches/016-linux601.patch
@@ -0,0 +1,90 @@
+diff -Nurp -u -r a/src/wl/sys/wl_cfg80211_hybrid.c b/src/wl/sys/wl_cfg80211_hybrid.c
+--- a/src/wl/sys/wl_cfg80211_hybrid.c	2022-12-12 00:23:30.821615599 +0000
++++ b/src/wl/sys/wl_cfg80211_hybrid.c	2022-12-12 00:35:47.854975024 +0000
+@@ -105,14 +105,28 @@ static s32 wl_cfg80211_get_tx_power(stru
+ static s32 wl_cfg80211_get_tx_power(struct wiphy *wiphy, s32 *dbm);
+ #endif
+ 
+-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 38)
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0)
++static s32 wl_cfg80211_config_default_key(struct wiphy *wiphy,
++           struct net_device *dev, int link_id, u8 key_idx, bool unicast,
++           bool multicast);
++#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 38)
+ static s32 wl_cfg80211_config_default_key(struct wiphy *wiphy,
+            struct net_device *dev, u8 key_idx, bool unicast, bool multicast);
+ #else
+ static s32 wl_cfg80211_config_default_key(struct wiphy *wiphy,
+            struct net_device *dev, u8 key_idx);
+ #endif
+-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37)
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0)
++static s32 wl_cfg80211_add_key(struct wiphy *wiphy, struct net_device *dev,
++           int link_id, u8 key_idx, bool pairwise, const u8 *mac_addr,
++           struct key_params *params);
++static s32 wl_cfg80211_del_key(struct wiphy *wiphy, struct net_device *dev,
++           int link_id, u8 key_idx, bool pairwise, const u8 *mac_addr);
++static s32 wl_cfg80211_get_key(struct wiphy *wiphy, struct net_device *dev,
++           int link_id, u8 key_idx, bool pairwise, const u8 *mac_addr,
++           void *cookie,
++           void (*callback) (void *cookie, struct key_params *params));
++#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37)
+ static s32 wl_cfg80211_add_key(struct wiphy *wiphy, struct net_device *dev,
+            u8 key_idx, bool pairwise, const u8 *mac_addr, struct key_params *params);
+ static s32 wl_cfg80211_del_key(struct wiphy *wiphy, struct net_device *dev,
+@@ -1161,7 +1175,12 @@ static s32 wl_cfg80211_get_tx_power(stru
+ 	return err;
+ }
+ 
+-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 38)
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0)
++static s32
++wl_cfg80211_config_default_key(struct wiphy *wiphy,
++	struct net_device *dev, int link_id, u8 key_idx, bool unicast,
++	bool multicast)
++#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 38)
+ static s32
+ wl_cfg80211_config_default_key(struct wiphy *wiphy,
+ 	struct net_device *dev, u8 key_idx, bool unicast, bool multicast)
+@@ -1186,7 +1205,12 @@ wl_cfg80211_config_default_key(struct wi
+ 	return 0;
+ }
+ 
+-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37)
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0)
++static s32
++wl_cfg80211_add_key(struct wiphy *wiphy, struct net_device *dev,
++                    int link_id, u8 key_idx, bool pairwise, const u8 *mac_addr,
++                    struct key_params *params)
++#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37)
+ static s32
+ wl_cfg80211_add_key(struct wiphy *wiphy, struct net_device *dev,
+                     u8 key_idx, bool pairwise, const u8 *mac_addr, struct key_params *params)
+@@ -1307,7 +1331,11 @@ wl_cfg80211_add_key(struct wiphy *wiphy,
+ 	return err;
+ }
+ 
+-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37)
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0)
++static s32
++wl_cfg80211_del_key(struct wiphy *wiphy, struct net_device *dev,
++                    int link_id, u8 key_idx, bool pairwise, const u8 *mac_addr)
++#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37)
+ static s32
+ wl_cfg80211_del_key(struct wiphy *wiphy, struct net_device *dev,
+                     u8 key_idx, bool pairwise, const u8 *mac_addr)
+@@ -1350,7 +1378,13 @@ wl_cfg80211_del_key(struct wiphy *wiphy,
+ 	return err;
+ }
+ 
+-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37)
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0)
++static s32
++wl_cfg80211_get_key(struct wiphy *wiphy, struct net_device *dev,
++                    int link_id, u8 key_idx, bool pairwise, const u8 *mac_addr,
++                    void *cookie,
++                    void (*callback) (void *cookie, struct key_params * params))
++#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37)
+ static s32
+ wl_cfg80211_get_key(struct wiphy *wiphy, struct net_device *dev,
+                     u8 key_idx, bool pairwise, const u8 *mac_addr, void *cookie,
diff --git a/network/broadcom-wl/slack-desc b/network/broadcom-wl/slack-desc
new file mode 100644
index 0000000000..dba3efd955
--- /dev/null
+++ b/network/broadcom-wl/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+           |-----handy-ruler------------------------------------------------------|
+broadcom-wl: broadcom-wl (Broadcom wireless kernel module)
+broadcom-wl:
+broadcom-wl: Proprietary driver for Broadcom's BCM4311, BCM4312, BCM4313, BCM4321,
+broadcom-wl: BCM4322, BCM43142, BCM43224, BCM43225, BCM43227, BCM43228, BCM4331,
+broadcom-wl: BCM4360 and BCM4352 wireless network cards. Includes a kernel module
+broadcom-wl: named 'wl'.
+broadcom-wl:
+broadcom-wl: For more information, see:
+broadcom-wl: https://www.broadcom.com/support/802.11
+broadcom-wl:
+broadcom-wl:
diff --git a/network/bsflite/bsflite.SlackBuild b/network/bsflite/bsflite.SlackBuild
index df1bc738f1..3c012d077b 100644
--- a/network/bsflite/bsflite.SlackBuild
+++ b/network/bsflite/bsflite.SlackBuild
@@ -1,28 +1,38 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for bsflite
 # Written by Peter Drauden (pjdraud@ilstu.edu)
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=bsflite
 VERSION=${VERSION:-0.85}
 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"
@@ -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/network/btpd/README b/network/btpd/README
index a63b2bbd16..acccc68c1c 100644
--- a/network/btpd/README
+++ b/network/btpd/README
@@ -1,11 +1,12 @@
-Btpd is a utility for sharing files over the BitTorrent network protocol.
-It runs in daemon mode, thus needing no controlling terminal or gui. Instead,
-the daemon is controlled by the btcli command line utility, or other programs
-capable of sending commands and queries on the btpd control socket.
+Btpd is a utility for sharing files over the BitTorrent network
+protocol.  It runs in daemon mode, thus needing no controlling
+terminal or gui. Instead, the daemon is controlled by the btcli
+command line utility, or other programs capable of sending commands
+and queries on the btpd control socket.
 
-The goal is to provide a healthy alternative to the still prevailing ftp/http
-servers for file distribution sites and a good BitTorrent client for the
-casual user.
+The goal is to provide a healthy alternative to the still prevailing
+ftp/http servers for file distribution sites and a good BitTorrent
+client for the casual user.
 
 Features of btpd include:
     * Reasonable resource usage.
@@ -16,5 +17,6 @@ Features of btpd include:
     * IPv6 support.
     * Multitracker support.
 
-Btpd is very simple and easy to use. The official README (which is located in 
-the standard documentation directory) is small and complete, so read it first.
+Btpd is very simple and easy to use. The official README (which
+is located in the standard documentation directory) is small and
+complete, so read it first.
diff --git a/network/btpd/btpd.SlackBuild b/network/btpd/btpd.SlackBuild
index 0d7c41cdce..e76afda47e 100644
--- a/network/btpd/btpd.SlackBuild
+++ b/network/btpd/btpd.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for btpd
 
@@ -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=btpd
 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"
@@ -60,7 +70,12 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+# respecting content-disposition may include cgi params in the filename
+TARBALL=$CWD/$PRGNAM-$VERSION.tar.gz
+if [ ! -e $TARBALL ]; then
+  TARBALL="$(/bin/ls $TARBALL\?* | head -1)"
+fi
+tar xvf $TARBALL
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
@@ -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/network/bwm-ng/bwm-ng.SlackBuild b/network/bwm-ng/bwm-ng.SlackBuild
index e9eb39918c..f63e93f226 100644
--- a/network/bwm-ng/bwm-ng.SlackBuild
+++ b/network/bwm-ng/bwm-ng.SlackBuild
@@ -1,9 +1,9 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for bwm-ng
 
 # Copyright 2010  Binh Nguyen <binhvng@gmail.com>
-# 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=bwm-ng
-VERSION=${VERSION:-0.6.2}
-BUILD=${BUILD:-1}
+VERSION=${VERSION:-0.6.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}
@@ -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/network/bwm-ng/bwm-ng.info b/network/bwm-ng/bwm-ng.info
index 404db9af38..358c1d48da 100644
--- a/network/bwm-ng/bwm-ng.info
+++ b/network/bwm-ng/bwm-ng.info
@@ -1,8 +1,8 @@
 PRGNAM="bwm-ng"
-VERSION="0.6.2"
+VERSION="0.6.3"
 HOMEPAGE="https://github.com/vgropp/bwm-ng"
-DOWNLOAD="https://github.com/vgropp/bwm-ng/archive/v0.6.2/bwm-ng-0.6.2.tar.gz"
-MD5SUM="1973976d7c8e8eea6f0545576a9159e8"
+DOWNLOAD="https://github.com/vgropp/bwm-ng/archive/v0.6.3/bwm-ng-0.6.3.tar.gz"
+MD5SUM="eb343c2b806c5e9a40611fc39e907a3d"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/network/bwm-ng/fix_gcc7_inline.patch b/network/bwm-ng/fix_gcc7_inline.patch
new file mode 100644
index 0000000000..dec44a7d66
--- /dev/null
+++ b/network/bwm-ng/fix_gcc7_inline.patch
@@ -0,0 +1,40 @@
+--- src/bwm-ng.c.orig	2017-06-12 03:15:08.731964116 +0200
++++ src/bwm-ng.c	2017-06-12 03:15:21.492001798 +0200
+@@ -26,7 +26,7 @@
+ 
+ /* handle interrupt signal */
+ void sigint(int sig) FUNCATTR_NORETURN;
+-inline void init(void);
++static inline void init(void);
+ 
+ /* clear stuff and exit */
+ #ifdef __STDC__
+@@ -98,7 +98,7 @@
+ 	deinit(0, NULL);
+ }
+ 
+-inline void init(void) {
++static inline void init(void) {
+ 	if_count=0;
+ 	delay=500;
+ #if EXTENDED_STATS	
+--- src/options.c.orig	2017-06-12 03:11:33.659353656 +0200
++++ src/options.c	2017-06-12 03:14:36.535870677 +0200
+@@ -34,7 +34,7 @@
+ #if EXTENDED_STATS
+ inline int str2output_type(char *optarg);
+ #endif
+-inline int str2out_method(char *optarg);
++static inline int str2out_method(char *optarg);
+ inline int str2in_method(char *optarg);
+ 
+ #ifdef CONFIG_FILE
+@@ -87,7 +87,7 @@
+ }
+ #endif  
+ 
+-inline int str2out_method(char *optarg) {
++static inline int str2out_method(char *optarg) {
+     if (optarg) {
+         if (!strcasecmp(optarg,"plain")) return PLAIN_OUT;
+ #ifdef HAVE_CURSES
diff --git a/network/c-toxcore/README b/network/c-toxcore/README
index aef1928e98..ba384d1ecc 100644
--- a/network/c-toxcore/README
+++ b/network/c-toxcore/README
@@ -1,16 +1,20 @@
-Tox is a free (as in liberty and price) peer to peer, distributed, multimedia
-messenger. Tox can provide a superior instant messaging experience than current
-market offerings by using existing technologies such as dispersed networking
-and strong cryptography. Files can be shared as fast as you and your partner's
-Internet connection allows, audio calls are instantaneous, and there are no
-arbitrary limits to how many people you can have in a group conversation.
+Tox is a free (as in liberty and price) peer to peer, distributed,
+multimedia messenger. Tox can provide a superior instant
+messaging experience than current market offerings by using
+existing technologies such as dispersed networking and strong
+cryptography. Files can be shared as fast as you and your partner's
+Internet connection allows, audio calls are instantaneous, and there
+are no arbitrary limits to how many people you can have in a group
+conversation.
 
-This is a fork of the original irungentoo/toxcore. Toxcore developer has been
-unable to find time to work on it and a non-hostile fork was created.
+This is a fork of the original irungentoo/toxcore. Toxcore developer
+has been unable to find time to work on it and a non-hostile fork was
+created.
 
 Additional libconfig dependency is needed for tox-bootstrapd daemon,
 together with:
 
   DAEMON=yes ./c-toxcore.SlackBuild
 
-NOTE: Please remove the original toxcore package before installing c-toxcore.
+NOTE: Please remove the original toxcore package before installing
+c-toxcore.
diff --git a/network/c-toxcore/c-toxcore.SlackBuild b/network/c-toxcore/c-toxcore.SlackBuild
index 54d332202f..6648543da4 100644
--- a/network/c-toxcore/c-toxcore.SlackBuild
+++ b/network/c-toxcore/c-toxcore.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for c-toxcore
 
-# Copyright 2015, 2016, 2017, 2018  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,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=c-toxcore
-VERSION=${VERSION:-0.2.1}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-0.2.12}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 DAEMON=${DAEMON:-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}
 
-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/network/c-toxcore/c-toxcore.info b/network/c-toxcore/c-toxcore.info
index f5e221b192..5e87461570 100644
--- a/network/c-toxcore/c-toxcore.info
+++ b/network/c-toxcore/c-toxcore.info
@@ -1,10 +1,10 @@
 PRGNAM="c-toxcore"
-VERSION="0.2.1"
+VERSION="0.2.12"
 HOMEPAGE="https://github.com/TokTok/c-toxcore"
-DOWNLOAD="https://github.com/TokTok/c-toxcore/archive/v0.2.1/c-toxcore-0.2.1.tar.gz"
-MD5SUM="e480a1924afd07b64ba5e6315787db5e"
+DOWNLOAD="https://github.com/TokTok/c-toxcore/archive/v0.2.12/c-toxcore-0.2.12.tar.gz"
+MD5SUM="16033d63c6520cd023acddaabe84fb95"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="%README% libsodium opus"
+REQUIRES="%README%"
 MAINTAINER="Mario Preksavec"
 EMAIL="mario at slackware dot hr"
diff --git a/network/cacti-spine/cacti-spine.SlackBuild b/network/cacti-spine/cacti-spine.SlackBuild
index d3553a84e2..69c48dc7bc 100644
--- a/network/cacti-spine/cacti-spine.SlackBuild
+++ b/network/cacti-spine/cacti-spine.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for cacti-spine
 
@@ -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=cacti-spine
 VERSION=${VERSION:-1.1.38}
 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/network/cacti/README b/network/cacti/README
index 53ff5b7059..6465cf2545 100644
--- a/network/cacti/README
+++ b/network/cacti/README
@@ -1,5 +1,5 @@
-Cacti is a complete network graphing solution designed to
-harness the power of RRDTool's data storage and graphing funcionality.
+Cacti is a complete network graphing solution designed to harness the
+power of RRDTool's data storage and graphing funcionality.
 
 Cacti provides a fast poller, advanced graph templating, multiple
 data acquisition methods, and user-management features out of the box.
@@ -18,6 +18,6 @@ Change these at build time if preferred:
     PHPUSER=youruser PHPGROUP=yourgroup \
     ./cacti.SlackBuild
 
-httpd, php, and mariadb (as included in Slackware) must also be configured
-properly and running.  Check the included documentation to setup your
-MariaDB database and users.  See also README.SBo.
+httpd, php, and mariadb (as included in Slackware) must also be
+configured properly and running. Check the included documentation to
+setup your MariaDB database and users. See also README.SBo.
diff --git a/network/cacti/cacti.SlackBuild b/network/cacti/cacti.SlackBuild
index 4bea90fd4c..ad194b09c5 100644
--- a/network/cacti/cacti.SlackBuild
+++ b/network/cacti/cacti.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for cacti:
 
@@ -23,17 +23,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=cacti
 VERSION=${VERSION:-1.1.38}
 ARCH=noarch
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 DOCROOT=${DOCROOT:-/var/www/htdocs}
 PHPUSER=${PHPUSER:-root}
 PHPGROUP=${PHPGROUP:-apache}
 
-CWD=$(pwd)
+# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
+# the name of the created package would be, and then exit. This information
+# could be useful to other scripts.
+if [ ! -z "${PRINT_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/network/cadaver/README b/network/cadaver/README
index 58cde7036b..f59e82f764 100644
--- a/network/cadaver/README
+++ b/network/cadaver/README
@@ -1,3 +1,3 @@
-Cadaver is a command-line WebDAV client for Unix. It supports file upload, 
-download, on-screen display, namespace operations (move/copy), collection 
-creation and deletion, and locking operations.
+Cadaver is a command-line WebDAV client for Unix. It supports file
+upload, download, on-screen display, namespace operations (move/copy),
+collection creation and deletion, and locking operations.
diff --git a/network/cadaver/cadaver.SlackBuild b/network/cadaver/cadaver.SlackBuild
index a6323eac30..46260f6cae 100644
--- a/network/cadaver/cadaver.SlackBuild
+++ b/network/cadaver/cadaver.SlackBuild
@@ -1,12 +1,15 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for cadaver
 # Jean-Yves Didier revision date 2008/05/29
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=cadaver
 VERSION=${VERSION:-0.23.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}
@@ -85,5 +95,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/network/canto/canto.SlackBuild b/network/canto/canto.SlackBuild
index d7c87b6243..99709176e3 100644
--- a/network/canto/canto.SlackBuild
+++ b/network/canto/canto.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for canto
 
@@ -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=canto
 VERSION=${VERSION:-0.7.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}
@@ -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/network/canto/canto.info b/network/canto/canto.info
index 4c554ab0bb..0e772165a0 100644
--- a/network/canto/canto.info
+++ b/network/canto/canto.info
@@ -5,6 +5,6 @@ DOWNLOAD="http://codezen.org/static/canto-0.7.10.tar.gz"
 MD5SUM="541d1770496866a5d513305e118b2ab5"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="python-chardet"
+REQUIRES=""
 MAINTAINER="Mikko Värri"
 EMAIL="vmj@linuxbox.fi"
diff --git a/network/castor/README b/network/castor/README
new file mode 100644
index 0000000000..011e8c84f1
--- /dev/null
+++ b/network/castor/README
@@ -0,0 +1,6 @@
+Castor is a graphical client for the Gemini, Gopher
+and Finger protocols.
+It's written in Rust and uses GTK.
+
+Home page: https://git.sr.ht/~julienxx/castor
+
diff --git a/network/castor/castor.SlackBuild b/network/castor/castor.SlackBuild
new file mode 100644
index 0000000000..204b8b80df
--- /dev/null
+++ b/network/castor/castor.SlackBuild
@@ -0,0 +1,172 @@
+#!/bin/bash
+
+# Slackware build script for castor
+
+# Copyright 2022 Julien Blanchard, Bordeaux 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.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=castor
+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
+
+  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"
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  CARGOTARGET="--target i686-unknown-linux-gnu"
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  CARGOTARGET="--target x86_64-unknown-linux-gnu"
+else
+  SLKCFLAGS="-O2"
+  CARGOTARGET=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$VERSION.tar.gz || 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)"
+
+    echo "HERE $ver $dep"
+
+    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/usr/share/applications
+install -m 644 data/Castor.desktop $PKG/usr/share/applications
+
+mkdir -p $PKG/usr/share/icons/hicolor/{scalable,16x16,32x32,64x64,128x128}/apps
+install -m 644 data/org.typed-hole.castor.svg $PKG/usr/share/icons/hicolor/scalable/apps/org.typed-hole.castor.svg
+install -m 644 data/org.typed-hole.castor-16.png $PKG/usr/share/icons/hicolor/16x16/apps/org.typed-hole.castor.png
+install -m 644 data/org.typed-hole.castor-32.png $PKG/usr/share/icons/hicolor/32x32/apps/org.typed-hole.castor.png
+install -m 644 data/org.typed-hole.castor-64.png $PKG/usr/share/icons/hicolor/64x64/apps/org.typed-hole.castor.png
+install -m 644 data/org.typed-hole.castor-128.png $PKG/usr/share/icons/hicolor/128x128/apps/org.typed-hole.castor.png
+
+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/network/castor/castor.info b/network/castor/castor.info
new file mode 100644
index 0000000000..c3a4b08e83
--- /dev/null
+++ b/network/castor/castor.info
@@ -0,0 +1,226 @@
+PRGNAM="castor"
+VERSION="0.9.0"
+HOMEPAGE="https://git.sr.ht/~julienxx/castor"
+DOWNLOAD="https://git.sr.ht/~julienxx/castor/archive/0.9.0.tar.gz \
+          https://static.crates.io/crates/aho-corasick/aho-corasick-0.7.18.crate \
+          https://static.crates.io/crates/ansi-parser/ansi-parser-0.6.5.crate \
+          https://static.crates.io/crates/atk/atk-0.8.0.crate \
+          https://static.crates.io/crates/atk-sys/atk-sys-0.9.1.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/cairo-rs/cairo-rs-0.8.1.crate \
+          https://static.crates.io/crates/cairo-sys-rs/cairo-sys-rs-0.9.2.crate \
+          https://static.crates.io/crates/cc/cc-1.0.73.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/cloudabi/cloudabi-0.0.3.crate \
+          https://static.crates.io/crates/core-foundation/core-foundation-0.7.0.crate \
+          https://static.crates.io/crates/core-foundation-sys/core-foundation-sys-0.7.0.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/foreign-types/foreign-types-0.3.2.crate \
+          https://static.crates.io/crates/foreign-types-shared/foreign-types-shared-0.1.1.crate \
+          https://static.crates.io/crates/form_urlencoded/form_urlencoded-1.0.1.crate \
+          https://static.crates.io/crates/fuchsia-cprng/fuchsia-cprng-0.1.1.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-macro/futures-macro-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/gdk/gdk-0.12.1.crate \
+          https://static.crates.io/crates/gdk-pixbuf/gdk-pixbuf-0.8.0.crate \
+          https://static.crates.io/crates/gdk-pixbuf-sys/gdk-pixbuf-sys-0.9.1.crate \
+          https://static.crates.io/crates/gdk-sys/gdk-sys-0.9.1.crate \
+          https://static.crates.io/crates/getrandom/getrandom-0.2.6.crate \
+          https://static.crates.io/crates/gio/gio-0.8.1.crate \
+          https://static.crates.io/crates/gio-sys/gio-sys-0.9.1.crate \
+          https://static.crates.io/crates/glib/glib-0.9.3.crate \
+          https://static.crates.io/crates/glib-sys/glib-sys-0.9.1.crate \
+          https://static.crates.io/crates/gobject-sys/gobject-sys-0.9.1.crate \
+          https://static.crates.io/crates/gtk/gtk-0.8.1.crate \
+          https://static.crates.io/crates/gtk-sys/gtk-sys-0.9.2.crate \
+          https://static.crates.io/crates/idna/idna-0.2.3.crate \
+          https://static.crates.io/crates/lazy_static/lazy_static-1.4.0.crate \
+          https://static.crates.io/crates/libc/libc-0.2.125.crate \
+          https://static.crates.io/crates/linkify/linkify-0.7.0.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/native-tls/native-tls-0.2.4.crate \
+          https://static.crates.io/crates/nom/nom-4.2.3.crate \
+          https://static.crates.io/crates/once_cell/once_cell-1.10.0.crate \
+          https://static.crates.io/crates/open/open-2.0.3.crate \
+          https://static.crates.io/crates/openssl/openssl-0.10.40.crate \
+          https://static.crates.io/crates/openssl-macros/openssl-macros-0.1.0.crate \
+          https://static.crates.io/crates/openssl-probe/openssl-probe-0.1.5.crate \
+          https://static.crates.io/crates/openssl-sys/openssl-sys-0.9.73.crate \
+          https://static.crates.io/crates/pango/pango-0.8.0.crate \
+          https://static.crates.io/crates/pango-sys/pango-sys-0.9.1.crate \
+          https://static.crates.io/crates/pathdiff/pathdiff-0.2.1.crate \
+          https://static.crates.io/crates/percent-encoding/percent-encoding-2.1.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.25.crate \
+          https://static.crates.io/crates/proc-macro2/proc-macro2-1.0.38.crate \
+          https://static.crates.io/crates/quote/quote-1.0.18.crate \
+          https://static.crates.io/crates/rand/rand-0.6.5.crate \
+          https://static.crates.io/crates/rand_chacha/rand_chacha-0.1.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_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.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.4.3.crate \
+          https://static.crates.io/crates/regex/regex-1.5.5.crate \
+          https://static.crates.io/crates/regex-syntax/regex-syntax-0.6.25.crate \
+          https://static.crates.io/crates/remove_dir_all/remove_dir_all-0.5.3.crate \
+          https://static.crates.io/crates/schannel/schannel-0.1.19.crate \
+          https://static.crates.io/crates/security-framework/security-framework-0.4.4.crate \
+          https://static.crates.io/crates/security-framework-sys/security-framework-sys-0.4.3.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/slab/slab-0.4.6.crate \
+          https://static.crates.io/crates/smawk/smawk-0.3.1.crate \
+          https://static.crates.io/crates/syn/syn-1.0.94.crate \
+          https://static.crates.io/crates/tempfile/tempfile-3.0.8.crate \
+          https://static.crates.io/crates/textwrap/textwrap-0.14.2.crate \
+          https://static.crates.io/crates/thiserror/thiserror-1.0.31.crate \
+          https://static.crates.io/crates/thiserror-impl/thiserror-impl-1.0.31.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/toml/toml-0.5.9.crate \
+          https://static.crates.io/crates/unicode-bidi/unicode-bidi-0.3.8.crate \
+          https://static.crates.io/crates/unicode-linebreak/unicode-linebreak-0.1.2.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/url/url-2.2.2.crate \
+          https://static.crates.io/crates/vcpkg/vcpkg-0.2.15.crate \
+          https://static.crates.io/crates/version_check/version_check-0.1.5.crate \
+          https://static.crates.io/crates/wasi/wasi-0.10.2+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"
+MD5SUM="296a3a901fea3d632661878a395758fa \
+        425b8fdf70df59998d9b7c89083e48d1 \
+        cbd60ca8e9c691e1d230c34b439aaf21 \
+        c37404d7263430048672b0965d92ca78 \
+        2cbf2ad274fffd9aa12091af85224804 \
+        9563ddbf0d01fb162d94707f57ad9f40 \
+        05d77ef52e90ad161fdd41b252420467 \
+        a295edb6953237ebbdfa8e731229f9a3 \
+        2ddf45ac1a99520e32146df4429b1cdc \
+        b0060b4604f0eb3fb647ccd26a42af19 \
+        8e3a4d0980acef2c4e74485a45de29a9 \
+        882dbbc613a93f64c3709b0a2bd0d6dc \
+        74634128440dbc3766bda76fdf0aaa05 \
+        1c8b50f8528dd37df7d984e0e4b61bd5 \
+        f0682cfdc40af509c98f46f6350c1ba5 \
+        9754db1eb3e8b15807f05a3540d2ab39 \
+        92499f5db37eadb0efa33bcc91248577 \
+        4c21da37e71a52f26c8c5490f3ec4837 \
+        78c898fdaa3968e23904bf8538c4a271 \
+        667e86b8b8d96ab4e9605627ce7dcc9a \
+        7ee8703970c3fa6a2e37893de742824b \
+        27260b46db6b9ac40318143d70a80ba3 \
+        5d404b52af03b999e7fb74fbe16d3bd0 \
+        8aa040d9c661f68ebb67d5b71813473b \
+        1e0ad6e5cdab371cabd218748fee9b6d \
+        74d9ab54981e8f02e7eb683ac0a8a6b9 \
+        750ca4b374c5cd501a612a841f7362a9 \
+        1ab2952ce15d2f9cfe279821274133eb \
+        8071e8e030bee77619611dbb4e508864 \
+        13e7b2af8086b80fec3451946b05fa97 \
+        72de423e49713bb29beb1b3831373306 \
+        a5e79b9e58c9fe5894602d4b05a0190e \
+        27c1c7c71baf887421265d5ece46e667 \
+        8a9e0a43625da8d29c57e742c4d3d385 \
+        ac87fc897aa5f2607b286424545b7f9f \
+        e27ee7d8c7fb289e4924ef6baf448e15 \
+        577e4187cd09eb6103661795d25457b7 \
+        1a5b772bdd792720d2fb65e87b3642f8 \
+        c4a9aaa7d6a67626abd95325076d77fe \
+        793dbb9602541b1054a2dede3025721c \
+        f06b6f8ad76d8b1c08c5ec9017c1dcb9 \
+        f50aaf5171cbc0327f8d18a4ec7405fb \
+        fba3b040a55c01be7376d3dd5c4d4920 \
+        e83dc3dbd3de1f5f2b4b248c521eeaec \
+        0b69b5f7fcd75744a27cd75847331621 \
+        b31bf94ffe7e0f2ada93afae1076eaeb \
+        5ac809692422b722eaded90be3c4d9c2 \
+        94b8bf179385ff071bdc33b58bf047c0 \
+        98731fbefe42841dce239a8e8064431d \
+        92bcd45a654d9e24c86f3465c6387c47 \
+        0a56079b59a262a80e33d13e6604cc4e \
+        c85df6858289ab6e5ea97228856e5ef6 \
+        1babe6b3077bea6540b8fb5ecaadc255 \
+        73212ff5e0f8cd8844081a2461393707 \
+        907244c0d3791f3f981c7cc8e4cad0a3 \
+        e6562b473a131e7df2e99252a63124f8 \
+        0f5be361f707ebc33bade847d62747c1 \
+        38bbbe08dc002d60fe11a5751b44c5ae \
+        c40bb551772810d818857841ea389f1e \
+        f490982aceabdbd515348f63e638a782 \
+        ce6dde2ea2691fdd97632fb8c9b3e042 \
+        07c75fec267864bcbb800ca7709ceae2 \
+        b478ee84018082806ea8da763f0b3f1f \
+        7a14e0068ec85774790aa54f05d2d198 \
+        0fa01f3988219987a04c09dae3933d94 \
+        793627c8c18012ad77cb3e81fa4c2195 \
+        3ab5a79607a4d260bf61cd99dc82ab05 \
+        8cab41822d03dfa674870315308fa392 \
+        35ddcd36701a1a6711cc3aec85909f41 \
+        28b1e6d15e1ba8cf3a2e953ce7fcd3de \
+        74b15f1928431937f14ed91fdc12b542 \
+        2255d3d9a603e177985602a7df1c5bbc \
+        5acfdc8656212bce8df1bcc43db34c3d \
+        f9e08a49715c401602243230b28d86f0 \
+        7826deb76941fc36c2391951bd65ba47 \
+        c8d655d206cbe48b84a22544d6fc6d15 \
+        3cc3a4bd5861ca93d7c0d19129334703 \
+        2e69b77050ab91b1d0bb941e843a05cb \
+        2793ed3e6807d79ff72271baec586531 \
+        6b5c7401117316735435311bf551515b \
+        82401c70623ccc1bfc0bcb5c3b0ac8b7 \
+        0538d1da369f3e3f0412aa4d735c1b61 \
+        f505a218806e44b2369671089d65e839 \
+        9e0c7fedb6287e5090bab920da5c1d09 \
+        1024ac462fe90a1d7882a6911bd70604 \
+        31553e8c2d0d2f2e7474cc48a03337d8 \
+        3d3fef13feb53a62c0f434a092f526bf \
+        be6b7845e52831416901caba0b97a360 \
+        5d5cf081e3f2aad8d9e52deef9e92c18 \
+        404d707155e84dbffd2bcb02875ebf68 \
+        85703ae5de861e4eb47f74fafca6a7be \
+        0b8a5d001f8f677ca2cdab6f63be391d \
+        a8ae09f39c6e68744ca70bf8db61df71 \
+        ac76b35d8c76c7fa25c73b8863d5d055 \
+        5f0470696baaa4e5953bddbf196998f9 \
+        7bfcad253aff26bc26c5e3521f3ba891 \
+        b02f8aae39609bfe759838fbe0616c1a \
+        bd0cd532c61dac2087ecd7e0fef0d011 \
+        e6c3402a883b9a35135ca6af2cc46922 \
+        10291d9a0022076bc0827250816d3476 \
+        a42cc2834b2150027d7b427558a87803 \
+        763a3a6901bbb11a6998d29867d39b3c \
+        eb721c4d9e5dba8f93e9de0a80036ec3 \
+        e900a384ac7dbb320fe6a7279fbfef89 \
+        f48add3d6234e8b9829fa5364509f425 \
+        a061ad1db3e0d839725b037ff8be84e7 \
+        0498c4a11448bfc35dc7bb2caa64c753 \
+        db96b50050277bf05a3c68534bbb9586 \
+        09de9d01e7331ff3da11f58be8bef0df"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Julien Blanchard"
+EMAIL="julien@typed-hole.org"
diff --git a/network/falkon/doinst.sh b/network/castor/doinst.sh
index 65c7e2eeb9..65c7e2eeb9 100644
--- a/network/falkon/doinst.sh
+++ b/network/castor/doinst.sh
diff --git a/network/castor/slack-desc b/network/castor/slack-desc
new file mode 100644
index 0000000000..660ec98b6b
--- /dev/null
+++ b/network/castor/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+      |-----handy-ruler------------------------------------------------------|
+castor: castor (gemini client)
+castor:
+castor: Castor is a graphical client for the Gemini, Gopher
+castor: and Finger protocols.
+castor: It's written in Rust and uses GTK.
+castor:
+castor: Home page: https://git.sr.ht/~julienxx/castor
+castor:
+castor:
+castor:
+castor:
diff --git a/network/catgirl/README b/network/catgirl/README
new file mode 100644
index 0000000000..995db51086
--- /dev/null
+++ b/network/catgirl/README
@@ -0,0 +1,4 @@
+This is an super-light client for TLS-only Internet Relay Chat,
+that provides an curses based interface.
+
+It centred on the use of standard features.
diff --git a/network/catgirl/catgirl.SlackBuild b/network/catgirl/catgirl.SlackBuild
new file mode 100644
index 0000000000..4fe30ec145
--- /dev/null
+++ b/network/catgirl/catgirl.SlackBuild
@@ -0,0 +1,106 @@
+#!/bin/bash
+
+# Slackware build script for catgirl
+
+# Copyright 2023 SlackBuilds.org Project. All rights reserved.
+# Written and currently maintained by naglfar[AT]rpblc.net
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (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-10 11:48:54 +0100 Add -rpath, simplify strip/man. DW.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=catgirl
+VERSION=${VERSION:-2.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 {} \+
+
+# NOTE in case libressl is installed instead of libtls
+export PKG_CONFIG_PATH=/usr/lib${LIBDIRSUFFIX}/libressl/pkgconfig:$PKG_CONFIG_PATH
+export CFLAGS="$SLKCFLAGS -L/usr/lib${LIBDIRSUFFIX}/libressl"
+export LDFLAGS="-Wl,-rpath=/usr/lib${LIBDIRSUFFIX}/libressl"
+
+./configure \
+  --prefix=/usr \
+  --mandir=/usr/man
+
+make
+make install DESTDIR=$PKG
+
+strip --strip-unneeded $PKG/usr/bin/$PRGNAM
+gzip -9 $PKG/usr/man/man1/catgirl.1
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+  LICENSE README.7 \
+  $PKG/usr/doc/$PRGNAM-$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/network/catgirl/catgirl.info b/network/catgirl/catgirl.info
new file mode 100644
index 0000000000..fc86eb7694
--- /dev/null
+++ b/network/catgirl/catgirl.info
@@ -0,0 +1,10 @@
+PRGNAM="catgirl"
+VERSION="2.1"
+HOMEPAGE="https://git.causal.agency/catgirl/"
+DOWNLOAD="https://git.causal.agency/catgirl/snapshot/catgirl-2.1.tar.gz"
+MD5SUM="75b381022a7ae9ac1e2fc19329ffcbe7"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="libtls"
+MAINTAINER="Naglfar"
+EMAIL="naglfar[AT]rpblc.net"
diff --git a/network/catgirl/slack-desc b/network/catgirl/slack-desc
new file mode 100644
index 0000000000..08878931ca
--- /dev/null
+++ b/network/catgirl/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+       |-----handy-ruler------------------------------------------------------|
+catgirl: catgirl (terminal IRC client)
+catgirl:
+catgirl: This is an super-light client for TLS-only Internet Relay Chat,
+catgirl: that provides an curses based interface.
+catgirl:
+catgirl: It centred on the use of standard features.
+catgirl:
+catgirl:
+catgirl:
+catgirl: https://git.causal.agency/catgirl/about/
+catgirl:
diff --git a/network/cclive/README b/network/cclive/README
deleted file mode 100644
index aac7ab605c..0000000000
--- a/network/cclive/README
+++ /dev/null
@@ -1,8 +0,0 @@
-cclive is a command line tool for downloading videos from Youtube and
-other similar video websites that require Adobe Flash to view the
-video content. It has low memory footprint compared to other similar
-tools. It is a rewrite ot the clive software in C++, and it is free
-software, licensed under the GPLv3.
-
-If you wish custom settings, e.g. for the output filename, create
-$HOME/.ccliverc (see manpage).
diff --git a/network/cclive/cclive.SlackBuild b/network/cclive/cclive.SlackBuild
deleted file mode 100644
index 393a6d7868..0000000000
--- a/network/cclive/cclive.SlackBuild
+++ /dev/null
@@ -1,83 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for cclive
-
-# Written by crocket <crockabiscuit@gmail.com>
-# Modified by Marek Srejma <sam_web@yahoo.de> 2017/05/03
-
-PRGNAM=cclive
-VERSION=${VERSION:-0.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"
-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.?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 missing library
-sed -i '25,1i#include <iostream>' src/cc/error.h src/cc/options.h
-# Eliminate some warnings
-sed -i '/with.*CXX/ s/", "/ ", " /' src/cc/options.h
-
-CPPFLAGS="-P -std=gnu++11" \
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
-  --prefix=/usr \
-  --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 -a AUTHORS COPYING ChangeLog INSTALL NEWS 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/network/cclive/cclive.info b/network/cclive/cclive.info
deleted file mode 100644
index c0179ebe65..0000000000
--- a/network/cclive/cclive.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="cclive"
-VERSION="0.9.3"
-HOMEPAGE="http://cclive.sourceforge.net/"
-DOWNLOAD="https://downloads.sourceforge.net/cclive/cclive-0.9.3.tar.xz"
-MD5SUM="c336f97e29327d92ead62765a0ef0b65"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="quvi"
-MAINTAINER="Marek Srejma"
-EMAIL="sam_web@yahoo.de"
diff --git a/network/cclive/slack-desc b/network/cclive/slack-desc
deleted file mode 100644
index 95d7dde09b..0000000000
--- a/network/cclive/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------------------------------------------------------|
-cclive: cclive (flash video downloader)
-cclive:
-cclive: cclive is a command line tool for downloading videos from Youtube and
-cclive: other similar video websites that require Adobe Flash to view the
-cclive: video content. It has low memory footprint compared to other similar
-cclive: tools. It is a rewrite ot the clive software in C++, and it is free
-cclive: software, licensed under the GPLv3.
-cclive:
-cclive: Website : http://cclive.sourceforge.net/
-cclive:
-cclive:
diff --git a/network/ccnet/ccnet.SlackBuild b/network/ccnet/ccnet.SlackBuild
index a357b3a0f4..2c27c4d222 100644
--- a/network/ccnet/ccnet.SlackBuild
+++ b/network/ccnet/ccnet.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for "ccnet".
 
@@ -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=ccnet
-VERSION=${VERSION:-4.4.6}
-BUILD=${BUILD:-1}
+VERSION=${VERSION:-6.1.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}
@@ -61,9 +71,9 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$VERSION-server
-tar xvf $CWD/$PRGNAM-$VERSION-server.tar.gz
-cd $PRGNAM-$VERSION-server
+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 \
@@ -93,12 +103,14 @@ make
 make install-strip DESTDIR=$PKG
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a COPYRIGHT HACKING LICENCE.txt README.markdown \
+cp -a HACKING LICENSE.txt README.markdown \
   $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/network/ccnet/ccnet.info b/network/ccnet/ccnet.info
index a796b40262..d4d7bce68b 100644
--- a/network/ccnet/ccnet.info
+++ b/network/ccnet/ccnet.info
@@ -1,10 +1,10 @@
 PRGNAM="ccnet"
-VERSION="4.4.6"
+VERSION="6.1.8"
 HOMEPAGE="http://seafile.com/"
-DOWNLOAD="https://github.com/haiwen/ccnet/archive/v4.4.6-server/ccnet-4.4.6-server.tar.gz"
-MD5SUM="bff067e61d0af043b761027fdd840314"
+DOWNLOAD="http://attic-distfiles.pld-linux.org/distfiles/by-md5/4/b/4bab2537f68070d5af226fc80b79c859/ccnet-6.1.8.tar.gz"
+MD5SUM="4bab2537f68070d5af226fc80b79c859"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="libsearpc vala libzdb"
+REQUIRES="libsearpc libzdb"
 MAINTAINER="Marcel Saegebarth"
 EMAIL="marc@mos6581.de"
diff --git a/network/cgterm/cgterm.SlackBuild b/network/cgterm/cgterm.SlackBuild
index e21ffc22b1..9d1a90f950 100644
--- a/network/cgterm/cgterm.SlackBuild
+++ b/network/cgterm/cgterm.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for "cgterm".
 
@@ -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=cgterm
 VERSION=${VERSION:-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"
@@ -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/network/cherokee/README b/network/cherokee/README
index 7214e5a3d4..c2428de130 100644
--- a/network/cherokee/README
+++ b/network/cherokee/README
@@ -37,7 +37,7 @@ Notes about using this SlackBuild
    to the script.
 5) If you want to build Cherokee with debugging options, enable trace
    facility by passing TRACE=yes to the script.
-6) The $WWWGROUP group and the $WWWUSER user account are set to cherokee.
+6) The $WWWGROUP group and $WWWUSER user account are set to cherokee.
    To run cherokee as a different user/group specify them passing the
    options WWWUSER/WWWGROUP to the slackbuild, like
 
@@ -48,7 +48,7 @@ Notes about using this SlackBuild
      groupadd -g 306 cherokee
      useradd -u 306 -g cherokee -d /var/www/htdocs-cherokee cherokee
 
-   See http://slackbuilds.org/uid_gid.txt for current reccomendations (if any)
+   See http://slackbuilds.org/uid_gid.txt for current reccomendations.
 7) If you want to use it with php, remember to add your user to the
    apache group, so that it can use /var/lib/php, like
 
diff --git a/network/cherokee/cherokee.SlackBuild b/network/cherokee/cherokee.SlackBuild
index ee57d2b98a..207850d16f 100644
--- a/network/cherokee/cherokee.SlackBuild
+++ b/network/cherokee/cherokee.SlackBuild
@@ -1,29 +1,39 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for cherokee
 
 # Written by Pablo Hernan Saro (pablosaro@gmail.com)
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=cherokee
-VERSION=${VERSION:-20131105_d91c9c1}
+VERSION=${VERSION:-20230111_ce1ca8a}
 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,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|\[2\.71|[2.69|" configure.ac m4/{nls,po,progtest}.m4
+
 # Apply all the patches in $CWD/patches (thanks Gentoo)
 for patch in $CWD/patches/* ; do
   patch -p1 < $patch
@@ -107,7 +119,7 @@ CXXFLAGS="$SLKCFLAGS" \
   --with-mysql=$MYSQL \
   --enable-ipv6=$IPV6 \
   --enable-admin=$ADMIN \
-  --disable-pam \
+  --enable-pam \
   --disable-static \
   --enable-trace=$TRACE
 
@@ -130,9 +142,11 @@ cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 install -D -m 0755 $CWD/rc.$PRGNAM $PKG/etc/rc.d/rc.$PRGNAM.new
 mv $PKG/etc/cherokee/cherokee.conf $PKG/etc/cherokee/cherokee.conf.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/network/cherokee/cherokee.info b/network/cherokee/cherokee.info
index ea23a977c6..83b3c5d9bd 100644
--- a/network/cherokee/cherokee.info
+++ b/network/cherokee/cherokee.info
@@ -1,10 +1,10 @@
 PRGNAM="cherokee"
-VERSION="20131105_d91c9c1"
+VERSION="20230111_ce1ca8a"
 HOMEPAGE="http://www.cherokee-project.com"
-DOWNLOAD="http://ponce.cc/slackware/sources/repo/cherokee-20131105_d91c9c1.tar.xz"
-MD5SUM="845ed7bdb3b038d277607a47288aaec1"
+DOWNLOAD="http://ponce.cc/slackware/sources/repo/cherokee-20230111_ce1ca8a.tar.xz"
+MD5SUM="f78e7cf58fd398a7207e537b98e6d14d"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Pablo Hernan Saro"
-EMAIL="pablosaro@gmail.com"
+MAINTAINER="Matteo Bernardini"
+EMAIL="ponce@slackbuilds.org"
diff --git a/network/choqok/README b/network/choqok/README
new file mode 100644
index 0000000000..152e77609f
--- /dev/null
+++ b/network/choqok/README
@@ -0,0 +1,12 @@
+
+ choqok (KDE Micro-Blogging client)
+
+ Choqok is a Free/Open Source micro-blogging client by the KDE
+ community. The name comes from an ancient Persian word, means
+ Sparrow!
+ 
+ Currently supports Twitter.com, GNU Social (formerly known as
+ StatusNet), Pump.io (formerly known as Identi.ca), Friendica and
+ Open Collaboration Services (used by OpenDesktop.org).
+ 
+ Homepage: https://github.com/KDE/choqok
diff --git a/network/choqok/choqok.SlackBuild b/network/choqok/choqok.SlackBuild
new file mode 100644
index 0000000000..73f5e8d49a
--- /dev/null
+++ b/network/choqok/choqok.SlackBuild
@@ -0,0 +1,103 @@
+#!/bin/bash
+
+# Slackware build script for choqok
+
+# Copyright 2022 Matthew 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=choqok
+VERSION=${VERSION:-1.7.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
+
+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
+
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+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 \
+    cmake -DKDE_INSTALL_USE_QT_SYS_PATHS=ON ..
+  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
+mkdir -p $PKG/usr/share/applications
+
+chmod 0644 $PKG/usr/share/applications/org.kde.choqok.desktop
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+rm -Rv $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/network/choqok/choqok.info b/network/choqok/choqok.info
new file mode 100644
index 0000000000..7a01041889
--- /dev/null
+++ b/network/choqok/choqok.info
@@ -0,0 +1,10 @@
+PRGNAM="choqok"
+VERSION="1.7.0"
+HOMEPAGE="https://github.com/KDE/choqok"
+DOWNLOAD="https://github.com/KDE/choqok/archive/refs/tags/v1.7.0/choqok-1.7.0.tar.gz"
+MD5SUM="429ff1f3f8c53ffae78ef82889ff21f5"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Matthew Miller"
+EMAIL="mattallmill@gmail.com"
diff --git a/network/hipchat/doinst.sh b/network/choqok/doinst.sh
index 65c7e2eeb9..65c7e2eeb9 100644
--- a/network/hipchat/doinst.sh
+++ b/network/choqok/doinst.sh
diff --git a/network/choqok/slack-desc b/network/choqok/slack-desc
new file mode 100644
index 0000000000..1bc990a324
--- /dev/null
+++ b/network/choqok/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+      |-----handy-ruler------------------------------------------------------|
+choqok: choqok (KDE Micro-Blogging client)
+choqok:
+choqok: Choqok is a Free/Open Source micro-blogging client by the KDE
+choqok: community. The name comes from an ancient Persian word, means
+choqok: Sparrow!
+choqok:
+choqok: Currently supports Twitter.com, GNU Social (formerly known as
+choqok: StatusNet), Pump.io (formerly known as Identi.ca), Friendica and
+choqok: Open Collaboration Services (used by OpenDesktop.org).
+choqok:
+choqok: Homepage: https://github.com/KDE/choqok
diff --git a/network/chrony/chrony.SlackBuild b/network/chrony/chrony.SlackBuild
index 92e3c05de3..ca8d8a96c3 100644
--- a/network/chrony/chrony.SlackBuild
+++ b/network/chrony/chrony.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for chrony
 
@@ -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=chrony
-VERSION=${VERSION:-3.4}
+VERSION=${VERSION:-4.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 NTP_USER=${NTP_USER:-chrony}
 NTP_GROUP=${NTP_GROUP:-chrony}
@@ -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}
@@ -96,7 +106,7 @@ make install DESTDIR=$PKG
 chown ${NTP_USER}:${NTP_GROUP} $PKG/var/lib/chrony
 install -D -m 0644 $CWD/chrony.conf $PKG/etc/chrony.conf.new
 install -D -m 0644 $CWD/rc.chrony $PKG/etc/rc.d/rc.chrony.new
-sed -i "s%@NTP_USER@%${NTP_USER}%g" $PKG/etc/rc.d/rc.chrony.new
+sed -i "s%^NTP_USER=@NTP_USER@%NTP_USER=${NTP_USER}%g" $PKG/etc/rc.d/rc.chrony.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
@@ -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/network/chrony/chrony.info b/network/chrony/chrony.info
index 19b3264d15..ad24728d56 100644
--- a/network/chrony/chrony.info
+++ b/network/chrony/chrony.info
@@ -1,8 +1,8 @@
 PRGNAM="chrony"
-VERSION="3.4"
+VERSION="4.2"
 HOMEPAGE="https://chrony.tuxfamily.org/"
-DOWNLOAD="https://download.tuxfamily.org/chrony/chrony-3.4.tar.gz"
-MD5SUM="7170e750469c198fc6784047d6f71144"
+DOWNLOAD="https://download.tuxfamily.org/chrony/chrony-4.2.tar.gz"
+MD5SUM="07282f8e76a4399d6c17009bb6345614"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/network/chrony/rc.chrony b/network/chrony/rc.chrony
index fc74d34ae2..fdff2facbd 100644
--- a/network/chrony/rc.chrony
+++ b/network/chrony/rc.chrony
@@ -1,13 +1,18 @@
 #!/bin/sh
 
+NTP_USER=@NTP_USER@
+
+# place local customizations in /etc/default/chrony
+[ -r /etc/default/chrony ] && . /etc/default/chrony
+
 ################################################################################
 chronyd_start() {
 ################################################################################
   if [ -n "$(pidof chronyd)" ]; then
     echo "chronyd seems to be already running."
   else
-    echo "Starting chronyd:  /usr/sbin/chronyd -u @NTP_USER@"
-    /usr/sbin/chronyd -u @NTP_USER@
+    echo "Starting chronyd: /usr/sbin/chronyd -u $NTP_USER $CHRONYD_ARGS"
+    /usr/sbin/chronyd -u $NTP_USER $CHRONYD_ARGS
   fi
 }
 
diff --git a/network/cicb/README b/network/cicb/README
index 26ba466cfe..92ce0a1155 100644
--- a/network/cicb/README
+++ b/network/cicb/README
@@ -1,8 +1,8 @@
 cicb (ICB client)
 
-ICB (International CB) is a teleconferencing system that allows Internet
-users to participate in realtime online discussions (similar to IRC). This
-package builds a client program (called, strangely enough, "icb") that
-is used to access ICB.
+ICB (International CB) is a teleconferencing system that allows
+Internet users to participate in realtime online discussions (similar
+to IRC). This package builds a client program (called, strangely
+enough, "icb") that is used to access ICB.
 
 icb has extensive built-in help, accessed by the /help command.
diff --git a/network/cicb/cicb.SlackBuild b/network/cicb/cicb.SlackBuild
index 30349a9a5f..92247a89ab 100644
--- a/network/cicb/cicb.SlackBuild
+++ b/network/cicb/cicb.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for cicb
 
-# 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.
 
@@ -22,10 +22,13 @@
 # git2targz.sh script, it should be smart enough to pull the latest
 # code and create a tarball with the correct VERSION.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=cicb
-VERSION=${VERSION:-5.2.0b1+git20170501}
+VERSION=${VERSION:-5.1.2b1+git20191209}
 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}
@@ -63,11 +70,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 {} \+
 
 # Need this for recent tcl, to allow deprecated features. Someday this will
 # probably stop working and upstream will have to fix it.
@@ -81,8 +85,7 @@ SLKCFLAGS="$SLKCFLAGS -DUSE_INTERP_ERRORLINE -DUSE_INTERP_RESULT"
 
 CPPFLAGS="-P" \
 LDFLAGS="-L/usr/lib$LIBDIRSUFFIX" \
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
+CFLAGS="$SLKCFLAGS -fcommon" \
 ./configure \
   --with-ssl \
   --with-ssl-lib=/usr/lib$LIBDIRSUFFIX \
@@ -122,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/network/cicb/cicb.info b/network/cicb/cicb.info
index cfcb0af283..0dee4331b0 100644
--- a/network/cicb/cicb.info
+++ b/network/cicb/cicb.info
@@ -1,10 +1,10 @@
 PRGNAM="cicb"
-VERSION="5.2.0b1+git20170501"
+VERSION="5.1.2b1+git20191209"
 HOMEPAGE="https://github.com/hoche/cicb/"
-DOWNLOAD="http://urchlay.naptime.net/~urchlay/src/cicb-5.2.0b1+git20170501.tar.xz"
-MD5SUM="ff3afbdad3f6744a154965b26c75db2e"
+DOWNLOAD="https://slackware.uk/~urchlay/src/cicb-5.1.2b1+git20191209.tar.xz"
+MD5SUM="2c3f5b6da0583f0dc2e6b9e5b9c48495"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
 MAINTAINER="B. Watson"
-EMAIL="yalhcru@gmail.com"
+EMAIL="urchlay@slackware.uk"
diff --git a/network/cicb/git2targz.sh b/network/cicb/git2targz.sh
index c8cd99f76b..de4eaab723 100644
--- a/network/cicb/git2targz.sh
+++ b/network/cicb/git2targz.sh
@@ -46,7 +46,7 @@ Archive created: $PRGNAM-$VERSION.tar.xz
 Update $PRGNAM.info with:
 
 VERSION="$VERSION"
-DOWNLOAD="http://urchlay.naptime.net/~urchlay/src/$PRGNAM-$VERSION.tar.xz"
+DOWNLOAD="https://slackware.uk/~urchlay/src/$PRGNAM-$VERSION.tar.xz"
 MD5SUM="$( md5sum $PRGNAM-$VERSION.tar.xz | cut -d' ' -f1 )"
 
 Don't forget to upload the new source!
diff --git a/network/cinny-desktop/README b/network/cinny-desktop/README
new file mode 100644
index 0000000000..6ee8d15e18
--- /dev/null
+++ b/network/cinny-desktop/README
@@ -0,0 +1,11 @@
+Cinny Desktop - yet another Matrix client.
+
+Cinny is a matrix client focusing primarily on simple, elegant and
+secure interface. The desktop app is made with Tauri.
+
+This SlackBuild is a re-packaged official deb archive.
+
+Cinny is also able to be used directly from the web with your
+electron supporting browser of choice.
+
+There is no 32bit application available.
diff --git a/network/cinny-desktop/cinny-desktop.SlackBuild b/network/cinny-desktop/cinny-desktop.SlackBuild
new file mode 100644
index 0000000000..10e830f7a0
--- /dev/null
+++ b/network/cinny-desktop/cinny-desktop.SlackBuild
@@ -0,0 +1,96 @@
+#!/bin/bash
+
+# Slackware build script for cinny-desktop
+#
+# This is a slightly gimped script for 15.0 based upon my script for -current
+# which takes native Slackware-built deb packages and converts them for
+# x86_64 and aarch64 available here:
+# https://github.com/mac-a-r0ni/lngnbuilds/tree/main/network/cinny-desktop
+#
+# Copyright 2023 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=cinny-desktop
+SRCNAM=Cinny_desktop
+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=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
+  LIBDIRSUFFIX=""
+  echo "This package is currently only available for 64bit."
+  exit 1
+elif [ "$ARCH" = "x86_64" ]; then
+  LIBDIRSUFFIX="64"
+else
+  echo "Package for $(uname -m) architecture is not available."
+  exit 1
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $PKG
+
+ar p $CWD/$SRCNAM-$ARCH.deb data.tar.gz | tar xzv
+
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -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
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/network/cinny-desktop/cinny-desktop.info b/network/cinny-desktop/cinny-desktop.info
new file mode 100644
index 0000000000..77f20374d6
--- /dev/null
+++ b/network/cinny-desktop/cinny-desktop.info
@@ -0,0 +1,10 @@
+PRGNAM="cinny-desktop"
+VERSION="3.2.1"
+HOMEPAGE="https://cinny.in/"
+DOWNLOAD="UNSUPPORTED"
+MD5SUM=""
+DOWNLOAD_x86_64="https://github.com/cinnyapp/cinny-desktop/releases/download/v3.2.1/Cinny_desktop-x86_64.deb"
+MD5SUM_x86_64="f62b34fdca91f2ea6a66395aa13e780b"
+REQUIRES="libayatana-appindicator webkit2gtk"
+MAINTAINER="Jay Lanagan"
+EMAIL="j@lngn.net"
diff --git a/network/cinny-desktop/doinst.sh b/network/cinny-desktop/doinst.sh
new file mode 100644
index 0000000000..fd1bca3b49
--- /dev/null
+++ b/network/cinny-desktop/doinst.sh
@@ -0,0 +1,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 -f usr/share/icons/hicolor >/dev/null 2>&1
+  fi
+fi
diff --git a/network/cinny-desktop/slack-desc b/network/cinny-desktop/slack-desc
new file mode 100644
index 0000000000..70f8319b4d
--- /dev/null
+++ b/network/cinny-desktop/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+             |-----handy-ruler------------------------------------------------------|
+cinny-desktop: cinny-desktop (yet another matrix client for desktop)
+cinny-desktop:
+cinny-desktop: A matrix client with simple, elegant and secure interface.
+cinny-desktop:
+cinny-desktop: Homepage: https://github.com/cinnyapp/cinny-desktop
+cinny-desktop:
+cinny-desktop:
+cinny-desktop:
+cinny-desktop:
+cinny-desktop:
+cinny-desktop:
diff --git a/network/ckermit/README b/network/ckermit/README
index 67eadee43e..ceca6cc69a 100644
--- a/network/ckermit/README
+++ b/network/ckermit/README
@@ -19,9 +19,10 @@ C-Kermit includes:
   * Built-in scriptable FTP and HTTP clients plus an SSH interface
   * Configurability as an SSH Subsystem
   * Character-set translation in both file transfer and online sessions,
-    for Western- and Eastern-European languages, Cyrillic, Greek, Hebrew,
-    and Japanese, now including Unicode.
+    for Western- and Eastern-European languages, Cyrillic, Greek,
+    Hebrew, and Japanese, now including Unicode.
   * Ability to send numeric and alphanumeric pages.
 
-This SlackBuild installs a default initialization file in the documentation
-directory.  However, an initialization file is rarely required with ckermit.
+This SlackBuild installs a default initialization file in the
+documentation directory.  However, an initialization file is rarely
+required with ckermit.
diff --git a/network/ckermit/ckermit.SlackBuild b/network/ckermit/ckermit.SlackBuild
index 8916e7d3fc..af5fa2f661 100644
--- a/network/ckermit/ckermit.SlackBuild
+++ b/network/ckermit/ckermit.SlackBuild
@@ -1,29 +1,40 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for ckermit
 
 # Written by Andrew Rowland (darowland@ieee.org)
 
+# 20220405 bkw: Modified by SlackBuilds.org, BUILD=2:
+# - fix permissions on man page and documentation (so they're not
+#   only readable by root!)
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=ckermit
-VERSION=${VERSION:-9.0.302}
+VERSION=${VERSION:-9.0.304.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"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -43,19 +54,26 @@ mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
 mkdir $PRGNAM-$VERSION
-tar xvf $CWD/cku302.tar.gz -C $PRGNAM-$VERSION
+FILE=$(sed -En '/^9\.0\.([0-9]+)\.([0-9]+)$/s//cku\1-dev\2.tar.gz/p'<<<$VERSION)
+if [ -z "$FILE" ]; then
+  FILE=$(sed -En '/^9\.0\.([0-9]+)$/s//cku\1.tar.gz/p'<<<$VERSION)
+  if [ -z "$FILE" ]; then
+    FILE=x.tar.gz
+  fi
+fi
+tar xvf $CWD/$FILE -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 \
+ -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 {} \+
 
 # Force the makefile to accept our custom cflags
 patch -p1 < $CWD/makefile-use-custom-cflags.diff
 
-make linux OPT="$SLKCFLAGS"
+make linux OPT="$SLKCFLAGS -D_IO_file_flags"
 
 mkdir -p $PKG/usr/bin
 cp -a wermit $PKG/usr/bin/kermit
@@ -63,15 +81,15 @@ strip --strip-unneeded $PKG/usr/bin/kermit
 ln -sf kermit $PKG/usr/bin/kermit-sshsub
 
 mkdir -p $PKG/usr/man/man1
-cp ckuker.nr $PKG/usr/man/man1/kermit.1
-gzip -9 $PKG/usr/man/man1/kermit.1
+gzip -9c < ckuker.nr > $PKG/usr/man/man1/kermit.1.gz
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a COPYING.TXT ockermit.ini *.txt $PKG/usr/doc/$PRGNAM-$VERSION
+shopt -s nullglob
+install -m0644 COPYING.TXT *.ini *.txt $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/ckermit.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/ckermit.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/network/ckermit/ckermit.info b/network/ckermit/ckermit.info
index b4d7fe1de2..da4529215d 100644
--- a/network/ckermit/ckermit.info
+++ b/network/ckermit/ckermit.info
@@ -1,8 +1,8 @@
 PRGNAM="ckermit"
-VERSION="9.0.302"
+VERSION="9.0.304.23"
 HOMEPAGE="http://www.kermitproject.org/ck90.html"
-DOWNLOAD="ftp://ftp.kermitproject.org/kermit/archives/cku302.tar.gz"
-MD5SUM="eac4dbf18b45775e4cdee5a7c74762b0"
+DOWNLOAD="ftp://ftp.kermitproject.org/kermit/test/tar/cku304-dev23.tar.gz"
+MD5SUM="fd42607a8875409141bce3318f16ca4e"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/network/clamav-unofficial-sigs/README b/network/clamav-unofficial-sigs/README
index 1d1c64fbc0..948510c4b9 100644
--- a/network/clamav-unofficial-sigs/README
+++ b/network/clamav-unofficial-sigs/README
@@ -1,20 +1,22 @@
-clamav-unofficial-sigs provides a shell script to download, verify (GPG) and
-integrate third-party clamav signatures into the clamav database.  These
-third-party signatures provide valuable spam and malware detection
-capabilities and make an excellent enhancement to native clamav signatures.
+clamav-unofficial-sigs provides a shell script to download, verify
+(GPG) and integrate third-party clamav signatures into the clamav
+database.  These third-party signatures provide valuable spam and
+malware detection capabilities and make an excellent enhancement to
+native clamav signatures.
 
-It is especially useful when running a mailserver with clamav.  The best way to
-update signatures is to set up a cron job.
+It is especially useful when running a mailserver with clamav.
+The best way to update signatures is to set up a cron job.
 
-These sources are fully tweakable via the config file.  Also refer to the
-documentation included with the package which provides configuration and
-setup infomation.
+These sources are fully tweakable via the config file.  Also refer
+to the documentation included with the package which provides
+configuration and setup infomation.
 
-The original script was from Bill Landry but it has not been updated for a
-while now and so this new script from ExtremeSHOK is now the recommended
-way to update third-party signature.  More information is here:
+The original script was from Bill Landry but it has not been updated
+for a while now and so this new script from ExtremeSHOK is now the
+recommended way to update third-party signature.  More information
+is here:
 
 http://sanesecurity.com/usage/linux-scripts/
 
-A sample cron job script is included in the package docs -- but it needs 
-modifying to work with Slackware.
+A sample cron job script is included in the package docs -- but it
+needs modifying to work with Slackware.
diff --git a/network/clamav-unofficial-sigs/clamav-unofficial-sigs.SlackBuild b/network/clamav-unofficial-sigs/clamav-unofficial-sigs.SlackBuild
index 560a5dcec6..9de7a6e4ac 100644
--- a/network/clamav-unofficial-sigs/clamav-unofficial-sigs.SlackBuild
+++ b/network/clamav-unofficial-sigs/clamav-unofficial-sigs.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware Package Build Script for clamav-unofficial-sigs
 # Home Page: https://github.com/extremeshok/clamav-unofficial-sigs
@@ -25,13 +25,23 @@
 # NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM="clamav-unofficial-sigs"
 VERSION=${VERSION:-5.6.2}
 ARCH="noarch"	# hardcode ARCH
 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}
@@ -80,4 +90,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/network/clamav-unofficial-sigs/clamav-unofficial-sigs.info b/network/clamav-unofficial-sigs/clamav-unofficial-sigs.info
index 8d51786e15..4b845c518b 100644
--- a/network/clamav-unofficial-sigs/clamav-unofficial-sigs.info
+++ b/network/clamav-unofficial-sigs/clamav-unofficial-sigs.info
@@ -1,7 +1,7 @@
 PRGNAM="clamav-unofficial-sigs"
 VERSION="5.6.2"
 HOMEPAGE="https://github.com/extremeshok/clamav-unofficial-sigs"
-DOWNLOAD="https://github.com/extremeshok/clamav-unofficial-sigs/archive/5.6.2.tar.gz"
+DOWNLOAD="https://github.com/extremeshok/clamav-unofficial-sigs/archive/5.6.2/clamav-unofficial-sigs-5.6.2.tar.gz"
 MD5SUM="f3226e88cc84de5803c84583cf72e622"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/network/claws-mail/README b/network/claws-mail/README
index da18943f39..3f7504d4b3 100644
--- a/network/claws-mail/README
+++ b/network/claws-mail/README
@@ -1,4 +1,5 @@
-Claws Mail is an email client (and news reader), based on GTK+ featuring:
+Claws Mail is an email client (and news reader), based on GTK+
+featuring:
 
  * Quick response
  * Graceful, and sophisticated interface
@@ -10,12 +11,13 @@ The appearance and interface are designed to be familiar to new users
 coming from other popular email clients, as well as experienced users.
 Almost all commands are accessible with the keyboard.
 
-The messages are managed in the standard MH format, which features fast
-access and data security. You'll be able to import your emails from almost
-any other email client, and export them just as easily.
+The messages are managed in the standard MH format, which features
+fast access and data security. You'll be able to import your emails
+from almost any other email client, and export them just as easily.
+
+The following plugins will not be built unless these optional
+dependencies are found:
 
-The following plugins will not be built unless these optional dependencies
-are found:
   The clamd plugin requires clamav.
   The fancy plugin requires webkitgtk.
   The gdata plugin requires gdata.
diff --git a/network/claws-mail/claws-mail.SlackBuild b/network/claws-mail/claws-mail.SlackBuild
index 9ecf035bd9..135dbb2a6f 100644
--- a/network/claws-mail/claws-mail.SlackBuild
+++ b/network/claws-mail/claws-mail.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 #
 # Slackware build script for claws-mail
 #
-# Copyright 2009-2019  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=claws-mail
-VERSION=${VERSION:-3.17.3}
+VERSION=${VERSION:-4.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}
@@ -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/network/claws-mail/claws-mail.info b/network/claws-mail/claws-mail.info
index 1439584ceb..5288da0251 100644
--- a/network/claws-mail/claws-mail.info
+++ b/network/claws-mail/claws-mail.info
@@ -1,8 +1,8 @@
 PRGNAM="claws-mail"
-VERSION="3.17.3"
+VERSION="4.1.1"
 HOMEPAGE="https://www.claws-mail.org/"
-DOWNLOAD="https://www.claws-mail.org/releases/claws-mail-3.17.3.tar.xz"
-MD5SUM="4dba4238f91bc2f4e146379842a17ad3"
+DOWNLOAD="https://www.claws-mail.org/releases/claws-mail-4.1.1.tar.xz"
+MD5SUM="bde1fdfcc082aa629d8704cba56a8cf6"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="libetpan"
diff --git a/network/claws-mail/slack-desc b/network/claws-mail/slack-desc
index 831e0ebed9..6836517d23 100644
--- a/network/claws-mail/slack-desc
+++ b/network/claws-mail/slack-desc
@@ -8,7 +8,7 @@
           |-----handy-ruler------------------------------------------------------|
 claws-mail: claws-mail (a user-friendly, lightweight, and fast email client)
 claws-mail:
-claws-mail: Claws Mail is an email client (and news reader) based on GTK+2
+claws-mail: Claws Mail is an email client (and news reader) based on GTK+3
 claws-mail: featuring quick response, graceful and sophisticated interface,
 claws-mail: easy configuration, intuitive operation, abundant features, and
 claws-mail: extensibility.
diff --git a/network/clipgrab/README b/network/clipgrab/README
index 1befa5f516..ba4271c070 100644
--- a/network/clipgrab/README
+++ b/network/clipgrab/README
@@ -10,8 +10,8 @@ more in: http://clipgrab.org/faqs/supported-sites
 It converts downloaded videos to  MPEG4, MP3  or  other formats
 in just one easy step.
 
-NOTE: This suggests FFMPEG with libmp3lame  support enabled for
-video conversion to MP3 format.
+Now, Clipgrab downloading youtube-dlp as additional component
+to downloading videos.
 
-* For  downloading 1080p videos from  Youtube  you need a newer
-version of ffmpeg than currently available on SBo.
+NOTE: for downloading 1080p videos from YouTube a most updated
+version of ffmpeg is required.
diff --git a/network/clipgrab/clipgrab.SlackBuild b/network/clipgrab/clipgrab.SlackBuild
index 9ced191ba9..1409e0a7cf 100644
--- a/network/clipgrab/clipgrab.SlackBuild
+++ b/network/clipgrab/clipgrab.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 #
 # Slackware build script for clipgrab.
 #
-# Copyright 2015-2019  Edinaldo P. Silva, Rio de Janeiro, Brazil.
+# Copyright 2015-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,17 @@
 #  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:
+# - install SlackBuild in doc dir correctly.
+# - do not install COPYING README docs executable.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=clipgrab
-VERSION=${VERSION:-3.8.3}
+VERSION=${VERSION:-3.9.10}
 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,27 +76,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 {} \+
 
 qmake-qt5 clipgrab.pro
 make DESTDIR=$PKG
 
 install -Dm644 $CWD/clipgrab.desktop $PKG/usr/share/applications/clipgrab.desktop
 install -Dm644 icon.png $PKG/usr/share/pixmaps/clipgrab.png
-install -Dm755 clipgrab $PKG/usr/bin/clipgrab
-
-find $PKG -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 -s -Dm755 clipgrab $PKG/usr/bin/clipgrab
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp COPYING license.odt README $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM-SlackBuild
+install -m0644 COPYING license.odt README $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 -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/network/clipgrab/clipgrab.info b/network/clipgrab/clipgrab.info
index fd8eb34eb5..e98728f76c 100644
--- a/network/clipgrab/clipgrab.info
+++ b/network/clipgrab/clipgrab.info
@@ -1,10 +1,10 @@
 PRGNAM="clipgrab"
-VERSION="3.8.3"
+VERSION="3.9.10"
 HOMEPAGE="http://clipgrab.org/"
-DOWNLOAD="https://download.clipgrab.org/clipgrab-3.8.3.tar.gz"
-MD5SUM="05e07c279cf1d81d9b316365293f0de7"
+DOWNLOAD="https://download.clipgrab.org/clipgrab-3.9.10.tar.gz"
+MD5SUM="d3653ecc3af9128bc631fe9ce794fa18"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="qt5 ffmpeg"
+REQUIRES="yt-dlp"
 MAINTAINER="Edinaldo P. Silva"
 EMAIL="edps.mundognu@gmail.com"
diff --git a/network/clive/clive.SlackBuild b/network/clive/clive.SlackBuild
index 2e2e786ee7..65f75559cd 100644
--- a/network/clive/clive.SlackBuild
+++ b/network/clive/clive.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for clive
 
@@ -23,10 +23,13 @@
 
 # modified by Javier Rojas <jerojasro@devnull.li> to fit clive
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=clive
 VERSION=${VERSION:-1.0.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}
@@ -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/network/clusterit/README b/network/clusterit/README
new file mode 100644
index 0000000000..1756996c34
--- /dev/null
+++ b/network/clusterit/README
@@ -0,0 +1,3 @@
+The most efficient and simple distributed shell around.
+
+ClusterIt provides the dsh and pcp command line tools.
diff --git a/network/clusterit/clusterit.SlackBuild b/network/clusterit/clusterit.SlackBuild
new file mode 100644
index 0000000000..a968345983
--- /dev/null
+++ b/network/clusterit/clusterit.SlackBuild
@@ -0,0 +1,91 @@
+#!/bin/bash
+
+# Slackware build script for ClusterIt
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=clusterit
+VERSION=${VERSION:-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 [ ! -z "${PRINT_PACKAGE_NAME}" ]; 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 \
+  --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 CHANGES README README-DVT 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/network/clusterit/clusterit.info b/network/clusterit/clusterit.info
new file mode 100644
index 0000000000..4e06c12768
--- /dev/null
+++ b/network/clusterit/clusterit.info
@@ -0,0 +1,10 @@
+PRGNAM="clusterit"
+VERSION="2.5"
+HOMEPAGE="https://www.garbled.net/clusterit.html"
+DOWNLOAD="https://downloads.sourceforge.net/project/clusterit/clusterit/clusterit-2.5/clusterit-2.5.tar.gz"
+MD5SUM="f0e772e07122e388de629fb57f7237ab"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Pierre-Philipp Braun"
+EMAIL="pbraun@nethence.com"
diff --git a/network/clusterit/slack-desc b/network/clusterit/slack-desc
new file mode 100644
index 0000000000..7e8ff443bb
--- /dev/null
+++ b/network/clusterit/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+         |-----handy-ruler------------------------------------------------------|
+clusterit: clusterit (distributed shell)
+clusterit:
+clusterit: The most efficient and simple distributed shell around.
+clusterit:
+clusterit: ClusterIt provides the dsh and pcp command line tools.
+clusterit:
+clusterit:
+clusterit:
+clusterit:
+clusterit:
+clusterit:
diff --git a/network/cmdiag/README b/network/cmdiag/README
index c195398c4c..eadeb898f7 100644
--- a/network/cmdiag/README
+++ b/network/cmdiag/README
@@ -1,4 +1,5 @@
-cmdiag is a Docsis cable modem diagnostic tool. It can get information from
-Docsis 1.0, 1.1 and maybe 2.0 cable modems. It gathers information from the
-cable modem via SNMP and displays various cable parameters in real time.
-This small tool is writen in C++, it runs on Linux and FreeBSD.
+cmdiag is a Docsis cable modem diagnostic tool. It can get information
+from Docsis 1.0, 1.1 and maybe 2.0 cable modems. It gathers
+information from the cable modem via SNMP and displays various cable
+parameters in real time. This small tool is writen in C++, it runs on
+Linux and FreeBSD.
diff --git a/network/cmdiag/cmdiag.SlackBuild b/network/cmdiag/cmdiag.SlackBuild
index 02b7da91f9..3bdb5eca92 100644
--- a/network/cmdiag/cmdiag.SlackBuild
+++ b/network/cmdiag/cmdiag.SlackBuild
@@ -1,12 +1,15 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for cmdiag
 # Written by Michal Bialozor <bialyy@o2.pl>
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=cmdiag
 VERSION=${VERSION:-0.2}
 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 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/network/cmst/README b/network/cmst/README
index 3cea99b65f..e42b7bcb3a 100644
--- a/network/cmst/README
+++ b/network/cmst/README
@@ -1,10 +1,9 @@
-cmst (GUI for connman daemon)
+cmst (Qt frontend for Connman)
 
-QT GUI for Connman with system tray icon.
+Graphical user interface to control the connman daemon. The connman 
+daemon must be started as you normally would, this program just 
+interfaces with that daemon. You can see what technologies and 
+services connman has found, and for wifi services an agent is 
+registered to assist in obtaining the information from you necessary 
+to logon to the wifi service.
 
-The program provides graphical user interface to control the connman
-daemon.  The connman daemon must be started as you normally would,
-this program just interfaces with that daemon.  You can see what
-technologies and services connman has found, and for wifi services an
-agent is registered to assist in obtaining the information from you
-necessary to logon the wifi service.
diff --git a/network/cmst/cmst.SlackBuild b/network/cmst/cmst.SlackBuild
index 6fa731b543..88b8c3976e 100644
--- a/network/cmst/cmst.SlackBuild
+++ b/network/cmst/cmst.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for cmst
 
-# Copyright 2015 Diego Borghetti <bdiego[at]gmail[dot]com>
+# Copyright 2023 Samuel Young, MO, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -11,7 +11,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,
@@ -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=cmst
-VERSION=${VERSION:-2016.04.03}
+VERSION=${VERSION:-2023.03.14}
 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,10 +66,9 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf ${PRGNAM}
-tar xvf $CWD/${PRGNAM}-$VERSION.tar.gz
-# The original tar.gz file don't have the version in the folder.
-cd ${PRGNAM}
+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 \
@@ -70,24 +76,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 {} \;
 
-export CFLAGS="$SLKCFLAGS"
-export CXXFLAGS="$SLKCFLAGS"
-export OPENSOURCE_CXXFLAGS="$SLKCFLAGS"
-export USE_LIBPATH="/usr/lib${LIBDIRSUFFIX}"
-
 qmake-qt5 DISTRO=slackware
+USE_LIBPATH="/usr/lib${LIBDIRSUFFIX}" \
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
 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
 
-mv $PKG/usr/share/man $PKG/usr/man
+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 text/* $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+  README.md text/* \
+  $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
@@ -95,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/network/cmst/cmst.info b/network/cmst/cmst.info
index 4152c3ce9a..dc28e059ab 100644
--- a/network/cmst/cmst.info
+++ b/network/cmst/cmst.info
@@ -1,10 +1,10 @@
 PRGNAM="cmst"
-VERSION="2016.04.03"
-HOMEPAGE="https://github.com/andrew-bibb/cmst/releases"
-DOWNLOAD="https://github.com/andrew-bibb/cmst/releases/download/cmst-2016.04.03/cmst-2016.04.03.tar.gz"
-MD5SUM="62aceed905b0d837ece686696d247d17"
+VERSION="2023.03.14"
+HOMEPAGE="https://github.com/andrew-bibb/cmst"
+DOWNLOAD="https://github.com/andrew-bibb/cmst/releases/download/cmst-2023.03.14/cmst-2023.03.14.tar.xz"
+MD5SUM="e4d0d63b23010b9a6a39dca08b973d73"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="qt5 connman"
-MAINTAINER="Diego Borghetti"
-EMAIL="bdiego[at]gmail[dot]com"
+REQUIRES="connman"
+MAINTAINER="Samuel Young"
+EMAIL="samyoung12788@gmail.com"
diff --git a/network/cmst/doinst.sh b/network/cmst/doinst.sh
index 5fb28930db..65c7e2eeb9 100644
--- a/network/cmst/doinst.sh
+++ b/network/cmst/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/network/cmst/slack-desc b/network/cmst/slack-desc
index 3df28a6b1d..7a0d2ef7b0 100644
--- a/network/cmst/slack-desc
+++ b/network/cmst/slack-desc
@@ -6,14 +6,14 @@
 # customary to leave one space after the ':' except on otherwise blank lines.
 
     |-----handy-ruler------------------------------------------------------|
-cmst: cmst (GUI for connman daemon)
+cmst: cmst (Qt frontend for Connman)
 cmst:
-cmst: The program provides graphical user interface to control the
-cmst: connman daemon. The connman daemon must be started
-cmst: as you normally would, this program just interfaces with that
-cmst: daemon. You can see what technologies and services connman
-cmst: has found, and for wifi services an agent is registered to assist
-cmst: in obtaining the information from you necessary to logon the
-cmst: wifi service.
+cmst: Cmst is a Qt based frontend for the connman connection manager. This 
+cmst: package also provides a systemtray icon.
+cmst:
+cmst:
+cmst:
+cmst:
+cmst:
+cmst: Homepage: https://github.com/andrew-bibb/cmst
 cmst:
-cmst: Homepage: https://github.com/andrew-bibb/cmst/releases
diff --git a/network/cni-plugins/README b/network/cni-plugins/README
new file mode 100644
index 0000000000..b0404bc836
--- /dev/null
+++ b/network/cni-plugins/README
@@ -0,0 +1,51 @@
+CNI plugins
+
+Some CNI network plugins, maintained by the containernetworking
+team. For more information, see the individual READMEs.
+
+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.
+
+Read CONTRIBUTING for build and test instructions.
+Plugins supplied:
+Main: interface-creating
+
+  bridge: Creates a bridge, adds the host and the container to it.
+  ipvlan: Adds an ipvlan interface in the container.
+  loopback: Set the state of loopback interface to up.
+  macvlan: Creates a new MAC address, forwards all traffic to that to
+           the container.
+  ptp: Creates a veth pair.
+  vlan: Allocates a vlan device.
+  host-device: Move an already-existing device into a container.
+
+Windows: windows specific
+
+  win-bridge: Creates a bridge, adds the host and the container to it.
+  win-overlay: Creates an overlay interface to the container.
+
+IPAM: IP address allocation
+
+  dhcp: Runs a daemon on the host to make DHCP requests on behalf of
+        the container
+  host-local: Maintains a local database of allocated IPs
+  static: Allocate a static IPv4/IPv6 addresses to container and it's
+          useful in debugging purpose.
+
+Meta: other plugins
+
+  flannel: Generates an interface corresponding to a flannel config file
+  tuning: Tweaks sysctl parameters of an existing interface
+  portmap: An iptables-based portmapping plugin. Maps ports from the
+           host's address space to the container.
+  bandwidth: Allows bandwidth-limiting through use of traffic control
+             tbf (ingress/egress).
+  sbr: A plugin that configures source based routing for an interface
+       (from which it is chained).
+  firewall: A firewall plugin which uses iptables or firewalld to add
+            rules to allow traffic to/from the container.
+
+Sample
+
+The sample plugin provides an example for building your own plugin.
diff --git a/network/cni-plugins/cni-plugins.SlackBuild b/network/cni-plugins/cni-plugins.SlackBuild
new file mode 100644
index 0000000000..dcc6f0440e
--- /dev/null
+++ b/network/cni-plugins/cni-plugins.SlackBuild
@@ -0,0 +1,118 @@
+#!/bin/bash
+
+# Slackware build script for cni-plugins
+
+# Copyright 2019 Gabriel Diaz, Madrid, Spain
+# 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.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=cni-plugins
+REPONAME=plugins
+VERSION=${VERSION:-1.1.1}
+GIT_COMMIT="4744ec27b89c083194e7df498de50f03a8a1d3ec"
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+# The domain part of the go package name, usually the hosting platform
+DOMAIN=github.com
+# The name of the organization/owner of the package
+ORG=containernetworking
+
+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
+  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 $REPONAME-$VERSION
+mkdir -p $REPONAME-$VERSION/src/$DOMAIN/$ORG
+cd $REPONAME-$VERSION/src/$DOMAIN/$ORG
+tar xvf $CWD/$REPONAME-$VERSION.tar.gz
+mv $REPONAME-$VERSION $REPONAME
+cd $REPONAME
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+# Point go to the location of the source tree
+export GOPATH="$TMP/$REPONAME-$VERSION"
+REPO_PATH=$TMP/$REPONAME-$VERSION/src/$DOMAIN/$ORG/$REPONAME
+sudo mkdir -p $PKG/usr/libexec/cni
+
+PLUGINS="plugins/meta/* plugins/main/* plugins/ipam/*"
+for d in $PLUGINS; do
+	if [ -d "$d" ]; then
+		plugin="$(basename "$d")"
+		if [ $plugin != "windows" ]; then
+			echo "  $plugin"
+			go build -o "$PKG/usr/libexec/cni/$plugin" "$@" "$REPO_PATH"/$d
+		fi
+	fi
+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 \
+  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/network/cni-plugins/cni-plugins.info b/network/cni-plugins/cni-plugins.info
new file mode 100644
index 0000000000..a3ff22f7f0
--- /dev/null
+++ b/network/cni-plugins/cni-plugins.info
@@ -0,0 +1,10 @@
+PRGNAM="cni-plugins"
+VERSION="1.1.1"
+HOMEPAGE="https://github.com/containernetworking/plugins"
+DOWNLOAD="https://github.com/containernetworking/plugins/archive/v1.1.1/plugins-1.1.1.tar.gz"
+MD5SUM="c37fed40151ddf0a00ef265c9dd91742"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="google-go-lang"
+MAINTAINER="Vincent Batts"
+EMAIL="vbatts@hashbangbash.com"
diff --git a/network/cni-plugins/slack-desc b/network/cni-plugins/slack-desc
new file mode 100644
index 0000000000..ead6b93729
--- /dev/null
+++ b/network/cni-plugins/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+           |-----handy-ruler------------------------------------------------------|
+cni-plugins: cni-plugins (plugins for Container Networking Interface)
+cni-plugins:
+cni-plugins: Container networking plugins for baseline functionality.
+cni-plugins:
+cni-plugins: Site: https://github.com/containernetworking/plugins
+cni-plugins:
+cni-plugins:
+cni-plugins:
+cni-plugins:
+cni-plugins:
+cni-plugins:
diff --git a/network/comgt/README b/network/comgt/README
index f8ae2f57ae..9697d193a6 100644
--- a/network/comgt/README
+++ b/network/comgt/README
@@ -1,5 +1,4 @@
 comgt is a scripting language interpreter useful for establishing
-communications on serial lines and through PCMCIA modems as well as GPRS
-and 3G datacards.  comgt has some features that are rarely found in other
-utilities of the same type.
-
+communications on serial lines and through PCMCIA modems as well as
+GPRS and 3G datacards. comgt has some features that are rarely found
+in other utilities of the same type.
diff --git a/network/comgt/comgt.SlackBuild b/network/comgt/comgt.SlackBuild
index 1f56551757..a48e723048 100644
--- a/network/comgt/comgt.SlackBuild
+++ b/network/comgt/comgt.SlackBuild
@@ -1,29 +1,39 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for comgt
 
 # Written by Zbigniew Baniewski, <Zbigniew [dot] Baniewski [at] gmail [dot] com>
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=comgt
 VERSION=${VERSION:-0.32}
 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,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/network/conkeror/conkeror.SlackBuild b/network/conkeror/conkeror.SlackBuild
index 5701e7d341..5f8e91dacf 100644
--- a/network/conkeror/conkeror.SlackBuild
+++ b/network/conkeror/conkeror.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for conkeror
 
@@ -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=conkeror
 VERSION=${VERSION:-1.0.4}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 SRCVER=685f24e3aeffc408dcea883e1d0c738cb18bbe8d
 
@@ -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
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/network/connman/README b/network/connman/README
index 4ce1967544..31cba91d83 100644
--- a/network/connman/README
+++ b/network/connman/README
@@ -1,8 +1,27 @@
-connman (open source connection manager)
+connman (Connection management daemon)
 
-ConnMan is a daemon for managing Internet connections within embedded
-device and integrates a vast range of communication features usually
-split between many daemons such as DHCP, DNS and NTP.
+Connman provides a daemon for managing Internet connections. The 
+Connection Manager is designed to be slim and to use as few resources 
+as possible. It is fully modular system that can be extended through 
+plug-ins. The plug-in approach allows for easy adaption and 
+modification for various use cases. Connman implements DNS resolving 
+and caching, DHCP clients for both IPv4 and IPv6, link-local IPv4 
+address handling and tethering (IP connection sharing) to clients via 
+USB, ethernet, WiFi, cellular and Bluetooth.
 
-The result of this consolidation is low memory consumption with a fast,
-coherent, synchronized reaction to changing network conditions.
+To run connman on startup, run (as root):
+  chmod +x /etc/rc.d/rc.connmand
+then add this to your /etc/rc.d/rc.local:
+  if [ -x /etc/rc.d/rc.connmand ]; then
+    /etc/rc.d/rc.connmand start
+  fi
+Make sure other networking services like NetworkManager or WPA
+Supplicant are not also configured to run on startup.
+
+By default, this SlackBuild will build connman with support for iwd,
+polkit, and nmcompat (NetworkManager compatibility interfaces). If
+you wish to disable any of these, you may run the SlackBuild with
+the DISABLE_IWD, DISABLE_POLKIT, and DISABLE_NMCOMPAT environment
+variables set, e.g.
+  DISABLE_IWD=yes DISABLE_POLKIT=yes DISABLE_NMCOMPAT=yes \
+  ./connman.SlackBuild
diff --git a/network/connman/allow_group_network.diff b/network/connman/allow_group_network.diff
deleted file mode 100644
index 2ab8d9f720..0000000000
--- a/network/connman/allow_group_network.diff
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/src/connman-polkit.conf	2010-11-05 12:09:04.285423955 -0200
-+++ b/src/connman-polkit.conf	2010-11-05 12:10:53.041423934 -0200
-@@ -5,6 +5,9 @@
-         <allow own="net.connman"/>
-         <allow send_interface="net.connman.Agent"/>
-     </policy>
-+    <policy group="network">
-+       <allow send_interface="net.connman.Agent"/>
-+    </policy>
-     <policy context="default">
-         <allow send_destination="net.connman"/>
-     </policy>
-
diff --git a/network/connman/connman.SlackBuild b/network/connman/connman.SlackBuild
index 2cee777343..8883b13f7d 100644
--- a/network/connman/connman.SlackBuild
+++ b/network/connman/connman.SlackBuild
@@ -1,31 +1,34 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for connman
 
-# Ryan P.C. McQuen | Everett, 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/>.
+# 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=connman
-VERSION=${VERSION:-1.32}
+VERSION=${VERSION:-1.42}
 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.?z*
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
@@ -69,14 +76,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 {} \;
 
-patch -p1 < $CWD/allow_group_network.diff
+iwd="--enable-iwd" ; [ "${DISABLE_IWD:-no}" != "no" ] && iwd=""
+polkit="--enable-polkit" ; [ "${DISABLE_POLKIT:-no}" != "no" ] && polkit=""
+nmcompat="--enable-nmcompat" ; [ "${DISABLE_NMCOMPAT:-no}" != "no" ] && nmcompat=""
 
-# fix cmst issue
-sed -i "s|deny|allow|" plugins/connman-nmcompat.conf
+autoreconf -i
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
-LIBS=-lncurses \
 ./configure \
   --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
@@ -84,16 +91,19 @@ LIBS=-lncurses \
   --localstatedir=/var \
   --mandir=/usr/man \
   --docdir=/usr/doc/$PRGNAM-$VERSION \
-  --enable-nmcompat \
-  --enable-polkit \
-  --enable-openvpn \
-  --enable-client \
-  --build=${ARCH}-slackware-linux
+  --disable-static \
+  --build=$ARCH-slackware-linux \
+  $iwd \
+  $polkit \
+  $nmcompat
 
 make
 make install DESTDIR=$PKG
 
-cp -av client/connmanctl $PKG/usr/sbin/
+mkdir -p $PKG/etc/rc.d
+install -m 644 $CWD/rc.connmand $PKG/etc/rc.d/
+
+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
@@ -101,19 +111,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
 
-mkdir -p ${PKG}/etc/rc.d
-install -m 644 ${CWD}/rc.connmand ${PKG}/etc/rc.d/
-
-mkdir -p ${PKG}/usr/doc/${PRGNAM}-${VERSION}
-install -m644 AUTHORS COPYING ChangeLog INSTALL README TODO doc/*.txt \
-  ${PKG}/usr/doc/${PRGNAM}-${VERSION}/
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+  AUTHORS COPYING ChangeLog HACKING README TODO \
+  $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
-mkdir -p ${PKG}/usr/doc/${PRGNAM}-${VERSION}/api
-mv ${PKG}/usr/doc/${PRGNAM}-${VERSION}/{*-api.txt,api/}
-
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/network/connman/connman.info b/network/connman/connman.info
index ae7d3d5b18..101cde64c9 100644
--- a/network/connman/connman.info
+++ b/network/connman/connman.info
@@ -1,10 +1,10 @@
 PRGNAM="connman"
-VERSION="1.32"
-HOMEPAGE="https://01.org/connman"
-DOWNLOAD="https://www.kernel.org/pub/linux/network/connman/connman-1.32.tar.xz"
-MD5SUM="d0c3071c1d8dec9cd17b760f862de2ad"
+VERSION="1.42"
+HOMEPAGE="https://git.kernel.org/pub/scm/network/connman/connman.git"
+DOWNLOAD="https://git.kernel.org/pub/scm/network/connman/connman.git/snapshot/connman-1.42.tar.gz"
+MD5SUM="5943f0687dff53f7c252e8a44cb9eb90"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Jason Graham"
-EMAIL="jgraha8@gmail.com"
+MAINTAINER="Samuel Young"
+EMAIL="samyoung12788@gmail.com"
diff --git a/network/connman/slack-desc b/network/connman/slack-desc
index 7a1d361633..d1039da9af 100644
--- a/network/connman/slack-desc
+++ b/network/connman/slack-desc
@@ -6,14 +6,14 @@
 # customary to leave one space after the ':' except on otherwise blank lines.
 
        |-----handy-ruler------------------------------------------------------|
-connman: connman (open source connection manager)
-connman:
-connman: ConnMan provides a daemon for managing internet connections within
-connman: embedded devices running Linux. The Connection Manager is designed
-connman: to be slim and to use as few resources as possible. It is fully
-connman: modular, and can be extended through plug-ins, to support various
-connman: wired and wireless technologies.
-connman:
-connman: https://01.org/connman
+connman: connman (Connection management daemon)
 connman:
+connman: Connman provides a daemon for managing Internet connections. The 
+connman: Connection Manager is designed to be slim and to use as few resources 
+connman: as possible. It is fully modular system that can be extended through 
+connman: plug-ins. The plug-in approach allows for easy adaption and 
+connman: modification for various use cases. Connman implements DNS resolving 
+connman: and caching, DHCP clients for both IPv4 and IPv6, link-local IPv4 
+connman: address handling and tethering (IP connection sharing) to clients via 
+connman: USB, ethernet, WiFi, cellular and Bluetooth.
 connman:
diff --git a/network/corebird/README b/network/corebird/README
deleted file mode 100644
index 4f1f415b27..0000000000
--- a/network/corebird/README
+++ /dev/null
@@ -1,2 +0,0 @@
-Corebird is a free Twitter client based on GTK3 which can manage multiple
-accounts and can display favourites and lists.
diff --git a/network/corebird/corebird.SlackBuild b/network/corebird/corebird.SlackBuild
deleted file mode 100644
index 50828f300c..0000000000
--- a/network/corebird/corebird.SlackBuild
+++ /dev/null
@@ -1,98 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for corebird
-
-# Copyright 2016 Henry Jensen, 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=corebird
-VERSION=${VERSION:-1.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 {} \;
-
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./autogen.sh \
-  --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
-
-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:-tgz}
diff --git a/network/corebird/corebird.info b/network/corebird/corebird.info
deleted file mode 100644
index 87a6770ebb..0000000000
--- a/network/corebird/corebird.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="corebird"
-VERSION="1.3"
-HOMEPAGE="https://corebird.baedert.org/"
-DOWNLOAD="https://github.com/baedert/corebird/archive/1.3/corebird-1.3.tar.gz"
-MD5SUM="800dbda002a28ae78eb6932fc403d3fb"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="vala rest json-glib gst-libav"
-MAINTAINER="Henry Jensen"
-EMAIL="hjensen@connochaetos.org"
diff --git a/network/corebird/doinst.sh b/network/corebird/doinst.sh
deleted file mode 100644
index 401d987795..0000000000
--- a/network/corebird/doinst.sh
+++ /dev/null
@@ -1,15 +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
-
-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/network/corebird/slack-desc b/network/corebird/slack-desc
deleted file mode 100644
index 50207384c2..0000000000
--- a/network/corebird/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------------------------------------------------------|
-corebird: corebird (Native Gtk+ Twitter Client)
-corebird:
-corebird: Corebird is a modern, easy, and fun Twitter client
-corebird:
-corebird: Homepage: https://corebird.baedert.org/
-corebird:
-corebird:
-corebird:
-corebird:
-corebird:
-corebird:
diff --git a/network/corkscrew/README b/network/corkscrew/README
index adc964e457..69959f4767 100644
--- a/network/corkscrew/README
+++ b/network/corkscrew/README
@@ -1,13 +1,12 @@
-Corkscrew is a tool for tunneling SSH through HTTP proxies.
-Setting up Corkscrew with SSH/OpenSSH is very simple.  Adding
-the following line to your ~/.ssh/config file will usually do
-the trick (replace proxy.example.com and 8080 with correct values):
+Corkscrew is a tool for tunneling SSH through HTTP proxies. Setting
+up Corkscrew with SSH/OpenSSH is very simple. Adding the following
+line to your ~/.ssh/config file will usually do the trick (replace
+proxy.example.com and 8080 with correct values):
 
 ProxyCommand /usr/bin/corkscrew proxy.example.com 8080 %h %p
 
-Basic HTTP authentication is also supported, you will need to create a file
-that contains your usename and password
-in the form of:
+Basic HTTP authentication is also supported, you will need to create a
+file that contains your usename and password in the form of:
 
 username:password
 
diff --git a/network/corkscrew/corkscrew.SlackBuild b/network/corkscrew/corkscrew.SlackBuild
index fccad559bf..61b96cdd70 100644
--- a/network/corkscrew/corkscrew.SlackBuild
+++ b/network/corkscrew/corkscrew.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for corkscrew.
 #
@@ -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=corkscrew
 VERSION=${VERSION:-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}
@@ -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/network/coturn/README b/network/coturn/README
new file mode 100644
index 0000000000..b9e0253193
--- /dev/null
+++ b/network/coturn/README
@@ -0,0 +1,16 @@
+coturn (Free open source implementation of TURN and STUN Server)
+
+The TURN Server is a VoIP media traffic NAT traversal server
+and gateway. It can be used as a general-purpose network
+traffic TURN server and gateway, too.
+
+You need the 'turnserver' group and user to run this script,
+for example:
+
+  groupadd -g 366 turnserver
+  useradd -u 366 -g turnserver -d /var/lib/turn -s /bin/bash turnserver
+
+If you wish another group and username, you can set TURN_GROUP and
+TURN_USER, for example:
+
+  TURN_GROUP=mygroup TURN_USER=myuser ./coturn.SlackBuild
diff --git a/network/coturn/coturn.SlackBuild b/network/coturn/coturn.SlackBuild
new file mode 100644
index 0000000000..6976e31e7b
--- /dev/null
+++ b/network/coturn/coturn.SlackBuild
@@ -0,0 +1,153 @@
+#!/bin/bash
+
+# Slackware build script for coturn
+
+# Copyright 2020 Thomas Bourdon <thomas dot bourdon at halpanet dot 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.
+
+# Special thanks to Thomas Morper for some configuration adjustments tips
+# Modified by slackbuilds.org 2020-04-17 16:08:20 +0100
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=coturn
+VERSION=${VERSION:-4.6.2}
+BUILD=${BUILD:-2}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+TURN_USER=${TURN_USER:-turnserver}
+TURN_GROUP=${TURN_GROUP:-turnserver}
+
+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
+
+if ! grep -q ^$TURN_GROUP: /etc/group 2>/dev/null ; then
+        echo "    Error: TURN group ($TURN_GROUP) doesn't exist."
+        echo "    Try creating one with: groupadd -g 366 $TURN_GROUP"
+        exit 1
+fi
+
+if ! grep -q ^$TURN_USER: /etc/passwd 2>/dev/null ; then
+        echo "    Error: TURN user ($TURN_USER) doesn't exist."
+        echo "    Try creating one with: useradd -u 366 -g $TURN_GROUP -d /var/lib/turn -s /bin/bash $TURN_USER"
+        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=""
+   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 \
+  --examplesdir=/usr/share/turnserver/examples \
+  --disable-rpath \
+  --build=$ARCH-slackware-linux || exit 1
+
+make
+make install DESTDIR=$PKG
+
+sed 's%/usr/local%/usr/share/turnserver/examples%' $PKG/etc/turnserver.conf.default > $PKG/etc/turnserver.conf.new
+rm -f $PKG/etc/turnserver.conf.default
+cp -a examples/ca $PKG/usr/share/turnserver/examples
+
+mkdir -p $PKG/etc/{rc.d,logrotate.d}
+cat $CWD/rc.turnserver > $PKG/etc/rc.d/rc.turnserver.new
+cat $CWD/logrotate.turnserver > $PKG/etc/logrotate.d/turnserver.new
+
+mkdir -p $PKG/var/log/turnserver
+chown $TURN_USER:$TURN_GROUP $PKG/var/log/turnserver
+
+# Populating /etc/default/turnserver.new
+mkdir -p $PKG/etc/default
+cat << EOF > $PKG/etc/default/turnserver.new
+TURN_USER=$TURN_USER
+TURN_GROUP=$TURN_GROUP
+TURN_PID_PATH=/var/run/turnserver
+EOF
+
+rm -rf $PKG/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
+
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a ChangeLog LICENSE* README* \
+  $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+find $PKG/{usr/doc,usr/man,usr/share,usr/include,etc,var} -type f -exec chmod -x {} +
+
+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/network/coturn/coturn.info b/network/coturn/coturn.info
new file mode 100644
index 0000000000..fdbc81c709
--- /dev/null
+++ b/network/coturn/coturn.info
@@ -0,0 +1,10 @@
+PRGNAM="coturn"
+VERSION="4.6.2"
+HOMEPAGE="https://github.com/coturn/coturn"
+DOWNLOAD="https://github.com/coturn/coturn/archive/4.6.2/coturn-4.6.2.tar.gz"
+MD5SUM="7d3ad08b1d63417cbc76d62f23e48ec4"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Thomas Bourdon"
+EMAIL="thomas dot bourdon at halpanet dot org"
diff --git a/network/coturn/doinst.sh b/network/coturn/doinst.sh
new file mode 100644
index 0000000000..e6ac736181
--- /dev/null
+++ b/network/coturn/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}
+}
+
+preserve_perms etc/rc.d/rc.turnserver.new
+config etc/turnserver.conf.new
+config etc/logrotate.d/turnserver.new
+config etc/default/turnserver.new
diff --git a/network/coturn/logrotate.turnserver b/network/coturn/logrotate.turnserver
new file mode 100644
index 0000000000..063f3c86e1
--- /dev/null
+++ b/network/coturn/logrotate.turnserver
@@ -0,0 +1,11 @@
+/var/log/turn/turn*.log {
+    su turnserver turnserver
+    daily
+    rotate 7
+    create 0644 turnserver turnserver
+    copytruncate
+    delaycompress
+    compress
+    notifempty
+    missingok
+}
diff --git a/network/coturn/rc.turnserver b/network/coturn/rc.turnserver
new file mode 100644
index 0000000000..8e34917c60
--- /dev/null
+++ b/network/coturn/rc.turnserver
@@ -0,0 +1,43 @@
+#! /bin/sh
+
+CONFIG="/etc/turnserver.conf"
+. /etc/default/turnserver
+
+coturn_start() {
+    if [ ! -d $TURN_PID_PATH ]; then
+      mkdir -p $TURN_PID_PATH
+      chown $TURN_USER:$TURN_GROUP $TURN_PID_PATH
+    fi
+    if [ -x /usr/bin/turnserver ]; then
+      echo "Starting turnserver daemon:  /usr/bin/turnserver"
+      su -l -c "/usr/bin/turnserver -o -c $CONFIG --pidfile $TURN_PID_PATH/turnserver.pid" $TURN_USER
+    fi
+}
+
+coturn_stop() {
+    echo "Stopping turnserver daemon:  /usr/bin/turnserver"
+    kill $(cat $TURN_PID_PATH/turnserver.pid)
+    rm -f $TURN_PID_PATH/turnserver.pid
+}
+
+coturn_restart() {
+    coturn_stop
+    sleep 1
+    coturn_start
+}
+
+case "$1" in
+'start')
+    coturn_start
+    ;;
+'stop')
+    coturn_stop
+    ;;
+'restart')
+    coturn_restart
+    ;;
+*)
+    echo "usage $0 start|stop|restart"
+esac
+
+exit 0
diff --git a/network/coturn/slack-desc b/network/coturn/slack-desc
new file mode 100644
index 0000000000..6e4fe0b298
--- /dev/null
+++ b/network/coturn/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+      |-----handy-ruler------------------------------------------------------|
+coturn: coturn (Free open source implementation of TURN and STUN Server)
+coturn:
+coturn: The TURN Server is a VoIP media traffic NAT traversal server and
+coturn: gateway. It can be used as a general-purpose network traffic TURN
+coturn: server and gateway, too.
+coturn:
+coturn: Homepage: https://github.com/coturn/coturn
+coturn:
+coturn:
+coturn:
+coturn:
diff --git a/network/courier-authlib/courier-authlib.SlackBuild b/network/courier-authlib/courier-authlib.SlackBuild
index b42e2a1598..06a032786f 100644
--- a/network/courier-authlib/courier-authlib.SlackBuild
+++ b/network/courier-authlib/courier-authlib.SlackBuild
@@ -1,31 +1,41 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for courier authlib
 
 # Written by Derek Noonburg (derekn@foolabs.com)
-# 2013-05-15
+# 2013-05-15, last updated 2019-08-26
 # Released into the public domain.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=courier-authlib
-VERSION=${VERSION:-0.66.1}
-BUILD=${BUILD:-1}
+VERSION=${VERSION:-0.69.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"
@@ -46,9 +56,10 @@ cd $TMP
 rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
 cd $PRGNAM-$VERSION
-chown -R operator .
+chown -R root:root .
 
 CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
@@ -56,19 +67,22 @@ CFLAGS="$SLKCFLAGS" \
   --localstatedir=/var \
   --mandir=/usr/man \
   --build=$ARCH-slackware-linux \
-  --with-authshadow
+  --with-authshadow \
+  --disable-static
 
 make
 make install DESTDIR=$PKG
 make install-configure DESTDIR=$PKG
 
+rm -f $PKG/usr/lib*/*/*.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
 
 gzip -9 $PKG/usr/man/*/*
 for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 
-for f in authdaemonrc authldaprc authmysqlrc ; do
+for f in authdaemonrc authldaprc authsqliterc ; do
   mv $PKG/etc/authlib/$f $PKG/etc/authlib/$f.new
 done
 
@@ -77,7 +91,6 @@ cp -a \
   INSTALL COPYING COPYING.GPL AUTHORS NEWS README* \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-chown -R root:root $PKG/usr/doc
 find $PKG/usr/doc -type f -exec chmod 0644 {} \;
 
 mkdir -p $PKG/install
@@ -85,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/network/courier-authlib/courier-authlib.info b/network/courier-authlib/courier-authlib.info
index 81f48f25a4..e2e55ac99d 100644
--- a/network/courier-authlib/courier-authlib.info
+++ b/network/courier-authlib/courier-authlib.info
@@ -1,10 +1,10 @@
 PRGNAM="courier-authlib"
-VERSION="0.66.1"
+VERSION="0.69.1"
 HOMEPAGE="http://www.courier-mta.org/authlib/"
-DOWNLOAD="https://download.sourceforge.net/courier/courier-authlib-0.66.1.tar.bz2"
-MD5SUM="123e9429909ed65a23464cb7ecb15cf1"
+DOWNLOAD="https://sourceforge.net/projects/courier/files/authlib/0.69.1/courier-authlib-0.69.1.tar.bz2"
+MD5SUM="ea219546964d26c0ec3ee21220d6868d"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES=""
+REQUIRES="courier-unicode"
 MAINTAINER="Derek Noonburg"
 EMAIL="derekn@foolabs.com"
diff --git a/network/courier-imap/courier-imap.SlackBuild b/network/courier-imap/courier-imap.SlackBuild
index 0836a6492b..db40c4f4f1 100644
--- a/network/courier-imap/courier-imap.SlackBuild
+++ b/network/courier-imap/courier-imap.SlackBuild
@@ -1,31 +1,41 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for courier IMAP
 
 # Written by Derek Noonburg (derekn@foolabs.com)
-# 2012-03-20
+# 2012-03-20, last updated 2019-08-26
 # Released into the public domain.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=courier-imap
-VERSION=${VERSION:-4.16.0}
+VERSION=${VERSION:-5.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"
@@ -46,13 +56,10 @@ cd $TMP
 rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
 cd $PRGNAM-$VERSION
-chown -R operator .
+chown -R root:root .
 
-# courier-imap refuses to build as root, so we do "su operator ..."
-# on the "configure" and "make" commands
-
-#su operator -c "\
-#CFLAGS=\"$SLKCFLAGS\" \
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
@@ -61,10 +68,9 @@ chown -R operator .
   --mandir=/usr/man \
   --enable-root-check=no \
   --build=$ARCH-slackware-linux \
-#"
-make
-#su operator -c "make"
+  --with-notice=unicode
 
+make
 make install DESTDIR=$PKG
 make install-configure DESTDIR=$PKG
 
@@ -81,7 +87,6 @@ done
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a AUTHORS COPYING COPYING.GPL INSTALL NEWS README $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-chown -R root:root $PKG/usr/doc
 find $PKG/usr/doc -type f -exec chmod 0644 {} \;
 
 mkdir -p $PKG/install
@@ -89,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/network/courier-imap/courier-imap.info b/network/courier-imap/courier-imap.info
index fdf9c55718..de423f2b02 100644
--- a/network/courier-imap/courier-imap.info
+++ b/network/courier-imap/courier-imap.info
@@ -1,10 +1,10 @@
 PRGNAM="courier-imap"
-VERSION="4.16.0"
+VERSION="5.0.7"
 HOMEPAGE="http://www.courier-mta.org/imap/"
-DOWNLOAD="https://download.sourceforge.net/courier/courier-imap-4.16.0.tar.bz2"
-MD5SUM="3d09a17a6eb68c9c91eb537ed0767728"
+DOWNLOAD="https://sourceforge.net/projects/courier/files/imap/5.0.7/courier-imap-5.0.7.tar.bz2"
+MD5SUM="d93fd9b3807070086c930823e63b2d82"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="courier-authlib courier-unicode"
+REQUIRES="courier-authlib"
 MAINTAINER="Derek Noonburg"
 EMAIL="derekn@foolabs.com"
diff --git a/network/courier-unicode/README b/network/courier-unicode/README
index 23211d4212..a0e38483ee 100644
--- a/network/courier-unicode/README
+++ b/network/courier-unicode/README
@@ -1,2 +1,3 @@
-The Courier Unicode library provides Unicode-related algorithms for
-other Courier applications.
+The Courier Unicode Library provides Unicode-related algorithms for
+other Courier applications. The current release of the Courier Unicode
+Library is based on the Unicode 13.0.0 standard.
diff --git a/network/courier-unicode/courier-unicode.SlackBuild b/network/courier-unicode/courier-unicode.SlackBuild
index b15e81c9a7..bd1da8a65c 100644
--- a/network/courier-unicode/courier-unicode.SlackBuild
+++ b/network/courier-unicode/courier-unicode.SlackBuild
@@ -1,31 +1,56 @@
-#!/bin/sh
-
+#!/bin/bash
+# ----------------------------------------------------------------------
 # Slackware build script for courier unicode
+#
+# Copyright 2015 - 2019 Derek Noonburg (derekn@foolabs.com)
+# Copyright 2019 - 2023 Andrew Strong, Blue Mountains, Australia.
+#
+#   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.
+# ----------------------------------------------------------------------
 
-# Written by Derek Noonburg (derekn@foolabs.com)
-# 2015-01-06
-# Released into the public domain.
+cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=courier-unicode
-VERSION=${VERSION:-1.1}
+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 [ ! -z "${PRINT_PACKAGE_NAME}" ]; 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,20 +71,29 @@ cd $TMP
 rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
 cd $PRGNAM-$VERSION
-chown -R operator .
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -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
 
@@ -67,13 +101,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 INSTALL COPYING AUTHORS README* ChangeLog $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS ChangeLog COPYING INSTALL README $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-chown -R root:root $PKG/usr/doc
-find $PKG/usr/doc -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:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/network/courier-unicode/courier-unicode.info b/network/courier-unicode/courier-unicode.info
index 2368fce438..379b283259 100644
--- a/network/courier-unicode/courier-unicode.info
+++ b/network/courier-unicode/courier-unicode.info
@@ -1,10 +1,10 @@
 PRGNAM="courier-unicode"
-VERSION="1.1"
+VERSION="2.2.6"
 HOMEPAGE="http://www.courier-mta.org/unicode/"
-DOWNLOAD="https://download.sourceforge.net/courier/courier-unicode-1.1.tar.bz2"
-MD5SUM="5fea17f4f0f50298a76f03bda6b24ada"
+DOWNLOAD="https://download.sourceforge.net/courier/courier-unicode-2.2.6.tar.bz2"
+MD5SUM="55ca273834da0eca2f99e2558af3a225"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Derek Noonburg"
-EMAIL="derekn@foolabs.com"
+MAINTAINER="Andrew Strong"
+EMAIL="andrew.david.strong@gmail.com"
diff --git a/network/cowpatty/cowpatty.SlackBuild b/network/cowpatty/cowpatty.SlackBuild
index 230c3e91f9..6413106c52 100644
--- a/network/cowpatty/cowpatty.SlackBuild
+++ b/network/cowpatty/cowpatty.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for cowpatty
 
@@ -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=cowpatty
 VERSION=${VERSION:-4.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}
@@ -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/network/cryptcat-unix/cryptcat-unix.SlackBuild b/network/cryptcat-unix/cryptcat-unix.SlackBuild
index 76df5aefc5..09564a9b3e 100644
--- a/network/cryptcat-unix/cryptcat-unix.SlackBuild
+++ b/network/cryptcat-unix/cryptcat-unix.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for cryptcat
 # Written by Jeanne-Kamikaze (AKA SlackerJeanne) (jeannekamikaze@shellblade.net)
@@ -8,10 +8,13 @@
 #
 # Modified by SlackBuilds.org
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 VERSION=${VERSION:-1.2.1}
 PRGNAM=cryptcat-unix
 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}
@@ -77,4 +87,4 @@ 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
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/network/csync/README b/network/csync/README
index 36fa5a184a..9b64b40b23 100644
--- a/network/csync/README
+++ b/network/csync/README
@@ -1,6 +1,7 @@
-Csync is a file synchronizer especially designed for you, the normal user.
+Csync is a file synchronizer especially designed for you, the normal
+user.
 
-To be more precise csync is a client only bidirectional file synchronizer. 
-You can use csync for different things.  The intention is to provide Roaming 
-Home Directories for Linux but you can use it to synchronize your music 
-collection or create a backup of a directory.
+To be more precise csync is a client only bidirectional file
+synchronizer. You can use csync for different things. The intention
+is to provide Roaming Home Directories for Linux but you can use it to
+synchronize your music collection or create a backup of a directory.
diff --git a/network/csync/csync.SlackBuild b/network/csync/csync.SlackBuild
index dbabaa2205..8e724e5b62 100644
--- a/network/csync/csync.SlackBuild
+++ b/network/csync/csync.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for Csync
 
@@ -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.
 
+# 20220330 bkw: Modified by SlackBuilds.org, BUILD=2:
+# - fix download URL.
+# - i486 => i586.
+# - no useless INSTALL in doc dir.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=csync
 VERSION=${VERSION:-0.50.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"
@@ -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 {} \+
 
 # Fix for gcc-5.2.0
 # "ISO C does not support ‘__FUNCTION__’ predefined identifier"
@@ -101,7 +113,7 @@ mkdir $PKG/usr/doc
 mv $PKG/usr/share/doc/csync $PKG/usr/doc/$PRGNAM-$VERSION
 rm -rf $PKG/usr/share/doc ; rmdir $PKG/usr/share 2>/dev/null || true
 cp -a \
-  AUTHORS COPYING ChangeLog INSTALL README \
+  AUTHORS COPYING ChangeLog 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
@@ -111,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/network/csync/csync.info b/network/csync/csync.info
index cd7c78baa6..7ee4dab046 100644
--- a/network/csync/csync.info
+++ b/network/csync/csync.info
@@ -1,10 +1,10 @@
 PRGNAM="csync"
 VERSION="0.50.0"
 HOMEPAGE="http://www.csync.org"
-DOWNLOAD="https://open.cryptomilk.org/attachments/download/27/csync-0.50.0.tar.xz"
+DOWNLOAD="https://slackware.uk/~urchlay/src/csync-0.50.0.tar.xz"
 MD5SUM="4f022aaa19ecd8008b03876dd65a9df2"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="log4c iniparser check"
+REQUIRES="log4c iniparser"
 MAINTAINER="Steven King"
 EMAIL="kingrst@gmail.com"
diff --git a/network/ctorrent/README b/network/ctorrent/README
index bec3191639..2a4405fc3b 100644
--- a/network/ctorrent/README
+++ b/network/ctorrent/README
@@ -1,22 +1,23 @@
-CTorrent is a BitTorrent client implemented in C++ to be lightweight and quick.
-The original has fallen a little behind in updates and bug fixes though.
+CTorrent is a BitTorrent client implemented in C++ to be lightweight
+and quick. The original has fallen a little behind in updates and bug
+fixes though.
 
-The files here contain the good work of those who wrote the original CTorrent
-base code and a number of patches that provide fixes and enhancements, as well
-as additional fixes and enhancements.
+The files here contain the good work of those who wrote the original
+CTorrent base code and a number of patches that provide fixes and
+enhancements, as well as additional fixes and enhancements.
 
-The purpose of the Enhanced CTorrent effort is to fix problems that remain in
-the code, modernize existing features and algorithms, and implement new
-features while maintaining low overhead requirements and a high standard of
-performance (both part of the original CTorrent design philosophy).
-Highlights of the enhanced client include:
+The purpose of the Enhanced CTorrent effort is to fix problems that
+remain in the code, modernize existing features and algorithms, and
+implement new features while maintaining low overhead requirements
+and a high standard of performance (both part of the original CTorrent
+design philosophy).  Highlights of the enhanced client include:
 
 * Support for large files (>2GB) and large torrents (>255 files)
 * Strategic selection of pieces to request for download
 * Continuous queueing of download requests, tuned based on latency and
   throughput for each peer
-* Improved download performance, including parallel requests in initial and
-  endgame modes
+* Improved download performance, including parallel requests in initial
+  and endgame modes
 * Improved bandwidth regulation
 * Improved compatibility with other peers
 * Performance optimization and bug fixes
diff --git a/network/ctorrent/ctorrent.SlackBuild b/network/ctorrent/ctorrent.SlackBuild
index 42ef7c1fac..b08b075217 100644
--- a/network/ctorrent/ctorrent.SlackBuild
+++ b/network/ctorrent/ctorrent.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 # Copyright (c) 2007-2009  Eric Hameleers, Eindhoven, Netherlands
 # All rights reserved.
 #
@@ -22,10 +22,13 @@
 # -----------------------------------------------------------------------------
 # Slightly modified by the SlackBuilds.org project
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=ctorrent
 VERSION=${VERSION:-3.3.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 PKGVERSION=dnh${VERSION}
 
@@ -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}
@@ -86,9 +96,9 @@ CXXFLAGS="$SLKCFLAGS" \
 make
 make install DESTDIR=$PKG
 
-mkdir -p $PKG/usr/doc/$PRGNAM-$PKGVERSION
-cp -a $DOCS $PKG/usr/doc/$PRGNAM-$PKGVERSION || true
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$PKGVERSION/$PRGNAM.SlackBuild
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION || true
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 find $PKG | xargs 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 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$PKGVERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/network/ctorrent/ctorrent.info b/network/ctorrent/ctorrent.info
index 473491d78e..e5ad101607 100644
--- a/network/ctorrent/ctorrent.info
+++ b/network/ctorrent/ctorrent.info
@@ -1,5 +1,5 @@
 PRGNAM="ctorrent"
-VERSION="dnh3.3.2"
+VERSION="3.3.2"
 HOMEPAGE="http://www.rahul.net/dholmes/ctorrent/"
 DOWNLOAD="http://downloads.sourceforge.net/dtorrent/3.3.2/ctorrent-dnh3.3.2.tar.gz"
 MD5SUM="59b23dd05ff70791cd6449effa7fc3b6"
diff --git a/network/curl-quic/README b/network/curl-quic/README
new file mode 100644
index 0000000000..c61e020829
--- /dev/null
+++ b/network/curl-quic/README
@@ -0,0 +1,13 @@
+curl-quic is a version of curl which supports QUIC and HTTP/3
+
+This version is identical to curl provided by Slackware,
+but supports QUIC and HTTP/3 via nghttp3 and ngtcp2 found on SBo.
+
+ECH is still not supported.
+
+Test that QUIC works by
+
+curl-quic -v --http3-only https://cloudflare-quic.com
+
+or any other QUIC-enabled website.
+
diff --git a/network/curl-quic/curl-quic.SlackBuild b/network/curl-quic/curl-quic.SlackBuild
new file mode 100644
index 0000000000..d262f7f9e8
--- /dev/null
+++ b/network/curl-quic/curl-quic.SlackBuild
@@ -0,0 +1,146 @@
+#!/bin/bash
+
+# Copyright 2008, 2009, 2010, 2011, 2013, 2014, 2016, 2017, 2018, 2020, 2021  Patrick J. Volkerding, Sebeka, 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.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=curl-quic
+TGZNAM=curl
+VERSION=${VERSION:-8.6.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 the variable PRINT_PACKAGE_NAME is set, then this script will report what
+# the name of the created package would be, and then exit. This information
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+OUTPUT=${OUTPUT:-/tmp}
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+
+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
+
+mkdir -p $OUTPUT
+
+rm -rf $PKG
+
+mkdir -p $PKG
+
+cd $TMP
+rm -rf $TGZNAM-$VERSION
+tar xvf $CWD/$TGZNAM-$VERSION.tar.?z* || exit 1
+cd $TGZNAM-$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 {} \+
+
+set -e
+
+
+CFLAGS="$SLKCFLAGS " \
+      CC='ccache gcc' \
+      CXX='ccache g++' \
+./configure \
+  --prefix=/opt/$PRGNAM \
+  --libdir=/opt/$PRGNAM/usr/lib${LIBDIRSUFFIX} \
+  --mandir=/opt/$PRGNAM/usr/man \
+  --with-libssh2 \
+  --with-gssapi \
+  --enable-ares \
+  --enable-static=no \
+  --without-ca-bundle \
+  --with-nghttp3 \
+  --with-ngtcp2 \
+  --enable-websockets \
+  --with-ca-path=/etc/ssl/certs \
+  --with-gnutls || exit 1
+
+CFLAGS="$SLKCFLAGS " \
+make V=1
+make install DESTDIR=$PKG
+
+mkdir -p $PKG/usr/bin
+( cd $PKG/usr/bin
+ln --symbolic --relative ../../opt/curl-quic/bin/curl curl-quic )
+
+# Don't ship .la files:
+rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la
+
+rm $PKG/opt/$PRGNAM/usr/lib${LIBDIRSUFFIX}/libcurl.la
+
+# We don't ship the related perl script (yet):
+rm -f $PKG/usr/man/man1/mk-ca-bundle.1
+
+find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+
+
+#rm $PKG/usr/lib${LIBDIRSUFFIX}/libcurl.a
+
+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
+
+# Get rid of .deps cruft:
+rm -rf $PKG/usr/doc/$PRGNAM-$VERSION/examples/.deps
+
+# man pages from normal curl still work
+rm -rf $PKG/opt/$PRGNAM/usr/man
+
+
+mkdir -p $PKG/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/network/curl-quic/curl-quic.info b/network/curl-quic/curl-quic.info
new file mode 100644
index 0000000000..fb673d3467
--- /dev/null
+++ b/network/curl-quic/curl-quic.info
@@ -0,0 +1,10 @@
+PRGNAM="curl-quic"
+VERSION="8.6.0"
+HOMEPAGE="https://curl.se/"
+DOWNLOAD="https://github.com/curl/curl/releases/download/curl-8_6_0/curl-8.6.0.tar.gz"
+MD5SUM="6178ea567611c2aaffafc88f91fb4238"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="nghttp3 ngtcp2"
+MAINTAINER="Lockywolf"
+EMAIL="for_sbo.curl-quic_2023-05-17@lockywolf.net"
diff --git a/network/curl-quic/slack-desc b/network/curl-quic/slack-desc
new file mode 100644
index 0000000000..1526548406
--- /dev/null
+++ b/network/curl-quic/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description. Line
+# up the first '|' above the ':' following the base package name, and the '|'
+# on the right side marks the last column you can put a 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------------------------------------------------------|
+curl-quic: curl-quic (command line URL data transfer tool)
+curl-quic:
+curl-quic: Curl is a command line tool for transferring data specified with URL
+curl-quic: syntax. The command is designed to work without user interaction or
+curl-quic: any kind of interactivity. Curl offers a busload of useful tricks
+curl-quic: like proxy support, user authentication, ftp upload, HTTP post,  SSL
+curl-quic: (https:) connections, cookies, file transfer resume and more.
+curl-quic:
+curl-quic: This build enables QUIC and HTTP/3 over pure UDP.
+curl-quic:
+curl-quic:
diff --git a/network/cyrus-imapd/README b/network/cyrus-imapd/README
index fbb307120b..e3eb218a72 100644
--- a/network/cyrus-imapd/README
+++ b/network/cyrus-imapd/README
@@ -1,15 +1,16 @@
-The Cyrus IMAP (Internet Message Access Protocol) server provides access to
-personal mail and system-wide bulletin boards through the IMAP protocol.
-The Cyrus IMAP server is a scalable enterprise mail system designed for use
-from small to large enterprise environments using standards-based
-technologies.
-
-A full Cyrus IMAP implementation allows a seamless mail and bulletin board
-environment to be set up across multiple servers. It differs from other IMAP
-server implementations in that it is run on "sealed" servers, where users
-are not normally permitted to log in. The mailbox database is stored in parts
-of the filesystem that are private to the Cyrus IMAP system. All user access
-to mail is through software using the IMAP, POP3, or KPOP protocols.
+The Cyrus IMAP (Internet Message Access Protocol) server provides access
+to personal mail and system-wide bulletin boards through the IMAP
+protocol.  The Cyrus IMAP server is a scalable enterprise mail system
+designed for use from small to large enterprise environments using
+standards-based technologies.
+
+A full Cyrus IMAP implementation allows a seamless mail and bulletin
+board environment to be set up across multiple servers. It differs from
+other IMAP server implementations in that it is run on "sealed" servers,
+where users are not normally permitted to log in. The mailbox database
+is stored in parts of the filesystem that are private to the Cyrus IMAP
+system. All user access to mail is through software using the IMAP,
+POP3, or KPOP protocols.
 
 The private mailbox database design gives the server large advantages in
 efficiency, scalability, and administratability. Multiple concurrent
@@ -18,15 +19,16 @@ supports access control lists on mailboxes and storage quotas on mailbox
 hierarchies.
 
 Cyrus is a highly scalable enterprise mail system designed for use in
-enterprise environments of various sizes using standards based technologies.
-Cyrus technologies scale from independent use in email departments to a system
-centrally managed in a large enterprise.
+enterprise environments of various sizes using standards based
+technologies.  Cyrus technologies scale from independent use in email
+departments to a system centrally managed in a large enterprise.
 
 For more information on how to install and run cyrus-imapd, see
-README.SLACKWARE that came with this package (which is also installed 
+README.SLACKWARE that came with this package (which is also installed
 with the documentation).
 
-Patches for autocreate and autosieve are no longer needed so they were removed.
+Patches for autocreate and autosieve are no longer needed so they were
+removed.
 
 Make sure to read the Upgrading to Cyrus IMAP 2.5.0 notes:
   https://cyrusimap.org/imap/release-notes/2.5/x/2.5.0.html
@@ -36,4 +38,3 @@ Something like this will create them:
   # groupadd -g 238 cyrus
   # useradd -d /var/imap -s /bin/sh -u 238 -g 238 cyrus
 See http://slackbuilds.org/uid_gid.txt for uid/gid suggestions.
-
diff --git a/network/cyrus-imapd/cyrus-imapd.SlackBuild b/network/cyrus-imapd/cyrus-imapd.SlackBuild
index 48e2c54e55..096af5706f 100644
--- a/network/cyrus-imapd/cyrus-imapd.SlackBuild
+++ b/network/cyrus-imapd/cyrus-imapd.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for cyrus-imapd
 
-# Copyright 2010, 2011, 2014, 2016, 2017  Mario Preksavec, Zagreb, Croatia
+# Copyright 2010, 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.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=cyrus-imapd
-VERSION=${VERSION:-2.5.11}
+VERSION=${VERSION:-3.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 the variable PRINT_PACKAGE_NAME is set, then this script will report what
+# the name of the created package would be, and then exit. This information
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; 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"
@@ -124,7 +134,8 @@ rm -rf $PKG/usr/share
 install -D -m0755 -oroot -groot $CWD/rc.cyrus-imapd $PKG/etc/rc.d/rc.cyrus-imapd.new
 
 # Install sample configuration
-install -D -m0640 -ocyrus -gcyrus master/conf/normal.conf $PKG/etc/cyrus.conf.new
+install -D -m0640 -ocyrus -gcyrus doc/examples/cyrus_conf/normal.conf \
+  $PKG/etc/cyrus.conf.new
 install -D -m0640 -ocyrus -gcyrus $CWD/imapd.conf $PKG/etc/imapd.conf.new
 
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
@@ -139,13 +150,17 @@ find $PKG -name perllocal.pod \
   | xargs rm -f
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a COPYING README doc/* master/conf tools/ $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+  COPYING README.md doc/* tools/ \
+  $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/network/cyrus-imapd/cyrus-imapd.info b/network/cyrus-imapd/cyrus-imapd.info
index 99b2c68075..9eb4263398 100644
--- a/network/cyrus-imapd/cyrus-imapd.info
+++ b/network/cyrus-imapd/cyrus-imapd.info
@@ -1,8 +1,8 @@
 PRGNAM="cyrus-imapd"
-VERSION="2.5.11"
+VERSION="3.2.12"
 HOMEPAGE="https://www.cyrusimap.org/"
-DOWNLOAD="ftp://ftp.cyrusimap.org/cyrus-imapd/cyrus-imapd-2.5.11.tar.gz"
-MD5SUM="674083444c36a786d9431b6612969224"
+DOWNLOAD="https://github.com/cyrusimap/cyrus-imapd/releases/download/cyrus-imapd-3.2.12/cyrus-imapd-3.2.12.tar.gz"
+MD5SUM="7c0ebaa07c402cc2933305336b1278e3"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/network/dante/README b/network/dante/README
index 97091aa6f0..131a226d1f 100644
--- a/network/dante/README
+++ b/network/dante/README
@@ -2,13 +2,14 @@ dante (a free SOCKS client and server)
 
 Dante is a product developed by Inferno Nettverk A/S. It consists of
 a SOCKS server and a SOCKS client, implementing RFC 1928 and related
-standards. It is a flexible product that can be used to provide convenient
-and secure network connectivity.
+standards. It is a flexible product that can be used to provide
+convenient and secure network connectivity.
 
 The Dante SOCKS server interoperates with many popular network
-applications which already have SOCKS support built in to them, such as
-most web-browsers, instant messaging programs, and many others. Dante is
-released under a BSD/CMU-type license and comes with complete source code.
+applications which already have SOCKS support built in to them,
+such as most web-browsers, instant messaging programs, and many
+others. Dante is released under a BSD/CMU-type license and comes with
+complete source code.
 
 Extensive documentation is available at the Dante web site:
 
@@ -26,17 +27,18 @@ maintainer).
 No config files are installed by default. Sample config
 files are in /usr/doc/dante-$VERSION/example/, and also as
 /etc/sock[ds].conf.example. Dante can be used as a client without a
-config file (by setting SOCKS_SERVER in the environment, e.g.), but more
-fine-grained control is possible with /etc/socks.conf. Dante won't be
-very useful as a server (sockd) without a config file, so copy one of the
-sockd example configs to /etc/sockd.conf if you're going to run a server.
+config file (by setting SOCKS_SERVER in the environment, e.g.), but
+more fine-grained control is possible with /etc/socks.conf. Dante
+won't be very useful as a server (sockd) without a config file, so
+copy one of the sockd example configs to /etc/sockd.conf if you're
+going to run a server.
 
 Dante supports LDAP authentication, but the SlackBuild author hasn't
 tested building the support for it. The Dante configure script says
 you'll need to install "Kerberos/SASL/GSSAPI/LDAP" for this to work
-(and it should be autodetected, if everything is installed). If you try
-this, please email the maintainer with your results (success, failure,
-anything extra you had to do to make it work).
+(and it should be autodetected, if everything is installed). If you
+try this, please email the maintainer with your results (success,
+failure, anything extra you had to do to make it work).
 
 The build doesn't include the "licensed modules" (purchase required)
 and there is no provision for adding them. These include the bandwidth
diff --git a/network/dante/dante.SlackBuild b/network/dante/dante.SlackBuild
index 2f28c512b2..35f43607a8 100644
--- a/network/dante/dante.SlackBuild
+++ b/network/dante/dante.SlackBuild
@@ -1,17 +1,22 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for dante
 
-# 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.
 
 # TODO: init script? Only if someone asks for it...
 
+# 20230103 bkw: BUILD=2, fix broken symlinks.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=dante
-VERSION=${VERSION:-1.4.2}
-BUILD=${BUILD:-1}
+VERSION=${VERSION:-1.4.3}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -21,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}
@@ -49,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" \
@@ -96,11 +102,11 @@ cat $CWD/README > $PKG/usr/doc/$PRGNAM-$VERSION/README.Slackware
 # Not going to install actual socks.conf and sockd.conf in /etc,
 # but at least symlink the examples where they can be found easily.
 mkdir -p $PKG/etc
-ln -s ../usr/doc/$PRGNAM-$VERSION/socks.conf $PKG/etc/socks.conf.example
-ln -s ../usr/doc/$PRGNAM-$VERSION/sockd.conf $PKG/etc/sockd.conf.example
+ln -s ../usr/doc/$PRGNAM-$VERSION/example/socks.conf $PKG/etc/socks.conf.example
+ln -s ../usr/doc/$PRGNAM-$VERSION/example/sockd.conf $PKG/etc/sockd.conf.example
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/network/dante/dante.info b/network/dante/dante.info
index 39bc7ea1ab..49a2b1071e 100644
--- a/network/dante/dante.info
+++ b/network/dante/dante.info
@@ -1,10 +1,10 @@
 PRGNAM="dante"
-VERSION="1.4.2"
+VERSION="1.4.3"
 HOMEPAGE="https://www.inet.no/dante/"
-DOWNLOAD="https://www.inet.no/dante/files/dante-1.4.2.tar.gz"
-MD5SUM="77551576d3e80bfaa941055a2959da81"
+DOWNLOAD="https://www.inet.no/dante/files/dante-1.4.3.tar.gz"
+MD5SUM="28ae15fb9e4f5ce7fe17307d01edc075"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
 MAINTAINER="B. Watson"
-EMAIL="yalhcru@gmail.com"
+EMAIL="urchlay@slackware.uk"
diff --git a/network/darkhttpd/README b/network/darkhttpd/README
index 4b210b0faa..89026de418 100644
--- a/network/darkhttpd/README
+++ b/network/darkhttpd/README
@@ -11,8 +11,8 @@ Features:
 * Event loop, single-threaded -- no fork() or pthreads.
 * Generates directory listings.
 * Supports HTTP GET and HEAD requests.
-* Supports Range / partial content. (Try streaming music files or resuming
-  a download.)
+* Supports Range / partial content. (Try streaming music files or
+  resuming a download.)
 * Supports If-Modified-Since.
 * Supports Keep-Alive connections.
 * Can serve 301 redirects based on Host header.
diff --git a/network/darkhttpd/darkhttpd.SlackBuild b/network/darkhttpd/darkhttpd.SlackBuild
index dd8716e14f..4b74b5e7c2 100644
--- a/network/darkhttpd/darkhttpd.SlackBuild
+++ b/network/darkhttpd/darkhttpd.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for darkhttpd
 
@@ -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=darkhttpd
-VERSION=${VERSION:-1.12}
+VERSION=${VERSION:-1.16}
 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}
@@ -62,7 +72,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xjvf $CWD/$PRGNAM-$VERSION.tar.bz2
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
@@ -80,7 +90,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 README $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a README* $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 # Install license (from Arch Linux' PKGBUILD)
@@ -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/network/darkhttpd/darkhttpd.info b/network/darkhttpd/darkhttpd.info
index 40bb58a94f..4b92c2dfcc 100644
--- a/network/darkhttpd/darkhttpd.info
+++ b/network/darkhttpd/darkhttpd.info
@@ -1,8 +1,8 @@
 PRGNAM="darkhttpd"
-VERSION="1.12"
+VERSION="1.16"
 HOMEPAGE="https://unix4lyfe.org/darkhttpd/"
-DOWNLOAD="https://unix4lyfe.org/darkhttpd/darkhttpd-1.12.tar.bz2"
-MD5SUM="d0d483a92f7af8f1c667d9e23e754280"
+DOWNLOAD="https://github.com/emikulic/darkhttpd/archive/v1.16/darkhttpd-1.16.tar.gz"
+MD5SUM="ba8928e866ebcb9691a0cdd3b504b3c3"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/network/darkstat/README b/network/darkstat/README
index f608a8653b..9eda1ecc68 100644
--- a/network/darkstat/README
+++ b/network/darkstat/README
@@ -1,6 +1,6 @@
-darkstat is a packet sniffing daemon that serves statistics over HTTP using a
-builtin web server. Statistics can be refined using tcpdump filter expression
-syntax.
+darkstat is a packet sniffing daemon that serves statistics over HTTP
+using a builtin web server. Statistics can be refined using tcpdump
+filter expression syntax.
 
 Features:
 - Traffic graphs, and reports per host, showing each port for each host.
diff --git a/network/darkstat/darkstat.SlackBuild b/network/darkstat/darkstat.SlackBuild
index aa0e82739c..67f5b494cb 100644
--- a/network/darkstat/darkstat.SlackBuild
+++ b/network/darkstat/darkstat.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for darkstat
 # Originally Written by Jorey Bump
-# Copyright 2015-2016 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
+# Copyright 2015-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=darkstat
-VERSION=${VERSION:-3.0.719}
+VERSION=${VERSION:-3.0.721}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,12 +38,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="AUTHORS ChangeLog COPYING.GPL NEWS README"
+DOCS="AUTHORS ChangeLog COPYING.GPL NEWS README*"
 
 if [ "$ARCH" = "i586" ]; then
   SLKCFLAGS="-O2 -march=i586 -mtune=i686"
@@ -58,7 +68,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xjvf $CWD/$PRGNAM-$VERSION.tar.bz2
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
@@ -67,13 +77,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 {} \;
 
+autoreconf -fiv
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
   --sysconfdir=/etc \
   --localstatedir=/var \
-  --mandir=/usr/man
+  --mandir=/usr/man \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --disable-static \
+  --build=$ARCH-slackware-linux
 
 make
 make install DESTDIR=$PKG
@@ -92,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/network/darkstat/darkstat.info b/network/darkstat/darkstat.info
index 6885bc33e4..360e725f6f 100644
--- a/network/darkstat/darkstat.info
+++ b/network/darkstat/darkstat.info
@@ -1,8 +1,8 @@
 PRGNAM="darkstat"
-VERSION="3.0.719"
+VERSION="3.0.721"
 HOMEPAGE="https://unix4lyfe.org/darkstat/"
-DOWNLOAD="https://unix4lyfe.org/darkstat/darkstat-3.0.719.tar.bz2"
-MD5SUM="963145de05cb21f4d93a9c244beeaea0"
+DOWNLOAD="https://github.com/emikulic/darkstat/archive/refs/tags/3.0.721/darkstat-3.0.721.tar.gz"
+MD5SUM="4d67d74414d2f458ec82972de43ab367"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/network/davmail/davmail.SlackBuild b/network/davmail/davmail.SlackBuild
index 8166e5c38d..ae6c441bea 100644
--- a/network/davmail/davmail.SlackBuild
+++ b/network/davmail/davmail.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for DavMail
 
-# Copyright (c) 2015-2018 Giuseppe Di Terlizzi <giuseppe.diterlizzi@gmail.com>
+# Copyright (c) 2015-2022 Giuseppe Di Terlizzi <giuseppe.diterlizzi@gmail.com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -26,13 +26,23 @@
 # Modified by Mario Preksavec <mario@slackware.hr>
 # Updated by Alfredo Tomasini <alto.tom@gmail.com> to support .zip releases
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=davmail
-VERSION=${VERSION:-4.9.0}
+VERSION=${VERSION:-5.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}
@@ -81,4 +91,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-${VERSION}-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/network/davmail/davmail.info b/network/davmail/davmail.info
index 5961fd4929..f24a018308 100644
--- a/network/davmail/davmail.info
+++ b/network/davmail/davmail.info
@@ -1,10 +1,10 @@
 PRGNAM="davmail"
-VERSION="4.9.0"
+VERSION="5.5.1"
 HOMEPAGE="http://davmail.sourceforge.net"
-DOWNLOAD="https://sourceforge.net/projects/davmail/files/davmail/4.9.0/davmail-4.9.0-2652.zip"
-MD5SUM="0d907e0dac83cfe834d2260f6624a2f2"
+DOWNLOAD="https://sourceforge.net/projects/davmail/files/davmail/5.5.1/davmail-5.5.1-3299.zip"
+MD5SUM="ae194c3571e107081164913a001d6f27"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="jdk"
+REQUIRES="zulu-openjdk8"
 MAINTAINER="Giuseppe Di Terlizzi"
 EMAIL="giuseppe.diterlizzi@gmail.com"
diff --git a/network/davmail/davmail.sh b/network/davmail/davmail.sh
index 117fb8188a..4a2f245f6f 100644
--- a/network/davmail/davmail.sh
+++ b/network/davmail/davmail.sh
@@ -1,4 +1,15 @@
 #!/bin/sh
+
 BASE=/usr/share/davmail
-for i in $BASE/lib/*; do export CLASSPATH=$CLASSPATH:$i; done
-exec java -Xmx512M -Dsun.net.inetaddr.ttl=60 -cp $BASE/davmail.jar:$CLASSPATH davmail.DavGateway $1
+
+if [ -n "$JAVA_HOME" ]; then
+  JAVA_CMD="$JAVA_HOME/bin/java"
+else
+  JAVA_CMD="$(which java)"
+fi
+
+for i in $BASE/lib/*; do
+  export CLASSPATH=$CLASSPATH:$i;
+done
+
+exec $JAVA_CMD -Xmx512M -Dsun.net.inetaddr.ttl=60 -cp $BASE/davmail.jar:$CLASSPATH davmail.DavGateway $1
diff --git a/network/dbmail/README b/network/dbmail/README
deleted file mode 100644
index de191faa2d..0000000000
--- a/network/dbmail/README
+++ /dev/null
@@ -1,21 +0,0 @@
-DBMail - Fast and scalable sql based email services. It's distributed under
-terms of GNU GPLv2.
-
-This DBMail build assume to work with MySQL/MariaDB or SQLite, as storage
-backends, because both of them are included in Slackware. Authentication
-backend can be either SQL or LDAP. On frontend side IMAP4, POP3, SIEVE
-protocols are supported. MTA communication can be performed via LMTP or
-local client - dbmail-deliver. There is an http API daemon to perform
-server administration. Admin tasks can also be performed via cli tools.
-
-For MySQL/MariaDB backend you should create database, user with password and
-grant this user all privilegies on created database. Then you should create
-tables via command
-
-'mysql DATABASE -u user -p password < /usr/doc/dbmail-*/create_tables.mysql'.
-
-This user, password and database must be mentioned in /etc/dbmail/dbmail.conf
-in apropriate places.
-
-More information about setup DBMail in different configuration environments
-you can get at http://www.dbmail.org/dokuwiki/doku.php.
diff --git a/network/dbmail/create_tables.mysql b/network/dbmail/create_tables.mysql
deleted file mode 100644
index de035154eb..0000000000
--- a/network/dbmail/create_tables.mysql
+++ /dev/null
@@ -1,467 +0,0 @@
--- dbmail mysql schema
---
--- Copyright (c) 2006 Aaron Stone, aaron@serendipity.cx
--- Copyright (c) 2004-2014, NFG Net Facilities Group BV, support@nfg.nl
--- 
--- 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., 675 Mass Ave, Cambridge, MA 02139, USA.
--- 
-
-
--- Make sure our database is set for utf8
-ALTER DATABASE CHARACTER SET utf8;
-
-SET FOREIGN_KEY_CHECKS=0;
---
--- Table structure for table `dbmail_acl`
---
-
-DROP TABLE IF EXISTS `dbmail_authlog`;
-CREATE TABLE `dbmail_authlog` (
-  `id` bigint(20) UNSIGNED NOT NULL auto_increment,
-  `userid` varchar(100) default NULL,
-  `service` varchar(32) default NULL,
-  `login_time` datetime default NULL,
-  `logout_time` datetime default NULL,
-  `src_ip` varchar(16) default NULL,
-  `src_port` int(11) default NULL,
-  `dst_ip` varchar(16) default NULL,
-  `dst_port` int(11) default NULL,
-  `status` varchar(32) default 'active',
-  `bytes_rx` bigint(20) NOT NULL default '0',
-  `bytes_tx` bigint(20) NOT NULL default '0',
-  PRIMARY KEY  (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-
-
---
--- Table structure for table `dbmail_acl`
---
-
-DROP TABLE IF EXISTS `dbmail_acl`;
-CREATE TABLE `dbmail_acl` (
-  `user_id` bigint(20) UNSIGNED NOT NULL default '0',
-  `mailbox_id` bigint(20) UNSIGNED NOT NULL default '0',
-  `lookup_flag` tinyint(1) NOT NULL default '0',
-  `read_flag` tinyint(1) NOT NULL default '0',
-  `seen_flag` tinyint(1) NOT NULL default '0',
-  `write_flag` tinyint(1) NOT NULL default '0',
-  `insert_flag` tinyint(1) NOT NULL default '0',
-  `post_flag` tinyint(1) NOT NULL default '0',
-  `create_flag` tinyint(1) NOT NULL default '0',
-  `delete_flag` tinyint(1) NOT NULL default '0',
-  `deleted_flag` tinyint(1) NOT NULL default '0',
-  `expunge_flag` tinyint(1) NOT NULL default '0',
-  `administer_flag` tinyint(1) NOT NULL default '0',
-  PRIMARY KEY  (`user_id`,`mailbox_id`),
-  KEY `user_id_index` (`user_id`),
-  KEY `mailbox_id_index` (`mailbox_id`),
-  CONSTRAINT `dbmail_acl_ibfk_1` FOREIGN KEY (`user_id`) REFERENCES `dbmail_users` (`user_idnr`) ON DELETE CASCADE ON UPDATE CASCADE,
-  CONSTRAINT `dbmail_acl_ibfk_2` FOREIGN KEY (`mailbox_id`) REFERENCES `dbmail_mailboxes` (`mailbox_idnr`) ON DELETE CASCADE ON UPDATE CASCADE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-
---
--- Table structure for table `dbmail_aliases`
---
-
-DROP TABLE IF EXISTS `dbmail_aliases`;
-CREATE TABLE `dbmail_aliases` (
-  `alias_idnr` bigint(20) UNSIGNED NOT NULL auto_increment,
-  `alias` varchar(255) NOT NULL default '',
-  `deliver_to` varchar(255) NOT NULL default '',
-  `client_idnr` bigint(20) UNSIGNED NOT NULL default '0',
-  PRIMARY KEY  (`alias_idnr`),
-  KEY `alias_index` (`alias`),
-  KEY `client_idnr_index` (`client_idnr`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-
---
--- Table structure for table `dbmail_envelope`
---
-
-DROP TABLE IF EXISTS `dbmail_envelope`;
-CREATE TABLE `dbmail_envelope` (
-  `id` bigint(20) UNSIGNED NOT NULL auto_increment,
-  `physmessage_id` bigint(20) UNSIGNED NOT NULL default '0',
-  `envelope` text NOT NULL,
-  PRIMARY KEY  (`id`),
-  UNIQUE KEY `physmessage_id_1` (`physmessage_id`),
-  UNIQUE KEY `physmessage_id_2` (`physmessage_id`,`id`),
-  CONSTRAINT `dbmail_envelope_ibfk_1` FOREIGN KEY (`physmessage_id`) REFERENCES `dbmail_physmessage` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-
---
--- Table structure for table `dbmail_filters`
---
-
-DROP TABLE IF EXISTS `dbmail_filters`;
-CREATE TABLE `dbmail_filters` (
-  `id` bigint(20) UNSIGNED NOT NULL auto_increment,
-  `user_id` bigint(20) UNSIGNED NOT NULL,
-  `headername` varchar(255) NOT NULL,
-  `headervalue` varchar(255) NOT NULL,
-  `mailbox` varchar(255) NOT NULL,
-  PRIMARY KEY  (`id`),
-  KEY `user_id` (`user_id`),
-  CONSTRAINT `dbmail_filters_ibfk_1` FOREIGN KEY (`user_id`) REFERENCES `dbmail_users` (`user_idnr`) ON DELETE CASCADE ON UPDATE CASCADE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-
---
--- Table structure for table `dbmail_header`
---
-
-DROP TABLE IF EXISTS `dbmail_header`;
-CREATE TABLE `dbmail_header` (
-  `physmessage_id` bigint(20) UNSIGNED NOT NULL,
-  `headername_id` bigint(20) UNSIGNED NOT NULL,
-  `headervalue_id` bigint(20) UNSIGNED NOT NULL,
-  PRIMARY KEY  (`physmessage_id`,`headername_id`,`headervalue_id`),
-  KEY `physmessage_id` (`physmessage_id`),
-  KEY `headername_id` (`headername_id`),
-  KEY `headervalue_id` (`headervalue_id`),
-  KEY `physmessage_id_headername_id` (`physmessage_id`,`headername_id`),
-  KEY `physmessage_id_headervalue_id` (`physmessage_id`,`headervalue_id`),
-  KEY `headername_id_headervalue_id` (`headername_id`,`headervalue_id`),
-  CONSTRAINT `dbmail_header_ibfk_1` FOREIGN KEY (`physmessage_id`) REFERENCES `dbmail_physmessage` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
-  CONSTRAINT `dbmail_header_ibfk_2` FOREIGN KEY (`headername_id`) REFERENCES `dbmail_headername` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
-  CONSTRAINT `dbmail_header_ibfk_3` FOREIGN KEY (`headervalue_id`) REFERENCES `dbmail_headervalue` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-
---
--- Table structure for table `dbmail_headername`
---
-
-DROP TABLE IF EXISTS `dbmail_headername`;
-CREATE TABLE `dbmail_headername` (
-  `id` bigint(20) UNSIGNED NOT NULL auto_increment,
-  `headername` varchar(255) NOT NULL default '',
-  PRIMARY KEY  (`id`),
-  UNIQUE KEY `headername` (`headername`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-
---
--- Table structure for table `dbmail_headervalue`
---
-
-DROP TABLE IF EXISTS `dbmail_headervalue`;
-CREATE TABLE `dbmail_headervalue` (
-  `id` bigint(20) UNSIGNED NOT NULL auto_increment,
-  `hash` varchar(255) NOT NULL,
-  `headervalue` text NOT NULL,
-  `sortfield` varchar(255) default NULL,
-  `datefield` datetime default NULL,
-  PRIMARY KEY  (`id`),
-  KEY `hash` (`hash`),
-  KEY `headervalue` (`headervalue`(255)),
-  KEY `sortfield` (`sortfield`),
-  KEY `datefield` (`datefield`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-
-
---
--- Table structure for table `dbmail_keywords`
---
-
-DROP TABLE IF EXISTS `dbmail_keywords`;
-CREATE TABLE `dbmail_keywords` (
-  `message_idnr` bigint(20) UNSIGNED NOT NULL default '0',
-  `keyword` varchar(255) NOT NULL,
-  PRIMARY KEY  (`message_idnr`,`keyword`),
-  CONSTRAINT `dbmail_keywords_ibfk_1` FOREIGN KEY (`message_idnr`) REFERENCES `dbmail_messages` (`message_idnr`) ON DELETE CASCADE ON UPDATE CASCADE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-
---
--- Table structure for table `dbmail_mailboxes`
---
-
-DROP TABLE IF EXISTS `dbmail_mailboxes`;
-CREATE TABLE `dbmail_mailboxes` (
-  `mailbox_idnr` bigint(20) UNSIGNED NOT NULL auto_increment,
-  `owner_idnr` bigint(20) UNSIGNED NOT NULL default '0',
-  `name` varchar(255) NOT NULL default '',
-  `seen_flag` tinyint(1) NOT NULL default '0',
-  `answered_flag` tinyint(1) NOT NULL default '0',
-  `deleted_flag` tinyint(1) NOT NULL default '0',
-  `flagged_flag` tinyint(1) NOT NULL default '0',
-  `recent_flag` tinyint(1) NOT NULL default '0',
-  `draft_flag` tinyint(1) NOT NULL default '0',
-  `no_inferiors` tinyint(1) NOT NULL default '0',
-  `no_select` tinyint(1) NOT NULL default '0',
-  `permission` tinyint(1) default '2',
-  `seq` bigint(20) NOT NULL default '0',
-  PRIMARY KEY  (`mailbox_idnr`),
-  UNIQUE KEY `owner_idnr_name_index` (`owner_idnr`,`name`),
-  KEY `name_index` (`name`),
-  KEY `owner_idnr_index` (`owner_idnr`),
-  KEY `seq_index` (`seq`),
-  CONSTRAINT `dbmail_mailboxes_ibfk_1` FOREIGN KEY (`owner_idnr`) REFERENCES `dbmail_users` (`user_idnr`) ON DELETE CASCADE ON UPDATE CASCADE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-
---
--- Table structure for table `dbmail_messages`
---
-
-DROP TABLE IF EXISTS `dbmail_messages`;
-CREATE TABLE `dbmail_messages` (
-  `message_idnr` bigint(20) UNSIGNED NOT NULL auto_increment,
-  `mailbox_idnr` bigint(20) UNSIGNED NOT NULL default '0',
-  `physmessage_id` bigint(20) UNSIGNED NOT NULL default '0',
-  `seen_flag` tinyint(1) NOT NULL default '0',
-  `answered_flag` tinyint(1) NOT NULL default '0',
-  `deleted_flag` tinyint(1) NOT NULL default '0',
-  `flagged_flag` tinyint(1) NOT NULL default '0',
-  `recent_flag` tinyint(1) NOT NULL default '0',
-  `draft_flag` tinyint(1) NOT NULL default '0',
-  `unique_id` varchar(70) NOT NULL default '',
-  `status` tinyint(3) unsigned NOT NULL default '0',
-  PRIMARY KEY  (`message_idnr`),
-  KEY `physmessage_id_index` (`physmessage_id`),
-  KEY `mailbox_idnr_index` (`mailbox_idnr`),
-  KEY `seen_flag_index` (`seen_flag`),
-  KEY `unique_id_index` (`unique_id`),
-  KEY `status_index` (`status`),
-  KEY `mailbox_status` (`mailbox_idnr`,`status`),
-  CONSTRAINT `dbmail_messages_ibfk_1` FOREIGN KEY (`physmessage_id`) REFERENCES `dbmail_physmessage` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
-  CONSTRAINT `dbmail_messages_ibfk_2` FOREIGN KEY (`mailbox_idnr`) REFERENCES `dbmail_mailboxes` (`mailbox_idnr`) ON DELETE CASCADE ON UPDATE CASCADE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-
---
--- Table structure for table `dbmail_mimeparts`
---
-
-DROP TABLE IF EXISTS `dbmail_mimeparts`;
-CREATE TABLE `dbmail_mimeparts` (
-  `id` bigint(20) UNSIGNED NOT NULL auto_increment,
-  `hash` char(128) NOT NULL,
-  `data` longblob NOT NULL,
-  `size` bigint(20) NOT NULL default '0',
-  PRIMARY KEY  (`id`),
-  KEY `hash` (`hash`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-
---
--- Table structure for table `dbmail_partlists`
---
-
-DROP TABLE IF EXISTS `dbmail_partlists`;
-CREATE TABLE `dbmail_partlists` (
-  `physmessage_id` bigint(20) UNSIGNED NOT NULL default '0',
-  `is_header` tinyint(1) NOT NULL default '0',
-  `part_key` smallint(6) NOT NULL default '0',
-  `part_depth` smallint(6) NOT NULL default '0',
-  `part_order` smallint(6) NOT NULL default '0',
-  `part_id` bigint(20) UNSIGNED NOT NULL default '0',
-  KEY `physmessage_id` (`physmessage_id`),
-  KEY `part_id` (`part_id`),
-  UNIQUE KEY `message_parts` (`physmessage_id`,`part_key`,`part_depth`,`part_order`),
-  CONSTRAINT `dbmail_partlists_ibfk_1` FOREIGN KEY (`physmessage_id`) REFERENCES `dbmail_physmessage` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
-  CONSTRAINT `dbmail_partlists_ibfk_2` FOREIGN KEY (`part_id`) REFERENCES `dbmail_mimeparts` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-
---
--- Table structure for table `dbmail_pbsp`
---
-
-DROP TABLE IF EXISTS `dbmail_pbsp`;
-CREATE TABLE `dbmail_pbsp` (
-  `idnr` bigint(20) UNSIGNED NOT NULL auto_increment,
-  `since` datetime NOT NULL default '0000-00-00 00:00:00',
-  `ipnumber` varchar(40) NOT NULL,
-  PRIMARY KEY  (`idnr`),
-  UNIQUE KEY `ipnumber_index` (`ipnumber`),
-  KEY `since_index` (`since`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-
---
--- Table structure for table `dbmail_physmessage`
---
-
-DROP TABLE IF EXISTS `dbmail_physmessage`;
-CREATE TABLE `dbmail_physmessage` (
-  `id` bigint(20) UNSIGNED NOT NULL auto_increment,
-  `messagesize` bigint(20) UNSIGNED NOT NULL default '0',
-  `rfcsize` bigint(20) UNSIGNED NOT NULL default '0',
-  `internal_date` datetime NOT NULL default '0000-00-00 00:00:00',
-  PRIMARY KEY  (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-
---
--- Table structure for table `dbmail_referencesfield`
---
-
-DROP TABLE IF EXISTS `dbmail_referencesfield`;
-CREATE TABLE `dbmail_referencesfield` (
-  `id` bigint(20) UNSIGNED NOT NULL auto_increment,
-  `physmessage_id` bigint(20) UNSIGNED NOT NULL default '0',
-  `referencesfield` varchar(255) NOT NULL default '',
-  PRIMARY KEY  (`id`),
-  UNIQUE KEY `physmessage_id` (`physmessage_id`,`referencesfield`),
-  CONSTRAINT `dbmail_referencesfield_ibfk_1` FOREIGN KEY (`physmessage_id`) REFERENCES `dbmail_physmessage` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-
---
--- Table structure for table `dbmail_replycache`
---
-
-DROP TABLE IF EXISTS `dbmail_replycache`;
-CREATE TABLE `dbmail_replycache` (
-  `to_addr` varchar(255) NOT NULL default '',
-  `from_addr` varchar(255) NOT NULL default '',
-  `handle` varchar(255) NOT NULL default '',
-  `lastseen` datetime NOT NULL default '0000-00-00 00:00:00',
-  UNIQUE KEY `replycache_1` (`to_addr`,`from_addr`,`handle`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-
---
--- Table structure for table `dbmail_sievescripts`
---
-
-DROP TABLE IF EXISTS `dbmail_sievescripts`;
-CREATE TABLE `dbmail_sievescripts` (
-  `owner_idnr` bigint(20) UNSIGNED NOT NULL default '0',
-  `name` varchar(255) NOT NULL,
-  `script` text,
-  `active` tinyint(1) NOT NULL default '0',
-  UNIQUE KEY `owner_idnr_2` (`owner_idnr`,`name`),
-  KEY `name` (`name`),
-  KEY `owner_idnr` (`owner_idnr`),
-  CONSTRAINT `dbmail_sievescripts_ibfk_1` FOREIGN KEY (`owner_idnr`) REFERENCES `dbmail_users` (`user_idnr`) ON DELETE CASCADE ON UPDATE CASCADE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-
---
--- Table structure for table `dbmail_subscription`
---
-
-DROP TABLE IF EXISTS `dbmail_subscription`;
-CREATE TABLE `dbmail_subscription` (
-  `user_id` bigint(20) UNSIGNED NOT NULL default '0',
-  `mailbox_id` bigint(20) UNSIGNED NOT NULL default '0',
-  PRIMARY KEY  (`user_id`,`mailbox_id`),
-  KEY `user_id_index` (`user_id`),
-  KEY `mailbox_id_index` (`mailbox_id`),
-  CONSTRAINT `dbmail_subscription_ibfk_1` FOREIGN KEY (`user_id`) REFERENCES `dbmail_users` (`user_idnr`) ON DELETE CASCADE ON UPDATE CASCADE,
-  CONSTRAINT `dbmail_subscription_ibfk_2` FOREIGN KEY (`mailbox_id`) REFERENCES `dbmail_mailboxes` (`mailbox_idnr`) ON DELETE CASCADE ON UPDATE CASCADE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-
---
--- Table structure for table `dbmail_usermap`
---
-
-DROP TABLE IF EXISTS `dbmail_usermap`;
-CREATE TABLE `dbmail_usermap` (
-  `login` varchar(255) NOT NULL,
-  `sock_allow` varchar(255) NOT NULL,
-  `sock_deny` varchar(255) NOT NULL,
-  `userid` varchar(255) NOT NULL,
-  UNIQUE KEY `usermap_idx_1` (`login`,`sock_allow`,`userid`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-
---
--- Table structure for table `dbmail_users`
---
-
-DROP TABLE IF EXISTS `dbmail_users`;
-CREATE TABLE `dbmail_users` (
-  `user_idnr` bigint(20) UNSIGNED NOT NULL auto_increment,
-  `userid` varchar(255) NOT NULL default '',
-  `passwd` varchar(255) NOT NULL default '',
-  `client_idnr` bigint(20) UNSIGNED NOT NULL default '0',
-  `maxmail_size` bigint(20) NOT NULL default '0',
-  `curmail_size` bigint(20) NOT NULL default '0',
-  `maxsieve_size` bigint(20) NOT NULL default '0',
-  `cursieve_size` bigint(20) NOT NULL default '0',
-  `encryption_type` varchar(255) NOT NULL default '',
-  `last_login` datetime NOT NULL default '1979-11-03 22:05:58',
-  PRIMARY KEY  (`user_idnr`),
-  UNIQUE KEY `userid_index` (`userid`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-
-DROP TABLE IF EXISTS dbmail_auto_notifications;                                                                                                                                        
-CREATE TABLE dbmail_auto_notifications (
-        user_idnr bigint(20) UNSIGNED NOT NULL,
-        notify_address varchar(100) NOT NULL default '',
-        INDEX user_idnr_index (user_idnr),
-        FOREIGN KEY user_idnr_fk (user_idnr)
-                REFERENCES dbmail_users (user_idnr) ON DELETE CASCADE ON UPDATE CASCADE
-) ENGINE InnoDB DEFAULT CHARSET=utf8;
-                             
-DROP TABLE IF EXISTS dbmail_auto_replies;
-CREATE TABLE dbmail_auto_replies (
-        user_idnr bigint(20) UNSIGNED DEFAULT '0' NOT NULL,
-        start_date DATETIME NOT NULL,
-        stop_date DATETIME NOT NULL,
-        reply_body MEDIUMTEXT,
-        INDEX user_idnr_index (user_idnr),
-        FOREIGN KEY user_idnr_fk2 (user_idnr)
-                REFERENCES dbmail_users (user_idnr) ON DELETE CASCADE ON UPDATE CASCADE
-) ENGINE InnoDB DEFAULT CHARSET=utf8;
-                             
---
--- views for IMAP sort
---
-
-DROP VIEW IF EXISTS dbmail_fromfield;
-CREATE VIEW dbmail_fromfield AS 
-	SELECT physmessage_id,sortfield AS fromfield 
-	FROM dbmail_messages m 
-	JOIN dbmail_header h USING (physmessage_id) 
-	JOIN dbmail_headername n ON h.headername_id = n.id 
-	JOIN dbmail_headervalue v ON h.headervalue_id = v.id 
-WHERE n.headername='from';
-
-DROP VIEW IF EXISTS dbmail_ccfield;
-CREATE VIEW dbmail_ccfield AS 
-	SELECT physmessage_id,sortfield AS ccfield 
-	FROM dbmail_messages m 
-	JOIN dbmail_header h USING (physmessage_id) 
-	JOIN dbmail_headername n ON h.headername_id = n.id 
-	JOIN dbmail_headervalue v ON h.headervalue_id = v.id 
-WHERE n.headername='cc';
-
-DROP VIEW IF EXISTS dbmail_tofield;
-CREATE VIEW dbmail_tofield AS 
-	SELECT physmessage_id,sortfield AS tofield 
-	FROM dbmail_messages m 
-	JOIN dbmail_header h USING (physmessage_id) 
-	JOIN dbmail_headername n ON h.headername_id = n.id 
-	JOIN dbmail_headervalue v ON h.headervalue_id = v.id 
-WHERE n.headername='to';
-
-DROP VIEW IF EXISTS dbmail_subjectfield;
-CREATE VIEW dbmail_subjectfield AS 
-	SELECT physmessage_id,headervalue AS subjectfield 
-	FROM dbmail_messages m 
-	JOIN dbmail_header h USING (physmessage_id) 
-	JOIN dbmail_headername n ON h.headername_id = n.id 
-	JOIN dbmail_headervalue v ON h.headervalue_id = v.id 
-WHERE n.headername='subject';
-
-DROP VIEW IF EXISTS dbmail_datefield;
-CREATE VIEW dbmail_datefield AS 
-	SELECT physmessage_id,datefield,sortfield
-	FROM dbmail_messages m 
-	JOIN dbmail_header h USING (physmessage_id) 
-	JOIN dbmail_headername n ON h.headername_id = n.id 
-	JOIN dbmail_headervalue v ON h.headervalue_id = v.id 
-WHERE n.headername='date';
-
-
-
--- Create the required built-in users for the delivery chain, anyone acls, and #public mailboxes
-INSERT INTO dbmail_users (userid, passwd, encryption_type) VALUES 
-	('__@!internal_delivery_user!@__', '', 'md5'),
-	('anyone', '', 'md5'),
-	('__public__', '', 'md5');
-
diff --git a/network/dbmail/dbmail.SlackBuild b/network/dbmail/dbmail.SlackBuild
deleted file mode 100644
index 16a6fa7f4f..0000000000
--- a/network/dbmail/dbmail.SlackBuild
+++ /dev/null
@@ -1,120 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for dbmail
-
-# Copyright 2018 Sergei Fedosoff eleksir@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=dbmail
-VERSION=${VERSION:-3.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}
-
-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" \
-./configure \
-  --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --sysconfdir=/etc/dbmail \
-  --localstatedir=/var \
-  --mandir=/usr/man \
-  --docdir=/usr/doc/$PRGNAM-$VERSION \
-  --enable-shared \
-  --enable-manpages \
-  --with-logdir \
-  --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
-
-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/dbmail
-cat $CWD/dbmail.conf > $PKG/etc/dbmail/dbmail.conf.new
-
-mkdir -p $PKG/etc/cron.daily
-install --mode=0755 $CWD/dbmail.cron $PKG/etc/cron.daily/dbmail.new
-
-mkdir -p $PKG/etc/logrotate.d
-cat $CWD/dbmail.logrotate > $PKG/etc/logrotate.d/dbmail.new
-
-mkdir -p $PKG/etc/rc.d
-cat $CWD/rc.dbmail-httpd.new > $PKG/etc/rc.d/rc.dbmail-httpd.new
-cat $CWD/rc.dbmail-imapd.new > $PKG/etc/rc.d/rc.dbmail-imapd.new
-cat $CWD/rc.dbmail-lmtpd.new > $PKG/etc/rc.d/rc.dbmail-lmtpd.new
-cat $CWD/rc.dbmail-pop3d.new > $PKG/etc/rc.d/rc.dbmail-pop3d.new
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS BUGS COPYING INSTALL README.md THANKS $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-cat $CWD/create_tables.mysql > $PKG/usr/doc/$PRGNAM-$VERSION/create_tables.mysql
-
-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/network/dbmail/dbmail.conf b/network/dbmail/dbmail.conf
deleted file mode 100644
index 3523bc8257..0000000000
--- a/network/dbmail/dbmail.conf
+++ /dev/null
@@ -1,426 +0,0 @@
-# (c) 2000-2006 IC&S, The Netherlands
-#
-# Configuration file for DBMAIL
-
-[DBMAIL]
-#
-# Database settings
-#
-# database connection URI
-#dburi                = sqldriver://username:password@hostname:port/db_name
-#dburi                = sqlite:///var/tmp/dbmail.db
-#dburi                = mysql://dbmail:dbmail@localhost:3306/dbmail
-dburi                = mysql://dbmail:dbmail@localhost/dbmail?unix-socket=/var/run/mysql/mysql.sock&charset=utf8
-
-#
-# following fields are now DEPRECATED!
-#driver               = mysql
-#host                 = localhost
-#sqlport              = 3306
-#sqlsocket            = /var/run/mysql/mysql.sock
-#user                 = dbmail
-#pass                 = dbmail
-#db                   = dbmail
-#encoding             = utf8
-
-#
-# Number of database connections per threaded daemon
-# This also determines the size of the worker threadpool
-#
-# Do NOT increase this without proper consideration. A
-# very large database/worker pool will not only increase
-# the connection pressure on the database, but will more
-# significantly cause unnecessary context-switching in
-# your CPUs.
-#
-max_db_connections   = 4
-
-#
-# Table prefix. Defaults to "dbmail_" if not specified.
-#
-table_prefix         = dbmail_
-
-#
-# Supported drivers are sql, ldap.
-#
-authdriver           = sql
-
-#
-# messages with unknown encoding will be assumed to have
-# default_msg_encoding
-# i.e. iso8859-1, utf8
-default_msg_encoding = utf8
-
-#
-# Postmaster's email address for use in bounce messages.
-#
-postmaster           = MAILER-DAEMON
-
-#
-# Sendmail executable for forwards, replies, notifies, vacations.
-# You may use pipes (|) in this command, for example:
-# dos2unix|/usr/sbin/sendmail  works well with Qmail.
-# You may use quotes (") for executables with unusual names.
-#
-sendmail              = /usr/sbin/sendmail
-
-#
-#
-# The following items can be overridden in the service-specific sections.
-#
-#
-
-#
-# Logging via stderr/log file and syslog
-#
-# Logging is broken up into 8 logging levels and each level can be indivually turned on or off.
-# The Stderr/log file logs all entries to stderr or the log file.
-# Syslog logging uses the facility mail and the logging level of the event for logging.
-# Syslog can then be configured to log data according to the levels.
-#
-# Set the log level to the sum of the values next to the levels you want to record.
-#   1 = Emergency
-#   2 = Alert
-#   4 = Critical
-#   8 = Error
-#  16 = Warning
-#  32 = Notice
-#  64 = Info
-# 128 = Debug
-# 256 = Database -> Logs at debug level
-#
-# Examples:   0 = Nothing
-#            31 = Emergency + Alert + Critical + Error + Warning
-#           511 = Everything
-#
-file_logging_levels       = 1
-#
-syslog_logging_levels     = 30
-
-#
-# Generate a log entry for database queries for the log level at number of seconds of query execution time.
-#
-query_time_info       = 10
-query_time_notice     = 20
-query_time_warning    = 30
-
-#
-# Throw an exception is the query takes longer than query_timeout seconds
-query_timeout         = 300
-
-#
-# Root privs are used to open a port, then privs
-# are dropped down to the user/group specified here.
-#
-effective_user        = mail
-effective_group       = mail
-
-#
-# The IPv4 and/or IPv6 addresses the services will bind to.
-# Use * for all local interfaces.
-# Use 127.0.0.1 for localhost only.
-# Separate multiple entries with spaces ( ) or commas (,).
-#
-bindip                = 0.0.0.0		# IPv4 only - all IP's
-#bindip                = ::		# IPv4 and IPv6 - all IP's (linux)
-#bindip                = ::		# IPv6 only - all IP's (BSD)
-#bindip                = 0.0.0.0,::	# IPv4 and IPv6 - all IP's (BSD)
-
-
-#
-# The maximum length of the queue of pending connections. See
-# listen(2) for more information
-#
-backlog              = 128
-
-#
-# Idle time allowed before a connection is shut off.
-#
-timeout               = 300
-
-#
-# Idle time allowed before a connection is shut off if you have not logged in yet.
-#
-login_timeout         = 60
-
-#
-# If yes, resolves IP addresses to DNS names when logging.
-#
-resolve_ip            = no
-
-#
-# If yes, keep statistics in the authlog table for connecting users
-#
-authlog               = no
-
-#
-# logfile for stdout messages
-#
-logfile               = /var/log/dbmail.log
-
-#
-# logfile for stderr messages
-#
-errorlog              = /var/log/dbmail.err
-
-#
-# directory for storing PID files
-#
-pid_directory         = /var/run/dbmail
-
-#
-# directory for locating libraries (normally has a sane default compiled-in)
-#
-#library_directory       = /usr/lib/dbmail
-
-#
-# SSL/TLS certificates
-#
-# A file containing a list of CAs in PEM format
-tls_cafile            =
-
-# A file containing a PEM format certificate
-tls_cert              =
-
-# A file containing a PEM format RSA or DSA key
-tls_key               =
-
-# A cipher list string in the format given in ciphers(1)
-tls_ciphers           =
-
-
-# hashing algorithm. You can select your favorite hash type
-# for generating unique ids for message parts.
-#
-# for valid values check mhash(3) but minus the MHASH_ prefix.
-#
-# if you ever change this value run 'dbmail-util --rehash' to
-# update the hash for all mimeparts.
-#
-# examples: MD5, SHA1, SHA256, SHA512, TIGER, WHIRLPOOL
-#
-hash_algorithm = SHA256
-
-
-# header_cache tuning
-#
-# set header_cache_readonly to 'yes' to prevent new
-# unknown header-names from being cached.
-#
-# header_cache_readonly = yes
-
-
-
-[LMTP]
-port                  = 24
-bindip                = 127.0.0.1
-#tls_port              =
-banner                = LMTP server ready.
-
-[POP]
-port                  = 110
-#tls_port              = 995
-
-# You can set an alternate banner to display when connecting to the service
-banner                = POP3 server ready.
-
-#
-# If yes, allows SMTP access from the host IP connecting by POP3.
-# This requires addition configuration of your MTA
-#
-pop_before_smtp       = no
-
-[HTTP]
-port                  = 41380
-#
-# the httpd daemon provides full access to all users, mailboxes
-# and messages. Be very careful with this one!
-bindip                = 127.0.0.1
-admin                 = admin:secret
-
-[IMAP]
-# You can set an alternate banner to display when connecting to the service
-# banner = imap 4r1 server (dbmail 2.3.x)
-
-#
-# Port to bind to.
-#
-port                  = 143
-#tls_port              = 993
-
-banner                = IMAP server ready.
- 
-#
-# IMAP prefers a longer timeout than other services.
-#
-timeout               = 4000
-
-#
-# If yes, allows SMTP access from the host IP connecting by IMAP.
-# This requires addition configuration of your MTA
-#
-imap_before_smtp      = no
-
-#
-# during IDLE, how many seconds between checking the mailbox
-# status (default: 30)
-#
-# idle_timeout          = 30
-
-# during IDLE, how often should the server send an '* OK' still
-# here message (default: 10)
-#
-# the time between such a message is idle_timeout * idle_interval
-# seconds
-#
-# idle_interval         = 10
-
-#
-# If TLS is enabled, login before starttls is normally
-# not allowed. Use login_disabled=no to change this
-#
-# login_disabled        = yes
-
-#
-# Provide a CAPABILITY to override the default
-#
-# capability 		= IMAP4 IMAP4rev1 AUTH=LOGIN ACL RIGHTS=texk NAMESPACE CHILDREN SORT QUOTA THREAD=ORDEREDSUBJECT UNSELECT IDLE
-
-# max message size. You can specify the maximum message size
-# accepted by the IMAP daemon during APPEND commands.
-#
-# Supported formats:
-#  decimal: 1000000
-#  octal:   03777777
-#  hex:     0xfffff
-#
-# max_message_size      =
-
-
-[SIEVE]
-#
-# Port to bind to.
-#
-port                  = 2000
-tls_port              =
-banner                = SIEVE server ready.
-
-
-[LDAP]
-#port                  = 389
-#version               = 3
-#hostname              = ldap
-#base_dn               = ou=People,dc=mydomain,dc=com
-
-#
-# If your LDAP library supports ldap_initialize(), then you can use the
-# alternative LDAP server DSN like following.
-#
-# URI                = ldap://127.0.0.1:389
-# URI                = ldapi://%2fvar%2frun%2fopenldap%2fldapi/
-
-#
-# Leave blank for anonymous bind.
-# example: cn=admin,dc=mydomain,dc=com
-#
-#bind_dn               =
-
-#
-# Leave blank for anonymous bind.
-#
-#bind_pw               =
-#scope                 = SubTree
-
-# AD users may want to set this to 'no' to disable
-# ldap referrals if you are seeing 'Operations errors'
-# in your logs
-#
-#referrals             = yes
-
-#user_objectclass      = top,account,dbmailUser
-#forw_objectclass      = top,account,dbmailForwardingAddress
-#cn_string             = uid
-#field_passwd          = userPassword
-#field_uid             = uid
-#field_nid             = uidNumber
-#min_nid               = 10000
-#max_nid               = 15000
-#field_cid             = gidNumber
-#min_cid               = 10000
-#max_cid               = 15000
-
-# a comma-separated list of attributes to match when searching
-# for users or forwards that match a delivery address. A match
-# on any of them is a hit.
-field_mail            = mail
-
-# field that holds the mail-quota size for a user.
-field_quota           = mailQuota
-
-# field that holds the forwarding address.
-field_fwdtarget       = mailForwardingAddress
-
-# override the query string used to search for users
-# or forwards with a delivery address.
-# query_string          = (mail=%s)
-
-[DELIVERY]
-#
-# Run Sieve scripts as messages are delivered.
-#
-SIEVE                 = yes
-
-#
-# Use 'user+mailbox@domain' format to deliver to a mailbox.
-#
-SUBADDRESS            = yes
-
-#
-# Turn on/off the Sieve Vacation extension.
-#
-SIEVE_VACATION        = yes
-
-#
-# Turn on/off the Sieve Notify extension
-#
-SIEVE_NOTIFY          = yes
-
-#
-# Turn on/off additional Sieve debugging.
-#
-SIEVE_DEBUG           = no
-
-
-# Use the auto_notify table to send email notifications.
-#
-AUTO_NOTIFY           = no
-
-#
-# Use the auto_reply table to send away messages.
-#
-AUTO_REPLY            = no
-
-#
-# Defaults to "NEW MAIL NOTIFICATION"
-#
-#AUTO_NOTIFY_SUBJECT        =
-
-#
-# Defaults to POSTMASTER from the DBMAIL section.
-#
-#AUTO_NOTIFY_SENDER        =
-
-
-# If you set this to 'yes' dbmail will check for duplicate
-# messages in the relevant mailbox during delivery using
-# the Message-ID header
-#
-suppress_duplicates	= no
-
-#
-# Soft or hard bounce on over-quota delivery
-#
-quota_failure           = hard
-
-
-# end of configuration file
diff --git a/network/dbmail/dbmail.cron b/network/dbmail/dbmail.cron
deleted file mode 100644
index 3cf4e0cd95..0000000000
--- a/network/dbmail/dbmail.cron
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-# cleanup deleted messages
-if [ -x /usr/sbin/dbmail-util ]; then
-	/usr/sbin/dbmail-util -ay 2>&1 > /dev/null
-fi
-
diff --git a/network/dbmail/dbmail.info b/network/dbmail/dbmail.info
deleted file mode 100644
index a4c76dc6fe..0000000000
--- a/network/dbmail/dbmail.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="dbmail"
-VERSION="3.2.3"
-HOMEPAGE="http://www.dbmail.org/"
-DOWNLOAD="http://www.dbmail.org/download/3.2/dbmail-3.2.3.tar.gz"
-MD5SUM="4f140751642559395dfe3a6bb2cc9300"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="libzdb re2c"
-MAINTAINER="Sergei Fedosoff"
-EMAIL="eleksir@gmail.com"
diff --git a/network/dbmail/dbmail.logrotate b/network/dbmail/dbmail.logrotate
deleted file mode 100644
index 40538d5b65..0000000000
--- a/network/dbmail/dbmail.logrotate
+++ /dev/null
@@ -1,9 +0,0 @@
-/var/log/dbmail.log /var/log/dbmail.err {
-        daily
-        missingok
-        notifempty
-        rotate 10
-        compress
-        delaycompress
-        copytruncate
-}
diff --git a/network/dbmail/doinst.sh b/network/dbmail/doinst.sh
deleted file mode 100644
index a7859d0c35..0000000000
--- a/network/dbmail/doinst.sh
+++ /dev/null
@@ -1,29 +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 # 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.dbmail-httpd.new
-preserve_perms etc/rc.d/rc.dbmail-imapd.new
-preserve_perms etc/rc.d/rc.dbmail-lmtpd.new
-preserve_perms etc/rc.d/rc.dbmail-pop3d.new
-preserve_perms etc/cron.daily/dbmail.new
-config etc/dbmail/dbmail.conf.new
-config etc/logrotate.d/dbmail.new
-
diff --git a/network/dbmail/rc.dbmail-httpd.new b/network/dbmail/rc.dbmail-httpd.new
deleted file mode 100644
index a669475539..0000000000
--- a/network/dbmail/rc.dbmail-httpd.new
+++ /dev/null
@@ -1,54 +0,0 @@
-#!/bin/sh
-#
-# DBMail-httpd startup script for Slackware Linux
-
-SERVICE='/usr/sbin/dbmail-httpd'
-OPTS=''
-PIDDIR='/var/run/dbmail'
-PID="${PIDDIR}/dbmail-httpd.pid"
-USER='mail'
-GROUP='mail'
-
-service_start() {
-	if [ ! -d "$PIDDIR" ]; then
-		mkdir "$PIDDIR"
-		chown ${USER}:${GROUP} "$PIDDIR"
-	fi
-
-	if [ -f "$PID" ]; then
-		echo "PID-file exist, refusing to run ${SERVICE}."
-		exit 1
-	fi
-
-	$SERVICE "$OPTS"
-}
-
-service_stop() {
-	if [ -f "$PID" ]; then
-		kill $(< $PID)
-	else
-		echo "No PID-file at $PID found, quitting."
-		exit 1
-	fi
-}
-
-service_restart() {
-  service_stop
-  sleep 1
-  service_start
-}
-
-case "$1" in
-  start)
-    service_start
-    ;;
-  stop)
-    service_stop
-    ;;
-  restart)
-    service_restart
-    ;;
-  *)
-    echo "Usage: $0 {start|stop|restart}"
-    exit 1
-esac
diff --git a/network/dbmail/rc.dbmail-imapd.new b/network/dbmail/rc.dbmail-imapd.new
deleted file mode 100644
index 1324c74da6..0000000000
--- a/network/dbmail/rc.dbmail-imapd.new
+++ /dev/null
@@ -1,54 +0,0 @@
-#!/bin/sh
-#
-# DBMail-imapd startup script for Slackware Linux
-
-SERVICE='/usr/sbin/dbmail-imapd'
-OPTS=''
-PIDDIR='/var/run/dbmail'
-PID="${PIDDIR}/dbmail-imapd.pid"
-USER='mail'
-GROUP='mail'
-
-service_start() {
-	if [ ! -d "$PIDDIR" ]; then
-		mkdir "$PIDDIR"
-		chown ${USER}:${GROUP} "$PIDDIR"
-	fi
-
-	if [ -f "$PID" ]; then
-		echo "PID-file exist, refusing to run ${SERVICE}."
-		exit 1
-	fi
-
-	$SERVICE "$OPTS"
-}
-
-service_stop() {
-	if [ -f "$PID" ]; then
-		kill $(< $PID)
-	else
-		echo "No PID-file at $PID found, quitting."
-		exit 1
-	fi
-}
-
-service_restart() {
-  service_stop
-  sleep 1
-  service_start
-}
-
-case "$1" in
-  start)
-    service_start
-    ;;
-  stop)
-    service_stop
-    ;;
-  restart)
-    service_restart
-    ;;
-  *)
-    echo "Usage: $0 {start|stop|restart}"
-    exit 1
-esac
diff --git a/network/dbmail/rc.dbmail-lmtpd.new b/network/dbmail/rc.dbmail-lmtpd.new
deleted file mode 100644
index 34a633d865..0000000000
--- a/network/dbmail/rc.dbmail-lmtpd.new
+++ /dev/null
@@ -1,54 +0,0 @@
-#!/bin/sh
-#
-# DBMail-lmtpd startup script for Slackware Linux
-
-SERVICE='/usr/sbin/dbmail-lmtpd'
-OPTS=''
-PIDDIR='/var/run/dbmail'
-PID="${PIDDIR}/dbmail-lmtpd.pid"
-USER='mail'
-GROUP='mail'
-
-service_start() {
-	if [ ! -d "$PIDDIR" ]; then
-		mkdir "$PIDDIR"
-		chown ${USER}:${GROUP} "$PIDDIR"
-	fi
-
-	if [ -f "$PID" ]; then
-		echo "PID-file exist, refusing to run ${SERVICE}."
-		exit 1
-	fi
-
-	$SERVICE "$OPTS"
-}
-
-service_stop() {
-	if [ -f "$PID" ]; then
-		kill $(< $PID)
-	else
-		echo "No PID-file at $PID found, quitting."
-		exit 1
-	fi
-}
-
-service_restart() {
-  service_stop
-  sleep 1
-  service_start
-}
-
-case "$1" in
-  start)
-    service_start
-    ;;
-  stop)
-    service_stop
-    ;;
-  restart)
-    service_restart
-    ;;
-  *)
-    echo "Usage: $0 {start|stop|restart}"
-    exit 1
-esac
diff --git a/network/dbmail/rc.dbmail-pop3d.new b/network/dbmail/rc.dbmail-pop3d.new
deleted file mode 100644
index 6398c40c8f..0000000000
--- a/network/dbmail/rc.dbmail-pop3d.new
+++ /dev/null
@@ -1,54 +0,0 @@
-#!/bin/sh
-#
-# DBMail-pop3d startup script for Slackware Linux
-
-SERVICE='/usr/sbin/dbmail-pop3d'
-OPTS=''
-PIDDIR='/var/run/dbmail'
-PID="${PIDDIR}/dbmail-pop3d.pid"
-USER='mail'
-GROUP='mail'
-
-service_start() {
-	if [ ! -d "$PIDDIR" ]; then
-		mkdir "$PIDDIR"
-		chown ${USER}:${GROUP} "$PIDDIR"
-	fi
-
-	if [ -f "$PID" ]; then
-		echo "PID-file exist, refusing to run ${SERVICE}."
-		exit 1
-	fi
-
-	$SERVICE "$OPTS"
-}
-
-service_stop() {
-	if [ -f "$PID" ]; then
-		kill $(< $PID)
-	else
-		echo "No PID-file at $PID found, quitting."
-		exit 1
-	fi
-}
-
-service_restart() {
-  service_stop
-  sleep 1
-  service_start
-}
-
-case "$1" in
-  start)
-    service_start
-    ;;
-  stop)
-    service_stop
-    ;;
-  restart)
-    service_restart
-    ;;
-  *)
-    echo "Usage: $0 {start|stop|restart}"
-    exit 1
-esac
diff --git a/network/dbmail/slack-desc b/network/dbmail/slack-desc
deleted file mode 100644
index 366bf4b4b8..0000000000
--- a/network/dbmail/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------------------------------------------------------|
-dbmail: dbmail (IMAP and POP3 Server)
-dbmail:
-dbmail: Fast and scalable sql based email services.
-dbmail:
-dbmail:
-dbmail:
-dbmail:
-dbmail:
-dbmail:
-dbmail:
-dbmail: Homepage: http://dbmail.org/
diff --git a/network/dclib/README b/network/dclib/README
deleted file mode 100644
index 74f1b1c9fe..0000000000
--- a/network/dclib/README
+++ /dev/null
@@ -1,4 +0,0 @@
-dclib is a library of classes supporting valknut, a client
-for the Direct Connect network protocol. In addition to the
-protocol support there is storage of various user data,
-such as a database of shareable items and lists of items to download.
diff --git a/network/dclib/dclib-0.3.23.patch b/network/dclib/dclib-0.3.23.patch
deleted file mode 100644
index 49ca6c8840..0000000000
--- a/network/dclib/dclib-0.3.23.patch
+++ /dev/null
@@ -1,42 +0,0 @@
---- dclib/core/cssl.cpp	2009-01-07 23:13:52.000000000 +0100
-+++ dclib/core/cssl.cpp.new	2013-09-29 13:19:29.489059230 +0200
-@@ -86,10 +86,10 @@
- /** */
- SSL_CTX * CSSL::InitClientCTX()
- {
--	SSL_METHOD *method;
-+	const SSL_METHOD *method;
- 	SSL_CTX *ctx = NULL;
- 
--	method = SSLv23_client_method();		/* Create new client-method instance */
-+        method = SSLv23_client_method();		/* Create new client-method instance */
- 	
- 	// sanity check
- 	if ( method != NULL )
-@@ -109,7 +109,7 @@
- /** */
- SSL_CTX * CSSL::InitServerCTX()
- {
--	SSL_METHOD *method;
-+	const SSL_METHOD *method;
- 	SSL_CTX *ctx = NULL;
- 
- 	method = SSLv23_server_method();		/* Create new client-method instance */
-@@ -130,7 +130,7 @@
- /** */
- SSL_CTX * CSSL::NewTLSv1ClientCTX()
- {
--	SSL_METHOD * method = TLSv1_client_method();
-+	const SSL_METHOD * method = TLSv1_client_method();
- 	SSL_CTX * ctx = NULL;
- 	
- 	if ( method != NULL )
-@@ -149,7 +149,7 @@
- /** */
- SSL_CTX * CSSL::NewTLSv1ServerCTX()
- {
--	SSL_METHOD * method = TLSv1_server_method();
-+	const SSL_METHOD * method = TLSv1_server_method();
- 	SSL_CTX * ctx = NULL;
- 	
- 	if ( method != NULL )
diff --git a/network/dclib/dclib.SlackBuild b/network/dclib/dclib.SlackBuild
deleted file mode 100644
index 28794405c6..0000000000
--- a/network/dclib/dclib.SlackBuild
+++ /dev/null
@@ -1,99 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for dclib
-
-# Copyright 2014 Kevin Paulus <goarilla@gmail.com>, Belgium
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
-#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
-#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (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=dclib
-VERSION=${VERSION:-0.3.23}
-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 xjvf $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 {} \;
-
-# Patch
-patch < "$CWD"/dclib-0.3.23.patch dclib/core/cssl.cpp
-
-# Configure and build
-CFLAGS="$SLKCFLAGS" \
-./configure \
- --prefix=/usr \
- --libdir=/usr/lib"${LIBDIRSUFFIX}" \
- --mandir=/usr/man \
- --sysconfdir=/etc \
- --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 COPYING.OpenSSL 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
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/network/dclib/dclib.info b/network/dclib/dclib.info
deleted file mode 100644
index d4c4bf51c0..0000000000
--- a/network/dclib/dclib.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="dclib"
-VERSION="0.3.23"
-HOMEPAGE="http://wxdcgui.sourceforge.net"
-DOWNLOAD="http://downloads.sourceforge.net/project/wxdcgui/dclib/0.3.23/dclib-0.3.23.tar.bz2"
-MD5SUM="6852e420e48d09b514fcb9f783611cdc"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Kevin Paulus"
-EMAIL="goarilla@gmail.com"
diff --git a/network/dclib/slack-desc b/network/dclib/slack-desc
deleted file mode 100644
index c819a40a4f..0000000000
--- a/network/dclib/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------------------------------------------------------|
-dclib: dclib (Neomodus DC library)
-dclib:
-dclib: dclib is a library of classes supporting valknut, a client
-dclib: for the Direct Connect network protocol. In addition to the
-dclib: protocol support there is storage of various user data,
-dclib: such as a database of shareable items and lists of items to download.
-dclib:
-dclib:
-dclib:
-dclib: Website: http://wxdcgui.sourceforge.net/
-dclib:
diff --git a/network/ddclient/README b/network/ddclient/README
index d99ecf45b5..335302278e 100644
--- a/network/ddclient/README
+++ b/network/ddclient/README
@@ -1,9 +1,14 @@
 DDclient is a small but full featured Perl client used to update dynamic
-DNS entries for accounts on Dynamic DNS Network Services free DNS service.
-It has the capability to update more than only dyndns and it can fetch your
-WAN-ipaddress in a few different ways.
+DNS entries for accounts on Dynamic DNS Network Services free DNS
+service.  It has the capability to update more than only dyndns and it
+can fetch your WAN-ipaddress in a few different ways.
 
 Supported features include: operating as a daemon, manual and automatic
 updates, static and dynamic updates, optimized updates for multiple
 addresses, MX, wildcards, abuse avoidance, retrying failed updates, and
 sending update status to syslog and through e-mail.
+
+Optional dependencies:
+  perl-JSON-PP          perl library for JSON support
+  perl-IO-Socket-INET6  perl library for ipv6-support
+
diff --git a/network/ddclient/ddclient.SlackBuild b/network/ddclient/ddclient.SlackBuild
index 101e66205d..232d87d2e1 100644
--- a/network/ddclient/ddclient.SlackBuild
+++ b/network/ddclient/ddclient.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for ddclient
 
@@ -25,14 +25,24 @@
 
 # Revision date 2011/08/14
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=ddclient
-VERSION=${VERSION:-3.8.3}
+VERSION=${VERSION:-3.10.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 ARCH=noarch	# it's only a perl script
 
-CWD=$(pwd)
+# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
+# the name of the created package would be, and then exit. This information
+# could be useful to other scripts.
+if [ ! -z "${PRINT_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,8 +53,13 @@ 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
+
+# patch the ddclient.conf.in file pid directory
+#  @runstatedir@ should be /var/run
+sed -i.orig -e 's/@runstatedir@/@localstatedir@\/run/' ddclient.conf.in
+
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -52,30 +67,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 {} \;
 
-mkdir -p $PKG/usr/bin
-cp -a ddclient $PKG/usr/bin
+./autogen
 
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-chmod 644 sample*
-cp -a COPY* Change* README* RELEASENOTE TODO sample* $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+./configure \
+  --prefix=/usr \
+  --sysconfdir=/etc/ddclient \
+  --localstatedir=/var 
 
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-cat $CWD/doinst.sh > $PKG/install/doinst.sh
+make
+make install DESTDIR=$PKG
+
+# patch to fix permissions on ddclient.conf
+# make it readable only by root # (it might contain passwords)
+chmod 0600                         $PKG/etc/ddclient/ddclient.conf
+
+# Add ".new" to the configuration file for the doinst.sh
+mv $PKG/etc/ddclient/ddclient.conf $PKG/etc/ddclient/ddclient.conf.new
 
 # Install startup script
 mkdir -p $PKG/etc/rc.d
 cat $CWD/rc.ddclient > $PKG/etc/rc.d/rc.ddclient.new
 
-# Copy configuration and make it readable only by root (it will probably
-#   contain passwords). See also doinst.sh
-mkdir -p $PKG/etc/ddclient
-cat sample-etc_ddclient.conf > $PKG/etc/ddclient/ddclient.conf.new
-chmod 0600 $PKG/etc/ddclient/ddclient.conf.new
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a CO* Change* README* sample* docs/ $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild >           $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
-# Add the cache dir
-mkdir -p $PKG/var/cache/ddclient
+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}
+cd $PKG 
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/network/ddclient/ddclient.info b/network/ddclient/ddclient.info
index 765f8a7588..7c1dadc93a 100644
--- a/network/ddclient/ddclient.info
+++ b/network/ddclient/ddclient.info
@@ -1,10 +1,10 @@
 PRGNAM="ddclient"
-VERSION="3.8.3"
-HOMEPAGE="http://ddclient.sourceforge.net/"
-DOWNLOAD="http://downloads.sourceforge.net/ddclient/ddclient-3.8.3.tar.bz2"
-MD5SUM="3b426ae52d509e463b42eeb08fb89e0b"
+VERSION="3.10.0"
+HOMEPAGE="https://github.com/ddclient/ddclient/"
+DOWNLOAD="https://github.com/ddclient/ddclient/archive/v3.10.0/ddclient-3.10.0.tar.gz"
+MD5SUM="1ae3e491d7930c6dba3eec118deeb2b3"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="perl-IO-Socket-SSL"
+REQUIRES=""
 MAINTAINER="Richard Narron"
 EMAIL="richard@aaazen.com"
diff --git a/network/ddclient/rc.ddclient b/network/ddclient/rc.ddclient
index cb88a8dd26..daac891d53 100644
--- a/network/ddclient/rc.ddclient
+++ b/network/ddclient/rc.ddclient
@@ -10,26 +10,28 @@
 case "$1" in
   start)
 	echo -n "Starting ddclient: "
+#	ddclient -verbose
 	ddclient
 	echo    
 	;;
   stop)
 	echo -n "Shutting down ddclient: "
 	#kill $( ps -aef | grep ddclient | grep sleeping | awk '{print$2}' )
-	kill -9 $( cat /var/run/ddclient.pid )
+	pkill ddclient
 	echo
 	;;
   restart)
-	$0 stop
-	$0 start
+	sh $0 stop
+	sh $0 start
 	;;
   status)
-	pids=$( ps -aef | grep ddclient | grep sleeping | awk '{print$2}' )
+	pids=$(pgrep ddclient)
 	if test "$pids"
 	then
 		for p in $pids
 		do
 			echo "ddclient (pid $p) is running."
+			ps up $p
 		done
 	else
 		echo "ddclient is stopped."
diff --git a/network/ddgr/README b/network/ddgr/README
index 2e0b99c118..b47c24434f 100644
--- a/network/ddgr/README
+++ b/network/ddgr/README
@@ -1,11 +1,12 @@
-ddgr is a cmdline utility to search DuckDuckGo from the terminal. While googler is
-highly popular among cmdline users, in many forums the need of a similar utility for
-privacy-aware DuckDuckGo came up. DuckDuckGo Bangs are super-cool too! So here's ddgr
-for you!
+ddgr is a cmdline utility to search DuckDuckGo from the
+terminal. While googler is highly popular among cmdline users, in many
+forums the need of a similar utility for privacy-aware DuckDuckGo came
+up. DuckDuckGo Bangs are super-cool too! So here's ddgr for you!
 
-Unlike the web interface, you can specify the number of search results you would like to
-see per page. It's more convenient than skimming through 30-odd search results per page.
-The default interface is carefully designed to use minimum space without sacrificing
+Unlike the web interface, you can specify the number of search results
+you would like to see per page. It's more convenient than skimming
+through 30-odd search results per page. The default interface
+is carefully designed to use minimum space without sacrificing
 readability.
 
 ddgr isn't affiliated to DuckDuckGo in any way.
diff --git a/network/ddgr/ddgr.SlackBuild b/network/ddgr/ddgr.SlackBuild
index 34cc761e2d..f6e7f45712 100644
--- a/network/ddgr/ddgr.SlackBuild
+++ b/network/ddgr/ddgr.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for ddgr
 
-# Copyright 2017-2019  Dimitris Zlatanidis  Orestiada, Greece
+# Copyright 2017-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=ddgr
-VERSION=${VERSION:-1.6}
+VERSION=${VERSION:-1.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}
@@ -77,9 +87,9 @@ mkdir -p $PKG/usr/bin
 install -D -m0755 $PRGNAM $PKG/usr/bin
 
 # Install bash completion file
-mkdir -p $PKG/etc/bash_completion.d
-install -D -m0744 auto-completion/bash/${PRGNAM}-completion.bash \
-    $PKG/etc/bash_completion.d/${PRGNAM}-completion.bash
+mkdir -p $PKG/usr/share/bash-completion/completions
+install -D -m0644 auto-completion/bash/${PRGNAM}-completion.bash \
+    $PKG/usr/share/bash-completion/completions/$PRGNAM
 
 # Install zsh completion file
 mkdir -p $PKG/usr/share/site-functions
@@ -105,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/network/ddgr/ddgr.info b/network/ddgr/ddgr.info
index e08deaa726..340cf91bcc 100644
--- a/network/ddgr/ddgr.info
+++ b/network/ddgr/ddgr.info
@@ -1,10 +1,10 @@
 PRGNAM="ddgr"
-VERSION="1.6"
+VERSION="1.9"
 HOMEPAGE="https://github.com/jarun/ddgr"
-DOWNLOAD="https://github.com/jarun/ddgr/archive/v1.6/ddgr-1.6.tar.gz"
-MD5SUM="6951ea48c661baa0742720287070aafa"
+DOWNLOAD="https://github.com/jarun/ddgr/archive/v1.9/ddgr-1.9.tar.gz"
+MD5SUM="c1f307709665e19db1cc65a04d1402f3"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="python3"
+REQUIRES=""
 MAINTAINER="Dimitris Zlatanidis"
 EMAIL="d.zlatanidis@gmail.com"
diff --git a/network/deis/README b/network/deis/README
deleted file mode 100644
index ae76f73b3f..0000000000
--- a/network/deis/README
+++ /dev/null
@@ -1,7 +0,0 @@
-Deis is a Django/Celery API server, Python CLI and set of Chef cookbooks
-that combine to provide a Heroku-inspired application platform for
-public and private clouds.
-
-Your PaaS. Your Rules.
-
-NOTE: Required python-urllib3 == 1.10.2 
diff --git a/network/deis/deis.SlackBuild b/network/deis/deis.SlackBuild
deleted file mode 100644
index 3ea477ee61..0000000000
--- a/network/deis/deis.SlackBuild
+++ /dev/null
@@ -1,88 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for deis
-
-# 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=deis
-VERSION=${VERSION:-1.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 $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
-
-rm -f $PKG/usr/README.rst
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a LICENSE PKG-INFO 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
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/network/deis/deis.info b/network/deis/deis.info
deleted file mode 100644
index d0e74d8a01..0000000000
--- a/network/deis/deis.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="deis"
-VERSION="1.6.1"
-HOMEPAGE="http://deis.io/"
-DOWNLOAD="https://pypi.python.org/packages/source/d/deis/deis-1.6.1.tar.gz"
-MD5SUM="dda95188c7bb4562c97eeeefc4eed8f9"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="docopt python-dateutil python-requests termcolor PyYAML python-tabulate ndg_httpsclient"
-MAINTAINER="Dimitris Zlatanidis"
-EMAIL="d.zlatanidis@gmail.com"
diff --git a/network/deis/slack-desc b/network/deis/slack-desc
deleted file mode 100644
index 39c0314cbe..0000000000
--- a/network/deis/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------------------------------------------------------|
-deis: deis (Command-line Client for Deis)
-deis:
-deis: The Deis client is a Python CLI that issues API calls to a private
-deis: Deis controller, providing a Heroku-inspired PaaS workflow.
-deis:
-deis: Homepage: http://deis.io/
-deis:
-deis:
-deis:
-deis:
-deis:
diff --git a/network/deltachat/README b/network/deltachat/README
new file mode 100644
index 0000000000..118f0f3717
--- /dev/null
+++ b/network/deltachat/README
@@ -0,0 +1,7 @@
+Delta Chat is a new chat app that sends messages via e-mails, encrypted
+if possible, with Autocrypt. You do not have to sign up anywhere, just
+use your existing e-mail account with Delta Chat.
+
+------------------------------------------------------------------------
+This SlackBuild downloads and installs the official AppImage under
+'/opt'.
diff --git a/network/deltachat/deltachat.SlackBuild b/network/deltachat/deltachat.SlackBuild
new file mode 100644
index 0000000000..5d9b567d67
--- /dev/null
+++ b/network/deltachat/deltachat.SlackBuild
@@ -0,0 +1,97 @@
+#!/bin/bash
+
+# Slackware build script for Delta Chat
+
+# Copyright 2023 Slackjeff <slackjeff@riseup.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.
+
+#########################################################################
+# ChangeLog
+#
+# IMPORTANT: update this if you change this script!)
+#########################################################################
+
+# 1.0   01-JAN-2023 Added (Version: 1.34.2)
+# 2.0   04-JULY-2023 Added (Version: 1.38.1)
+# 3.0   24-DEC-2023 Added (Version: 1.42.2)
+
+cd "$(dirname "$0")" ; CWD=$(pwd)
+
+PRGNAM=deltachat
+VERSION=${VERSION:-1.42.2}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+ARCH="${ARCH:-$(uname -m)}"
+if [ "$ARCH" != "x86_64" ]; then
+	echo "$ARCH is not supported for $PRGNAM-$VERSION."
+	exit 1;
+fi
+
+if [ -n "${PRINT_PACKAGE_NAME}" ]; then
+	echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+	exit 0
+fi
+
+TMP="${TMP:-/tmp/SBo}"
+PKG="$TMP/package-$PRGNAM"
+OUTPUT="${OUTPUT:-/tmp}"
+
+APPIMGNAM="DeltaChat-$VERSION.AppImage"
+
+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/share/$PRGNAM-$VERSION"
+mkdir -p "$PKG/usr/share/applications"
+mkdir -p "$PKG/usr/share/pixmaps"
+mkdir -p "$PKG/usr/bin"
+mkdir -p "$PKG/opt"
+cd $PKG/opt
+install -m 755 $CWD/$APPIMGNAM .
+./$APPIMGNAM --appimage-extract
+rm -f $APPIMGNAM
+mv squashfs-root $PRGNAM-$VERSION
+# Fix Perms
+chown -R root:root .
+find . -perm /111 -a \! -perm 755 -a -exec chmod 755 {} + -o \
+       \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} +
+
+chmod +x $PRGNAM-$VERSION/usr/lib*/*.so*
+ln -s "/opt/$PRGNAM-$VERSION/$PRGNAM-desktop" "$PKG/usr/bin/$PRGNAM"
+ln -s "/opt/$PRGNAM-$VERSION/$PRGNAM-desktop.png" "$PKG/usr/share/pixmaps/$PRGNAM-desktop.png"
+
+cat $CWD/$PRGNAM.SlackBuild > "$PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild"
+cat $CWD/README > "$PKG/usr/doc/$PRGNAM-$VERSION/README"
+cat $CWD/slack-desc > "$PKG/install/slack-desc"
+cat $CWD/doinst.sh > "$PKG/install/doinst.sh"
+cat $CWD/$PRGNAM.desktop > $PKG/usr/share/applications/$PRGNAM.desktop
+
+cd "$PKG"
+
+# Strip
+find . -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+/sbin/makepkg -l y -c n "$OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
diff --git a/network/deltachat/deltachat.desktop b/network/deltachat/deltachat.desktop
new file mode 100644
index 0000000000..4d67906be5
--- /dev/null
+++ b/network/deltachat/deltachat.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Name=DeltaChat
+Exec=deltachat --no-sandbox %U
+Terminal=false
+Type=Application
+Icon=deltachat-desktop
+StartupWMClass=DeltaChat
+Comment=Desktop Application for delta.chat
+Keywords=dc;chat;delta;messaging;messenger;email
+Categories=Network;Chat;InstantMessaging;
diff --git a/network/deltachat/deltachat.info b/network/deltachat/deltachat.info
new file mode 100644
index 0000000000..995eccae6f
--- /dev/null
+++ b/network/deltachat/deltachat.info
@@ -0,0 +1,10 @@
+PRGNAM="deltachat"
+VERSION="1.42.2"
+HOMEPAGE="https://delta.chat/"
+DOWNLOAD="UNSUPPORTED"
+MD5SUM=""
+DOWNLOAD_x86_64="https://download.delta.chat/desktop/v1.42.2/DeltaChat-1.42.2.AppImage"
+MD5SUM_x86_64="c116a69fbb35bef2cbad5a88e04f446e"
+REQUIRES=""
+MAINTAINER="slackjeff"
+EMAIL="slackjeff@riseup.net"
diff --git a/network/BitchX/doinst.sh b/network/deltachat/doinst.sh
index 5fb28930db..5fb28930db 100644
--- a/network/BitchX/doinst.sh
+++ b/network/deltachat/doinst.sh
diff --git a/network/deltachat/slack-desc b/network/deltachat/slack-desc
new file mode 100644
index 0000000000..9384e23e1e
--- /dev/null
+++ b/network/deltachat/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.  Line
+# up the first '|' above the ':' following the base package name, and the '|' on
+# the right side marks the last column you can put a 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------------------------------------------------------|
+deltachat: deltachat (messaging app that works over e-mail.)
+deltachat:
+deltachat: New chat app that sends messages via e-mails, encrypted if possible
+deltachat: with Autocrypt. You do not have to sign up anywhere, just use your
+deltachat: existing e-mail account with Delta Chat.
+deltachat: Independent of any company or services. You own your data.
+deltachat:
+deltachat:
+deltachat:
+deltachat: https://delta.chat/
+deltachat:
diff --git a/network/deluge/README b/network/deluge/README
index 3a1a831f39..f52da898d7 100644
--- a/network/deluge/README
+++ b/network/deluge/README
@@ -1,3 +1,3 @@
-Deluge is a bittorrent client for  Linux and other Unix-Like operating
-systems. Deluge was created because of the lack of a good, native, GTK based
-torrent solution for Linux.
+Deluge is a bittorrent client for Linux and other Unix-Like operating
+systems. Deluge was created because of the lack of a good, native, GTK
+based torrent solution for Linux.
diff --git a/network/deluge/deluge.SlackBuild b/network/deluge/deluge.SlackBuild
index 6417289318..18ead3ad4a 100644
--- a/network/deluge/deluge.SlackBuild
+++ b/network/deluge/deluge.SlackBuild
@@ -1,8 +1,10 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for deluge.
 
 # Copyright 2010-2011 Marco Bonetti <sid77@slackware.it>
+# Copyright 2019-2022 Logan Rathbone <poprocks@gmail.com>
+#
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -21,11 +23,15 @@
 # WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+
+cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=deluge
-VERSION=${VERSION:-1.3.15}
+VERSION=${VERSION:-2.1.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,12 +41,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}
 
-DOCS="LICENSE ChangeLog* README"
+DOCS="AUTHORS LICENSE CHANGELOG.md README.md"
 
 if [ "$ARCH" = "i586" ]; then
   SLKCFLAGS="-O2 -march=i586 -mtune=i686"
@@ -58,7 +68,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 .
 
@@ -68,8 +78,7 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-python setup.py build || exit 1
-python setup.py install --root=$PKG || exit 1
+python3 setup.py install --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
@@ -89,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/network/deluge/deluge.info b/network/deluge/deluge.info
index 05c7ae9933..3b04ed5b43 100644
--- a/network/deluge/deluge.info
+++ b/network/deluge/deluge.info
@@ -1,10 +1,10 @@
 PRGNAM="deluge"
-VERSION="1.3.15"
+VERSION="2.1.1"
 HOMEPAGE="https://www.deluge-torrent.org/"
-DOWNLOAD="http://download.deluge-torrent.org/source/deluge-1.3.15.tar.bz2"
-MD5SUM="96cdc53cd184df0052e8394d087e2723"
+DOWNLOAD="https://ftp.osuosl.org/pub/deluge/source/2.1/deluge-2.1.1.tar.xz"
+MD5SUM="2f132a55217fd250967678c9a555bad5"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="Mako libtorrent-rasterbar pyOpenSSL python-chardet python-twisted pyxdg"
-MAINTAINER="Gerardo Zamduio"
-EMAIL="gerardo.zamudio@linux.com"
+REQUIRES="rencode python3-twisted pyOpenSSL libtorrent-rasterbar"
+MAINTAINER="Logan Rathbone"
+EMAIL="poprocks@gmail.com"
diff --git a/network/dhcping/dhcping.SlackBuild b/network/dhcping/dhcping.SlackBuild
index ee77c1a33f..35797703d0 100644
--- a/network/dhcping/dhcping.SlackBuild
+++ b/network/dhcping/dhcping.SlackBuild
@@ -1,12 +1,15 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for dhcping
 # Written by Michal Bialozor <bialyy@o2.pl>
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=dhcping
 VERSION=${VERSION:-1.2}
 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 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/network/dianara/dianara.SlackBuild b/network/dianara/dianara.SlackBuild
index 8402ad1c47..386ec28ad5 100644
--- a/network/dianara/dianara.SlackBuild
+++ b/network/dianara/dianara.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for dianara
 
@@ -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=dianara
-VERSION=${VERSION:-1.3.4}
+VERSION=${VERSION:-1.4.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}
@@ -72,7 +82,7 @@ find -L . \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 qmake Dianara.pro \
-    QMAKE_CXXFLAGS="$SLKCFLAGS"
+    QMAKE_CXXFLAGS="$SLKCFLAGS -I/usr/include/QtOAuth"
 make
 make install INSTALL_ROOT=$PKG
 
@@ -84,7 +94,7 @@ mkdir -p $PKG/usr/share/$PRGNAM/translations
 install -p -D -m 0644 translations/*.qm $PKG/usr/share/$PRGNAM/translations/
 
 mkdir -p $PKG/usr/share/applications
-install -p -D -m 0644 dianara.desktop $PKG/usr/share/applications/
+install -p -D -m 0644 org.nongnu.dianara.desktop $PKG/usr/share/applications/dianara.desktop
 
 mkdir -p $PKG/usr/share/icons/hicolor/32x32/apps
 install -p -D -m 0644 icon/32x32/dianara.png \
@@ -94,9 +104,7 @@ mkdir -p $PKG/usr/share/icons/hicolor/64x64/apps
 install -p -D -m 0644 icon/64x64/dianara.png \
     $PKG/usr/share/icons/hicolor/64x64/apps/
 
-mkdir -p $PKG/usr/man/man1
-install -p -D -m 0644 manual/dianara.1 $PKG/usr/man/man1
-
+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
@@ -118,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/network/dianara/dianara.info b/network/dianara/dianara.info
index f96681c250..44b0ab2627 100644
--- a/network/dianara/dianara.info
+++ b/network/dianara/dianara.info
@@ -1,8 +1,8 @@
 PRGNAM="dianara"
-VERSION="1.3.4"
+VERSION="1.4.3"
 HOMEPAGE="http://dianara.nongnu.org"
-DOWNLOAD="http://download.savannah.gnu.org/releases/dianara/dianara-v1.3.4.tar.gz"
-MD5SUM="7a1991d8e7af6ca71427f20d46e822a3"
+DOWNLOAD="http://download.savannah.gnu.org/releases/dianara/dianara-v1.4.3.tar.gz"
+MD5SUM="cae0b2e282651b012d01ef03bf4d5707"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="qoauth"
diff --git a/network/dillo/README b/network/dillo/README
index 5d4725b929..90dd6b4156 100644
--- a/network/dillo/README
+++ b/network/dillo/README
@@ -1,5 +1,6 @@
 Dillo is a multi-platform graphical web browser known for its speed
 and small footprint.  It is written in C and C++ and is based on FLTK.
 
-HTTPS and SSL support is built into this but is only at *alpha* stage. It can
-be commented out in the dillo.SlackBuild file if you wish.
+HTTPS and SSL support is built into this but is only at *alpha*
+stage. It can be commented out in the dillo.SlackBuild file if you
+wish.
diff --git a/network/dillo/dillo-3.0.5-fno-common.patch b/network/dillo/dillo-3.0.5-fno-common.patch
new file mode 100644
index 0000000000..df80f55afa
--- /dev/null
+++ b/network/dillo/dillo-3.0.5-fno-common.patch
@@ -0,0 +1,100 @@
+--- a/dpid/dpid.c
++++ b/dpid/dpid.c
+@@ -41,6 +41,26 @@
+ volatile sig_atomic_t caught_sigchld = 0;
+ char *SharedKey = NULL;
+ 
++char *srs_name;
++
++/*! dpid's service request socket file descriptor */
++int srs_fd;
++
++/*! Number of available plugins */
++int numdpis;
++
++/*! Number of sockets being watched */
++int numsocks;
++
++/*! State information for each plugin. */
++struct dp *dpi_attr_list;
++
++/*! service served for each plugin  */
++Dlist *services_list;
++
++/*! Set of sockets watched for connections */
++fd_set sock_set;
++
+ /*! Remove dpid_comm_keys file.
+  * This avoids that dillo instances connect to a stale port after dpid
+  * has exited (e.g. after a reboot).
+--- a/dpid/dpid.h
++++ b/dpid/dpid.h
+@@ -25,10 +25,10 @@
+ 
+ /*! \TODO: Should read this from dillorc */
+ #define SRS_NAME "dpid.srs"
+-char *srs_name;
++extern char *srs_name;
+ 
+ /*! dpid's service request socket file descriptor */
+-int srs_fd;
++extern int srs_fd;
+ 
+ /*! plugin state information
+  */
+@@ -49,19 +49,19 @@
+ };
+ 
+ /*! Number of available plugins */
+-int numdpis;
++extern int numdpis;
+ 
+ /*! Number of sockets being watched */
+-int numsocks;
++extern int numsocks;
+ 
+ /*! State information for each plugin. */
+-struct dp *dpi_attr_list;
++extern struct dp *dpi_attr_list;
+ 
+ /*! service served for each plugin  */
+-Dlist *services_list;
++extern Dlist *services_list;
+ 
+ /*! Set of sockets watched for connections */
+-fd_set sock_set;
++extern fd_set sock_set;
+ 
+ /*! Set to 1 by the SIGCHLD handler dpi_sigchld */
+ extern volatile sig_atomic_t caught_sigchld;
+--- a/dpid/dpid_common.c
++++ b/dpid/dpid_common.c
+@@ -14,6 +14,9 @@
+ #include <unistd.h>
+ #include "dpid_common.h"
+ 
++/*! Error codes for dpid */
++dpi_errno_t dpi_errno;
++
+ /*
+  * Send a verbose error message.
+  */
+--- a/dpid/dpid_common.h
++++ b/dpid/dpid_common.h
+@@ -35,12 +35,13 @@
+ #define CKD_WRITE(fd, msg) ckd_write(fd, msg, __FILE__, __LINE__)
+ #define CKD_CLOSE(fd)      ckd_close(fd, __FILE__, __LINE__)
+ 
+-
+ /*! Error codes for dpid */
+-enum {
++typedef enum {
+    no_errors,
+    dpid_srs_addrinuse /* dpid service request socket address already in use */
+-} dpi_errno;
++} dpi_errno_t;
++
++extern dpi_errno_t dpi_errno;
+ 
+ /*! Intended for identifying dillo plugins
+  * and related files
diff --git a/network/dillo/dillo-3.0.5-openssl-1.1.patch b/network/dillo/dillo-3.0.5-openssl-1.1.patch
new file mode 100644
index 0000000000..f21694113c
--- /dev/null
+++ b/network/dillo/dillo-3.0.5-openssl-1.1.patch
@@ -0,0 +1,26 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -286,7 +286,7 @@
+ 
+   if test "x$ssl_ok" = "xyes"; then
+     old_libs="$LIBS"
+-    AC_CHECK_LIB(ssl, SSL_library_init, ssl_ok=yes, ssl_ok=no, -lcrypto)
++    AC_CHECK_LIB(ssl, OPENSSL_config, ssl_ok=yes, ssl_ok=no, -lcrypto)
+     LIBS="$old_libs"
+   fi
+ 
+--- a/dpi/https.c
++++ b/dpi/https.c
+@@ -476,7 +476,11 @@
+       case X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT:
+          /*Either self signed and untrusted*/
+          /*Extract CN from certificate name information*/
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+          if ((cn = strstr(remote_cert->name, "/CN=")) == NULL) {
++#else
++         if ((cn = strstr(X509_get_subject_name(remote_cert), "/CN=")) == NULL) {
++#endif
+             strcpy(buf, "(no CN given)");
+          } else {
+             char *cn_end;
+
diff --git a/network/dillo/dillo.SlackBuild b/network/dillo/dillo.SlackBuild
index cee153a1b1..5094bd6ec7 100644
--- a/network/dillo/dillo.SlackBuild
+++ b/network/dillo/dillo.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for dillo. It has NOT been tested on x86_64.
 
@@ -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=dillo
 VERSION=${VERSION:-3.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}
 
-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,6 +81,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 {} \;
 
+# Thanks gentoo!
+patch -p1 < $CWD/dillo-3.0.5-openssl-1.1.patch
+patch -p1 < $CWD/dillo-3.0.5-fno-common.patch
+
+autoreconf -fi
+
 #https and ssl are in the alpha stage, but if you don't want to try and use it
 #just delete or comment out --enable-ssl
 
@@ -105,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/network/dino/README b/network/dino/README
new file mode 100644
index 0000000000..c02e88b308
--- /dev/null
+++ b/network/dino/README
@@ -0,0 +1,11 @@
+dino is super simple jabber client with support for video calls
+
+Dino is written in vala and is well compatible
+with Conversations Android.
+
+Dino does not support neither system tray nor
+multiple windows.
+
+To switch theme, run it like:
+
+/usr/bin/env GTK_THEME=Adwaita:dark /usr/bin/dino
diff --git a/network/dino/dino.SlackBuild b/network/dino/dino.SlackBuild
new file mode 100644
index 0000000000..06f927cc17
--- /dev/null
+++ b/network/dino/dino.SlackBuild
@@ -0,0 +1,125 @@
+#!/bin/bash
+
+# Slackware build script for nghttp3
+# 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)
+
+set -uoe pipefail
+
+TGZNAM=dino
+PRGNAM=dino
+VERSION=${VERSION:-0.4.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
+
+# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
+# the name of the created package would be, and then exit. This information
+# could be useful to other scripts.
+PRINT_PACKAGE_NAME=${PRINT_PACKAGE_NAME:-}
+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" = "s390" ]; then
+  SLKCFLAGS="-O2"
+  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
+
+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 $TGZNAM-$VERSION
+tar xvf $CWD/$TGZNAM-$VERSION.tar.?z* || exit 1
+cd $TGZNAM-$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 {} \;
+
+CFLAGS="$SLKCFLAGS" \
+      ./configure \
+      --with-libsoup3 \
+  --prefix=/usr \
+  --sysconfdir=/etc \
+  --lib-suffix=${LIBDIRSUFFIX} \
+  --build=$ARCH-slackware-linux || exit 1
+
+make || exit 1
+make install DESTDIR=$PKG || exit 1
+
+# Strip binaries:
+( 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 || :
+)
+
+# Add a documentation directory:
+mkdir -p $PKG/usr/doc/${PRGNAM}-$VERSION
+cp -a \
+   "$CWD/dino.SlackBuild" "$CWD/slack-desc" "$CWD/README" "$CWD/$PRGNAM.info" \
+   README.md LICENSE \
+  $PKG/usr/doc/${PRGNAM}-$VERSION
+chown root:root  $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/network/dino/dino.info b/network/dino/dino.info
new file mode 100644
index 0000000000..dfedf0f9a7
--- /dev/null
+++ b/network/dino/dino.info
@@ -0,0 +1,10 @@
+PRGNAM="dino"
+VERSION="0.4.2"
+HOMEPAGE="https://github.com/dino/dino/"
+DOWNLOAD="https://github.com/dino/dino/releases/download/v0.4.2/dino-0.4.2.tar.gz"
+MD5SUM="6437acc254ccb92ce195b760113d8cc0"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="libsignal-protocol-c libadwaita libsrtp2 libsoup3 webrtc-audio-processing"
+MAINTAINER="Lockywolf"
+EMAIL="for_sbo-dino_2023-05-09@lockywolf.net"
diff --git a/network/fwbuilder/doinst.sh b/network/dino/doinst.sh
index 4a25de5e6f..4a25de5e6f 100644
--- a/network/fwbuilder/doinst.sh
+++ b/network/dino/doinst.sh
diff --git a/network/dino/slack-desc b/network/dino/slack-desc
new file mode 100644
index 0000000000..6845a437dc
--- /dev/null
+++ b/network/dino/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description. Line
+# up the first '|' above the ':' following the base package name, and the '|'
+# on the right side marks the last column you can put a 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------------------------------------------------------|
+dino: dino (a super simple Jabber client supporting video calls)
+dino:
+dino: dino supports groupchats, OMEMO and GnuPG encryption, and
+dino: video calls
+dino:
+dino:
+dino:
+dino:
+dino:
+dino:
+dino:
diff --git a/network/dirb/README b/network/dirb/README
index 3e85a34679..69e6d3ba72 100644
--- a/network/dirb/README
+++ b/network/dirb/README
@@ -1,14 +1,15 @@
-DIRB is a Web Content Scanner. It looks for existing (and/or hidden) Web
-Objects. It basically works by launching a dictionary based attack against
-a web server and analizing the response.
+DIRB is a Web Content Scanner. It looks for existing (and/or hidden)
+Web Objects. It basically works by launching a dictionary based attack
+against a web server and analizing the response.
 
-DIRB comes with a set of preconfigured attack wordlists for easy usage but
-you can use your custom wordlists. Also DIRB sometimes can be used as a
-classic CGI scanner, but remember it is a content scanner not a vulnerability
-scanner.
+DIRB comes with a set of preconfigured attack wordlists for easy usage
+but you can use your custom wordlists. Also DIRB sometimes can be used
+as a classic CGI scanner, but remember it is a content scanner not a
+vulnerability scanner.
 
 DIRB main purpose is to help in professional web application auditing.
-Especially in security related testing. It covers some holes not covered by
-classic web vulnerability scanners. DIRB looks for specific web objects that
-other generic CGI scanners can't look for. It doesn't search vulnerabilities
-nor does it look for web content that could be vulnerable.
+Especially in security related testing. It covers some holes not
+covered by classic web vulnerability scanners. DIRB looks for specific
+web objects that other generic CGI scanners can't look for. It doesn't
+search vulnerabilities nor does it look for web content that could be
+vulnerable.
diff --git a/network/dirb/dirb.SlackBuild b/network/dirb/dirb.SlackBuild
index 7fd1a25f74..e7f6fd869e 100644
--- a/network/dirb/dirb.SlackBuild
+++ b/network/dirb/dirb.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for dirb
 
@@ -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=dirb
 VERSION=${VERSION:-222}
-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}
@@ -72,7 +82,7 @@ find -L . \
 # Fix broken permissions
 chmod 755 configure
 
-CFLAGS="$SLKCFLAGS" \
+CFLAGS="$SLKCFLAGS -fcommon" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
@@ -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/network/discord/README b/network/discord/README
index 9885858f9c..a925a39705 100644
--- a/network/discord/README
+++ b/network/discord/README
@@ -5,3 +5,9 @@ works on both your desktop and phone. Stop paying for TeamSpeak
 servers and hassling with Skype. Simplify your life.
 
 Discord is only available as a 64bit program. 32bit is unsupported.
+
+If you'd like Discord to continue working after an upstream update
+is released, but is not yet available on SBo, add the following to
+your user's ~/.config/discord/settings.json file:
+
+"SKIP_HOST_UPDATE": true
diff --git a/network/discord/discord.SlackBuild b/network/discord/discord.SlackBuild
index 4ee91e3373..f2ee1bb935 100644
--- a/network/discord/discord.SlackBuild
+++ b/network/discord/discord.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for discord
 #
-# Copyright 2016-2019  Jeremy Hansen <jebrhansen+SBo -at- gmail.com>
+# Copyright 2016-2024  Jeremy Hansen <jebrhansen+SBo@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=discord
-VERSION=${VERSION:-0.0.9}
+VERSION=${VERSION:-0.0.49}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,19 +38,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" = "i586" ]; then
   DEBARCH="i386"
-  LIBDIRSUFFIX=""
   echo "This package is currently only available for 64bit."
   exit 1
 elif [ "$ARCH" = "x86_64" ]; then
   DEBARCH="amd64"
-  LIBDIRSUFFIX="64"
 else
   echo "Package for $(uname -m) architecture is not available."
   exit 1
@@ -58,7 +63,7 @@ set -eu
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $PKG
-ar p $CWD/${PRGNAM}-${VERSION}.deb data.tar.xz | unxz | tar xv
+ar p $CWD/${PRGNAM}-${VERSION}.deb data.tar.gz | tar zxv
 
 chown -R root:root .
 find -L . \
@@ -77,9 +82,12 @@ cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 # Don't need these:
 rm -rf $PKG/usr/share/doc $PKG/usr/share/lintian
 
+# Correct permissions error found using sbopkglint
+chmod +x $PKG/usr/share/discord/lib*.so*
+
 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/network/discord/discord.info b/network/discord/discord.info
index fa3d37ad50..7fb1fdfabe 100644
--- a/network/discord/discord.info
+++ b/network/discord/discord.info
@@ -1,10 +1,10 @@
 PRGNAM="discord"
-VERSION="0.0.9"
+VERSION="0.0.49"
 HOMEPAGE="https://discordapp.com"
 DOWNLOAD="UNSUPPORTED"
 MD5SUM=""
-DOWNLOAD_x86_64="https://dl.discordapp.net/apps/linux/0.0.9/discord-0.0.9.deb"
-MD5SUM_x86_64="2f6f5eb899f2815fbd26dddea0d2d316"
-REQUIRES="libc++"
+DOWNLOAD_x86_64="https://dl.discordapp.net/apps/linux/0.0.49/discord-0.0.49.deb"
+MD5SUM_x86_64="8e2ada746ede52a95b9433f6893199f0"
+REQUIRES=""
 MAINTAINER="Jeremy Hansen"
 EMAIL="jebrhansen+SBo@gmail.com"
diff --git a/network/dissenter-browser/README b/network/dissenter-browser/README
deleted file mode 100644
index e475ecd0fc..0000000000
--- a/network/dissenter-browser/README
+++ /dev/null
@@ -1,9 +0,0 @@
-The free speech web browser.
-
-Browse faster by blocking ads and trackers that violate your privacy
-and cost you time and money.
-
-Dissenter is 64-bit software.
-
-This SlackBuild does not build Dissenter from source, it simply repackages
-the binary.
diff --git a/network/dissenter-browser/dissenter-browser.SlackBuild b/network/dissenter-browser/dissenter-browser.SlackBuild
deleted file mode 100644
index ed07f8557d..0000000000
--- a/network/dissenter-browser/dissenter-browser.SlackBuild
+++ /dev/null
@@ -1,90 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for dissenter-browser
-
-# Copyright 2019 Donald Cooley South Haven, Indiana 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=dissenter-browser
-VERSION=${VERSION:-0.66.99}
-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}
-
-# Abort build if architecture is not 64-bit.
-if [ "$ARCH" != "x86_64" ]; then
-  echo "$ARCH is not supported."
-  exit 1
-fi
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-$VERSION
-mkdir -p $PRGNAM-$VERSION
-cd $PRGNAM-$VERSION
-rpm2cpio < $CWD/${PRGNAM}-${VERSION}-${BUILD}.${ARCH}.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 {} \;
-
-cp -ap usr opt $PKG/
-
-# Slackware doesn't ship a GNOME desktop so I don't see any reason for gnome-control-center
-rm -rf $PKG/usr/share/gnome-control-center
-
-# Move icon into place
-mkdir -p $PKG/usr/share/pixmaps
-cp opt/gab/dissenter/*.xpm $PKG/usr/share/pixmaps/dissenter-browser.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
-
-rm -rf $PKG/usr/lib
-
-# Place man page(s) where The Man likes 'em
-mv $PKG/usr/share/man $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
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/network/dissenter-browser/dissenter-browser.info b/network/dissenter-browser/dissenter-browser.info
deleted file mode 100644
index d56384b6fe..0000000000
--- a/network/dissenter-browser/dissenter-browser.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="dissenter-browser"
-VERSION="0.66.99"
-HOMEPAGE="https://dissenter.com"
-DOWNLOAD="UNSUPPORTED"
-MD5SUM=""
-DOWNLOAD_x86_64="https://dissenter.com/dist/browser/0.66.99/dissenter-browser-0.66.99-1.x86_64.rpm"
-MD5SUM_x86_64="e283dadf430ed9d3da90ac8a82822f64"
-REQUIRES=""
-MAINTAINER="Donald Cooley"
-EMAIL="chytraeu@sdf.org"
diff --git a/network/dissenter-browser/doinst.sh b/network/dissenter-browser/doinst.sh
deleted file mode 100644
index f1e78d65ce..0000000000
--- a/network/dissenter-browser/doinst.sh
+++ /dev/null
@@ -1,7 +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
diff --git a/network/dissenter-browser/slack-desc b/network/dissenter-browser/slack-desc
deleted file mode 100644
index e2446ed6b2..0000000000
--- a/network/dissenter-browser/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------------------------------------------------------|
-dissenter-browser: dissenter-browser (the free speech web browser)
-dissenter-browser:
-dissenter-browser: Browse faster by blocking ads and trackers that violate your privacy
-dissenter-browser: and cost you time and money.
-dissenter-browser:
-dissenter-browser:
-dissenter-browser:
-dissenter-browser:
-dissenter-browser:
-dissenter-browser: https://dissenter.com
-dissenter-browser:
diff --git a/network/dkimproxy/dkimproxy.SlackBuild b/network/dkimproxy/dkimproxy.SlackBuild
index f3860a6c04..732dead34e 100644
--- a/network/dkimproxy/dkimproxy.SlackBuild
+++ b/network/dkimproxy/dkimproxy.SlackBuild
@@ -1,8 +1,9 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for DKIMproxy
 
 # Copyright 2010, Steven King <kingrst@gmail.com>
+# 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,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=dkimproxy
 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=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"
@@ -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=""
@@ -118,7 +132,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 INSTALL NEWS README TODO ChangeLog smtpprox.ChangeLog \
+  AUTHORS COPYING NEWS README TODO ChangeLog smtpprox.ChangeLog \
   smtpprox.README smtpprox.TODO \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
@@ -135,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/network/dkimproxy/dkimproxy.info b/network/dkimproxy/dkimproxy.info
index 78257acaa8..accfde7268 100644
--- a/network/dkimproxy/dkimproxy.info
+++ b/network/dkimproxy/dkimproxy.info
@@ -5,6 +5,6 @@ DOWNLOAD="http://downloads.sourceforge.net/dkimproxy/dkimproxy-1.4.1.tar.gz"
 MD5SUM="3ecaa38a8c865a5b7682f7f261354218"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="perl-Crypt-OpenSSL-RSA perl-digest-sha1 perl-MailTools perl-net-dns perl-Net-Server perl-Mail-DKIM"
-MAINTAINER="Steven King"
-EMAIL="kingrst@gmail.com"
+REQUIRES="perl-Net-Server perl-Mail-DKIM"
+MAINTAINER="Yth - Arnaud"
+EMAIL="yth@ythogtha.org"
diff --git a/network/dma/README b/network/dma/README
new file mode 100644
index 0000000000..b4e69c3b1b
--- /dev/null
+++ b/network/dma/README
@@ -0,0 +1,7 @@
+dma is a small Mail Transport Agent (MTA), designed for home and
+office use. It accepts mails from locally installed Mail User
+Agents (MUA) and delivers the mails either locally or to a remote
+destination.
+
+Remote delivery includes several features like TLS/SSL support and
+SMTP authentication.
diff --git a/network/dma/dma.SlackBuild b/network/dma/dma.SlackBuild
new file mode 100644
index 0000000000..6646e51b30
--- /dev/null
+++ b/network/dma/dma.SlackBuild
@@ -0,0 +1,101 @@
+#!/bin/bash
+
+# Slackware build script for dma
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=dma
+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 the variable PRINT_PACKAGE_NAME is set, then this script will report what
+# the name of the created package would be, and then exit. This information
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; 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|share/man|/man|g" Makefile
+sed -i "s|/lib|/lib${LIBDIRSUFFIX}|g" Makefile
+
+make
+make install sendmail-link mailq-link install-spool-dirs install-etc 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 INSTALL LICENSE README.markdown TODO 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/network/dma/dma.info b/network/dma/dma.info
new file mode 100644
index 0000000000..e5e9785815
--- /dev/null
+++ b/network/dma/dma.info
@@ -0,0 +1,10 @@
+PRGNAM="dma"
+VERSION="0.13"
+HOMEPAGE="https://github.com/corecode/dma/"
+DOWNLOAD="https://github.com/corecode/dma/archive/v0.13/dma-0.13.tar.gz"
+MD5SUM="8bf824b065295a594f399c8b96663673"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Pierre-Philipp Braun"
+EMAIL="pbraun@nethence.com"
diff --git a/network/dma/slack-desc b/network/dma/slack-desc
new file mode 100644
index 0000000000..9df4761ac6
--- /dev/null
+++ b/network/dma/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+   |-----handy-ruler------------------------------------------------------|
+dma: dma (DragonFlyBSD Mail Agent)
+dma:
+dma: dma is a small Mail Transport Agent (MTA), designed for home and
+dma: office use. It accepts mails from locally installed Mail User Agents
+dma: (MUA) and delivers the mails either locally or to a remote
+dma: destination. Remote delivery includes several features like TLS/SSL
+dma: support and SMTP authentication.
+dma:
+dma:
+dma:
+dma:
diff --git a/network/dmitry/README b/network/dmitry/README
index 3691ef6b21..e5f7c80b4d 100644
--- a/network/dmitry/README
+++ b/network/dmitry/README
@@ -1,5 +1,5 @@
-DMitry (Deepmagic Information Gathering Tool) is a UNIX/(GNU)Linux Command
-Line Application coded in C. DMitry has the ability to gather as much
-information as possible about a host. Base functionality is able to gather
-possible subdomains, email addresses, uptime information, tcp port scan,
-whois lookups, and more.
+DMitry (Deepmagic Information Gathering Tool) is a UNIX/(GNU)Linux
+Command Line Application coded in C. DMitry has the ability to gather
+as much information as possible about a host. Base functionality
+is able to gather possible subdomains, email addresses, uptime
+information, tcp port scan, whois lookups, and more.
diff --git a/network/dmitry/dmitry.SlackBuild b/network/dmitry/dmitry.SlackBuild
index 36b383e22f..1b470564ef 100644
--- a/network/dmitry/dmitry.SlackBuild
+++ b/network/dmitry/dmitry.SlackBuild
@@ -1,32 +1,33 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for dmitry
 
 # Copyright Wigums
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
-#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
-#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+#        DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
+#                    Version 2, December 2004
+
+# Copyright (C) 2004 Sam Hocevar <sam@hocevar.net>
+
+# Everyone is permitted to copy and distribute verbatim or modified
+# copies of this license document, and changing it is allowed as long
+# as the name is changed.
+
+#            DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
+#   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+#  0. You just DO WHAT THE FUCK YOU WANT TO.
+
+
+
+cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=dmitry
 SRCNAM=DMitry
-VERSION=${VERSION:-1.2a}
+VERSION=${VERSION:-1.3a}
 BUILD=${BUILD:-1}
-TAG=${TAG:-_Sbo}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -36,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}
@@ -70,7 +78,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 \
@@ -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/network/dmitry/dmitry.info b/network/dmitry/dmitry.info
index 7978b58988..36caccd326 100644
--- a/network/dmitry/dmitry.info
+++ b/network/dmitry/dmitry.info
@@ -1,8 +1,8 @@
 PRGNAM="dmitry"
-VERSION="1.2a"
+VERSION="1.3a"
 HOMEPAGE="http://mor-pah.net/software/dmitry-deepmagic-information-gathering-tool/"
-DOWNLOAD="https://dl.packetstormsecurity.net/UNIX/misc/DMitry-1.2a.tar.gz"
-MD5SUM="5917242266383be3aa7e0e618ae0c015"
+DOWNLOAD="https://dl.packetstormsecurity.net/UNIX/misc/DMitry-1.3a.tar.gz"
+MD5SUM="8d578ba16de34b5cbebf6b767181b00d"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/network/dmitry/slack-desc b/network/dmitry/slack-desc
index 39f5f3b3ac..e714c85e53 100644
--- a/network/dmitry/slack-desc
+++ b/network/dmitry/slack-desc
@@ -8,12 +8,12 @@
       |-----handy-ruler------------------------------------------------------|
 dmitry: dmitry (Deepmagic Information Gathering Tool)
 dmitry:
-dmitry: DMitry (Deepmagic Information Gathering Tool) is a UNIX/(GNU)Linux 
-dmitry: Command Line Application coded in C. DMitry has the ability to gather 
-dmitry: as much information as possible about a host.  Base functionality is 
-dmitry: able to gather possible subdomains, email addresses, uptime 
+dmitry: DMitry (Deepmagic Information Gathering Tool) is a UNIX/(GNU)Linux
+dmitry: Command Line Application coded in C. DMitry has the ability to gather
+dmitry: as much information as possible about a host.  Base functionality is
+dmitry: able to gather possible subdomains, email addresses, uptime
 dmitry: information, tcp port scan, whois lookups, and more.
 dmitry:
 dmitry:
-dmitry: 
+dmitry:
 dmitry:
diff --git a/network/dnscrypt-proxy/README b/network/dnscrypt-proxy/README
index 3e69789b36..0e857524f6 100644
--- a/network/dnscrypt-proxy/README
+++ b/network/dnscrypt-proxy/README
@@ -1,13 +1,11 @@
-dnscrypt-proxy is a tool for securing communications between a client and a DNS
-resolver. It provides a local service which can be used directly as your local
-resolver or as a DNS forwarder, encrypting and authenticating requests using the
-DNSCrypt protocol and passing them to an upstream server.
+DNSCrypt is a protocol that encrypts, authenticates and optionally 
+anonymizes communications between a DNS client and a DNS resolver. 
+It prevents DNS spoofing. It uses cryptographic signatures to verify 
+that responses originate from the chosen DNS resolver and haven’t been
+tampered with.
 
-By default dnscrypt-proxy is configured to use a random DNS server; you will
-definitely want to change this.
+It is an open specification, with free and open source reference 
+implementations, and it is not affiliated with any company nor 
+organization.
 
-Note that google-go-lang is a compile-time dependency and is not needed during
-run-time.
-
-Be sure to read README.Slackware for information on configuring/running
-dnscrypt-proxy as a daemon!
+Free, DNSCrypt-enabled resolvers are available all over the world.
diff --git a/network/dnscrypt-proxy/README.Slackware b/network/dnscrypt-proxy/README.Slackware
index b5a6388c56..11336b5864 100644
--- a/network/dnscrypt-proxy/README.Slackware
+++ b/network/dnscrypt-proxy/README.Slackware
@@ -1,27 +1,34 @@
-A. Setup
+An init script and configuration file have been provided to run 
+dnscrypt-proxy as a daemon. To configure dnscrypt-proxy, edit:
 
-An init script and configuration file have been provided to run dnscrypt-proxy
-as a daemon. To configure dnscrypt-proxy, edit
-/etc/dnscrypt-proxy/dnscrypt-proxy.toml with the desired settings. By default
-dnscrypt-proxy will use a random DNS server and will run on localhost
-(127.0.0.1), port 53.
+    /etc/dnscrypt-proxy/dnscrypt-proxy.toml 
 
-The configuration file is setup to use a dnscrypt user by default. In order to
-use the default configuration you should create a dnscrypt user and group with
-the following commands:
+Remember to chmod +x /etc/rc.d/rc.dnscrypt-proxy before starting.
+
+By default dnscrypt-proxy will use a random DNS server, i have hardcoded 
+some anonymizing relays to bounce the DNS querries around for increased
+privacy.
+Built in local caching is also enabled by default.
+The proxy will run on localhost 127.0.0.1 and ::1 port 53.
+If ipv6 is not required or available, it can be disabled in the config.
+
+The configuration file is setup to use a 'dnscrypt' user by default. 
+In order to use the default configuration you should create a 
+'dnscrypt' user and group with the following commands:
 
     groupadd -g 293 dnscrypt
     useradd -u 293 -g 293 -c "DNSCrypt" -d /run/dnscrypt -s /bin/false dnscrypt
 
-If you decide to use another user you should edit the USER setting in
-/etc/default/dnscrypt-proxy and the user_name setting in
-/etc/dnscrypt-proxy/dnscrypt-proxy.toml (there are example settings provided
-for the user 'nobody').
+If you decide to use another user you should edit the user_name setting
+in:
 
-In order to send all DNS requests through dnscrypt-proxy, you will need to
-update /etc/resolv.conf to point to localhost. If using dhcpcd, the easiest way
-to set dnscrypt-proxy as the primary (but not exclusive) dns resolver is to
-create file /etc/resolv.conf.head with the following line:
+    /etc/dnscrypt-proxy/dnscrypt-proxy.toml 
+
+In order to send all DNS requests through dnscrypt-proxy, you will need
+to update /etc/resolv.conf to point to localhost. If using dhcpcd, the 
+easiest way to set dnscrypt-proxy as the primary (but not exclusive) 
+dns resolver is to create file /etc/resolv.conf.head with the following
+line:
 
     nameserver 127.0.0.1
 
@@ -29,30 +36,27 @@ You may also have to add the following line to enable EDNS:
 
     options edns0
 
-To start dnscrypt-proxy automatically at system start, add the following to
-/etc/rc.d/rc.local:
+It is also recommended to make the resolv.conf file immutable by
+issuing:
+
+    chattr +i /etc/resolv.conf
+
+To prevent the settings from being reset by dhcp or any other service.
+
+To start dnscrypt-proxy automatically at system start, add the following
+to:
+    
+    /etc/rc.d/rc.local:
 
     if [ -x /etc/rc.d/rc.dnscrypt-proxy ]; then
         /etc/rc.d/rc.dnscrypt-proxy start
     fi
 
-To properly stop dnscrypt-proxy on system shutdown, add the following to
-/etc/rc.d/rc.local_shutdown:
+To properly stop dnscrypt-proxy on system shutdown, add the following
+to:
+
+    /etc/rc.d/rc.local_shutdown:
 
     if [ -x /etc/rc.d/rc.dnscrypt-proxy ]; then
         /etc/rc.d/rc.dnscrypt-proxy stop
     fi
-
-B. DNS Cache
-
-dnscrypt-proxy provides control over how it caches DNS queries via its
-configuration file. However, you can also run your own local caching DNS
-server. A sample configuration for dnsmasq (included with Slackware) is
-provided at /usr/doc/dnscrypt-proxy-@VERSION@/dnsmasq.conf. A sample
-configuration for bind/named that also does local DNSSEC validation (if
-supported by the upstream DNS server) is also provided at
-/usr/doc/dnscrypt-proxy-@VERSION@/named.conf. Both configurations run on port
-53, forwarding lookups to dnscrypt-proxy running on port 55. In order to use
-these configurations you will need to change the port dnscrypt-proxy runs on in
-/etc/dnscrypt-proxy/dnscrypt-proxy.toml. If you perform your own DNS caching,
-it makes sense to disable dnscrypt-proxy's caching in its configuration file.
diff --git a/network/dnscrypt-proxy/dnscrypt-proxy.SlackBuild b/network/dnscrypt-proxy/dnscrypt-proxy.SlackBuild
index 52f8059230..4b59f7799e 100644
--- a/network/dnscrypt-proxy/dnscrypt-proxy.SlackBuild
+++ b/network/dnscrypt-proxy/dnscrypt-proxy.SlackBuild
@@ -1,8 +1,9 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for dnscrypt-proxy
 
-# Copyright 2019 T3slider <t3slider@gmail.com>
+# Copyright 2023 thnkman <thnkman@proton.me>
+# Based on Marco Bonetti's <sid77@slackware.it> tor script.
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,17 +23,18 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-# Thanks to Larry Hajali for work on README.Slackware, the basis for the sample
-# dnsmasq configuration, and the idea for an init script. His contributions
-# significantly improved the value of this script!
+cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=dnscrypt-proxy
-VERSION=${VERSION:-2.0.25}
+VERSION=${VERSION:-2.1.5}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
-DOMAIN=github.com
-ORG=jedisct1
+DNSCRYPT_USER=${DNSCRYPT_USER:-dnscrypt}
+DNSCRYPT_UID=${DNSCRYPT_UID:-293}
+DNSCRYPT_GROUP=${DNSCRYPT_GROUP:-dnscrypt}
+DNSCRYPT_GID=${DNSCRYPT_GID:-293}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -42,32 +44,44 @@ 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
-  LIBDIRSUFFIX="64"
-else
-  LIBDIRSUFFIX=""
-fi
-
 set -e
 
+bailout() {
+  echo -e "\nYou must have a $DNSCRYPT_USER user and $DNSCRYPT_GROUP group to run this script. "
+  echo -e    "Something like this should suffice for most systems: "
+  echo -e    "# groupadd -g $DNSCRYPT_GID $DNSCRYPT_GROUP "
+  echo -e    "# useradd -u $DNSCRYPT_UID -g $DNSCRYPT_GID -c \"DNSCrypt-proxy\" -d /dev/null -s /bin/false $DNSCRYPT_USER \n"
+  exit 1
+}
+
+if ! grep -q "^$DNSCRYPT_USER:" /etc/passwd > /dev/null 2>&1 ; then
+  bailout
+elif ! grep -q "^$DNSCRYPT_GROUP:" /etc/group > /dev/null 2>&1 ; then
+  bailout
+fi
+
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-mkdir -p $PRGNAM-$VERSION/src/$DOMAIN/$ORG
-cd $PRGNAM-$VERSION/src/$DOMAIN/$ORG
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-mv $PRGNAM-$VERSION $PRGNAM
-cd $PRGNAM
+if [[ $ARCH == i?86 ]]; then
+  tar xvf $CWD/$PRGNAM-linux_i386-$VERSION.tar.gz --transform="s/linux-i386/$PRGNAM-$VERSION/"
+elif [[ $ARCH == x86_64 ]]; then
+  tar xvf $CWD/$PRGNAM-linux_x86_64-$VERSION.tar.gz --transform="s/linux-x86_64/$PRGNAM-$VERSION/"
+else
+  echo "Architecture not supported"
+  exit 1
+fi
+cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -75,35 +89,28 @@ 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 GOPATH="$TMP/$PRGNAM-$VERSION"
-
-go install -a -x ./...
-
-mkdir -p $PKG/usr/sbin
+mkdir -p $PKG/usr/bin \
+    $PKG/etc/{$PRGNAM,rc.d} \
+    $PKG/var/{log,run}/$PRGNAM
 
-install -m 755 "$TMP/$PRGNAM-$VERSION/bin/${PRGNAM}" $PKG/usr/sbin/${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/var/log/$PRGNAM $PKG/etc/default $PKG/etc/$PRGNAM
-chmod 0700 $PKG/var/log/$PRGNAM
-sed "s/@VERSION@/$VERSION/" $CWD/$PRGNAM.default > $PKG/etc/default/$PRGNAM.new
-install -D -m 0755 $CWD/rc.$PRGNAM $PKG/etc/rc.d/rc.$PRGNAM.new
-install -D -m 0644 $CWD/$PRGNAM.toml $PKG/etc/$PRGNAM/$PRGNAM.toml.new
+cp -a ./*.txt $PKG/etc/$PRGNAM/
+install -D -m 0755 $PRGNAM $PKG/usr/bin/$PRGNAM
+install -D -m 0644 $CWD/$PRGNAM.toml $PKG/etc/$PRGNAM/$PRGNAM.toml
+install -D -m 0644 $CWD/rc.$PRGNAM $PKG/etc/rc.d/rc.$PRGNAM
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
-  ChangeLog LICENSE README.md utils $PRGNAM/example-* \
+  LICENSE \
   $PKG/usr/doc/$PRGNAM-$VERSION
-sed "s/@VERSION@/$VERSION/g" $CWD/README.Slackware > $PKG/usr/doc/$PRGNAM-$VERSION/README.Slackware
-cat $CWD/dnsmasq.conf > $PKG/usr/doc/$PRGNAM-$VERSION/dnsmasq.conf
-cat $CWD/named.conf > $PKG/usr/doc/$PRGNAM-$VERSION/named.conf
+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
 
+sed -i "s/DNSCRYPT_UID=.*$/DNSCRYPT_UID=$DNSCRYPT_UID/" $PKG/install/doinst.sh
+sed -i "s/DNSCRYPT_GID=.*$/DNSCRYPT_GID=$DNSCRYPT_GID/" $PKG/install/doinst.sh
+
 cd $PKG
-/sbin/makepkg -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/network/dnscrypt-proxy/dnscrypt-proxy.default b/network/dnscrypt-proxy/dnscrypt-proxy.default
deleted file mode 100644
index 112202cc9e..0000000000
--- a/network/dnscrypt-proxy/dnscrypt-proxy.default
+++ /dev/null
@@ -1,30 +0,0 @@
-# /etc/default/dnscrypt-proxy
-
-# This file contains additional configuration settings for dnscrypt-proxy
-# (primary configuration belongs in the dnscrypt-proxy configuration file).
-# This file supports configuring and running multiple instances (see the bottom
-# of this file for a sample secondary configuration). However, note that
-# dnscrypt-proxy now automatically provides redundancy based on a pool of
-# available servers in its own configuration file. Under normal circumstances
-# you would only ever need one active configuration in this file, but support
-# for multiple independent servers has been maintained in case you have a need
-# for segregation of upstream servers.
-
-# DNSCRYPTCONFIG should be the path to the dnscrypt-proxy configuration file
-# for the given instance.
-DNSCRYPTCONFIG[0]="/etc/dnscrypt-proxy/dnscrypt-proxy.toml"
-
-# The pid file for this instance. PIDFILE must always be specified for each
-# instance!
-PIDFILE[0]="/run/dnscrypt-proxy/dnscrypt-proxy-0.pid"
-
-# The user to run the daemon. This should be the same user specified in the
-# config.
-#USER[0]="nobody"
-USER[0]="dnscrypt"
-
-# A simple example configuration for a second instance (note that this would
-# require a new dnscrypt-proxy configuration file)
-#DNSCRYPTCONFIG[1]="/etc/dnscrypt-proxy/dnscrypt-proxy-1.toml"
-#PIDFILE[1]="/run/dnscrypt-proxy/dnscrypt-proxy-1.pid"
-#USER[1]="dnscrypt"
diff --git a/network/dnscrypt-proxy/dnscrypt-proxy.info b/network/dnscrypt-proxy/dnscrypt-proxy.info
index add495f8cd..f4ba8b100e 100644
--- a/network/dnscrypt-proxy/dnscrypt-proxy.info
+++ b/network/dnscrypt-proxy/dnscrypt-proxy.info
@@ -1,10 +1,10 @@
 PRGNAM="dnscrypt-proxy"
-VERSION="2.0.25"
-HOMEPAGE="https://github.com/jedisct1/dnscrypt-proxy"
-DOWNLOAD="https://github.com/jedisct1/dnscrypt-proxy/archive/2.0.25/dnscrypt-proxy-2.0.25.tar.gz"
-MD5SUM="1c92cedfc8d4ea7dc21b1abd5e93478c"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="google-go-lang"
-MAINTAINER="T3slider"
-EMAIL="t3slider@gmail.com"
+VERSION="2.1.5"
+HOMEPAGE="https://github.com/DNSCrypt/dnscrypt-proxy"
+DOWNLOAD="https://github.com/DNSCrypt/dnscrypt-proxy/releases/download/2.1.5/dnscrypt-proxy-linux_i386-2.1.5.tar.gz"
+MD5SUM="edbd10c9d3be0e81976203c77902f339"
+DOWNLOAD_x86_64="https://github.com/DNSCrypt/dnscrypt-proxy/releases/download/2.1.5/dnscrypt-proxy-linux_x86_64-2.1.5.tar.gz"
+MD5SUM_x86_64="8190b0d10841aea11f74caf77dbc2c39"
+REQUIRES=""
+MAINTAINER="thnkman"
+EMAIL="thnkman@proton.me"
diff --git a/network/dnscrypt-proxy/dnscrypt-proxy.toml b/network/dnscrypt-proxy/dnscrypt-proxy.toml
index 5b4e99a89d..182429bd67 100644
--- a/network/dnscrypt-proxy/dnscrypt-proxy.toml
+++ b/network/dnscrypt-proxy/dnscrypt-proxy.toml
@@ -21,17 +21,23 @@
 ## Servers from the "public-resolvers" source (see down below) can
 ## be viewed here: https://dnscrypt.info/public-servers
 ##
-## If this line is commented, all registered servers matching the require_* filters
-## will be used.
+## The proxy will automatically pick working servers from this list.
+## Note that the require_* filters do NOT apply when using this setting.
+##
+## By default, this list is empty and all registered servers matching the
+## require_* filters will be used instead.
 ##
-## The proxy will automatically pick the fastest, working servers from the list.
 ## Remove the leading # first to enable this; lines starting with # are ignored.
 
 # server_names = ['scaleway-fr', 'google', 'yandex', 'cloudflare']
 
 
 ## List of local addresses and ports to listen to. Can be IPv4 and/or IPv6.
-## Note: When using systemd socket activation, choose an empty set (i.e. [] ).
+## Example with both IPv4 and IPv6:
+## listen_addresses = ['127.0.0.1:53', '[::1]:53']
+##
+## To listen to all IPv4 addresses, use `listen_addresses = ['0.0.0.0:53']`
+## To listen to all IPv4+IPv6 addresses, use `listen_addresses = ['[::]:53']`
 
 listen_addresses = ['127.0.0.1:53', '[::1]:53']
 
@@ -46,35 +52,37 @@ max_clients = 250
 ## Note (2): this feature is not compatible with systemd socket activation.
 ## Note (3): when using -pidfile, the PID file directory must be writable by the new user
 
-# user_name = 'nobody'
 user_name = 'dnscrypt'
 
 
-## Require servers (from static + remote sources) to satisfy specific properties
+## Require servers (from remote sources) to satisfy specific properties
 
 # Use servers reachable over IPv4
 ipv4_servers = true
 
 # Use servers reachable over IPv6 -- Do not enable if you don't have IPv6 connectivity
-ipv6_servers = false
+ipv6_servers = true
 
 # Use servers implementing the DNSCrypt protocol
 dnscrypt_servers = true
 
 # Use servers implementing the DNS-over-HTTPS protocol
-doh_servers = true
+doh_servers = false
+
+# Use servers implementing the Oblivious DoH protocol
+odoh_servers = false
 
 
 ## Require servers defined by remote sources to satisfy specific properties
 
 # Server must support DNS security extensions (DNSSEC)
-require_dnssec = false
+require_dnssec = true
 
 # Server must not log user queries (declarative)
 require_nolog = true
 
-# Server must not enforce its own blacklist (for parental control, ads blocking...)
-require_nofilter = true
+# Server must not enforce its own blocklist (for parental control, ads blocking...)
+require_nofilter = false
 
 # Server names to avoid even if they match all criteria
 disabled_server_names = []
@@ -93,18 +101,21 @@ force_tcp = false
 ## Uncomment the following line to route all TCP connections to a local Tor node
 ## Tor doesn't support UDP, so set `force_tcp` to `true` as well.
 
-# proxy = "socks5://127.0.0.1:9050"
+# proxy = 'socks5://127.0.0.1:9050'
 
 
 ## HTTP/HTTPS proxy
 ## Only for DoH servers
 
-# http_proxy = "http://127.0.0.1:8888"
+# http_proxy = 'http://127.0.0.1:8888'
 
 
-## How long a DNS query will wait for a response, in milliseconds
+## How long a DNS query will wait for a response, in milliseconds.
+## If you have a network with *a lot* of latency, you may need to
+## increase this. Startup may be slower if you do so.
+## Don't increase it too much. 10000 is the highest reasonable value.
 
-timeout = 2500
+timeout = 5000
 
 
 ## Keepalive for HTTP (HTTPS, HTTP/2) queries, in seconds
@@ -112,19 +123,31 @@ timeout = 2500
 keepalive = 30
 
 
-## Use the REFUSED return code for blocked responses
-## Setting this to `false` means that some responses will be lies.
-## Unfortunately, `false` appears to be required for Android 8+
+## Add EDNS-client-subnet information to outgoing queries
+##
+## Multiple networks can be listed; they will be randomly chosen.
+## These networks don't have to match your actual networks.
+
+# edns_client_subnet = ["0.0.0.0/0", "2001:db8::/32"]
+
 
-refused_code_in_responses = false
+## Response for blocked queries. Options are `refused`, `hinfo` (default) or
+## an IP response. To give an IP response, use the format `a:<IPv4>,aaaa:<IPv6>`.
+## Using the `hinfo` option means that some responses will be lies.
+## Unfortunately, the `hinfo` option appears to be required for Android 8+
 
+# blocked_query_response = 'refused'
 
-## Load-balancing strategy: 'p2' (default), 'ph', 'first' or 'random'
+
+## Load-balancing strategy: 'p2' (default), 'ph', 'p<n>', 'first' or 'random'
+## Randomly choose 1 of the fastest 2, half, n, 1 or all live servers by latency.
+## The response quality still depends on the server itself.
 
 # lb_strategy = 'p2'
 
 ## Set to `true` to constantly try to estimate the latency of all the resolvers
 ## and adjust the load-balancing parameters accordingly, or to `false` to disable.
+## Default is `true` that makes 'p2' `lb_strategy` work well.
 
 # lb_estimator = true
 
@@ -134,12 +157,20 @@ refused_code_in_responses = false
 # log_level = 2
 
 
-## log file for the application
+## Log file for the application, as an alternative to sending logs to
+## the standard system logging service (syslog/Windows event log).
+##
+## This file is different from other log files, and will not be
+## automatically rotated by the application.
 
-# log_file = 'dnscrypt-proxy.log'
 log_file = '/var/log/dnscrypt-proxy/dnscrypt-proxy.log'
 
 
+## When using a log file, only keep logs from the most recent launch.
+
+# log_file_latest = true
+
+
 ## Use the system logger (syslog on Unix, Event Log on Windows)
 
 # use_syslog = true
@@ -154,7 +185,7 @@ cert_refresh_delay = 240
 ## This may improve privacy but can also have a significant impact on CPU usage
 ## Only enable if you don't have a lot of network load
 
-# dnscrypt_ephemeral_keys = false
+dnscrypt_ephemeral_keys = true
 
 
 ## DoH: Disable TLS session tickets - increases privacy but also latency
@@ -167,6 +198,8 @@ cert_refresh_delay = 240
 ## 49195 = TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256
 ## 52392 = TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305
 ## 52393 = TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305
+##  4865 = TLS_AES_128_GCM_SHA256
+##  4867 = TLS_CHACHA20_POLY1305_SHA256
 ##
 ## On non-Intel CPUs such as MIPS routers and ARM systems (Android, Raspberry Pi...),
 ## the following suite improves performance.
@@ -178,34 +211,49 @@ cert_refresh_delay = 240
 # tls_cipher_suite = [52392, 49199]
 
 
-## Fallback resolver
-## This is a normal, non-encrypted DNS resolver, that will be only used
-## for one-shot queries when retrieving the initial resolvers list, and
-## only if the system DNS configuration doesn't work.
-## No user application queries will ever be leaked through this resolver,
-## and it will not be used after IP addresses of resolvers URLs have been found.
-## It will never be used if lists have already been cached, and if stamps
-## don't include host names without IP addresses.
-## It will not be used if the configured system DNS works.
-## A resolver supporting DNSSEC is recommended. This may become mandatory.
+## Bootstrap resolvers
+##
+## These are normal, non-encrypted DNS resolvers, that will be only used
+## for one-shot queries when retrieving the initial resolvers list and if
+## the system DNS configuration doesn't work.
+##
+## No user queries will ever be leaked through these resolvers, and they will
+## not be used after IP addresses of DoH resolvers have been found (if you are
+## using DoH).
+##
+## They will never be used if lists have already been cached, and if the stamps
+## of the configured servers already include IP addresses (which is the case for
+## most of DoH servers, and for all DNSCrypt servers and relays).
+##
+## They will not be used if the configured system DNS works, or after the
+## proxy already has at least one usable secure resolver.
 ##
-## People in China may need to use 114.114.114.114:53 here.
-## Other popular options include 8.8.8.8 and 1.1.1.1.
+## Resolvers supporting DNSSEC are recommended, and, if you are using
+## DoH, bootstrap resolvers should ideally be operated by a different entity
+## than the DoH servers you will be using, especially if you have IPv6 enabled.
+##
+## People in China may want to use 114.114.114.114:53 here.
+## Other popular options include 8.8.8.8, 9.9.9.9 and 1.1.1.1.
+##
+## If more than one resolver is specified, they will be tried in sequence.
+##
+## TL;DR: put valid standard resolver addresses here. Your actual queries will
+## not be sent there. If you're using DNSCrypt or Anonymized DNS and your
+## lists are up to date, these resolvers will not even be used.
 
-fallback_resolver = '9.9.9.9:53'
+bootstrap_resolvers = ['9.9.9.9:53', '8.8.8.8:53']
 
 
-## Never let dnscrypt-proxy try to use the system DNS settings;
-## unconditionally use the fallback resolver.
+## Always use the bootstrap resolver before the system DNS settings.
 
-ignore_system_dns = false
+ignore_system_dns = true
 
 
 ## Maximum time (in seconds) to wait for network connectivity before
 ## initializing the proxy.
 ## Useful if the proxy is automatically started at boot, and network
 ## connectivity is not guaranteed to be immediately available.
-## Use 0 to not test for connectivity at all,
+## Use 0 to not test for connectivity at all (not recommended),
 ## and -1 to wait as much as possible.
 
 netprobe_timeout = 60
@@ -219,7 +267,7 @@ netprobe_timeout = 60
 ## On other operating systems, the connection will be initialized
 ## but nothing will be sent at all.
 
-netprobe_address = "9.9.9.9:53"
+netprobe_address = '9.9.9.9:53'
 
 
 ## Offline mode - Do not use any remote encrypted servers.
@@ -229,9 +277,19 @@ netprobe_address = "9.9.9.9:53"
 # offline_mode = false
 
 
+## Additional data to attach to outgoing queries.
+## These strings will be added as TXT records to queries.
+## Do not use, except on servers explicitly asking for extra data
+## to be present.
+## encrypted-dns-server can be configured to use this for access control
+## in the [access_control] section
+
+# query_meta = ['key1:value1', 'key2:value2', 'token:MySecretToken']
+
+
 ## Automatic log files rotation
 
-# Maximum log files size in MB
+# Maximum log files size in MB - Set to 0 for unlimited.
 log_files_max_size = 10
 
 # How long to keep backup files, in days
@@ -246,13 +304,34 @@ log_files_max_backups = 1
 #        Filters        #
 #########################
 
+## Note: if you are using dnsmasq, disable the `dnssec` option in dnsmasq if you
+## configure dnscrypt-proxy to do any kind of filtering (including the filters
+## below and blocklists).
+## You can still choose resolvers that do DNSSEC validation.
+
+
 ## Immediately respond to IPv6-related queries with an empty response
 ## This makes things faster when there is no IPv6 connectivity, but can
 ## also cause reliability issues with some stub resolvers.
-## Do not enable if you added a validating resolver such as dnsmasq in front
-## of the proxy.
 
-block_ipv6 = false
+block_ipv6 = true
+
+
+## Immediately respond to A and AAAA queries for host names without a domain name
+
+block_unqualified = true
+
+
+## Immediately respond to queries for local zones instead of leaking them to
+## upstream resolvers (always causing errors or timeouts).
+
+block_undelegated = true
+
+
+## TTL for synthetic responses sent when a request has been blocked (due to
+## IPv6 or blocklists).
+
+reject_ttl = 10
 
 
 
@@ -260,9 +339,7 @@ block_ipv6 = false
 #        Route queries for specific domains to a dedicated set of servers        #
 ##################################################################################
 
-## Example map entries (one entry per line):
-## example.com 9.9.9.9
-## example.net 9.9.9.9,8.8.8.8,1.1.1.1
+## See the `example-forwarding-rules.txt` file for an example
 
 # forwarding_rules = 'forwarding-rules.txt'
 
@@ -276,12 +353,14 @@ block_ipv6 = false
 ## In addition to acting as a HOSTS file, it can also return the IP address
 ## of a different name. It will also do CNAME flattening.
 ##
-## Example map entries (one entry per line)
-## example.com     10.1.1.1
-## www.google.com  forcesafesearch.google.com
+## See the `example-cloaking-rules.txt` file for an example
 
 # cloaking_rules = 'cloaking-rules.txt'
 
+## TTL used when serving entries in cloaking-rules.txt
+
+# cloak_ttl = 600
+
 
 
 ###########################
@@ -295,12 +374,12 @@ cache = true
 
 ## Cache size
 
-cache_size = 512
+cache_size = 4096
 
 
 ## Minimum TTL for cached entries
 
-cache_min_ttl = 600
+cache_min_ttl = 2400
 
 
 ## Maximum TTL for cached entries
@@ -319,6 +398,51 @@ cache_neg_max_ttl = 600
 
 
 
+########################################
+#        Captive portal handling       #
+########################################
+
+[captive_portals]
+
+## A file that contains a set of names used by operating systems to
+## check for connectivity and captive portals, along with hard-coded
+## IP addresses to return.
+
+# map_file = 'example-captive-portals.txt'
+
+
+
+##################################
+#        Local DoH server        #
+##################################
+
+[local_doh]
+
+## dnscrypt-proxy can act as a local DoH server. By doing so, web browsers
+## requiring a direct connection to a DoH server in order to enable some
+## features will enable these, without bypassing your DNS proxy.
+
+## Addresses that the local DoH server should listen to
+
+# listen_addresses = ['127.0.0.1:3000']
+
+
+## Path of the DoH URL. This is not a file, but the part after the hostname
+## in the URL. By convention, `/dns-query` is frequently chosen.
+## For each `listen_address` the complete URL to access the server will be:
+## `https://<listen_address><path>` (ex: `https://127.0.0.1/dns-query`)
+
+# path = '/dns-query'
+
+
+## Certificate file and key - Note that the certificate has to be trusted.
+## See the documentation (wiki) for more information.
+
+# cert_file = 'localhost.pem'
+# cert_key_file = 'localhost.pem'
+
+
+
 ###############################
 #        Query logging        #
 ###############################
@@ -327,7 +451,8 @@ cache_neg_max_ttl = 600
 
 [query_log]
 
-  ## Path to the query log file (absolute, or relative to the same directory as the executable file)
+  ## Path to the query log file (absolute, or relative to the same directory as the config file)
+  ## Can be set to /dev/stdout in order to log to the standard output.
 
   # file = 'query.log'
 
@@ -353,7 +478,7 @@ cache_neg_max_ttl = 600
 
 [nx_log]
 
-  ## Path to the query log file (absolute, or relative to the same directory as the executable file)
+  ## Path to the query log file (absolute, or relative to the same directory as the config file)
 
   # file = 'nx.log'
 
@@ -365,10 +490,10 @@ cache_neg_max_ttl = 600
 
 
 ######################################################
-#        Pattern-based blocking (blacklists)        #
+#        Pattern-based blocking (blocklists)        #
 ######################################################
 
-## Blacklists are made of one pattern per line. Example of valid patterns:
+## Blocklists are made of one pattern per line. Example of valid patterns:
 ##
 ##   example.com
 ##   =example.com
@@ -377,20 +502,20 @@ cache_neg_max_ttl = 600
 ##   ads*.example.*
 ##   ads*.example[0-9]*.com
 ##
-## Example blacklist files can be found at https://download.dnscrypt.info/blacklists/
-## A script to build blacklists from public feeds can be found in the
-## `utils/generate-domains-blacklists` directory of the dnscrypt-proxy source code.
+## Example blocklist files can be found at https://download.dnscrypt.info/blocklists/
+## A script to build blocklists from public feeds can be found in the
+## `utils/generate-domains-blocklists` directory of the dnscrypt-proxy source code.
 
-[blacklist]
+[blocked_names]
 
-  ## Path to the file of blocking rules (absolute, or relative to the same directory as the executable file)
+  ## Path to the file of blocking rules (absolute, or relative to the same directory as the config file)
 
-  # blacklist_file = 'blacklist.txt'
+  # blocked_names_file = 'blocked-names.txt'
 
 
   ## Optional path to a file logging blocked queries
 
-  # log_file = 'blocked.log'
+  # log_file = 'blocked-names.log'
 
 
   ## Optional log format: tsv or ltsv (default: tsv)
@@ -400,25 +525,25 @@ cache_neg_max_ttl = 600
 
 
 ###########################################################
-#        Pattern-based IP blocking (IP blacklists)        #
+#        Pattern-based IP blocking (IP blocklists)        #
 ###########################################################
 
-## IP blacklists are made of one pattern per line. Example of valid patterns:
+## IP blocklists are made of one pattern per line. Example of valid patterns:
 ##
 ##   127.*
 ##   fe80:abcd:*
 ##   192.168.1.4
 
-[ip_blacklist]
+[blocked_ips]
 
-  ## Path to the file of blocking rules (absolute, or relative to the same directory as the executable file)
+  ## Path to the file of blocking rules (absolute, or relative to the same directory as the config file)
 
-  # blacklist_file = 'ip-blacklist.txt'
+  # blocked_ips_file = 'blocked-ips.txt'
 
 
   ## Optional path to a file logging blocked queries
 
-  # log_file = 'ip-blocked.log'
+  # log_file = 'blocked-ips.log'
 
 
   ## Optional log format: tsv or ltsv (default: tsv)
@@ -428,26 +553,53 @@ cache_neg_max_ttl = 600
 
 
 ######################################################
-#   Pattern-based whitelisting (blacklists bypass)   #
+#   Pattern-based allow lists (blocklists bypass)   #
 ######################################################
 
-## Whitelists support the same patterns as blacklists
-## If a name matches a whitelist entry, the corresponding session
+## Allowlists support the same patterns as blocklists
+## If a name matches an allowlist entry, the corresponding session
 ## will bypass names and IP filters.
 ##
 ## Time-based rules are also supported to make some websites only accessible at specific times of the day.
 
-[whitelist]
+[allowed_names]
+
+  ## Path to the file of allow list rules (absolute, or relative to the same directory as the config file)
+
+  # allowed_names_file = 'allowed-names.txt'
+
+
+  ## Optional path to a file logging allowed queries
 
-  ## Path to the file of whitelisting rules (absolute, or relative to the same directory as the executable file)
+  # log_file = 'allowed-names.log'
 
-  # whitelist_file = 'whitelist.txt'
+
+  ## Optional log format: tsv or ltsv (default: tsv)
+
+  # log_format = 'tsv'
 
 
-  ## Optional path to a file logging whitelisted queries
 
-  # log_file = 'whitelisted.log'
+#########################################################
+#   Pattern-based allowed IPs lists (blocklists bypass) #
+#########################################################
+
+## Allowed IP lists support the same patterns as IP blocklists
+## If an IP response matches an allow ip entry, the corresponding session
+## will bypass IP filters.
+##
+## Time-based rules are also supported to make some websites only accessible at specific times of the day.
+
+[allowed_ips]
 
+  ## Path to the file of allowed ip rules (absolute, or relative to the same directory as the config file)
+
+  # allowed_ips_file = 'allowed-ips.txt'
+
+
+  ## Optional path to a file logging allowed queries
+
+  # log_file = 'allowed-ips.log'
 
   ## Optional log format: tsv or ltsv (default: tsv)
 
@@ -460,13 +612,12 @@ cache_neg_max_ttl = 600
 ##########################################
 
 ## One or more weekly schedules can be defined here.
-## Patterns in the name-based blocklist can optionally be followed with @schedule_name
+## Patterns in the name-based blocked_names file can optionally be followed with @schedule_name
 ## to apply the pattern 'schedule_name' only when it matches a time range of that schedule.
 ##
-## For example, the following rule in a blacklist file:
+## For example, the following rule in a blocklist file:
 ## *.youtube.* @time-to-sleep
-## would block access to YouTube only during the days, and period of the days
-## define by the 'time-to-sleep' schedule.
+## would block access to YouTube during the times defined by the 'time-to-sleep' schedule.
 ##
 ## {after='21:00', before= '7:00'} matches 0:00-7:00 and 21:00-0:00
 ## {after= '9:00', before='18:00'} matches 9:00-18:00
@@ -507,43 +658,200 @@ cache_neg_max_ttl = 600
 ## must include the prefixes.
 ##
 ## If the `urls` property is missing, cache files and valid signatures
-## must be already present; This doesn't prevent these cache files from
+## must already be present. This doesn't prevent these cache files from
 ## expiring after `refresh_delay` hours.
+## Cache freshness is checked every 24 hours, so values for 'refresh_delay'
+## of less than 24 hours will have no effect.
+## A maximum delay of 168 hours (1 week) is imposed to ensure cache freshness.
 
 [sources]
 
   ## An example of a remote source from https://github.com/DNSCrypt/dnscrypt-resolvers
 
   [sources.'public-resolvers']
-  urls = ['https://raw.githubusercontent.com/DNSCrypt/dnscrypt-resolvers/master/v2/public-resolvers.md', 'https://download.dnscrypt.info/resolvers-list/v2/public-resolvers.md']
-  cache_file = 'public-resolvers.md'
-  minisign_key = 'RWQf6LRCGA9i53mlYecO4IzT51TGPpvWucNSCh1CBM0QTaLn73Y7GFO3'
-  refresh_delay = 72
-  prefix = ''
-
-  ## Quad9 over DNSCrypt - https://quad9.net/
+    urls = ['https://raw.githubusercontent.com/DNSCrypt/dnscrypt-resolvers/master/v3/public-resolvers.md', 'https://download.dnscrypt.info/resolvers-list/v3/public-resolvers.md', 'https://ipv6.download.dnscrypt.info/resolvers-list/v3/public-resolvers.md', 'https://download.dnscrypt.net/resolvers-list/v3/public-resolvers.md']
+    cache_file = 'public-resolvers.md'
+    minisign_key = 'RWQf6LRCGA9i53mlYecO4IzT51TGPpvWucNSCh1CBM0QTaLn73Y7GFO3'
+    refresh_delay = 72
+    prefix = ''
+
+  ## Anonymized DNS relays
+
+  [sources.'relays']
+    urls = ['https://raw.githubusercontent.com/DNSCrypt/dnscrypt-resolvers/master/v3/relays.md', 'https://download.dnscrypt.info/resolvers-list/v3/relays.md', 'https://ipv6.download.dnscrypt.info/resolvers-list/v3/relays.md', 'https://download.dnscrypt.net/resolvers-list/v3/relays.md']
+    cache_file = 'relays.md'
+    minisign_key = 'RWQf6LRCGA9i53mlYecO4IzT51TGPpvWucNSCh1CBM0QTaLn73Y7GFO3'
+    refresh_delay = 72
+    prefix = ''
+
+  ## ODoH (Oblivious DoH) servers and relays
+
+  # [sources.'odoh-servers']
+  #   urls = ['https://raw.githubusercontent.com/DNSCrypt/dnscrypt-resolvers/master/v3/odoh-servers.md', 'https://download.dnscrypt.info/resolvers-list/v3/odoh-servers.md', 'https://ipv6.download.dnscrypt.info/resolvers-list/v3/odoh-servers.md', 'https://download.dnscrypt.net/resolvers-list/v3/odoh-servers.md']
+  #   cache_file = 'odoh-servers.md'
+  #   minisign_key = 'RWQf6LRCGA9i53mlYecO4IzT51TGPpvWucNSCh1CBM0QTaLn73Y7GFO3'
+  #   refresh_delay = 24
+  #   prefix = ''
+  # [sources.'odoh-relays']
+  #   urls = ['https://raw.githubusercontent.com/DNSCrypt/dnscrypt-resolvers/master/v3/odoh-relays.md', 'https://download.dnscrypt.info/resolvers-list/v3/odoh-relays.md', 'https://ipv6.download.dnscrypt.info/resolvers-list/v3/odoh-relays.md', 'https://download.dnscrypt.net/resolvers-list/v3/odoh-relays.md']
+  #   cache_file = 'odoh-relays.md'
+  #   minisign_key = 'RWQf6LRCGA9i53mlYecO4IzT51TGPpvWucNSCh1CBM0QTaLn73Y7GFO3'
+  #   refresh_delay = 24
+  #   prefix = ''
+
+  ## Quad9
 
   # [sources.quad9-resolvers]
-  # urls = ["https://www.quad9.net/quad9-resolvers.md"]
-  # minisign_key = "RWQBphd2+f6eiAqBsvDZEBXBGHQBJfeG6G+wJPPKxCZMoEQYpmoysKUN"
-  # cache_file = "quad9-resolvers.md"
-  # refresh_delay = 72
-  # prefix = "quad9-"
+  #   urls = ['https://www.quad9.net/quad9-resolvers.md']
+  #   minisign_key = 'RWQBphd2+f6eiAqBsvDZEBXBGHQBJfeG6G+wJPPKxCZMoEQYpmoysKUN'
+  #   cache_file = 'quad9-resolvers.md'
+  #   prefix = 'quad9-'
 
   ## Another example source, with resolvers censoring some websites not appropriate for children
   ## This is a subset of the `public-resolvers` list, so enabling both is useless
 
   #  [sources.'parental-control']
-  #  urls = ['https://raw.githubusercontent.com/DNSCrypt/dnscrypt-resolvers/master/v2/parental-control.md', 'https://download.dnscrypt.info/resolvers-list/v2/parental-control.md']
-  #  cache_file = 'parental-control.md'
-  #  minisign_key = 'RWQf6LRCGA9i53mlYecO4IzT51TGPpvWucNSCh1CBM0QTaLn73Y7GFO3'
+  #    urls = ['https://raw.githubusercontent.com/DNSCrypt/dnscrypt-resolvers/master/v3/parental-control.md', 'https://download.dnscrypt.info/resolvers-list/v3/parental-control.md', 'https://ipv6.download.dnscrypt.info/resolvers-list/v3/parental-control.md', 'https://download.dnscrypt.net/resolvers-list/v3/parental-control.md']
+  #    cache_file = 'parental-control.md'
+  #    minisign_key = 'RWQf6LRCGA9i53mlYecO4IzT51TGPpvWucNSCh1CBM0QTaLn73Y7GFO3'
+
+
+
+#########################################
+#        Servers with known bugs        #
+#########################################
+
+[broken_implementations]
+
+# Cisco servers currently cannot handle queries larger than 1472 bytes, and don't
+# truncate reponses larger than questions as expected by the DNSCrypt protocol.
+# This prevents large responses from being received over UDP and over relays.
+#
+# Older versions of the `dnsdist` server software had a bug with queries larger
+# than 1500 bytes. This is fixed since `dnsdist` version 1.5.0, but
+# some server may still run an outdated version.
+#
+# The list below enables workarounds to make non-relayed usage more reliable
+# until the servers are fixed.
+
+fragments_blocked = ['cisco', 'cisco-ipv6', 'cisco-familyshield', 'cisco-familyshield-ipv6', 'cleanbrowsing-adult', 'cleanbrowsing-adult-ipv6', 'cleanbrowsing-family', 'cleanbrowsing-family-ipv6', 'cleanbrowsing-security', 'cleanbrowsing-security-ipv6']
+
+
+
+#################################################################
+#        Certificate-based client authentication for DoH        #
+#################################################################
+
+# Use a X509 certificate to authenticate yourself when connecting to DoH servers.
+# This is only useful if you are operating your own, private DoH server(s).
+# 'creds' maps servers to certificates, and supports multiple entries.
+# If you are not using the standard root CA, an optional "root_ca"
+# property set to the path to a root CRT file can be added to a server entry.
+
+[doh_client_x509_auth]
+
+#
+# creds = [
+#    { server_name='*', client_cert='client.crt', client_key='client.key' }
+# ]
+
+
+
+################################
+#        Anonymized DNS        #
+################################
+
+[anonymized_dns]
+
+## Routes are indirect ways to reach DNSCrypt servers.
+##
+## A route maps a server name ("server_name") to one or more relays that will be
+## used to connect to that server.
+##
+## A relay can be specified as a DNS Stamp (either a relay stamp, or a
+## DNSCrypt stamp) or a server name.
+##
+## The following example routes "example-server-1" via `anon-example-1` or `anon-example-2`,
+## and "example-server-2" via the relay whose relay DNS stamp is
+## "sdns://gRIxMzcuNzQuMjIzLjIzNDo0NDM".
+##
+## !!! THESE ARE JUST EXAMPLES !!!
+##
+## Review the list of available relays from the "relays.md" file, and, for each
+## server you want to use, define the relays you want connections to go through.
+##
+## Carefully choose relays and servers so that they are run by different entities.
+##
+## "server_name" can also be set to "*" to define a default route, for all servers:
+## { server_name='*', via=['anon-example-1', 'anon-example-2'] }
+##
+## If a route is ["*"], the proxy automatically picks a relay on a distinct network.
+## { server_name='*', via=['*'] } is also an option, but is likely to be suboptimal.
+##
+## Manual selection is always recommended over automatic selection, so that you can
+## select (relay,server) pairs that work well and fit your own criteria (close by or
+## in different countries, operated by different entities, on distinct ISPs...)
+
+ routes = [
+    { server_name='ams-dnscrypt-nl', via=['sdns://gRE4OS4zOC4xMzEuMzg6NDM0Mw', 'sdns://gQ4zNy4xMjAuMTQyLjExNQ', 'sdns://gQ8xMjguMTI3LjEwNC4xMDg'] },
+    { server_name='ams-dnscrypt-nl-ipv6', via=['sdns://gQ4zNy4xMjAuMTQyLjExNQ', 'sdns://gRpbMmEwYzpiOWMwOmY6NDUxZDo6MV06NDM0Mw', 'sdns://gQ8xMjguMTI3LjEwNC4xMDg'] }
+ ]
+
+
+# Skip resolvers incompatible with anonymization instead of using them directly
+
+skip_incompatible = true
+
+
+# If public server certificates for a non-conformant server cannot be
+# retrieved via a relay, try getting them directly. Actual queries
+# will then always go through relays.
+
+# direct_cert_fallback = false
+
+
+
+###############################
+#            DNS64            #
+###############################
+
+## DNS64 is a mechanism for synthesizing AAAA records from A records.
+## It is used with an IPv6/IPv4 translator to enable client-server
+## communication between an IPv6-only client and an IPv4-only server,
+## without requiring any changes to either the IPv6 or the IPv4 node,
+## for the class of applications that work through NATs.
+##
+## There are two options to synthesize such records:
+## Option 1: Using a set of static IPv6 prefixes;
+## Option 2: By discovering the IPv6 prefix from DNS64-enabled resolver.
+##
+## If both options are configured - only static prefixes are used.
+## (Ref. RFC6147, RFC6052, RFC7050)
+##
+## Do not enable unless you know what DNS64 is and why you need it, or else
+## you won't be able to connect to anything at all.
+
+[dns64]
+
+## (Option 1) Static prefix(es) as Pref64::/n CIDRs.
+# prefix = ['64:ff9b::/96']
+
+## (Option 2) DNS64-enabled resolver(s) to discover Pref64::/n CIDRs.
+## These resolvers are used to query for Well-Known IPv4-only Name (WKN) "ipv4only.arpa." to discover only.
+## Set with your ISP's resolvers in case of custom prefixes (other than Well-Known Prefix 64:ff9b::/96).
+## IMPORTANT: Default resolvers listed below support Well-Known Prefix 64:ff9b::/96 only.
+# resolver = ['[2606:4700:4700::64]:53', '[2001:4860:4860::64]:53']
+
 
 
+########################################
+#            Static entries            #
+########################################
 
 ## Optional, local, static list of additional servers
 ## Mostly useful for testing your own servers.
 
 [static]
 
-  # [static.'google']
-  # stamp = 'sdns://AgUAAAAAAAAAAAAOZG5zLmdvb2dsZS5jb20NL2V4cGVyaW1lbnRhbA'
+  # [static.'myserver']
+  # stamp = 'sdns://AQcAAAAAAAAAAAAQMi5kbnNjcnlwdC1jZXJ0Lg'
diff --git a/network/dnscrypt-proxy/dnsmasq.conf b/network/dnscrypt-proxy/dnsmasq.conf
deleted file mode 100644
index 9700cb2df9..0000000000
--- a/network/dnscrypt-proxy/dnsmasq.conf
+++ /dev/null
@@ -1,21 +0,0 @@
-# Use dnsmasq as a caching DNS forwarder to dnscrypt-proxy. This configuration
-# assumes dnscrypt-proxy is running on port 55.
-
-# Never forward plain names (without a dot or domain part)
-domain-needed
-
-# Never forward addresses in the non-routed address spaces.
-bogus-priv
-
-# Don't use /etc/resolv.conf. Forward all queries to dnscrypt-proxy.
-no-resolv
-
-# Use the resolver on localhost port 55 (dnscrypt-proxy)
-server=127.0.0.1#55
-
-# Listen on localhost. Default port 53
-listen-address=127.0.0.1
-
-# Pass on the upstream DNSSEC flag. Only enable this if you trust the upstream
-# resolver.
-#proxy-dnssec
diff --git a/network/dnscrypt-proxy/doinst.sh b/network/dnscrypt-proxy/doinst.sh
index e264e34a56..c648875656 100644
--- a/network/dnscrypt-proxy/doinst.sh
+++ b/network/dnscrypt-proxy/doinst.sh
@@ -1,27 +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...
-}
+#!/bin/bash
 
-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
-}
+# dnscrypt-proxy writes files to its data directories after
+# dropping privileges. This ensures $DNSCRYPT_USER can write
+# files to these directories, without having to change default
+# root:root in slackware.
+#
+# This is a workaround, might not be a elegant solution.
 
-preserve_perms etc/rc.d/rc.dnscrypt-proxy.new
-config etc/default/dnscrypt-proxy.new
-config etc/dnscrypt-proxy/dnscrypt-proxy.toml.new
+PRGNAM=dnscrypt-proxy
+DNSCRYPT_UID=293
+DNSCRYPT_GID=293
+
+chown $DNSCRYPT_UID:$DNSCRYPT_GID etc/$PRGNAM/*
+
+setfacl -m u:$DNSCRYPT_UID:rwx etc/$PRGNAM
+setfacl -m u:$DNSCRYPT_UID:rwx var/run/$PRGNAM
+setfacl -m u:$DNSCRYPT_UID:rwx var/log/$PRGNAM
diff --git a/network/dnscrypt-proxy/named.conf b/network/dnscrypt-proxy/named.conf
deleted file mode 100644
index b416855f26..0000000000
--- a/network/dnscrypt-proxy/named.conf
+++ /dev/null
@@ -1,153 +0,0 @@
-options {
-	directory "/var/named";
-	/*
-	 * If there is a firewall between you and nameservers you want
-	 * to talk to, you might need to uncomment the query-source
-	 * directive below.  Previous versions of BIND always asked
-	 * questions using port 53, but BIND 8.1 uses an unprivileged
-	 * port by default.
-	 */
-	// query-source address * port 53;
-	forwarders { 127.0.0.1 port 55; };
-	forward only;
-	dnssec-enable yes;
-	dnssec-validation auto;
-	dnssec-lookaside auto;
-	allow-transfer { "none"; };
-	allow-query { 127.0.0.1; };
-	listen-on { 127.0.0.1; };
-};
-
-// 
-// a caching only nameserver config
-// 
-zone "." IN {
-	type hint;
-	file "caching-example/named.root";
-};
-
-zone "localhost" IN {
-	type master;
-	file "caching-example/localhost.zone";
-	allow-update { none; };
-};
-
-zone "0.0.127.in-addr.arpa" IN {
-	type master;
-	file "caching-example/named.local";
-	allow-update { none; };
-};
-
-// RFC 1918. These shouldn't be necessary but empty-zones-enable isn't
-// working properly...
-zone "10.in-addr.arpa" IN {
-	type master;
-	file "caching-example/named.local";
-	allow-update { none; };
-};
-
-zone "16.172.in-addr.arpa" IN {
-	type master;
-	file "caching-example/named.local";
-	allow-update { none; };
-};
-
-zone "17.172.in-addr.arpa" IN {
-	type master;
-	file "caching-example/named.local";
-	allow-update { none; };
-};
-
-zone "18.172.in-addr.arpa" IN {
-	type master;
-	file "caching-example/named.local";
-	allow-update { none; };
-};
-
-zone "19.172.in-addr.arpa" IN {
-	type master;
-	file "caching-example/named.local";
-	allow-update { none; };
-};
-
-zone "20.172.in-addr.arpa" IN {
-	type master;
-	file "caching-example/named.local";
-	allow-update { none; };
-};
-
-zone "21.172.in-addr.arpa" IN {
-	type master;
-	file "caching-example/named.local";
-	allow-update { none; };
-};
-
-zone "22.172.in-addr.arpa" IN {
-	type master;
-	file "caching-example/named.local";
-	allow-update { none; };
-};
-
-zone "23.172.in-addr.arpa" IN {
-	type master;
-	file "caching-example/named.local";
-	allow-update { none; };
-};
-
-zone "24.172.in-addr.arpa" IN {
-	type master;
-	file "caching-example/named.local";
-	allow-update { none; };
-};
-
-zone "25.172.in-addr.arpa" IN {
-	type master;
-	file "caching-example/named.local";
-	allow-update { none; };
-};
-
-zone "26.172.in-addr.arpa" IN {
-	type master;
-	file "caching-example/named.local";
-	allow-update { none; };
-};
-
-zone "27.172.in-addr.arpa" IN {
-	type master;
-	file "caching-example/named.local";
-	allow-update { none; };
-};
-
-zone "28.172.in-addr.arpa" IN {
-	type master;
-	file "caching-example/named.local";
-	allow-update { none; };
-};
-
-zone "29.172.in-addr.arpa" IN {
-	type master;
-	file "caching-example/named.local";
-	allow-update { none; };
-};
-
-zone "30.172.in-addr.arpa" IN {
-	type master;
-	file "caching-example/named.local";
-	allow-update { none; };
-};
-
-zone "31.172.in-addr.arpa" IN {
-	type master;
-	file "caching-example/named.local";
-	allow-update { none; };
-};
-
-zone "168.192.in-addr.arpa" IN {
-	type master;
-	file "caching-example/named.local";
-	allow-update { none; };
-};
-
-logging {
-	category edns-disabled { null; };
-};
diff --git a/network/dnscrypt-proxy/rc.dnscrypt-proxy b/network/dnscrypt-proxy/rc.dnscrypt-proxy
index 1aa68260b9..49cd4dc984 100644
--- a/network/dnscrypt-proxy/rc.dnscrypt-proxy
+++ b/network/dnscrypt-proxy/rc.dnscrypt-proxy
@@ -1,134 +1,76 @@
-#!/bin/bash
-
-CONFIGFILE="/etc/default/dnscrypt-proxy"
-DAEMON="/usr/sbin/dnscrypt-proxy"
-
-. $CONFIGFILE
-
-start_instance() {
-    if [ ! -r ${DNSCRYPTCONFIG[$1]} ]; then
-        echo "No configuration for instance $1 found!"
-        return
-    fi
-    if [ -z ${PIDFILE[$1]} ]; then
-        echo "No PID configuration for instance $1 found!"
-        return
-    fi
-    if [ -z ${USER[$1]} ]; then
-        echo "No user configuration for instance $1 found!"
-        return
-    fi
-    if [ -r ${PIDFILE[$1]} ]; then
-        echo "dnscrypt-proxy (instance $1) already running!"
-        return
-    fi
-
-    mkdir -p $(dirname ${PIDFILE[$1]})
-    # The child (unprivileged) process needs write access or the PID will not
-    # be written.
-    chmod 0700 $(dirname ${PIDFILE[$1]})
-    chown ${USER[$1]} $(dirname ${PIDFILE[$1]})
-
-    # The new Go-based dnscrypt-proxy no longer has the ability to daemonize.
-    # In the absence of a standard Slackware daemon tool we'll use nohup. :(
-    nohup $DAEMON -config ${DNSCRYPTCONFIG[$1]} -pidfile ${PIDFILE[$1]} >> /dev/null 2>&1 &
-}
+#!/bin/sh
 
-stop_instance() {
-    if [ ! -r ${DNSCRYPTCONFIG[$1]} ]; then
-        echo "No configuration for instance $1 found!"
-        return
-    fi
-    if [ -z ${PIDFILE[$1]} ]; then
-        echo "No PID configuration for instance $1 found!"
-        return
-    fi
-    if [ ! -r ${PIDFILE[$1]} ]; then
-        echo "dnscrypt-proxy (instance $1) is not running!"
-        return
-    fi
-    echo "Stopping dnscrypt-proxy (instance $1)..."
-    kill $(cat ${PIDFILE[$1]})
-}
+# Init file for dnscrypt-proxy
 
-status_instance() {
-    if [ ! -r ${DNSCRYPTCONFIG[$1]} ]; then
-        echo "No configuration for instance $1 found!"
-        return
-    fi
-    if [ -z ${PIDFILE[$1]} ]; then
-        echo "No PID configuration for instance $1 found!"
-        return
-    fi
-    if [ ! -r ${PIDFILE[$1]} ]; then
-        echo "dnscrypt-proxy (instance $1) is not running."
-        return
-    fi
-    PID=$(cat ${PIDFILE[$1]})
-    if [ -z "$PID" ]; then
-        echo "PID file is empty! dnscrypt-proxy (instance $1) does not appear to be running, but there is a stale PID file."
-    elif kill -0 $PID ; then
-        echo "dnscrypt-proxy (instance $1) is running."
-    else
-        echo "dnscrypt-proxy (instance $1) is not running, but there is a stale PID file."
-    fi
-}
+CONFDIR="/etc/dnscrypt-proxy"
+LOGDIR="/var/log/dnscrypt-proxy"
+RUNDIR="/var/run/dnscrypt-proxy"
+
+OPTS="-config $CONFDIR/dnscrypt-proxy.toml -pidfile $RUNDIR/dnscrypt-proxy.pid -logfile $LOGDIR/dnscrypt-proxy.log"
+
+PID=$(cat /var/run/dnscrypt-proxy/dnscrypt-proxy.pid 2>/dev/null)
 
 start() {
-    for i in `/usr/bin/seq 0 $((${#DNSCRYPTCONFIG[@]}-1))`
-    do
-        start_instance $i
-    done
+    echo "Starting DNSCrypt-proxy"
+    /usr/bin/dnscrypt-proxy $OPTS &
 }
 
 stop() {
-    for i in `/usr/bin/seq 0 $((${#DNSCRYPTCONFIG[@]}-1))`
-    do
-        stop_instance $i
-    done
+    echo "Stopping DNSCrypt-proxy"
+
+if [ -z $PID ]; then
+    echo "Not running"
+    exit 0
+fi
+
+if kill -15 $PID 2>/dev/null; then
+    echo "Stopped"
+    rm $RUNDIR/dnscrypt-proxy.pid 2>/dev/null
+else
+    sleep 1
+if kill -9 $PID 2>/dev/null; then
+    echo "Killed"
+    rm $RUNDIR/dnscrypt-proxy.pid 2>/dev/null
+else
+    echo "Error"
+    exit 1
+fi
+fi
+
 }
 
 status() {
-    for i in `/usr/bin/seq 0 $((${#DNSCRYPTCONFIG[@]}-1))`
-    do
-        status_instance $i
-    done
+
+if [ -z $PID ]; then
+    echo "Not running"
+    exit 0
+else
+    echo "Running"
+    exit 0
+fi
+
 }
 
 case "$1" in
-    'start')
-        start
-        ;;
-    'stop')
-        stop
-        ;;
-    'restart')
-        stop
-        start
-        ;;
-    'status')
-        status
-        ;;
-    *_start)
-        INSTANCE=`echo $1 | /bin/cut -d '_' -f 1`
-        start_instance $INSTANCE
-        ;;
-    *_stop)
-        INSTANCE=`echo $1 | /bin/cut -d '_' -f 1`
-        stop_instance $INSTANCE
-        ;;
-    *_restart)
-        INSTANCE=`echo $1 | /bin/cut -d '_' -f 1`
-        stop_instance $INSTANCE
-        sleep 1
-        start_instance $INSTANCE
-        ;;
-    *_status)
-        INSTANCE=`echo $1 | /bin/cut -d '_' -f 1`
-        status_instance $INSTANCE
-        ;;
-    *)
-        echo "Usage: $0 {start|stop|restart|status|#_start|#_stop|#_restart}"
-        exit 1
-        ;;
+
+start)
+	start
+    ;;
+
+stop)
+    stop
+;;
+
+restart)
+    stop
+    sleep 3
+    start
+;;
+
+status)
+    status
+;;
+
+*)
+	echo "Usage: $0 (start|stop|restart|status)"
 esac
diff --git a/network/dnscrypt-proxy/slack-desc b/network/dnscrypt-proxy/slack-desc
index 46cdd370c5..092cd543f4 100644
--- a/network/dnscrypt-proxy/slack-desc
+++ b/network/dnscrypt-proxy/slack-desc
@@ -13,7 +13,7 @@ dnscrypt-proxy: your local resolver or as a DNS forwarder, encrypting and
 dnscrypt-proxy: authenticating requests using the DNSCrypt protocol and passing them
 dnscrypt-proxy: to an upstream DNSCrypt-enabled server.
 dnscrypt-proxy:
-dnscrypt-proxy: https://github.com/jedisct1/dnscrypt-proxy
 dnscrypt-proxy:
 dnscrypt-proxy:
 dnscrypt-proxy:
+dnscrypt-proxy: https://github.com/DNSCrypt/dnscrypt-proxy
diff --git a/network/dnscrypt-wrapper/README b/network/dnscrypt-wrapper/README
index b21182469a..076c9951d2 100644
--- a/network/dnscrypt-wrapper/README
+++ b/network/dnscrypt-wrapper/README
@@ -1,5 +1,5 @@
-dnscrypt-wrapper is a server-side DNSCrypt proxy that adds DNSCrypt support to
-any name resolver.
+dnscrypt-wrapper is a server-side DNSCrypt proxy that adds DNSCrypt
+support to any name resolver.
 
 Be sure to read README.Slackware for information on configuring/running
 dnscrypt-wrapper as a daemon!
diff --git a/network/dnscrypt-wrapper/dnscrypt-wrapper.SlackBuild b/network/dnscrypt-wrapper/dnscrypt-wrapper.SlackBuild
index 3d22ceec49..2f1a8b277f 100644
--- a/network/dnscrypt-wrapper/dnscrypt-wrapper.SlackBuild
+++ b/network/dnscrypt-wrapper/dnscrypt-wrapper.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for dnscrypt-wrapper
 
@@ -24,10 +24,13 @@
 
 # Thanks to Larry Hajali for the logrotate configuration
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=dnscrypt-wrapper
 VERSION=${VERSION:-0.4.2}
 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}
@@ -110,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/network/dnscrypt-wrapper/dnscrypt-wrapper.info b/network/dnscrypt-wrapper/dnscrypt-wrapper.info
index 4375be0958..64f000800f 100644
--- a/network/dnscrypt-wrapper/dnscrypt-wrapper.info
+++ b/network/dnscrypt-wrapper/dnscrypt-wrapper.info
@@ -5,6 +5,6 @@ DOWNLOAD="https://github.com/cofyc/dnscrypt-wrapper/archive/v0.4.2/dnscrypt-wrap
 MD5SUM="f384a825eb3ecdbdd960842f3c6e3f85"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="libsodium"
+REQUIRES=""
 MAINTAINER="T3slider"
 EMAIL="t3slider@gmail.com"
diff --git a/network/dnsmap/README b/network/dnsmap/README
index 7796d68b71..c6a80020f6 100644
--- a/network/dnsmap/README
+++ b/network/dnsmap/README
@@ -1,5 +1,5 @@
-dnsmap is mainly meant to be used by pentesters during the information 
-gathering/enumeration phase of infrastructure security assessments. 
-During the enumeration stage, the security consultant would typically 
-discover the target company's IP netblocks, domain names, phone numbers, 
-etc ...
+dnsmap is mainly meant to be used by pentesters during the information
+gathering/enumeration phase of infrastructure security assessments.
+During the enumeration stage, the security consultant would typically
+discover the target company's IP netblocks, domain names, phone
+numbers, etc ...
diff --git a/network/dnsmap/dnsmap.SlackBuild b/network/dnsmap/dnsmap.SlackBuild
index ae866d3b9e..a82e53094b 100644
--- a/network/dnsmap/dnsmap.SlackBuild
+++ b/network/dnsmap/dnsmap.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for dnsmap
 
@@ -20,10 +20,13 @@
 
 #  0. You just DO WHAT THE FUCK YOU WANT TO.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=dnsmap
 VERSION=${VERSION:-0.30}
 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}
@@ -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/network/dnsproxy-bin/README b/network/dnsproxy-bin/README
new file mode 100644
index 0000000000..c8f4a6e94a
--- /dev/null
+++ b/network/dnsproxy-bin/README
@@ -0,0 +1,21 @@
+dnsproxy is a simple DNS proxy server that supports all existing DNS
+protocols including DNS-over-TLS, DNS-over-HTTPS, DNSCrypt, and
+DNS-over-QUIC. Moreover, it can work as a DNS-over-HTTPS, DNS-over-TLS
+or DNS-over-QUIC server.
+
+This script packages the official prebuilt binary.
+
+A simple init script /etc/rc.d/rc.dnsproxy has been provided to run
+dnsproxy as a daemon.
+
+In most cases, dnsproxy should not be run as root. If there exists the
+user dnsproxy, the script /etc/rc.d/rc.dnsproxy will run dnsproxy as
+the user dnsproxy. This user can be created with:
+  groupadd -g 384 dnsproxy
+  useradd -u 384 -g 384 -s /sbin/nologin -M dnsproxy
+
+If the user dnsproxy does not exist, then the script
+/etc/rc.d/rc.dnsproxy will run dnsproxy as root.
+
+Also, the script /etc/rc.d/rc.dnsproxy assumes that the configuration
+file location is /etc/dnsproxy.yaml
diff --git a/network/dnsproxy-bin/dnsproxy-bin.SlackBuild b/network/dnsproxy-bin/dnsproxy-bin.SlackBuild
new file mode 100644
index 0000000000..7d3ceef21c
--- /dev/null
+++ b/network/dnsproxy-bin/dnsproxy-bin.SlackBuild
@@ -0,0 +1,89 @@
+#!/bin/bash
+
+# Slackware build script for dnsproxy-bin
+
+# Copyright 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=dnsproxy-bin
+VERSION=${VERSION:-0.69.2}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+       *) 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}
+
+case "$ARCH" in
+    i?86) SUFFIX="linux-386" ;;
+  x86_64) SUFFIX="linux-amd64" ;;
+       *) SUFFIX="linux-$ARCH" ;;
+esac
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $SUFFIX
+tar xvf $CWD/${PRGNAM%-bin}-$SUFFIX-v$VERSION.tar.gz
+cd $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 {} \;
+
+mkdir -p $PKG/usr/sbin $PKG/etc/rc.d
+install -m 0755 -o root -g root dnsproxy $PKG/usr/sbin
+install -m 0644 -o root -g root $CWD/rc.dnsproxy \
+    $PKG/etc/rc.d/rc.dnsproxy.new
+install -m 0644 -o root -g root $CWD/config.yaml.dist \
+    $PKG/etc/dnsproxy.yaml.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 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/network/dnsproxy-bin/dnsproxy-bin.info b/network/dnsproxy-bin/dnsproxy-bin.info
new file mode 100644
index 0000000000..49cb5070ea
--- /dev/null
+++ b/network/dnsproxy-bin/dnsproxy-bin.info
@@ -0,0 +1,14 @@
+PRGNAM="dnsproxy-bin"
+VERSION="0.69.2"
+HOMEPAGE="https://github.com/AdguardTeam/dnsproxy"
+DOWNLOAD="https://github.com/AdguardTeam/dnsproxy/releases/download/v0.69.2/dnsproxy-linux-386-v0.69.2.tar.gz \
+          https://raw.githubusercontent.com/AdguardTeam/dnsproxy/master/config.yaml.dist"
+MD5SUM="c05787d47e440ecdff651bf4d704cc41 \
+        5a8aaaacbc3aeb1af4aac34233f2d14b"
+DOWNLOAD_x86_64="https://github.com/AdguardTeam/dnsproxy/releases/download/v0.69.2/dnsproxy-linux-amd64-v0.69.2.tar.gz \
+                 https://raw.githubusercontent.com/AdguardTeam/dnsproxy/master/config.yaml.dist"
+MD5SUM_x86_64="8d388d605932435ce66344c89052c9a9 \
+               5a8aaaacbc3aeb1af4aac34233f2d14b"
+REQUIRES=""
+MAINTAINER="Alexander Verbovetsky"
+EMAIL="alik@ejik.org"
diff --git a/network/dnsproxy-bin/doinst.sh b/network/dnsproxy-bin/doinst.sh
new file mode 100644
index 0000000000..7ddb7da4e8
--- /dev/null
+++ b/network/dnsproxy-bin/doinst.sh
@@ -0,0 +1,23 @@
+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.dnsproxy.new
+config etc/dnsproxy.yaml.new
diff --git a/network/dnsproxy-bin/rc.dnsproxy b/network/dnsproxy-bin/rc.dnsproxy
new file mode 100644
index 0000000000..f71496a467
--- /dev/null
+++ b/network/dnsproxy-bin/rc.dnsproxy
@@ -0,0 +1,62 @@
+#!/bin/bash
+# Start/stop/restart the dnsproxy
+
+if [[ $EUID -ne 0 ]]; then
+   echo "This script must be run as root" 1>&2
+   exit 1
+fi
+
+name="dnsproxy"
+pidfiles=/run/"$name"
+mkdir -p $pidfiles
+if /bin/id "$name" &>/dev/null; then
+  chown $name:$name $pidfiles
+  daemon="/usr/bin/daemon --name=$name --pidfiles=$pidfiles --user=$name"
+else
+  daemon="/usr/bin/daemon --name=$name --pidfiles=$pidfiles"
+fi
+
+start_dnsproxy() {
+if $daemon --running; then
+  echo "$name is already running"
+else
+  echo "Starting $name..."
+  $daemon -- /usr/sbin/dnsproxy --config-path=/etc/dnsproxy.yaml
+fi
+}
+
+stop_dnsproxy() {
+if $daemon --running; then
+  echo "Stopping $name..."
+  $daemon --stop
+else
+  echo "$name is not running"
+fi
+}
+
+restart_dnsproxy() {
+  stop_dnsproxy
+  sleep 1
+  start_dnsproxy
+}
+
+status_dnsproxy() {
+  $daemon --running --verbose
+}
+
+case "$1" in
+'start')
+  start_dnsproxy
+  ;;
+'stop')
+  stop_dnsproxy
+  ;;
+'restart')
+  restart_dnsproxy
+  ;;
+'status')
+  status_dnsproxy
+  ;;
+*)
+  echo "usage $0 start|stop|restart|status"
+esac
diff --git a/network/dnsproxy-bin/slack-desc b/network/dnsproxy-bin/slack-desc
new file mode 100644
index 0000000000..a45ac3d72a
--- /dev/null
+++ b/network/dnsproxy-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------------------------------------------------------|
+dnsproxy-bin: dnsproxy-bin (DNS proxy server)
+dnsproxy-bin:
+dnsproxy-bin: dnsproxy is a simple DNS proxy server that supports all existing DNS
+dnsproxy-bin: protocols including DNS-over-TLS, DNS-over-HTTPS, DNSCrypt, and
+dnsproxy-bin: DNS-over-QUIC. Moreover, it can work as a DNS-over-HTTPS,
+dnsproxy-bin: DNS-over-TLS or DNS-over-QUIC server.
+dnsproxy-bin:
+dnsproxy-bin: This script packages the official prebuilt binary.
+dnsproxy-bin:
+dnsproxy-bin: Homepage: https://github.com/AdguardTeam/dnsproxy
+dnsproxy-bin:
diff --git a/network/dnstop/README b/network/dnstop/README
index b553554476..a34f6b94a8 100644
--- a/network/dnstop/README
+++ b/network/dnstop/README
@@ -1,5 +1,6 @@
-dnstop is a libpcap  application (ala tcpdump) that displays various tables
-of DNS traffic on your network. Currently dnstop displays tables of:
+dnstop is a libpcap application (ala tcpdump) that displays various
+tables of DNS traffic on your network. Currently dnstop displays
+tables of:
 
     * Source IP addresses
     * Destination IP addresses
@@ -13,16 +14,16 @@ of DNS traffic on your network. Currently dnstop displays tables of:
 
 dnstop supports both IPv4 and IPv6 addresses.
 
-To help find especially undesirable DNS queries, dnstop provides a number of
-filters. The filters tell dnstop to display only the following types of queries:
+To help find especially undesirable DNS queries, dnstop provides
+a number of filters. The filters tell dnstop to display only the
+following types of queries:
 
     * For unknown/invalid TLDs
     * A queries where the query name is already an IP address
     * PTR queries for RFC1918 address space
 
-dnstop can either read packets from the live capture device, or from a tcpdump
-savefile.
+dnstop can either read packets from the live capture device, or from a
+tcpdump savefile.
 
 --
 Unless modified, this script compiles with PPP frame support.
-
diff --git a/network/dnstop/dnstop.SlackBuild b/network/dnstop/dnstop.SlackBuild
index 7cbe6a6c2f..2ed41f7fd7 100644
--- a/network/dnstop/dnstop.SlackBuild
+++ b/network/dnstop/dnstop.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for dnstop
 
@@ -8,26 +8,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=dnstop
 VERSION=${VERSION:-20121017}
 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/network/dnstracer/dnstracer.SlackBuild b/network/dnstracer/dnstracer.SlackBuild
index 4298549e9e..2c546869b9 100644
--- a/network/dnstracer/dnstracer.SlackBuild
+++ b/network/dnstracer/dnstracer.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for dnstracer
 
@@ -9,10 +9,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=dnstracer
 VERSION=${VERSION:-1.10}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -22,7 +25,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
+# the name of the created package would be, and then exit. This information
+# could be useful to other scripts.
+if [ ! -z "${PRINT_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 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/network/dobbscoin/README b/network/dobbscoin/README
deleted file mode 100644
index b4cf808509..0000000000
--- a/network/dobbscoin/README
+++ /dev/null
@@ -1,8 +0,0 @@
-DobbsCOIN is an scrypt implementation, Crypto-Currency meme coin, based
-on the SubGenius Deity J.R. "BOB" Dobbs, and his Mighty 'Church of the
-SubGenius'
-
-qrencode is an optional but strongly recommended dependency.
-UPNP is disabled, it requires the optional dependency miniupnpc.
-
-Package provides both, dobbscoin-qt (GUI) and dobbscoind (CLI).
diff --git a/network/dobbscoin/dobbscoin-qt.desktop b/network/dobbscoin/dobbscoin-qt.desktop
deleted file mode 100644
index 8615c8d3e4..0000000000
--- a/network/dobbscoin/dobbscoin-qt.desktop
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Name=Dobbscoin
-GenericName=Dobbscoin QT-Client
-Comment=Dobbscoin client to send and receive money
-Exec=/usr/bin/dobbscoin-qt
-Icon=dobbscoin
-StartupNotify=true
-Terminal=false
-Type=Application
-Categories=Network;P2P;
diff --git a/network/dobbscoin/dobbscoin.SlackBuild b/network/dobbscoin/dobbscoin.SlackBuild
deleted file mode 100644
index defc639fc5..0000000000
--- a/network/dobbscoin/dobbscoin.SlackBuild
+++ /dev/null
@@ -1,123 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for dobbscoin
-
-# Copyright 2014  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.
-
-# based on bitcoin.SlackBuild by nomnombtc <nomnombtc@arcor.de>
-
-PRGNAM=dobbscoin
-VERSION=${VERSION:-0.10.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
-
-# Detect miniupnpc
-if [ -x /usr/bin/upnpc ]; then UPNP=1; else UPNP="-"; fi
-
-# Detect qrencode
-if [ -x /usr/bin/qrencode ]; then QRCODE=1; else QRCODE=0; fi
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-source-$VERSION
-tar xvf $CWD/${PRGNAM}-source-$VERSION.tar.gz || tar xvf $CWD/v$VERSION.tar.gz
-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 {} \;
-
-# Fix for miniupnpc >= 1.9.20150730.
-# Source: https://github.com/dogecoin/dogecoin/issues/1292
-patch -p1 < $CWD/miniupnpc-1.9-api.patch
-
-./autogen.sh
-
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
-  --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --mandir=/usr/man \
-  --docdir=/usr/doc/$PRGNAM-$VERSION \
-  --disable-silent-rules \
-  --enable-static=no \
-  --with-gui="${QTGUI:-qt4}" \
-  --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/man/man{1,5}
-install -m 0644 contrib/debian/manpages/*.1 $PKG/usr/man/man1/
-install -m 0644 contrib/debian/manpages/*.5 $PKG/usr/man/man5/
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-
-mkdir -p $PKG/usr/share/{applications,pixmaps}
-install -m 0644 contrib/debian/dobbscoin-qt.desktop $PKG/usr/share/applications/
-install -m 0644 share/pixmaps/dobbscoin128.xpm $PKG/usr/share/pixmaps/
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a doc/* COPYING contrib/debian/examples/dobbscoin.conf $PKG/usr/doc/$PRGNAM-$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/network/dobbscoin/dobbscoin.info b/network/dobbscoin/dobbscoin.info
deleted file mode 100644
index bd12b3870f..0000000000
--- a/network/dobbscoin/dobbscoin.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="dobbscoin"
-VERSION="0.10.1"
-HOMEPAGE="http://dobbscoin.info/"
-DOWNLOAD="https://github.com/dobbscoin/dobbscoin-source/archive/v0.10.1/dobbscoin-source-0.10.1.tar.gz"
-MD5SUM="7742688342b80820b7cf70db50d812f6"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="protobuf"
-MAINTAINER="Erik Hanson"
-EMAIL="erik@slackbuilds.org"
diff --git a/network/dobbscoin/doinst.sh b/network/dobbscoin/doinst.sh
deleted file mode 100644
index 140e332222..0000000000
--- a/network/dobbscoin/doinst.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-if [ -x /usr/bin/update-desktop-database ]; then
-  /usr/bin/update-desktop-database -q usr/share/applications
-fi
diff --git a/network/dobbscoin/miniupnpc-1.9-api.patch b/network/dobbscoin/miniupnpc-1.9-api.patch
deleted file mode 100644
index 2fe88bac4b..0000000000
--- a/network/dobbscoin/miniupnpc-1.9-api.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 984e204d7c60f0d0c5cc7d1c3a5daefcd7433f6e Mon Sep 17 00:00:00 2001
-From: acerix <dylan@psilly.com>
-Date: Wed, 7 Oct 2015 20:33:08 -0400
-Subject: [PATCH] apply bitcoin patch for miniupnpc 1.9
-
----
- src/net.cpp | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/src/net.cpp b/src/net.cpp
-index 279ee4d..f7ea000 100644
---- a/src/net.cpp
-+++ b/src/net.cpp
-@@ -1109,10 +1109,14 @@ void ThreadMapPort()
- #ifndef UPNPDISCOVER_SUCCESS
-     /* miniupnpc 1.5 */
-     devlist = upnpDiscover(2000, multicastif, minissdpdpath, 0);
--#else
-+#elif MINIUPNPC_API_VERSION < 14
-     /* miniupnpc 1.6 */
-     int error = 0;
-     devlist = upnpDiscover(2000, multicastif, minissdpdpath, 0, 0, &error);
-+#else
-+    /* miniupnpc 1.9.20150730 */
-+    int error = 0;
-+    devlist = upnpDiscover(2000, multicastif, minissdpdpath, 0, 0, 2, &error);
- #endif
- 
-     struct UPNPUrls urls;
diff --git a/network/dobbscoin/slack-desc b/network/dobbscoin/slack-desc
deleted file mode 100644
index a97e7f7c77..0000000000
--- a/network/dobbscoin/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------------------------------------------------------|
-dobbscoin: dobbscoin (The P2P currency of the Econocolypse)
-dobbscoin:
-dobbscoin: Dobbscoin is a peer-to-peer settlement instrument, a "currency like
-dobbscoin: electronic document", not to be confused with 'Legal Tender'.
-dobbscoin:
-dobbscoin:
-dobbscoin:
-dobbscoin:
-dobbscoin:
-dobbscoin:
-dobbscoin:
diff --git a/network/docsis/docsis.SlackBuild b/network/docsis/docsis.SlackBuild
index e278024aad..df2dc9f45a 100644
--- a/network/docsis/docsis.SlackBuild
+++ b/network/docsis/docsis.SlackBuild
@@ -1,12 +1,15 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for docsis
 # Written by Michal Bialozor <bialyy@o2.pl>
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=docsis
 VERSION=${VERSION:-0.9.6}
-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}
@@ -50,7 +60,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" \
 ./configure \
   --prefix=/usr \
   --build=$ARCH-slackware-linux
@@ -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/network/dog/README b/network/dog/README
new file mode 100644
index 0000000000..a1ba58f7d4
--- /dev/null
+++ b/network/dog/README
@@ -0,0 +1,5 @@
+dog (command-line DNS client)
+
+dog is a command-line DNS client, like 'dig'. It has colourful
+output, understands normal command-line argument syntax, supports the
+DNS-over-TLS and DNS-over-HTTPS protocols, and can emit JSON.
diff --git a/network/dog/config.toml b/network/dog/config.toml
new file mode 100644
index 0000000000..8b41196d91
--- /dev/null
+++ b/network/dog/config.toml
@@ -0,0 +1,9 @@
+[source.crates-io]
+replace-with = "vendored-sources"
+
+[source."https://github.com/llogiq/mutagen"]
+git = "https://github.com/llogiq/mutagen"
+replace-with = "vendored-sources"
+
+[source.vendored-sources]
+directory = "vendor"
diff --git a/network/dog/dog.1 b/network/dog/dog.1
new file mode 100644
index 0000000000..bf9b516b86
--- /dev/null
+++ b/network/dog/dog.1
@@ -0,0 +1,268 @@
+.\" Automatically generated by Pandoc 3.1.6
+.\"
+.\" Define V font for inline verbatim, using C font in formats
+.\" that render this, and otherwise B font.
+.ie "\f[CB]x\f[]"x" \{\
+. ftr V B
+. ftr VI BI
+. ftr VB B
+. ftr VBI BI
+.\}
+.el \{\
+. ftr V CR
+. ftr VI CI
+. ftr VB CB
+. ftr VBI CBI
+.\}
+.TH "dog" "1" "" "v0.1.0" ""
+.hy
+.SH NAME
+.PP
+dog \[em] a command-line DNS client
+.SH SYNOPSIS
+.PP
+\f[V]dog [options] [domains...]\f[R]
+.PP
+\f[B]dog\f[R] is a command-line DNS client.
+It has colourful output, supports the DNS-over-TLS and DNS-over-HTTPS
+protocols, and can emit JSON.
+.SH EXAMPLES
+.TP
+\f[V]dog example.net\f[R]
+Query the \f[V]A\f[R] record of a domain using default settings
+.TP
+\f[V]dog example.net MX\f[R]
+\&...looking up \f[V]MX\f[R] records instead
+.TP
+\f[V]dog example.net MX \[at]1.1.1.1\f[R]
+\&...using a specific nameserver instead
+.TP
+\f[V]dog example.net MX \[at]1.1.1.1 -T\f[R]
+\&...using TCP rather than UDP
+.TP
+\f[V]dog -q example.net -t MX -n 1.1.1.1 -T\f[R]
+As above, but using explicit arguments
+.SH QUERY OPTIONS
+.TP
+\f[V]-q\f[R], \f[V]--query=HOST\f[R]
+Host name or domain name to query.
+.TP
+\f[V]-t\f[R], \f[V]--type=TYPE\f[R]
+Type of the DNS record being queried (\f[V]A\f[R], \f[V]MX\f[R],
+\f[V]NS\f[R]\&...)
+.TP
+\f[V]-n\f[R], \f[V]--nameserver=ADDR\f[R]
+Address of the nameserver to send packets to.
+.TP
+\f[V]--class=CLASS\f[R]
+Network class of the DNS record being queried (\f[V]IN\f[R],
+\f[V]CH\f[R], \f[V]HS\f[R])
+.PP
+By default, dog will request A records using the system default
+resolver.
+At least one domain name must be passed \[em] dog will not automatically
+query the root nameservers.
+.PP
+Query options passed in using a command-line option, such as
+`\f[V]--query lookup.dog\f[R]' or `\f[V]--type MX\f[R]', or as plain
+arguments, such as `\f[V]lookup.dog\f[R]' or `\f[V]MX\f[R]'.
+dog will make an intelligent guess as to what plain arguments mean
+(\f[V]MX\f[R] is quite clearly a type), which makes it easier to compose
+ad-hoc queries quickly.
+If precision is desired, use the long-form options.
+.PP
+If more than one domain, type, nameserver, or class is specified, dog
+will perform one query for each combination, and display the combined
+results in a table.
+For example, passing three type arguments and two domain name arguments
+will send six requests.
+.PP
+DNS traditionally uses port 53 for both TCP and UDP.
+To use a resolver with a different port, include the port number after a
+colon (\f[V]:\f[R]) in the nameserver address.
+.SH SENDING OPTIONS
+.TP
+\f[V]--edns=SETTING\f[R]
+Whether to opt in to DNS.
+This can be `\f[V]disable\f[R]', `\f[V]hide\f[R]', or `\f[V]show\f[R]'.
+.TP
+\f[V]--txid=NUMBER\f[R]
+Set the transaction ID to a specific value.
+.TP
+\f[V]-Z=TWEAKS\f[R]
+Set uncommon protocol-level tweaks.
+.SH TRANSPORT OPTIONS
+.TP
+\f[V]-U\f[R], \f[V]--udp\f[R]
+Use the DNS protocol over UDP.
+.TP
+\f[V]-T\f[R], \f[V]--tcp\f[R]
+Use the DNS protocol over TCP.
+.TP
+\f[V]-S\f[R], \f[V]--tls\f[R]
+Use the DNS-over-TLS protocol.
+.TP
+\f[V]-H\f[R], \f[V]--https\f[R]
+Use the DNS-over-HTTPS protocol.
+.PP
+By default, dog will use the UDP protocol, automatically re-sending the
+request using TCP if the response indicates that the message is too
+large for UDP.
+Passing \f[V]--udp\f[R] will only use UDP and will fail in this case;
+passing \f[V]--tcp\f[R] will use TCP by default.
+.PP
+The DNS-over-TLS (DoT) and DNS-over-HTTPS (DoH) protocols are available
+with the \f[V]--tls\f[R] and \f[V]--https\f[R] options.
+Bear in mind that the system default resolver is unlikely to respond to
+requests using these protocols.
+.PP
+Note that if a hostname or domain name is given as a nameserver, rather
+than an IP address, the resolution of that host is performed by the
+operating system, \f[I]not\f[R] by dog.
+.PP
+Unlike the others, the HTTPS transport type requires an entire URL,
+complete with protocol, domain name, and path.
+.SH OUTPUT OPTIONS
+.TP
+\f[V]-1\f[R], \f[V]--short\f[R]
+Short mode: display nothing but the first result.
+.TP
+\f[V]-J\f[R], \f[V]--json\f[R]
+Display the output as JSON.
+.TP
+\f[V]--color\f[R], \f[V]--colour=WHEN\f[R]
+When to colourise the output.
+This can be `\f[V]always\f[R]', `\f[V]automatic\f[R]', or
+`\f[V]never\f[R]'.
+.TP
+\f[V]--seconds\f[R]
+Do not format durations as hours and minutes; instead, display them as
+seconds.
+.TP
+\f[V]--time\f[R]
+Print how long the response took to arrive.
+.SH META OPTIONS
+.TP
+\f[V]--help\f[R]
+Displays an overview of the command-line options.
+.TP
+\f[V]--version\f[R]
+Displays the version of dog being invoked.
+.SH ENVIRONMENT VARIABLES
+.PP
+dog responds to the following environment variables:
+.SS \f[V]DOG_DEBUG\f[R]
+.PP
+Set this to any non-empty value to have dog emit debugging information
+to standard error.
+For more in-depth output, set this to the exact string
+`\f[V]trace\f[R]'.
+.SH RECORD TYPES
+.PP
+dog understands and can interpret the following record types:
+.TP
+\f[V]A\f[R]
+IPv4 addresses
+.TP
+\f[V]AAAA\f[R]
+IPv6 addresses
+.TP
+\f[V]CAA\f[R]
+permitted certificate authorities
+.TP
+\f[V]CNAME\f[R]
+canonical domain aliases
+.TP
+\f[V]HINFO\f[R]
+system information and, sometimes, forbidden request explanations
+.TP
+\f[V]LOC\f[R]
+location information
+.TP
+\f[V]MX\f[R]
+e-mail server addresses
+.TP
+\f[V]NAPTR\f[R]
+DDDS rules
+.TP
+\f[V]NS\f[R]
+domain name servers
+.TP
+\f[V]OPT\f[R]
+extensions to the DNS protocol
+.TP
+\f[V]PTR\f[R]
+pointers to canonical names, usually for reverse lookups
+.TP
+\f[V]SOA\f[R]
+administrative information about zones
+.TP
+\f[V]SRV\f[R]
+IP addresses with port numbers
+.TP
+\f[V]SSHFP\f[R]
+SSH key fingerprints
+.TP
+\f[V]TLSA\f[R]
+TLS certificates, public keys, and hashes
+.TP
+\f[V]TXT\f[R]
+arbitrary textual information
+.PP
+When a response DNS packet contains a record of one of these known
+types, dog will display it in a table containing the type name and a
+human-readable summary of its contents.
+.PP
+Records with a type number that does not map to any known record type
+will still be displayed.
+As they cannot be interpreted, their contents will be displayed as a
+series of numbers instead.
+.PP
+dog also contains a list of record type names that it knows the type
+number of, but is not able to interpret, such as \f[V]IXFR\f[R] or
+\f[V]ANY\f[R] or \f[V]AFSDB\f[R].
+These are acceptable as command-line arguments, meaning you can send an
+AFSDB request with `\f[V]dog AFSDB\f[R]'.
+However, their response contents will still be displayed as numbers.
+They may be supported in future versions of dog.
+.SH PROTOCOL TWEAKS
+.PP
+The \f[V]-Z\f[R] command-line argument can be used one or more times to
+set some protocol-level options in the DNS queries that get sent.
+It accepts the following values:
+.TP
+\f[V]aa\f[R]
+Sets the \f[V]AA\f[R] (Authoritative Answers) bit in the query.
+.TP
+\f[V]ad\f[R]
+Sets the \f[V]AD\f[R] (Authentic Data) bit in the query.
+.TP
+\f[V]bufsize=NUM\f[R]
+Sets the UDP payload size field in the OPT field in the query.
+This has no effect if EDNS is diabled.
+.TP
+\f[V]cd\f[R]
+Sets the \f[V]CD\f[R] (Checking Disabled) bit in the query.
+.SH EXIT STATUSES
+.TP
+0
+If everything goes OK.
+.TP
+1
+If there was a network, I/O, or TLS error during operation.
+.TP
+2
+If there is no result from the server when running in short mode.
+This can be any received server error, not just NXDOMAIN.
+.TP
+3
+If there was a problem with the command-line arguments.
+.SH AUTHOR
+.PP
+dog is maintained by Benjamin `ogham' Sago.
+.PP
+\f[B]Website:\f[R] \f[V]https://dns.lookup.dog/\f[R]
+.PD 0
+.P
+.PD
+\f[B]Source code:\f[R] \f[V]https://github.com/ogham/dog\f[R]
diff --git a/network/dog/dog.SlackBuild b/network/dog/dog.SlackBuild
new file mode 100644
index 0000000000..2b5e586287
--- /dev/null
+++ b/network/dog/dog.SlackBuild
@@ -0,0 +1,104 @@
+#!/bin/bash
+
+# Slackware build script for dog
+
+# Written by B. Watson (urchlay@slackware.uk)
+
+# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
+
+# Notes:
+
+# This is written in rust, which annoys me (not the language, but its
+# build system). Fortunately it works with the rust included in
+# Slackware 15.0 (no need for rustup).
+
+# I considered just doing a binary repack, but upstream doesn't
+# provide a 32-bit x86 binary...
+
+# The vendored sources were made thus:
+## tar xvf dog-0.1.0.tar.gz
+## cd dog-0.1.0
+## cargo vendor
+## cd ..
+## tar cvfJ dog-0.1.0-vendored-sources.tar.xz dog-0.1.0/vendor/
+# It's a bunch of .crate files, like 70 of them. I would not have
+# packaged this if I didn't have a place to host my own tarball
+# with all the vendor stuff (if I had to list 70 .crate files in
+# my .info file, I'd just forget about this).
+
+# The man page was generated with:
+## pandoc --standalone -t man /tmp/SBo/dog-0.1.0/man/dog.1.md > dog.1
+# (adapted from the Justfile)
+
+# Linode has some docs on using this:
+# https://www.linode.com/docs/guides/use-dog-linux-dns-client/
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=dog
+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}
+
+# It's in rust, we don't need any C flags. Also, no lib|lib64 here.
+
+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-$VERSION-vendored-sources.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 {} +
+
+# Contents of config.toml came from 'cargo vendor' output.
+mkdir -p .cargo
+cat $CWD/config.toml > .cargo/config.toml
+
+# Setting CARGO_HOME prevents writing a 0-byte /root/.cargo/.package-cache
+CARGO_HOME=`pwd`/.cargo-home cargo build --release
+
+install -D -s -m0755 -oroot -groot target/release/dog $PKG/usr/bin/dog
+
+# Pregenerated (tiny) man page to avoid dependency on (huge) pandoc.
+mkdir -p $PKG/usr/man/man1
+gzip -9c < $CWD/dog.1 > $PKG/usr/man/man1/dog.1.gz
+
+# Completions for various shells. They all seem to work.
+PSH=$PKG/usr/share
+install -D -m0644 completions/dog.bash $PSH/bash-completion/completions/dog
+install -D -m0644 completions/dog.fish $PSH/fish/completions/dog.fish
+install -D -m0644 completions/dog.zsh  $PSH/zsh/site-functions/_dog
+
+PKGDOC=$PKG/usr/doc/$PRGNAM-$VERSION
+mkdir -p $PKGDOC
+cp -a README* LICENCE $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/network/dog/dog.info b/network/dog/dog.info
new file mode 100644
index 0000000000..97882692e3
--- /dev/null
+++ b/network/dog/dog.info
@@ -0,0 +1,12 @@
+PRGNAM="dog"
+VERSION="0.1.0"
+HOMEPAGE="https://dns.lookup.dog/"
+DOWNLOAD="https://github.com/ogham/dog/archive/v0.1.0/dog-0.1.0.tar.gz \
+          https://slackware.uk/~urchlay/src/dog-0.1.0-vendored-sources.tar.xz"
+MD5SUM="ed91c9cedc9dd9b16c179a928290ed65 \
+        07919b78323eb5b5b22f67f11fa6b592"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="B. Watson"
+EMAIL="urchlay@slackware.uk"
diff --git a/network/dog/slack-desc b/network/dog/slack-desc
new file mode 100644
index 0000000000..1208e3fe29
--- /dev/null
+++ b/network/dog/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+   |-----handy-ruler------------------------------------------------------|
+dog: dog (command-line DNS client)
+dog:
+dog: dog is a command-line DNS client, like 'dig'. It has colourful
+dog: output, understands normal command-line argument syntax, supports the
+dog: DNS-over-TLS and DNS-over-HTTPS protocols, and can emit JSON.
+dog:
+dog:
+dog:
+dog:
+dog:
+dog:
diff --git a/network/dogecoin/LICENSE b/network/dogecoin/LICENSE
deleted file mode 100644
index d159169d10..0000000000
--- a/network/dogecoin/LICENSE
+++ /dev/null
@@ -1,339 +0,0 @@
-                    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 Lesser 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/network/dogecoin/README b/network/dogecoin/README
deleted file mode 100644
index b7dcd2cc2a..0000000000
--- a/network/dogecoin/README
+++ /dev/null
@@ -1,12 +0,0 @@
-Dogecoin (P2P electronic cash system)
-
-Dogecoin is a free open source peer-to-peer electronic cash system
-that is completely decentralized, without the need for a central
-server or trusted parties.  Users hold the crypto keys to their
-own money and transact directly with each other, with the help
-of a P2P network to check for double-spending.
-
-qrencode is an optional but strongly recommended dependency.
-UPNP is disabled, it requires the optional dependency miniupnpc.
-
-Package provides both, dogecoin-qt (GUI) and dogecoind (CLI).
diff --git a/network/dogecoin/dogecoin.SlackBuild b/network/dogecoin/dogecoin.SlackBuild
deleted file mode 100644
index 6733350de6..0000000000
--- a/network/dogecoin/dogecoin.SlackBuild
+++ /dev/null
@@ -1,145 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for dogecoin
-
-# Written by Pedro Guimaraes <moisespedro15@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.
-
-#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.
-
-PRGNAM=dogecoin
-VERSION=${VERSION:-1.6}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-MARCH=$( uname -m )
-if [ -z "$ARCH" ]; then
-  case "$MARCH" in
-    i?86)    export ARCH=i486 ;;
-    armv7hl) export ARCH=$MARCH ;;
-    armv6hl) export ARCH=$MARCH ;;
-    arm*)    export ARCH=arm ;;
-    *)       export ARCH=$MARCH ;;
-  esac
-fi
-
-case "$ARCH" in
-  i486)    SLKCFLAGS="-O2 -march=i486 -mtune=i686"
-           SLKLDFLAGS=""; LIBDIRSUFFIX=""
-           ;;
-  x86_64)  SLKCFLAGS="-O2 -fPIC"
-           SLKLDFLAGS="-L/usr/lib64"; LIBDIRSUFFIX="64"
-           ;;
-  armv7hl) SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16"
-           SLKLDFLAGS=""; LIBDIRSUFFIX=""
-           ;;
-  armv6hl) SLKCFLAGS="-O2 -march=armv6 -mfpu=vfp -mfloat-abi=hard"
-           SLKLDFLAGS=""; LIBDIRSUFFIX=""
-           ;;
-  *)       SLKCFLAGS="-O2"
-           SLKLDFLAGS=""; LIBDIRSUFFIX=""
-           ;;
-esac
-
-case "$ARCH" in
-    arm*)    TARGET=$ARCH-slackware-linux-gnueabi ;;
-    *)       TARGET=$ARCH-slackware-linux ;;
-esac
-
-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/$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 {} \;
-
-# Detect miniupnpc
-if [ -x /usr/bin/upnpc ]; then UPNP=1; else UPNP="-"; fi
-
-# Detect qrencode
-if [ -x /usr/bin/qrencode ]; then QRCODE=1; else QRCODE=0; fi
-
-# Build dogecoin-qt
-echo Building dogecoin-qt ...
-qmake \
-  QMAKE_CFLAGS+="$SLKCFLAGS" \
-  QMAKE_CXXFLAGS+="$SLKCFLAGS -DBOOST_VARIANT_USE_RELAXED_GET_BY_DEFAULT=1" \
-  USE_UPNP="$UPNP" \
-  USE_QRCODE="$QRCODE" \
-  USE_SSL=1
-
-make
-
-# Build dogecoind
-cd src
-
-  if [ "$UPNP" = "-" ]; then
-    # disable UPNP
-    sed -i 's/USE_UPNP:=0/USE_UPNP:=/g' makefile.unix
-  fi
-
-  # disable static linking, not supported by boost in slackware
-  sed -i 's/Bstatic/Bdynamic/g' makefile.unix
-
-  CFLAGS="$SLKCFLAGS" \
-  CXXFLAGS="$SLKCFLAGS -DBOOST_VARIANT_USE_RELAXED_GET_BY_DEFAULT=1" \
-  make -f makefile.unix \
-    dogecoind \
-    USE_SSL=1
-
-cd -
-
-mkdir -p $PKG/usr/{bin,man/man{1,5}}
-mkdir -p $PKG/usr/share/{applications,kde4/services,pixmaps}
-
-install -m 0755 dogecoin-qt $PKG/usr/bin/
-install -m 0755 src/dogecoind $PKG/usr/bin/
-
-install -m 0644 contrib/debian/manpages/dogecoin-qt.1 $PKG/usr/man/man1/
-install -m 0644 contrib/debian/manpages/dogecoind.1 $PKG/usr/man/man1/
-install -m 0644 contrib/debian/manpages/dogecoin.conf.5 $PKG/usr/man/man5/
-
-install -m 0644 -T share/pixmaps/bitcoin128.png $PKG/usr/share/pixmaps/dogecoin128.png
-install -m 0644 contrib/debian/dogecoin-qt.desktop $PKG/usr/share/applications/
-install -m 0644 contrib/debian/dogecoin-qt.protocol $PKG/usr/share/kde4/services/
-
-find $PKG -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 doc/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
-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/network/dogecoin/dogecoin.info b/network/dogecoin/dogecoin.info
deleted file mode 100644
index a2d688c7b0..0000000000
--- a/network/dogecoin/dogecoin.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="dogecoin"
-VERSION="1.6"
-HOMEPAGE="http://www.dogecoin.com"
-DOWNLOAD="https://github.com/dogecoin/dogecoin/archive/1.6.tar.gz"
-MD5SUM="2340d89110f00c68fa748ab7b74a6087"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Pedro Guimaraes"
-EMAIL="moisespedro15@gmail.com"
diff --git a/network/dogecoin/doinst.sh b/network/dogecoin/doinst.sh
deleted file mode 100644
index 140e332222..0000000000
--- a/network/dogecoin/doinst.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-if [ -x /usr/bin/update-desktop-database ]; then
-  /usr/bin/update-desktop-database -q usr/share/applications
-fi
diff --git a/network/dogecoin/slack-desc b/network/dogecoin/slack-desc
deleted file mode 100644
index 79712bab8f..0000000000
--- a/network/dogecoin/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------------------------------------------------------|
-dogecoin: dogecoin (P2P electronic cash system)
-dogecoin:
-dogecoin: dogecoin is a free open source peer-to-peer electronic cash system
-dogecoin: that is completely decentralized, without the need for a central
-dogecoin: server or trusted parties.  Users hold the crypto keys to their
-dogecoin: own money and transact directly with each other, with the help
-dogecoin: of a P2P network to check for double-spending.
-dogecoin:
-dogecoin: Project Website: http://www.dogecoin.com
-dogecoin:
-dogecoin:
diff --git a/network/dokuwiki/README b/network/dokuwiki/README
index afddebc299..08789293b8 100644
--- a/network/dokuwiki/README
+++ b/network/dokuwiki/README
@@ -7,9 +7,8 @@ useful in the enterprise context and the large number of plugins
 contributed by its vibrant community allow for a broad range of use
 cases beyond a traditional wiki.
 
-Note:
-You must add this line in your httpd.conf to enable dokuwiki:
-Include /etc/httpd/extra/httpd-dokuwiki.conf
-
 If your default directory is not /var/www/htdocs please
 edit to your default directory.
+
+TEST Dokuwiki, Run in your favorite browser:
+http://127.0.0.1/dokuwiki/
diff --git a/network/dokuwiki/doinst.sh b/network/dokuwiki/doinst.sh
index 14d06020bc..57a1536f08 100644
--- a/network/dokuwiki/doinst.sh
+++ b/network/dokuwiki/doinst.sh
@@ -1,5 +1,7 @@
+# Remove comment
 sed -i "s:#Include /etc/httpd/mod_php.conf:Include /etc/httpd/mod_php.conf:g" etc/httpd/httpd.conf
+
+# If not exist line, send...
 grep -q -e 'Dokuwiki' etc/httpd/httpd.conf || cat >> etc/httpd/httpd.conf <<'EOF'
-# Dokuwiki
 Include /etc/httpd/extra/httpd-dokuwiki.conf
 EOF
diff --git a/network/dokuwiki/dokuwiki.SlackBuild b/network/dokuwiki/dokuwiki.SlackBuild
index be04cf0dd2..3c329e643d 100644
--- a/network/dokuwiki/dokuwiki.SlackBuild
+++ b/network/dokuwiki/dokuwiki.SlackBuild
@@ -1,8 +1,10 @@
-#!/bin/sh
-# Slackware build script for dokuwiki
+#!/bin/bash
 
-# Copyright 2016 Giorgio Peron <giorgio.peron@gmail.com>, Belluno, Italy
-# All rights reserved.
+# Slackware build script for dokuwiki
+#
+# Copyright 2016-2019 Giorgio Peron <giorgio.peron@gmail.com>, Belluno, Italy
+# Copyright 2019-2021 Jefferson Rocha <root@slackjeff.com.br>, Curitiba, Brazil
+# Copyright 2021-2023 slackjeff <slackjeff@riseup.net>
 #
 # Redistribution and use of this script, with or without modification, is
 # permitted provided that the following conditions are met:
@@ -21,34 +23,40 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-PRGNAM=${PRGNAM:-dokuwiki}
-VERSION=${VERSION:-20180422b}
-UNPACK=${UNPACK:-stable}
-SRCVERSION=${SRCVERSION:-2018-04-22b}
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=dokuwiki
+VERSION=${VERSION:-20230404a}
+SRCVERSION=${SRCVERSION:-2023-04-04a}
 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
 
-mv ${PRGNAM}-${UNPACK}.tgz ${PRGNAM}-${SRCVERSION}.tgz
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$SRCVERSION
+rm -rf $PRGNAM-$VERSION
 tar xvzf $CWD/$PRGNAM-$SRCVERSION.tgz
 
-mkdir -p $PKG/var/www/$PRGNAM
-mv $TMP/$PRGNAM-$SRCVERSION/* $PKG/var/www/$PRGNAM/
-chown -R apache:apache $PKG/var/www/$PRGNAM/
+mkdir -p $PKG/var/www/htdocs/$PRGNAM
+mv $TMP/${PRGNAM}-${SRCVERSION}/* $PKG/var/www/htdocs/$PRGNAM/
+chown -R apache:apache $PKG/var/www/htdocs/$PRGNAM/
 mkdir -p $PKG/etc/httpd/extra
 
+# Create in extra dokuwiki.conf
 cat > $PKG/etc/httpd/extra/httpd-dokuwiki.conf <<'EOF'
 Alias /dokuwiki /var/www/htdocs/dokuwiki
 <Directory /var/www/htdocs/dokuwiki/>
@@ -66,6 +74,9 @@ Alias /dokuwiki /var/www/htdocs/dokuwiki
 EOF
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+# Move all docs
+mv -v $PKG/var/www/htdocs/${PRGNAM}/{COPYING,README,VERSION} $PKG/usr/doc/$PRGNAM-$VERSION/
+chown -R root:root $PKG/usr/doc/$PRGNAM-$VERSION/
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
@@ -73,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/network/dokuwiki/dokuwiki.info b/network/dokuwiki/dokuwiki.info
index 399ca8b8e2..b746c2f55a 100644
--- a/network/dokuwiki/dokuwiki.info
+++ b/network/dokuwiki/dokuwiki.info
@@ -1,10 +1,10 @@
 PRGNAM="dokuwiki"
-VERSION="20180422b"
+VERSION="20230404a"
 HOMEPAGE="https://www.dokuwiki.org/dokuwiki"
-DOWNLOAD="https://download.dokuwiki.org/src/dokuwiki/dokuwiki-stable.tgz"
-MD5SUM="605944ec47cd5f822456c54c124df255"
+DOWNLOAD="https://download.dokuwiki.org/src/dokuwiki/dokuwiki-2023-04-04a.tgz"
+MD5SUM="8a68393e689bf6d1130bfe660a19fc6b"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Jefferson Rocha"
-EMAIL="root@slackjeff.com.br"
+MAINTAINER="slackjeff"
+EMAIL="slackjeff@riseup.net"
diff --git a/network/dothost/README b/network/dothost/README
index dfce38298e..ad59377441 100644
--- a/network/dothost/README
+++ b/network/dothost/README
@@ -1,15 +1,21 @@
+dothost (DNS lookup utility with Graphviz output)
+
 dothost is a DNS lookup utility, which produces output in Graphviz
 format. It does this, not by using Graphviz, but by using the graph-easy
 Perl module also available at slackbuilds.org
 
 Example:
 
-dothost www.iana.org | graph-easy --as boxart
+dothost www.iana.org | graph-easy --as ascii
 
-  ┌──────────────────┐
-  ∨                  │
-┌────────────┐     ┏━━━━━━━━━━━━━━┓     ┌───────────────────┐
-│ 192.0.32.8 │ ──> ┃ www.iana.org ┃ ──> │ 2620:0:2d0:200::8 │
-└────────────┘     ┗━━━━━━━━━━━━━━┛     └───────────────────┘
-                     ∧                    │
-                     └────────────────────┘
+       +-------------------------+
+       v                         |
+     #####################     +------------+
+  +> #   www.iana.org    # --> | 192.0.32.8 |
+  |  #####################     +------------+
+  |    |
+  |    |
+  |    v
+  |  +-------------------+
+  +- | 2620:0:2d0:200::8 |
+     +-------------------+
diff --git a/network/dothost/dothost.SlackBuild b/network/dothost/dothost.SlackBuild
index 7f5fc755a4..23e7c278cf 100644
--- a/network/dothost/dothost.SlackBuild
+++ b/network/dothost/dothost.SlackBuild
@@ -1,8 +1,9 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for dothost
 
-# Copyright 2018 Donald Cooley South Haven, Indiana USA
+# Copyright 2023 B. Watson (urchlay@slackware.uk)
+# Copyright 2018-2020 Donald Cooley South Haven, Indiana USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,20 +23,27 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20230223 bkw: BUILD=2
+# - new maintainer.
+# - ARCH=noarch (no compiled code, no lib64 dir).
+# - cosmetics in slack-desc and README.
+# - simplify build.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=dothost
-VERSION=${VERSION:-0.1}
-BUILD=${BUILD:-1}
+VERSION=${VERSION:-0.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
+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}
@@ -49,29 +57,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 {} \;
-
-# Install dothost binary in /opt
-mkdir -p $PKG/opt/dothost
-cp dothost $PKG/opt/dothost/dothost
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
 
-# Link dothost binary to /usr/bin
-mkdir -p $PKG/usr/bin
-ln -s /opt/dothost/dothost $PKG/usr/bin/dothost
+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
+gzip -9 $PKG/usr/man/man1/$PRGNAM.1
 
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a doc/* $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
+# no need for the man page in /usr/doc
+rm -f doc/*.1
+cp -a doc/* $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/network/dothost/dothost.info b/network/dothost/dothost.info
index 52d08d53cb..37de1d7117 100644
--- a/network/dothost/dothost.info
+++ b/network/dothost/dothost.info
@@ -1,10 +1,10 @@
 PRGNAM="dothost"
-VERSION="0.1"
-HOMEPAGE="http://jwilk.net/software/dothost"
-DOWNLOAD="https://github.com/jwilk/dothost/releases/download/0.1/dothost-0.1.tar.gz"
-MD5SUM="4c1aa7632ede8a65d6037a5b3b922179"
+VERSION="0.2"
+HOMEPAGE="https://jwilk.net/software/dothost"
+DOWNLOAD="https://github.com/jwilk/dothost/releases/download/0.2/dothost-0.2.tar.gz"
+MD5SUM="2f95fb6cd01458b9e848b4fdbe9aba79"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="graph-easy"
-MAINTAINER="Donald Cooley"
-EMAIL="chytraeu@sdf.org"
+MAINTAINER="B. Watson"
+EMAIL="urchlay@slackware.uk"
diff --git a/network/dothost/slack-desc b/network/dothost/slack-desc
index 9793dfb5b0..4bbbff2c90 100644
--- a/network/dothost/slack-desc
+++ b/network/dothost/slack-desc
@@ -12,8 +12,8 @@ dothost: dothost is a DNS lookup utility, which produces output in Graphviz
 dothost: format. It does this, not by using Graphviz, but by using the
 dothost: graph-easy Perl module also available at slackbuilds.org
 dothost:
+dothost: https://jwilk.net/software/dothost
 dothost:
 dothost:
-dothost: http://jwilk.net/software/dothost
 dothost:
 dothost:
diff --git a/network/dovecot-pgsql/README b/network/dovecot-pgsql/README
new file mode 100644
index 0000000000..72b4df4604
--- /dev/null
+++ b/network/dovecot-pgsql/README
@@ -0,0 +1,4 @@
+Dovecot is an open source IMAP and POP3 server for Linux/UNIX-like
+systems, written with security foremost in mind.
+
+This script builds the PostgreSQL driver.
diff --git a/network/dovecot-pgsql/dovecot-pgsql.SlackBuild b/network/dovecot-pgsql/dovecot-pgsql.SlackBuild
new file mode 100644
index 0000000000..5dff6bd73d
--- /dev/null
+++ b/network/dovecot-pgsql/dovecot-pgsql.SlackBuild
@@ -0,0 +1,123 @@
+#!/bin/bash
+
+# Slackware build script for dovecot-pgsql
+
+# Copyright 2006, 2010  Alan Hicks, Lizella, GA
+# Copyright 2013, 2014, 2015, 2016, 2017  Mario Preksavec, Zagreb, Croatia
+# Copyright 2017, 2018, 2019  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2020, 2021, 2022  Eugene Wissner, Dachau, 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.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=dovecot-pgsql
+VERSION=${VERSION:-2.3.17.1}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+SRCNAM=dovecot
+
+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 {} \+
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --sysconfdir=/etc \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --localstatedir=/var \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --mandir=/usr/man \
+  --with-notify=inotify \
+  --without-pam \
+  --with-ldap=plugin \
+  --with-lucene \
+  --with-sql=plugin \
+  --with-pgsql \
+  --with-libcap \
+  --disable-static \
+  --build=$ARCH-slackware-linux
+
+make -C src/lib-sql libdriver_pgsql.la
+
+mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/dovecot/auth
+cp -a \
+  src/lib-sql/libdriver_pgsql.la \
+  src/lib-sql/.libs/libdriver_pgsql.so \
+  $PKG/usr/lib${LIBDIRSUFFIX}/dovecot/
+ln -s ../libdriver_pgsql.so $PKG/usr/lib${LIBDIRSUFFIX}/dovecot/auth/libdriver_pgsql.so
+
+strip --strip-unneeded $PKG/usr/lib${LIBDIRSUFFIX}/dovecot/libdriver_pgsql.so
+
+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/network/dovecot-pgsql/dovecot-pgsql.info b/network/dovecot-pgsql/dovecot-pgsql.info
new file mode 100644
index 0000000000..a8d74d1975
--- /dev/null
+++ b/network/dovecot-pgsql/dovecot-pgsql.info
@@ -0,0 +1,10 @@
+PRGNAM="dovecot-pgsql"
+VERSION="2.3.17.1"
+HOMEPAGE="https://dovecot.org/"
+DOWNLOAD="https://www.dovecot.org/releases/2.3/dovecot-2.3.17.1.tar.gz"
+MD5SUM="9b67ec4f21e5ecfcfb32fd5f412b511b"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="postgresql"
+MAINTAINER="Eugene Wissner"
+EMAIL="belka@caraus.de"
diff --git a/network/dovecot-pgsql/slack-desc b/network/dovecot-pgsql/slack-desc
new file mode 100644
index 0000000000..a47e2dc664
--- /dev/null
+++ b/network/dovecot-pgsql/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct. It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+             |-----handy-ruler------------------------------------------------------|
+dovecot-pgsql: dovecot-pgsql (PostgreSQL driver for dovecot)
+dovecot-pgsql:
+dovecot-pgsql: Dovecot is an open source IMAP and POP3 server for Linux/UNIX-like
+dovecot-pgsql: systems, written with security foremost in mind.
+dovecot-pgsql:
+dovecot-pgsql: This script builds the PostgreSQL driver.
+dovecot-pgsql:
+dovecot-pgsql:
+dovecot-pgsql:
+dovecot-pgsql:
+dovecot-pgsql:
diff --git a/network/dovecot-pigeonhole/README b/network/dovecot-pigeonhole/README
index 84995d1dd3..73a60843e4 100644
--- a/network/dovecot-pigeonhole/README
+++ b/network/dovecot-pigeonhole/README
@@ -1,19 +1,20 @@
-Pigeonhole is the name of the project that adds support for the Sieve language
-(RFC 5228) and the ManageSieve protocol (RFC 5804) to the Dovecot Secure
-IMAP/POP3 Server.
+Pigeonhole is the name of the project that adds support for the Sieve
+language (RFC 5228) and the ManageSieve protocol (RFC 5804) to the
+Dovecot Secure IMAP/POP3 Server.
 
-Sieve language specification and scripts provide mail filtering capabilities on
-the server side for individual users. Each user can edit and upload (using
-ManageSieve) sieve scripts to filter mail based on supported Sieve language
-extensions within pigeonhole.
+Sieve language specification and scripts provide mail filtering
+capabilities on the server side for individual users. Each user can
+edit and upload (using ManageSieve) sieve scripts to filter mail based
+on supported Sieve language extensions within pigeonhole.
 
-The Pigeonhole project provides Sieve support as a plugin to Dovecot's Local
-Delivery Agent (LDA). The ManageSieve protocol is provided is an additional
-service, next to Dovecot's own POP3 and IMAP services.
+The Pigeonhole project provides Sieve support as a plugin to Dovecot's
+Local Delivery Agent (LDA). The ManageSieve protocol is provided is an
+additional service, next to Dovecot's own POP3 and IMAP services.
 
-To configure pigeonhole, use sieve and managesieve config files installed with
-dovecot documentation. Copy 20-managesieve.conf and 90-sieve.conf files to
-/etc/dovecot/conf.d and edit them according to your needs.
+To configure pigeonhole, use sieve and managesieve config files
+installed with dovecot documentation. Copy 20-managesieve.conf and
+90-sieve.conf files to /etc/dovecot/conf.d and edit them according to
+your needs.
 
 For additional help with configuration, see:
 
diff --git a/network/dovecot-pigeonhole/dovecot-pigeonhole.SlackBuild b/network/dovecot-pigeonhole/dovecot-pigeonhole.SlackBuild
index fb88f7ce6a..8c11be3da4 100644
--- a/network/dovecot-pigeonhole/dovecot-pigeonhole.SlackBuild
+++ b/network/dovecot-pigeonhole/dovecot-pigeonhole.SlackBuild
@@ -1,9 +1,9 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware Package Build Script for pigeonhole
 
 # Copyright 2010, 2011, 2013  Nishant Limbachia, Hoffman Estates, IL, USA
-# Copyright 2013, 2014, 2015, 2016, 2017, 2018, 2019  Mario Preksavec, Zagreb, Croatia
+# Copyright 2013, 2021  Mario Preksavec, Zagreb, Croatia
 # 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=dovecot-pigeonhole
-VERSION=${VERSION:-0.5.4}
+VERSION=${VERSION:-0.5.17}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 SRCNAM=dovecot-2.3-pigeonhole
 
@@ -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}
@@ -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/network/dovecot-pigeonhole/dovecot-pigeonhole.info b/network/dovecot-pigeonhole/dovecot-pigeonhole.info
index 83de02e3e3..a025888741 100644
--- a/network/dovecot-pigeonhole/dovecot-pigeonhole.info
+++ b/network/dovecot-pigeonhole/dovecot-pigeonhole.info
@@ -1,10 +1,10 @@
 PRGNAM="dovecot-pigeonhole"
-VERSION="0.5.4"
+VERSION="0.5.17"
 HOMEPAGE="http://pigeonhole.dovecot.org/"
-DOWNLOAD="http://pigeonhole.dovecot.org/releases/2.3/dovecot-2.3-pigeonhole-0.5.4.tar.gz"
-MD5SUM="331a7554d6b12ac2cca760146934fc5b"
+DOWNLOAD="https://pigeonhole.dovecot.org/releases/2.3/dovecot-2.3-pigeonhole-0.5.17.tar.gz"
+MD5SUM="b694322af9d54ca8cfaf857bb8d69b12"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="dovecot"
+REQUIRES=""
 MAINTAINER="Mario Preksavec"
 EMAIL="mario at slackware dot hr"
diff --git a/network/dovecot/README b/network/dovecot/README
deleted file mode 100644
index f81559ff43..0000000000
--- a/network/dovecot/README
+++ /dev/null
@@ -1,27 +0,0 @@
-dovecot (open source IMAP and POP3 server)
-
-Dovecot is an open source IMAP and POP3 email server for Linux/UNIX-like
-systems, written with security primarily in mind. Dovecot is an excellent
-choice for both small and large installations. It's fast, simple to set
-up, requires no special administration and it uses very little memory.
-
-This script builds dovecot with support for SSL. As such, you must
-have openssl installed - openssl-solibs is not enough in itself to meet
-this requirement.
-
-By default, MySQL database is selected, switch to PostgreSQL with:
-
-  DATABASE=pgsql ./dovecot.SlackBuild
-
-See the documentation in /usr/doc/dovecot-*/ to get started.
-
-
-Groupnames and Usernames
-
-You must have both 'dovecot' and 'dovenull' users and groups to run this
-script, for example:
-
-  groupadd -g 202 dovecot
-  useradd -d /dev/null -s /bin/false -u 202 -g 202 dovecot
-  groupadd -g 248 dovenull
-  useradd -d /dev/null -s /bin/false -u 248 -g 248 dovenull
diff --git a/network/dovecot/doinst.sh b/network/dovecot/doinst.sh
deleted file mode 100644
index 03c21fc848..0000000000
--- a/network/dovecot/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/rc.d/rc.dovecot.new
-
diff --git a/network/dovecot/dovecot.SlackBuild b/network/dovecot/dovecot.SlackBuild
deleted file mode 100644
index a69de55eb3..0000000000
--- a/network/dovecot/dovecot.SlackBuild
+++ /dev/null
@@ -1,133 +0,0 @@
-#!/bin/sh
-
-# Copyright 2006, 2010  Alan Hicks, Lizella, GA
-# Copyright 2013, 2014, 2015, 2016, 2017, 2018, 2019  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=dovecot
-VERSION=${VERSION:-2.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}
-
-# Build with MySQL database support by default
-case $DATABASE in
-  pgsql) : ;;
-      *) DATABASE=mysql ;;
-esac
-
-bailout() {
-  echo "  You must have both dovecot and dovenull users and groups:"
-  echo "    # groupadd -g 202 dovecot"
-  echo "    # useradd -d /dev/null -s /bin/false -u 202 -g 202 dovecot"
-  echo "    # groupadd -g 248 dovenull"
-  echo "    # useradd -d /dev/null -s /bin/false -u 248 -g 248 dovenull"
-  exit 1
-}
-
-# Bail if user isn't valid on your system
-if ! getent group dovecot 1>/dev/null 2>/dev/null ; then
-  bailout
-elif ! getent passwd dovecot 1>/dev/null 2>/dev/null ; then
-  bailout
-fi
-
-set -e
-
-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
-
-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 {} \;
-
-# Add -ldl to LDFLAGS for sqlite
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-LDFLAGS="-ldl" \
-./configure \
-  --prefix=/usr \
-  --sysconfdir=/etc \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --localstatedir=/var \
-  --docdir=/usr/doc/$PRGNAM-$VERSION \
-  --mandir=/usr/man \
-  --with-notify=inotify \
-  --without-pam \
-  --with-ldap=plugin \
-  --with-lucene \
-  --with-$DATABASE \
-  --with-sqlite \
-  --with-libcap \
-  --disable-static \
-  --build=$ARCH-slackware-linux
-
-make
-make install-strip DESTDIR=$PKG
-
-mkdir -p $PKG/etc/rc.d
-cat $CWD/rc.dovecot > $PKG/etc/rc.d/rc.dovecot.new
-chmod 0755 $PKG/etc/rc.d/rc.dovecot.new
-
-gzip -9 $PKG/usr/man/man?/*.?
-
-cp -a \
-  AUTHORS COPYING* ChangeLog NEWS README TODO \
-  $PKG/usr/doc/$PRGNAM-$VERSION/
-cat $CWD/dovecot.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/dovecot.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/network/dovecot/dovecot.info b/network/dovecot/dovecot.info
deleted file mode 100644
index eb0eb93f65..0000000000
--- a/network/dovecot/dovecot.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="dovecot"
-VERSION="2.3.4"
-HOMEPAGE="http://www.dovecot.org/"
-DOWNLOAD="http://www.dovecot.org/releases/2.3/dovecot-2.3.4.tar.gz"
-MD5SUM="00eebc835a8793e8a167a616a78f4753"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Mario Preksavec"
-EMAIL="mario at slackware dot hr"
diff --git a/network/dovecot/rc.dovecot b/network/dovecot/rc.dovecot
deleted file mode 100644
index 8d68312ab7..0000000000
--- a/network/dovecot/rc.dovecot
+++ /dev/null
@@ -1,55 +0,0 @@
-#!/bin/bash
-
-# Copyright 2006, Alan Hicks, Lizella, GA
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
-#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
-#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-dovecot_start()
-{
-  echo "Firing up dovecot."
-  dovecot
-}
-
-dovecot_stop()
-{
-  echo "Shutting down dovecot."
-  killall dovecot
-}
-
-dovecot_restart()
-{
-  dovecot_stop
-  sleep 3 # Give it time to clean-up if it needs it.
-  dovecot_start
-}
-
-case $1 in
-'start')
-  dovecot_start
-  ;;
-'stop')
-  dovecot_stop
-  ;;
-'restart')
-  dovecot_restart
-  ;;
-*)
-  echo "usage $0 start|stop|restart"
-esac
-
diff --git a/network/dovecot/slack-desc b/network/dovecot/slack-desc
deleted file mode 100644
index 29a273bade..0000000000
--- a/network/dovecot/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------------------------------------------------------|
-dovecot: dovecot (open source IMAP and POP3 server)
-dovecot:
-dovecot: Dovecot is an open source IMAP and POP3 server for Linux/UNIX-like
-dovecot: systems, written with security primarily in mind. Although it's
-dovecot: written in C, it uses several coding techniques to avoid most of the
-dovecot: common pitfalls.
-dovecot: Dovecot can work with standard mbox and Maildir formats and it's
-dovecot: fully compatible with UW-IMAP and Courier IMAP servers'
-dovecot: implementation of them, as well as mail clients accessing the
-dovecot: mailboxes directly.
-dovecot:
diff --git a/network/drawterm/drawterm.SlackBuild b/network/drawterm/drawterm.SlackBuild
index 241e4a0981..7750f55164 100644
--- a/network/drawterm/drawterm.SlackBuild
+++ b/network/drawterm/drawterm.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for drawterm
 
@@ -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=drawterm
 VERSION=${VERSION:-dc703b3438f9}
 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}
@@ -46,7 +56,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 || tar xvf $CWD/$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
@@ -57,7 +67,9 @@ find -L . \
 
 # The makefile uses the build host's uname to determine the target architecture,
 # and won't handle our CFLAGS, and can't 'make install'.
-CONF=unix make
+# (we can fool it a bit with CC though - Dave)
+CONF=unix make \
+CC="gcc $SLKCFLAGS -fcommon"
 
 install -D -t $PKG/usr/bin -m755 drawterm
 install -D -t $PKG/usr/man/man1 -m755 drawterm.1
@@ -76,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/network/driftnet/README b/network/driftnet/README
index 03ebbda903..bdcc236f51 100644
--- a/network/driftnet/README
+++ b/network/driftnet/README
@@ -1,9 +1,18 @@
-Driftnet is a program designed to capture JPEG and GIF images by sniffing
-network traffic and display them in an X window.  Optionally, you may also
-capture MPEG audio streams and play them.  According to the author, "It is
-a horrific invasion of privacy and shouldn't be used by anyone anywhere."
+Driftnet is a program designed to capture JPEG and GIF images by
+sniffing network traffic and display them in an X window.  Optionally,
+you may also capture MPEG audio streams and play them.  According to
+the author, "It is a horrific invasion of privacy and shouldn't be
+used by anyone anywhere."
 
 Original project:  http://www.ex-parrot.com/~chris/driftnet/
 
 This is an updated version available from GitHub, which includes several
 patches for use on newer systems.
+
+HTTP websockets display
+-----------------------
+
+Disabled by default.
+
+This feature requires libwebsockets as a dependency and remove this
+build flag: --disable-http-display
diff --git a/network/driftnet/driftnet.SlackBuild b/network/driftnet/driftnet.SlackBuild
index d9999b0e3b..69308123bd 100644
--- a/network/driftnet/driftnet.SlackBuild
+++ b/network/driftnet/driftnet.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 # Slackbuild build script for driftnet
 
 # Copyright 2010, JK Wood <joshuakwood@gmail.com>
-# Copyright 2017-2018 Brenton Earl <brent@exitstatuosne.com>
+# Copyright 2017-2018, 2020 Brenton Earl <brent@exitstatuosne.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=driftnet
-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}
@@ -87,6 +97,9 @@ 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 INSTALL CREDITS README.md Changelog TODO $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
@@ -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/network/driftnet/driftnet.info b/network/driftnet/driftnet.info
index 0a4f69fa15..a7d40d2e0e 100644
--- a/network/driftnet/driftnet.info
+++ b/network/driftnet/driftnet.info
@@ -1,8 +1,8 @@
 PRGNAM="driftnet"
-VERSION="1.2.0"
+VERSION="1.3.0"
 HOMEPAGE="https://github.com/deiv/driftnet"
-DOWNLOAD="https://github.com/deiv/driftnet/archive/v1.2.0/driftnet-1.2.0.tar.gz"
-MD5SUM="86fda7573a2c17ba02059e63e0f097b8"
+DOWNLOAD="https://github.com/deiv/driftnet/archive/v1.3.0/driftnet-1.3.0.tar.gz"
+MD5SUM="60e8955771e028cab44ecd6b2800f326"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/network/dropbear/README b/network/dropbear/README
index bae1c188d1..2f154bcb82 100644
--- a/network/dropbear/README
+++ b/network/dropbear/README
@@ -7,13 +7,20 @@ useful for "embedded"-type Linux (or other Unix) systems, such as
 wireless routers.
 
 Please note the Dropbear distribution includes a standalone version of
-OpenSSH's scp program. This slackbuild will build this by default, thus
-creating a package which conflicts with OpenSSH's scp binary. Installing this
-package will overwrite this file with a symbolic link to the dropbearmulti
-binary, so a backup of /usr/bin/scp will be made if it exists. After
-uninstalling dropbear, you can restore the backup with 'mv
-/usr/bin/scp.openssh /usr/bin/scp'.
+OpenSSH's scp program. This SlackBuild will NOT link this by default,
+thus creating a package which will not conflict with OpenSSH's scp
+binary.
 
-If you do not want to build the scp binary, use:
+If you want to link dropbear's scp binary, use:
 
-    WITH_SCP=no ./dropbear.SlackBuild
+    WITH_SCP=yes ./dropbear.SlackBuild
+
+Installing the package built with WITH_SCP=yes will overwrite
+this file with a symbolic link to the dropbearmulti binary, so a
+backup of /usr/bin/scp will be made if it exists. After uninstalling
+dropbear, you can restore the backup with 'mv /usr/bin/scp.openssh
+/usr/bin/scp'.
+
+Installing the package built with WITH_SCP=no will create a
+symbolic link /usr/bin/scp.dropbear pointing to the dropbearmulti
+binary.
diff --git a/network/dropbear/dropbear.SlackBuild b/network/dropbear/dropbear.SlackBuild
index e9bd3d6105..490b671695 100644
--- a/network/dropbear/dropbear.SlackBuild
+++ b/network/dropbear/dropbear.SlackBuild
@@ -1,7 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
-# Copyright 2007-2008, Piter Punk, S�o Paulo, Brazil
-# Copyright 2017-2019, Andrew Clemons, Wellington New Zealand
+# Copyright 2007-2008, Piter Punk, São Paulo, Brazil
+# Copyright 2017-2020,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
@@ -21,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=dropbear
-VERSION=${VERSION:-2019.78}
+VERSION=${VERSION:-2022.83}
+SRCVERSION="DROPBEAR_$VERSION"
 BUILD=${BUILD:-1}
 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}
@@ -58,9 +67,9 @@ 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-$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 \
@@ -68,6 +77,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 {} \;
 
+autoreconf -if
+
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
@@ -85,40 +96,50 @@ CXXFLAGS="$SLKCFLAGS" \
   --disable-pututxline \
   --build=$ARCH-slackware-linux
 
-PROGRAMS="dropbear dbclient dropbearkey dropbearconvert"
-
-WITH_SCP=${WITH_SCP:-yes}
-
-if [ "$WITH_SCP" = "yes" ] ; then
-  PROGRAMS="$PROGRAMS scp"
-fi
+PROGRAMS="dropbear dbclient dropbearkey dropbearconvert scp"
 
 make strip \
   PROGRAMS="$PROGRAMS" \
-  MULTI=1
+  MULTI=1 \
+  SCPPROGRESS=1
 
 make install \
   PROGRAMS="$PROGRAMS" \
   MULTI=1 \
+  SCPPROGRESS=1 \
   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
 
+WITH_SCP=${WITH_SCP:-no}
+
+# 20220412 bkw: use relative symlinks.
+for i in $PROGRAMS; do
+  BIN=$PKG/usr/bin/$i
+  SBIN=$PKG/usr/sbin/$i
+
+  if [ "$i" = "scp" ] && [ "$WITH_SCP" != "yes" ] ; then
+    [ -L $BIN  ] && rm -f $BIN  && ln -s dropbearmulti $BIN.dropbear
+    [ -L $SBIN ] && rm -f $SBIN && ln -s ../bin/dropbearmulti $SBIN.dropbear
+  else
+    [ -L $BIN  ] && rm -f $BIN  && ln -s dropbearmulti $BIN
+    [ -L $SBIN ] && rm -f $SBIN && ln -s ../bin/dropbearmulti $SBIN
+  fi
+done
+
 mkdir -p $PKG/etc/rc.d
 cat $CWD/rc.dropbear.new > $PKG/etc/rc.d/rc.dropbear.new
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a CHANGES INSTALL LICENSE MULTI README SMALL $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a CHANGES LICENSE MULTI README SMALL $PKG/usr/doc/$PRGNAM-$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
 
-if [ "$WITH_SCOPE" = "yes" ] ; then
+if [ "$WITH_SCP" = "yes" ] ; then
   cat << EOF >> $PKG/install/doinst.sh
 if [ -e usr/bin/scp ]; then
   mv usr/bin/scp usr/bin/scp.openssh
@@ -127,4 +148,4 @@ EOF
 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/network/dropbear/dropbear.info b/network/dropbear/dropbear.info
index 0ad1eaba52..b4635fc56b 100644
--- a/network/dropbear/dropbear.info
+++ b/network/dropbear/dropbear.info
@@ -1,8 +1,8 @@
 PRGNAM="dropbear"
-VERSION="2019.78"
-HOMEPAGE="https://matt.ucc.asn.au/dropbear/dropbear.html"
-DOWNLOAD="https://matt.ucc.asn.au/dropbear/releases/dropbear-2019.78.tar.bz2"
-MD5SUM="a972c85ed678ad0fdcb7844e1294fb54"
+VERSION="2022.83"
+HOMEPAGE="https://github.com/mkj/dropbear"
+DOWNLOAD="https://github.com/mkj/dropbear/archive/DROPBEAR_2022.83/dropbear-DROPBEAR_2022.83.tar.gz"
+MD5SUM="f166e27ec24752ffa892910fc89a51b1"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/network/dropbear/slack-desc b/network/dropbear/slack-desc
index 837032b6bc..f2e888a128 100644
--- a/network/dropbear/slack-desc
+++ b/network/dropbear/slack-desc
@@ -14,6 +14,6 @@ dropbear: distributed under a MIT-style license. Dropbear is particularly
 dropbear: useful for "embedded"-type Linux (or other Unix) systems, such as
 dropbear: wireless routers.
 dropbear:
-dropbear:
+dropbear: https://github.com/mkj/dropbear
 dropbear:
 dropbear:
diff --git a/network/dropbox/dropbox.SlackBuild b/network/dropbox/dropbox.SlackBuild
index de881b8178..f84854721d 100644
--- a/network/dropbox/dropbox.SlackBuild
+++ b/network/dropbox/dropbox.SlackBuild
@@ -1,8 +1,9 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for dropbox
 
 # Copyright 2017 cmyster amit.ugol@gmail.com
+# Copyright 2019-2024 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,24 +25,16 @@
 
 
 # Public changelog can be found in: https://www.dropboxforum.com
-# SlackBuild changelog:
-# 25/Jul/2019 * Updated to latest version 77.4.131
-#             * Support for FS other than EXT4 is re-introduced.
-# 07/Jul/2019 * Updated to latest version 75.4.142
-# 26/May/2019 * Updated to latest version 73.4.118
-# 14/Apr/2019 * Updated to latest version 70.4.93
-# 10/Feb/2019 * Updated to latest version 66.4.84
-# 30/Dec/2018 * Updated to latest version 63.4.107
-# 02/Dec/2018 * Updated to latest version 62.4.103
-# 28/Oct/2018 * Updated to latest version 60.4.107
-# 24/Oct/2018 * Updated to latest version 59.4.93
-# 05/Sep/2018 * Updated to latest version 56.4.94
-###
+# Source for x86: https://www.dropbox.com/download?plat=lnx.x86
+# Source for x86_64: https://www.dropbox.com/download?plat=lnx.x86_64
+
+cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=dropbox
-VERSION=${VERSION:-77.4.131}
+VERSION=${VERSION:-196.4.6900}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -51,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}
@@ -94,4 +91,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/network/dropbox/dropbox.desktop b/network/dropbox/dropbox.desktop
index c3694e8c45..b1a1115fd9 100644
--- a/network/dropbox/dropbox.desktop
+++ b/network/dropbox/dropbox.desktop
@@ -2,7 +2,7 @@
 Name=Dropbox
 GenericName=Network Storage
 Comment=Secure backup, sync and sharing made easy
-Exec=dbus-launch /opt/dropbox/dropboxd
+Exec=/opt/dropbox/dropboxd
 Icon=/usr/share/pixmaps/dropbox.png
 Terminal=false
 Type=Application
diff --git a/network/dropbox/dropbox.info b/network/dropbox/dropbox.info
index 14a2ae291b..9df24e3a6b 100644
--- a/network/dropbox/dropbox.info
+++ b/network/dropbox/dropbox.info
@@ -1,10 +1,10 @@
 PRGNAM="dropbox"
-VERSION="77.4.131"
+VERSION="196.4.6900"
 HOMEPAGE="https://www.dropbox.com"
-DOWNLOAD="https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86-77.4.131.tar.gz"
-MD5SUM="70da9a7b78580447262a892aa63bd19e"
-DOWNLOAD_x86_64="https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86_64-77.4.131.tar.gz"
-MD5SUM_x86_64="6176fa7600569e1a8d0ef6d16acc8a5a"
+DOWNLOAD="https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86-196.4.6900.tar.gz"
+MD5SUM="691c757e0689c38df18d5d3a0e54b66c"
+DOWNLOAD_x86_64="https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86_64-196.4.6900.tar.gz"
+MD5SUM_x86_64="7ceac7a9546e337c78d13106fb923880"
 REQUIRES=""
-MAINTAINER="Amit Ugol"
-EMAIL="amit.ugol@gmail.com"
+MAINTAINER="Willy Sudiarto Raharjo"
+EMAIL="willysr@slackbuilds.org"
diff --git a/network/dsniff/README b/network/dsniff/README
index 39b8cafe10..a8a7d90ca7 100644
--- a/network/dsniff/README
+++ b/network/dsniff/README
@@ -1,7 +1,8 @@
-dsniff is a collection of tools for network auditing and penetration testing.
-dsniff, filesnarf, mailsnarf, msgsnarf, urlsnarf, and webspy passively monitor
-a network for interesting data (passwords, e-mail, files, etc.). arpspoof,
-dnsspoof, and macof facilitate the interception of network traffic normally
-unavailable to an attacker (e.g, due to layer-2 switching). sshmitm and
-webmitm implement active monkey-in-the-middle attacks against redirected SSH
-and HTTPS sessions by exploiting weak bindings in ad-hoc PKI.
+dsniff is a collection of tools for network auditing and penetration
+testing. dsniff, filesnarf, mailsnarf, msgsnarf, urlsnarf, and
+webspy passively monitor a network for interesting data (passwords,
+e-mail, files, etc.). arpspoof, dnsspoof, and macof facilitate the
+interception of network traffic normally unavailable to an attacker
+(e.g, due to layer-2 switching). sshmitm and webmitm implement active
+monkey-in-the-middle attacks against redirected SSH and HTTPS sessions
+by exploiting weak bindings in ad-hoc PKI.
diff --git a/network/dsniff/dsniff.SlackBuild b/network/dsniff/dsniff.SlackBuild
index 3fe080fd8b..3c6d9d03ad 100644
--- a/network/dsniff/dsniff.SlackBuild
+++ b/network/dsniff/dsniff.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for dsniff.
 
@@ -23,11 +23,14 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=dsniff
 VERSION=${VERSION:-2.4b1}
 SRCVER=${SRCVER:-2.4}
 BUILD=${BUILD:-3}
 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,11 +83,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 {} \;
 
-zcat $CWD/dsniff_2.4b1+debian-18.diff.gz | patch -p1
-for i in debian/patches/*.dpatch; do
-    patch -N < "$i"
-done
-sed -i 's|${CC-cc} -E|${CC-cc} -O2 -E|g' configure
+for i in $CWD/patches/*.patch; do patch -p1 < $i; done
+
+autoreconf -fi
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
@@ -87,6 +95,7 @@ CXXFLAGS="$SLKCFLAGS" \
   --mandir=/usr/man \
   --sysconfdir=/etc \
   --localstatedir=/var \
+  --with-libtirpc \
   --build=$ARCH-slackware-linux
 
 make
@@ -106,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/network/dsniff/dsniff_2.4b1+debian-18.diff.gz b/network/dsniff/dsniff_2.4b1+debian-18.diff.gz
deleted file mode 100644
index e83ac181b1..0000000000
--- a/network/dsniff/dsniff_2.4b1+debian-18.diff.gz
+++ /dev/null
diff --git a/network/dsniff/patches/01_time.h.patch b/network/dsniff/patches/01_time.h.patch
new file mode 100644
index 0000000000..1867cf901e
--- /dev/null
+++ b/network/dsniff/patches/01_time.h.patch
@@ -0,0 +1,26 @@
+Author: Steve Kemp <skx@debian.org>
+Description: Include <time.h> to fix segfault on some architectures.
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=315969
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+
+--- a/msgsnarf.c
++++ b/msgsnarf.c
+@@ -23,6 +23,7 @@
+ #include <nids.h>
+ #include <pcap.h>
+ #include <pcaputil.h>
++#include <time.h>
+ 
+ #include "buf.h"
+ #include "decode.h"
+--- a/sshow.c
++++ b/sshow.c
+@@ -15,6 +15,7 @@
+ 
+ #include <sys/types.h>
+ #include <sys/times.h>
++#include <time.h>
+ 
+ #include <netinet/in_systm.h>
+ #include <netinet/in.h>
diff --git a/network/dsniff/patches/02_mailsnarf_corrupt.patch b/network/dsniff/patches/02_mailsnarf_corrupt.patch
new file mode 100644
index 0000000000..18bb736c3c
--- /dev/null
+++ b/network/dsniff/patches/02_mailsnarf_corrupt.patch
@@ -0,0 +1,17 @@
+Author: Steve Kemp <skx@debian.org>
+Description: mailsnarf does not parse mail correctly.
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=149330
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+
+--- a/mailsnarf.c
++++ b/mailsnarf.c
+@@ -178,7 +178,7 @@
+ 	if (smtp->state != SMTP_DATA) {
+ 		while ((i = buf_index(&buf, "\r\n", 2)) >= 0) {
+ 			line = buf_tok(&buf, NULL, i + 2);
+-			line->base[line->end] = '\0';
++			line->base[line->end-1] = '\0';
+ 			p = buf_ptr(line);
+ 			
+ 			if (strncasecmp(p, "RSET", 4) == 0) {
diff --git a/network/dsniff/patches/03_pcap_read_dump.patch b/network/dsniff/patches/03_pcap_read_dump.patch
new file mode 100644
index 0000000000..3cc0374840
--- /dev/null
+++ b/network/dsniff/patches/03_pcap_read_dump.patch
@@ -0,0 +1,534 @@
+Author: Joseph Battaglia <sephail@sephail.net> and Joshua Krage <jkrage@guisarme.us>
+Description: Allow the reading of saved PCAP capture files.
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=153462
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=298604
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+
+--- a/dsniff.8
++++ b/dsniff.8
+@@ -10,7 +10,7 @@
+ .nf
+ .fi
+ \fBdsniff\fR [\fB-c\fR] [\fB-d\fR] [\fB-m\fR] [\fB-n\fR] [\fB-i
+-\fIinterface\fR] [\fB-s \fIsnaplen\fR] [\fB-f \fIservices\fR]
++\fIinterface\fR | \fB-p \fIpcapfile\fR] [\fB-s \fIsnaplen\fR] [\fB-f \fIservices\fR]
+ [\fB-t \fItrigger[,...]\fR]]
+ [\fB-r\fR|\fB-w\fR \fIsavefile\fR] [\fIexpression\fR]
+ .SH DESCRIPTION
+@@ -45,6 +45,9 @@
+ Do not resolve IP addresses to hostnames.
+ .IP "\fB-i \fIinterface\fR"
+ Specify the interface to listen on.
++.IP "\fB-p \fIpcapfile\fR"
++Rather than processing the contents of packets observed upon the network 
++process the given PCAP capture file.
+ .IP "\fB-s \fIsnaplen\fR"
+ Analyze at most the first \fIsnaplen\fR bytes of each TCP connection,
+ rather than the default of 1024.
+--- a/dsniff.c
++++ b/dsniff.c
+@@ -46,8 +46,9 @@
+ usage(void)
+ {
+ 	fprintf(stderr, "Version: " VERSION "\n"
+-		"Usage: dsniff [-cdmn] [-i interface] [-s snaplen] [-f services]\n"
+-		"              [-t trigger[,...]] [-r|-w savefile] [expression]\n");
++		"Usage: dsniff [-cdmn] [-i interface | -p pcapfile] [-s snaplen]\n"
++		"              [-f services] [-t trigger[,...]] [-r|-w savefile]\n"
++		"              [expression]\n");
+ 	exit(1);
+ }
+ 
+@@ -79,7 +80,7 @@
+ 
+ 	services = savefile = triggers = NULL;
+ 	
+-	while ((c = getopt(argc, argv, "cdf:i:mnr:s:t:w:h?V")) != -1) {
++	while ((c = getopt(argc, argv, "cdf:i:mnp:r:s:t:w:h?V")) != -1) {
+ 		switch (c) {
+ 		case 'c':
+ 			Opt_client = 1;
+@@ -99,6 +100,9 @@
+ 		case 'n':
+ 			Opt_dns = 0;
+ 			break;
++		case 'p':
++			nids_params.filename = optarg;
++			break;
+ 		case 'r':
+ 			Opt_read = 1;
+ 			savefile = optarg;
+@@ -168,10 +172,23 @@
+ 	else nids_register_tcp(trigger_tcp);
+ 	
+ 	if (nids_params.pcap_filter != NULL) {
+-		warnx("listening on %s [%s]", nids_params.device,
+-		      nids_params.pcap_filter);
++		if (nids_params.filename == NULL) {
++			warnx("listening on %s [%s]", nids_params.device,
++		        nids_params.pcap_filter);
++		}
++		else {
++			warnx("using %s [%s]", nids_params.filename,
++		        nids_params.pcap_filter);
++		}
++	}
++	else {
++		if (nids_params.filename == NULL) {
++			warnx("listening on %s", nids_params.device);
++		}
++		else {
++			warnx("using %s", nids_params.filename);
++		}
+ 	}
+-	else warnx("listening on %s", nids_params.device);
+ 	
+ 	nids_run();
+ 	
+--- a/filesnarf.8
++++ b/filesnarf.8
+@@ -9,7 +9,7 @@
+ .na
+ .nf
+ .fi
+-\fBfilesnarf\fR [\fB-i \fIinterface\fR] [[\fB-v\fR] \fIpattern [\fIexpression\fR]]
++\fBfilesnarf\fR [\fB-i \fIinterface\fR | \fB-p \fIpcapfile\fR] [[\fB-v\fR] \fIpattern [\fIexpression\fR]]
+ .SH DESCRIPTION
+ .ad
+ .fi
+@@ -18,6 +18,8 @@
+ .SH OPTIONS
+ .IP "\fB-i \fIinterface\fR"
+ Specify the interface to listen on.
++.IP "\fB-p \fIpcapfile\fR"
++Process packets from the specified PCAP capture file instead of the network.
+ .IP \fB-v\fR
+ "Versus" mode. Invert the sense of matching, to select non-matching
+ files.
+--- a/filesnarf.c
++++ b/filesnarf.c
+@@ -51,7 +51,7 @@
+ usage(void)
+ {
+ 	fprintf(stderr, "Version: " VERSION "\n"
+-		"Usage: filesnarf [-i interface] [[-v] pattern [expression]]\n");
++		"Usage: filesnarf [-i interface | -p pcapfile] [[-v] pattern [expression]]\n");
+ 	exit(1);
+ }
+ 
+@@ -464,11 +464,14 @@
+ 	extern int optind;
+ 	int c;
+ 
+-	while ((c = getopt(argc, argv, "i:vh?V")) != -1) {
++	while ((c = getopt(argc, argv, "i:p:vh?V")) != -1) {
+ 		switch (c) {
+ 		case 'i':
+ 			nids_params.device = optarg;
+ 			break;
++		case 'p':
++			nids_params.filename = optarg;
++			break;
+ 		case 'v':
+ 			Opt_invert = 1;
+ 			break;
+@@ -498,11 +501,24 @@
+ 	nids_register_ip(decode_udp_nfs);
+ 	nids_register_tcp(decode_tcp_nfs);
+ 
+-	if (nids_params.pcap_filter != NULL) {
+-		warnx("listening on %s [%s]", nids_params.device,
+-		      nids_params.pcap_filter);
+-	}
+-	else warnx("listening on %s", nids_params.device);
++        if (nids_params.pcap_filter != NULL) {
++                if (nids_params.filename == NULL) {
++                        warnx("listening on %s [%s]", nids_params.device,
++                              nids_params.pcap_filter);
++                }
++                else {
++                        warnx("using %s [%s]", nids_params.filename,
++                              nids_params.pcap_filter);
++                }
++        }
++        else {
++                if (nids_params.filename == NULL) {
++                        warnx("listening on %s", nids_params.device);
++                }
++                else {
++                        warnx("using %s", nids_params.filename);
++                }
++        }
+ 
+ 	nids_run();
+ 
+--- a/mailsnarf.8
++++ b/mailsnarf.8
+@@ -9,7 +9,7 @@
+ .na
+ .nf
+ .fi
+-\fBmailsnarf\fR [\fB-i \fIinterface\fR] [[\fB-v\fR] \fIpattern [\fIexpression\fR]]
++\fBmailsnarf\fR [\fB-i \fIinterface\fR | \fB-p \fIpcapfile\fR] [[\fB-v\fR] \fIpattern [\fIexpression\fR]]
+ .SH DESCRIPTION
+ .ad
+ .fi
+@@ -19,6 +19,8 @@
+ .SH OPTIONS
+ .IP "\fB-i \fIinterface\fR"
+ Specify the interface to listen on.
++.IP "\fB-p \fIpcapfile\fR"
++Process packets from the specified PCAP capture file instead of the network.
+ .IP \fB-v\fR
+ "Versus" mode. Invert the sense of matching, to select non-matching
+ messages.
+--- a/mailsnarf.c
++++ b/mailsnarf.c
+@@ -59,7 +59,7 @@
+ usage(void)
+ {
+ 	fprintf(stderr, "Version: " VERSION "\n"
+-		"Usage: mailsnarf [-i interface] [[-v] pattern [expression]]\n");
++		"Usage: mailsnarf [-i interface | -p pcapfile] [[-v] pattern [expression]]\n");
+ 	exit(1);
+ }
+ 
+@@ -344,11 +344,14 @@
+ 	extern int optind;
+ 	int c;
+ 	
+-	while ((c = getopt(argc, argv, "i:vh?V")) != -1) {
++	while ((c = getopt(argc, argv, "i:p:vh?V")) != -1) {
+ 		switch (c) {
+ 		case 'i':
+ 			nids_params.device = optarg;
+ 			break;
++                case 'p':
++                        nids_params.filename = optarg;
++                        break;
+ 		case 'v':
+ 			Opt_invert = 1;
+ 			break;
+@@ -378,10 +381,23 @@
+ 	nids_register_tcp(sniff_pop_session);
+ 
+ 	if (nids_params.pcap_filter != NULL) {
+-		warnx("listening on %s [%s]", nids_params.device,
+-		      nids_params.pcap_filter);
+-	}
+-	else warnx("listening on %s", nids_params.device);
++                if (nids_params.filename == NULL) {
++		        warnx("listening on %s [%s]", nids_params.device,
++		              nids_params.pcap_filter);
++                }
++                else {
++		        warnx("using %s [%s]", nids_params.filename,
++		              nids_params.pcap_filter);
++                }
++	}
++	else {
++                if (nids_params.filename == NULL) {
++                    warnx("listening on %s", nids_params.device);
++                }
++                else {
++                    warnx("using %s", nids_params.filename);
++                }
++        }
+ 	
+ 	nids_run();
+ 	
+--- a/msgsnarf.8
++++ b/msgsnarf.8
+@@ -9,7 +9,7 @@
+ .na
+ .nf
+ .fi
+-\fBmsgsnarf\fR [\fB-i \fIinterface\fR] [[\fB-v\fR] \fIpattern [\fIexpression\fR]]
++\fBmsgsnarf\fR [\fB-i \fIinterface\fR | \fB-p \fIpcapfile\fR] [[\fB-v\fR] \fIpattern [\fIexpression\fR]]
+ .SH DESCRIPTION
+ .ad
+ .fi
+@@ -19,6 +19,8 @@
+ .SH OPTIONS
+ .IP "\fB-i \fIinterface\fR"
+ Specify the interface to listen on.
++.IP "\fB-p \fIpcapfile\fR"
++Process packets from the specified PCAP capture file instead of the network.
+ .IP \fB-v\fR
+ "Versus" mode. Invert the sense of matching, to select non-matching
+ messages.
+--- a/msgsnarf.c
++++ b/msgsnarf.c
+@@ -45,7 +45,7 @@
+ usage(void)
+ {
+ 	fprintf(stderr, "Version: " VERSION "\n"
+-		"Usage: msgsnarf [-i interface] [[-v] pattern [expression]]\n");
++		"Usage: msgsnarf [-i interface | -p pcapfile] [[-v] pattern [expression]]\n");
+ 	exit(1);
+ }
+ 
+@@ -633,11 +633,14 @@
+ 	extern int optind;
+ 	int c;
+ 	
+-	while ((c = getopt(argc, argv, "i:hv?V")) != -1) {
++	while ((c = getopt(argc, argv, "i:p:hv?V")) != -1) {
+ 		switch (c) {
+ 		case 'i':
+ 			nids_params.device = optarg;
+ 			break;
++		case 'p':
++			nids_params.filename = optarg;
++			break;
+ 		case 'v':
+ 			Opt_invert = 1;
+ 			break;
+@@ -666,11 +669,24 @@
+ 	
+ 	nids_register_tcp(sniff_msgs);
+ 
+-	if (nids_params.pcap_filter != NULL) {
+-		warnx("listening on %s [%s]", nids_params.device,
+-		      nids_params.pcap_filter);
+-	}
+-	else warnx("listening on %s", nids_params.device);
++        if (nids_params.pcap_filter != NULL) {
++                if (nids_params.filename == NULL) {
++                        warnx("listening on %s [%s]", nids_params.device,
++                              nids_params.pcap_filter);
++                }
++                else {
++                        warnx("using %s [%s]", nids_params.filename,
++                              nids_params.pcap_filter);
++                }
++        }
++        else {
++                if (nids_params.filename == NULL) {
++                    warnx("listening on %s", nids_params.device);
++                }
++                else {
++                    warnx("using %s", nids_params.filename);
++                }
++        }
+ 
+ 	nids_run();
+ 	
+--- a/sshow.8
++++ b/sshow.8
+@@ -9,7 +9,7 @@
+ .na
+ .nf
+ .fi
+-\fBsshow\fR [\fB-d\fR] [\fB-i \fIinterface\fR] [\fIexpression\fR]
++\fBsshow\fR [\fB-d\fR] [\fB-i \fIinterface\fR | \fB-p \fIpcapfile\fR] [\fIexpression\fR]
+ .SH DESCRIPTION
+ .ad
+ .fi
+@@ -28,6 +28,8 @@
+ Enable verbose debugging output.
+ .IP "\fB-i \fIinterface\fR"
+ Specify the interface to listen on.
++.IP "\fB-p \fIpcapfile\fR"
++Process packets from the specified PCAP capture file instead of the network.
+ .IP "\fIexpression\fR"
+ Specify a tcpdump(8) filter expression to select traffic to sniff.
+ .SH "SEE ALSO"
+--- a/sshow.c
++++ b/sshow.c
+@@ -82,7 +82,7 @@
+ static void
+ usage(void)
+ {
+-	fprintf(stderr, "Usage: sshow [-d] [-i interface]\n");
++	fprintf(stderr, "Usage: sshow [-d] [-i interface | -p pcapfile]\n");
+ 	exit(1);
+ }
+ 
+@@ -616,7 +616,7 @@
+ 	extern int optind;
+ 	int c;
+ 	
+-	while ((c = getopt(argc, argv, "di:h?")) != -1) {
++	while ((c = getopt(argc, argv, "di:p:h?")) != -1) {
+ 		switch (c) {
+ 		case 'd':
+ 			debug++;
+@@ -624,6 +624,9 @@
+ 		case 'i':
+ 			nids_params.device = optarg;
+ 			break;
++		case 'p':
++			nids_params.filename = optarg;
++			break;
+ 		default:
+ 			usage();
+ 			break;
+@@ -652,11 +655,24 @@
+ 	
+ 	nids_register_tcp(process_event);
+ 
+-	if (nids_params.pcap_filter != NULL) {
+-		warnx("listening on %s [%s]", nids_params.device,
+-		      nids_params.pcap_filter);
+-	}
+-	else warnx("listening on %s", nids_params.device);
++        if (nids_params.pcap_filter != NULL) {
++                if (nids_params.filename == NULL) {
++                        warnx("listening on %s [%s]", nids_params.device,
++                              nids_params.pcap_filter);
++                }
++                else {
++                        warnx("using %s [%s]", nids_params.filename,
++                              nids_params.pcap_filter);
++                }
++        }
++        else {
++                if (nids_params.filename == NULL) {
++                    warnx("listening on %s", nids_params.device);
++                }
++                else {
++                    warnx("using %s", nids_params.filename);
++                }
++        }
+ 
+ 	nids_run();
+ 	
+--- a/urlsnarf.8
++++ b/urlsnarf.8
+@@ -9,7 +9,7 @@
+ .na
+ .nf
+ .fi
+-\fBurlsnarf\fR [\fB-n\fR] [\fB-i \fIinterface\fR]  [[\fB-v\fR] \fIpattern [\fIexpression\fR]]
++\fBurlsnarf\fR [\fB-n\fR] [\fB-i \fIinterface\fR | \fB-p \fIpcapfile\fR]  [[\fB-v\fR] \fIpattern [\fIexpression\fR]]
+ .SH DESCRIPTION
+ .ad
+ .fi
+@@ -21,6 +21,9 @@
+ .IP \fB-n\fR
+ Do not resolve IP addresses to hostnames.
+ .IP "\fB-i \fIinterface\fR"
++Specify the interface to listen on.
++.IP "\fB-p \fIpcapfile\fR"
++Process packets from the specified PCAP capture file instead of the network.
+ .IP \fB-v\fR
+ "Versus" mode. Invert the sense of matching, to select non-matching
+ URLs.
+--- a/urlsnarf.c
++++ b/urlsnarf.c
+@@ -41,7 +41,7 @@
+ usage(void)
+ {
+ 	fprintf(stderr, "Version: " VERSION "\n"
+-		"Usage: urlsnarf [-n] [-i interface] [[-v] pattern [expression]]\n");
++		"Usage: urlsnarf [-n] [-i interface | -p pcapfile] [[-v] pattern [expression]]\n");
+ 	exit(1);
+ }
+ 
+@@ -201,11 +201,14 @@
+ 	extern int optind;
+ 	int c;
+ 	
+-	while ((c = getopt(argc, argv, "i:nvh?V")) != -1) {
++	while ((c = getopt(argc, argv, "i:p:nvh?V")) != -1) {
+ 		switch (c) {
+ 		case 'i':
+ 			nids_params.device = optarg;
+ 			break;
++		case 'p':
++			nids_params.filename = optarg;
++			break;
+ 		case 'n':
+ 			Opt_dns = 0;
+ 			break;
+@@ -238,8 +241,24 @@
+ 	
+ 	nids_register_tcp(sniff_http_client);
+ 
+-	warnx("listening on %s [%s]", nids_params.device,
+-	      nids_params.pcap_filter);
++        if (nids_params.pcap_filter != NULL) {
++                if (nids_params.filename == NULL) {
++                        warnx("listening on %s [%s]", nids_params.device,
++                              nids_params.pcap_filter);
++                }
++                else {
++                        warnx("using %s [%s]", nids_params.filename,
++                              nids_params.pcap_filter);
++                }
++        }
++        else {
++                if (nids_params.filename == NULL) {
++                    warnx("listening on %s", nids_params.device);
++                }
++                else {
++                    warnx("using %s", nids_params.filename);
++                }
++        }
+ 
+ 	nids_run();
+ 	
+--- a/webspy.8
++++ b/webspy.8
+@@ -9,7 +9,7 @@
+ .na
+ .nf
+ .fi
+-\fBwebspy\fR [\fB-i \fIinterface\fR] \fIhost\fR
++\fBwebspy\fR [\fB-i \fIinterface\fR | \fB-p \fIpcapfile\fR] \fIhost\fR
+ .SH DESCRIPTION
+ .ad
+ .fi
+@@ -20,6 +20,8 @@
+ .SH OPTIONS
+ .IP "\fB-i \fIinterface\fR"
+ Specify the interface to listen on.
++.IP "\fB-p \fIpcapfile\fR"
++Process packets from the specified PCAP capture file instead of the network.
+ .IP \fIhost\fR
+ Specify the web client to spy on.
+ .SH "SEE ALSO"
+--- a/webspy.c
++++ b/webspy.c
+@@ -42,7 +42,7 @@
+ usage(void)
+ {
+ 	fprintf(stderr, "Version: " VERSION "\n"
+-		"Usage: %s [-i interface] host\n", progname);
++		"Usage: %s [-i interface | -p pcapfile] host\n", progname);
+ 	exit(1);
+ }
+ 
+@@ -184,11 +184,14 @@
+ 	extern int optind;
+ 	int c;
+ 	
+-	while ((c = getopt(argc, argv, "i:h?V")) != -1) {
++	while ((c = getopt(argc, argv, "i:p:h?V")) != -1) {
+ 		switch (c) {
+ 		case 'i':
+ 			nids_params.device = optarg;
+ 			break;
++		case 'p':
++			nids_params.filename = optarg;
++			break;
+ 		default:
+ 			usage();
+ 		}
+@@ -216,7 +219,13 @@
+ 	
+ 	nids_register_tcp(sniff_http_client);
+ 
+-	warnx("listening on %s", nids_params.device);
++        if (nids_params.filename == NULL) {
++                warnx("listening on %s", nids_params.device);
++        }
++        else {
++                warnx("using %s", nids_params.filename);
++        }
++
+ 
+ 	nids_run();
+ 	
diff --git a/network/dsniff/patches/04_multiple_intf.patch b/network/dsniff/patches/04_multiple_intf.patch
new file mode 100644
index 0000000000..b624929d6c
--- /dev/null
+++ b/network/dsniff/patches/04_multiple_intf.patch
@@ -0,0 +1,56 @@
+Author: Steve Kemp <skx@debian.org>
+Description: Work with multiple interfaces.
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=242369
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+
+--- a/arp.c
++++ b/arp.c
+@@ -39,7 +39,7 @@
+ 
+ #ifdef BSD
+ int
+-arp_cache_lookup(in_addr_t ip, struct ether_addr *ether)
++arp_cache_lookup(in_addr_t ip, struct ether_addr *ether, const char* linf)
+ {
+ 	int mib[6];
+ 	size_t len;
+@@ -91,7 +91,7 @@
+ #endif
+ 
+ int
+-arp_cache_lookup(in_addr_t ip, struct ether_addr *ether)
++arp_cache_lookup(in_addr_t ip, struct ether_addr *ether, const char* lif)
+ {
+ 	int sock;
+ 	struct arpreq ar;
+@@ -99,7 +99,7 @@
+ 	
+ 	memset((char *)&ar, 0, sizeof(ar));
+ #ifdef __linux__
+-	strncpy(ar.arp_dev, "eth0", sizeof(ar.arp_dev));   /* XXX - *sigh* */
++	strncpy(ar.arp_dev, lif, strlen(lif));
+ #endif
+ 	sin = (struct sockaddr_in *)&ar.arp_pa;
+ 	sin->sin_family = AF_INET;
+--- a/arp.h
++++ b/arp.h
+@@ -11,6 +11,6 @@
+ #ifndef _ARP_H_
+ #define _ARP_H_
+ 
+-int	arp_cache_lookup(in_addr_t ip, struct ether_addr *ether);
++int	arp_cache_lookup(in_addr_t ip, struct ether_addr *ether, const char* linf);
+ 
+ #endif /* _ARP_H_ */
+--- a/arpspoof.c
++++ b/arpspoof.c
+@@ -113,7 +113,7 @@
+ 	int i = 0;
+ 
+ 	do {
+-		if (arp_cache_lookup(ip, mac) == 0)
++		if (arp_cache_lookup(ip, mac, intf) == 0)
+ 			return (1);
+ #ifdef __linux__
+ 		/* XXX - force the kernel to arp. feh. */
diff --git a/network/dsniff/patches/05_amd64_fix.patch b/network/dsniff/patches/05_amd64_fix.patch
new file mode 100644
index 0000000000..c5b9384fcf
--- /dev/null
+++ b/network/dsniff/patches/05_amd64_fix.patch
@@ -0,0 +1,221 @@
+Author: Steve Kemp <skx@debian.org>
+Description: Compile under AMD64.
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=254002
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+
+--- a/configure
++++ b/configure
+@@ -2667,15 +2667,62 @@
+   echo "$ac_t""no" 1>&6
+ fi
+ 
++echo $ac_n "checking for __dn_expand in -lresolv""... $ac_c" 1>&6
++echo "configure:2672: checking for __dn_expand in -lresolv" >&5
++ac_lib_var=`echo resolv'_'__dn_expand | sed 'y%./+-%__p_%'`
++if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  ac_save_LIBS="$LIBS"
++LIBS="-lresolv  $LIBS"
++cat > conftest.$ac_ext <<EOF
++#line 2680 "configure"
++#include "confdefs.h"
++/* Override any gcc2 internal prototype to avoid an error.  */
++/* We use char because int might match the return type of a gcc2
++    builtin and then its argument prototype would still apply.  */
++char __dn_expand();
++
++int main() {
++__dn_expand()
++; return 0; }
++EOF
++if { (eval echo configure:2691: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++  rm -rf conftest*
++  eval "ac_cv_lib_$ac_lib_var=yes"
++else
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  rm -rf conftest*
++  eval "ac_cv_lib_$ac_lib_var=no"
++fi
++rm -f conftest*
++LIBS="$ac_save_LIBS"
++
++fi
++if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
++  echo "$ac_t""yes" 1>&6
++    ac_tr_lib=HAVE_LIB`echo resolv | sed -e 's/[^a-zA-Z0-9_]/_/g' \
++    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
++  cat >> confdefs.h <<EOF
++#define $ac_tr_lib 1
++EOF
++
++  LIBS="-lresolv $LIBS"
++
++else
++  echo "$ac_t""no" 1>&6
++fi
++
+ for ac_func in dirname strlcpy strlcat strsep
+ do
+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+-echo "configure:2674: checking for $ac_func" >&5
++echo "configure:2721: checking for $ac_func" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 2679 "configure"
++#line 2726 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func(); below.  */
+@@ -2698,7 +2745,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2702: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:2749: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_func_$ac_func=yes"
+ else
+@@ -2728,12 +2775,12 @@
+ for ac_func in MD5Update
+ do
+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+-echo "configure:2732: checking for $ac_func" >&5
++echo "configure:2779: checking for $ac_func" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 2737 "configure"
++#line 2784 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func(); below.  */
+@@ -2756,7 +2803,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2760: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:2807: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_func_$ac_func=yes"
+ else
+@@ -2788,12 +2835,12 @@
+ for ac_func in warnx
+ do
+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+-echo "configure:2792: checking for $ac_func" >&5
++echo "configure:2839: checking for $ac_func" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 2797 "configure"
++#line 2844 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func(); below.  */
+@@ -2816,7 +2863,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2820: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:2867: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_func_$ac_func=yes"
+ else
+@@ -2848,12 +2895,12 @@
+ for ac_func in ether_ntoa
+ do
+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+-echo "configure:2852: checking for $ac_func" >&5
++echo "configure:2899: checking for $ac_func" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 2857 "configure"
++#line 2904 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func(); below.  */
+@@ -2876,7 +2923,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2880: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:2927: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_func_$ac_func=yes"
+ else
+@@ -2912,7 +2959,7 @@
+ fi
+ 
+ echo $ac_n "checking for Berkeley DB with 1.85 compatibility""... $ac_c" 1>&6
+-echo "configure:2916: checking for Berkeley DB with 1.85 compatibility" >&5
++echo "configure:2963: checking for Berkeley DB with 1.85 compatibility" >&5
+ # Check whether --with-db or --without-db was given.
+ if test "${with_db+set}" = set; then
+   withval="$with_db"
+@@ -3015,7 +3062,7 @@
+ 
+ 
+ echo $ac_n "checking for libpcap""... $ac_c" 1>&6
+-echo "configure:3019: checking for libpcap" >&5
++echo "configure:3066: checking for libpcap" >&5
+ # Check whether --with-libpcap or --without-libpcap was given.
+ if test "${with_libpcap+set}" = set; then
+   withval="$with_libpcap"
+@@ -3063,7 +3110,7 @@
+ 
+ 
+ echo $ac_n "checking for libnet""... $ac_c" 1>&6
+-echo "configure:3067: checking for libnet" >&5
++echo "configure:3114: checking for libnet" >&5
+ # Check whether --with-libnet or --without-libnet was given.
+ if test "${with_libnet+set}" = set; then
+   withval="$with_libnet"
+@@ -3110,7 +3157,7 @@
+ 
+ 
+ echo $ac_n "checking for libnids""... $ac_c" 1>&6
+-echo "configure:3114: checking for libnids" >&5
++echo "configure:3161: checking for libnids" >&5
+ # Check whether --with-libnids or --without-libnids was given.
+ if test "${with_libnids+set}" = set; then
+   withval="$with_libnids"
+@@ -3152,9 +3199,9 @@
+ save_cppflags="$CPPFLAGS"
+ CPPFLAGS="$NIDSINC"
+ echo $ac_n "checking whether libnids version is good""... $ac_c" 1>&6
+-echo "configure:3156: checking whether libnids version is good" >&5
++echo "configure:3203: checking whether libnids version is good" >&5
+ cat > conftest.$ac_ext <<EOF
+-#line 3158 "configure"
++#line 3205 "configure"
+ #include "confdefs.h"
+ #include <nids.h>
+ EOF
+@@ -3173,7 +3220,7 @@
+ 
+ 
+ echo $ac_n "checking for OpenSSL""... $ac_c" 1>&6
+-echo "configure:3177: checking for OpenSSL" >&5
++echo "configure:3224: checking for OpenSSL" >&5
+ # Check whether --with-openssl or --without-openssl was given.
+ if test "${with_openssl+set}" = set; then
+   withval="$with_openssl"
+--- a/configure.in
++++ b/configure.in
+@@ -57,6 +57,7 @@
+ AC_CHECK_LIB(nsl, gethostbyname)
+ dnl XXX - feh, everything except OpenBSD sux.
+ AC_CHECK_LIB(resolv, dn_expand)
++AC_CHECK_LIB(resolv, __dn_expand)
+ AC_REPLACE_FUNCS(dirname strlcpy strlcat strsep)
+ needmd5=no
+ AC_CHECK_FUNCS(MD5Update, , [needmd5=yes])
diff --git a/network/dsniff/patches/06_urlsnarf_zeropad.patch b/network/dsniff/patches/06_urlsnarf_zeropad.patch
new file mode 100644
index 0000000000..29991708e5
--- /dev/null
+++ b/network/dsniff/patches/06_urlsnarf_zeropad.patch
@@ -0,0 +1,17 @@
+Author: Steve Kemp <skx@debian.org>
+Description: urlsnarf: zero-pad date.
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=298605
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+
+--- a/urlsnarf.c
++++ b/urlsnarf.c
+@@ -68,7 +68,7 @@
+ 		 t->tm_hour - gmt.tm_hour);
+ 	tz = hours * 60 + t->tm_min - gmt.tm_min;
+ 	
+-	len = strftime(tstr, sizeof(tstr), "%e/%b/%Y:%X", t);
++	len = strftime(tstr, sizeof(tstr), "%d/%b/%Y:%X", t);
+ 	if (len < 0 || len > sizeof(tstr) - 5)
+ 		return (NULL);
+ 	
diff --git a/network/dsniff/patches/07_libnet_1.1.patch b/network/dsniff/patches/07_libnet_1.1.patch
new file mode 100644
index 0000000000..66d57cade4
--- /dev/null
+++ b/network/dsniff/patches/07_libnet_1.1.patch
@@ -0,0 +1,906 @@
+Author: Faidon Liambotis <paravoid@debian.org>
+Description: Use libnet v1.1 instead of v1.0
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+
+--- a/arpspoof.c
++++ b/arpspoof.c
+@@ -27,7 +27,7 @@
+ 
+ extern char *ether_ntoa(struct ether_addr *);
+ 
+-static struct libnet_link_int *llif;
++static libnet_t *l;
+ static struct ether_addr spoof_mac, target_mac;
+ static in_addr_t spoof_ip, target_ip;
+ static char *intf;
+@@ -41,47 +41,49 @@
+ }
+ 
+ static int
+-arp_send(struct libnet_link_int *llif, char *dev,
+-	 int op, u_char *sha, in_addr_t spa, u_char *tha, in_addr_t tpa)
++arp_send(libnet_t *l, int op, u_int8_t *sha,
++	 in_addr_t spa, u_int8_t *tha, in_addr_t tpa)
+ {
+-	char ebuf[128];
+-	u_char pkt[60];
+-	
++	int retval;
++
+ 	if (sha == NULL &&
+-	    (sha = (u_char *)libnet_get_hwaddr(llif, dev, ebuf)) == NULL) {
++	    (sha = (u_int8_t *)libnet_get_hwaddr(l)) == NULL) {
+ 		return (-1);
+ 	}
+ 	if (spa == 0) {
+-		if ((spa = libnet_get_ipaddr(llif, dev, ebuf)) == 0)
++		if ((spa = libnet_get_ipaddr4(l)) == -1)
+ 			return (-1);
+-		spa = htonl(spa); /* XXX */
+ 	}
+ 	if (tha == NULL)
+ 		tha = "\xff\xff\xff\xff\xff\xff";
+ 	
+-	libnet_build_ethernet(tha, sha, ETHERTYPE_ARP, NULL, 0, pkt);
++	libnet_autobuild_arp(op, sha, (u_int8_t *)&spa,
++			     tha, (u_int8_t *)&tpa, l);
++	libnet_build_ethernet(tha, sha, ETHERTYPE_ARP, NULL, 0, l, 0);
+ 	
+-	libnet_build_arp(ARPHRD_ETHER, ETHERTYPE_IP, ETHER_ADDR_LEN, 4,
+-			 op, sha, (u_char *)&spa, tha, (u_char *)&tpa,
+-			 NULL, 0, pkt + ETH_H);
+-
+ 	fprintf(stderr, "%s ",
+ 		ether_ntoa((struct ether_addr *)sha));
+ 
+ 	if (op == ARPOP_REQUEST) {
+ 		fprintf(stderr, "%s 0806 42: arp who-has %s tell %s\n",
+ 			ether_ntoa((struct ether_addr *)tha),
+-			libnet_host_lookup(tpa, 0),
+-			libnet_host_lookup(spa, 0));
++			libnet_addr2name4(tpa, LIBNET_DONT_RESOLVE),
++			libnet_addr2name4(spa, LIBNET_DONT_RESOLVE));
+ 	}
+ 	else {
+ 		fprintf(stderr, "%s 0806 42: arp reply %s is-at ",
+ 			ether_ntoa((struct ether_addr *)tha),
+-			libnet_host_lookup(spa, 0));
++			libnet_addr2name4(spa, LIBNET_DONT_RESOLVE));
+ 		fprintf(stderr, "%s\n",
+ 			ether_ntoa((struct ether_addr *)sha));
+ 	}
+-	return (libnet_write_link_layer(llif, dev, pkt, sizeof(pkt)) == sizeof(pkt));
++	retval = libnet_write(l);
++	if (retval)
++		fprintf(stderr, "%s", libnet_geterror(l));
++
++	libnet_clear_packet(l);
++
++	return retval;
+ }
+ 
+ #ifdef __linux__
+@@ -119,7 +121,7 @@
+ 		/* XXX - force the kernel to arp. feh. */
+ 		arp_force(ip);
+ #else
+-		arp_send(llif, intf, ARPOP_REQUEST, NULL, 0, NULL, ip);
++		arp_send(l, ARPOP_REQUEST, NULL, 0, NULL, ip);
+ #endif
+ 		sleep(1);
+ 	}
+@@ -136,9 +138,9 @@
+ 	if (arp_find(spoof_ip, &spoof_mac)) {
+ 		for (i = 0; i < 3; i++) {
+ 			/* XXX - on BSD, requires ETHERSPOOF kernel. */
+-			arp_send(llif, intf, ARPOP_REPLY,
+-				 (u_char *)&spoof_mac, spoof_ip,
+-				 (target_ip ? (u_char *)&target_mac : NULL),
++			arp_send(l, ARPOP_REPLY,
++				 (u_int8_t *)&spoof_mac, spoof_ip,
++				 (target_ip ? (u_int8_t *)&target_mac : NULL),
+ 				 target_ip);
+ 			sleep(1);
+ 		}
+@@ -151,7 +153,8 @@
+ {
+ 	extern char *optarg;
+ 	extern int optind;
+-	char ebuf[PCAP_ERRBUF_SIZE];
++	char pcap_ebuf[PCAP_ERRBUF_SIZE];
++	char libnet_ebuf[LIBNET_ERRBUF_SIZE];
+ 	int c;
+ 	
+ 	intf = NULL;
+@@ -163,7 +166,7 @@
+ 			intf = optarg;
+ 			break;
+ 		case 't':
+-			if ((target_ip = libnet_name_resolve(optarg, 1)) == -1)
++			if ((target_ip = libnet_name2addr4(l, optarg, LIBNET_RESOLVE)) == -1)
+ 				usage();
+ 			break;
+ 		default:
+@@ -176,26 +179,26 @@
+ 	if (argc != 1)
+ 		usage();
+ 	
+-	if ((spoof_ip = libnet_name_resolve(argv[0], 1)) == -1)
++	if ((spoof_ip = libnet_name2addr4(l, argv[0], LIBNET_RESOLVE)) == -1)
+ 		usage();
+ 	
+-	if (intf == NULL && (intf = pcap_lookupdev(ebuf)) == NULL)
+-		errx(1, "%s", ebuf);
++	if (intf == NULL && (intf = pcap_lookupdev(pcap_ebuf)) == NULL)
++		errx(1, "%s", pcap_ebuf);
+ 	
+-	if ((llif = libnet_open_link_interface(intf, ebuf)) == 0)
+-		errx(1, "%s", ebuf);
++	if ((l = libnet_init(LIBNET_LINK, intf, libnet_ebuf)) == NULL)
++		errx(1, "%s", libnet_ebuf);
+ 	
+ 	if (target_ip != 0 && !arp_find(target_ip, &target_mac))
+ 		errx(1, "couldn't arp for host %s",
+-		     libnet_host_lookup(target_ip, 0));
++		     libnet_addr2name4(target_ip, LIBNET_DONT_RESOLVE));
+ 	
+ 	signal(SIGHUP, cleanup);
+ 	signal(SIGINT, cleanup);
+ 	signal(SIGTERM, cleanup);
+ 	
+ 	for (;;) {
+-		arp_send(llif, intf, ARPOP_REPLY, NULL, spoof_ip,
+-			 (target_ip ? (u_char *)&target_mac : NULL),
++		arp_send(l, ARPOP_REPLY, NULL, spoof_ip,
++			 (target_ip ? (u_int8_t *)&target_mac : NULL),
+ 			 target_ip);
+ 		sleep(2);
+ 	}
+--- a/dnsspoof.c
++++ b/dnsspoof.c
+@@ -38,7 +38,7 @@
+ 
+ pcap_t		*pcap_pd = NULL;
+ int		 pcap_off = -1;
+-int		 lnet_sock = -1;
++libnet_t	*l;
+ u_long		 lnet_ip = -1;
+ 
+ static void
+@@ -90,19 +90,18 @@
+ dns_init(char *dev, char *filename)
+ {
+ 	FILE *f;
+-	struct libnet_link_int *llif;
++	libnet_t *l;
++	char libnet_ebuf[LIBNET_ERRBUF_SIZE];
+ 	struct dnsent *de;
+ 	char *ip, *name, buf[1024];
+ 
+-	if ((llif = libnet_open_link_interface(dev, buf)) == NULL)
+-		errx(1, "%s", buf);
++	if ((l = libnet_init(LIBNET_LINK, dev, libnet_ebuf)) == NULL)
++		errx(1, "%s", libnet_ebuf);
+ 	
+-	if ((lnet_ip = libnet_get_ipaddr(llif, dev, buf)) == -1)
+-		errx(1, "%s", buf);
++	if ((lnet_ip = libnet_get_ipaddr4(l)) == -1)
++		errx(1, "%s", libnet_geterror(l));
+ 
+-	lnet_ip = htonl(lnet_ip);
+-	
+-	libnet_close_link_interface(llif);
++	libnet_destroy(l);
+ 
+ 	SLIST_INIT(&dns_entries);
+ 	
+@@ -180,7 +179,7 @@
+ static void
+ dns_spoof(u_char *u, const struct pcap_pkthdr *pkthdr, const u_char *pkt)
+ {
+-	struct libnet_ip_hdr *ip;
++	struct libnet_ipv4_hdr *ip;
+ 	struct libnet_udp_hdr *udp;
+ 	HEADER *dns;
+ 	char name[MAXHOSTNAMELEN];
+@@ -189,7 +188,7 @@
+ 	in_addr_t dst;
+ 	u_short type, class;
+ 
+-	ip = (struct libnet_ip_hdr *)(pkt + pcap_off);
++	ip = (struct libnet_ipv4_hdr *)(pkt + pcap_off);
+ 	udp = (struct libnet_udp_hdr *)(pkt + pcap_off + (ip->ip_hl * 4));
+ 	dns = (HEADER *)(udp + 1);
+ 	p = (u_char *)(dns + 1);
+@@ -212,7 +211,7 @@
+ 	if (class != C_IN)
+ 		return;
+ 
+-	p = buf + IP_H + UDP_H + dnslen;
++	p = buf + dnslen;
+ 	
+ 	if (type == T_A) {
+ 		if ((dst = dns_lookup_a(name)) == -1)
+@@ -234,38 +233,38 @@
+ 		anslen += 12;
+ 	}
+ 	else return;
+-	
+-	libnet_build_ip(UDP_H + dnslen + anslen, 0, libnet_get_prand(PRu16),
+-			0, 64, IPPROTO_UDP, ip->ip_dst.s_addr,
+-			ip->ip_src.s_addr, NULL, 0, buf);
+-	
+-	libnet_build_udp(ntohs(udp->uh_dport), ntohs(udp->uh_sport),
+-			 NULL, dnslen + anslen, buf + IP_H);
+ 
+-	memcpy(buf + IP_H + UDP_H, (u_char *)dns, dnslen);
++	memcpy(buf, (u_char *)dns, dnslen);
+ 
+-	dns = (HEADER *)(buf + IP_H + UDP_H);
++	dns = (HEADER *)buf;
+ 	dns->qr = dns->ra = 1;
+ 	if (type == T_PTR) dns->aa = 1;
+ 	dns->ancount = htons(1);
+ 
+ 	dnslen += anslen;
++
++	libnet_clear_packet(l);
++	libnet_build_udp(ntohs(udp->uh_dport), ntohs(udp->uh_sport),
++			 LIBNET_UDP_H + dnslen, 0,
++			 (u_int8_t *)buf, dnslen, l, 0);
++
++	libnet_build_ipv4(LIBNET_IPV4_H + LIBNET_UDP_H + dnslen, 0,
++			  libnet_get_prand(LIBNET_PRu16), 0, 64, IPPROTO_UDP, 0,
++			  ip->ip_dst.s_addr, ip->ip_src.s_addr, NULL, 0, l, 0);
+ 	
+-	libnet_do_checksum(buf, IPPROTO_UDP, UDP_H + dnslen);
+-	
+-	if (libnet_write_ip(lnet_sock, buf, IP_H + UDP_H + dnslen) < 0)
++	if (libnet_write(l) < 0)
+ 		warn("write");
+ 
+ 	fprintf(stderr, "%s.%d > %s.%d:  %d+ %s? %s\n",
+-	      libnet_host_lookup(ip->ip_src.s_addr, 0), ntohs(udp->uh_sport),
+-	      libnet_host_lookup(ip->ip_dst.s_addr, 0), ntohs(udp->uh_dport),
++	      libnet_addr2name4(ip->ip_src.s_addr, 0), ntohs(udp->uh_sport),
++	      libnet_addr2name4(ip->ip_dst.s_addr, 0), ntohs(udp->uh_dport),
+ 	      ntohs(dns->id), type == T_A ? "A" : "PTR", name);
+ }
+ 
+ static void
+ cleanup(int sig)
+ {
+-	libnet_close_raw_sock(lnet_sock);
++	libnet_destroy(l);
+ 	pcap_close(pcap_pd);
+ 	exit(0);
+ }
+@@ -276,6 +275,7 @@
+ 	extern char *optarg;
+ 	extern int optind;
+ 	char *p, *dev, *hosts, buf[1024];
++	char ebuf[LIBNET_ERRBUF_SIZE];
+ 	int i;
+ 
+ 	dev = hosts = NULL;
+@@ -306,7 +306,7 @@
+ 		strlcpy(buf, p, sizeof(buf));
+ 	}
+ 	else snprintf(buf, sizeof(buf), "udp dst port 53 and not src %s",
+-		      libnet_host_lookup(lnet_ip, 0));
++		      libnet_addr2name4(lnet_ip, LIBNET_DONT_RESOLVE));
+ 	
+ 	if ((pcap_pd = pcap_init(dev, buf, 128)) == NULL)
+ 		errx(1, "couldn't initialize sniffing");
+@@ -314,10 +314,10 @@
+ 	if ((pcap_off = pcap_dloff(pcap_pd)) < 0)
+ 		errx(1, "couldn't determine link layer offset");
+ 	
+-	if ((lnet_sock = libnet_open_raw_sock(IPPROTO_RAW)) == -1)
++	if ((l = libnet_init(LIBNET_RAW4, dev, ebuf)) == NULL)
+ 		errx(1, "couldn't initialize sending");
+ 	
+-	libnet_seed_prand();
++	libnet_seed_prand(l);
+ 	
+ 	signal(SIGHUP, cleanup);
+ 	signal(SIGINT, cleanup);
+--- a/filesnarf.c
++++ b/filesnarf.c
+@@ -134,8 +134,8 @@
+ 	int fd;
+ 
+ 	warnx("%s.%d > %s.%d: %s (%d@%d)",
+-	      libnet_host_lookup(addr->daddr, 0), addr->dest,
+-	      libnet_host_lookup(addr->saddr, 0), addr->source,
++	      libnet_addr2name4(addr->daddr, LIBNET_DONT_RESOLVE), addr->dest,
++	      libnet_addr2name4(addr->saddr, LIBNET_DONT_RESOLVE), addr->source,
+ 	      ma->filename, len, ma->offset);
+ 	
+ 	if ((fd = open(ma->filename, O_WRONLY|O_CREAT, 0644)) >= 0) {
+@@ -353,7 +353,7 @@
+ }
+ 
+ static void
+-decode_udp_nfs(struct libnet_ip_hdr *ip)
++decode_udp_nfs(struct libnet_ipv4_hdr *ip)
+ {
+ 	static struct tuple4 addr;
+ 	struct libnet_udp_hdr *udp;
+--- a/macof.c
++++ b/macof.c
+@@ -48,8 +48,8 @@
+ static void
+ gen_mac(u_char *mac)
+ {
+-	*((in_addr_t *)mac) = libnet_get_prand(PRu32);
+-	*((u_short *)(mac + 4)) = libnet_get_prand(PRu16);
++	*((in_addr_t *)mac) = libnet_get_prand(LIBNET_PRu32);
++	*((u_short *)(mac + 4)) = libnet_get_prand(LIBNET_PRu16);
+ }
+ 
+ int
+@@ -59,22 +59,23 @@
+ 	extern int optind;
+ 	int c, i;
+ 	struct libnet_link_int *llif;
+-	char ebuf[PCAP_ERRBUF_SIZE];
++	char pcap_ebuf[PCAP_ERRBUF_SIZE];
++	char libnet_ebuf[LIBNET_ERRBUF_SIZE];
+ 	u_char sha[ETHER_ADDR_LEN], tha[ETHER_ADDR_LEN];
+ 	in_addr_t src, dst;
+ 	u_short sport, dport;
+ 	u_int32_t seq;
+-	u_char pkt[ETH_H + IP_H + TCP_H];
++	libnet_t *l;
+ 	
+ 	while ((c = getopt(argc, argv, "vs:d:e:x:y:i:n:h?V")) != -1) {
+ 		switch (c) {
+ 		case 'v':
+ 			break;
+ 		case 's':
+-			Src = libnet_name_resolve(optarg, 0);
++			Src = libnet_name2addr4(l, optarg, 0);
+ 			break;
+ 		case 'd':
+-			Dst = libnet_name_resolve(optarg, 0);
++			Dst = libnet_name2addr4(l, optarg, 0);
+ 			break;
+ 		case 'e':
+ 			Tha = (u_char *)ether_aton(optarg);
+@@ -101,13 +102,13 @@
+ 	if (argc != 0)
+ 		usage();
+ 	
+-	if (!Intf && (Intf = pcap_lookupdev(ebuf)) == NULL)
+-		errx(1, "%s", ebuf);
++	if (!Intf && (Intf = pcap_lookupdev(pcap_ebuf)) == NULL)
++		errx(1, "%s", pcap_ebuf);
+ 	
+-	if ((llif = libnet_open_link_interface(Intf, ebuf)) == 0)
+-		errx(1, "%s", ebuf);
++	if ((l = libnet_init(LIBNET_LINK, Intf, libnet_ebuf)) == NULL)
++		errx(1, "%s", libnet_ebuf);
+ 	
+-	libnet_seed_prand();
++	libnet_seed_prand(l);
+ 	
+ 	for (i = 0; i != Repeat; i++) {
+ 		
+@@ -117,39 +118,39 @@
+ 		else memcpy(tha, Tha, sizeof(tha));
+ 		
+ 		if (Src != 0) src = Src;
+-		else src = libnet_get_prand(PRu32);
++		else src = libnet_get_prand(LIBNET_PRu32);
+ 		
+ 		if (Dst != 0) dst = Dst;
+-		else dst = libnet_get_prand(PRu32);
++		else dst = libnet_get_prand(LIBNET_PRu32);
+ 		
+ 		if (Sport != 0) sport = Sport;
+-		else sport = libnet_get_prand(PRu16);
++		else sport = libnet_get_prand(LIBNET_PRu16);
+ 		
+ 		if (Dport != 0) dport = Dport;
+-		else dport = libnet_get_prand(PRu16);
++		else dport = libnet_get_prand(LIBNET_PRu16);
+ 
+-		seq = libnet_get_prand(PRu32);
+-		
+-		libnet_build_ethernet(tha, sha, ETHERTYPE_IP, NULL, 0, pkt);
+-		
+-		libnet_build_ip(TCP_H, 0, libnet_get_prand(PRu16), 0, 64,
+-				IPPROTO_TCP, src, dst, NULL, 0, pkt + ETH_H);
++		seq = libnet_get_prand(LIBNET_PRu32);
+ 		
+ 		libnet_build_tcp(sport, dport, seq, 0, TH_SYN, 512,
+-				 0, NULL, 0, pkt + ETH_H + IP_H);
++				 0, 0, LIBNET_TCP_H, NULL, 0, l, 0);
+ 		
+-		libnet_do_checksum(pkt + ETH_H, IPPROTO_IP, IP_H);
+-		libnet_do_checksum(pkt + ETH_H, IPPROTO_TCP, TCP_H);
++		libnet_build_ipv4(LIBNET_TCP_H, 0,
++				  libnet_get_prand(LIBNET_PRu16), 0, 64,
++				  IPPROTO_TCP, 0, src, dst, NULL, 0, l, 0);
+ 		
+-		if (libnet_write_link_layer(llif, Intf, pkt, sizeof(pkt)) < 0)
++		libnet_build_ethernet(tha, sha, ETHERTYPE_IP, NULL, 0, l, 0);
++		
++		if (libnet_write(l) < 0)
+ 			errx(1, "write");
+ 
++		libnet_clear_packet(l);
++
+ 		fprintf(stderr, "%s ",
+ 			ether_ntoa((struct ether_addr *)sha));
+ 		fprintf(stderr, "%s %s.%d > %s.%d: S %u:%u(0) win 512\n",
+ 			ether_ntoa((struct ether_addr *)tha),
+-			libnet_host_lookup(Src, 0), sport,
+-			libnet_host_lookup(Dst, 0), dport, seq, seq);
++			libnet_addr2name4(Src, 0), sport,
++			libnet_addr2name4(Dst, 0), dport, seq, seq);
+ 	}
+ 	exit(0);
+ }
+--- a/record.c
++++ b/record.c
+@@ -65,8 +65,8 @@
+ 	tm = localtime(&rec->time);
+ 	strftime(tstr, sizeof(tstr), "%x %X", tm);
+ 	
+-	srcp = libnet_host_lookup(rec->src, Opt_dns);
+-	dstp = libnet_host_lookup(rec->dst, Opt_dns);
++	srcp = libnet_addr2name4(rec->src, Opt_dns);
++	dstp = libnet_addr2name4(rec->dst, Opt_dns);
+ 
+ 	if ((pr = getprotobynumber(rec->proto)) == NULL)
+ 		protop = "unknown";
+--- a/sshmitm.c
++++ b/sshmitm.c
+@@ -389,7 +389,7 @@
+ 	if (argc < 1)
+ 		usage();
+ 	
+-	if ((ip = libnet_name_resolve(argv[0], 1)) == -1)
++	if ((ip = libnet_name2addr4(NULL, argv[0], LIBNET_RESOLVE)) == -1)
+ 		usage();
+ 
+ 	if (argc == 2 && (rport = atoi(argv[1])) == 0)
+--- a/tcpkill.c
++++ b/tcpkill.c
+@@ -39,17 +39,18 @@
+ static void
+ tcp_kill_cb(u_char *user, const struct pcap_pkthdr *pcap, const u_char *pkt)
+ {
+-	struct libnet_ip_hdr *ip;
++	struct libnet_ipv4_hdr *ip;
+ 	struct libnet_tcp_hdr *tcp;
+-	u_char ctext[64], buf[IP_H + TCP_H];
++	u_char ctext[64];
+ 	u_int32_t seq, win;
+-	int i, *sock, len;
++	int i, len;
++	libnet_t *l;
+ 
+-	sock = (int *)user;
++	l = (libnet_t *)user;
+ 	pkt += pcap_off;
+ 	len = pcap->caplen - pcap_off;
+ 
+-	ip = (struct libnet_ip_hdr *)pkt;
++	ip = (struct libnet_ipv4_hdr *)pkt;
+ 	if (ip->ip_p != IPPROTO_TCP)
+ 		return;
+ 	
+@@ -57,34 +58,31 @@
+ 	if (tcp->th_flags & (TH_SYN|TH_FIN|TH_RST))
+ 		return;
+ 
+-	libnet_build_ip(TCP_H, 0, 0, 0, 64, IPPROTO_TCP,
+-			ip->ip_dst.s_addr, ip->ip_src.s_addr,
+-			NULL, 0, buf);
+-
+-	libnet_build_tcp(ntohs(tcp->th_dport), ntohs(tcp->th_sport),
+-			 0, 0, TH_RST, 0, 0, NULL, 0, buf + IP_H);
+-	
+ 	seq = ntohl(tcp->th_ack);
+ 	win = ntohs(tcp->th_win);
+ 	
+ 	snprintf(ctext, sizeof(ctext), "%s:%d > %s:%d:",
+-		 libnet_host_lookup(ip->ip_src.s_addr, 0),
++		 libnet_addr2name4(ip->ip_src.s_addr, LIBNET_DONT_RESOLVE),
+ 		 ntohs(tcp->th_sport),
+-		 libnet_host_lookup(ip->ip_dst.s_addr, 0),
++		 libnet_addr2name4(ip->ip_dst.s_addr, LIBNET_DONT_RESOLVE),
+ 		 ntohs(tcp->th_dport));
+ 	
+-	ip = (struct libnet_ip_hdr *)buf;
+-	tcp = (struct libnet_tcp_hdr *)(ip + 1);
+-	
+ 	for (i = 0; i < Opt_severity; i++) {
+-		ip->ip_id = libnet_get_prand(PRu16);
+ 		seq += (i * win);
+-		tcp->th_seq = htonl(seq);
+ 		
+-		libnet_do_checksum(buf, IPPROTO_TCP, TCP_H);
++		libnet_clear_packet(l);
++		
++		libnet_build_tcp(ntohs(tcp->th_dport), ntohs(tcp->th_sport),
++				 seq, 0, TH_RST, 0, 0, 0, LIBNET_TCP_H, 
++				 NULL, 0, l, 0);
++		
++		libnet_build_ipv4(LIBNET_IPV4_H + LIBNET_TCP_H, 0,
++				  libnet_get_prand(LIBNET_PRu16), 0, 64,
++				  IPPROTO_TCP, 0, ip->ip_dst.s_addr,
++				  ip->ip_src.s_addr, NULL, 0, l, 0);
+ 		
+-		if (libnet_write_ip(*sock, buf, sizeof(buf)) < 0)
+-			warn("write_ip");
++		if (libnet_write(l) < 0)
++			warn("write");
+ 		
+ 		fprintf(stderr, "%s R %lu:%lu(0) win 0\n", ctext, seq, seq);
+ 	}
+@@ -95,8 +93,10 @@
+ {
+ 	extern char *optarg;
+ 	extern int optind;
+-	int c, sock;
++	int c;
+ 	char *p, *intf, *filter, ebuf[PCAP_ERRBUF_SIZE];
++	char libnet_ebuf[LIBNET_ERRBUF_SIZE];
++	libnet_t *l;
+ 	pcap_t *pd;
+ 	
+ 	intf = NULL;
+@@ -136,14 +136,14 @@
+ 	if ((pcap_off = pcap_dloff(pd)) < 0)
+ 		errx(1, "couldn't determine link layer offset");
+ 	
+-	if ((sock = libnet_open_raw_sock(IPPROTO_RAW)) == -1)
++	if ((l = libnet_init(LIBNET_RAW4, intf, libnet_ebuf)) == NULL)
+ 		errx(1, "couldn't initialize sending");
+ 	
+-	libnet_seed_prand();
++	libnet_seed_prand(l);
+ 	
+ 	warnx("listening on %s [%s]", intf, filter);
+ 	
+-	pcap_loop(pd, -1, tcp_kill_cb, (u_char *)&sock);
++	pcap_loop(pd, -1, tcp_kill_cb, (u_char *)l);
+   
+ 	/* NOTREACHED */
+ 	
+--- a/tcpnice.c
++++ b/tcpnice.c
+@@ -41,107 +41,106 @@
+ }
+ 
+ static void
+-send_tcp_window_advertisement(int sock, struct libnet_ip_hdr *ip,
++send_tcp_window_advertisement(libnet_t *l, struct libnet_ipv4_hdr *ip,
+ 			     struct libnet_tcp_hdr *tcp)
+ {
+ 	int len;
+ 	
+ 	ip->ip_hl = 5;
+-	ip->ip_len = htons(IP_H + TCP_H);
+-	ip->ip_id = libnet_get_prand(PRu16);
+-	memcpy(buf, (u_char *)ip, IP_H);
++	ip->ip_len = htons(LIBNET_IPV4_H + LIBNET_TCP_H);
++	ip->ip_id = libnet_get_prand(LIBNET_PRu16);
++	memcpy(buf, (u_char *)ip, LIBNET_IPV4_H);
+ 	
+ 	tcp->th_off = 5;
+ 	tcp->th_win = htons(MIN_WIN);
+-	memcpy(buf + IP_H, (u_char *)tcp, TCP_H);
++	memcpy(buf + LIBNET_IPV4_H, (u_char *)tcp, LIBNET_TCP_H);
+ 	
+-	libnet_do_checksum(buf, IPPROTO_TCP, TCP_H);
++	libnet_do_checksum(l, buf, IPPROTO_TCP, LIBNET_TCP_H);
+ 	
+-	len = IP_H + TCP_H;
++	len = LIBNET_IPV4_H + LIBNET_TCP_H;
+ 	
+-	if (libnet_write_ip(sock, buf, len) != len)
++	if (libnet_write_raw_ipv4(l, buf, len) != len)
+ 		warn("write");
+ 	
+ 	fprintf(stderr, "%s:%d > %s:%d: . ack %lu win %d\n",
+-		libnet_host_lookup(ip->ip_src.s_addr, 0), ntohs(tcp->th_sport),
+-		libnet_host_lookup(ip->ip_dst.s_addr, 0), ntohs(tcp->th_dport),
++		libnet_addr2name4(ip->ip_src.s_addr, 0), ntohs(tcp->th_sport),
++		libnet_addr2name4(ip->ip_dst.s_addr, 0), ntohs(tcp->th_dport),
+ 		ntohl(tcp->th_ack), 1);
+ }
+ 
+ static void
+-send_icmp_source_quench(int sock, struct libnet_ip_hdr *ip)
++send_icmp_source_quench(libnet_t *l, struct libnet_ipv4_hdr *ip)
+ {
+-	struct libnet_icmp_hdr *icmp;
++	struct libnet_icmpv4_hdr *icmp;
+ 	int len;
+ 	
+ 	len = (ip->ip_hl * 4) + 8;
+ 
+-	libnet_build_ip(ICMP_ECHO_H + len, 0, libnet_get_prand(PRu16),
+-			0, 64, IPPROTO_ICMP, ip->ip_dst.s_addr,
+-			ip->ip_src.s_addr, NULL, 0, buf);
+-	
+-	icmp = (struct libnet_icmp_hdr *)(buf + IP_H);
++	icmp = (struct libnet_icmpv4_hdr *)(buf + LIBNET_IPV4_H);
+ 	icmp->icmp_type = ICMP_SOURCEQUENCH;
+ 	icmp->icmp_code = 0;
+-	memcpy((u_char *)icmp + ICMP_ECHO_H, (u_char *)ip, len);
++	memcpy((u_char *)icmp + LIBNET_ICMPV4_ECHO_H, (u_char *)ip, len);
+ 	
+-	libnet_do_checksum(buf, IPPROTO_ICMP, ICMP_ECHO_H + len);
++	len += LIBNET_ICMPV4_ECHO_H;
+ 	
+-	len += (IP_H + ICMP_ECHO_H);
++	libnet_build_ipv4(LIBNET_IPV4_H + len, 0,
++			  libnet_get_prand(LIBNET_PRu16), 0, 64, IPPROTO_ICMP,
++			  0, ip->ip_dst.s_addr, ip->ip_src.s_addr,
++			  (u_int8_t *) icmp, len, l, 0);
+ 	
+-	if (libnet_write_ip(sock, buf, len) != len)
++	if (libnet_write(l) != len)
+ 		warn("write");
+ 	
+ 	fprintf(stderr, "%s > %s: icmp: source quench\n",
+-		libnet_host_lookup(ip->ip_dst.s_addr, 0),
+-		libnet_host_lookup(ip->ip_src.s_addr, 0));
++		libnet_addr2name4(ip->ip_dst.s_addr, 0),
++		libnet_addr2name4(ip->ip_src.s_addr, 0));
+ }
+ 
+ static void
+-send_icmp_frag_needed(int sock, struct libnet_ip_hdr *ip)
++send_icmp_frag_needed(libnet_t *l, struct libnet_ipv4_hdr *ip)
+ {
+-	struct libnet_icmp_hdr *icmp;
++	struct libnet_icmpv4_hdr *icmp;
+ 	int len;
+ 
+ 	len = (ip->ip_hl * 4) + 8;
+ 	
+-	libnet_build_ip(ICMP_MASK_H + len, 4, libnet_get_prand(PRu16),
+-			0, 64, IPPROTO_ICMP, ip->ip_dst.s_addr,
+-			ip->ip_src.s_addr, NULL, 0, buf);
+-
+-	icmp = (struct libnet_icmp_hdr *)(buf + IP_H);
++	icmp = (struct libnet_icmpv4_hdr *)(buf + LIBNET_IPV4_H);
+ 	icmp->icmp_type = ICMP_UNREACH;
+ 	icmp->icmp_code = ICMP_UNREACH_NEEDFRAG;
+ 	icmp->hun.frag.pad = 0;
+ 	icmp->hun.frag.mtu = htons(MIN_MTU);
+-	memcpy((u_char *)icmp + ICMP_MASK_H, (u_char *)ip, len);
++	memcpy((u_char *)icmp + LIBNET_ICMPV4_MASK_H, (u_char *)ip, len);
+ 
+-	libnet_do_checksum(buf, IPPROTO_ICMP, ICMP_MASK_H + len);
+-	
+-	len += (IP_H + ICMP_MASK_H);
++	len += LIBNET_ICMPV4_MASK_H;
++
++	libnet_build_ipv4(LIBNET_IPV4_H + len, 4,
++			  libnet_get_prand(LIBNET_PRu16), 0, 64, IPPROTO_ICMP,
++			  0, ip->ip_dst.s_addr, ip->ip_src.s_addr,
++			  (u_int8_t *) icmp, len, l, 0);
+ 	
+-	if (libnet_write_ip(sock, buf, len) != len)
++	if (libnet_write(l) != len)
+ 		warn("write");
+ 	
+ 	fprintf(stderr, "%s > %s: icmp: ",
+-		libnet_host_lookup(ip->ip_dst.s_addr, 0),
+-		libnet_host_lookup(ip->ip_src.s_addr, 0));
++		libnet_addr2name4(ip->ip_dst.s_addr, 0),
++		libnet_addr2name4(ip->ip_src.s_addr, 0));
+ 	fprintf(stderr, "%s unreachable - need to frag (mtu %d)\n",
+-		libnet_host_lookup(ip->ip_src.s_addr, 0), MIN_MTU);
++		libnet_addr2name4(ip->ip_src.s_addr, 0), MIN_MTU);
+ }
+ 
+ static void
+ tcp_nice_cb(u_char *user, const struct pcap_pkthdr *pcap, const u_char *pkt)
+ {
+-	struct libnet_ip_hdr *ip;
++	struct libnet_ipv4_hdr *ip;
+ 	struct libnet_tcp_hdr *tcp;
+-	int *sock, len;
++	int len;
++	libnet_t *l;
+ 
+-	sock = (int *)user;
++	l = (libnet_t *)user;
+ 	pkt += pcap_off;
+ 	len = pcap->caplen - pcap_off;
+ 
+-	ip = (struct libnet_ip_hdr *)pkt;
++	ip = (struct libnet_ipv4_hdr *)pkt;
+ 	if (ip->ip_p != IPPROTO_TCP)
+ 		return;
+ 	
+@@ -151,11 +150,11 @@
+ 	
+ 	if (ntohs(ip->ip_len) > (ip->ip_hl << 2) + (tcp->th_off << 2)) {
+ 		if (Opt_icmp)
+-			send_icmp_source_quench(*sock, ip);
++			send_icmp_source_quench(l, ip);
+ 		if (Opt_win)
+-			send_tcp_window_advertisement(*sock, ip, tcp);
++			send_tcp_window_advertisement(l, ip, tcp);
+ 		if (Opt_pmtu)
+-			send_icmp_frag_needed(*sock, ip);
++			send_icmp_frag_needed(l, ip);
+ 	}
+ }
+ 
+@@ -164,8 +163,10 @@
+ {
+ 	extern char *optarg;
+ 	extern int optind;
+-	int c, sock;
++	int c;
+ 	char *intf, *filter, ebuf[PCAP_ERRBUF_SIZE];
++	char libnet_ebuf[LIBNET_ERRBUF_SIZE];
++	libnet_t *l;
+ 	pcap_t *pd;
+ 	
+ 	intf = NULL;
+@@ -209,14 +210,14 @@
+ 	if ((pcap_off = pcap_dloff(pd)) < 0)
+ 		errx(1, "couldn't determine link layer offset");
+ 	
+-	if ((sock = libnet_open_raw_sock(IPPROTO_RAW)) == -1)
++	if ((l = libnet_init(LIBNET_RAW4, intf, libnet_ebuf)) == NULL)
+ 		errx(1, "couldn't initialize sending");
+ 	
+-	libnet_seed_prand();
++	libnet_seed_prand(l);
+ 	
+ 	warnx("listening on %s [%s]", intf, filter);
+ 	
+-	pcap_loop(pd, -1, tcp_nice_cb, (u_char *)&sock);
++	pcap_loop(pd, -1, tcp_nice_cb, (u_char *)l);
+ 	
+ 	/* NOTREACHED */
+ 	
+--- a/tcp_raw.c
++++ b/tcp_raw.c
+@@ -119,7 +119,7 @@
+ }
+ 
+ struct iovec *
+-tcp_raw_input(struct libnet_ip_hdr *ip, struct libnet_tcp_hdr *tcp, int len)
++tcp_raw_input(struct libnet_ipv4_hdr *ip, struct libnet_tcp_hdr *tcp, int len)
+ {
+ 	struct tha tha;
+ 	struct tcp_conn *conn;
+@@ -131,7 +131,7 @@
+ 
+ 	/* Verify TCP checksum. */
+ 	cksum = tcp->th_sum;
+-	libnet_do_checksum((u_char *) ip, IPPROTO_TCP, len);
++	libnet_do_checksum(NULL, (u_char *) ip, IPPROTO_TCP, len);
+ 
+ 	if (cksum != tcp->th_sum)
+ 		return (NULL);
+--- a/tcp_raw.h
++++ b/tcp_raw.h
+@@ -15,7 +15,7 @@
+ 				   u_short sport, u_short dport,
+ 				   u_char *buf, int len);
+ 
+-struct iovec   *tcp_raw_input(struct libnet_ip_hdr *ip,
++struct iovec   *tcp_raw_input(struct libnet_ipv4_hdr *ip,
+ 			      struct libnet_tcp_hdr *tcp, int len);
+ 
+ void		tcp_raw_timeout(int timeout, tcp_raw_callback_t callback);
+--- a/trigger.c
++++ b/trigger.c
+@@ -276,7 +276,7 @@
+ }
+ 	
+ void
+-trigger_ip(struct libnet_ip_hdr *ip)
++trigger_ip(struct libnet_ipv4_hdr *ip)
+ {
+ 	struct trigger *t, tr;
+ 	u_char *buf;
+@@ -305,7 +305,7 @@
+ 
+ /* libnids needs a nids_register_udp()... */
+ void
+-trigger_udp(struct libnet_ip_hdr *ip)
++trigger_udp(struct libnet_ipv4_hdr *ip)
+ {
+ 	struct trigger *t, tr;
+ 	struct libnet_udp_hdr *udp;
+@@ -437,7 +437,7 @@
+ }
+ 
+ void
+-trigger_tcp_raw(struct libnet_ip_hdr *ip)
++trigger_tcp_raw(struct libnet_ipv4_hdr *ip)
+ {
+ 	struct trigger *t, tr;
+ 	struct libnet_tcp_hdr *tcp;
+--- a/trigger.h
++++ b/trigger.h
+@@ -24,10 +24,10 @@
+ int	trigger_set_tcp(int port, char *name);
+ int	trigger_set_rpc(int program, char *name);
+ 
+-void	trigger_ip(struct libnet_ip_hdr *ip);
+-void	trigger_udp(struct libnet_ip_hdr *ip);
++void	trigger_ip(struct libnet_ipv4_hdr *ip);
++void	trigger_udp(struct libnet_ipv4_hdr *ip);
+ void	trigger_tcp(struct tcp_stream *ts, void **conn_save);
+-void	trigger_tcp_raw(struct libnet_ip_hdr *ip);
++void	trigger_tcp_raw(struct libnet_ipv4_hdr *ip);
+ void	trigger_tcp_raw_timeout(int signal);
+ void	trigger_rpc(int program, int proto, int port);
+ 
+--- a/urlsnarf.c
++++ b/urlsnarf.c
+@@ -145,14 +145,14 @@
+ 		if (user == NULL)
+ 			user = "-";
+ 		if (vhost == NULL)
+-			vhost = libnet_host_lookup(addr->daddr, Opt_dns);
++			vhost = libnet_addr2name4(addr->daddr, Opt_dns);
+ 		if (referer == NULL)
+ 			referer = "-";
+ 		if (agent == NULL)
+ 			agent = "-";
+ 		
+ 		printf("%s - %s [%s] \"%s http://%s%s\" - - \"%s\" \"%s\"\n",
+-		       libnet_host_lookup(addr->saddr, Opt_dns),
++		       libnet_addr2name4(addr->saddr, Opt_dns),
+ 		       user, timestamp(), req, vhost, uri, referer, agent);
+ 	}
+ 	fflush(stdout);
+--- a/webmitm.c
++++ b/webmitm.c
+@@ -242,7 +242,7 @@
+ 			word = buf_tok(&msg, "/", 1);
+ 			vhost = buf_strdup(word);
+ 		}
+-		ssin.sin_addr.s_addr = libnet_name_resolve(vhost, 1);
++		ssin.sin_addr.s_addr = libnet_name2addr4(NULL, vhost, 1);
+ 		free(vhost);
+ 		
+ 		if (ssin.sin_addr.s_addr == ntohl(INADDR_LOOPBACK) ||
+@@ -510,7 +510,7 @@
+ 	argv += optind;
+ 
+ 	if (argc == 1) {
+-		if ((static_host = libnet_name_resolve(argv[0], 1)) == -1)
++		if ((static_host = libnet_name2addr4(NULL, argv[0], 1)) == -1)
+ 			usage();
+ 	}
+ 	else if (argc != 0) usage();
+--- a/webspy.c
++++ b/webspy.c
+@@ -126,7 +126,7 @@
+ 		if (auth == NULL)
+ 			auth = "";
+ 		if (vhost == NULL)
+-			vhost = libnet_host_lookup(addr->daddr, 0);
++			vhost = libnet_addr2name4(addr->daddr, 0);
+ 		
+ 		snprintf(cmd, sizeof(cmd), "openURL(http://%s%s%s%s)",
+ 			 auth, *auth ? "@" : "", vhost, uri);
+@@ -205,7 +205,7 @@
+ 	cmdtab[0] = cmd;
+ 	cmdtab[1] = NULL;
+ 	
+-	if ((host = libnet_name_resolve(argv[0], 1)) == -1)
++	if ((host = libnet_name2addr4(NULL, argv[0], 1)) == -1)
+ 		errx(1, "unknown host");
+ 	
+ 	if ((dpy = XOpenDisplay(NULL)) == NULL)
diff --git a/network/dsniff/patches/08_openssl-0.9.8.patch b/network/dsniff/patches/08_openssl-0.9.8.patch
new file mode 100644
index 0000000000..dc9b327bfe
--- /dev/null
+++ b/network/dsniff/patches/08_openssl-0.9.8.patch
@@ -0,0 +1,15 @@
+Author: <kees@ubuntu.com>
+Description: Fix FTBFS with openssl.
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+
+--- a/ssh.c
++++ b/ssh.c
+@@ -16,6 +16,7 @@
+ #include <openssl/ssl.h>
+ #include <openssl/err.h>
+ #include <openssl/rand.h>
++#include <openssl/md5.h>
+ 
+ #include <err.h>
+ #include <errno.h>
diff --git a/network/dsniff/patches/09_sysconf_clocks.patch b/network/dsniff/patches/09_sysconf_clocks.patch
new file mode 100644
index 0000000000..a41fa581c5
--- /dev/null
+++ b/network/dsniff/patches/09_sysconf_clocks.patch
@@ -0,0 +1,23 @@
+Author: <kees@ubuntu.com>
+Description: Fix FTBFS: ./sshow.c:226: error: 'CLK_TCK' undeclared.
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+
+--- a/sshow.c
++++ b/sshow.c
+@@ -217,6 +217,7 @@
+ {
+ 	clock_t delay;
+ 	int payload;
++    long CLK_TCK= sysconf(_SC_CLK_TCK);
+ 
+ 	delay = add_history(session, 0, cipher_size, plain_range);
+ 
+@@ -265,6 +266,7 @@
+ 	clock_t delay;
+ 	int skip;
+ 	range string_range;
++    long CLK_TCK= sysconf(_SC_CLK_TCK);
+ 	
+ 	delay = add_history(session, 1, cipher_size, plain_range);
+ 	
diff --git a/network/dsniff/patches/10_urlsnarf_escape.patch b/network/dsniff/patches/10_urlsnarf_escape.patch
new file mode 100644
index 0000000000..e6fab01ab3
--- /dev/null
+++ b/network/dsniff/patches/10_urlsnarf_escape.patch
@@ -0,0 +1,89 @@
+Author: Hilko Bengen <bengen@debian.org>
+Description: Escape user, vhost, uri, referer, agent strings in log.
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=372536
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+
+--- a/urlsnarf.c
++++ b/urlsnarf.c
+@@ -84,6 +84,43 @@
+ 	return (tstr);
+ }
+ 
++static char *
++escape_log_entry(char *string)
++{
++	char *out;
++	unsigned char *c, *o;
++	size_t len;
++
++	if (!string)
++		return NULL;
++
++	/* Determine needed length */
++	for (c = string, len = 0; *c; c++) {
++		if ((*c < 32) || (*c >= 128))
++			len += 4;
++		else if ((*c == '"') || (*c =='\\'))
++			len += 2;
++		else
++			len++;
++	}
++	out = malloc(len+1);
++	if (!out)
++		return NULL;
++	for (c = string, o = out; *c; c++, o++) {
++		if ((*c < 32) || (*c >= 128)) {
++			snprintf(o, 5, "\\x%02x", *c);
++			o += 3;
++		} else if ((*c == '"') || ((*c =='\\'))) {
++			*(o++) = '\\';
++			*o = *c;
++		} else {
++			*o = *c;
++		}
++	}
++	out[len]='\0';
++	return out;
++}
++
+ static int
+ process_http_request(struct tuple4 *addr, u_char *data, int len)
+ {
+@@ -142,18 +179,26 @@
+ 				buf_tok(NULL, NULL, i);
+ 			}
+ 		}
+-		if (user == NULL)
+-			user = "-";
+-		if (vhost == NULL)
+-			vhost = libnet_addr2name4(addr->daddr, Opt_dns);
+-		if (referer == NULL)
+-			referer = "-";
+-		if (agent == NULL)
+-			agent = "-";
+-		
++		user = escape_log_entry(user);
++		vhost = escape_log_entry(vhost);
++		uri = escape_log_entry(uri);
++		referer = escape_log_entry(referer);
++		agent = escape_log_entry(agent);
++
+ 		printf("%s - %s [%s] \"%s http://%s%s\" - - \"%s\" \"%s\"\n",
+ 		       libnet_addr2name4(addr->saddr, Opt_dns),
+-		       user, timestamp(), req, vhost, uri, referer, agent);
++		       (user?user:"-"),
++		       timestamp(), req, 
++		       (vhost?vhost:libnet_addr2name4(addr->daddr, Opt_dns)), 
++		       uri,
++		       (referer?referer:"-"),
++		       (agent?agent:"-"));
++
++		free(user);
++		free(vhost);
++		free(uri);
++		free(referer);
++		free(agent);
+ 	}
+ 	fflush(stdout);
+ 	
diff --git a/network/dsniff/patches/11_string_header.patch b/network/dsniff/patches/11_string_header.patch
new file mode 100644
index 0000000000..1b383f2847
--- /dev/null
+++ b/network/dsniff/patches/11_string_header.patch
@@ -0,0 +1,166 @@
+Author: Luciano Bello <luciano@linux.org.ar>
+Description: Avoid the "implicit declaration of function 'str*'" warning
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+
+--- a/arp.c
++++ b/arp.c
+@@ -34,6 +34,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <unistd.h>
++#include <string.h>
+ 
+ #include "arp.h"
+ 
+--- a/buf.c
++++ b/buf.c
+@@ -17,6 +17,7 @@
+ #include <unistd.h>
+ #include <ctype.h>
+ #include <err.h>
++#include <string.h>
+ 
+ #include "buf.h"
+ 
+--- a/decode_nntp.c
++++ b/decode_nntp.c
+@@ -15,6 +15,7 @@
+ 
+ #include <stdio.h>
+ #include <string.h>
++#include <strlcat.h>
+ 
+ #include "base64.h"
+ #include "decode.h"
+--- a/decode_pop.c
++++ b/decode_pop.c
+@@ -14,6 +14,7 @@
+ 
+ #include <stdio.h>
+ #include <string.h>
++#include <strlcat.h>
+ 
+ #include "base64.h"
+ #include "options.h"
+--- a/decode_rlogin.c
++++ b/decode_rlogin.c
+@@ -14,6 +14,8 @@
+ 
+ #include <stdio.h>
+ #include <string.h>
++#include <strlcpy.h>
++#include <strlcat.h>
+ 
+ #include "options.h"
+ #include "decode.h"
+--- a/decode_smb.c
++++ b/decode_smb.c
+@@ -15,6 +15,7 @@
+ 
+ #include <stdio.h>
+ #include <string.h>
++#include <strlcat.h>
+ 
+ #include "decode.h"
+ 
+--- a/decode_smtp.c
++++ b/decode_smtp.c
+@@ -14,6 +14,7 @@
+ 
+ #include <stdio.h>
+ #include <string.h>
++#include <strlcat.h>
+ 
+ #include "base64.h"
+ #include "options.h"
+--- a/decode_sniffer.c
++++ b/decode_sniffer.c
+@@ -15,6 +15,8 @@
+ 
+ #include <stdio.h>
+ #include <string.h>
++#include <strlcat.h>
++#include <strlcpy.h>
+ 
+ #include "base64.h"
+ #include "decode.h"
+--- a/decode_socks.c
++++ b/decode_socks.c
+@@ -14,6 +14,7 @@
+ 
+ #include <stdio.h>
+ #include <string.h>
++#include <strlcat.h>
+ 
+ #include "decode.h"
+ 
+--- a/decode_tds.c
++++ b/decode_tds.c
+@@ -18,6 +18,7 @@
+ 
+ #include <stdio.h>
+ #include <string.h>
++#include <strlcat.h>
+ 
+ #include "decode.h"
+ 
+--- a/decode_telnet.c
++++ b/decode_telnet.c
+@@ -14,6 +14,7 @@
+ 
+ #include <stdio.h>
+ #include <string.h>
++#include <strlcpy.h>
+ 
+ #include "options.h"
+ #include "decode.h"
+--- a/decode_x11.c
++++ b/decode_x11.c
+@@ -14,6 +14,8 @@
+ 
+ #include <stdio.h>
+ #include <string.h>
++#include <strlcat.h>
++#include <strlcpy.h>
+ 
+ #include "decode.h"
+ 
+--- a/dnsspoof.c
++++ b/dnsspoof.c
+@@ -20,6 +20,7 @@
+ #include <stdlib.h>
+ #include <signal.h>
+ #include <string.h>
++#include <strlcpy.h>
+ #include <resolv.h>
+ #include <err.h>
+ #include <libnet.h>
+--- a/magic.c
++++ b/magic.c
+@@ -36,6 +36,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include <strlcpy.h>
+ #include <ctype.h>
+ #include <time.h>
+ #include <err.h>
+--- /dev/null
++++ b/missing/strlcat.h
+@@ -0,0 +1 @@
++size_t strlcat(char *dst, const char *src, size_t siz);
+--- /dev/null
++++ b/missing/strlcpy.h
+@@ -0,0 +1 @@
++size_t strlcpy(char *dst, const char *src, size_t siz);
+--- a/sshmitm.c
++++ b/sshmitm.c
+@@ -24,6 +24,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <unistd.h>
++#include <strlcat.h>
+ 
+ #include "buf.h"
+ #include "record.h"
diff --git a/network/dsniff/patches/12_arpa_inet_header.patch b/network/dsniff/patches/12_arpa_inet_header.patch
new file mode 100644
index 0000000000..246cf27b3c
--- /dev/null
+++ b/network/dsniff/patches/12_arpa_inet_header.patch
@@ -0,0 +1,65 @@
+Author: Luciano Bello <luciano@linux.org.ar>
+Description: avoid the "implicit declaration of function 'ntohs'" warning
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+
+--- a/decode_aim.c
++++ b/decode_aim.c
+@@ -14,6 +14,7 @@
+ 
+ #include <stdio.h>
+ #include <string.h>
++#include <arpa/inet.h>
+ 
+ #include "hex.h"
+ #include "buf.h"
+--- a/decode_mmxp.c
++++ b/decode_mmxp.c
+@@ -21,6 +21,7 @@
+ 
+ #include <stdio.h>
+ #include <string.h>
++#include <arpa/inet.h>
+ 
+ #include "buf.h"
+ #include "decode.h"
+--- a/decode_pptp.c
++++ b/decode_pptp.c
+@@ -16,6 +16,7 @@
+ 
+ #include <stdio.h>
+ #include <string.h>
++#include <arpa/inet.h>
+ 
+ #include "buf.h"
+ #include "decode.h"
+--- a/decode_tds.c
++++ b/decode_tds.c
+@@ -19,6 +19,7 @@
+ #include <stdio.h>
+ #include <string.h>
+ #include <strlcat.h>
++#include <arpa/inet.h>
+ 
+ #include "decode.h"
+ 
+--- a/decode_vrrp.c
++++ b/decode_vrrp.c
+@@ -15,6 +15,7 @@
+ 
+ #include <stdio.h>
+ #include <string.h>
++#include <arpa/inet.h>
+ 
+ #include "buf.h"
+ #include "decode.h"
+--- a/ssh.c
++++ b/ssh.c
+@@ -23,6 +23,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include <arpa/inet.h>
+ #include <unistd.h>
+ 
+ #include "hex.h"
diff --git a/network/dsniff/patches/13_pop_with_version.patch b/network/dsniff/patches/13_pop_with_version.patch
new file mode 100644
index 0000000000..80c570c41a
--- /dev/null
+++ b/network/dsniff/patches/13_pop_with_version.patch
@@ -0,0 +1,30 @@
+Author: Luciano Bello <luciano@linux.org.ar>
+Description: distinguish between pop versions
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+
+--- a/decode.c
++++ b/decode.c
+@@ -63,7 +63,8 @@
+ 	{ "http",	decode_http },
+ 	{ "ospf",	decode_ospf },
+ 	{ "poppass",	decode_poppass },
+-	{ "pop",	decode_pop },
++	{ "pop2",	decode_pop },
++	{ "pop3",	decode_pop },
+ 	{ "nntp",	decode_nntp },
+ 	{ "smb",	decode_smb },
+ 	{ "imap",	decode_imap },
+--- a/dsniff.services
++++ b/dsniff.services
+@@ -10,8 +10,8 @@
+ ospf		89/ip
+ http		98/tcp
+ poppass		106/tcp
+-pop		109/tcp
+-pop		110/tcp
++pop2		109/tcp
++pop3		110/tcp
+ portmap		111/tcp
+ portmap		-111/tcp
+ portmap		111/udp
diff --git a/network/dsniff/patches/14_obsolete_time.patch b/network/dsniff/patches/14_obsolete_time.patch
new file mode 100644
index 0000000000..f4ca6088c1
--- /dev/null
+++ b/network/dsniff/patches/14_obsolete_time.patch
@@ -0,0 +1,36 @@
+Author: Luciano Bello <luciano@linux.org.ar>
+Description: According to /usr/include/time.h, CLK_TCK is the 
+"obsolete POSIX.1-1988 name" for CLOCKS_PER_SEC.
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=420944
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+
+--- a/sshow.c
++++ b/sshow.c
+@@ -224,7 +224,7 @@
+ 	if (debug)
+ 		printf("- %s -> %s: DATA (%s bytes, %.2f seconds)\n",
+ 			s_saddr(ts), s_daddr(ts), s_range(plain_range),
+-			(float)delay / CLK_TCK);
++			(float)delay / CLOCKS_PER_SEC);
+ 	if (debug > 1)
+ 		print_data(&ts->server, cipher_size);
+ 
+@@ -273,7 +273,7 @@
+ 	if (debug)
+ 		printf("- %s <- %s: DATA (%s bytes, %.2f seconds)\n",
+ 		       s_saddr(ts), s_daddr(ts), s_range(plain_range),
+-		       (float)delay / CLK_TCK);
++		       (float)delay / CLOCKS_PER_SEC);
+ 	if (debug > 1)
+ 		print_data(&ts->client, cipher_size);
+ 	
+@@ -302,7 +302,7 @@
+ 	
+ 	if (session->state == 1 &&
+ #ifdef USE_TIMING
+-	    now - get_history(session, 2)->timestamp >= CLK_TCK &&
++	    now - get_history(session, 2)->timestamp >= CLOCKS_PER_SEC &&
+ #endif
+ 	    session->protocol == 1 &&
+ 	    (session->history.directions & 7) == 5 &&
diff --git a/network/dsniff/patches/15_checksum_libnids.patch b/network/dsniff/patches/15_checksum_libnids.patch
new file mode 100644
index 0000000000..47fbbe1d58
--- /dev/null
+++ b/network/dsniff/patches/15_checksum_libnids.patch
@@ -0,0 +1,98 @@
+Author: Gleb Paharenko <gpaharenko@gmail.com>
+Description: Workaround to this Debian bug
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=420129
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+
+--- a/dsniff.c
++++ b/dsniff.c
+@@ -70,6 +70,80 @@
+ {
+ }
+ 
++
++static int get_all_ifaces(struct ifreq **, int *);
++static unsigned int get_addr_from_ifreq(struct ifreq *);
++
++int all_local_ipaddrs_chksum_disable()
++{
++	struct ifreq *ifaces;
++	int ifaces_count;
++	int i, ind = 0;
++	struct nids_chksum_ctl *ctlp;
++	unsigned int tmp;
++
++	if (!get_all_ifaces(&ifaces, &ifaces_count))
++		return -1;
++	ctlp =
++	    (struct nids_chksum_ctl *) malloc(ifaces_count *
++					      sizeof(struct
++						     nids_chksum_ctl));
++	if (!ctlp)
++		return -1;
++	for (i = 0; i < ifaces_count; i++) {
++		tmp = get_addr_from_ifreq(ifaces + i);
++		if (tmp) {
++			ctlp[ind].netaddr = tmp;
++			ctlp[ind].mask = inet_addr("255.255.255.255");
++			ctlp[ind].action = NIDS_DONT_CHKSUM;
++			ind++;
++		}
++	}
++	free(ifaces);
++	nids_register_chksum_ctl(ctlp, ind);
++}
++
++/* helper functions for Example 2 */
++unsigned int get_addr_from_ifreq(struct ifreq *iface)
++{
++	if (iface->ifr_addr.sa_family == AF_INET)
++		return ((struct sockaddr_in *) &(iface->ifr_addr))->
++		    sin_addr.s_addr;
++	return 0;
++}
++
++static int get_all_ifaces(struct ifreq **ifaces, int *count)
++{
++	int ifaces_size = 8 * sizeof(struct ifreq);
++	struct ifconf param;
++	int sock;
++	unsigned int i;
++
++	*ifaces = malloc(ifaces_size);
++	sock = socket(PF_INET, SOCK_DGRAM, IPPROTO_IP);
++	if (sock <= 0)
++		return 0;
++	for (;;) {
++		param.ifc_len = ifaces_size;
++		param.ifc_req = *ifaces;
++		if (ioctl(sock, SIOCGIFCONF, &param))
++			goto err;
++		if (param.ifc_len < ifaces_size)
++			break;
++		free(*ifaces);
++		ifaces_size *= 2;
++		ifaces = malloc(ifaces_size);
++	}
++	*count = param.ifc_len / sizeof(struct ifreq);
++	close(sock);
++	return 1;
++      err:
++	close(sock);
++	return 0;
++}
++
++
++
+ int
+ main(int argc, char *argv[])
+ {
+@@ -189,6 +263,8 @@
+ 			warnx("using %s", nids_params.filename);
+ 		}
+ 	}
++
++	all_local_ipaddrs_chksum_disable();
+ 	
+ 	nids_run();
+ 	
diff --git a/network/dsniff/patches/16_TDS_decoder.patch b/network/dsniff/patches/16_TDS_decoder.patch
new file mode 100644
index 0000000000..a748243f6c
--- /dev/null
+++ b/network/dsniff/patches/16_TDS_decoder.patch
@@ -0,0 +1,20 @@
+Author: Luciano Bello <luciano@debian.org>
+Description: Fix for DOS y TDS decoder. Patch provided by Hilko Bengen.
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=609988
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+
+--- a/decode_tds.c
++++ b/decode_tds.c
+@@ -144,6 +144,11 @@
+ 	     len > sizeof(*th) && len >= ntohs(th->size);
+ 	     buf += ntohs(th->size), len -= ntohs(th->size)) {
+ 		
++		if (th->size != 8) {
++			/* wrong header length */
++			break;
++		}
++
+ 		if (th->type == 2) {
+ 			/* Version 4.x, 5.0 */
+ 			if (len < sizeof(*th) + sizeof(*tl))
diff --git a/network/dsniff/patches/17_checksum.patch b/network/dsniff/patches/17_checksum.patch
new file mode 100644
index 0000000000..96eb3cc80f
--- /dev/null
+++ b/network/dsniff/patches/17_checksum.patch
@@ -0,0 +1,29 @@
+Author: Piotr Engelking <inkerman42@gmail.com>
+Description: Disable the filtering packets with incorrect checksum.
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=372536
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+
+--- a/urlsnarf.c
++++ b/urlsnarf.c
+@@ -245,6 +245,7 @@
+ 	extern char *optarg;
+ 	extern int optind;
+ 	int c;
++	struct nids_chksum_ctl chksum_ctl;
+ 	
+ 	while ((c = getopt(argc, argv, "i:p:nvh?V")) != -1) {
+ 		switch (c) {
+@@ -305,6 +306,12 @@
+                 }
+         }
+ 
++        chksum_ctl.netaddr = 0;
++        chksum_ctl.mask = 0;
++        chksum_ctl.action = NIDS_DONT_CHKSUM;
++
++        nids_register_chksum_ctl(&chksum_ctl, 1);
++
+ 	nids_run();
+ 	
+ 	/* NOTREACHED */
diff --git a/network/dsniff/patches/18_sshcrypto.patch b/network/dsniff/patches/18_sshcrypto.patch
new file mode 100644
index 0000000000..252ffa6e67
--- /dev/null
+++ b/network/dsniff/patches/18_sshcrypto.patch
@@ -0,0 +1,17 @@
+Author: Steve Kemp <skx@debian.org>
+Description: Missing openssl  includes in sshcrypto.c. 
+This patch was through diff.gz and now is implemented as a dpatch.
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+
+--- a/sshcrypto.c
++++ b/sshcrypto.c
+@@ -14,6 +14,8 @@
+ 
+ #include <sys/types.h>
+ #include <openssl/ssl.h>
++#include <openssl/blowfish.h>
++#include <openssl/des.h>
+ 
+ #include <err.h>
+ #include <stdio.h>
diff --git a/network/dsniff/patches/19_rewrite-and-modernize-POP-decoder.patch b/network/dsniff/patches/19_rewrite-and-modernize-POP-decoder.patch
new file mode 100644
index 0000000000..790931521f
--- /dev/null
+++ b/network/dsniff/patches/19_rewrite-and-modernize-POP-decoder.patch
@@ -0,0 +1,132 @@
+>From b05e27ba9b0ba9ef00ad2183933652e08d8c89af Mon Sep 17 00:00:00 2001
+From: Stefan Tomanek <stefan@pico.ruhr.de>
+Date: Sat, 29 Oct 2011 20:48:55 +0200
+Subject: [PATCH] rewrite and modernize POP decoder
+
+
+Signed-off-by: Stefan Tomanek <stefan@pico.ruhr.de>
+---
+ decode_pop.c |   96 ++++++++++++++++++++++++++++++++++++++++++++++-----------
+ 1 files changed, 77 insertions(+), 19 deletions(-)
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+
+--- a/decode_pop.c
++++ b/decode_pop.c
+@@ -6,6 +6,8 @@
+  * Copyright (c) 2000 Dug Song <dugsong@monkey.org>
+  *
+  * $Id: decode_pop.c,v 1.4 2001/03/15 08:33:02 dugsong Exp $
++ *
++ * Rewritten by Stefan Tomanek 2011 <stefan@pico.ruhr.de>
+  */
+ 
+ #include "config.h"
+@@ -45,32 +47,88 @@
+ decode_pop(u_char *buf, int len, u_char *obuf, int olen)
+ {
+ 	char *p;
++	char *s;
++	int n;
+ 	int i, j;
++	char *user;
++	char *password;
++	enum {
++		NONE,
++		AUTHPLAIN,
++		AUTHLOGIN,
++		USERPASS
++	} mode = NONE;
++
+ 	
+ 	obuf[0] = '\0';
+ 	
+ 	for (p = strtok(buf, "\r\n"); p != NULL; p = strtok(NULL, "\r\n")) {
+-		if (strncasecmp(p, "AUTH PLAIN", 10) == 0 ||
+-		    strncasecmp(p, "AUTH LOGIN", 10) == 0) {
+-			strlcat(obuf, p, olen);
+-			strlcat(obuf, "\n", olen);
+-			
+-			/* Decode SASL auth. */
+-			for (i = 0; i < 2 && (p = strtok(NULL, "\r\n")); i++) {
+-				strlcat(obuf, p, olen);
+-				j = base64_pton(p, p, strlen(p));
+-				p[j] = '\0';
+-				strlcat(obuf, " [", olen);
+-				strlcat(obuf, p, olen);
+-				strlcat(obuf, "]\n", olen);
++		if (mode == NONE) {
++			user = NULL;
++			password = NULL;
++			if (strncasecmp(p, "AUTH PLAIN", 10) == 0) {
++				mode = AUTHPLAIN;
++				continue;
++			}
++			if (strncasecmp(p, "AUTH LOGIN", 10) == 0) {
++				mode = AUTHLOGIN;
++				continue;
++			}
++			if (strncasecmp(p, "USER ", 5) == 0) {
++				mode = USERPASS;
++				/* the traditional login cuts right to the case,
++				 * so no continue here
++				 */
+ 			}
+ 		}
+-		/* Save regular POP2, POP3 auth info. */
+-		else if (strncasecmp(p, "USER ", 5) == 0 ||
+-			 strncasecmp(p, "PASS ", 5) == 0 ||
+-			 strncasecmp(p, "HELO ", 5) == 0) {
+-			strlcat(obuf, p, olen);
+-			strlcat(obuf, "\n", olen);
++		printf("(%d) %s\n", mode, p);
++		if (mode == USERPASS) {
++			if (strncasecmp(p, "USER ", 5) == 0) {
++				user = &p[5];
++			} else if (strncasecmp(p, "PASS ", 5) == 0) {
++				password = &p[5];
++			}
++		}
++
++		if (mode == AUTHPLAIN) {
++			j = base64_pton(p, p, strlen(p));
++			p[j] = '\0';
++			n = 0;
++			s = p;
++			/* p consists of three parts, divided by \0 */
++			while (s <= &p[j] && n<=3) {
++				if (n == 0) {
++					/* we do not process this portion yet */
++				} else if (n == 1) {
++					user = s;
++				} else if (n == 2) {
++					password = s;
++				}
++				n++;
++				while (*s) s++;
++				s++;
++			}
++		}
++
++		if (mode == AUTHLOGIN) {
++			j = base64_pton(p, p, strlen(p));
++			p[j] = '\0';
++			if (! user) {
++				user = p;
++			} else {
++				password = p;
++				/* got everything we need :-) */
++			}
++		}
++
++		if (user && password) {
++			strlcat(obuf, "\nusername [", olen);
++			strlcat(obuf, user, olen);
++			strlcat(obuf, "] password [", olen);
++			strlcat(obuf, password, olen);
++			strlcat(obuf, "]\n", olen);
++
++			mode = NONE;
+ 		}
+ 	}
+ 	return (strlen(obuf));
diff --git a/network/dsniff/patches/20_debian_dirs.patch b/network/dsniff/patches/20_debian_dirs.patch
new file mode 100644
index 0000000000..a99a3ff57d
--- /dev/null
+++ b/network/dsniff/patches/20_debian_dirs.patch
@@ -0,0 +1,62 @@
+Author: Steve Kemp <skx@debian.org>
+Description: Adapt to Debian directory structure.
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -11,7 +11,7 @@
+ install_prefix  =
+ prefix          = @prefix@
+ exec_prefix	= @exec_prefix@
+-libdir		= @libdir@
++libdir		= $(prefix)/share/dsniff
+ sbindir         = @sbindir@
+ mandir		= @mandir@
+ 
+@@ -37,8 +37,7 @@
+ X11INC	= @X_CFLAGS@
+ X11LIB	= @X_LIBS@ @X_PRE_LIBS@ -lXmu -lX11 @X_EXTRA_LIBS@
+ 
+-INCS	= -I. $(NIDSINC) $(PCAPINC) $(LNETINC) $(DBINC) $(SSLINC) $(X11INC) \
+-	  -I$(srcdir)/missing
++INCS	= -I. $(X11INC) -I$(srcdir)/missing 
+ LIBS	= @LIBS@ -L$(srcdir) -lmissing
+ 
+ INSTALL	= @INSTALL@
+--- a/dnsspoof.8
++++ b/dnsspoof.8
+@@ -31,7 +31,7 @@
+ address queries on the LAN with an answer of the local machine's IP
+ address.
+ .SH FILES
+-.IP \fI/usr/local/lib/dnsspoof.hosts\fR
++.IP \fI/usr/share/dsniff/dnsspoof.hosts\fR
+ Sample hosts file.
+ .SH "SEE ALSO"
+ dsniff(8), hosts(5)
+--- a/dsniff.8
++++ b/dsniff.8
+@@ -68,9 +68,9 @@
+ On a hangup signal \fBdsniff\fR will dump its current trigger table to
+ \fIdsniff.services\fR.
+ .SH FILES
+-.IP \fI/usr/local/lib/dsniff.services\fR
++.IP \fI/usr/share/dsniff/dsniff.services\fR
+ Default trigger table
+-.IP \fI/usr/local/lib/dsniff.magic\fR
++.IP \fI/usr/share/dsniff/dsniff.magic\fR
+ Network protocol magic
+ .SH "SEE ALSO"
+ arpspoof(8), libnids(3), services(5), magic(5)
+--- a/pathnames.h
++++ b/pathnames.h
+@@ -12,7 +12,7 @@
+ #define PATHNAMES_H
+ 
+ #ifndef DSNIFF_LIBDIR
+-#define DSNIFF_LIBDIR		"/usr/local/lib/"
++#define DSNIFF_LIBDIR		"/usr/share/dsniff/"
+ #endif
+ 
+ #define DSNIFF_SERVICES		"dsniff.services"
diff --git a/network/dsniff/patches/21_msgsnarf_segfault.patch b/network/dsniff/patches/21_msgsnarf_segfault.patch
new file mode 100644
index 0000000000..e60fe847e4
--- /dev/null
+++ b/network/dsniff/patches/21_msgsnarf_segfault.patch
@@ -0,0 +1,15 @@
+Author: <bdefreese@debian2.bddebian.com>
+Description: Correctly 0 out the c struct.
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+
+--- a/msgsnarf.c
++++ b/msgsnarf.c
+@@ -584,6 +584,7 @@
+ 		if (i == 0) {
+ 			if ((c = malloc(sizeof(*c))) == NULL)
+ 				nids_params.no_mem("sniff_msgs");
++			memset(c, 0, sizeof(*c));
+ 			c->ip = ts->addr.saddr;
+ 			c->nick = strdup("unknown");
+ 			SLIST_INSERT_HEAD(&client_list, c, next);
diff --git a/network/dsniff/patches/22_handlepp.patch b/network/dsniff/patches/22_handlepp.patch
new file mode 100644
index 0000000000..da0a49dbeb
--- /dev/null
+++ b/network/dsniff/patches/22_handlepp.patch
@@ -0,0 +1,17 @@
+Author: Joerg Dorchain <joerg@dorchain.net>
+Description: Add tcpkill support for handle ppp interfaces.
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+
+--- a/pcaputil.c
++++ b/pcaputil.c
+@@ -52,6 +52,9 @@
+ 	case DLT_NULL:
+ 		offset = 4;
+ 		break;
++	case DLT_LINUX_SLL:   /* e.g. ppp */
++		offset = 16;
++		break;
+ 	default:
+ 		warnx("unsupported datalink type");
+ 		break;
diff --git a/network/dsniff/patches/23_urlsnarf_timestamp.patch b/network/dsniff/patches/23_urlsnarf_timestamp.patch
new file mode 100644
index 0000000000..36a8b0f277
--- /dev/null
+++ b/network/dsniff/patches/23_urlsnarf_timestamp.patch
@@ -0,0 +1,82 @@
+Author: Hilko Bengen <bengen@debian.org>
+Description: urlsnarf: use timestamps from pcap file if available.
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=573365
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+
+--- a/urlsnarf.c
++++ b/urlsnarf.c
+@@ -36,6 +36,7 @@
+ u_short		Opt_dns = 1;
+ int		Opt_invert = 0;
+ regex_t	       *pregex = NULL;
++time_t          tt = 0;
+ 
+ static void
+ usage(void)
+@@ -57,9 +58,12 @@
+ {
+ 	static char tstr[32], sign;
+ 	struct tm *t, gmt;
+-	time_t tt = time(NULL);
+ 	int days, hours, tz, len;
+ 	
++	if (!nids_params.filename) {
++		tt = time(NULL);
++	}
++	
+ 	gmt = *gmtime(&tt);
+ 	t = localtime(&tt);
+ 	
+@@ -312,9 +316,48 @@
+ 
+         nids_register_chksum_ctl(&chksum_ctl, 1);
+ 
+-	nids_run();
+-	
+-	/* NOTREACHED */
++	pcap_t *p;
++	char pcap_errbuf[PCAP_ERRBUF_SIZE];
++	if (nids_params.filename == NULL) {
++		/* adapted from libnids.c:open_live() */
++		if (strcmp(nids_params.device, "all") == 0)
++			nids_params.device = "any";
++		p = pcap_open_live(nids_params.device, 16384, 
++				   (nids_params.promisc != 0),
++				   0, pcap_errbuf);
++		if (!p) {
++			fprintf(stderr, "pcap_open_live(): %s\n",
++				pcap_errbuf);
++			exit(1);
++		}
++	}
++	else {
++		p = pcap_open_offline(nids_params.filename, 
++				      pcap_errbuf);
++		if (!p) {
++			fprintf(stderr, "pcap_open_offline(%s): %s\n",
++				nids_params.filename, pcap_errbuf);
++		}
++	}
++
++	struct pcap_pkthdr *h;
++	u_char *d;
++	int rc;
++	while ((rc = pcap_next_ex(p, &h, &d)) == 1) {
++		tt = h->ts.tv_sec;
++		nids_pcap_handler(NULL, h, d);
++	}
++	switch (rc) {
++	case(-2): /* end of pcap file */
++	case(0):  /* timeout on live capture */
++		break;
++	case(-1):
++	default:
++		fprintf(stderr, "rc = %i\n", rc);
++		pcap_perror(p, "pcap_read_ex()");
++		exit(1);
++		break;
++	}
+ 	
+ 	exit(0);
+ }
diff --git a/network/dsniff/patches/24_Fix-OpenSSL1.1.0-Build.patch b/network/dsniff/patches/24_Fix-OpenSSL1.1.0-Build.patch
new file mode 100644
index 0000000000..db7739ee34
--- /dev/null
+++ b/network/dsniff/patches/24_Fix-OpenSSL1.1.0-Build.patch
@@ -0,0 +1,202 @@
+Description: Fix build with OpenSSL 1.1.0
+Author: Christoph Biedl <debian.axhn@manchmal.in-ulm.de>
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+
+
+--- a/ssh.c
++++ b/ssh.c
+@@ -234,7 +234,10 @@
+ 	u_char *p, cipher, cookie[8], msg[1024];
+ 	u_int32_t num;
+ 	int i;
+-	
++    
++	const BIGNUM *servkey_e, *servkey_n;
++	const BIGNUM *hostkey_e, *hostkey_n;
++
+ 	/* Generate anti-spoofing cookie. */
+ 	RAND_bytes(cookie, sizeof(cookie));
+ 	
+@@ -243,11 +246,13 @@
+ 	*p++ = SSH_SMSG_PUBLIC_KEY;			/* type */
+ 	memcpy(p, cookie, 8); p += 8;			/* cookie */
+ 	num = 768; PUTLONG(num, p);			/* servkey bits */
+-	put_bn(ssh->ctx->servkey->e, &p);		/* servkey exponent */
+-	put_bn(ssh->ctx->servkey->n, &p);		/* servkey modulus */
++	RSA_get0_key(ssh->ctx->servkey, &servkey_n, &servkey_e, NULL);
++	put_bn(servkey_e, &p);		/* servkey exponent */
++	put_bn(servkey_n, &p);		/* servkey modulus */
+ 	num = 1024; PUTLONG(num, p);			/* hostkey bits */
+-	put_bn(ssh->ctx->hostkey->e, &p);		/* hostkey exponent */
+-	put_bn(ssh->ctx->hostkey->n, &p);		/* hostkey modulus */
++	RSA_get0_key(ssh->ctx->hostkey, &hostkey_n, &hostkey_e, NULL);
++	put_bn(hostkey_e, &p);		/* hostkey exponent */
++	put_bn(hostkey_n, &p);		/* hostkey modulus */
+ 	num = 0; PUTLONG(num, p);			/* protocol flags */
+ 	num = ssh->ctx->encmask; PUTLONG(num, p);	/* ciphers */
+ 	num = ssh->ctx->authmask; PUTLONG(num, p);	/* authmask */
+@@ -298,7 +303,7 @@
+ 	SKIP(p, i, 4);
+ 
+ 	/* Decrypt session key. */
+-	if (BN_cmp(ssh->ctx->servkey->n, ssh->ctx->hostkey->n) > 0) {
++	if (BN_cmp(servkey_n, hostkey_n) > 0) {
+ 		rsa_private_decrypt(enckey, enckey, ssh->ctx->servkey);
+ 		rsa_private_decrypt(enckey, enckey, ssh->ctx->hostkey);
+ 	}
+@@ -318,8 +323,8 @@
+ 	BN_clear_free(enckey);
+ 	
+ 	/* Derive real session key using session id. */
+-	if ((p = ssh_session_id(cookie, ssh->ctx->hostkey->n,
+-				ssh->ctx->servkey->n)) == NULL) {
++	if ((p = ssh_session_id(cookie, hostkey_n,
++				servkey_n)) == NULL) {
+ 		warn("ssh_session_id");
+ 		return (-1);
+ 	}
+@@ -328,10 +333,8 @@
+ 	}
+ 	/* Set cipher. */
+ 	if (cipher == SSH_CIPHER_3DES) {
+-		ssh->estate = des3_init(ssh->sesskey, sizeof(ssh->sesskey));
+-		ssh->dstate = des3_init(ssh->sesskey, sizeof(ssh->sesskey));
+-		ssh->encrypt = des3_encrypt;
+-		ssh->decrypt = des3_decrypt;
++		warnx("cipher 3des no longer supported");
++		return (-1);
+ 	}
+ 	else if (cipher == SSH_CIPHER_BLOWFISH) {
+ 		ssh->estate = blowfish_init(ssh->sesskey,sizeof(ssh->sesskey));
+@@ -357,7 +360,10 @@
+ 	u_char *p, cipher, cookie[8], msg[1024];
+ 	u_int32_t num;
+ 	int i;
+-	
++
++	BIGNUM *servkey_n, *servkey_e;
++	BIGNUM *hostkey_n, *hostkey_e;
++
+ 	/* Get public key. */
+ 	if ((i = SSH_recv(ssh, pkt, sizeof(pkt))) <= 0) {
+ 		warn("SSH_recv");
+@@ -379,21 +385,23 @@
+ 
+ 	/* Get servkey. */
+ 	ssh->ctx->servkey = RSA_new();
+-	ssh->ctx->servkey->n = BN_new();
+-	ssh->ctx->servkey->e = BN_new();
++	servkey_n = BN_new();
++	servkey_e = BN_new();
++	RSA_set0_key(ssh->ctx->servkey, servkey_n, servkey_e, NULL);
+ 
+ 	SKIP(p, i, 4);
+-	get_bn(ssh->ctx->servkey->e, &p, &i);
+-	get_bn(ssh->ctx->servkey->n, &p, &i);
++	get_bn(servkey_e, &p, &i);
++	get_bn(servkey_n, &p, &i);
+ 
+ 	/* Get hostkey. */
+ 	ssh->ctx->hostkey = RSA_new();
+-	ssh->ctx->hostkey->n = BN_new();
+-	ssh->ctx->hostkey->e = BN_new();
++	hostkey_n = BN_new();
++	hostkey_e = BN_new();
++	RSA_set0_key(ssh->ctx->hostkey, hostkey_n, hostkey_e, NULL);
+ 
+ 	SKIP(p, i, 4);
+-	get_bn(ssh->ctx->hostkey->e, &p, &i);
+-	get_bn(ssh->ctx->hostkey->n, &p, &i);
++	get_bn(hostkey_e, &p, &i);
++	get_bn(hostkey_n, &p, &i);
+ 
+ 	/* Get cipher, auth masks. */
+ 	SKIP(p, i, 4);
+@@ -405,8 +413,8 @@
+ 	RAND_bytes(ssh->sesskey, sizeof(ssh->sesskey));
+ 
+ 	/* Obfuscate with session id. */
+-	if ((p = ssh_session_id(cookie, ssh->ctx->hostkey->n,
+-				ssh->ctx->servkey->n)) == NULL) {
++	if ((p = ssh_session_id(cookie, hostkey_n,
++				servkey_n)) == NULL) {
+ 		warn("ssh_session_id");
+ 		return (-1);
+ 	}
+@@ -422,7 +430,7 @@
+ 		else BN_add_word(bn, ssh->sesskey[i]);
+ 	}
+ 	/* Encrypt session key. */
+-	if (BN_cmp(ssh->ctx->servkey->n, ssh->ctx->hostkey->n) < 0) {
++	if (BN_cmp(servkey_n, hostkey_n) < 0) {
+ 		rsa_public_encrypt(bn, bn, ssh->ctx->servkey);
+ 		rsa_public_encrypt(bn, bn, ssh->ctx->hostkey);
+ 	}
+@@ -470,10 +478,8 @@
+ 		ssh->decrypt = blowfish_decrypt;
+ 	}
+ 	else if (cipher == SSH_CIPHER_3DES) {
+-		ssh->estate = des3_init(ssh->sesskey, sizeof(ssh->sesskey));
+-		ssh->dstate = des3_init(ssh->sesskey, sizeof(ssh->sesskey));
+-		ssh->encrypt = des3_encrypt;
+-		ssh->decrypt = des3_decrypt;
++		warnx("cipher 3des no longer supported");
++		return (-1);
+ 	}
+ 	/* Get server response. */
+ 	if ((i = SSH_recv(ssh, pkt, sizeof(pkt))) <= 0) {
+--- a/sshcrypto.c
++++ b/sshcrypto.c
+@@ -28,10 +28,12 @@
+ 	u_char			iv[8];
+ };
+ 
++#if 0
+ struct des3_state {
+ 	des_key_schedule	k1, k2, k3;
+ 	des_cblock		iv1, iv2, iv3;
+ };
++#endif
+ 
+ void
+ rsa_public_encrypt(BIGNUM *out, BIGNUM *in, RSA *key)
+@@ -39,10 +41,12 @@
+ 	u_char *inbuf, *outbuf;
+ 	int len, ilen, olen;
+ 
+-	if (BN_num_bits(key->e) < 2 || !BN_is_odd(key->e))
++	const BIGNUM *n, *e;
++	RSA_get0_key(key, &n, &e, NULL);
++	if (BN_num_bits(e) < 2 || !BN_is_odd(e))
+ 		errx(1, "rsa_public_encrypt() exponent too small or not odd");
+ 
+-	olen = BN_num_bytes(key->n);
++	olen = BN_num_bytes(n);
+ 	outbuf = malloc(olen);
+ 
+ 	ilen = BN_num_bytes(in);
+@@ -71,7 +75,9 @@
+ 	u_char *inbuf, *outbuf;
+ 	int len, ilen, olen;
+ 
+-	olen = BN_num_bytes(key->n);
++	const BIGNUM *n;
++	RSA_get0_key(key, &n, NULL, NULL);
++	olen = BN_num_bytes(n);
+ 	outbuf = malloc(olen);
+ 
+ 	ilen = BN_num_bytes(in);
+@@ -146,6 +152,7 @@
+ 	swap_bytes(dst, dst, len);
+ }
+ 
++#if 0
+ /* XXX - SSH1's weirdo 3DES... */
+ void *
+ des3_init(u_char *sesskey, int len)
+@@ -194,3 +201,4 @@
+ 	des_ncbc_encrypt(dst, dst, len, dstate->k2, &dstate->iv2, DES_ENCRYPT);
+ 	des_ncbc_encrypt(dst, dst, len, dstate->k1, &dstate->iv1, DES_DECRYPT);
+ }
++#endif
diff --git a/network/dsniff/patches/25_fix-spelling-errors.patch b/network/dsniff/patches/25_fix-spelling-errors.patch
new file mode 100644
index 0000000000..febbf914e0
--- /dev/null
+++ b/network/dsniff/patches/25_fix-spelling-errors.patch
@@ -0,0 +1,17 @@
+Description: Fix minor spelling error in source code
+Author: Marcos Fouces <marcos.fouces@gmail.com>
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+
+
+--- a/remote.c
++++ b/remote.c
+@@ -652,7 +652,7 @@
+ 	  if (remote_command_count > 0)
+ 	    {
+ 	      fprintf (stderr,
+-		"%s: the `-id' option must preceed all `-remote' options.\n",
++		"%s: the `-id' option must precede all `-remote' options.\n",
+ 		       progname);
+ 	      usage ();
+ 	      exit (-1);
diff --git a/network/dsniff/patches/26_arpspoof-add-r-switch-to-poison-both-directions.patch b/network/dsniff/patches/26_arpspoof-add-r-switch-to-poison-both-directions.patch
new file mode 100644
index 0000000000..9a55f25051
--- /dev/null
+++ b/network/dsniff/patches/26_arpspoof-add-r-switch-to-poison-both-directions.patch
@@ -0,0 +1,170 @@
+>From 8fbf0ac15e5fe2df427e3e028f9aa8d96788986a Mon Sep 17 00:00:00 2001
+From: Stefan Tomanek <stefan@pico.ruhr.de>
+Date: Sun, 6 Nov 2011 22:44:54 +0100
+Subject: [PATCH 1/3] arpspoof: add -r switch to poison both directions
+
+
+Signed-off-by: Stefan Tomanek <stefan@pico.ruhr.de>
+---
+ arpspoof.8 |    5 ++++-
+ arpspoof.c |   59 +++++++++++++++++++++++++++++++++++++++++++++++------------
+ 2 files changed, 51 insertions(+), 13 deletions(-)
+
+ ---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+ 
+--- a/arpspoof.8
++++ b/arpspoof.8
+@@ -9,7 +9,7 @@
+ .na
+ .nf
+ .fi
+-\fBarpspoof\fR [\fB-i \fIinterface\fR] [\fB-t \fItarget\fR] \fIhost\fR
++\fBarpspoof\fR [\fB\-i \fIinterface\fR] [\fB\-t \fItarget\fR] [\fB\-r\fR] \fIhost\fR
+ .SH DESCRIPTION
+ .ad
+ .fi
+@@ -26,6 +26,9 @@
+ .IP "\fB-t \fItarget\fR"
+ Specify a particular host to ARP poison (if not specified, all hosts
+ on the LAN).
++.IP "\fB\-r\fR"
++Poison both hosts (host and target) to capture traffic in both directions.
++(only valid in conjuntion with \-t)
+ .IP \fIhost\fR
+ Specify the host you wish to intercept packets for (usually the local
+ gateway).
+--- a/arpspoof.c
++++ b/arpspoof.c
+@@ -7,6 +7,8 @@
+  * Copyright (c) 1999 Dug Song <dugsong@monkey.org>
+  *
+  * $Id: arpspoof.c,v 1.5 2001/03/15 08:32:58 dugsong Exp $
++ *
++ * Improved 2011 by Stefan Tomanek <stefa@pico.ruhr.de>
+  */
+ 
+ #include "config.h"
+@@ -31,12 +33,13 @@
+ static struct ether_addr spoof_mac, target_mac;
+ static in_addr_t spoof_ip, target_ip;
+ static char *intf;
++static int poison_reverse;
+ 
+ static void
+ usage(void)
+ {
+ 	fprintf(stderr, "Version: " VERSION "\n"
+-		"Usage: arpspoof [-i interface] [-t target] host\n");
++		"Usage: arpspoof [-i interface] [-t target] [-r] host\n");
+ 	exit(1);
+ }
+ 
+@@ -133,18 +136,30 @@
+ static void
+ cleanup(int sig)
+ {
++	int fw = arp_find(spoof_ip, &spoof_mac);
++	int bw = poison_reverse && target_ip && arp_find(target_ip, &target_mac);
+ 	int i;
+-	
+-	if (arp_find(spoof_ip, &spoof_mac)) {
+-		for (i = 0; i < 3; i++) {
+-			/* XXX - on BSD, requires ETHERSPOOF kernel. */
++
++	fprintf(stderr, "Cleaning up and re-arping targets...\n");
++	for (i = 0; i < 5; i++) {
++		/* XXX - on BSD, requires ETHERSPOOF kernel. */
++		if (fw) {
+ 			arp_send(l, ARPOP_REPLY,
+ 				 (u_int8_t *)&spoof_mac, spoof_ip,
+ 				 (target_ip ? (u_int8_t *)&target_mac : NULL),
+ 				 target_ip);
++			/* we have to wait a moment before sending the next packet */
++			sleep(1);
++		}
++		if (bw) {
++			arp_send(l, ARPOP_REPLY,
++				 (u_int8_t *)&target_mac, target_ip,
++				 (u_int8_t *)&spoof_mac,
++				 spoof_ip);
+ 			sleep(1);
+ 		}
+ 	}
++
+ 	exit(0);
+ }
+ 
+@@ -156,11 +171,12 @@
+ 	char pcap_ebuf[PCAP_ERRBUF_SIZE];
+ 	char libnet_ebuf[LIBNET_ERRBUF_SIZE];
+ 	int c;
+-	
++
+ 	intf = NULL;
+ 	spoof_ip = target_ip = 0;
+-	
+-	while ((c = getopt(argc, argv, "i:t:h?V")) != -1) {
++	poison_reverse = 0;
++
++	while ((c = getopt(argc, argv, "ri:t:h?V")) != -1) {
+ 		switch (c) {
+ 		case 'i':
+ 			intf = optarg;
+@@ -169,6 +185,9 @@
+ 			if ((target_ip = libnet_name2addr4(l, optarg, LIBNET_RESOLVE)) == -1)
+ 				usage();
+ 			break;
++		case 'r':
++			poison_reverse = 1;
++			break;
+ 		default:
+ 			usage();
+ 		}
+@@ -178,7 +197,12 @@
+ 	
+ 	if (argc != 1)
+ 		usage();
+-	
++
++	if (poison_reverse && !target_ip) {
++		errx(1, "Spoofing the reverse path (-r) is only available when specifying a target (-t).");
++		usage();
++	}
++
+ 	if ((spoof_ip = libnet_name2addr4(l, argv[0], LIBNET_RESOLVE)) == -1)
+ 		usage();
+ 	
+@@ -191,18 +215,29 @@
+ 	if (target_ip != 0 && !arp_find(target_ip, &target_mac))
+ 		errx(1, "couldn't arp for host %s",
+ 		     libnet_addr2name4(target_ip, LIBNET_DONT_RESOLVE));
+-	
++
++	if (poison_reverse) {
++		if (!arp_find(spoof_ip, &spoof_mac)) {
++			errx(1, "couldn't arp for spoof host %s",
++			     libnet_addr2name4(spoof_ip, LIBNET_DONT_RESOLVE));
++		}
++	}
++
+ 	signal(SIGHUP, cleanup);
+ 	signal(SIGINT, cleanup);
+ 	signal(SIGTERM, cleanup);
+-	
++
+ 	for (;;) {
+ 		arp_send(l, ARPOP_REPLY, NULL, spoof_ip,
+ 			 (target_ip ? (u_int8_t *)&target_mac : NULL),
+ 			 target_ip);
++		if (poison_reverse) {
++			arp_send(l, ARPOP_REPLY, NULL, target_ip, (uint8_t *)&spoof_mac, spoof_ip);
++		}
++
+ 		sleep(2);
+ 	}
+ 	/* NOTREACHED */
+-	
++
+ 	exit(0);
+ }
diff --git a/network/dsniff/patches/27_arpspoof-allow-use-of-of-multiple-targets.patch b/network/dsniff/patches/27_arpspoof-allow-use-of-of-multiple-targets.patch
new file mode 100644
index 0000000000..120001f7b3
--- /dev/null
+++ b/network/dsniff/patches/27_arpspoof-allow-use-of-of-multiple-targets.patch
@@ -0,0 +1,194 @@
+Description: [PATCH 2/3] arpspoof: allow use of multiple targets. Last hunk modified by João Salavisa <joao.salavisa@gmail.com>
+in order to fix a bug with "-t" option of arpspoof. See https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=706766 fo more information.
+Author: Stefan Tomanek <stefan@pico.ruhr.de>
+ ---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+
+
+--- a/arpspoof.8
++++ b/arpspoof.8
+@@ -25,7 +25,7 @@
+ Specify the interface to use.
+ .IP "\fB-t \fItarget\fR"
+ Specify a particular host to ARP poison (if not specified, all hosts
+-on the LAN).
++on the LAN). Repeat to specify multiple hosts.
+ .IP "\fB\-r\fR"
+ Poison both hosts (host and target) to capture traffic in both directions.
+ (only valid in conjuntion with \-t)
+--- a/arpspoof.c
++++ b/arpspoof.c
+@@ -29,9 +29,14 @@
+ 
+ extern char *ether_ntoa(struct ether_addr *);
+ 
++struct host {
++	in_addr_t ip;
++	struct ether_addr mac;
++};
++
+ static libnet_t *l;
+-static struct ether_addr spoof_mac, target_mac;
+-static in_addr_t spoof_ip, target_ip;
++static struct host spoof = {0};
++static struct host *targets;
+ static char *intf;
+ static int poison_reverse;
+ 
+@@ -133,30 +138,46 @@
+ 	return (0);
+ }
+ 
++static int arp_find_all() {
++	struct host *target = targets;
++	while(target->ip) {
++		if (arp_find(target->ip, &target->mac)) {
++			return 1;
++		}
++		target++;
++	}
++
++	return 0;
++}
++
+ static void
+ cleanup(int sig)
+ {
+-	int fw = arp_find(spoof_ip, &spoof_mac);
+-	int bw = poison_reverse && target_ip && arp_find(target_ip, &target_mac);
++	int fw = arp_find(spoof.ip, &spoof.mac);
++	int bw = poison_reverse && targets[0].ip && arp_find_all();
+ 	int i;
+ 
+ 	fprintf(stderr, "Cleaning up and re-arping targets...\n");
+ 	for (i = 0; i < 5; i++) {
+-		/* XXX - on BSD, requires ETHERSPOOF kernel. */
+-		if (fw) {
+-			arp_send(l, ARPOP_REPLY,
+-				 (u_int8_t *)&spoof_mac, spoof_ip,
+-				 (target_ip ? (u_int8_t *)&target_mac : NULL),
+-				 target_ip);
+-			/* we have to wait a moment before sending the next packet */
+-			sleep(1);
+-		}
+-		if (bw) {
+-			arp_send(l, ARPOP_REPLY,
+-				 (u_int8_t *)&target_mac, target_ip,
+-				 (u_int8_t *)&spoof_mac,
+-				 spoof_ip);
+-			sleep(1);
++		struct host *target = targets;
++		while(target->ip) {
++			/* XXX - on BSD, requires ETHERSPOOF kernel. */
++			if (fw) {
++				arp_send(l, ARPOP_REPLY,
++					 (u_int8_t *)&spoof.mac, spoof.ip,
++					 (target->ip ? (u_int8_t *)&target->mac : NULL),
++					 target->ip);
++				/* we have to wait a moment before sending the next packet */
++				sleep(1);
++			}
++			if (bw) {
++				arp_send(l, ARPOP_REPLY,
++					 (u_int8_t *)&target->mac, target->ip,
++					 (u_int8_t *)&spoof.mac,
++					 spoof.ip);
++				sleep(1);
++			}
++			target++;
+ 		}
+ 	}
+ 
+@@ -171,10 +192,15 @@
+ 	char pcap_ebuf[PCAP_ERRBUF_SIZE];
+ 	char libnet_ebuf[LIBNET_ERRBUF_SIZE];
+ 	int c;
++	int n_targets;
+ 
++	spoof.ip = 0;
+ 	intf = NULL;
+-	spoof_ip = target_ip = 0;
+ 	poison_reverse = 0;
++	n_targets = 0;
++
++	/* allocate enough memory for target list */
++	targets = calloc( argc+1, sizeof(struct host) );
+ 
+ 	while ((c = getopt(argc, argv, "ri:t:h?V")) != -1) {
+ 		switch (c) {
+@@ -182,7 +208,7 @@
+ 			intf = optarg;
+ 			break;
+ 		case 't':
+-			if ((target_ip = libnet_name2addr4(l, optarg, LIBNET_RESOLVE)) == -1)
++			if ((targets[n_targets++].ip = libnet_name2addr4(l, optarg, LIBNET_RESOLVE)) == -1)
+ 				usage();
+ 			break;
+ 		case 'r':
+@@ -198,12 +224,12 @@
+ 	if (argc != 1)
+ 		usage();
+ 
+-	if (poison_reverse && !target_ip) {
++	if (poison_reverse && !n_targets) {
+ 		errx(1, "Spoofing the reverse path (-r) is only available when specifying a target (-t).");
+ 		usage();
+ 	}
+ 
+-	if ((spoof_ip = libnet_name2addr4(l, argv[0], LIBNET_RESOLVE)) == -1)
++	if ((spoof.ip = libnet_name2addr4(l, argv[0], LIBNET_RESOLVE)) == -1)
+ 		usage();
+ 	
+ 	if (intf == NULL && (intf = pcap_lookupdev(pcap_ebuf)) == NULL)
+@@ -211,15 +237,19 @@
+ 	
+ 	if ((l = libnet_init(LIBNET_LINK, intf, libnet_ebuf)) == NULL)
+ 		errx(1, "%s", libnet_ebuf);
+-	
+-	if (target_ip != 0 && !arp_find(target_ip, &target_mac))
+-		errx(1, "couldn't arp for host %s",
+-		     libnet_addr2name4(target_ip, LIBNET_DONT_RESOLVE));
++
++	struct host *target = targets;
++	while(target->ip) {
++		if (target->ip != 0 && !arp_find(target->ip, &target->mac))
++			errx(1, "couldn't arp for host %s",
++			libnet_addr2name4(target->ip, LIBNET_DONT_RESOLVE));
++		target++;
++	}
+ 
+ 	if (poison_reverse) {
+-		if (!arp_find(spoof_ip, &spoof_mac)) {
++		if (!arp_find(spoof.ip, &spoof.mac)) {
+ 			errx(1, "couldn't arp for spoof host %s",
+-			     libnet_addr2name4(spoof_ip, LIBNET_DONT_RESOLVE));
++			     libnet_addr2name4(spoof.ip, LIBNET_DONT_RESOLVE));
+ 		}
+ 	}
+ 
+@@ -228,12 +258,20 @@
+ 	signal(SIGTERM, cleanup);
+ 
+ 	for (;;) {
+-		arp_send(l, ARPOP_REPLY, NULL, spoof_ip,
+-			 (target_ip ? (u_int8_t *)&target_mac : NULL),
+-			 target_ip);
+-		if (poison_reverse) {
+-			arp_send(l, ARPOP_REPLY, NULL, target_ip, (uint8_t *)&spoof_mac, spoof_ip);
++    if (!n_targets) {
++      arp_send(l, ARPOP_REPLY, my_ha, spoof.ip, brd_ha, 0, my_ha);
++    } else {
++		struct host *target = targets;
++		while(target->ip) {
++			arp_send(l, ARPOP_REPLY, NULL, spoof.ip,
++				(target->ip ? (u_int8_t *)&target->mac : NULL),
++				target->ip);
++			if (poison_reverse) {
++				arp_send(l, ARPOP_REPLY, NULL, target->ip, (uint8_t *)&spoof.mac, spoof.ip);
++			}
++			target++;
+ 		}
++    }
+ 
+ 		sleep(2);
+ 	}
diff --git a/network/dsniff/patches/28_arpspoof-allow-selection-of-source-hw-address.patch b/network/dsniff/patches/28_arpspoof-allow-selection-of-source-hw-address.patch
new file mode 100644
index 0000000000..95da6a1651
--- /dev/null
+++ b/network/dsniff/patches/28_arpspoof-allow-selection-of-source-hw-address.patch
@@ -0,0 +1,230 @@
+>From 21773ccf18a5fc49d35e510a8797b0a1e83858c4 Mon Sep 17 00:00:00 2001
+From: Stefan Tomanek <stefan@pico.ruhr.de>
+Date: Sun, 20 Nov 2011 21:32:53 +0100
+Subject: [PATCH 3/3] arpspoof: allow selection of source hw address
+
+In certain networks, sending with the wrong hardware source address can
+jeopardize the network connection of the host running arpspoof. This
+patch makes it possible to specify whether arpspoof should use the own
+hardware address or the one of the real host when resetting the arp
+table of the target systems; it is also possible to use both.
+
+Signed-off-by: Stefan Tomanek <stefan@pico.ruhr.de>
+---
+ arpspoof.8 |    9 +++++-
+ arpspoof.c |   90 ++++++++++++++++++++++++++++++++++++++++++-----------------
+ 2 files changed, 72 insertions(+), 27 deletions(-)
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+
+--- a/arpspoof.8
++++ b/arpspoof.8
+@@ -9,7 +9,7 @@
+ .na
+ .nf
+ .fi
+-\fBarpspoof\fR [\fB\-i \fIinterface\fR] [\fB\-t \fItarget\fR] [\fB\-r\fR] \fIhost\fR
++\fBarpspoof\fR [\fB\-i \fIinterface\fR] [\fB\-c \fIown|host|both\fR] [\fB\-t \fItarget\fR] [\fB\-r\fR] \fIhost\fR
+ .SH DESCRIPTION
+ .ad
+ .fi
+@@ -23,6 +23,13 @@
+ .SH OPTIONS
+ .IP "\fB-i \fIinterface\fR"
+ Specify the interface to use.
++.IP "\fB-c \fIown|host|both\fR"
++Specify which hardware address t use when restoring the arp configuration;
++while cleaning up, packets can be send with the own address as well as with
++the address of the host. Sending packets with a fake hw address can disrupt
++connectivity with certain switch/ap/bridge configurations, however it works
++more reliably than using the own address, which is the default way arpspoof
++cleans up afterwards.
+ .IP "\fB-t \fItarget\fR"
+ Specify a particular host to ARP poison (if not specified, all hosts
+ on the LAN). Repeat to specify multiple hosts.
+--- a/arpspoof.c
++++ b/arpspoof.c
+@@ -40,37 +40,36 @@
+ static char *intf;
+ static int poison_reverse;
+ 
++static uint8_t *my_ha = NULL;
++static uint8_t *brd_ha = "\xff\xff\xff\xff\xff\xff";
++
++static int cleanup_src_own = 1;
++static int cleanup_src_host = 0;
++
+ static void
+ usage(void)
+ {
+ 	fprintf(stderr, "Version: " VERSION "\n"
+-		"Usage: arpspoof [-i interface] [-t target] [-r] host\n");
++		"Usage: arpspoof [-i interface] [-c own|host|both] [-t target] [-r] host\n");
+ 	exit(1);
+ }
+ 
+ static int
+-arp_send(libnet_t *l, int op, u_int8_t *sha,
+-	 in_addr_t spa, u_int8_t *tha, in_addr_t tpa)
++arp_send(libnet_t *l, int op,
++	u_int8_t *sha, in_addr_t spa,
++	u_int8_t *tha, in_addr_t tpa,
++	u_int8_t *me)
+ {
+ 	int retval;
+ 
+-	if (sha == NULL &&
+-	    (sha = (u_int8_t *)libnet_get_hwaddr(l)) == NULL) {
+-		return (-1);
+-	}
+-	if (spa == 0) {
+-		if ((spa = libnet_get_ipaddr4(l)) == -1)
+-			return (-1);
+-	}
+-	if (tha == NULL)
+-		tha = "\xff\xff\xff\xff\xff\xff";
+-	
++	if (!me) me = sha;
++
+ 	libnet_autobuild_arp(op, sha, (u_int8_t *)&spa,
+ 			     tha, (u_int8_t *)&tpa, l);
+-	libnet_build_ethernet(tha, sha, ETHERTYPE_ARP, NULL, 0, l, 0);
++	libnet_build_ethernet(tha, me, ETHERTYPE_ARP, NULL, 0, l, 0);
+ 	
+ 	fprintf(stderr, "%s ",
+-		ether_ntoa((struct ether_addr *)sha));
++		ether_ntoa((struct ether_addr *)me));
+ 
+ 	if (op == ARPOP_REQUEST) {
+ 		fprintf(stderr, "%s 0806 42: arp who-has %s tell %s\n",
+@@ -129,7 +128,7 @@
+ 		/* XXX - force the kernel to arp. feh. */
+ 		arp_force(ip);
+ #else
+-		arp_send(l, ARPOP_REQUEST, NULL, 0, NULL, ip);
++		arp_send(l, ARPOP_REQUEST, NULL, 0, NULL, ip, NULL);
+ #endif
+ 		sleep(1);
+ 	}
+@@ -156,17 +155,23 @@
+ 	int fw = arp_find(spoof.ip, &spoof.mac);
+ 	int bw = poison_reverse && targets[0].ip && arp_find_all();
+ 	int i;
++	int rounds = (cleanup_src_own*5 + cleanup_src_host*5);
+ 
+ 	fprintf(stderr, "Cleaning up and re-arping targets...\n");
+-	for (i = 0; i < 5; i++) {
++	for (i = 0; i < rounds; i++) {
+ 		struct host *target = targets;
+ 		while(target->ip) {
++			uint8_t *src_ha = NULL;
++			if (cleanup_src_own && (i%2 || !cleanup_src_host)) {
++				src_ha = my_ha;
++			}
+ 			/* XXX - on BSD, requires ETHERSPOOF kernel. */
+ 			if (fw) {
+ 				arp_send(l, ARPOP_REPLY,
+ 					 (u_int8_t *)&spoof.mac, spoof.ip,
+-					 (target->ip ? (u_int8_t *)&target->mac : NULL),
+-					 target->ip);
++					 (target->ip ? (u_int8_t *)&target->mac : brd_ha),
++					 target->ip,
++					 src_ha);
+ 				/* we have to wait a moment before sending the next packet */
+ 				sleep(1);
+ 			}
+@@ -174,7 +179,8 @@
+ 				arp_send(l, ARPOP_REPLY,
+ 					 (u_int8_t *)&target->mac, target->ip,
+ 					 (u_int8_t *)&spoof.mac,
+-					 spoof.ip);
++					 spoof.ip,
++					 src_ha);
+ 				sleep(1);
+ 			}
+ 			target++;
+@@ -193,6 +199,7 @@
+ 	char libnet_ebuf[LIBNET_ERRBUF_SIZE];
+ 	int c;
+ 	int n_targets;
++	char *cleanup_src = NULL;
+ 
+ 	spoof.ip = 0;
+ 	intf = NULL;
+@@ -202,7 +209,7 @@
+ 	/* allocate enough memory for target list */
+ 	targets = calloc( argc+1, sizeof(struct host) );
+ 
+-	while ((c = getopt(argc, argv, "ri:t:h?V")) != -1) {
++	while ((c = getopt(argc, argv, "ri:t:c:h?V")) != -1) {
+ 		switch (c) {
+ 		case 'i':
+ 			intf = optarg;
+@@ -214,6 +221,9 @@
+ 		case 'r':
+ 			poison_reverse = 1;
+ 			break;
++		case 'c':
++			cleanup_src = optarg;
++			break;
+ 		default:
+ 			usage();
+ 		}
+@@ -229,6 +239,29 @@
+ 		usage();
+ 	}
+ 
++	if (!cleanup_src || strcmp(cleanup_src, "own")==0) { /* default! */
++		/* only use our own hw address when cleaning up,
++		 * not jeopardizing any bridges on the way to our
++		 * target
++		 */
++		cleanup_src_own = 1;
++		cleanup_src_host = 0;
++	} else if (strcmp(cleanup_src, "host")==0) {
++		/* only use the target hw address when cleaning up;
++		 * this can screw up some bridges and scramble access
++		 * for our own host, however it resets the arp table
++		 * more reliably
++		 */
++		cleanup_src_own = 0;
++		cleanup_src_host = 1;
++	} else if (strcmp(cleanup_src, "both")==0) {
++		cleanup_src_own = 1;
++		cleanup_src_host = 1;
++	} else {
++		errx(1, "Invalid parameter to -c: use 'own' (default), 'host' or 'both'.");
++		usage();
++	}
++
+ 	if ((spoof.ip = libnet_name2addr4(l, argv[0], LIBNET_RESOLVE)) == -1)
+ 		usage();
+ 	
+@@ -253,6 +286,10 @@
+ 		}
+ 	}
+ 
++	if ((my_ha = (u_int8_t *)libnet_get_hwaddr(l)) == NULL) {
++		errx(1, "Unable to determine own mac address");
++	}
++
+ 	signal(SIGHUP, cleanup);
+ 	signal(SIGINT, cleanup);
+ 	signal(SIGTERM, cleanup);
+@@ -263,11 +300,12 @@
+     } else {
+ 		struct host *target = targets;
+ 		while(target->ip) {
+-			arp_send(l, ARPOP_REPLY, NULL, spoof.ip,
+-				(target->ip ? (u_int8_t *)&target->mac : NULL),
+-				target->ip);
++			arp_send(l, ARPOP_REPLY, my_ha, spoof.ip,
++				(target->ip ? (u_int8_t *)&target->mac : brd_ha),
++				target->ip,
++				my_ha);
+ 			if (poison_reverse) {
+-				arp_send(l, ARPOP_REPLY, NULL, target->ip, (uint8_t *)&spoof.mac, spoof.ip);
++				arp_send(l, ARPOP_REPLY, my_ha, target->ip, (uint8_t *)&spoof.mac, spoof.ip, my_ha);
+ 			}
+ 			target++;
+ 		}
diff --git a/network/dsniff/patches/29_libnet_name2addr4.patch b/network/dsniff/patches/29_libnet_name2addr4.patch
new file mode 100644
index 0000000000..76c8c39882
--- /dev/null
+++ b/network/dsniff/patches/29_libnet_name2addr4.patch
@@ -0,0 +1,144 @@
+Description: fixes possible segmentation faults of arpspoof, sshmitm, webmitm and 
+webspy if any non-resolving hostname is passed. Issue was introduced by 
+dsniff-2.4-libnet_11.patch; libnet_name_resolve() was replaced by libnet_name2addr4() 
+while there must be the structure libnet_t passed additionally. And if that structure is not initialized
+using libnet_init() and the passed name can't be resolved (like "192.168.2."), it
+causes a snprintf() to NULL and thus the segmentation fault. Note that macof isn't
+affected as no resolving was involved here ever.
+Author: Robert Scheck <robert@fedoraproject.org>
+Bug-RedHat: https://bugzilla.redhat.com/show_bug.cgi?id=1009879
+Origin: http://pkgs.fedoraproject.org/cgit/rpms/dsniff.git/tree/dsniff-2.4-libnet_name2addr4.patch
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+
+--- a/sshmitm.c
++++ b/sshmitm.c
+@@ -45,6 +45,8 @@
+ struct	 sockaddr_in csin, ssin;
+ int	 sig_pipe[2];
+ 
++static	 libnet_t *l;
++
+ static void
+ usage(void)
+ {
+@@ -364,6 +366,7 @@
+ 	u_long ip;
+ 	u_short lport, rport;
+ 	int c;
++	char libnet_ebuf[LIBNET_ERRBUF_SIZE];
+ 
+ 	lport = rport = 22;
+ 
+@@ -390,12 +393,15 @@
+ 	if (argc < 1)
+ 		usage();
+ 	
+-	if ((ip = libnet_name2addr4(NULL, argv[0], LIBNET_RESOLVE)) == -1)
+-		usage();
+-
+ 	if (argc == 2 && (rport = atoi(argv[1])) == 0)
+ 		usage();
+ 	
++	if ((l = libnet_init(LIBNET_LINK, NULL, libnet_ebuf)) == NULL)
++		errx(1, "%s", libnet_ebuf);
++	
++	if ((ip = libnet_name2addr4(l, argv[0], LIBNET_RESOLVE)) == -1)
++		usage();
++	
+ 	record_init(NULL);
+ 	
+ 	mitm_init(lport, ip, rport);
+--- a/webmitm.c
++++ b/webmitm.c
+@@ -47,6 +47,8 @@
+ int	 do_ssl, sig_pipe[2];
+ in_addr_t	static_host = 0;
+ 
++static	 libnet_t *l;
++
+ extern int decode_http(char *, int, char *, int);
+ 
+ static void
+@@ -242,7 +244,7 @@
+ 			word = buf_tok(&msg, "/", 1);
+ 			vhost = buf_strdup(word);
+ 		}
+-		ssin.sin_addr.s_addr = libnet_name2addr4(NULL, vhost, 1);
++		ssin.sin_addr.s_addr = libnet_name2addr4(l, vhost, LIBNET_RESOLVE);
+ 		free(vhost);
+ 		
+ 		if (ssin.sin_addr.s_addr == ntohl(INADDR_LOOPBACK) ||
+@@ -496,6 +498,7 @@
+ 	extern char *optarg;
+ 	extern int optind;
+ 	int c;
++	char libnet_ebuf[LIBNET_ERRBUF_SIZE];
+ 
+ 	while ((c = getopt(argc, argv, "dh?V")) != -1) {
+ 		switch (c) {
+@@ -509,8 +512,11 @@
+ 	argc -= optind;
+ 	argv += optind;
+ 
++	if ((l = libnet_init(LIBNET_LINK, NULL, libnet_ebuf)) == NULL)
++		errx(1, "%s", libnet_ebuf);
++	
+ 	if (argc == 1) {
+-		if ((static_host = libnet_name2addr4(NULL, argv[0], 1)) == -1)
++		if ((static_host = libnet_name2addr4(l, argv[0], LIBNET_RESOLVE)) == -1)
+ 			usage();
+ 	}
+ 	else if (argc != 0) usage();
+--- a/webspy.c
++++ b/webspy.c
+@@ -33,6 +33,7 @@
+ extern int mozilla_remote_commands (Display *, Window, char **);
+ char	*expected_mozilla_version = "4.7";
+ char	*progname = "webspy";
++static	libnet_t *l;
+ 
+ Display		*dpy;
+ char		 cmd[2048], *cmdtab[2];
+@@ -183,6 +184,7 @@
+ 	extern char *optarg;
+ 	extern int optind;
+ 	int c;
++	char libnet_ebuf[LIBNET_ERRBUF_SIZE];
+ 	
+ 	while ((c = getopt(argc, argv, "i:p:h?V")) != -1) {
+ 		switch (c) {
+@@ -205,7 +207,10 @@
+ 	cmdtab[0] = cmd;
+ 	cmdtab[1] = NULL;
+ 	
+-	if ((host = libnet_name2addr4(NULL, argv[0], 1)) == -1)
++	if ((l = libnet_init(LIBNET_LINK, NULL, libnet_ebuf)) == NULL)
++		errx(1, "%s", libnet_ebuf);
++	
++	if ((host = libnet_name2addr4(l, argv[0], LIBNET_RESOLVE)) == -1)
+ 		errx(1, "unknown host");
+ 	
+ 	if ((dpy = XOpenDisplay(NULL)) == NULL)
+--- a/arpspoof.c
++++ b/arpspoof.c
+@@ -208,6 +208,10 @@
+ 
+ 	/* allocate enough memory for target list */
+ 	targets = calloc( argc+1, sizeof(struct host) );
++    
++	if ((l = libnet_init(LIBNET_LINK, NULL, libnet_ebuf)) == NULL)
++		errx(1, "%s", libnet_ebuf);
++
+ 
+ 	while ((c = getopt(argc, argv, "ri:t:c:h?V")) != -1) {
+ 		switch (c) {
+@@ -265,6 +269,8 @@
+ 	if ((spoof.ip = libnet_name2addr4(l, argv[0], LIBNET_RESOLVE)) == -1)
+ 		usage();
+ 	
++	libnet_destroy(l);
++	
+ 	if (intf == NULL && (intf = pcap_lookupdev(pcap_ebuf)) == NULL)
+ 		errx(1, "%s", pcap_ebuf);
+ 	
diff --git a/network/dsniff/patches/30_pntohl_shift.patch b/network/dsniff/patches/30_pntohl_shift.patch
new file mode 100644
index 0000000000..8764d69523
--- /dev/null
+++ b/network/dsniff/patches/30_pntohl_shift.patch
@@ -0,0 +1,19 @@
+Description: Corrects the incorrect bit-shift in pntohl(), the left-shift should be 8 bits, not 18.
+Author: Matthew Boyle <mlb@decisionsoft.co.uk>
+Origin: http://pkgs.fedoraproject.org/cgit/rpms/dsniff.git/tree/dsniff-2.4-pntohl_shift.patch
+Bug-RedHat: https://bugzilla.redhat.com/show_bug.cgi?id=714958
+Bug-RedHat: https://bugzilla.redhat.com/show_bug.cgi?id=850496
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+
+--- a/decode.h
++++ b/decode.h
+@@ -35,7 +35,7 @@
+ 			  (u_short)*((u_char *)p+0)<<8))
+ 			 
+ #define pntohl(p)	((u_int32_t)*((u_char *)p+3)<<0|   \
+-			 (u_int32_t)*((u_char *)p+2)<<18|  \
++			 (u_int32_t)*((u_char *)p+2)<<8|  \
+ 			 (u_int32_t)*((u_char *)p+1)<<16|  \
+ 			 (u_int32_t)*((u_char *)p+0)<<24)
+ 
diff --git a/network/dsniff/patches/31_sysconf_clocks.patch b/network/dsniff/patches/31_sysconf_clocks.patch
new file mode 100644
index 0000000000..4aa22086d9
--- /dev/null
+++ b/network/dsniff/patches/31_sysconf_clocks.patch
@@ -0,0 +1,31 @@
+Description: Adds a clock fix. It was improved by Robert Scheck <robert@fedoraproject.org> 
+to work with older Linux kernel versions, too.
+Author: <kees@ubuntu.com>
+Origin: http://pkgs.fedoraproject.org/cgit/rpms/dsniff.git/tree/dsniff-2.4-sysconf_clocks.patch
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+
+--- a/sshow.c
++++ b/sshow.c
+@@ -217,7 +217,9 @@
+ {
+ 	clock_t delay;
+ 	int payload;
+-    long CLK_TCK= sysconf(_SC_CLK_TCK);
++#if defined(_SC_CLK_TCK)
++	long CLK_TCK = sysconf(_SC_CLK_TCK);
++#endif
+ 
+ 	delay = add_history(session, 0, cipher_size, plain_range);
+ 
+@@ -266,7 +268,9 @@
+ 	clock_t delay;
+ 	int skip;
+ 	range string_range;
+-    long CLK_TCK= sysconf(_SC_CLK_TCK);
++#if defined(_SC_CLK_TCK)
++	long CLK_TCK = sysconf(_SC_CLK_TCK);
++#endif
+ 	
+ 	delay = add_history(session, 1, cipher_size, plain_range);
+ 	
diff --git a/network/dsniff/patches/32_rpc_segfault.patch b/network/dsniff/patches/32_rpc_segfault.patch
new file mode 100644
index 0000000000..89a8d9c5af
--- /dev/null
+++ b/network/dsniff/patches/32_rpc_segfault.patch
@@ -0,0 +1,19 @@
+Description: avoids xdrs being used without being initialised first. Without this
+patch dsniff segfaults when decoding RPC packets on x86_64.
+Author: Matthew Boyle <mlb@decisionsoft.co.uk>
+Origin: http://pkgs.fedoraproject.org/cgit/rpms/dsniff.git/tree/dsniff-2.4-rpc_segfault.patch
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+
+--- a/rpc.c
++++ b/rpc.c
+@@ -125,6 +125,9 @@
+ 			return (0);
+ 		}
+ 	}
++	else
++		return (0);
++	
+ 	stat = xdr_getpos(&xdrs);
+ 	xdr_destroy(&xdrs);
+ 	
diff --git a/network/dsniff/patches/33_sshcrypto_DES.patch b/network/dsniff/patches/33_sshcrypto_DES.patch
new file mode 100644
index 0000000000..02ff90bf09
--- /dev/null
+++ b/network/dsniff/patches/33_sshcrypto_DES.patch
@@ -0,0 +1,65 @@
+Description: improves 18_sshcrypto.patch 
+   - Replace all des_ methods and structs with DES_ equivalents.
+   - Remove openssl/des_old.h include.
+   - Register dependencies on OpenSSL, glib20 and gettext.
+Author: jca
+Origin: OpenBSD
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+
+--- a/sshcrypto.c
++++ b/sshcrypto.c
+@@ -30,8 +30,8 @@
+ 
+ #if 0
+ struct des3_state {
+-	des_key_schedule	k1, k2, k3;
+-	des_cblock		iv1, iv2, iv3;
++	DES_key_schedule	k1, k2, k3;
++	DES_cblock		iv1, iv2, iv3;
+ };
+ #endif
+ 
+@@ -162,13 +162,13 @@
+ 	if ((state = malloc(sizeof(*state))) == NULL)
+ 		err(1, "malloc");
+ 
+-	des_set_key((void *)sesskey, state->k1);
+-	des_set_key((void *)(sesskey + 8), state->k2);
++	DES_set_key((void *)sesskey, &state->k1);
++	DES_set_key((void *)(sesskey + 8), &state->k2);
+ 
+ 	if (len <= 16)
+-		des_set_key((void *)sesskey, state->k3);
++		DES_set_key((void *)sesskey, &state->k3);
+ 	else
+-		des_set_key((void *)(sesskey + 16), state->k3);
++		DES_set_key((void *)(sesskey + 16), &state->k3);
+ 	
+ 	memset(state->iv1, 0, 8);
+ 	memset(state->iv2, 0, 8);
+@@ -184,9 +184,9 @@
+ 	estate = (struct des3_state *)state;
+ 	memcpy(estate->iv1, estate->iv2, 8);
+ 	
+-	des_ncbc_encrypt(src, dst, len, estate->k1, &estate->iv1, DES_ENCRYPT);
+-	des_ncbc_encrypt(dst, dst, len, estate->k2, &estate->iv2, DES_DECRYPT);
+-	des_ncbc_encrypt(dst, dst, len, estate->k3, &estate->iv3, DES_ENCRYPT);
++	DES_ncbc_encrypt(src, dst, len, &estate->k1, &estate->iv1, DES_ENCRYPT);
++	DES_ncbc_encrypt(dst, dst, len, &estate->k2, &estate->iv2, DES_DECRYPT);
++	DES_ncbc_encrypt(dst, dst, len, &estate->k3, &estate->iv3, DES_ENCRYPT);
+ }
+ 
+ void
+@@ -197,8 +197,8 @@
+ 	dstate = (struct des3_state *)state;
+ 	memcpy(dstate->iv1, dstate->iv2, 8);
+ 	
+-	des_ncbc_encrypt(src, dst, len, dstate->k3, &dstate->iv3, DES_DECRYPT);
+-	des_ncbc_encrypt(dst, dst, len, dstate->k2, &dstate->iv2, DES_ENCRYPT);
+-	des_ncbc_encrypt(dst, dst, len, dstate->k1, &dstate->iv1, DES_DECRYPT);
++	DES_ncbc_encrypt(src, dst, len, &dstate->k3, &dstate->iv3, DES_DECRYPT);
++	DES_ncbc_encrypt(dst, dst, len, &dstate->k2, &dstate->iv2, DES_ENCRYPT);
++	DES_ncbc_encrypt(dst, dst, len, &dstate->k1, &dstate->iv1, DES_DECRYPT);
+ }
+ #endif
diff --git a/network/dsniff/patches/34_fix-parallel-FTBFS.patch b/network/dsniff/patches/34_fix-parallel-FTBFS.patch
new file mode 100644
index 0000000000..00fbb96c13
--- /dev/null
+++ b/network/dsniff/patches/34_fix-parallel-FTBFS.patch
@@ -0,0 +1,109 @@
+Description: Fix parallel FTBFS problems
+ * Add libmissing.a as a dependency to each of the PROGS to ensure it is
+   built before them.
+ * Ensure mount.h is created before decode_mountd.o gets built.
+ * Ensure nfs_prot.h is created before filesnarf.o gets built.
+Author: Lukas Schwaighofer <lukas@schwaighofer.name>
+Author: Adrian Bunk <bunk@debian.org>
+Bug-Debian: https://bugs.debian.org/860611
+Bug-Debian: https://bugs.debian.org/869086
+
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -75,16 +75,28 @@
+ .c.o:
+ 	$(CC) $(CFLAGS) $(INCS) -c $(srcdir)/$*.c
+ 
+-all: libmissing.a $(PROGS)
++all: $(PROGS)
+ 
+-mount.c: mount.x
++mount.h: mount.x
+ 	rpcgen -h mount.x -o mount.h
++
++mount.c: mount.x
+ 	rpcgen -c mount.x -o mount.c
+ 
+-nfs_prot.c: nfs_prot.x
++mount.o: mount.h
++
++decode_mountd.o: mount.h
++
++nfs_prot.h: nfs_prot.x
+ 	rpcgen -h nfs_prot.x -o nfs_prot.h
++
++nfs_prot.c: nfs_prot.x
+ 	rpcgen -c nfs_prot.x -o nfs_prot.c
+ 
++nfs_prot.o: nfs_prot.h
++
++filesnarf.o: nfs_prot.h
++
+ $(LIBOBJS):
+ 	$(CC) $(CFLAGS) $(INCS) -c $(srcdir)/missing/$*.c
+ 
+@@ -92,49 +104,49 @@
+ 	ar -cr $@ $(LIBOBJS)
+ 	$(RANLIB) $@
+ 
+-dsniff: $(HDRS) $(SRCS) $(OBJS)
++dsniff: $(HDRS) $(SRCS) $(OBJS) libmissing.a
+ 	$(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) $(NIDSLIB) $(PCAPLIB) $(LNETLIB) $(DBLIB) $(SSLLIB)
+ 
+-arpspoof: arpspoof.o arp.o
++arpspoof: arpspoof.o arp.o libmissing.a
+ 	$(CC) $(LDFLAGS) -o $@ arpspoof.o arp.o $(LIBS) $(PCAPLIB) $(LNETLIB)
+ 
+-dnsspoof: dnsspoof.o pcaputil.o
++dnsspoof: dnsspoof.o pcaputil.o libmissing.a
+ 	$(CC) $(LDFLAGS) -o $@ dnsspoof.o pcaputil.o $(LIBS) $(PCAPLIB) $(LNETLIB)
+ 
+-filesnarf: nfs_prot.o filesnarf.o pcaputil.o rpc.o
++filesnarf: nfs_prot.o filesnarf.o pcaputil.o rpc.o libmissing.a
+ 	$(CC) $(LDFLAGS) -o $@ filesnarf.o nfs_prot.o pcaputil.o rpc.o $(LIBS) $(NIDSLIB) $(PCAPLIB) $(LNETLIB)
+ 
+-macof: macof.o
++macof: macof.o libmissing.a
+ 	$(CC) $(LDFLAGS) -o $@ macof.o $(LIBS) $(PCAPLIB) $(LNETLIB)
+ 
+-mailsnarf: mailsnarf.o buf.o pcaputil.o
++mailsnarf: mailsnarf.o buf.o pcaputil.o libmissing.a
+ 	$(CC) $(LDFLAGS) -o $@ mailsnarf.o buf.o pcaputil.o $(LIBS) $(NIDSLIB) $(PCAPLIB) $(LNETLIB)
+ 
+-msgsnarf: msgsnarf.o buf.o pcaputil.o
++msgsnarf: msgsnarf.o buf.o pcaputil.o libmissing.a
+ 	$(CC) $(LDFLAGS) -o $@ msgsnarf.o buf.o pcaputil.o $(LIBS) $(NIDSLIB) $(PCAPLIB) $(LNETLIB)
+ 
+-sshmitm: sshmitm.o buf.o hex.o record.o ssh.o sshcrypto.o
++sshmitm: sshmitm.o buf.o hex.o record.o ssh.o sshcrypto.o libmissing.a
+ 	$(CC) $(LDFLAGS) -o $@ sshmitm.o buf.o hex.o record.o ssh.o sshcrypto.o $(LIBS) $(LNETLIB) $(DBLIB) $(SSLLIB)
+ 
+-sshow: sshow.o pcaputil.o
++sshow: sshow.o pcaputil.o libmissing.a
+ 	$(CC) $(LDFLAGS) -o $@ sshow.o pcaputil.o $(LIBS) $(NIDSLIB) $(PCAPLIB) $(LNETLIB)
+ 
+-tcpkill: tcpkill.o pcaputil.o
++tcpkill: tcpkill.o pcaputil.o libmissing.a
+ 	$(CC) $(LDFLAGS) -o $@ tcpkill.o pcaputil.o $(LIBS) $(PCAPLIB) $(LNETLIB)
+ 
+-tcpnice: tcpnice.o pcaputil.o
++tcpnice: tcpnice.o pcaputil.o libmissing.a
+ 	$(CC) $(LDFLAGS) -o $@ tcpnice.o pcaputil.o $(LIBS) $(PCAPLIB) $(LNETLIB)
+ 
+-tcphijack: tcphijack.o pcaputil.o
++tcphijack: tcphijack.o pcaputil.o libmissing.a
+ 	$(CC) $(LDFLAGS) -o $@ tcphijack.o pcaputil.o $(LIBS) $(PCAPLIB) $(LNETLIB)
+ 
+-urlsnarf: urlsnarf.o base64.o buf.o pcaputil.o
++urlsnarf: urlsnarf.o base64.o buf.o pcaputil.o libmissing.a
+ 	$(CC) $(LDFLAGS) -o $@ urlsnarf.o base64.o buf.o pcaputil.o $(LIBS) $(NIDSLIB) $(PCAPLIB) $(LNETLIB)
+ 
+-webmitm: webmitm.o base64.o buf.o decode_http.o record.o
++webmitm: webmitm.o base64.o buf.o decode_http.o record.o libmissing.a
+ 	$(CC) $(LDFLAGS) -o $@ webmitm.o base64.o buf.o decode_http.o record.o $(LIBS) $(LNETLIB) $(DBLIB) $(SSLLIB)
+ 
+-webspy: webspy.o base64.o buf.o remote.o
++webspy: webspy.o base64.o buf.o remote.o libmissing.a
+ 	$(CC) $(LDFLAGS) -o $@ webspy.o base64.o buf.o remote.o $(LIBS) $(NIDSLIB) $(PCAPLIB) $(LNETLIB) $(X11LIB)
+ 
+ install:
diff --git a/network/dsniff/patches/35_Add_CPPFLAGS.patch b/network/dsniff/patches/35_Add_CPPFLAGS.patch
new file mode 100644
index 0000000000..3ea8eb94d7
--- /dev/null
+++ b/network/dsniff/patches/35_Add_CPPFLAGS.patch
@@ -0,0 +1,50 @@
+Description: import CPPFLAGS in order to build an ELF binary that uses fortified libc functions. Now it is built with all default Debian compiler flags.
+Author: Marcos Fouces <marcos.fouces@gmail.com>
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -11,12 +11,13 @@
+ install_prefix  =
+ prefix          = @prefix@
+ exec_prefix	= @exec_prefix@
+-libdir		= $(prefix)/share/dsniff
++libdir		= @libdir@
+ sbindir         = @sbindir@
+ mandir		= @mandir@
+ 
+ CC	= @CC@
+ CFLAGS	= @CFLAGS@ -DDSNIFF_LIBDIR=\"$(libdir)/\"
++CPPFLAGS = @CPPFLAGS@
+ LDFLAGS	= @LDFLAGS@
+ 
+ PCAPINC = @PCAPINC@
+@@ -37,7 +38,8 @@
+ X11INC	= @X_CFLAGS@
+ X11LIB	= @X_LIBS@ @X_PRE_LIBS@ -lXmu -lX11 @X_EXTRA_LIBS@
+ 
+-INCS	= -I. $(X11INC) -I$(srcdir)/missing 
++INCS	= -I. $(NIDSINC) $(PCAPINC) $(LNETINC) $(DBINC) $(SSLINC) $(X11INC) \
++	  -I$(srcdir)/missing
+ LIBS	= @LIBS@ -L$(srcdir) -lmissing
+ 
+ INSTALL	= @INSTALL@
+@@ -73,7 +75,7 @@
+ CONFIGS	= dsniff.magic dsniff.services dnsspoof.hosts
+ 
+ .c.o:
+-	$(CC) $(CFLAGS) $(INCS) -c $(srcdir)/$*.c
++	$(CC) $(CFLAGS) $(CPPFLAGS) $(INCS) -c $(srcdir)/$*.c
+ 
+ all: $(PROGS)
+ 
+@@ -98,7 +100,7 @@
+ filesnarf.o: nfs_prot.h
+ 
+ $(LIBOBJS):
+-	$(CC) $(CFLAGS) $(INCS) -c $(srcdir)/missing/$*.c
++	$(CC) $(CFLAGS) $(CPPFLAGS) $(INCS) -c $(srcdir)/missing/$*.c
+ 
+ libmissing.a: $(LIBOBJS)
+ 	ar -cr $@ $(LIBOBJS)
diff --git a/network/dsniff/patches/36_implicit_declarations.patch b/network/dsniff/patches/36_implicit_declarations.patch
new file mode 100644
index 0000000000..159f7c2b32
--- /dev/null
+++ b/network/dsniff/patches/36_implicit_declarations.patch
@@ -0,0 +1,59 @@
+Description: fix implicit declarations compiler warning
+ * switch to C99 uint64_t, remove now unnecessary xdr_u_int64_t function
+ * include missing string.h for memset
+Author: Lukas Schwaighofer <lukas@schwaighofer.name>
+
+--- a/filesnarf.c
++++ b/filesnarf.c
+@@ -55,30 +55,6 @@
+ 	exit(1);
+ }
+ 
+-/* XXX - for nfs_prot_xdr.c */
+-bool_t
+-xdr_u_int64_t(XDR *xdrs, u_int64_t *nump)
+-{
+-	int i = 1;
+-	u_char *p = (u_char *)nump;
+-
+-	if (*(char *)&i == 1) {		/* endian haack. */
+-		if (xdr_u_long(xdrs, (u_long *)(p + 4)))
+-			return (xdr_u_long(xdrs, (u_long *)p));
+-	}
+-	else {
+-		if (xdr_u_long(xdrs, (u_long *)p))
+-			return (xdr_u_long(xdrs, (u_long *)(p + 4)));
+-	}
+-	return (FALSE);
+-}
+-
+-bool_t
+-xdr_int64_t(XDR *xdrs, int64_t *nump)
+-{
+-	return (xdr_u_int64_t(xdrs, (u_int64_t *)nump));
+-}
+-
+ static void
+ fh_map_init(void)
+ {
+--- a/nfs_prot.x
++++ b/nfs_prot.x
+@@ -190,7 +190,7 @@
+ /*
+  * Basic data types
+  */
+-typedef u_int64_t	uint64;
++typedef uint64_t	uint64;
+ typedef int64_t		int64;
+ typedef unsigned int	uint32;
+ typedef int		int32;
+--- a/sshcrypto.c
++++ b/sshcrypto.c
+@@ -20,6 +20,7 @@
+ #include <err.h>
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <string.h>
+ 
+ #include "sshcrypto.h"
+ 
diff --git a/network/dsniff/patches/37_fix-lib-and-share-dirs.patch b/network/dsniff/patches/37_fix-lib-and-share-dirs.patch
new file mode 100644
index 0000000000..f384b7ced0
--- /dev/null
+++ b/network/dsniff/patches/37_fix-lib-and-share-dirs.patch
@@ -0,0 +1,14 @@
+Description: Fix directory location for data files. They were wrongly set to lib dirs.
+Author: Hank Leininger <hlein@korelogic.com>
+
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -11,7 +11,7 @@
+ install_prefix  =
+ prefix          = @prefix@
+ exec_prefix	= @exec_prefix@
+-libdir		= @libdir@
++libdir	= $(prefix)/share/dsniff
+ sbindir         = @sbindir@
+ mandir		= @mandir@
+ 
diff --git a/network/dsniff/patches/38_fix-pcap_init.patch b/network/dsniff/patches/38_fix-pcap_init.patch
new file mode 100644
index 0000000000..5a91c2b40a
--- /dev/null
+++ b/network/dsniff/patches/38_fix-pcap_init.patch
@@ -0,0 +1,63 @@
+Description: Resolve naming collision due to libpcap API changes
+ dsniff was written with a function named pcap_init() that predates
+ the one in libpcap and is entirely different.  This patch renames it
+ out of the way.
+Author: Dennis Filder <d.filder@web.de>
+Bug-Debian: https://bugs.debian.org/980588
+Last-Update: 2021-02-10
+---
+--- a/tcpnice.c
++++ b/tcpnice.c
+@@ -204,7 +204,7 @@
+ 	
+ 	filter = copy_argv(argv);
+ 	
+-	if ((pd = pcap_init(intf, filter, 128)) == NULL)
++	if ((pd = pcap_init_dsniff(intf, filter, 128)) == NULL)
+ 		errx(1, "couldn't initialize sniffing");
+ 
+ 	if ((pcap_off = pcap_dloff(pd)) < 0)
+--- a/dnsspoof.c
++++ b/dnsspoof.c
+@@ -309,7 +309,7 @@
+ 	else snprintf(buf, sizeof(buf), "udp dst port 53 and not src %s",
+ 		      libnet_addr2name4(lnet_ip, LIBNET_DONT_RESOLVE));
+ 	
+-	if ((pcap_pd = pcap_init(dev, buf, 128)) == NULL)
++	if ((pcap_pd = pcap_init_dsniff(dev, buf, 128)) == NULL)
+ 		errx(1, "couldn't initialize sniffing");
+ 
+ 	if ((pcap_off = pcap_dloff(pcap_pd)) < 0)
+--- a/pcaputil.h
++++ b/pcaputil.h
+@@ -11,7 +11,7 @@
+ #ifndef PCAPUTIL_H
+ #define PCAPUTIL_H
+ 
+-pcap_t *pcap_init(char *intf, char *filter, int snaplen);
++pcap_t *pcap_init_dsniff(char *intf, char *filter, int snaplen);
+ 
+ int	pcap_dloff(pcap_t *pd);
+ 
+--- a/tcpkill.c
++++ b/tcpkill.c
+@@ -130,7 +130,7 @@
+ 	
+ 	filter = copy_argv(argv);
+ 	
+-	if ((pd = pcap_init(intf, filter, 64)) == NULL)
++	if ((pd = pcap_init_dsniff(intf, filter, 64)) == NULL)
+ 		errx(1, "couldn't initialize sniffing");
+ 
+ 	if ((pcap_off = pcap_dloff(pd)) < 0)
+--- a/pcaputil.c
++++ b/pcaputil.c
+@@ -63,7 +63,7 @@
+ }
+ 
+ pcap_t *
+-pcap_init(char *intf, char *filter, int snaplen)
++pcap_init_dsniff(char *intf, char *filter, int snaplen)
+ {
+ 	pcap_t *pd;
+ 	u_int net, mask;
diff --git a/network/dsniff/patches/39_libtirpc.patch b/network/dsniff/patches/39_libtirpc.patch
new file mode 100644
index 0000000000..9f46666826
--- /dev/null
+++ b/network/dsniff/patches/39_libtirpc.patch
@@ -0,0 +1,51 @@
+Author: Robert Scheck <robert@fedoraproject.org> 
+Description: allows building against libtirpc (as a separate library) given the Sun RPC
+support in glibc has been deprecated for a long time.
+
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -16,7 +16,7 @@
+ mandir		= @mandir@
+ 
+ CC	= @CC@
+-CFLAGS	= @CFLAGS@ -DDSNIFF_LIBDIR=\"$(libdir)/\"
++CFLAGS	= @CFLAGS@ -DDSNIFF_LIBDIR=\"$(libdir)/\" -I/usr/include/tirpc
+ CPPFLAGS = @CPPFLAGS@
+ LDFLAGS	= @LDFLAGS@
+ 
+@@ -107,7 +107,7 @@
+ 	$(RANLIB) $@
+ 
+ dsniff: $(HDRS) $(SRCS) $(OBJS) libmissing.a
+-	$(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) $(NIDSLIB) $(PCAPLIB) $(LNETLIB) $(DBLIB) $(SSLLIB)
++	$(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) $(NIDSLIB) $(PCAPLIB) $(LNETLIB) $(DBLIB) $(SSLLIB) -ltirpc
+ 
+ arpspoof: arpspoof.o arp.o libmissing.a
+ 	$(CC) $(LDFLAGS) -o $@ arpspoof.o arp.o $(LIBS) $(PCAPLIB) $(LNETLIB)
+@@ -116,7 +116,7 @@
+ 	$(CC) $(LDFLAGS) -o $@ dnsspoof.o pcaputil.o $(LIBS) $(PCAPLIB) $(LNETLIB)
+ 
+ filesnarf: nfs_prot.o filesnarf.o pcaputil.o rpc.o libmissing.a
+-	$(CC) $(LDFLAGS) -o $@ filesnarf.o nfs_prot.o pcaputil.o rpc.o $(LIBS) $(NIDSLIB) $(PCAPLIB) $(LNETLIB)
++	$(CC) $(LDFLAGS) -o $@ filesnarf.o nfs_prot.o pcaputil.o rpc.o $(LIBS) $(NIDSLIB) $(PCAPLIB) $(LNETLIB) -ltirpc
+ 
+ macof: macof.o libmissing.a
+ 	$(CC) $(LDFLAGS) -o $@ macof.o $(LIBS) $(PCAPLIB) $(LNETLIB)
+@@ -128,7 +128,7 @@
+ 	$(CC) $(LDFLAGS) -o $@ msgsnarf.o buf.o pcaputil.o $(LIBS) $(NIDSLIB) $(PCAPLIB) $(LNETLIB)
+ 
+ sshmitm: sshmitm.o buf.o hex.o record.o ssh.o sshcrypto.o libmissing.a
+-	$(CC) $(LDFLAGS) -o $@ sshmitm.o buf.o hex.o record.o ssh.o sshcrypto.o $(LIBS) $(LNETLIB) $(DBLIB) $(SSLLIB)
++	$(CC) $(LDFLAGS) -o $@ sshmitm.o buf.o hex.o record.o ssh.o sshcrypto.o $(LIBS) $(LNETLIB) $(DBLIB) $(SSLLIB) -ltirpc
+ 
+ sshow: sshow.o pcaputil.o libmissing.a
+ 	$(CC) $(LDFLAGS) -o $@ sshow.o pcaputil.o $(LIBS) $(NIDSLIB) $(PCAPLIB) $(LNETLIB)
+@@ -146,7 +146,7 @@
+ 	$(CC) $(LDFLAGS) -o $@ urlsnarf.o base64.o buf.o pcaputil.o $(LIBS) $(NIDSLIB) $(PCAPLIB) $(LNETLIB)
+ 
+ webmitm: webmitm.o base64.o buf.o decode_http.o record.o libmissing.a
+-	$(CC) $(LDFLAGS) -o $@ webmitm.o base64.o buf.o decode_http.o record.o $(LIBS) $(LNETLIB) $(DBLIB) $(SSLLIB)
++	$(CC) $(LDFLAGS) -o $@ webmitm.o base64.o buf.o decode_http.o record.o $(LIBS) $(LNETLIB) $(DBLIB) $(SSLLIB) -ltirpc
+ 
+ webspy: webspy.o base64.o buf.o remote.o libmissing.a
+ 	$(CC) $(LDFLAGS) -o $@ webspy.o base64.o buf.o remote.o $(LIBS) $(NIDSLIB) $(PCAPLIB) $(LNETLIB) $(X11LIB)
diff --git a/network/dublin-traceroute/dublin-traceroute.SlackBuild b/network/dublin-traceroute/dublin-traceroute.SlackBuild
index 570be0491e..b204aef358 100644
--- a/network/dublin-traceroute/dublin-traceroute.SlackBuild
+++ b/network/dublin-traceroute/dublin-traceroute.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for DUBLIN-TRACEROUTE
 
@@ -23,11 +23,15 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 # 07/Apr/2018 * First version
+# 20230530 bkw: modified by SlackBuilds.org: do not write to $CWD.
+
+cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=dublin-traceroute
 VERSION=${VERSION:-0.4.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -37,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,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 {} +
 
 mkdir -p build
 cd build
@@ -81,16 +89,9 @@ cd build
     -DSETCAP_EXECUTABLE=FALSE \
     -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
-
-if [ "${SETCAP:-yes}" = "yes" ]; then
-  sed -i -e 's/^## //' $CWD/doinst.sh
-fi
-
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp COPYING README.md contributors.txt $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
@@ -99,5 +100,10 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
+# 20230530 bkw: modify the installed file, not the one in $CWD
+if [ "${SETCAP:-yes}" = "yes" ]; then
+  sed -i -e 's/^## //' $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/network/dukto/dukto.SlackBuild b/network/dukto/dukto.SlackBuild
index 73d57be48a..6019f6d5d6 100644
--- a/network/dukto/dukto.SlackBuild
+++ b/network/dukto/dukto.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for Dukto
 
@@ -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=dukto
 VERSION=${VERSION:-6.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}
@@ -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/network/dukto/dukto.info b/network/dukto/dukto.info
index 34100745eb..08e62295db 100644
--- a/network/dukto/dukto.info
+++ b/network/dukto/dukto.info
@@ -5,6 +5,6 @@ DOWNLOAD="http://ponce.cc/slackware/sources/repo/dukto/dukto_6.0-1_i386.deb"
 MD5SUM="2f71d86c9e90da470229107a0c5d6e67"
 DOWNLOAD_x86_64="http://ponce.cc/slackware/sources/repo/dukto/dukto_6.0-1_amd64.deb"
 MD5SUM_x86_64="f66aab0eb41887e0083f4645e2a85642"
-REQUIRES=""
+REQUIRES="qt4"
 MAINTAINER="Andre Fernando"
 EMAIL="ando344@gmail.com"
diff --git a/network/dwb/README b/network/dwb/README
deleted file mode 100644
index 06e43caeaa..0000000000
--- a/network/dwb/README
+++ /dev/null
@@ -1,3 +0,0 @@
-dwb is a lightweight web browser based on the webkit web browser 
-engine and the gtk toolkit. dwb is highly customisable and can be
-easily configured through a web interface.
diff --git a/network/dwb/doinst.sh b/network/dwb/doinst.sh
deleted file mode 100644
index 392c12adb9..0000000000
--- a/network/dwb/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
-fi
-
diff --git a/network/dwb/dwb.SlackBuild b/network/dwb/dwb.SlackBuild
deleted file mode 100644
index 35b930c488..0000000000
--- a/network/dwb/dwb.SlackBuild
+++ /dev/null
@@ -1,103 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for dwb
-# Originally by Marcin Herda <mherda@slackword.net>
-
-# Formerly maintained by:
-# Ryan P.C. McQuen | Everett, WA | ryanpcmcquen@member.fsf.org
-
-# 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
-# <https://www.gnu.org/licenses/>.
-
-# 20170309 bkw:
-# - take over maintenance
-# - update for v20161213_4f6c404 (latest commit)
-# - i486 => i586
-# - minor tweaks
-# - TODO: look into ad-blocking (patch whatever's needed)
-
-PRGNAM=dwb
-VERSION=${VERSION:-20161213_4f6c404}
-SRCVER=${SRCVER:-4f6c404f2761}
-SRCNAM=${SRCNAM:-portix-dwb}
-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-$SRCVER
-tar xvf $CWD/$SRCVER.tar.bz2 || tar xvf $CWD/$SRCNAM-$SRCVER.tar.bz2
-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 {} \;
-
-# fix the location of man pages
-sed -i '/^MANDIR/s/DATAROOTDIR/PREFIX/' config.mk
-
-CFLAGS="$SLKCFLAGS" \
-make
-make install DESTDIR=$PKG
-strip $PKG/usr/bin/*
-gzip $PKG/usr/man/man?/*.?
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a README 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:-tgz}
diff --git a/network/dwb/dwb.info b/network/dwb/dwb.info
deleted file mode 100644
index f2ca1c84e3..0000000000
--- a/network/dwb/dwb.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="dwb"
-VERSION="20161213_4f6c404"
-HOMEPAGE="https://portix.bitbucket.io/dwb/"
-DOWNLOAD="https://bitbucket.org/portix/dwb/get/4f6c404f2761.tar.bz2"
-MD5SUM="08df9c127009284bc201e2301e41f3e1"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="webkitgtk"
-MAINTAINER="B. Watson"
-EMAIL="yalhcru@gmail.com"
diff --git a/network/dwb/slack-desc b/network/dwb/slack-desc
deleted file mode 100644
index 7fb4569ff9..0000000000
--- a/network/dwb/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------------------------------------------------------|
-dwb: dwb (dwb web browser)
-dwb:
-dwb: dwb is a lightweight web browser based on the webkit web browser
-dwb: engine and the gtk toolkit. dwb is highly customisable and can be
-dwb: easily configured through a web interface.
-dwb:
-dwb: Homepage: http://portix.bitbucket.org/dwb/
-dwb:
-dwb:
-dwb:
-dwb:
diff --git a/network/e2guardian/e2guardian.SlackBuild b/network/e2guardian/e2guardian.SlackBuild
index ac8b04ce29..09034b7145 100644
--- a/network/e2guardian/e2guardian.SlackBuild
+++ b/network/e2guardian/e2guardian.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for e2guardian
 # http://e2guardian.org
@@ -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=e2guardian
 VERSION=${VERSION:-4.1.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}
@@ -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/network/easyrsa/README b/network/easyrsa/README
index 46b44b5543..07ac1cb371 100644
--- a/network/easyrsa/README
+++ b/network/easyrsa/README
@@ -1,8 +1,10 @@
-EasyRSA is a CLI utility to build and manage a PKI CA. Initially part of the
-OpenVPN project (www.openvpn.net), now maintained by the community.
+EasyRSA is a CLI utility to build and manage a PKI CA. Initially
+part of the OpenVPN project (www.openvpn.net), now maintained by the
+community.
 
-The EasyRSA package and scripts are installed under /usr/share/easyrsa. They
-can be copied anywhere else convenient when they are to be used.
+The EasyRSA package and scripts are installed under
+/usr/share/easyrsa. They can be copied anywhere else convenient when
+they are to be used.
 
 Further instructions for version 3 usage at:
 https://community.openvpn.net/openvpn/wiki/EasyRSA3-OpenVPN-Howto
diff --git a/network/easyrsa/easyrsa.SlackBuild b/network/easyrsa/easyrsa.SlackBuild
index ffb18d7c19..97c6028f34 100644
--- a/network/easyrsa/easyrsa.SlackBuild
+++ b/network/easyrsa/easyrsa.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 # Slackware build script for EasyRSA
 # Copyright 2016 Sebastian Arcus, United Kingdom
 # All rights reserved.
@@ -20,15 +20,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=easyrsa
 SRCNAM=EasyRSA
-VERSION=${VERSION:-3.0.4}
+VERSION=${VERSION:-3.1.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/network/easyrsa/easyrsa.info b/network/easyrsa/easyrsa.info
index fafb548f82..1d45e65351 100644
--- a/network/easyrsa/easyrsa.info
+++ b/network/easyrsa/easyrsa.info
@@ -1,8 +1,8 @@
 PRGNAM="easyrsa"
-VERSION="3.0.4"
+VERSION="3.1.7"
 HOMEPAGE="https://github.com/OpenVPN/easy-rsa"
-DOWNLOAD="https://github.com/OpenVPN/easy-rsa/releases/download/v3.0.4/EasyRSA-3.0.4.tgz"
-MD5SUM="d163f0681b4b2067f107badeb9151629"
+DOWNLOAD="https://github.com/OpenVPN/easy-rsa/releases/download/v3.1.7/EasyRSA-3.1.7.tgz"
+MD5SUM="d5c434808ad8df32d992bfdd5e011379"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/network/efax-gtk/README b/network/efax-gtk/README
index 5425e12a1c..b077155754 100644
--- a/network/efax-gtk/README
+++ b/network/efax-gtk/README
@@ -1,10 +1,11 @@
-It is a GTK+ front end for the efax program who can be used to send and
-receive faxes with a fax modem, and to view, print and manage faxes received.
-It also has a socket interface to provide a "virtual printer" for sending
-faxes from word processors and similar programs, and can automatically
-e-mail a received fax to a designated user, and automatically print a
-received fax. It is specially nice for a single user's use, as probably he/she
-doesn't usually need a fax server (i.e. hylafax).
+It is a GTK+ front end for the efax program who can be used to send
+and receive faxes with a fax modem, and to view, print and manage
+faxes received. It also has a socket interface to provide a "virtual
+printer" for sending faxes from word processors and similar programs,
+and can automatically e-mail a received fax to a designated user, and
+automatically print a received fax. It is specially nice for a single
+user's use, as probably he/she doesn't usually need a fax server
+(i.e. hylafax).
 
-See README.SLACKWARE file in efax-gtk's docs directory for configuration
-notes.
+See README.SLACKWARE file in efax-gtk's docs directory for
+configuration notes.
diff --git a/network/efax-gtk/efax-gtk.SlackBuild b/network/efax-gtk/efax-gtk.SlackBuild
index 22557857e6..3460336c75 100644
--- a/network/efax-gtk/efax-gtk.SlackBuild
+++ b/network/efax-gtk/efax-gtk.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for efax-gtk
 
@@ -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=efax-gtk
 VERSION=${VERSION:-3.2.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}
@@ -47,8 +57,8 @@ DOCFILES="ABOUT-NLS AUTHORS BUGS ChangeLog COPYING INSTALL README"
 EFAX_DOCS="efax/COPYING efax/PATCHES efax/README efax/fax"
 OTHER_CMDS="mail_fax print_fax"
 
-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,7 +86,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 -w -Wl,--allow-multiple-definition" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
@@ -135,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/network/efax/README b/network/efax/README
new file mode 100644
index 0000000000..7505b7d156
--- /dev/null
+++ b/network/efax/README
@@ -0,0 +1,29 @@
+efax is a small ANSI C/POSIX program that sends and receives faxes
+using any fax modem (Class 1, 2 or 2.0). [*]
+
+efax is smaller and easier to install than HylaFAX or mgetty+sendfax.
+As one user put it "EFAX is a nice simple program for single user
+systems."
+
+The "fax" command, a shell script, lets you send, receive, view and
+print faxes. In larger systems, faxes can be sent by printing to a
+"fax" printer and received faxes can be e-mailed as MIME attachments
+to an administrator for distribution.  efax can also pass incoming
+data calls to a getty program.
+
+The efax package includes "efix," a program to convert between
+various image file formats. To fax Postscript files you will need
+Ghostscript. To view faxes you can use any program tha displays
+PGM files.  efix can also convert received files to Postscript or HP
+Laserjet formats for printing.
+
+This program has only a command-line interface.
+If you need a GUI-based fax solution, install efax-gtk instead.
+
+[*] Any hardware-based fax modem, that is. If you have a "software
+modem," a so-called "Linmodem," then you'll instead need to
+download the alpha version of efax and modify this SlackBuild script
+accordingly.
+
+The alpha release can be found here:
+https://www.cce.com/efax/download/efax-0.9a-001114.tar.gz
diff --git a/network/efax/efax.SlackBuild b/network/efax/efax.SlackBuild
new file mode 100644
index 0000000000..08d3614ee4
--- /dev/null
+++ b/network/efax/efax.SlackBuild
@@ -0,0 +1,116 @@
+#!/bin/bash
+#
+# Slackware build script for efax.
+#
+# Copyright 2020 by Jay, Seattle, WA.
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions, and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=efax
+SRCNAM=efax-0.9
+VERSION=${VERSION:-0.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
+
+# Caveat emptor
+case "$ARCH" in
+    i?86) ;;
+  x86_64) ;;
+       *) echo -e "\nBuild for $ARCH is untested!!"
+          echo -e "Press Ctrl-C within ten seconds to abort,"
+          echo -e "or press ENTER to continue at your own risk.\n"
+          read -t 10 PLACEHOLDER ;;
+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" = "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 {} \;
+
+
+sed -i "11s/CFLAGS=/CFLAGS=$SLKCFLAGS -fcommon/" Makefile
+sed -i "20i\
+BINDIR=$PKG\/usr\/bin" Makefile
+sed -i "21i\
+MANDIR=$PKG\/usr\/man" Makefile
+
+mkdir -p $PKG/usr/bin $PKG/usr/man/man1
+make all
+make install
+
+gzip -9 $PKG/usr/man/*/*
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+cat $TMP/$SRCNAM/README > $PKG/usr/doc/$PRGNAM-$VERSION/README
+cat $TMP/$SRCNAM/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
diff --git a/network/efax/efax.info b/network/efax/efax.info
new file mode 100644
index 0000000000..253928f9c7
--- /dev/null
+++ b/network/efax/efax.info
@@ -0,0 +1,10 @@
+PRGNAM="efax"
+VERSION="0.9"
+HOMEPAGE="https://www.cce.com/efax/"
+DOWNLOAD="ftp://ftp.metalab.unc.edu/pub/Linux/apps/serialcomm/fax/efax-0.9.tar.gz"
+MD5SUM="23bd3767f87c455c58ccae7f88bce725"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Jay"
+EMAIL="ld.jay@protonmail.com"
diff --git a/network/efax/slack-desc b/network/efax/slack-desc
new file mode 100644
index 0000000000..46f3d01791
--- /dev/null
+++ b/network/efax/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+    |-----handy-ruler------------------------------------------------------|
+efax: efax (send/receive fax)
+efax:
+efax: It can be used to send and receive faxes with a fax modem and to
+efax: view, print, and manage faxes received. It can automatically e-mail
+efax: a received fax to a designated user and automatically print a
+efax: received fax.
+efax:
+efax: This is the command-line version.
+efax: For a GUI version, install efax-gtk instead.
+efax:
+efax:
diff --git a/network/eiskaltdcpp/README b/network/eiskaltdcpp/README
index 3f670e8d3b..5725f46742 100644
--- a/network/eiskaltdcpp/README
+++ b/network/eiskaltdcpp/README
@@ -1,6 +1,7 @@
-EiskaltDC++ is a cross-platform program that uses the Direct Connect and ADC
-protocols. It is compatible with other DC clients, such as the original DC from
-Neomodus, DC++ and derivatives. EiskaltDC++ also interoperates with all common
-DC hub software.
+EiskaltDC++ is a cross-platform program that uses the Direct Connect
+and ADC protocols. It is compatible with other DC clients, such as
+the original DC from Neomodus, DC++ and derivatives. EiskaltDC++ also
+interoperates with all common DC hub software.
 
-The eiskaltdcpp is distributed under version 3 of GNU Public License (GPL).
+The eiskaltdcpp is distributed under version 3 of GNU Public License
+(GPL).
diff --git a/network/eiskaltdcpp/doinst.sh b/network/eiskaltdcpp/doinst.sh
index 6b75f2eda0..0e9b18910a 100644
--- a/network/eiskaltdcpp/doinst.sh
+++ b/network/eiskaltdcpp/doinst.sh
@@ -2,7 +2,8 @@ if [ -x /usr/bin/update-desktop-database ]; then
   /usr/bin/update-desktop-database &> /dev/null
 fi
 
-if [ -x /usr/bin/gtk-update-icon-cache ]; then
-  /usr/bin/gtk-update-icon-cache  -f -q /usr/share/icons/hicolor &> /dev/null
+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/network/eiskaltdcpp/eiskaltdcpp.SlackBuild b/network/eiskaltdcpp/eiskaltdcpp.SlackBuild
index d1d649564f..50097796a5 100644
--- a/network/eiskaltdcpp/eiskaltdcpp.SlackBuild
+++ b/network/eiskaltdcpp/eiskaltdcpp.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for eiskaltdcpp
 
@@ -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=eiskaltdcpp
-VERSION=${VERSION:-2.2.10}
+VERSION=${VERSION:-2.4.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}
@@ -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/network/eiskaltdcpp/eiskaltdcpp.info b/network/eiskaltdcpp/eiskaltdcpp.info
index c84afa3f27..6400b4d2c8 100644
--- a/network/eiskaltdcpp/eiskaltdcpp.info
+++ b/network/eiskaltdcpp/eiskaltdcpp.info
@@ -1,10 +1,10 @@
 PRGNAM="eiskaltdcpp"
-VERSION="2.2.10"
+VERSION="2.4.2"
 HOMEPAGE="https://github.com/eiskaltdcpp/eiskaltdcpp"
-DOWNLOAD="https://github.com/eiskaltdcpp/eiskaltdcpp/archive/v2.2.10/eiskaltdcpp-2.2.10.tar.gz"
-MD5SUM="1a67875b59c05f2253b5938a0fcf2951"
+DOWNLOAD="https://github.com/eiskaltdcpp/eiskaltdcpp/archive/v2.4.2/eiskaltdcpp-2.4.2.tar.gz"
+MD5SUM="58e07f79de61e3cc02a4be3f96f02884"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="lua"
+REQUIRES="lua miniupnpc"
 MAINTAINER="Nikolay Korotkiy"
 EMAIL="sikmir@gmail.com"
diff --git a/network/ejabberd-bin/README b/network/ejabberd-bin/README
new file mode 100644
index 0000000000..4783e1c3b8
--- /dev/null
+++ b/network/ejabberd-bin/README
@@ -0,0 +1,13 @@
+ejabberd is an open-source, robust, scalable and extensible realtime
+platform built using Erlang/OTP, that includes XMPP server, MQTT broker
+and SIP service.
+
+This script repackage the official deb package that provides a full
+featured ejabberd server and does not require any extra dependencies.
+It contains a stripped down version of Erlang, which does not conflict
+with the SBo erlang.
+
+A user and group "ejabberd" must exist prior to running this script.
+To create them run as root:
+  groupadd -g 370 ejabberd
+  useradd -u 370 -g 370 -s /sbin/nologin -d /var/lib/ejabberd ejabberd
diff --git a/network/ejabberd-bin/README.SBo b/network/ejabberd-bin/README.SBo
new file mode 100644
index 0000000000..747f79d7fa
--- /dev/null
+++ b/network/ejabberd-bin/README.SBo
@@ -0,0 +1,16 @@
+In order to start ejabberd at boot and stop it properly at shutdown,
+make sure rc.local and rc.local_shutdown contain the following lines:
+
+  /etc/rc.d/rc.local
+  ==================
+  # Start ejabberd
+  if [ -x /etc/rc.d/rc.ejabberd ]; then
+    /etc/rc.d/rc.ejabberd  start
+  fi
+
+  /etc/rc.d/rc.local_shutdown
+  ===========================
+  # Stop ejabberd
+  if [ -x /etc/rc.d/rc.ejabberd ]; then
+    /etc/rc.d/rc.ejabberd stop
+  fi
diff --git a/network/ejabberd-bin/doinst.sh b/network/ejabberd-bin/doinst.sh
new file mode 100644
index 0000000000..016d743a77
--- /dev/null
+++ b/network/ejabberd-bin/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
+}
+
+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.ejabberd.new
+config etc/ejabberd/ejabberd.yml.new
+config etc/ejabberd/ejabberdctl.cfg.new
+config etc/ejabberd/inetrc.new
diff --git a/network/ejabberd-bin/ejabberd-bin.SlackBuild b/network/ejabberd-bin/ejabberd-bin.SlackBuild
new file mode 100644
index 0000000000..bc34eef76a
--- /dev/null
+++ b/network/ejabberd-bin/ejabberd-bin.SlackBuild
@@ -0,0 +1,124 @@
+#!/bin/bash
+
+# Slackware build script for ejabberd-bin
+
+# Copyright 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=ejabberd-bin
+VERSION=${VERSION:-24.02}
+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" -a "$ARCH" != "aarch64" ]; then
+  echo "Only x86_64 and aarch64 are supported."
+  exit 1
+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
+
+if ! grep ^ejabberd: /etc/group 2>&1 > /dev/null; then
+  echo "  A group "ejabberd" must exist prior to running this script."
+  echo "    # groupadd -g 370 ejabberd"
+  exit 1
+elif ! grep ^ejabberd: /etc/passwd 2>&1 > /dev/null; then
+  echo "  A user "ejabberd" must exist prior to running this script."
+  echo "    # useradd -u 370 -g 370 -s /sbin/nologin -d /var/lib/ejabberd ejabberd"
+  exit 1
+elif ! grep ^ejabberd:.*:/var/lib/ejabberd: /etc/passwd 2>&1 > /dev/null; then
+  echo "  Please change the user "ejabberd" home directory to /var/lib/ejabberd."
+  echo "    # usermod -d /var/lib/ejabberd ejabberd"
+  exit 1
+fi
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $PKG
+ar p $CWD/${PRGNAM%-bin}_${VERSION}-*.deb data.tar.gz | tar xvz
+
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -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 -r usr/share lib etc
+mkdir -p etc var/{lib,log}/ejabberd
+chown -R ejabberd:ejabberd var/{lib,log}/ejabberd
+chmod 700 var/{lib,log}/ejabberd
+rm -f opt/ejabberd/conf/*.pem
+mv opt/ejabberd/conf etc/ejabberd
+rmdir opt/ejabberd/{database,logs,}
+chown root:ejabberd etc/ejabberd/* opt/ejabberd-*/lib/epam-*/priv/bin/epam
+chmod 640 etc/ejabberd/*
+chmod 4750 opt/ejabberd-*/lib/epam-*/priv/bin/epam
+
+sed -i -e '/^ca_file:/,/^[^ ]/{//!d}' -e '/^certfiles:/,/^[^ ]/{//!d}' \
+  -e '/\(^ca_file:\|^certfiles:\)/d' etc/ejabberd/ejabberd.yml
+
+find -L etc/ejabberd -type f -print0 | xargs -0 -I {} mv {} {}.new
+
+sed -i -e 's|/opt/ejabberd/conf|/etc/ejabberd|' \
+  -e 's|/opt/ejabberd/logs|/var/log/ejabberd|' \
+  -e 's|/opt/ejabberd/database/\$ERLANG_NODE|/var/lib/ejabberd|' \
+  opt/ejabberd-$VERSION/bin/ejabberdctl
+
+find $PKG -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 etc/rc.d
+cat $CWD/rc.ejabberd > etc/rc.d/rc.ejabberd.new
+
+mkdir -p usr/share/bash-completion/completions
+cat $CWD/ejabberdctl.bc > usr/share/bash-completion/completions/ejabberdctl
+
+mkdir -p usr/man/man5
+cat $CWD/ejabberd.yml.5 | gzip -9c > usr/man/man5/ejabberd.yml.5.gz
+
+mkdir -p usr/doc/$PRGNAM-$VERSION
+cat $CWD/CHANGELOG.md > usr/doc/$PRGNAM-$VERSION/CHANGELOG.md
+cat $CWD/$PRGNAM.SlackBuild > usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p install
+cat $CWD/slack-desc > install/slack-desc
+cat $CWD/doinst.sh > install/doinst.sh
+
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/network/ejabberd-bin/ejabberd-bin.info b/network/ejabberd-bin/ejabberd-bin.info
new file mode 100644
index 0000000000..0c8fd4dd64
--- /dev/null
+++ b/network/ejabberd-bin/ejabberd-bin.info
@@ -0,0 +1,16 @@
+PRGNAM="ejabberd-bin"
+VERSION="24.02"
+HOMEPAGE="https://www.ejabberd.im"
+DOWNLOAD="UNSUPPORTED"
+MD5SUM=""
+DOWNLOAD_x86_64="https://github.com/processone/ejabberd/releases/download/24.02/ejabberd_24.02-1_amd64.deb \
+                 https://raw.githubusercontent.com/processone/ejabberd/24.02/tools/ejabberdctl.bc \
+                 https://raw.githubusercontent.com/processone/ejabberd/24.02/man/ejabberd.yml.5 \
+                 https://raw.githubusercontent.com/processone/ejabberd/24.02/CHANGELOG.md"
+MD5SUM_x86_64="4298b09b2448520321a3dae9bca9ab56 \
+               699c3c0df85c53ebed6649a2a61131a9 \
+               47c603b65521b0899bf41be2bfcc2c4a \
+               183364229c2b80a66e2a9916ec58beff"
+REQUIRES=""
+MAINTAINER="Alexander Verbovetsky"
+EMAIL="alik@ejik.org"
diff --git a/network/ejabberd-bin/rc.ejabberd b/network/ejabberd-bin/rc.ejabberd
new file mode 100644
index 0000000000..f08f3a56a2
--- /dev/null
+++ b/network/ejabberd-bin/rc.ejabberd
@@ -0,0 +1,45 @@
+#!/bin/bash
+# Start/stop/restart the ejabberd xmpp server
+
+bin=/usr/sbin/ejabberdctl
+
+start_ejabberd() {
+  echo "Starting ejabberd... "
+  $bin start
+  $bin started
+}
+
+stop_ejabberd() {
+  echo "Stopping ejabberd... "
+  $bin stop
+  $bin stopped
+}
+
+restart_ejabberd() {
+  stop_ejabberd
+  sleep 1
+  start_ejabberd
+}
+
+status_ejabberd() {
+  $bin status
+}
+
+reload-config_ejabberd() {
+  $bin reload_config
+}
+
+case "$1" in
+  start)
+   start_ejabberd ;;
+  stop)
+   stop_ejabberd ;;
+  restart|force-reload)
+   restart_ejabberd ;;
+  status)
+   status_ejabberd ;;
+  reload-config)
+   reload-config_ejabberd ;;
+  *)
+    echo "usage $0 start|stop|restart|force-reload|status|reload-config" ;;
+esac
diff --git a/network/ejabberd-bin/slack-desc b/network/ejabberd-bin/slack-desc
new file mode 100644
index 0000000000..7423ea65a6
--- /dev/null
+++ b/network/ejabberd-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------------------------------------------------------|
+ejabberd-bin: ejabberd-bin (xmpp server)
+ejabberd-bin:
+ejabberd-bin: ejabberd is an open-source, robust, scalable and extensible realtime
+ejabberd-bin: platform built using Erlang/OTP, that includes XMPP server, MQTT
+ejabberd-bin: broker and SIP service.
+ejabberd-bin:
+ejabberd-bin: This script repackage the official deb package.
+ejabberd-bin:
+ejabberd-bin:
+ejabberd-bin: Homepage: https://www.ejabberd.im
+ejabberd-bin:
diff --git a/network/ejabberd/README b/network/ejabberd/README
new file mode 100644
index 0000000000..dc46278e0a
--- /dev/null
+++ b/network/ejabberd/README
@@ -0,0 +1,23 @@
+ejabberd is an open-source, robust, scalable and extensible realtime
+platform built using Erlang/OTP, that includes XMPP server, MQTT broker
+and SIP service.
+
+A user and group "ejabberd" must exist prior to running this script.
+To create them run as root:
+  groupadd -g 370 ejabberd
+  useradd -u 370 -g 370 -s /sbin/nologin -d /var/lib/ejabberd ejabberd
+
+You can enable the following optional features by passing variables to
+the script (VAR=yes ejabberd.SlackBuild):
+
+ODBC=yes|no (default: no), enable ODBC support
+MYSQL=yes|no (default: no), enable MySQL support
+PGSQL=yes|no (default: no), enable PostgreSQL support
+SQLITE=yes|no (default: no), enable SQLite support
+PAM=yes|no (default: no), enable PAM authentication
+REDIS=yes|no (default: no), enable Redis support
+SIP=yes|no (default: no), enable SIP support
+LUA=yes|no (default: no), enable Lua support (to import from Prosody)
+TOOLS=yes|no (default: no), build development tools
+
+rebar3 is needed only at build time.
diff --git a/network/ejabberd/README.SBo b/network/ejabberd/README.SBo
new file mode 100644
index 0000000000..747f79d7fa
--- /dev/null
+++ b/network/ejabberd/README.SBo
@@ -0,0 +1,16 @@
+In order to start ejabberd at boot and stop it properly at shutdown,
+make sure rc.local and rc.local_shutdown contain the following lines:
+
+  /etc/rc.d/rc.local
+  ==================
+  # Start ejabberd
+  if [ -x /etc/rc.d/rc.ejabberd ]; then
+    /etc/rc.d/rc.ejabberd  start
+  fi
+
+  /etc/rc.d/rc.local_shutdown
+  ===========================
+  # Stop ejabberd
+  if [ -x /etc/rc.d/rc.ejabberd ]; then
+    /etc/rc.d/rc.ejabberd stop
+  fi
diff --git a/network/ejabberd/doinst.sh b/network/ejabberd/doinst.sh
new file mode 100644
index 0000000000..016d743a77
--- /dev/null
+++ b/network/ejabberd/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
+}
+
+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.ejabberd.new
+config etc/ejabberd/ejabberd.yml.new
+config etc/ejabberd/ejabberdctl.cfg.new
+config etc/ejabberd/inetrc.new
diff --git a/network/ejabberd/ejabberd.SlackBuild b/network/ejabberd/ejabberd.SlackBuild
new file mode 100644
index 0000000000..e0e6fd450c
--- /dev/null
+++ b/network/ejabberd/ejabberd.SlackBuild
@@ -0,0 +1,172 @@
+#!/bin/bash
+
+# Slackware build script for ejabberd
+
+# 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=ejabberd
+VERSION=${VERSION:-24.02}
+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
+
+if ! grep ^ejabberd: /etc/group 2>&1 > /dev/null; then
+  echo "  A group "ejabberd" must exist prior to running this script."
+  echo "    # groupadd -g 370 ejabberd"
+  exit 1
+elif ! grep ^ejabberd: /etc/passwd 2>&1 > /dev/null; then
+  echo "  A user "ejabberd" must exist prior to running this script."
+  echo "    # useradd -u 370 -g 370 -s /sbin/nologin -d /var/lib/ejabberd ejabberd"
+  exit 1
+elif ! grep ^ejabberd:.*:/var/lib/ejabberd: /etc/passwd 2>&1 > /dev/null; then
+  echo "  Please change the user "ejabberd" home directory to /var/lib/ejabberd."
+  echo "    # usermod -d /var/lib/ejabberd ejabberd"
+  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
+
+rm -f rebar rebar3
+
+find -L $CWD -maxdepth 1 -type f \
+  -name "*.tar.gz" ! -name "$PRGNAM-$VERSION.tar.gz" | while read f
+do
+  fn=$(basename $f | rev | cut -d- -f2 | rev)
+  mkdir -p deps/$fn
+  tar xvf $f -C deps/$fn --strip-components=1
+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 {} \;
+
+odbc="";   [ "${ODBC:-no}" != "no" ]   && odbc="--enable-odbc"
+mysql="";  [ "${MYSQL:-no}" != "no" ]  && mysql="--enable-mysql"
+pgsql="";  [ "${PGSQL:-no}" != "no" ]  && pgsql="--enable-pgsql"
+sqlite=""; [ "${SQLITE:-no}" != "no" ] && sqlite="--enable-sqlite"
+pam="";    [ "${PAM:-no}" != "no" ]    && pam="--enable-pam"
+redis="";  [ "${REDIS:-no}" != "no" ]  && redis="--enable-redis"
+sip="";    [ "${SIP:-no}" != "no" ]    && sip="--enable-sip"
+lua="";    [ "${LUA:-no}" != "no" ]    && lua="--enable-lua"
+tools="";  [ "${TOOLS:-no}" != "no" ]  && tools="--enable-tools"
+
+./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 \
+  --enable-user=ejabberd \
+  --build=$ARCH-slackware-linux \
+  --with-rebar=rebar \
+  $odbc \
+  $mysql \
+  $pgsql \
+  $sqlite \
+  $pam \
+  $redis \
+  $sip \
+  $lua \
+  $tools
+
+unshare -n make
+make install DESTDIR=$PKG
+
+rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la
+
+find -L $PKG/usr/lib${LIBDIRSUFFIX} -type f -name "*.so" -exec chmod 755 {} \;
+
+find $PKG -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
+
+install -D -m644 tools/ejabberdctl.bc \
+  $PKG/usr/share/bash-completion/completions/ejabberdctl
+rm -f tools/ejabberdctl.bc
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a CHANGELOG.md CONTRIBUTING.md CONTRIBUTORS.md README.md sql tools \
+  $PKG/usr/doc/$PRGNAM-$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
+
+chown -R ejabberd:ejabberd $PKG/var/lib/ejabberd
+chmod 700 $PKG/var/lib/ejabberd
+
+for i in `find $PKG/etc/ejabberd -type f`; do mv $i $i.new; done
+
+mkdir -p $PKG/etc/rc.d
+cat $CWD/rc.ejabberd > $PKG/etc/rc.d/rc.ejabberd.new
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/network/ejabberd/ejabberd.info b/network/ejabberd/ejabberd.info
new file mode 100644
index 0000000000..6b5c808233
--- /dev/null
+++ b/network/ejabberd/ejabberd.info
@@ -0,0 +1,64 @@
+PRGNAM="ejabberd"
+VERSION="24.02"
+HOMEPAGE="https://www.ejabberd.im"
+DOWNLOAD="https://github.com/processone/ejabberd/archive/24.02/ejabberd-24.02.tar.gz \
+          https://github.com/dvv/base64url/archive/1.0.1/base64url-1.0.1.tar.gz \
+          https://github.com/processone/cache_tab/archive/1.0.30/cache_tab-1.0.30.tar.gz \
+          https://github.com/processone/eimp/archive/1.0.22/eimp-1.0.22.tar.gz \
+          https://github.com/processone/epam/archive/1.0.14/epam-1.0.14.tar.gz \
+          https://github.com/wooga/eredis/archive/v1.2.0/eredis-1.2.0.tar.gz \
+          https://github.com/processone/esip/archive/1.0.52/esip-1.0.52.tar.gz \
+          https://github.com/processone/ezlib/archive/1.0.12/ezlib-1.0.12.tar.gz \
+          https://github.com/processone/fast_tls/archive/1.1.19/fast_tls-1.1.19.tar.gz \
+          https://github.com/processone/fast_xml/archive/1.1.51/fast_xml-1.1.51.tar.gz \
+          https://github.com/processone/fast_yaml/archive/1.0.36/fast_yaml-1.0.36.tar.gz \
+          https://github.com/benoitc/erlang-idna/archive/6.0.0/erlang-idna-6.0.0.tar.gz \
+          https://github.com/davisp/jiffy/archive/1.1.1/jiffy-1.1.1.tar.gz \
+          https://github.com/potatosalad/erlang-jose/archive/1.11.5/erlang-jose-1.11.5.tar.gz \
+          https://github.com/rvirding/luerl/archive/1.1.1/luerl-1.1.1.tar.gz \
+          https://github.com/processone/mqtree/archive/1.0.16/mqtree-1.0.16.tar.gz \
+          https://github.com/processone/p1_acme/archive/1.0.22/p1_acme-1.0.22.tar.gz \
+          https://github.com/processone/p1_mysql/archive/1.0.23/p1_mysql-1.0.23.tar.gz \
+          https://github.com/processone/p1_oauth2/archive/0.6.14/p1_oauth2-0.6.14.tar.gz \
+          https://github.com/processone/p1_pgsql/archive/1.1.25/p1_pgsql-1.1.25.tar.gz \
+          https://github.com/processone/p1_utils/archive/1.0.25/p1_utils-1.0.25.tar.gz \
+          https://github.com/processone/pkix/archive/1.0.9/pkix-1.0.9.tar.gz \
+          https://github.com/processone/erlang-sqlite3/archive/1.1.14/erlang-sqlite3-1.1.14.tar.gz \
+          https://github.com/processone/stringprep/archive/1.0.29/stringprep-1.0.29.tar.gz \
+          https://github.com/processone/stun/archive/1.2.12/stun-1.2.12.tar.gz \
+          https://github.com/processone/xmpp/archive/1.8.1/xmpp-1.8.1.tar.gz \
+          https://github.com/processone/yconf/archive/1.0.15/yconf-1.0.15.tar.gz \
+          https://github.com/benoitc/unicode_util_compat/archive/0.4.1/unicode_util_compat-0.4.1.tar.gz"
+MD5SUM="1b8b91a2b0af65685c185766dc8cf667 \
+        4d515ed34e4e8966bb7400ce51de83b2 \
+        b8fd0788b9108c1dcea49fb3ba86eb77 \
+        505deb9dfe6324a6bc8e130908df105d \
+        88be9e7fec2aaa5ca8230c19db661263 \
+        239232590c82b1b7d78247079a1f17aa \
+        3bda6c2e154462c640e9fa99fe704cd8 \
+        5fd5273a71ad80b3397212dc4a9dccd3 \
+        62a46c10c57ecdc8a60783ea62edc1d0 \
+        2a7b886287b1034f0a3d07b9f15d5d59 \
+        cbb767ad4f8678d91120a34402957661 \
+        1975930f1ab7d90ca14f914a8f7dacd6 \
+        5ab471571ac2b39c02a90350cecb04e3 \
+        2576e3fa9da67054de9bf67972d64bbe \
+        e038b92f2c79bad70f5fb7c821d9f121 \
+        f0f50e4ea6bca2abd455596209930689 \
+        af192ea9a715e40db4a395341e237a0b \
+        a6fff6901ff93b9687cf481934d99775 \
+        a227318ad3f7665a45a2c284d203f259 \
+        3f45f0e02e532308a51e1927c7c51888 \
+        90f134a42486419966e4d64d8bdaa105 \
+        db9a2e5cb2db46f0ed48b06efbcfa4c5 \
+        d23c63956f6d3da25f5a75f4a70a94fd \
+        4d5dff0200768e298b166667272f5f92 \
+        80d445f62e246c55515fc6b77692c5a0 \
+        2b64f5b3d22c3a493cacdba805bde06d \
+        6f50a504c0fa81f9a5a1f63f16ff5272 \
+        1742d5522f1329229beb3e033a96898d"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="erlang-otp rebar"
+MAINTAINER="Alexander Verbovetsky"
+EMAIL="alik@ejik.org"
diff --git a/network/ejabberd/rc.ejabberd b/network/ejabberd/rc.ejabberd
new file mode 100644
index 0000000000..b231820a51
--- /dev/null
+++ b/network/ejabberd/rc.ejabberd
@@ -0,0 +1,57 @@
+#!/bin/bash
+# Start/stop/restart the ejabberd xmpp server
+
+bin=/usr/sbin/ejabberdctl
+
+start_ejabberd() {
+  echo "Starting ejabberd... "
+  $bin start
+  $bin started
+}
+
+stop_ejabberd() {
+  echo "Stopping ejabberd... "
+  $bin stop
+  $bin stopped
+}
+
+restart_ejabberd() {
+  stop_ejabberd
+  sleep 1
+  start_ejabberd
+}
+
+status_ejabberd() {
+  $bin status
+}
+
+force-stop_ejabberd() {
+  echo "Killing ejabberd... "
+  port=$(/usr/bin/epmd -names | awk -v name=ejabberd '$2==name {print $5}')
+  if [ -z "$port" ]; then
+    echo "ejabberd not found"
+  else
+    kill $(lsof -i TCP:$port -s TCP:LISTEN | tail -n +2 | awk '{print $2}')
+  fi
+}
+
+reload-config_ejabberd() {
+  $bin reload_config
+}
+
+case "$1" in
+  start)
+   start_ejabberd ;;
+  stop)
+   stop_ejabberd ;;
+  restart|reload)
+   restart_ejabberd ;;
+  status)
+   status_ejabberd ;;
+  force-stop)
+   force-stop_ejabberd ;;
+  reload-config)
+   reload-config_ejabberd ;;
+  *)
+    echo "usage $0 start|stop|restart|status|force-stop|reload-config" ;;
+esac
diff --git a/network/ejabberd/slack-desc b/network/ejabberd/slack-desc
new file mode 100644
index 0000000000..0c1e8d5c14
--- /dev/null
+++ b/network/ejabberd/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+        |-----handy-ruler------------------------------------------------------|
+ejabberd: ejabberd (xmpp server)
+ejabberd:
+ejabberd:
+ejabberd: ejabberd is an open-source, robust, scalable and extensible realtime
+ejabberd: platform built using Erlang/OTP, that includes XMPP server, MQTT
+ejabberd: broker and SIP service.
+ejabberd:
+ejabberd:
+ejabberd: Homepage: https://www.ejabberd.im
+ejabberd:
+ejabberd:
diff --git a/network/ekiga/README b/network/ekiga/README
deleted file mode 100644
index fdaa328d57..0000000000
--- a/network/ekiga/README
+++ /dev/null
@@ -1,14 +0,0 @@
-Ekiga (formely known as GnomeMeeting) is an open source VoIP and
-video conferencing application for GNOME. Ekiga uses both the H.323
-and SIP protocols. It supports many audio and video codecs, and is
-interoperable with other SIP compliant software and also with
-Microsoft NetMeeting.
-
-Help button is broken, which probably needs the Gnome help system.
-
-The following options, all disabled by default, are supported. Just
-set any of them to "yes" to enable the corresponding feature:
-- AVAHI (requires the optional dependency avahi)
-- KDE (experimental KDE support)
-- KAB (experimental KAddressBook support)
-- GS (experimental GStreamer support)
diff --git a/network/ekiga/doinst.sh b/network/ekiga/doinst.sh
deleted file mode 100644
index 06d1b6ebf1..0000000000
--- a/network/ekiga/doinst.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-schema_install() {
-  SCHEMA="$1"
-  GCONF_CONFIG_SOURCE="xml::etc/gconf/gconf.xml.defaults" \
-  chroot . gconftool-2 --makefile-install-rule \
-    /etc/gconf/schemas/$SCHEMA \
-    1>/dev/null 2>/dev/null
-}
-
-schema_install ekiga.schemas
-
-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/network/ekiga/ekiga.SlackBuild b/network/ekiga/ekiga.SlackBuild
deleted file mode 100644
index c56634c92e..0000000000
--- a/network/ekiga/ekiga.SlackBuild
+++ /dev/null
@@ -1,152 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for Ekiga
-
-# Copyright 2008-2009 Mauro Giachero
-# All rights reserved.
-# Copyright 2011 Davd Woodfall <dave@dawoodfall.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.
-
-PRGNAM=ekiga
-VERSION=${VERSION:-4.0.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
-
-# Requires avahi
-if [[ ${AVAHI:-no} = "no" ]] ; then
-  DO_AVAHI="dis"
-else
-  DO_AVAHI="en"
-fi
-
-# Experimental XCAP support
-#if [[ ${XCAP:-no} = "no" ]] ; then
-  DO_XCAP="dis"
-#else
-#  DO_XCAP="en"
-#fi
-
-# Experimental KDE support
-if [[ ${KDE:-no} = "no" ]] ; then
-  DO_KDE="dis"
-else
-  DO_KDE="en"
-fi
-
-# Experimental KAddressBook support
-if [[ ${KAB:-no} = "no" ]] ; then
-  DO_KAB="dis"
-else
-  DO_KAB="en"
-fi
-
-# Experimental GStreamer support
-if [[ ${GS:-no} = "no" ]] ; then
-  DO_GS="dis"
-else
-  DO_GS="en"
-fi
-
-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 {} \;
-
-
-# Fix for -current (20150722 dbs)
-sed -e 's/gnome-icon-theme/adwaita-icon-theme/g' -i configure.ac
-autoconf
-
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
-  --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --sysconfdir=/etc \
-  --localstatedir=/var \
-  --mandir=/usr/man \
-  --disable-static \
-  --disable-gdu \
-  --disable-eds \
-  --disable-schemas-install \
-  --${DO_AVAHI}able-avahi \
-  --${DO_XCAP}able-xcap \
-  --${DO_KDE}able-kde \
-  --${DO_KAB}able-kab \
-  --${DO_GS}able-gstreamer \
-  --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
-
-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 [A-CE-LN-Z]* MAINTAINERS 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/network/ekiga/ekiga.info b/network/ekiga/ekiga.info
deleted file mode 100644
index 793e412d5e..0000000000
--- a/network/ekiga/ekiga.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="ekiga"
-VERSION="4.0.1"
-HOMEPAGE="https://www.ekiga.org/"
-DOWNLOAD="http://ftp.gnome.org/pub/gnome/sources/ekiga/4.0/ekiga-4.0.1.tar.xz"
-MD5SUM="704ba532a8e3e0b5e3e2971dd2db39e4"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="opal ptlib"
-MAINTAINER="David Woodfall"
-EMAIL="dave@dawoodfall.net"
diff --git a/network/ekiga/slack-desc b/network/ekiga/slack-desc
deleted file mode 100644
index 00014f972b..0000000000
--- a/network/ekiga/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------------------------------------------------------|
-ekiga: ekiga (an open source VoIP and video conferencing application)
-ekiga:
-ekiga: Ekiga (formely known as GnomeMeeting) is an open source VoIP and
-ekiga: video conferencing application for GNOME. Ekiga uses both the H.323
-ekiga: and SIP protocols. It supports many audio and video codecs, and is
-ekiga: interoperable with other SIP compliant software and also with
-ekiga: Microsoft NetMeeting.
-ekiga:
-ekiga: Homepage: https://www.ekiga.org/
-ekiga:
-ekiga:
diff --git a/network/element-desktop/README b/network/element-desktop/README
new file mode 100644
index 0000000000..5ea2012a55
--- /dev/null
+++ b/network/element-desktop/README
@@ -0,0 +1,12 @@
+Element 
+
+Secure and independent communication, connected via Matrix
+
+Choose where your data is kept, or host it yourself, instead of being 
+forced to use the app’s own server.
+
+End-to-end encrypted by default
+
+
+Element is only available as a 64bit program. 32bit is unsupported.
+
diff --git a/network/element-desktop/doinst.sh b/network/element-desktop/doinst.sh
new file mode 100644
index 0000000000..7d010b535a
--- /dev/null
+++ b/network/element-desktop/doinst.sh
@@ -0,0 +1,12 @@
+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/network/element-desktop/element-desktop.SlackBuild b/network/element-desktop/element-desktop.SlackBuild
new file mode 100644
index 0000000000..87aa5cf624
--- /dev/null
+++ b/network/element-desktop/element-desktop.SlackBuild
@@ -0,0 +1,93 @@
+#!/bin/bash
+
+# Slackware build script for element-desktop
+#
+# 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=element-desktop
+VERSION=${VERSION:-1.11.53}
+SRCVERSION=$( echo $VERSION | tr _ - )
+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
+  DEBARCH="i386"
+  echo "This package is currently only available for 64bit."
+  exit 1
+elif [ "$ARCH" = "x86_64" ]; then
+  DEBARCH="amd64"
+else
+  echo "Package for $(uname -m) architecture is not available."
+  exit 1
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $PKG
+ar p $CWD/${PRGNAM}_${SRCVERSION}_amd64.deb data.tar.xz | tar Jxv
+
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -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
+cp -a $PKG/usr/share/doc/$PRGNAM/* $PKG/opt/Element/LICENSE* \
+  $PKG/usr/doc/$PRGNAM-$VERSION
+rm -rf $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/network/element-desktop/element-desktop.info b/network/element-desktop/element-desktop.info
new file mode 100644
index 0000000000..ec43aeb9f4
--- /dev/null
+++ b/network/element-desktop/element-desktop.info
@@ -0,0 +1,10 @@
+PRGNAM="element-desktop"
+VERSION="1.11.53"
+HOMEPAGE="https://element.io/"
+DOWNLOAD="UNSUPPORTED"
+MD5SUM=""
+DOWNLOAD_x86_64="https://packages-old.element.io/debian/pool/main/e/element-desktop/element-desktop_1.11.53_amd64.deb"
+MD5SUM_x86_64="63cfc2a190371c9288529197cd1afbc0"
+REQUIRES="sqlcipher"
+MAINTAINER="marav"
+EMAIL="marav8@free.fr"
diff --git a/network/element-desktop/slack-desc b/network/element-desktop/slack-desc
new file mode 100644
index 0000000000..683fc945ad
--- /dev/null
+++ b/network/element-desktop/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+               |-----handy-ruler------------------------------------------------------|
+element-desktop: element-desktop (Secure and independent communication via Matrix)
+element-desktop:
+element-desktop: Element lets you choose where your messages are stored, putting 
+element-desktop: you in control of your data.
+element-desktop:
+element-desktop: Secure and end-to-end encrypted. Built on Matrix
+element-desktop:
+element-desktop:
+element-desktop: Homepage: https://element.io/
+element-desktop:
+element-desktop:
diff --git a/network/elemental-ircd/README b/network/elemental-ircd/README
deleted file mode 100644
index 2603265d13..0000000000
--- a/network/elemental-ircd/README
+++ /dev/null
@@ -1,36 +0,0 @@
-Elemental-IRCd is a high performance, lightweight, and scalable IRC daemon. It
-is a fork of the now-defunct ShadowIRCD and seeks to continue in the direction
-ShadowIRCD was headed.
-
-An `/etc/rc.d/rc.elemental-ircd` script is supplied which supports
-start/stop/restart/reload, which you can call from your rc.local:
-
-    # /etc/rc.d/rc.local
-    # ==================
-    if [ -x /etc/rc.d/rc.elemental-ircd ]; then
-        /etc/rc.d/rc.elemental-ircd start
-    fi
-
-The `reload` parameter will make an already running ircd reload its
-configuration file.
-
-The elemental-ircd will refuse to run as root, so you need to create a user
-for it:
-    groupadd -g 315 elemental-ircd
-    useradd -u 315 -g 315 -d /var/lib/elemental-ircd elemental-ircd
-By default we name the user `elemental-ircd` with UID 315, and put it in the
-`elemental-ircd` group (GID 315). If you want to give it a different name, uid
-or gid, you can give
-    IRCD_UNAME=elemental-ircd
-    IRCD_UID=315
-    IRCD_GID=315
-different values when running the slackbuild script.
-
-Before starting the ircd, you'll need to create a configuration file for it.
-It should be named `/etc/elemental-ircd/ircd.conf`. In that directory there
-is already an `example.conf` and a `reference.conf`.
-
-Note: elemental-ircd comes with a binary called `/usr/bin/mkpasswd`, which is
-used to create passwords for o-lines, but it creates a conflict with
-`/usr/bin/mkpasswd` from expect, so the `mkpasswd` supplied by elemental-ircd
-is renamed to `ircd-mkpasswd` by the SlackBuild script.
diff --git a/network/elemental-ircd/doinst.sh b/network/elemental-ircd/doinst.sh
deleted file mode 100644
index e99e1995fe..0000000000
--- a/network/elemental-ircd/doinst.sh
+++ /dev/null
@@ -1,39 +0,0 @@
-
-IRCD_UNAME="@UNAME@"
-IRCD_UID="@UID@"
-IRCD_GID="@GID@"
-
-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.elemental-ircd.new
-config etc/logrotate.d/elemental-ircd.new
-config etc/elemental-ircd/ircd.motd.new
-
-# Set up user/group permissions
-groupadd -g $IRCD_GID $IRCD_UNAME 2>/dev/null
-useradd -u $IRCD_UID -g $IRCD_GID -d var/lib/elemental-ircd $IRCD_UNAME 2>/dev/null
-chown $IRCD_UID:$IRCD_GID var/run/elemental-ircd
-chown $IRCD_UID:$IRCD_GID var/log/elemental-ircd
-chown $IRCD_UID:$IRCD_GID var/lib/elemental-ircd
-chown $IRCD_UID:$IRCD_GID var/state/elemental-ircd
diff --git a/network/elemental-ircd/elemental-ircd.SlackBuild b/network/elemental-ircd/elemental-ircd.SlackBuild
deleted file mode 100644
index 5e6346f61c..0000000000
--- a/network/elemental-ircd/elemental-ircd.SlackBuild
+++ /dev/null
@@ -1,145 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for elemental-ircd
-
-# Copyright 2015 Andreas Guldstrand <andreas.guldstrand@gmail.com>
-# Copyright 2007-2015 Adis Nezirovic <adis_at_linux.org.ba> for doinst.sh
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
-#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
-#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (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="elemental-ircd"
-VERSION=${VERSION:-6.6.3}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-IRCD_UID=${IRCD_UID:-315}
-IRCD_GID=${IRCD_GID:-315}
-IRCD_UNAME=${IRCD_UNAME:-elemental-ircd}
-
-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-$PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz || 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 {} \;
-
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
-  --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --sysconfdir=/etc/$PRGNAM \
-  --localstatedir=/var/state \
-  --mandir=/usr/man \
-  --docdir=/usr/doc/$PRGNAM-$VERSION \
-  --with-helpdir="/usr/doc/$PRGNAM-$VERSION/help" \
-  --build=$ARCH-slackware-linux \
-  --enable-ipv6 \
-  --enable-epoll \
-  --with-logdir="/var/log/$PRGNAM" \
-  --with-rundir=/var/run
-
-make
-make install DESTDIR=$PKG
-
-# /usr/bin/mkpasswd already exists in expect, so rename this one
-mv $PKG/usr/bin/mkpasswd $PKG/usr/bin/ircd-mkpasswd
-
-# Rename /etc/elemental-ircd/ircd.motd to .new so we don't clobber it
-mv $PKG/etc/$PRGNAM/ircd.motd $PKG/etc/$PRGNAM/ircd.motd.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 \
-  CONTRIBUTING.md CREDITS Dockerfile INSTALL LICENSE NEWS README.md TODO.markdown \
-  doc/*.txt doc/example.conf doc/Hybrid-team doc/Ratbox-team doc/README.cidr_bans \
-  doc/reference.charybdis.conf doc/reference.conf doc/server-version-info \
-  doc/Tao-of-IRC.940110 doc/technical tools/README.mkpasswd \
-  $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a extensions/README $PKG/usr/doc/$PRGNAM-$VERSION/README.extensions
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-cat $CWD/README > $PKG/usr/doc/$PRGNAM-$VERSION/README.SBo
-
-# Create /var/lib/elemental-ircd directory
-mkdir -p $PKG/var/lib/$PRGNAM
-
-# Copy rc.elemental-ircd into /etc/rc.d
-mkdir -p $PKG/etc/rc.d
-sed -e "s/@USER@/$IRCD_UNAME/" $CWD/rc.$PRGNAM > $PKG/etc/rc.d/rc.$PRGNAM.new
-
-# Copy logrotate script into /etc/logrotate.d
-mkdir -p $PKG/etc/logrotate.d
-cat $CWD/$PRGNAM.logrotate > $PKG/etc/logrotate.d/$PRGNAM.new
-
-# Copy slackware-specific example conf to /etc/elemental-ircd
-mkdir -p $PKG/etc/$PRGNAM
-sed -e "s/@LIBDIRSUFFIX@/$LIBDIRSUFFIX/" \
-    $CWD/slackware.conf > $PKG/etc/$PRGNAM/slackware.conf
-
-# Copy the slack-desc (and a custom doinst.sh if necessary) into ./install
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-sed -e "s/@UNAME@/$IRCD_UNAME/" \
-    -e "s/@UID@/$IRCD_UID/" \
-    -e "s/@GID@/$IRCD_GID/" \
-    $CWD/doinst.sh > $PKG/install/doinst.sh
-chmod 755 $PKG/install/doinst.sh
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/network/elemental-ircd/elemental-ircd.info b/network/elemental-ircd/elemental-ircd.info
deleted file mode 100644
index a365cc6736..0000000000
--- a/network/elemental-ircd/elemental-ircd.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="elemental-ircd"
-VERSION="6.6.3"
-HOMEPAGE="https://github.com/Elemental-IRCd/elemental-ircd"
-DOWNLOAD="https://github.com/Elemental-IRCd/elemental-ircd/archive/elemental-ircd-6.6.3.tar.gz"
-MD5SUM="4e0aa3b2692252a6b467e07f1de8ab34"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Andreas Guldstrand"
-EMAIL="andreas.guldstrand@gmail.com"
diff --git a/network/elemental-ircd/elemental-ircd.logrotate b/network/elemental-ircd/elemental-ircd.logrotate
deleted file mode 100644
index 16c989becc..0000000000
--- a/network/elemental-ircd/elemental-ircd.logrotate
+++ /dev/null
@@ -1,15 +0,0 @@
-/var/log/elemental-ircd/* {
-    daily
-    rotate 7
-    copytruncate
-    delaycompress
-    compress
-    notifempty
-    missingok
-    postrotate
-        if [ -x /etc/rc.d/rc.elemental-ircd ]
-        then
-            /etc/rc.d/rc.elemental-ircd reload > /dev/null 2>&1
-        fi
-    endscript
-}
diff --git a/network/elemental-ircd/rc.elemental-ircd b/network/elemental-ircd/rc.elemental-ircd
deleted file mode 100644
index 9af9f68ef9..0000000000
--- a/network/elemental-ircd/rc.elemental-ircd
+++ /dev/null
@@ -1,53 +0,0 @@
-#!/bin/sh
-#
-# elemental-ircd startup script for Slackware
-
-USER="@USER@"
-PIDFILE="/var/run/elemental-ircd/ircd.pid"
-PID=`cat $PIDFILE 2>/dev/null`
-
-ircd_start() {
-  echo "Starting elemental-ircd."
-  su - $USER -c "/usr/bin/ircd -pidfile $PIDFILE"
-}
-
-ircd_stop() {
-  echo -n "Stopping elemental-ircd..."
-  kill -TERM $PID 2>/dev/null
-  echo " done."
-}
-
-ircd_reload() {
-	echo -n "Sending signal to elemental-ircd to reload its configuration..."
-	if kill -CHLD $PID 2>/dev/null; then
-		kill -HUP $PID
-		echo " done."
-	else
-		echo "ircd doesn't seem to be running."
-		exit 1
-	fi
-}
-
-ircd_restart() {
-  ircd_stop
-  sleep 1
-  ircd_start
-}
-
-case "$1" in
-  start)
-    ircd_start
-    ;;
-  stop)
-    ircd_stop
-    ;;
-  restart)
-    ircd_restart
-    ;;
-  reload)
-	ircd_reload
-	;;
-  *)
-    echo "Usage: $0 {start|stop|restart|reload}"
-    exit 1
-esac
diff --git a/network/elemental-ircd/slack-desc b/network/elemental-ircd/slack-desc
deleted file mode 100644
index 7e6875da28..0000000000
--- a/network/elemental-ircd/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------------------------------------------------------|
-elemental-ircd: elemental-ircd (high performance irc daemon)
-elemental-ircd:
-elemental-ircd: Elemental-IRCd is a high performance, lightweight, and scalable IRC
-elemental-ircd: daemon. It is a fork of the now-defunct ShadowIRCD and seeks to
-elemental-ircd: continue in the direction ShadowIRCD was headed.
-elemental-ircd:
-elemental-ircd: https://github.com/Elemental-IRCd/elemental-ircd
-elemental-ircd:
-elemental-ircd:
-elemental-ircd:
-elemental-ircd:
diff --git a/network/elemental-ircd/slackware.conf b/network/elemental-ircd/slackware.conf
deleted file mode 100644
index fc9d8401ba..0000000000
--- a/network/elemental-ircd/slackware.conf
+++ /dev/null
@@ -1,609 +0,0 @@
-/* /etc/elemental-ircd/slackware.conf - brief example configuration file
- *
- * Copyright (C) 2000-2002 Hybrid Development Team
- * Copyright (C) 2002-2005 ircd-ratbox development team
- * Copyright (C) 2005-2006 charybdis development team
- * Copyright (C) 2014      Elemental-IRCd development team
- *
- * $Id: example.conf 3582 2007-11-17 21:55:48Z jilles $
- *
- * See reference.conf for more information.
- */
-
-/* Extensions */
-#loadmodule "extensions/chm_adminonly.so";
-loadmodule "extensions/chm_operonly.so";
-#loadmodule "extensions/chm_sslonly.so";
-#loadmodule "extensions/chm_operonly_compat.so";
-#loadmodule "extensions/chm_quietunreg_compat.so";
-#loadmodule "extensions/chm_sslonly_compat.so";
-#loadmodule "extensions/createauthonly.so";
-loadmodule "extensions/extb_account.so";
-loadmodule "extensions/extb_canjoin.so";
-loadmodule "extensions/extb_channel.so";
-loadmodule "extensions/extb_extgecos.so";
-loadmodule "extensions/extb_oper.so";
-loadmodule "extensions/extb_realname.so";
-#loadmodule "extensions/extb_server.so";
-#loadmodule "extensions/extb_ssl.so";
-#loadmodule "extensions/hurt.so";
-loadmodule "extensions/ip_cloaking.so";
-#loadmodule "extensions/m_findforwards.so";
-loadmodule "extensions/m_identify.so";
-loadmodule "extensions/m_mkpasswd.so";
-loadmodule "extensions/m_webirc.so";
-#loadmodule "extensions/m_cycle.so";
-#loadmodule "extensions/m_oaccept.so";
-#loadmodule "extensions/m_opme.so";
-#loadmodule "extensions/m_ojoin.so";
-#loadmodule "extensions/m_omode.so";
-#loadmodule "extensions/m_olist.so";
-#loadmodule "extensions/m_okick.so";
-#loadmodule "extensions/m_force.so";
-#loadmodule "extensions/m_roleplay.so";
-#loadmodule "extensions/no_oper_invis.so";
-loadmodule "extensions/sno_farconnect.so";
-loadmodule "extensions/sno_globalkline.so";
-loadmodule "extensions/sno_globaloper.so";
-#loadmodule "extensions/sno_whois.so";
-
-serverinfo {
-	name = "hostname.domain.tld";
-	sid = "42X";
-	description = "elemental-ircd test server";
-	network_name = "ShadowNET";
-	network_desc = "Your IRC network.";
-	helpchan = "#help";
-	helpurl = "http://www.mynet.net/help";
-	hub = yes;
-
-	/* On multi-homed hosts you may need the following. These define
-	 * the addresses we connect from to other servers. */
-	/* for IPv4 */
-	#vhost = "192.169.0.1";
-	/* for IPv6 */
-	#vhost6 = "3ffe:80e8:546::2";
-
-	/* ssl_private_key: our ssl private key */
-	ssl_private_key = "etc/ssl.key";
-
-	/* ssl_cert: certificate for our ssl server */
-	ssl_cert = "etc/ssl.cert";
-
-	/* ssl_dh_params: DH parameters, generate with openssl dhparam -out dh.pem 1024 */
-	ssl_dh_params = "etc/dh.pem";
-
-	/* ssld_count: number of ssld processes you want to start, if you
-	 * have a really busy server, using N-1 where N is the number of
-	 * cpu/cpu cores you have might be useful. A number greater than one
-	 * can also be useful in case of bugs in ssld and because ssld needs
-	 * two file descriptors per SSL connection.
-	 */
-	ssld_count = 1;
-
-	/* default max clients: the default maximum number of clients
-	 * allowed to connect.  This can be changed once ircd has started by
-	 * issuing:
-	 *   /quote set maxclients <limit>
-	 */
-	default_max_clients = 1024;
-};
-
-admin {
-	name = "Lazy admin (lazya)";
-	description = "ShadowNET client server";
-	email = "nobody@127.0.0.1";
-};
-
-log {
-	fname_userlog = "/var/log/elemental-ircd/userlog";
-	#fname_fuserlog = "/var/log/elemental-ircd/fuserlog";
-	fname_operlog = "/var/log/elemental-ircd/operlog";
-	#fname_foperlog = "/var/log/elemental-ircd/foperlog";
-	fname_serverlog = "/var/log/elemental-ircd/serverlog";
-	#fname_klinelog = "/var/log/elemental-ircd/klinelog";
-	fname_killlog = "/var/log/elemental-ircd/killlog";
-	fname_operspylog = "/var/log/elemental-ircd/operspylog";
-	#fname_ioerrorlog = "/var/log/elemental-ircd/ioerror";
-};
-
-/* class {} blocks MUST be specified before anything that uses them.  That
- * means they must be defined before auth {} and before connect {}.
- */
-class "users" {
-	ping_time = 2 minutes;
-	number_per_ident = 10;
-	number_per_ip = 10;
-	number_per_ip_global = 50;
-	cidr_ipv4_bitlen = 24;
-	cidr_ipv6_bitlen = 64;
-	number_per_cidr = 200;
-	max_number = 3000;
-	sendq = 400 kbytes;
-};
-
-class "opers" {
-	ping_time = 5 minutes;
-	number_per_ip = 10;
-	max_number = 1000;
-	sendq = 1 megabyte;
-};
-
-class "server" {
-	ping_time = 5 minutes;
-	connectfreq = 5 minutes;
-	max_number = 1;
-	sendq = 4 megabytes;
-};
-
-listen {
-	/* defer_accept: wait for clients to send IRC handshake data before
-	 * accepting them.  if you intend to use software which depends on the
-	 * server replying first, such as BOPM, you should disable this feature.
-	 * otherwise, you probably want to leave it on. Disabling this will not
-	 * update on a rehash.
-	 */
-	defer_accept = yes;
-
-	/* If you want to listen on a specific IP only, specify host.
-	 * host definitions apply only to the following port line.
-	 */
-	#host = "192.169.0.1";
-	port = 5000, 6665 .. 6669;
-	sslport = 6697;
-
-	/* Listen on IPv6 (if you used host= above). */
-	#host = "3ffe:1234:a:b:c::d";
-	#port = 5000, 6665 .. 6669;
-	#sslport = 9999;
-};
-
-/* auth {}: allow users to connect to the ircd (OLD I:)
- * auth {} blocks MUST be specified in order of precedence.  The first one
- * that matches a user will be used.  So place spoofs first, then specials,
- * then general access, then restricted.
- */
-auth {
-	/* user: the user@host allowed to connect.  Multiple IPv4/IPv6 user
-	 * lines are permitted per auth block.  This is matched against the
-	 * hostname and IP address (using :: shortening for IPv6 and
-	 * prepending a 0 if it starts with a colon) and can also use CIDR
-	 * masks.
-	 */
-	user = "*@172.16.0.0/12";
-	user = "*test@123D:B567:*";
-
-	/* auth_user: The username (authenticated via SASL or PASS) allowed
-	 * to connect. You are able to put multiple auth_user lines. If people
-	 * are authenticating via SASL in this way, it is recommended to comment
-	 * out the password option below. You will also *NEED* to specify a user
-	 * line above auth_user, this can safely be "*@*", however.
-	 */
-	auth_user = "jilles";
-	auth_user = "jdhore";
-
-	/* password: an optional password that is required to use this block.
-	 * By default this is not encrypted, specify the flag "encrypted" in
-	 * flags = ...; below if it is.
-	 */
-	password = "letmein";
-
-	/* spoof: fake the users user@host to be be this.  You may either
-	 * specify a host or a user@host to spoof to.  This is free-form,
-	 * just do everyone a favour and dont abuse it. (OLD I: = flag)
-	 */
-        spoof = "I.still.hate.packets";
-
-	/* autojoin: Channel (or channels, comma-seperated) to join users
-	 * in this auth block to on connect. Note that this won't join
-	 * the user through any bans or otherwise restrictive chmodes.
-	 */
-	autojoin = "#shadowircd,#test";
-
-	/* Possible flags in auth:
-	 *
-	 * encrypted                  | password is encrypted with mkpasswd
-	 * spoof_notice               | give a notice when spoofing hosts
-	 * exceed_limit (old > flag)  | allow user to exceed class user limits
-	 * kline_exempt (old ^ flag)  | exempt this user from k/g/xlines&dnsbls
-	 * dnsbl_exempt		      | exempt this user from dnsbls
-	 * spambot_exempt	      | exempt this user from spambot checks
-	 * shide_exempt		      | exempt this user from serverhiding
-	 * jupe_exempt                | exempt this user from generating
-	 *                              warnings joining juped channels
-	 * resv_exempt		      | exempt this user from resvs
-	 * flood_exempt               | exempt this user from flood limits
-	 *                                     USE WITH CAUTION.
-	 * no_tilde     (old - flag)  | don't prefix ~ to username if no ident
-	 * need_ident   (old + flag)  | require ident for user in this class
-	 * need_ssl                   | require SSL/TLS for user in this class
-	 * need_sasl                  | require SASL id for user in this class
-	 */
-	flags = kline_exempt, exceed_limit;
-
-	/* class: the class the user is placed in */
-	class = "opers";
-};
-
-/* Example WEBIRC authblock */
-auth {
-	/* user: webirc@IP.OF.YOUR.WEBIRC . the webirc@ part is required */
-	user = "webirc@192.168.1.1";
-
-	/* password: password the webirc client sends in the WEBIRC command.
-	 * You can use a encrypted password here (see above auth block).
-	 */
-	password = "<password>";
-
-	/* spoof: This is required to keep it what it is currently if you
-	 * want the webirc client to show the users' real host as their
-	 * host on IRC.
-	 */
-	spoof = "webirc.";
-	class = "users";
-};
-
-auth {
-	user = "*@*";
-	class = "users";
-	flags = no_tilde;
-};
-
-/* privset {} blocks MUST be specified before anything that uses them.  That
- * means they must be defined before operator {}.
- */
-privset "local_op" {
-	privs = oper:local_kill, oper:operwall;
-};
-
-privset "server_bot" {
-	extends = "local_op";
-	privs = oper:kline, oper:remoteban, snomask:nick_changes;
-};
-
-privset "global_op" {
-	extends = "local_op";
-	privs = oper:global_kill, oper:routing, oper:kline, oper:unkline, oper:xline,
-		oper:resv, oper:mass_notice, oper:remoteban;
-};
-
-privset "admin" {
-	extends = "global_op";
-	privs = oper:admin, oper:die, oper:rehash, oper:spy, oper:override;
-};
-
-operator "god" {
-	/* name: the name of the oper must go above */
-
-	/* user: the user@host required for this operator.  CIDR *is*
-	 * supported now. auth{} spoofs work here, other spoofs do not.
- 	 * multiple user="" lines are supported.
-	 */
-	user = "*god@127.0.0.1";
-
-	/* password: the password required to oper.  Unless ~encrypted is
-	 * contained in flags = ...; this will need to be encrypted using
-	 * mkpasswd, MD5 is supported
-	 */
-	password = "etcnjl8juSU1E";
-
-	/* rsa key: the public key for this oper when using Challenge.
-	 * A password should not be defined when this is used, see
-	 * doc/challenge.txt for more information.
-	 */
-	#rsa_public_key_file = "/usr/local/ircd/etc/oper.pub";
-
-	/* umodes: the specific umodes this oper gets when they oper.
-	 * If this is specified an oper will not be given oper_umodes
-	 * These are described above oper_only_umodes in general {};
-	 */
-	#umodes = locops, servnotice, operwall, wallop;
-
-	/* fingerprint: if specified, the oper's client certificate
-	 * fingerprint will be checked against the specified fingerprint
-	 * below.
-	 */
-	#fingerprint = "c77106576abf7f9f90cca0f63874a60f2e40a64b";
-
-	/* snomask: specific server notice mask on oper up.
-	 * If this is specified an oper will not be given oper_snomask.
-	 */
-	snomask = "+Zbfkrsuy";
-
-	/* vhost: defines the vhost that this oper will get on oper up.
-	 * this must be a valid hostmask. If this is specified the oper
-	 * will not be given default_operhost.
-	 */
-	vhost = "is.an.oper";
-
-	/* swhois: defines an additional line that will be displayed
-	 * whenever someone does /whois on the oper in question.
-	 */
-	swhois = "is wearing pants.";
-
-	/* operstring: defines a custom operstring for this oper,
-	 * which will be shown in whois instead of default_operstring
-	 * or default_adminstring.
-	 */
-	operstring = "is a lazy IRC Operator";
-
-	/* flags: misc options for the operator.  You may prefix an option
-	 * with ~ to disable it, e.g. ~encrypted.
-	 *
-	 * Default flags are encrypted.
-	 *
-	 * Available options:
-	 *
-	 * encrypted:    the password above is encrypted [DEFAULT]
-	 * need_ssl:     must be using SSL/TLS to oper up
-         */
-	flags = encrypted;
-
-	/* privset: privileges set to grant */
-	privset = "admin";
-};
-
-connect "irc.uplink.com" {
-	host = "192.168.0.1";
-	send_password = "password";
-	accept_password = "anotherpassword";
-	port = 6666;
-	hub_mask = "*";
-	class = "server";
-	flags = compressed, topicburst;
-
-	#fingerprint = "c77106576abf7f9f90cca0f63874a60f2e40a64b";
-
-	/* If the connection is IPv6, uncomment below.
-	 * Use 0::1, not ::1, for IPv6 localhost. */
-	#aftype = ipv6;
-};
-
-connect "ssl.uplink.com" {
-	host = "192.168.0.1";
-	send_password = "password";
-	accept_password = "anotherpassword";
-	port = 9999;
-	hub_mask = "*";
-	class = "server";
-	flags = ssl, topicburst;
-};
-
-service {
-	name = "services.int";
-};
-
-cluster {
-	name = "*";
-	flags = kline, tkline, unkline, xline, txline, unxline, resv, tresv, unresv;
-};
-
-shared {
-	oper = "*@*", "*";
-	flags = all;
-};
-
-/* exempt {}: IPs that are exempt from Dlines and rejectcache. (OLD d:) */
-exempt {
-	ip = "127.0.0.1";
-};
-
-channel {
-	#disabledmodes = "ME";
-	autochanmodes = "nt";
-	admin_on_channel_create = no;
-	exemptchanops = "NT";
-	use_halfop = yes;
-	use_admin = yes;
-	use_owner = yes;
-	use_knock = yes;
-	use_local_channels = yes;
-	knock_delay = 5 minutes;
-	knock_delay_channel = 1 minute;
-	max_chans_per_user = 15;
-	max_bans = 100;
-	max_bans_large = 500;
-	default_split_user_count = 0;
-	default_split_server_count = 0;
-	no_create_on_split = no;
-	no_join_on_split = no;
-	burst_topicwho = yes;
-	kick_on_split_riding = no;
-	only_ascii_channels = no;
-	cycle_host_change = yes;
-	host_in_topic = yes;
-	resv_forcepart = yes;
-	channel_target_change = yes;
-};
-
-serverhide {
-	flatten_links = yes;
-	links_delay = 5 minutes;
-        hidden = no;
-	disable_hidden = no;
-};
-
-/* These are the blacklist settings.
- * You can have multiple combinations of host and rejection reasons.
- * They are used in pairs of one host/rejection reason.
- *
- * These settings should be adequate for most networks, and are (presently)
- * required for use on ShadowNet.
- *
- * Word to the wise: Do not use blacklists like SPEWS for blocking IRC
- * connections.
- *
- * As of charybdis 2.1.3, you can do some keyword substitution on the rejection
- * reason. The available keyword substitutions are:
- *
- *   ${ip}           - the user's IP
- *   ${host}         - the user's canonical hostname
- *   ${dnsbl-host}   - the dnsbl hostname the lookup was done against
- *   ${nick}         - the user's nickname
- *   ${network-name} - the name of the network
- *
- */
-blacklist {
-	host = "rbl.efnetrbl.org";
-	reject_reason = "${nick}, your IP (${ip}) is listed in EFnet's RBL. For assistance, see http://efnetrbl.org/?i=${ip}";
-
-	host = "dnsbl.dronebl.org";
-	reject_reason = "${nick}, your IP (${ip}) is listed in DroneBL. For assistance, see http://dronebl.org/lookup_branded.do?ip=${ip}&network=${network-name}";
-
-	host = "torexit.dan.me.uk";
-	reject_reason = "${nick}, your IP (${ip}) is listed as a TOR exit node. In order to protect ${network-name} from TOR-based abuse, we are not allowing TOR exit nodes to connect to our network.";
-};
-
-alias "NickServ" {
-	target = "NickServ";
-};
-
-alias "ChanServ" {
-	target = "ChanServ";
-};
-
-alias "OperServ" {
-	target = "OperServ";
-};
-
-alias "MemoServ" {
-	target = "MemoServ";
-};
-
-alias "HostServ" {
-	target = "HostServ";
-};
-
-alias "BotServ" {
-	target = "BotServ";
-};
-
-alias "InfoServ" {
-	target = "InfoServ";
-};
-
-alias "GroupServ" {
-	target = "GroupServ";
-};
-
-alias "NS" {
-	target = "NickServ";
-};
-
-alias "CS" {
-	target = "ChanServ";
-};
-
-alias "OS" {
-	target = "OperServ";
-};
-
-alias "MS" {
-	target = "MemoServ";
-};
-
-alias "HS" {
-	target = "HostServ";
-};
-
-alias "BS" {
-	target = "BotServ";
-};
-
-alias "IS" {
-	target = "InfoServ";
-};
-
-alias "GS" {
-	target = "GroupServ";
-};
-
-general {
-	hide_error_messages = opers;
-	hide_spoof_ips = yes;
-
-	/*
-	 * default umodes: umodes to set upon connection
-	 * If you have enabled the ip_cloaking extension, and you wish for
-	 * incoming clients to be cloaked upon connection, +x must be in
-	 * the umode string below.
-	 */
-	default_umodes = "+ix";
-
-	default_operstring = "is an IRC Operator";
-	default_adminstring = "is a Server Administrator";
-	#default_operhost = "staff.testnet.net";
-	#static_quit = "I like turtles!";
-	servicestring = "is a Network Service";
-	disable_fake_channels = no;
-	hide_channel_below_users = 3;
-	tkline_expire_notices = no;
-	default_floodcount = 10;
-	failed_oper_notice = yes;
-	dots_in_ident=2;
-	min_nonwildcard = 4;
-	min_nonwildcard_simple = 3;
-	max_accept = 100;
-	max_monitor = 100;
-	anti_nick_flood = yes;
-	max_nick_time = 20 seconds;
-	max_nick_changes = 5;
-	anti_spam_exit_message_time = 5 minutes;
-	use_part_messages = yes;
-	ts_warn_delta = 30 seconds;
-	ts_max_delta = 5 minutes;
-	client_exit = yes;
-	collision_fnc = yes;
-	global_snotices = yes;
-	dline_with_reason = yes;
-	kline_delay = 0 seconds;
-	kline_with_reason = yes;
-	kline_reason = "K-Lined";
-	identify_service = "NickServ@services.int";
-	identify_command = "IDENTIFY";
-	non_redundant_klines = yes;
-	warn_no_nline = yes;
-	use_propagated_bans = yes;
-	stats_e_disabled = no;
-	stats_c_oper_only=no;
-	stats_h_oper_only=no;
-	stats_y_oper_only=no;
-	stats_o_oper_only=yes;
-	stats_P_oper_only=no;
-	stats_i_oper_only=masked;
-	stats_k_oper_only=masked;
-	map_oper_only = no;
-	operspy_admin_only = no;
-	operspy_dont_care_user_info = no;
-	secret_channels_in_whois = no;
-	caller_id_wait = 1 minute;
-	pace_wait_simple = 1 second;
-	pace_wait = 10 seconds;
-	short_motd = no;
-	ping_cookie = no;
-	connect_timeout = 30 seconds;
-	default_ident_timeout = 5;
-	disable_auth = no;
-	no_oper_flood = yes;
-	true_no_oper_flood = no;
-	max_targets = 4;
-	client_flood = 20;
-	use_whois_actually = no;
-	oper_only_umodes = operwall, locops, servnotice;
-	oper_umodes = locops, servnotice, operwall, wallop;
-	oper_snomask = "+s";
-	burst_away = yes;
-	nick_delay = 0 seconds; # 15 minutes if you want to enable this
-	reject_ban_time = 1 minute;
-	reject_after_count = 3;
-	reject_duration = 5 minutes;
-	throttle_duration = 60;
-	throttle_count = 4;
-	expire_override_time = 5 minutes;
-	away_interval = 30;
-};
-
-modules {
-	path = "/usr/lib@LIBDIRSUFFIX@/elemental-ircd/modules";
-	path = "/usr/lib@LIBDIRSUFFIX@/elemental-ircd/modules/autoload";
-};
diff --git a/network/elinks/README b/network/elinks/README
index 97574a8664..e40cc46f9e 100644
--- a/network/elinks/README
+++ b/network/elinks/README
@@ -1,10 +1,8 @@
-elinks (ELinks - Full-Featured Text WWW Browser)
-
-ELinks is an advanced and well-established feature-rich text mode web
-(HTTP/FTP/..) browser. ELinks can render both frames and tables, is
+Elinks is an advanced and well-established feature-rich text mode web
+(HTTP/FTP/..) browser. Elinks can render both frames and tables, is
 highly customizable, and can be extended via Lua or Guile scripts. It
-is very portable and runs on a variety of platforms. It also uses
-SpiderMonkey javascript support.
+is very portable and runs on a variety of platforms. It also has
+(very limited) JavaScript support via SpiderMonkey (js185).
 
 There are a number of options that can be used to add support for
 other protocols etc. To enable or disable an option use the following
@@ -14,8 +12,6 @@ MOUSE=no ./elinks.SlackBuild
 
 Several options can be combined together.
 
-OPTIONS
-
 Category       Description                         Default Value
 
 System:
@@ -55,12 +51,40 @@ DATA                                               yes
 FSP                                                no
 FTP                                                yes
 FINGER                                             no
-GOPHER                                             no
+GOPHER (use internal gopher code, see note below)  no
 NNTP                                               no
 SMB                                                no
 
 Note that Unicode combining characters is marked as experimental.
 
-Optional dependencies apart from scripting languages stated above:
+Contributed Patches:
+
+Thanks goes to B. Watson for the following two patches:
+
+No Suspend Patch
+
+Elinks sometimes has problems resuming if it has been suspended with ^Z.
+To apply a patch that disables ^Z, ^S and ^Q suspend/pause/resume keys
+so that they are available to bind in elinks:
+
+  NO_SUSPEND=yes
+
+No Connect Patch.
+
+Sometimes when quitting and another client is running on the same
+session-ring, the process will freeze and require killing manually.
+This patch solves that by making elinks use '-no-connect 1' by default.
+It won't be possible to open links in new windows with this, but using
+URI passing is a workaround.
+
+  NO_CONNECT=yes
+
+Auto-detected Dependencies:
+
+js185: SpiderMonkey (can be turned off in options).
+tre:   regexp support in searches.
 
-tre:  for regex search support
+Other included patches help make the internal gopher support usable.  By
+default elinks will hand gopher URLs to lynx if the GOPHER option isn't
+set.  Using the internal gopher client has the advantage of having
+combined http and gopher bookmarks, and a more uniform interface.
diff --git a/network/elinks/elinks.SlackBuild b/network/elinks/elinks.SlackBuild
index 48769d4771..b402bed806 100644
--- a/network/elinks/elinks.SlackBuild
+++ b/network/elinks/elinks.SlackBuild
@@ -1,7 +1,7 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for elinks
-# Copyright 2014 David Woodfall <dave@dawoodfall.net>
+# Copyright 2014 David Woodfall <dave@slackbuilds.org>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -21,10 +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=elinks
-VERSION=${VERSION:-git20131231}
-BUILD=${BUILD:-10}
+VERSION=${VERSION:-20170723_f86be65}
+COMMIT=${VERSION#*_}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -34,50 +38,62 @@ 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}
 
-# Added -fno-strict-aliasing -Wno-pointer-sign for a much more peaceful build
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-g0 -O0 -march=i486 -mtune=i686 -fno-strict-aliasing -Wno-pointer-sign"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i586" ]; then
-  SLKCFLAGS="-g0 -O0 -march=i586 -mtune=i686 -fno-strict-aliasing -Wno-pointer-sign"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-g0 -O0 -march=i686 -mtune=i686 -fno-strict-aliasing -Wno-pointer-sign"
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-g0 -O0 -fPIC -fno-strict-aliasing -Wno-pointer-sign"
-  SLKLDFLAGS="-m64"
+  SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
 else
-  SLKCFLAGS="-go -O0"
+  SLKCFLAGS="-O2"
   LIBDIRSUFFIX=""
 fi
 
+# A much more peaceful build
+SLKCFLAGS="$SLKCFLAGS -fno-strict-aliasing -Wno-pointer-sign"
+
 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 $PRGNAM-$COMMIT
+tar xvf $CWD/$COMMIT.tar.?z || 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 \
+  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
   -o -perm 511 \) -exec chmod 755 {} \; -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 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+# fix documentation generation on 15.0.
+# xmlto needs --skip-validation or it fails.
+sed -i 's/$(XMLTO) -o/$(XMLTO) --skip-validation -o/' doc/Makefile
 
-for patch in $CWD/patches/*
-do
+for patch in $CWD/patches/*; do
   patch --verbose -p1 < $patch
 done
 
+# patches for no suspend (^Z) and -no-connect by default
+# courtesy of B. Watson.
+[ "${NO_SUSPEND:-no}" = "yes" ] &&
+  patch --verbose -p1 -i $CWD/option-patches/0010-*
+[ "${NO_CONNECT:-no}" = "yes" ] &&
+  patch --verbose -p1 -i $CWD/option-patches/0020-*
+
 # System
 [ "${FASTMEM:-no}"    = "yes" ] && fastmem="--enable-fastmem"
 [ "${CGI:-no}"        = "yes" ] && cgi="--enable-cgi"
@@ -114,8 +130,11 @@ done
 [ "${NNTP:-no}"       = "yes" ] && nntp="--enable-nntp"
 [ "${SMB:-no}"        = "yes" ] && smb="--enable-smb"
 
-autoreconf
-CFLAGS="$SLKCFLAGS -L/usr/lib64" \
+# quiet some more warnings
+sed "s,^aclocal,& -Wnone," -i autogen.sh
+
+./autogen.sh
+CFLAGS="$SLKCFLAGS -L/usr/lib$LIBDIRSUFFIX" \
   ./configure \
   --prefix=/usr \
   --libdir=/usr/lib$LIBDIRSUFFIX \
@@ -124,6 +143,7 @@ CFLAGS="$SLKCFLAGS -L/usr/lib64" \
   --mandir=/usr/man \
   --infodir=/usr/info \
   --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --htmldir=/usr/doc/$PRGNAM-$VERSION/html \
   $fastmem \
   $cgi \
   $combining \
@@ -153,23 +173,26 @@ CFLAGS="$SLKCFLAGS -L/usr/lib64" \
   --build=$ARCH-slackware-linux
 
 make
+# html doesn't install so we copy it later
+make -C doc html
 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 --strip-unneeded $PKG/usr/bin/$PRGNAM
+gzip -9 $PKG/usr/man/man?/*.?
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+
 cp -a \
-  AUTHORS COPYING ChangeLog INSTALL NEWS README THANKS TODO doc/html doc/*txt \
-  contrib \
+  AUTHORS BUGS COPYING NEWS README SITES THANKS TODO ChangeLog contrib \
+  doc/*txt doc/manual.html-chunked \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
+# don't need these
+find $PKG \( -name ".gitignore" -o -name "manual.proc" \) -delete
+
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/network/elinks/elinks.info b/network/elinks/elinks.info
index d6e1a90a23..e543517b54 100644
--- a/network/elinks/elinks.info
+++ b/network/elinks/elinks.info
@@ -1,10 +1,10 @@
 PRGNAM="elinks"
-VERSION="git20131231"
-HOMEPAGE="http://elinks.or.cz"
-DOWNLOAD="http://www.unrealize.co.uk/source/elinks-git20131231.tar.xz"
-MD5SUM="3b3b57ac6b9bafe123d046f342272d17"
+VERSION="20170723_f86be65"
+HOMEPAGE="http://elinks.cz"
+DOWNLOAD="https://repo.or.cz/elinks.git/snapshot/f86be65.tar.gz"
+MD5SUM="660ae64c253f1e2014064dc1a3fbed80"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="David Woodfall"
-EMAIL="dave@dawoodfall.net"
+MAINTAINER="D Woodfall"
+EMAIL="dave@slackbuilds.org"
diff --git a/network/elinks/option-patches/0010-disable-suspend-pause.patch b/network/elinks/option-patches/0010-disable-suspend-pause.patch
new file mode 100644
index 0000000000..9a85ad5669
--- /dev/null
+++ b/network/elinks/option-patches/0010-disable-suspend-pause.patch
@@ -0,0 +1,19 @@
+diff -Naur elinks-git20131231/src/terminal/kbd.c elinks-git20131231.patched/src/terminal/kbd.c
+--- elinks-git20131231/src/terminal/kbd.c	2013-12-18 10:38:57.000000000 -0500
++++ elinks-git20131231.patched/src/terminal/kbd.c	2020-06-25 01:32:29.333043353 -0400
+@@ -263,6 +263,15 @@
+ 	t.c_lflag |= TOSTOP;
+ #endif
+ 	t.c_oflag |= OPOST;
++
++	/* 20200625 bkw: patched code disables suspend (normally ^Z),
++		pause (normally ^S) and resume (normally ^Q). This allows
++		us to use those keys for normal keybinds. If we're running
++		elinks in tmux or screen, or in X with multiple terminals,
++		or the Linux console (multiple consoles), we don't really
++		need ^Z anyway. */
++	t.c_cc[VSUSP] = t.c_cc[VSTOP] = t.c_cc[VSTART] = vdisable;
++
+ 	if (tcsetattr(itrm->in.ctl, TCSANOW, &t)) return -1;
+ 
+ 	return 0;
diff --git a/network/elinks/option-patches/0020-no-connect-by-default.patch b/network/elinks/option-patches/0020-no-connect-by-default.patch
new file mode 100644
index 0000000000..e36c9aa006
--- /dev/null
+++ b/network/elinks/option-patches/0020-no-connect-by-default.patch
@@ -0,0 +1,62 @@
+diff -Naur elinks-git20131231/doc/man/man1/elinks.1.in elinks-git20131231.patched/doc/man/man1/elinks.1.in
+--- elinks-git20131231/doc/man/man1/elinks.1.in	2013-12-18 10:38:57.000000000 -0500
++++ elinks-git20131231.patched/doc/man/man1/elinks.1.in	2020-06-25 03:02:54.523412259 -0400
+@@ -141,12 +141,13 @@
+ Look up specified host and print all DNS resolved IP addresses\&.
+ .RE
+ .PP
+-\fB\-no\-connect\fR \fI[0|1]\fR (default: 0)
++\fB\-no\-connect\fR \fI[0|1]\fR (default: 1)
+ .RS 4
+ Run
+ ELinks
+-as a separate instance instead of connecting to an existing instance\&. Note that normally no runtime state files (bookmarks, history, etc\&.) are written to the disk when this option is used\&. See also
+-\-touch\-files\&.
++as a separate instance instead of connecting to an existing instance\&. Enabled
++by default in this build; use \fB\-no\-connect 0\fR to connect to an existing
++instance\&.
+ .RE
+ .PP
+ \fB\-no\-home\fR \fI[0|1]\fR (default: 0)
+@@ -238,13 +239,13 @@
+ Print given URLs in source form to stdout\&.
+ .RE
+ .PP
+-\fB\-touch\-files\fR \fI[0|1]\fR (default: 0)
++\fB\-touch\-files\fR \fI[0|1]\fR (default: 1)
+ .RS 4
+ When enabled, runtime state files (bookmarks, history, etc\&.) are written to disk, even when
+ \-no\-connect
+ or
+ \-session\-ring
+-is used\&. The option has no effect if not used in conjunction with any of these options\&.
++is used\&. The option has no effect if not used in conjunction with any of these options\&. This option is enabled by default; use \fB\-touch\-files 0\fR to disable\&.
+ .RE
+ .PP
+ \fB\-verbose\fR \fI<num>\fR (default: 1)
+diff -Naur elinks-git20131231/src/config/cmdline.c elinks-git20131231.patched/src/config/cmdline.c
+--- elinks-git20131231/src/config/cmdline.c	2013-12-18 10:38:57.000000000 -0500
++++ elinks-git20131231.patched/src/config/cmdline.c	2020-06-25 02:58:31.595442844 -0400
+@@ -848,11 +848,9 @@
+ 		"addresses.")),
+ 
+ 	INIT_OPT_BOOL("", N_("Run as separate instance"),
+-		"no-connect", 0, 0,
++		"no-connect", 0, 1,
+ 		N_("Run ELinks as a separate instance instead of connecting "
+-		"to an existing instance. Note that normally no runtime state "
+-		"files (bookmarks, history, etc.) are written to the disk "
+-		"when this option is used. See also -touch-files.")),
++		"to an existing instance. Enabled by default in this build.")),
+ 
+ 	INIT_OPT_BOOL("", N_("Disable use of files in ~/.elinks"),
+ 		"no-home", 0, 0,
+@@ -921,7 +919,7 @@
+ 	INIT_OPT_COMMAND("", NULL, "stdin", OPT_HIDDEN, redir_cmd, NULL),
+ 
+ 	INIT_OPT_BOOL("", N_("Touch files in ~/.elinks when running with -no-connect/-session-ring"),
+-		"touch-files", 0, 0,
++		"touch-files", 0, 1,
+ 		N_("When enabled, runtime state files (bookmarks, history, "
+ 		"etc.) are written to disk, even when -no-connect or "
+ 		"-session-ring is used. The option has no effect if not used "
diff --git a/network/elinks/patches/0001-gopher_html_links.patch b/network/elinks/patches/0001-gopher_html_links.patch
deleted file mode 100644
index c9ab73856d..0000000000
--- a/network/elinks/patches/0001-gopher_html_links.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-################################################################
-# There is a problem that html links that contain URL:htpp://...
-# aren't being followed. This fixes that issue and also chtml.
-# Normally those kind of links go to a redirect page that the
-# server generates, which then sends you on your way.
-# dave@dawoodfall.net
-###############################################################
-diff -Naur a/src/protocol/gopher/gopher.c b/src/protocol/gopher/gopher.c
---- a/src/protocol/gopher/gopher.c	2013-12-18 15:38:57.000000000 +0000
-+++ b/src/protocol/gopher/gopher.c	2017-11-15 23:10:19.758394411 +0000
-@@ -277,6 +277,10 @@
- 	struct string command;
- 	enum gopher_entity entity = DEFAULT_GOPHER_ENTITY;
- 	unsigned char *selector = conn->uri->data;
-+	unsigned char *URI = "hURI%3";
-+	unsigned char *URL = "hURL%3";
-+	unsigned char *CURI = "HURI%3";
-+	unsigned char *CURL = "HURL%3";
- 	int selectorlen = conn->uri->datalen;
- 	struct gopher_entity_info *entity_info;
- 	size_t size;
-@@ -288,6 +292,18 @@
- 		selectorlen--;
- 	}
- 
-+	if(strstr(selector, URL) != NULL || strstr(selector, URI) != NULL) {
-+		entity = GOPHER_HTML;
-+		*selector++;
-+		selectorlen--;
-+	}
-+
-+	if(strstr(selector, CURL) != NULL || strstr(selector, CURI) != NULL) {
-+		entity = GOPHER_CHTML;
-+		*selector++;
-+		selectorlen--;
-+	}
-+
- 	/* This is probably a hack. It serves as a work around when no entity is
- 	 * available in the Gopher URI. Instead of segfaulting later the content
- 	 * will be served as application/octet-stream. However, it could
diff --git a/network/elinks/patches/0002-gopher_index_queries.patch b/network/elinks/patches/0002-gopher_index_queries.patch
deleted file mode 100644
index ab970f60f7..0000000000
--- a/network/elinks/patches/0002-gopher_index_queries.patch
+++ /dev/null
@@ -1,120 +0,0 @@
-#######################################################################
-# elinks by default generates its own search query form when it sees
-# a type 7 index entity. The problem is that it didn't read the
-# served results page and instead generated another search page after
-# you had entered the first. This patch fixes that and in my tests it
-# seems to work so far.
-# dave@dawoodfall.net
-#######################################################################
-diff -Naur a/src/protocol/gopher/gopher.c b/src/protocol/gopher/gopher.c
---- a/src/protocol/gopher/gopher.c	2017-11-24 19:12:52.495714437 +0000
-+++ b/src/protocol/gopher/gopher.c	2017-11-30 12:56:38.872336516 +0000
-@@ -43,6 +43,34 @@
- #include "util/memory.h"
- #include "util/string.h"
- 
-+#ifdef HAVE_FCNTL_H
-+#include <fcntl.h> /* OS/2 needs this after sys/types.h */
-+#endif
-+
-+/* To enable logging for debugging purposes. */
-+#if 0
-+
-+#define LOGFILE "/tmp/log"
-+
-+static void
-+debug_log(unsigned char *data,  int NL)
-+{
-+	int fd = open(LOGFILE, O_WRONLY | O_APPEND | O_CREAT, 0622);
-+
-+	if (fd == -1) return;
-+
-+	set_bin(fd);
-+	write(fd, data, strlen(data));
-+    if (NL)
-+        write(fd, "\n", 1);
-+	close(fd);
-+}
-+#undef LOGFILE
-+
-+#else
-+#define debug_log(data, len)
-+#endif
-+
- struct module gopher_protocol_module = struct_module(
- 	/* name: */		N_("Gopher"),
- 	/* options: */		NULL,
-@@ -219,23 +247,31 @@
- 		if (query) selectorlen -= 1;
- 		query = NULL;
- 		querylen = 0;
--	} else {
--		query += 1;
-+	} else if (entity == GOPHER_INDEX) {
-+        /* fix query size to not include the seach= part */
-+		query += 8;
- 		querylen = selector + selectorlen - query;
- 		/* Exclude '?' */
--		selectorlen -= querylen + 1;
-+        /* fix selector length to fit with query */
-+		selectorlen -= querylen + 8;
- 		if (querylen >= 7 && !c_strncasecmp(query, "search=", 7)) {
- 			query	 += 7;
- 			querylen -= 7;
- 		}
-+		debug_log("selector:", 1);
-+		debug_log(selector, 1);
-+		debug_log("query:", 1);
-+		debug_log(query, 1);
- 	}
- 
- 	switch (entity) {
- 	case GOPHER_INDEX:
- 		/* No search required? */
-+        /* Don't display the form page */
- 		if (!query) {
- 			done_string(command);
--			return init_gopher_index_cache_entry(conn);
-+			add_uri_decoded(command, selector, selectorlen, 0);
-+			break;
- 		}
- 
- 		add_uri_decoded(command, selector, selectorlen, 0);
-@@ -343,6 +379,10 @@
- 	gopher->entity = entity_info;
- 	gopher->commandlen = command.length;
- 
-+debug_log("439 gopher->entity:", 1);
-+debug_log(gopher->entity, 1);
-+debug_log("437 command.source:", 1);
-+debug_log(command.source, 1);
- 	memcpy(gopher->command, command.source, command.length);
- 	done_string(&command);
- 
-@@ -377,7 +417,7 @@
- 		"<td>            </td>"
- 		"<td>%s:</td>"
- 		"<td><input maxlength=\"256\" name=\"search\" value=\"\"></td>"
--		"<td><input type=submit value=\"Search\"></td>"
-+		"<td><input type=submit value=\"Submit\"></td>"
- 		"</table>"
- 		"</form>",
- 		addr, text);
-@@ -726,7 +766,8 @@
- 	/* Now read the data from the socket */
- 	switch (gopher->entity->type) {
- 	case GOPHER_DIRECTORY:
--	case GOPHER_INDEX:
-+/* Don't do directory list for cgi output (7)
-+	case GOPHER_INDEX: */
- 		state = read_gopher_directory_data(conn, rb);
- 		break;
- 
-@@ -738,6 +779,7 @@
- 		state = connection_state(S_GOPHER_CSO_ERROR);
- 		break;
- 
-+	case GOPHER_INDEX:
- 	case GOPHER_SOUND:
- 	case GOPHER_PLUS_SOUND:
- 	case GOPHER_PLUS_MOVIE:
diff --git a/network/elinks/patches/0003-gopher_directory_links.patch b/network/elinks/patches/0003-gopher_directory_links.patch
deleted file mode 100644
index dc80ef3728..0000000000
--- a/network/elinks/patches/0003-gopher_directory_links.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-#######################################################################
-# elinks does not follow links to directories on other servers
-# properly. This adds a '/' before the '1' at the start of a link and 
-# removes any trailing 1.
-# dave@dawoodfall.net
-#######################################################################
-diff -Naur a/src/protocol/gopher/gopher.c b/src/protocol/gopher/gopher.c
---- a/src/protocol/gopher/gopher.c	2017-12-17 01:54:27.941645180 +0000
-+++ b/src/protocol/gopher/gopher.c	2017-12-17 21:52:05.072454433 +0000
-@@ -317,6 +317,9 @@
- 	unsigned char *URL = "hURL%3";
- 	unsigned char *CURI = "HURI%3";
- 	unsigned char *CURL = "HURL%3";
-+	unsigned char *DIR = "1";
-+	unsigned char *SLASHDIR = "/1";
-+	unsigned char *SLASHPOS;
- 	int selectorlen = conn->uri->datalen;
- 	struct gopher_entity_info *entity_info;
- 	size_t size;
-@@ -354,6 +357,26 @@
- 		selectorlen++;
- 	}
- 
-+	if (entity_info->type == '1')
-+	{
-+		if (strstr(selector, DIR) == selector)
-+		{
-+			*selector++;
-+			selectorlen--;
-+		}
-+		else
-+		{
-+			SLASHPOS = strstr(selector, SLASHDIR);
-+			if (SLASHPOS != NULL)
-+			{
-+				if (strlen(SLASHPOS) == 2)
-+				{
-+					selectorlen--;
-+				}
-+			}
-+		}
-+	}
-+
- 	state = add_gopher_command(conn, &command, entity, selector, selectorlen);
- 	if (!is_in_state(state, S_CONN))
- 		return state;
-@@ -379,10 +402,10 @@
- 	gopher->entity = entity_info;
- 	gopher->commandlen = command.length;
- 
--debug_log("439 gopher->entity:", 1);
--debug_log(gopher->entity, 1);
--debug_log("437 command.source:", 1);
--debug_log(command.source, 1);
-+	debug_log("439 gopher->entity: ", 0);
-+	debug_log(gopher->entity, 1);
-+	debug_log("437 command.source: ", 0);
-+	debug_log(command.source, 1);
- 	memcpy(gopher->command, command.source, command.length);
- 	done_string(&command);
- 
diff --git a/network/elinks/patches/0004-ssl_cert_verify.patch b/network/elinks/patches/0004-ssl_cert_verify.patch
deleted file mode 100644
index 4629da564a..0000000000
--- a/network/elinks/patches/0004-ssl_cert_verify.patch
+++ /dev/null
@@ -1,161 +0,0 @@
-##############################################################################
-# elinks does not verify ssl host names with openssl
-# This is a modifed version of the patch here that fixes that issue:
-# http://lists.linuxfromscratch.org/pipermail/elinks-dev/2015-June/002099.html
-# This patch turns on verification by default, and differentiates
-# between host verification fail and normal SSL errors.
-# dave@dawoodfall.net
-##############################################################################
---- a/configure.in	2017-12-21 15:58:12.470247050 +0000
-+++ b/configure.in	2017-12-21 16:10:27.406938487 +0000
-@@ -1132,6 +1132,9 @@
- fi
- 
- AC_MSG_RESULT($cf_result)
-+if test "$cf_result" = yes; then
-+	AC_CHECK_FUNCS(X509_VERIFY_PARAM_set1_host)
-+fi
- 
- # ---- GNU TLS
- 
-diff -Naur a/src/network/ssl/socket.c b/src/network/ssl/socket.c
---- a/src/network/ssl/socket.c	2017-12-21 15:58:12.553249389 +0000
-+++ b/src/network/ssl/socket.c	2017-12-21 16:11:47.532190591 +0000
-@@ -7,6 +7,9 @@
- #ifdef CONFIG_OPENSSL
- #include <openssl/ssl.h>
- #include <openssl/x509v3.h>
-+#ifdef HAVE_X509_VERIFY_PARAM_SET1_HOST
-+#include <openssl/x509_vfy.h>
-+#endif
- #define USE_OPENSSL
- #elif defined(CONFIG_NSS_COMPAT_OSSL)
- #include <nss_compat_ossl/nss_compat_ossl.h>
-@@ -168,6 +171,30 @@
- 
- #ifdef USE_OPENSSL
- 
-+#ifdef HAVE_X509_VERIFY_PARAM_SET1_HOST
-+/* activate the OpenSSL-provided host name check */
-+static int
-+ossl_set_hostname(void *ssl, unsigned char *server_name)
-+{
-+	int ret = -1;
-+
-+	X509_VERIFY_PARAM *vpm = X509_VERIFY_PARAM_new();
-+	if (vpm) {
-+		if (X509_VERIFY_PARAM_set1_host(vpm, (char *) server_name, 0)
-+				&& SSL_set1_param(ssl, vpm))
-+		{
-+			/* successfully activated the OpenSSL host name check */
-+			ret = 0;
-+		}
-+
-+		X509_VERIFY_PARAM_free(vpm);
-+	}
-+
-+	return ret;
-+}
-+
-+#else /* HAVE_X509_VERIFY_PARAM_SET1_HOST */
-+
- /** Checks whether the host component of a URI matches a host name in
-  * the server certificate.
-  *
-@@ -360,6 +387,7 @@
- 	mem_free(host_in_uri);
- 	return matched;
- }
-+#endif	/* HAVE_X509_VERIFY_PARAM_SET1_HOST */
- 
- #endif	/* USE_OPENSSL */
- 
-@@ -389,7 +417,10 @@
- 
- 		default:
- 			socket->no_tls = !socket->no_tls;
--			socket->ops->retry(socket, connection_state(S_SSL_ERROR));
-+			if (SSL_VERIFY_FAIL_IF_NO_PEER_CERT != NULL)
-+				socket->ops->retry(socket, connection_state(S_SSL_CERTFAIL));
-+			else
-+				socket->ops->retry(socket, connection_state(S_SSL_ERROR));
- 	}
- }
- 
-@@ -400,6 +431,9 @@
- 	int ret;
- 	unsigned char *server_name;
- 	struct connection *conn = socket->conn;
-+#ifdef USE_OPENSSL
-+	int (*verify_callback_ptr)(int, X509_STORE_CTX *);
-+#endif	/* USE_OPENSSL */
- 
- 	/* TODO: Recode server_name to UTF-8.  */
- 	server_name = get_uri_string(conn->proxied_uri, URI_HOST);
-@@ -418,6 +452,23 @@
- 		return -1;
- 	}
- 
-+#ifdef USE_OPENSSL
-+#ifdef HAVE_X509_VERIFY_PARAM_SET1_HOST
-+	/* activate the OpenSSL-provided host name check */
-+	if (ossl_set_hostname(socket->ssl, server_name)) {
-+		mem_free_if(server_name);
-+		socket->ops->done(socket, connection_state(S_SSL_ERROR));
-+		return -1;
-+	}
-+
-+	/* verify_callback() is not needed with X509_VERIFY_PARAM_set1_host() */
-+	verify_callback_ptr = NULL;
-+#else
-+	/* use our own callback implementing the host name check */
-+	verify_callback_ptr = verify_callback;
-+#endif
-+#endif	/* USE_OPENSSL */
-+
- 	mem_free_if(server_name);
- 
- 	if (socket->no_tls)
-@@ -429,7 +480,7 @@
- 	if (get_opt_bool("connection.ssl.cert_verify", NULL))
- 		SSL_set_verify(socket->ssl, SSL_VERIFY_PEER
- 					  | SSL_VERIFY_FAIL_IF_NO_PEER_CERT,
--			       verify_callback);
-+			       verify_callback_ptr);
- 
- 	if (get_opt_bool("connection.ssl.client_cert.enable", NULL)) {
- 		unsigned char *client_cert;
-diff -Naur a/src/network/ssl/ssl.c b/src/network/ssl/ssl.c
---- a/src/network/ssl/ssl.c	2017-12-21 15:58:12.553249389 +0000
-+++ b/src/network/ssl/ssl.c	2017-12-21 16:11:03.378949490 +0000
-@@ -109,7 +109,7 @@
- 
- static union option_info openssl_options[] = {
- 	INIT_OPT_BOOL("connection.ssl", N_("Verify certificates"),
--		"cert_verify", 0, 0,
-+		"cert_verify", 0, 1,
- 		N_("Verify the peer's SSL certificate. Note that this "
- 		"needs extensive configuration of OpenSSL by the user.")),
- 
-diff -Naur a/src/network/state.c b/src/network/state.c
---- a/src/network/state.c	2017-12-21 15:58:12.553249389 +0000
-+++ b/src/network/state.c	2017-12-21 16:10:20.579746621 +0000
-@@ -88,6 +88,7 @@
- 
- #ifdef CONFIG_SSL
- 	{S_SSL_ERROR,		N_("SSL error")},
-+	{S_SSL_CERTFAIL,		N_("SSL Host Verification Failed.")},
- #else
- 	{S_SSL_ERROR,		N_("This version of ELinks does not contain SSL/TLS support")},
- #endif
-diff -Naur a/src/network/state.h b/src/network/state.h
---- a/src/network/state.h	2017-12-21 15:58:12.553249389 +0000
-+++ b/src/network/state.h	2017-12-21 16:10:03.057254202 +0000
-@@ -67,6 +67,7 @@
- 	S_ENCODE_ERROR		= -100017,
- 	S_SSL_ERROR		= -100018,
- 	S_NO_FORCED_DNS		= -100019,
-+	S_SSL_CERTFAIL		= -100020,
- 
- 	S_HTTP_ERROR		= -100100,
- 	S_HTTP_204		= -100101,
diff --git a/network/elinks/patches/0005-gopher_newlines_tabs_entity.patch b/network/elinks/patches/0005-gopher_newlines_tabs_entity.patch
deleted file mode 100644
index f93b0d5431..0000000000
--- a/network/elinks/patches/0005-gopher_newlines_tabs_entity.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-#####################################################################
-# Some fixes for having line feeds in text without a carriage return.
-# Make sure that only lines with tabs are treated as links.
-# Support links that don't begin with a '/'.
-#####################################################################
-diff -Naur a/src/protocol/gopher/gopher.c b/src/protocol/gopher/gopher.c
---- a/src/protocol/gopher/gopher.c	2017-12-28 15:08:54.310546900 +0000
-+++ b/src/protocol/gopher/gopher.c	2017-12-28 20:26:00.635193897 +0000
-@@ -326,7 +326,7 @@
- 
- 	/* Get entity type, and selector string. */
- 	/* Pick up gopher_entity */
--	if (selectorlen > 1 && selector[1] == '/') {
-+	if (selectorlen > 1) {
- 		entity = *selector++;
- 		selectorlen--;
- 	}
-@@ -357,8 +357,7 @@
- 		selectorlen++;
- 	}
- 
--	if (entity_info->type == '1')
--	{
-+	if (entity_info->type == '1') {
- 		if (strstr(selector, DIR) == selector)
- 		{
- 			*selector++;
-@@ -402,9 +401,9 @@
- 	gopher->entity = entity_info;
- 	gopher->commandlen = command.length;
- 
--	debug_log("439 gopher->entity: ", 0);
-+	debug_log("404 gopher->entity: ", 0);
- 	debug_log(gopher->entity, 1);
--	debug_log("437 command.source: ", 0);
-+	debug_log("406 command.source: ", 0);
- 	debug_log(command.source, 1);
- 	memcpy(gopher->command, command.source, command.length);
- 	done_string(&command);
-@@ -486,6 +485,7 @@
- 	unsigned char *host = NULL;
- 	unsigned char *port = NULL;
- 	enum gopher_entity entity = *name++;
-+	int link = 0;
- 
- 	if (!entity) {
- 		add_char_to_string(buffer, '\n');
-@@ -495,6 +495,7 @@
- 	if (*name) {
- 		selector = strchr(name, ASCII_TAB);
- 		if (selector) {
-+			link = 1;
- 			/* Terminate name */
- 			*selector++ = '\0';
- 
-@@ -565,7 +566,7 @@
- 	switch (entity) {
- 	case GOPHER_WWW:
- 		/* Gopher pointer to W3 */
--		if (selector) {
-+		if (selector && link == 1) {
- 			add_gopher_link(buffer, name, selector);
- 			break;
- 		}
-@@ -617,7 +618,8 @@
- 
- 		} else if (address.length > 0
- 			   && strlcmp(address.source, address.length - 1,
--				      "gopher://error.host:1/", -1)) {
-+				      "gopher://error.host:1/", -1)
-+				 && link == 1) {
- 			add_gopher_link(buffer, name, address.source);
- 
- 		} else {
-@@ -639,6 +641,12 @@
- 	for (; datalen > 1; data++, datalen--)
- 		if (data[0] == ASCII_CR && data[1] == ASCII_LF)
- 			return data + 2;
-+		else
-+			if(data[0] == ASCII_CR)
-+				return data + 2;
-+		else
-+			if(data[0] == ASCII_LF)
-+				return data + 2;
- 
- 	return NULL;
- }
diff --git a/network/elinks/patches/0006-indexes_nocr.patch b/network/elinks/patches/0006-indexes_nocr.patch
deleted file mode 100644
index 5c68cee8ca..0000000000
--- a/network/elinks/patches/0006-indexes_nocr.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-#######################################################################
-# Fixes index listings with only LF and no CRs.
-# dave@dawoodfall.net
-#######################################################################
-diff -Naur a/src/protocol/gopher/gopher.c b/src/protocol/gopher/gopher.c
---- a/src/protocol/gopher/gopher.c	2017-12-29 17:14:24.247093626 +0000
-+++ b/src/protocol/gopher/gopher.c	2017-12-29 17:12:08.496272595 +0000
-@@ -638,15 +638,16 @@
- static unsigned char *
- get_gopher_line_end(unsigned char *data, int datalen)
- {
--	for (; datalen > 1; data++, datalen--)
--		if (data[0] == ASCII_CR && data[1] == ASCII_LF)
-+	for (; datalen > 1; data++, datalen--) {
-+		if (data[0] == ASCII_CR && data[1] == ASCII_LF)
- 			return data + 2;
- 		else
- 			if(data[0] == ASCII_CR)
--				return data + 2;
--		else
--			if(data[0] == ASCII_LF)
--				return data + 2;
-+				return data + 1;
-+			else
-+				if(data[0] == ASCII_LF)
-+					return data + 1;
-+	}
- 
- 	return NULL;
- }
-@@ -796,9 +797,21 @@
- 
- 	/* Now read the data from the socket */
- 	switch (gopher->entity->type) {
-+	case GOPHER_INDEX:
-+		/* Lines with no carriage returns */
-+		if (strchr(rb->data, ASCII_CR) == NULL) {
-+			unsigned char *tmp;
-+			tmp = malloc(rb->length + 3);
-+			memcpy(tmp, "i", 1);
-+			memcpy(tmp+1, rb->data, rb->length);
-+			tmp[rb->length]= '\r';
-+			tmp[rb->length+1]= '\n';
-+			rb->length+=3;
-+			memcpy(rb->data, tmp, rb->length);
-+			free(tmp);
-+		}
-+
- 	case GOPHER_DIRECTORY:
--/* Don't do directory list for cgi output (7)
--	case GOPHER_INDEX: */
- 		state = read_gopher_directory_data(conn, rb);
- 		break;
- 
-@@ -810,7 +823,6 @@
- 		state = connection_state(S_GOPHER_CSO_ERROR);
- 		break;
- 
--	case GOPHER_INDEX:
- 	case GOPHER_SOUND:
- 	case GOPHER_PLUS_SOUND:
- 	case GOPHER_PLUS_MOVIE:
diff --git a/network/elinks/patches/0007-move_null.patch b/network/elinks/patches/0007-move_null.patch
deleted file mode 100644
index 9d8037cc37..0000000000
--- a/network/elinks/patches/0007-move_null.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-###################################################################
-# Move the added null terminator one char forwards
-# dave@dawoodfall.net
-###################################################################
-diff --exclude .git -Naur a/src/protocol/gopher/gopher.c b/src/protocol/gopher/gopher.c
---- a/src/protocol/gopher/gopher.c	2017-12-29 17:15:39.521209968 +0000
-+++ b/src/protocol/gopher/gopher.c	2018-01-17 05:46:45.660258482 +0000
-@@ -658,7 +658,7 @@
- 	assert(line < end);
- 
- 	/* Just to be safe NUL terminate the line */
--	end[-2] = 0;
-+	end[-1] = 0;
- 
- 	return line[0] == '.' && !line[1] ? NULL : line;
- }
diff --git a/network/elinks/patches/0010-force-text-wrap.patch b/network/elinks/patches/0010-force-text-wrap.patch
new file mode 100644
index 0000000000..4705cb0893
--- /dev/null
+++ b/network/elinks/patches/0010-force-text-wrap.patch
@@ -0,0 +1,26 @@
+# This wraps <pre> text too when "W" is pressed.
+# (main toggle-wrap-text)
+diff --git a/src/document/html/renderer.c b/src/document/html/renderer.c
+index 6470c54..a40a4ef 100644
+--- a/src/document/html/renderer.c
++++ b/src/document/html/renderer.c
+@@ -1801,7 +1801,7 @@ put_chars(struct html_context *html_context, unsigned char *chars, int charslen)
+ 
+ 	renderer_context.nobreak = 0;
+ 
+-	if (!(html_context->options->wrap || html_is_preformatted())) {
++	if (html_context->options->wrap || !html_is_preformatted()) {
+ 		while (part->cx > overlap(par_format)
+ 		       && part->cx > par_format.leftmargin) {
+ 			int x = split_line(html_context);
+@@ -1822,9 +1822,7 @@ put_chars(struct html_context *html_context, unsigned char *chars, int charslen)
+ 	int_lower_bound(&part->max_width, part->xa
+ 			+ par_format.leftmargin + par_format.rightmargin
+ 			- (chars[charslen - 1] == ' '
+-			   && !html_is_preformatted()));
+-	return;
+-
++               && (html_context->options->wrap || !html_is_preformatted())));
+ }
+ 
+ #undef overlap
diff --git a/network/elinks/patches/0020-gopher-html-links.patch b/network/elinks/patches/0020-gopher-html-links.patch
new file mode 100644
index 0000000000..38a2dd0b10
--- /dev/null
+++ b/network/elinks/patches/0020-gopher-html-links.patch
@@ -0,0 +1,37 @@
+################################################################
+# Fix for HTML links that contain URL:http://
+# dave@slackbuilds.org
+###############################################################
+diff -Naur a/src/protocol/gopher/gopher.c b/src/protocol/gopher/gopher.c
+--- a/src/protocol/gopher/gopher.c	2013-12-18 15:38:57.000000000 +0000
++++ b/src/protocol/gopher/gopher.c	2020-01-08 05:34:02.300498220 +0000
+@@ -277,6 +277,10 @@
+ 	struct string command;
+ 	enum gopher_entity entity = DEFAULT_GOPHER_ENTITY;
+ 	unsigned char *selector = conn->uri->data;
++	unsigned char const* URI  = "hURI%3";
++	unsigned char const* URL  = "hURL%3";
++	unsigned char const* CURI = "HURI%3";
++	unsigned char const* CURL = "HURL%3";
+ 	int selectorlen = conn->uri->datalen;
+ 	struct gopher_entity_info *entity_info;
+ 	size_t size;
+@@ -288,6 +292,18 @@
+ 		selectorlen--;
+ 	}
+ 
++	if(strstr(selector, URL) != NULL || strstr(selector, URI) != NULL) {
++		entity = GOPHER_HTML;
++		selector++;
++		selectorlen--;
++	}
++
++	if(strstr(selector, CURL) != NULL || strstr(selector, CURI) != NULL) {
++		entity = GOPHER_CHTML;
++		selector++;
++		selectorlen--;
++	}
++
+ 	/* This is probably a hack. It serves as a work around when no entity is
+ 	 * available in the Gopher URI. Instead of segfaulting later the content
+ 	 * will be served as application/octet-stream. However, it could
diff --git a/network/elinks/patches/0030-gopher-index-queries.patch b/network/elinks/patches/0030-gopher-index-queries.patch
new file mode 100644
index 0000000000..662fd13a7f
--- /dev/null
+++ b/network/elinks/patches/0030-gopher-index-queries.patch
@@ -0,0 +1,113 @@
+#######################################################################
+# Fix for type 7 entities.
+# dave@slackbuilds.org
+#######################################################################
+diff -Naur '--exclude=.git' bb/src/protocol/gopher/gopher.c cc/src/protocol/gopher/gopher.c
+--- bb/src/protocol/gopher/gopher.c	2020-01-13 22:35:13.663935305 +0000
++++ cc/src/protocol/gopher/gopher.c	2020-01-13 23:16:00.053003768 +0000
+@@ -197,7 +197,7 @@
+ 	command->length = strlen(command->source);
+ }
+ 
+-static struct connection_state init_gopher_index_cache_entry(struct connection *conn);
++/* static struct connection_state init_gopher_index_cache_entry(struct connection *conn); */
+ 
+ static struct connection_state
+ add_gopher_command(struct connection *conn, struct string *command,
+@@ -205,7 +205,7 @@
+ 		   unsigned char *selector, int selectorlen)
+ {
+ 	unsigned char *query;
+-	int querylen;
++	int querylen = 0;
+ 
+ 	if (!init_string(command))
+ 		return connection_state(S_OUT_OF_MEM);
+@@ -218,13 +218,14 @@
+ 		/* Exclude '?' */
+ 		if (query) selectorlen -= 1;
+ 		query = NULL;
+-		querylen = 0;
+-	} else {
+-		query += 1;
++	} else if (entity == GOPHER_INDEX) {
++		/* fix query size to not include the search= part */
++		query += 8;
+ 		querylen = selector + selectorlen - query;
+ 		/* Exclude '?' */
+-		selectorlen -= querylen + 1;
+-		if (querylen >= 7 && !c_strncasecmp(query, "search=", 7)) {
++		/* fix selector length to fit with query */
++		selectorlen -= querylen + 8;
++		if (querylen >= 7 && !c_strncasecmp(query, "submit=", 7)) {
+ 			query	 += 7;
+ 			querylen -= 7;
+ 		}
+@@ -233,9 +234,11 @@
+ 	switch (entity) {
+ 	case GOPHER_INDEX:
+ 		/* No search required? */
++		/* Don't display the form page */
+ 		if (!query) {
+ 			done_string(command);
+-			return init_gopher_index_cache_entry(conn);
++			add_uri_decoded(command, selector, selectorlen, 0);
++			break;
+ 		}
+ 
+ 		add_uri_decoded(command, selector, selectorlen, 0);
+@@ -371,13 +374,14 @@
+ add_gopher_search_field(struct string *buffer, const unsigned char *text,
+ 		const unsigned char *addr)
+ {
++	/* Not *every* query is a search! */
+ 	add_format_to_string(buffer,
+ 		"<form action=\"%s\">"
+ 		"<table>"
+ 		"<td>            </td>"
+ 		"<td>%s:</td>"
+-		"<td><input maxlength=\"256\" name=\"search\" value=\"\"></td>"
+-		"<td><input type=submit value=\"Search\"></td>"
++		"<td><input maxlength=\"256\" name=\"submit\" value=\"\"></td>"
++		"<td><input type=submit value=\"Submit\"></td>"
+ 		"</table>"
+ 		"</form>",
+ 		addr, text);
+@@ -662,6 +666,7 @@
+ }
+ 
+ /* Display a Gopher Index document. */
++/* Use the page that the gopher site sends us
+ static struct connection_state
+ init_gopher_index_cache_entry(struct connection *conn)
+ {
+@@ -674,9 +679,9 @@
+ 
+ 	where = get_uri_string(conn->uri, URI_PUBLIC);
+ 
+-	/* TODO: Use different function when using UTF-8
++	 TODO: Use different function when using UTF-8
+ 	 * in terminal (decode_uri_for_display replaces
+-	 * bytes of UTF-8 characters width '*'). */
++	 * bytes of UTF-8 characters width '*'). *
+ 	if (where) decode_uri_for_display(where);
+ 
+ 	add_format_to_string(&buffer,
+@@ -695,7 +700,7 @@
+ 
+ 	mem_free_if(where);
+ 
+-	/* FIXME: I think this needs a form or something */
++	* FIXME: I think this needs a form or something *
+ 
+ 	add_fragment(conn->cached, conn->from, buffer.source, buffer.length);
+ 	conn->from += buffer.length;
+@@ -707,7 +712,7 @@
+ 		? connection_state(S_OK)
+ 		: connection_state(S_OUT_OF_MEM);
+ }
+-
++*/
+ 
+ static void
+ read_gopher_response_data(struct socket *socket, struct read_buffer *rb)
diff --git a/network/elinks/patches/0040-gopher-directory-links.patch b/network/elinks/patches/0040-gopher-directory-links.patch
new file mode 100644
index 0000000000..15a89fac2f
--- /dev/null
+++ b/network/elinks/patches/0040-gopher-directory-links.patch
@@ -0,0 +1,26 @@
+#######################################################################
+# Fix remote directory links.
+# dave@slackbuilds.org
+#######################################################################
+diff -Naur -x .git bb/src/protocol/gopher/gopher.c cc/src/protocol/gopher/gopher.c
+--- bb/src/protocol/gopher/gopher.c	2020-01-13 23:22:18.918292198 +0000
++++ cc/src/protocol/gopher/gopher.c	2020-01-13 23:21:00.631960039 +0000
+@@ -321,6 +321,18 @@
+ 		selectorlen++;
+ 	}
+ 
++	if (entity_info->type == '1') {
++		if (strchr(selector, '1') == (char *) selector) {
++			selector++;
++			selectorlen--;
++		}
++		else {
++			if ((char *) selector  == "/1") {
++				selectorlen--;
++			}
++		}
++	}
++
+ 	state = add_gopher_command(conn, &command, entity, selector, selectorlen);
+ 	if (!is_in_state(state, S_CONN))
+ 		return state;
diff --git a/network/elinks/patches/0050-gopher-newlines-tabs-entity.patch b/network/elinks/patches/0050-gopher-newlines-tabs-entity.patch
new file mode 100644
index 0000000000..b255fb4f98
--- /dev/null
+++ b/network/elinks/patches/0050-gopher-newlines-tabs-entity.patch
@@ -0,0 +1,56 @@
+#####################################################################
+# Fix line feeds without carriage returns.
+# Make sure that only lines with tabs are treated as links.
+# Support links that don't begin with a '/'.
+# dave@slackbuilds.org
+#####################################################################
+diff -Naur -x .git bb/src/protocol/gopher/gopher.c cc/src/protocol/gopher/gopher.c
+--- bb/src/protocol/gopher/gopher.c	2020-01-14 03:19:39.956296190 +0000
++++ cc/src/protocol/gopher/gopher.c	2020-01-14 03:20:05.295045232 +0000
+@@ -290,7 +290,7 @@
+ 
+ 	/* Get entity type, and selector string. */
+ 	/* Pick up gopher_entity */
+-	if (selectorlen > 1 && selector[1] == '/') {
++	if (selectorlen > 1) {
+ 		entity = *selector++;
+ 		selectorlen--;
+ 	}
+@@ -333,6 +333,18 @@
+ 		}
+ 	}
+ 
++	if (entity_info->type == '1') {
++		if (strchr(selector, '1') == (char *) selector) {
++			selector++;
++			selectorlen--;
++		}
++		else {
++			if ((char *) selector  == "/1") {
++				selectorlen--;
++			}
++		}
++	}
++
+ 	state = add_gopher_command(conn, &command, entity, selector, selectorlen);
+ 	if (!is_in_state(state, S_CONN))
+ 		return state;
+@@ -570,7 +582,8 @@
+ 
+ 		} else if (address.length > 0
+ 			   && strlcmp(address.source, address.length - 1,
+-				      "gopher://error.host:1/", -1)) {
++				      "gopher://error.host:1/", -1)
++				 && selector) {
+ 			add_gopher_link(buffer, name, address.source);
+ 
+ 		} else {
+@@ -590,7 +603,7 @@
+ get_gopher_line_end(unsigned char *data, int datalen)
+ {
+ 	for (; datalen > 1; data++, datalen--)
+-		if (data[0] == ASCII_CR && data[1] == ASCII_LF)
++		if (data[0] == ASCII_CR || data[0] == ASCII_LF)
+ 			return data + 2;
+ 
+ 	return NULL;
diff --git a/network/elinks/patches/0060-gopher-indexes-nocr.patch b/network/elinks/patches/0060-gopher-indexes-nocr.patch
new file mode 100644
index 0000000000..9e4a441db6
--- /dev/null
+++ b/network/elinks/patches/0060-gopher-indexes-nocr.patch
@@ -0,0 +1,19 @@
+#######################################################################
+# Fix index listings with only LF and no CRs.
+# dave@slackbuilds.org 
+#######################################################################
+diff -Naur '--exclude=.git' bb/src/protocol/gopher/gopher.c cc/src/protocol/gopher/gopher.c
+--- bb/src/protocol/gopher/gopher.c	2020-01-14 06:42:11.030536586 +0000
++++ cc/src/protocol/gopher/gopher.c	2020-01-14 06:42:26.710000886 +0000
+@@ -757,6 +757,11 @@
+ 	switch (gopher->entity->type) {
+ 	case GOPHER_DIRECTORY:
+ 	case GOPHER_INDEX:
++		/* Lines with no carriage returns */
++		if (strchr(rb->data, ASCII_CR) == NULL) {
++			strncat(rb->data, "\r\n", 2);
++			rb->length += 3;
++		}
+ 		state = read_gopher_directory_data(conn, rb);
+ 		break;
+ 
diff --git a/network/elinks/patches/0070-gopher-move-null.patch b/network/elinks/patches/0070-gopher-move-null.patch
new file mode 100644
index 0000000000..8f259e55cf
--- /dev/null
+++ b/network/elinks/patches/0070-gopher-move-null.patch
@@ -0,0 +1,16 @@
+###################################################################
+# Move the null terminator one char forwards.
+# dave@slackbuilds.org
+###################################################################
+diff -Naur -x .git bb/src/protocol/gopher/gopher.c cc/src/protocol/gopher/gopher.c
+--- bb/src/protocol/gopher/gopher.c	2020-01-14 03:24:11.259323801 +0000
++++ cc/src/protocol/gopher/gopher.c	2020-01-14 03:24:49.452454019 +0000
+@@ -615,7 +615,7 @@
+ 	assert(line < end);
+ 
+ 	/* Just to be safe NUL terminate the line */
+-	end[-2] = 0;
++	end[-1] = 0;
+ 
+ 	return line[0] == '.' && !line[1] ? NULL : line;
+ }
diff --git a/network/elinks/patches/0080-gopher-html-entities.patch b/network/elinks/patches/0080-gopher-html-entities.patch
new file mode 100644
index 0000000000..750d1a49de
--- /dev/null
+++ b/network/elinks/patches/0080-gopher-html-entities.patch
@@ -0,0 +1,47 @@
+###################################################################
+# Encode < > to HTML.
+###################################################################
+diff -Naur '--exclude=.git' bb/src/protocol/gopher/gopher.c cc/src/protocol/gopher/gopher.c
+--- bb/src/protocol/gopher/gopher.c	2020-01-14 03:26:41.791778387 +0000
++++ cc/src/protocol/gopher/gopher.c	2020-01-14 06:19:56.964025440 +0000
+@@ -620,6 +620,25 @@
+ 	return line[0] == '.' && !line[1] ? NULL : line;
+ }
+ 
++/* substring replacement */
++static void
++str_replace(char * in_string, char * s_string, char * r_string)
++{
++	/* max == replace all characters */
++	char temp[strlen(in_string) * (strlen(r_string) - strlen(s_string)) + 1];
++	char * pos;
++
++	if (!(pos = strstr(in_string, s_string)))
++			return;
++
++	strncpy(temp, in_string, pos - in_string);
++	temp[pos - in_string] = 0;
++	sprintf(temp + (pos - in_string), "%s%s", r_string, pos + 1);
++	in_string[0] = 0;
++	strcpy(in_string, temp);
++	return str_replace(in_string, s_string, r_string);
++}
++
+ /* Parse a Gopher Menu document */
+ static struct connection_state
+ read_gopher_directory_data(struct connection *conn, struct read_buffer *rb)
+@@ -639,6 +658,14 @@
+ 		return connection_state(S_OUT_OF_MEM);
+ 	}
+ 
++	/* Lines with characters that need to be converted to html */
++	if (strstr(rb->data, "<")) {
++		str_replace(rb->data, "<", "&lt;");
++	}
++	if (strstr(rb->data, ">")) {
++		str_replace(rb->data, ">", "&gt;");
++	}
++
+ 	while ((end = get_gopher_line_end(rb->data, rb->length))) {
+ 		unsigned char *line = check_gopher_last_line(rb->data, end);
+ 
diff --git a/network/elinks/patches/0010-fix-lib-path.patch b/network/elinks/patches/0090-fix-lib-path.patch
index 2cdee67fbd..2cdee67fbd 100644
--- a/network/elinks/patches/0010-fix-lib-path.patch
+++ b/network/elinks/patches/0090-fix-lib-path.patch
diff --git a/network/elinks/slack-desc b/network/elinks/slack-desc
index 13590c62fd..7ae5ceddeb 100644
--- a/network/elinks/slack-desc
+++ b/network/elinks/slack-desc
@@ -13,7 +13,7 @@ elinks: web (HTTP/FTP/..) browser. ELinks can render both frames and tables,
 elinks: is highly customizable, and can be extended via Lua or Guile scripts.
 elinks: It is very portable and runs on a variety of platforms.
 elinks:
-elinks: For more information, see: http://elinks.or.cz
+elinks: Homepage: http://elinks.cz
 elinks:
 elinks:
 elinks:
diff --git a/network/emacs-w3m/README b/network/emacs-w3m/README
deleted file mode 100644
index 2d82a1d8b3..0000000000
--- a/network/emacs-w3m/README
+++ /dev/null
@@ -1,5 +0,0 @@
-simple Emacs interface of w3m
-
-Emacs-w3m is an interface program of w3m, a pager with WWW
-capability. It can be used as a lightweight  WWW browser on
-emacsen.
diff --git a/network/emacs-w3m/emacs-w3m.SlackBuild b/network/emacs-w3m/emacs-w3m.SlackBuild
deleted file mode 100644
index 622024e9ed..0000000000
--- a/network/emacs-w3m/emacs-w3m.SlackBuild
+++ /dev/null
@@ -1,87 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for emacs-w3m
-
-# Written by Felix Pfeifer (pfeifer[dot]felix[at]googlemail[dot]com
-
-PRGNAM=emacs-w3m
-VERSION=${VERSION:-cvs_1.4.400_0.20100725}
-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/w3m-el-snapshot_1.4.400+0.20100725.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 {} \;
-
-autoconf
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
-  --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --sysconfdir=/etc \
-  --localstatedir=/var \
-  --mandir=/usr/man \
-  --infodir=$PKG/usr/info \
-  --docdir=/usr/doc/$PRGNAM-$VERSION \
-  --build=$ARCH-slackware-linux
-
-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
-
-rm -f $PKG/usr/info/dir
-gzip -9 $PKG/usr/info/*.info*
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
-  [BCNR]* \
-  $PKG/usr/doc/$PRGNAM-$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/network/emacs-w3m/emacs-w3m.info b/network/emacs-w3m/emacs-w3m.info
deleted file mode 100644
index 92b7823263..0000000000
--- a/network/emacs-w3m/emacs-w3m.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="emacs-w3m"
-VERSION="cvs_1.4.400_0.20100725"
-HOMEPAGE="http://emacs-w3m.namazu.org/"
-DOWNLOAD="http://ponce.cc/slackware/sources/repo/w3m-el-snapshot_1.4.400+0.20100725.orig.tar.gz"
-MD5SUM="0c5da2a83ea6502bcf7b589b8c4daed8"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="w3m"
-MAINTAINER="Felix Pfeifer"
-EMAIL="pfeifer[dot]felix[at]googlemail[dot]com"
diff --git a/network/emacs-w3m/slack-desc b/network/emacs-w3m/slack-desc
deleted file mode 100644
index 63ade2db34..0000000000
--- a/network/emacs-w3m/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------------------------------------------------------|
-emacs-w3m: emacs-w3m (simple Emacs interface of w3m)
-emacs-w3m:
-emacs-w3m: Emacs-w3m is an interface program of w3m, a pager with WWW
-emacs-w3m: capability. It can be used as a lightweight  WWW browser on
-emacs-w3m: emacsen.
-emacs-w3m:
-emacs-w3m:
-emacs-w3m:
-emacs-w3m:
-emacs-w3m:
-emacs-w3m:
diff --git a/network/emailrelay/README b/network/emailrelay/README
index 47e94fa533..3a7d7b669d 100644
--- a/network/emailrelay/README
+++ b/network/emailrelay/README
@@ -1,6 +1,7 @@
-E-MailRelay is a simple SMTP proxy and store-and-forward message transfer agent
-(MTA). When running as a proxy all e-mail messages can be passed through a
-user-defined program, such as a spam filter, which can drop, re-address or edit
-messages as they pass through. When running as a store-and-forward MTA incoming
-messages are stored in a local spool directory, and then forwarded to the next
-SMTP server on request.
+E-MailRelay is a simple SMTP proxy and store-and-forward message
+transfer agent (MTA). When running as a proxy all e-mail messages
+can be passed through a user-defined program, such as a spam filter,
+which can drop, re-address or edit messages as they pass through. When
+running as a store-and-forward MTA incoming messages are stored in a
+local spool directory, and then forwarded to the next SMTP server on
+request.
diff --git a/network/emailrelay/doinst.sh b/network/emailrelay/doinst.sh
index 9dbb27e57f..ec8c4c433d 100644
--- a/network/emailrelay/doinst.sh
+++ b/network/emailrelay/doinst.sh
@@ -12,3 +12,4 @@ config() {
 
 config etc/rc.d/rc.emailrelay.new
 config etc/emailrelay.conf.new
+config etc/emailrelay.auth.new
diff --git a/network/emailrelay/emailrelay.SlackBuild b/network/emailrelay/emailrelay.SlackBuild
index d46158c878..894cebe387 100644
--- a/network/emailrelay/emailrelay.SlackBuild
+++ b/network/emailrelay/emailrelay.SlackBuild
@@ -1,9 +1,9 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for emailrelay
 
-# Copyright 2011,2013 Andrew Clemons, Wellington, New Zealand
-# Copyright 2016-2018 Andrew Clemons, Wellington, New Zealand
+# Copyright 2011,2013,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
@@ -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=emailrelay
-VERSION=${VERSION:-2.0}
+VERSION=${VERSION:-2.5.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}
@@ -61,7 +68,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION-src.tar.gz
+tar xvf $CWD/$PRGNAM-"$VERSION"-src.tar.gz
 cd $PRGNAM-$VERSION
 
 chown -R root:root .
@@ -83,7 +90,6 @@ CXXFLAGS="$SLKCFLAGS" \
   --disable-gui \
   --with-openssl \
   --without-mbedtls \
-  --disable-install-hook \
   --build=$ARCH-slackware-linux
 
 make
@@ -96,11 +102,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
+rm $PKG/usr/doc/$PRGNAM-$VERSION/INSTALL
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/etc/rc.d/
 mv $PKG/usr/libexec/emailrelay/init/emailrelay $PKG/etc/rc.d/rc.emailrelay.new
 mv $PKG/etc/emailrelay.conf $PKG/etc/emailrelay.conf.new
+mv $PKG/etc/emailrelay.auth $PKG/etc/emailrelay.auth.new
 
 rm -rf $PKG/usr/libexec/emailrelay/init/
 rm -rf $PKG/etc/pam.d
@@ -113,4 +121,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/network/emailrelay/emailrelay.info b/network/emailrelay/emailrelay.info
index 1b39ccf0e5..2365dc9617 100644
--- a/network/emailrelay/emailrelay.info
+++ b/network/emailrelay/emailrelay.info
@@ -1,8 +1,8 @@
 PRGNAM="emailrelay"
-VERSION="2.0"
+VERSION="2.5.2"
 HOMEPAGE="https://emailrelay.sourceforge.net/"
-DOWNLOAD="https://sourceforge.net/projects/emailrelay/files/emailrelay/2.0/emailrelay-2.0-src.tar.gz"
-MD5SUM="a14293d14c651499cc5a9a107b5985bd"
+DOWNLOAD="https://sourceforge.net/projects/emailrelay/files/emailrelay/2.5.2/emailrelay-2.5.2-src.tar.gz"
+MD5SUM="d24fdb7c334739218e9ad01d5655296a"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/network/emailrelay/slack-desc b/network/emailrelay/slack-desc
index 8f22802191..076c131c58 100644
--- a/network/emailrelay/slack-desc
+++ b/network/emailrelay/slack-desc
@@ -16,4 +16,4 @@ emailrelay: through. When running as a store-and-forward MTA incoming messages
 emailrelay: are stored in a local spool directory, and then forwarded to the
 emailrelay: next SMTP server on request.
 emailrelay:
-emailrelay:
+emailrelay: https://emailrelay.sourceforge.net/
diff --git a/network/emesene/README b/network/emesene/README
deleted file mode 100644
index 8e0f508488..0000000000
--- a/network/emesene/README
+++ /dev/null
@@ -1,3 +0,0 @@
-emesene is a platform independent instant messaging client for the
-Windows Live Messenger (tm) network. emesene is distributed free
-of charge under the GNU General Public License 2 or any later version.
diff --git a/network/emesene/emesene.SlackBuild b/network/emesene/emesene.SlackBuild
deleted file mode 100644
index f91ee3449f..0000000000
--- a/network/emesene/emesene.SlackBuild
+++ /dev/null
@@ -1,65 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for emesene
-
-# Written by Giovanne Castro <giovannefc@ig.com.br>
-
-PRGNAM=emesene
-VERSION=${VERSION:-1.6.3}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-# No flags/configure needed because it is writen in python programing language.
-ARCH=noarch
-
-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 {} \;
-
-# Create link to executable program
-mkdir -p $PKG/usr/bin
-ln -sf /usr/share/emesene-$VERSION/emesene $PKG/usr/bin
-
-# Copy libraries program
-mkdir -p $PKG/usr/share/emesene-$VERSION
-cp -a *.py \
-  emesene emesene.pot MANIFEST.in hotmlog.htm \
-  abstract conversation_themes docs emesenelib libmimic misc \
-  plugins_base po pygif pyisf smilies sound_themes themes \
-  $PKG/usr/share/emesene-$VERSION
-
-# Install icon on correct places
-mkdir -p $PKG/usr/share/applications
-cat $CWD/emesene.desktop > $PKG/usr/share/applications/emesene.desktop
-mkdir -p $PKG/usr/share/pixmaps
-cat emesene-logo.png > $PKG/usr/share/pixmaps/emesene-logo.png
-
-# Copy documentation
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
-  COPYING GPL LGPL PSF README \
-  $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
-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/network/emesene/emesene.desktop b/network/emesene/emesene.desktop
deleted file mode 100644
index 8149835fdf..0000000000
--- a/network/emesene/emesene.desktop
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Name=emesene
-GenericName=An IM for the WLM® network
-GenericName[pt_BR]=Cliente para Windows® Live Messenger
-Exec=emesene
-Icon=emesene-logo
-Terminal=false
-Type=Application
-StartupNotify=true
-Categories=Network;InstantMessaging;
diff --git a/network/emesene/emesene.info b/network/emesene/emesene.info
deleted file mode 100644
index e847167115..0000000000
--- a/network/emesene/emesene.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="emesene"
-VERSION="1.6.3"
-HOMEPAGE="https://github.com/emesene/emesene"
-DOWNLOAD="http://sourceforge.net/projects/emesene/files/emesene-1.6.3/emesene-1.6.3.tar.gz"
-MD5SUM="0d57f88a1f10a209f9f4552a78c6b965"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="libmimic wxPython"
-MAINTAINER="Giovanne Castro"
-EMAIL="giovannefc@ig.com.br"
diff --git a/network/emesene/slack-desc b/network/emesene/slack-desc
deleted file mode 100644
index cae860296c..0000000000
--- a/network/emesene/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------------------------------------------------------|
-emesene: emesene (An IM for the WLM(tm)
-emesene:
-emesene: emesene is a platform independent instant messaging client for the
-emesene: Windows Live Messenger (tm) network. emesene is distributed free
-emesene: of charge under the GNU GPL 2 or any later version.
-emesene:
-emesene:
-emesene: Home Page: https://github.com/emesene/emesene
-emesene:
-emesene:
-emesene:
diff --git a/network/enet/README b/network/enet/README
index c7ab446f5d..bb8132d4fd 100644
--- a/network/enet/README
+++ b/network/enet/README
@@ -1,4 +1,4 @@
-ENet's purpose is to provide a relatively thin, simple and robust network
-communication layer on top of UDP (User Datagram Protocol). The primary
-feature it provides is optional reliable, in-order delivery of packets.
-
+ENet's purpose is to provide a relatively thin, simple and
+robust network communication layer on top of UDP (User Datagram
+Protocol). The primary feature it provides is optional reliable,
+in-order delivery of packets.
diff --git a/network/enet/enet.SlackBuild b/network/enet/enet.SlackBuild
index 2a933a0a9c..c31af6a1a2 100644
--- a/network/enet/enet.SlackBuild
+++ b/network/enet/enet.SlackBuild
@@ -1,29 +1,60 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for enet
 
-# Written by otzy_007 (oz@oprod.net)
+# Copyright 2021 S. S. Bolokanar, Bulgaria <bolokanar@bulgars.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.
+
+# Originally written by: otzy_007 (oz@oprod.net) 2010
+
+cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=enet
-VERSION=${VERSION:-1.3.12}
-BUILD=${BUILD:-1}
+VERSION=${VERSION:-1.3.17}
+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"
@@ -73,8 +104,10 @@ mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a README LICENSE ChangeLog $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/network/enet/enet.info b/network/enet/enet.info
index d6aa8ddcb6..2d5be7c542 100644
--- a/network/enet/enet.info
+++ b/network/enet/enet.info
@@ -1,10 +1,10 @@
 PRGNAM="enet"
-VERSION="1.3.12"
-HOMEPAGE="http://enet.bespin.org/index.html"
-DOWNLOAD="http://enet.bespin.org/download/enet-1.3.12.tar.gz"
-MD5SUM="2b581600a589553c1e7684ad663f27a8"
+VERSION="1.3.17"
+HOMEPAGE="http://enet.bespin.org"
+DOWNLOAD="http://enet.bespin.org/download/enet-1.3.17.tar.gz"
+MD5SUM="c8e96051c5a60afa9f3052d02b2cbe19"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="otzy_007"
-EMAIL="oz@oprod.net"
+MAINTAINER="S. S. Bolokanar"
+EMAIL="bolokanar@bulgars.org"
diff --git a/network/enet/slack-desc b/network/enet/slack-desc
index 8e9c473393..b3adcd3730 100644
--- a/network/enet/slack-desc
+++ b/network/enet/slack-desc
@@ -13,7 +13,7 @@ enet: simple and robust network communication layer on top of UDP
 enet: (User Datagram Protocol). The primary feature it provides
 enet: is optional reliable, in-order delivery of packets.
 enet:
-enet: Homepage: http://enet.bespin.org/index.html
+enet: Homepage: http://enet.bespin.org
 enet:
 enet:
 enet:
diff --git a/network/epiphany/README b/network/epiphany/README
new file mode 100644
index 0000000000..179a10f924
--- /dev/null
+++ b/network/epiphany/README
@@ -0,0 +1,5 @@
+Epiphany is a GNOME web browser based on the WebKit rendering engine.
+
+Epiphany's principles are simplicity, standards compliance, and 
+software freedom.
+
diff --git a/network/epiphany/doinst.sh b/network/epiphany/doinst.sh
new file mode 100644
index 0000000000..816f2a9a60
--- /dev/null
+++ b/network/epiphany/doinst.sh
@@ -0,0 +1,17 @@
+#!/bin/sh
+
+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
+  fi
+fi
diff --git a/network/epiphany/epiphany.SlackBuild b/network/epiphany/epiphany.SlackBuild
new file mode 100644
index 0000000000..33597f55a6
--- /dev/null
+++ b/network/epiphany/epiphany.SlackBuild
@@ -0,0 +1,114 @@
+#!/bin/bash
+
+# Slackware build script for gnome-web
+
+# Copyright 2022 Charadon 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.
+#
+#  June 7, 2023: Bumped to version 43.1, cleaned up, and taken over mtce - Bob Funk
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=epiphany
+VERSION=${VERSION:-43.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
+  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 COPYING $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a 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/network/epiphany/epiphany.info b/network/epiphany/epiphany.info
new file mode 100644
index 0000000000..7d0e28697f
--- /dev/null
+++ b/network/epiphany/epiphany.info
@@ -0,0 +1,10 @@
+PRGNAM="epiphany"
+VERSION="43.1"
+HOMEPAGE="https://wiki.gnome.org/Apps/Web"
+DOWNLOAD="https://download.gnome.org/sources/epiphany/43/epiphany-43.1.tar.xz"
+MD5SUM="b372b3a60975f0284abbb48a3d5ff0e3"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="webkit2gtk4.1 libdazzle libhandy appstream-glib libportal"
+MAINTAINER="Bob Funk"
+EMAIL="bobfunk11@gmail.com"
diff --git a/network/epiphany/slack-desc b/network/epiphany/slack-desc
new file mode 100644
index 0000000000..bceed5689e
--- /dev/null
+++ b/network/epiphany/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+        |-----handy-ruler------------------------------------------------------|
+epiphany: epiphany (GNOME Web)
+epiphany:
+epiphany: Epiphany, aka GNOME Web, is the GNOME projects web browser, based on
+epiphany: the WebKit rendering engine.
+epiphany:
+epiphany:
+epiphany:
+epiphany:
+epiphany:
+epiphany: https://gitlab.gnome.org/GNOME/epiphany
+epiphany:
diff --git a/network/et/et.SlackBuild b/network/et/et.SlackBuild
index 82b18acb05..893b776e4a 100644
--- a/network/et/et.SlackBuild
+++ b/network/et/et.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for Eternal Terminal (et)
 
@@ -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=et
-VERSION=${VERSION:-5.1.8}
+VERSION=${VERSION:-6.1.11}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,11 +38,21 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
+# the name of the created package would be, and then exit. This information
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
+HOME=$TMP/EternalTerminal-et-v$VERSION
+export HOME
+
 if [ "$ARCH" = "i586" ]; then
   SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
@@ -74,6 +87,7 @@ cd build
   cmake \
     -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
     -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+    -DDISABLE_VCPKG=ON \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DCMAKE_BUILD_TYPE=Release ..
   make
@@ -91,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/network/et/et.info b/network/et/et.info
index f740044c66..db255cb51b 100644
--- a/network/et/et.info
+++ b/network/et/et.info
@@ -1,10 +1,10 @@
 PRGNAM="et"
-VERSION="5.1.8"
+VERSION="6.1.11"
 HOMEPAGE="https://mistertea.github.io/EternalTerminal/"
-DOWNLOAD="https://github.com/MisterTea/EternalTerminal/archive/et-v5.1.8/EternalTerminal-et-v5.1.8.tar.gz"
-MD5SUM="27f5975561694bf27215332c158cb925"
+DOWNLOAD="https://github.com/MisterTea/EternalTerminal/archive/et-v6.1.11/EternalTerminal-et-v6.1.11.tar.gz"
+MD5SUM="41dd49bb7f2969727321fd961b0ff06d"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="protobuf-c gflags libsodium"
+REQUIRES="protobuf-c gflags"
 MAINTAINER="khronosschoty"
 EMAIL="khronosschoty@posteo.org"
diff --git a/network/etcd/README b/network/etcd/README
deleted file mode 100644
index 17acd9492d..0000000000
--- a/network/etcd/README
+++ /dev/null
@@ -1,16 +0,0 @@
-Etcd is a distributed reliable key-value store for the most critical
-data of a distributed system, with a focus on being:
-    Simple: well-defined, user-facing API (gRPC)
-    Secure: automatic TLS with optional client cert authentication
-    Fast: benchmarked 10,000 writes/sec
-    Reliable: properly distributed using Raft
-
-Groupname and Username
-
-You must have the 'etcd' group and user to run this script,
-for example:
-
-  groupadd -g 355 etcd
-  useradd -d /var/lib/etcd -s /bin/sh -u 355 -g etcd etcd
-
-For some basic setup instructions, check the included 'README.SBo'.
diff --git a/network/etcd/README.SBo b/network/etcd/README.SBo
deleted file mode 100644
index 0f12c4c51e..0000000000
--- a/network/etcd/README.SBo
+++ /dev/null
@@ -1,16 +0,0 @@
-README.SBo
-==========
-
-To start etcd automatically at system startup, add the following to
-your /etc/rc.d/rc.local:
-
-  if [ -x /etc/rc.d/rc.etcd ]; then
-    /etc/rc.d/rc.etcd start
-  fi
-
-To stop etcd automatically at system shutdown, add the following to
-your /etc/rc.d/rc.local_shutdown:
-
-  if [ -x /etc/rc.d/rc.etcd ]; then
-    /etc/rc.d/rc.etcd stop
-  fi
diff --git a/network/etcd/doinst.sh b/network/etcd/doinst.sh
deleted file mode 100644
index 45b0c62dd7..0000000000
--- a/network/etcd/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.etcd.new
-config etc/etcd/etcd.conf.yml.new
-config etc/logrotate.d/etcd.new
diff --git a/network/etcd/etcd.SlackBuild b/network/etcd/etcd.SlackBuild
deleted file mode 100644
index bcfd212731..0000000000
--- a/network/etcd/etcd.SlackBuild
+++ /dev/null
@@ -1,106 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for etcd
-
-# Copyright 2018-2019 Thibaut Notteboom, 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.
-
-PRGNAM=etcd
-VERSION=${VERSION:-3.3.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
-
-if [ "$(grep ^etcd /etc/passwd)" = "" -o "$(grep ^etcd /etc/group)" = "" ] ; then
-  printf "\nYou must have a etcd user and group.\n\nExample:\n"
-  printf "\t# groupadd -g 355 etcd\n"
-  printf "\t# useradd -d /var/lib/etcd -s /bin/sh -u 355 -g etcd etcd\n\n"
-  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 {} \;
-
-./build
-
-install -Dm755 bin/etcd $PKG/usr/bin/etcd
-install -Dm755 bin/etcdctl $PKG/usr/bin/etcdctl
-
-install -Dm644 etcd.conf.yml.sample $PKG/etc/etcd/etcd.conf.yml.new
-install -Dm644 $CWD/rc.etcd $PKG/etc/rc.d/rc.etcd.new
-install -Dm644 $CWD/etcd.logrotate $PKG/etc/logrotate.d/etcd.new
-
-install -o etcd -g etcd -d $PKG/var/lib/etcd
-install -o etcd -g etcd -d $PKG/var/log/etcd
-
-find $PKG -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 Documentation/* \
-  $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-cat $CWD/README.SBo > $PKG/usr/doc/$PRGNAM-$VERSION/README.SBo
-
-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/network/etcd/etcd.info b/network/etcd/etcd.info
deleted file mode 100644
index 1842125887..0000000000
--- a/network/etcd/etcd.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="etcd"
-VERSION="3.3.13"
-HOMEPAGE="https://github.com/coreos/etcd"
-DOWNLOAD="https://github.com/coreos/etcd/archive/v3.3.13/etcd-3.3.13.tar.gz"
-MD5SUM="07ef1b925ddc49ed96c5a8a9f2c7bb01"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="google-go-lang"
-MAINTAINER="Thibaut Notteboom"
-EMAIL="thibaut.notteboom@gmail.com"
diff --git a/network/etcd/etcd.logrotate b/network/etcd/etcd.logrotate
deleted file mode 100644
index 225b3a9e2d..0000000000
--- a/network/etcd/etcd.logrotate
+++ /dev/null
@@ -1,7 +0,0 @@
-/var/log/etcd/etcd.log {
-  copytruncate
-  daily
-  rotate 7
-  compress
-  missingok
-}
diff --git a/network/etcd/rc.etcd b/network/etcd/rc.etcd
deleted file mode 100644
index abd95ede02..0000000000
--- a/network/etcd/rc.etcd
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/sh
-
-ETCD_USER=etcd
-ETCD_BIN=/usr/bin/etcd
-ETCD_LOG_FILE=/var/log/etcd/etcd.log
-ETCD_CONFIG_FILE=/etc/etcd/etcd.conf.yml
-
-etcd_start() {
-  echo "Starting the etcd service:  $ETCD_BIN"
-  su - $ETCD_USER -c "$ETCD_BIN --config-file $ETCD_CONFIG_FILE >> $ETCD_LOG_FILE 2>&1 &"
-}
-
-etcd_stop() {
-  echo "Stoping the etcd service:  $ETCD_BIN"
-  killall etcd
-}
-
-etcd_restart() {
-  etcd_stop
-  sleep 1
-  etcd_start
-}
-
-case "$1" in
-  'start')
-    etcd_start
-  ;;
-  'stop')
-    etcd_stop
-  ;;
-  'restart')
-    etcd_restart
-  ;;
-  *)
-    echo "Usage: $0 start|stop|restart"
-  ;;
-esac
diff --git a/network/etcd/slack-desc b/network/etcd/slack-desc
deleted file mode 100644
index d069a38a0e..0000000000
--- a/network/etcd/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------------------------------------------------------|
-etcd: etcd (key value store for shared configuration and service discovery)
-etcd:
-etcd: Etcd is a distributed reliable key-value store for the most critical
-etcd: data of a distributed system, with a focus on being:
-etcd:     Simple: well-defined, user-facing API (gRPC)
-etcd:     Secure: automatic TLS with optional client cert authentication
-etcd:     Fast: benchmarked 10,000 writes/sec
-etcd:     Reliable: properly distributed using Raft
-etcd:
-etcd:
-etcd:
diff --git a/network/etherape/README b/network/etherape/README
index b87bb97581..d69885b0d9 100644
--- a/network/etherape/README
+++ b/network/etherape/README
@@ -1,11 +1,12 @@
-EtherApe is a graphical network monitor modeled after etherman. Featuring
-Ethernet, IP, TCP, FDDI and Token Ring modes, it displays network activity
-graphically. Hosts and links change in size with traffic. Color coded
-protocols display.
+EtherApe is a graphical network monitor modeled after
+etherman. Featuring Ethernet, IP, TCP, FDDI and Token Ring modes, it
+displays network activity graphically. Hosts and links change in size
+with traffic. Color coded protocols display.
 
 It supports Ethernet, FDDI, Token Ring, ISDN, PPP and SLIP devices. It
 can filter traffic to be shown, and can read traffic from a file as well
 as live from the network.
 
-This build will set the kdesu su wrapper when called from the GUI desktop pass.
-if not enabled etherape will not monitor the ports if not called by root.
+This build will set the kdesu su wrapper when called from the GUI
+desktop pass. If not enabled, etherape will not monitor the ports if
+not called by root.
diff --git a/network/etherape/etherape.SlackBuild b/network/etherape/etherape.SlackBuild
index 4a121bcf59..1da85ca851 100644
--- a/network/etherape/etherape.SlackBuild
+++ b/network/etherape/etherape.SlackBuild
@@ -1,10 +1,10 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for etherape
 
 # Copyright 2011-2013  Chris Abela, Malta
 # Copyright 2014  Ryan P.C. McQuen, WA, ryanpcmcquen@member.fsf.org
-# 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
@@ -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=etherape
-VERSION=${VERSION:-0.9.18}
+VERSION=${VERSION:-0.9.20}
 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}
@@ -93,7 +103,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 ABOUT-NLS AUTHORS COPYING ChangeLog FAQ INSTALL NEWS OVERVIEW README* TODO \
+cp -a ABOUT-NLS AUTHORS COPYING ChangeLog FAQ NEWS OVERVIEW README* TODO \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
@@ -104,4 +114,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 sed -i 's/Exec=etherape/Exec=kdesu etherape/' $PKG/usr/share/applications/etherape.desktop
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/network/etherape/etherape.info b/network/etherape/etherape.info
index 97fba9b12c..bef3d9b20e 100644
--- a/network/etherape/etherape.info
+++ b/network/etherape/etherape.info
@@ -1,10 +1,10 @@
 PRGNAM="etherape"
-VERSION="0.9.18"
+VERSION="0.9.20"
 HOMEPAGE="http://etherape.sourceforge.net/"
-DOWNLOAD="http://downloads.sourceforge.net/etherape/etherape-0.9.18.tar.gz"
-MD5SUM="6d6a6c03e03e2d6aae3a59cd42752ac1"
+DOWNLOAD="http://downloads.sourceforge.net/etherape/etherape-0.9.20.tar.gz"
+MD5SUM="3c1769bbc0aa537d044ca9852ecafcb1"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="goocanvas2 c-ares"
+REQUIRES="goocanvas2"
 MAINTAINER="Willy Sudiarto Raharjo"
 EMAIL="willysr@slackbuilds.org"
diff --git a/network/etherpad-lite/README b/network/etherpad-lite/README
index 5b76b1e0b0..d63c14fcaa 100644
--- a/network/etherpad-lite/README
+++ b/network/etherpad-lite/README
@@ -7,14 +7,16 @@ realtime collaborative editor. A smaller, manageable and well
 documented codebase makes it easier for developers to improve the code
 and contribute towards the project.
 
-See etherpad lite in action at http://slackpad.org
+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.
 
+See etherpad lite in action at http://slackpad.org
 
 Optional Dependency
 
 abiword (with AbiCommand plugin) is required to import/export pads.
 
-
 Groupname and Username
 
 You must have the 'etherpad' group and user to run this script,
diff --git a/network/etherpad-lite/etherpad-lite.SlackBuild b/network/etherpad-lite/etherpad-lite.SlackBuild
index 2679620b29..3074a5d8a2 100644
--- a/network/etherpad-lite/etherpad-lite.SlackBuild
+++ b/network/etherpad-lite/etherpad-lite.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 #
 # Slackware build script for etherpad-lite
 #
@@ -6,10 +6,13 @@
 # license: WTFPL <http://sam.zoy.org/wtfpl/COPYING>
 #
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=etherpad-lite
 VERSION=${VERSION:-1.6.5}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 # Select etherpad's default user/group
 ETHERPAD_USER=${ETHERPAD_USER:-etherpad}
@@ -19,7 +22,14 @@ ETHERPAD_GID=${ETHERPAD_GID:-264}
 
 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}
@@ -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/network/etherpoke/etherpoke.SlackBuild b/network/etherpoke/etherpoke.SlackBuild
index 6a9e6357cf..65e459a5f4 100644
--- a/network/etherpoke/etherpoke.SlackBuild
+++ b/network/etherpoke/etherpoke.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for etherpoke
 
-# Copyright 2015-2016  Dimitris Zlatanidis  Orestiada, Greece
+# Copyright 2015-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=etherpoke
 VERSION=${VERSION:-2.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}
@@ -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/$VERSION.tar.gz
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
@@ -72,13 +82,18 @@ find -L . \
 mkdir -p $PKG/usr/sbin
 sed -i "s#/usr/local/sbin#$PKG/usr/sbin#" src/Makefile
 
+sed -i '1d' README.md
+sed -i '1i Homepage: http://web.archive.org/web/20160305135410/http://codeward.org/etherpoke/' \
+	README.md
+
 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 Changelog AUTHORS COPYING $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a README.md Changelog AUTHORS COPYING conf/$PRGNAM.conf.example \
+	$PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
@@ -86,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/network/etherpoke/etherpoke.info b/network/etherpoke/etherpoke.info
index 02413cd6c8..2eb0ecbb2a 100644
--- a/network/etherpoke/etherpoke.info
+++ b/network/etherpoke/etherpoke.info
@@ -1,10 +1,10 @@
 PRGNAM="etherpoke"
 VERSION="2.5.1"
-HOMEPAGE="https://github.com/erlcash/etherpoke"
-DOWNLOAD="https://github.com/erlcash/etherpoke/archive/2.5.1.tar.gz"
+HOMEPAGE="http://web.archive.org/web/20160305135410/http://codeward.org/etherpoke/"
+DOWNLOAD="https://github.com/erlcash/etherpoke/archive/2.5.1/etherpoke-2.5.1.tar.gz"
 MD5SUM="d236dc011ec265693e96d139018d8247"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="libconfig"
 MAINTAINER="Dimitris Zlatanidis"
-EMAIL="d.zlatanidis@gmail.com"
+EMAIL="dslackw@gmail.com"
diff --git a/network/etherpoke/slack-desc b/network/etherpoke/slack-desc
index b38b08a389..1a1f746ae1 100644
--- a/network/etherpoke/slack-desc
+++ b/network/etherpoke/slack-desc
@@ -12,7 +12,7 @@ etherpoke: etherpoke defines two events: SESSION_BEGIN, SESSION_END to which a
 etherpoke: hook (system command) can be assigned. The event hook can be any
 etherpoke: program installed in the system.
 etherpoke:
-etherpoke: Homepage: https://github.com/erlcash/etherpoke
+etherpoke:
 etherpoke:
 etherpoke:
 etherpoke:
diff --git a/network/ettercap-NG/README b/network/ettercap-NG/README
deleted file mode 100644
index d5416e6943..0000000000
--- a/network/ettercap-NG/README
+++ /dev/null
@@ -1,11 +0,0 @@
-Ettercap is a suite for man in the middle attacks on LAN. It features
-sniffing of live connections, content filtering on the fly and many other
-interesting tricks. It is capable of intercepting traffic on a network
-segment, capturing passwords, and conducting man-in-the-middle attacks
-against a number of common protocols.
-
-It supports active and passive dissection of many protocols (even
-ciphered ones) and includes many feature for network and host analysis.
-
-It is free software, licensed under the terms of the
-GNU General Public License.
diff --git a/network/ettercap-NG/doinst.sh b/network/ettercap-NG/doinst.sh
deleted file mode 100644
index 837a7c8f69..0000000000
--- a/network/ettercap-NG/doinst.sh
+++ /dev/null
@@ -1,19 +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/etter.conf.new
-
-if [ -x usr/bin/update-desktop-database ]; then
-  usr/bin/update-desktop-database -q usr/share/applications
-fi
-
diff --git a/network/ettercap-NG/ettercap-NG.SlackBuild b/network/ettercap-NG/ettercap-NG.SlackBuild
deleted file mode 100644
index 31d14820be..0000000000
--- a/network/ettercap-NG/ettercap-NG.SlackBuild
+++ /dev/null
@@ -1,111 +0,0 @@
-#!/bin/sh
-
-# Slackbuild for ettercap-NG
-#
-# Copyright 2008 meckafett <tom[DOT]bradish[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.
-
-# Modified by the SlackBuilds.org team
-
-PRGNAM=ettercap-NG
-VERSION=${VERSION:-0.7.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}
-
-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-$VERSION
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -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 to fix "[:space:]" character class
-patch -p1 < $CWD/ettercap-NG_configure.patch
-
-CFLAGS="$SLKCFLAGS" \
-./configure \
-  --prefix=/usr \
-  --libdir=/usr/lib$LIBDIRSUFFIX \
-  --sysconfdir=/etc \
-  --localstatedir=/var \
-  --enable-plugins \
-  --enable-gtk \
-  --build=$ARCH-slackware-linux \
-
-make
-make install DESTDIR=$PKG
-
-mkdir -p $PKG/usr/share/applications
-cat $CWD/ettercap.desktop > $PKG/usr/share/applications/ettercap.desktop
-
-mv $PKG/etc/etter.conf $PKG/etc/etter.conf.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
-
-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 INSTALL LICENSE README* THANKS TODO* 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/network/ettercap-NG/ettercap-NG.info b/network/ettercap-NG/ettercap-NG.info
deleted file mode 100644
index c0ee3773a7..0000000000
--- a/network/ettercap-NG/ettercap-NG.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="ettercap-NG"
-VERSION="0.7.3"
-HOMEPAGE="http://ettercap.sourceforge.net/"
-DOWNLOAD="http://downloads.sourceforge.net/ettercap/ettercap-NG-0.7.3.tar.gz"
-MD5SUM="28fb15cd024162c55249888fe1b97820"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="libnet"
-MAINTAINER="meckafett"
-EMAIL="tom.bradish@gmail.com"
diff --git a/network/ettercap-NG/ettercap-NG_configure.patch b/network/ettercap-NG/ettercap-NG_configure.patch
deleted file mode 100644
index 69e9ccc4e7..0000000000
--- a/network/ettercap-NG/ettercap-NG_configure.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ettercap-NG-0.7.3/configure	2005-05-27 12:11:45.000000000 -0300
-+++ ettercap-NG-0.7.3_patched/configure	2011-04-04 20:57:49.000000000 -0300
-@@ -8346,7 +8346,7 @@
-   exit 1
- fi
- gentoo_lt_version="1.5.18"
--gentoo_ltmain_version=`grep '^[:space:]*VERSION=' $ltmain | sed -e 's|^[:space:]*VERSION=||'`
-+gentoo_ltmain_version=`grep '^[[:space:]]*VERSION=' $ltmain | sed -e 's|^[[:space:]]*VERSION=||'`
- if test "$gentoo_lt_version" != "$gentoo_ltmain_version"; then
-   echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6
diff --git a/network/ettercap-NG/ettercap.desktop b/network/ettercap-NG/ettercap.desktop
deleted file mode 100644
index 5ca2e8b4d1..0000000000
--- a/network/ettercap-NG/ettercap.desktop
+++ /dev/null
@@ -1,7 +0,0 @@
-[Desktop Entry]
-Name=Ettercap GTK
-Icon=/usr/share/ettercap/ettercap.png
-Exec=/usr/bin/ettercap --gtk
-Terminal=false
-Type=Application
-Categories=Network;System;Security;GTK;
diff --git a/network/ettercap-NG/slack-desc b/network/ettercap-NG/slack-desc
deleted file mode 100644
index 6b55cb57a0..0000000000
--- a/network/ettercap-NG/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------------------------------------------------------|
-ettercap-NG: ettercap-NG (Multipurpose sniffer/interceptor/logger)
-ettercap-NG:
-ettercap-NG: Ettercap is a suite for man in the middle attacks on LAN. It
-ettercap-NG: features sniffing of live connections, content filtering on the
-ettercap-NG: fly and many other interesting tricks. It supports active and
-ettercap-NG: passive dissection of many protocols (even ciphered ones) and
-ettercap-NG: includes many feature for network and host host analysis.
-ettercap-NG:
-ettercap-NG: Homepage: http://ettercap.sourceforge.net/
-ettercap-NG:
-ettercap-NG:
diff --git a/network/ettercap/README b/network/ettercap/README
index c368fa6414..c17c48eb05 100644
--- a/network/ettercap/README
+++ b/network/ettercap/README
@@ -1,8 +1,8 @@
 Ettercap is a suite for man in the middle attacks on LAN. It features
-sniffing of live connections, content filtering on the fly and many other
-interesting tricks. It is capable of intercepting traffic on a network
-segment, capturing passwords, and conducting man-in-the-middle attacks
-against a number of common protocols.
+sniffing of live connections, content filtering on the fly and many
+other interesting tricks. It is capable of intercepting traffic on a
+network segment, capturing passwords, and conducting man-in-the-middle
+attacks against a number of common protocols.
 
 It supports active and passive dissection of many protocols (even
 ciphered ones) and includes many feature for network and host analysis.
@@ -10,6 +10,10 @@ ciphered ones) and includes many feature for network and host analysis.
 It is free software, licensed under the terms of the
 GNU General Public License.
 
-The build script support the following switches:
-IPV6=ON (default: OFF) to enable ipv6 support
-LUA=ON (default: OFF) to enable lua support (experimental), requires luajit
+The build script supports the following environment variables:
+
+IPV6=ON to enable ipv6 support
+
+LUA=ON to enable experimental lua support, requires luajit
+
+GeoIP is an optional dependency.
diff --git a/network/ettercap/curl-8.patch b/network/ettercap/curl-8.patch
new file mode 100644
index 0000000000..52426d3db7
--- /dev/null
+++ b/network/ettercap/curl-8.patch
@@ -0,0 +1,34 @@
+From 40534662043b7d831d1f6c70448afa9d374a9b63 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Thu, 23 Mar 2023 10:23:14 -0700
+Subject: [PATCH] sslstrip: Enhance the libcurl version check to consider
+ version 8+
+
+Lately curl has released version 8 and hence LIBCURL_VERSION_MAJOR is
+reset to 0, current check assumes major version to be 7 at max and hence
+on systems with libcurl 8+ this check breaks and build fails
+
+Fixes
+
+TOPDIR/build/tmp/work/cortexa15t2hf-neon-yoe-linux-gnueabi/ettercap/0.8.3.1-r0/git/plug-ins/sslstrip/sslstrip.c:57:2: error: libcurl 7.26.0 or up is needed
+ ^
+1 error generated.
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ plug-ins/sslstrip/sslstrip.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/plug-ins/sslstrip/sslstrip.c b/plug-ins/sslstrip/sslstrip.c
+index 327bf58af..d9b67c8b6 100644
+--- a/plug-ins/sslstrip/sslstrip.c
++++ b/plug-ins/sslstrip/sslstrip.c
+@@ -51,7 +51,7 @@
+ 
+ #include <curl/curl.h>
+ 
+-#if (LIBCURL_VERSION_MAJOR < 7) || (LIBCURL_VERSION_MINOR < 26)
++#if (LIBCURL_VERSION_MAJOR < 7) || (LIBCURL_VERSION_MAJOR == 7 && LIBCURL_VERSION_MINOR < 26)
+ #error libcurl 7.26.0 or up is needed
+ #endif
+ 
diff --git a/network/ettercap/ettercap.SlackBuild b/network/ettercap/ettercap.SlackBuild
index f841ef5396..c2aff5dbf0 100644
--- a/network/ettercap/ettercap.SlackBuild
+++ b/network/ettercap/ettercap.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for ettercap
 
-# Copyright 2013-2016 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy
+# Copyright 2013-2019 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=ettercap
-VERSION=${VERSION:-0.8.2}
+VERSION=${VERSION:-0.8.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}
@@ -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 -p1 < $CWD/curl-8.patch
+
 mkdir -p build
 cd build
   cmake \
@@ -107,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/network/ettercap/ettercap.info b/network/ettercap/ettercap.info
index cd95a28fcb..b403b95b8f 100644
--- a/network/ettercap/ettercap.info
+++ b/network/ettercap/ettercap.info
@@ -1,10 +1,10 @@
 PRGNAM="ettercap"
-VERSION="0.8.2"
+VERSION="0.8.3.1"
 HOMEPAGE="https://ettercap.github.io/ettercap/"
-DOWNLOAD="https://github.com/Ettercap/ettercap/releases/download/v0.8.2/ettercap-0.8.2.tar.gz"
-MD5SUM="b6b20851862f55644d5f296f77b785d1"
+DOWNLOAD="https://github.com/Ettercap/ettercap/releases/download/v0.8.3.1/ettercap-0.8.3.1.tar.gz"
+MD5SUM="aec144118be53679f906843ff3054ee0"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="libnet"
+REQUIRES="GeoIP libnet"
 MAINTAINER="Matteo Bernardini"
 EMAIL="ponce@slackbuilds.org"
diff --git a/network/exim/README b/network/exim/README
index 64476d0c07..450792ca2a 100644
--- a/network/exim/README
+++ b/network/exim/README
@@ -1,8 +1,9 @@
-Exim is a mail transfer agent (MTA) used on Unix-like operating systems.
-It is freely available under the GNU GPL and it aims to be a general and
-flexible mailer with extensive facilities for checking incoming e-mail and
-can be integrated with other email tools such as Clamav, Spamassassin,
-Bogofilter, and others available at Slackbuilds.org.
+Exim is a mail transfer agent (MTA) used on Unix-like operating
+systems.  It is freely available under the GNU GPL and it aims
+to be a general and flexible mailer with extensive facilities for
+checking incoming e-mail and can be integrated with other email tools
+such as Clamav, Spamassassin, Bogofilter, and others available at
+Slackbuilds.org.
 
 Exim was orginally written by Philip Hazel for use in the University of
 Cambridge Computing Services e-mail systems.
diff --git a/network/exim/README.SBo b/network/exim/README.SBo
index d2da77c32b..c05477c707 100644
--- a/network/exim/README.SBo
+++ b/network/exim/README.SBo
@@ -15,6 +15,7 @@ The database lookups will not be built by default, but you can enable
 them easily by passing the directives on the command line when calling
 this script, e.g.
 
+  LOOKUP_JSON=yes \
   LOOKUP_LDAP=yes \
   LOOKUP_MYSQL=yes \
   LOOKUP_PGSQL=yes \
@@ -22,9 +23,10 @@ this script, e.g.
   LOOKUP_SQLITE=yes \
   sh exim.SlackBuild
 
-For including the Redis and PostgreSQL lookups you'll need the "hiredis"
-resp. "postgresql" packages, both available from SlackBuilds.org.
+For including the JSON, PostgreSQL and Redis lookups you'll need the
+"jansson", "hiredis" and "postgresql" packages respectively, all available
+from SlackBuilds.org.
 
-WARNING: this package is intended as a drop-in replacement for Sendmail.
+WARNING: this package is intended as a drop-in replacement for Postfix.
 As a result, there are some inevitable filename conflicts between
-Sendmail and Exim. REMOVE SENDMAIL BEFORE INSTALLING THIS PACKAGE!
+Postfix and Exim. REMOVE POSTFIX BEFORE INSTALLING THIS PACKAGE!
diff --git a/network/exim/contrib/exim.cron b/network/exim/contrib/exim.cron
index b4b7751ea8..ca15f5bb17 100644
--- a/network/exim/contrib/exim.cron
+++ b/network/exim/contrib/exim.cron
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Exim's spool directory
 SPOOL=/var/spool/exim
diff --git a/network/exim/contrib/rc.exim b/network/exim/contrib/rc.exim
index d448ddd708..72ff9cccd1 100644
--- a/network/exim/contrib/rc.exim
+++ b/network/exim/contrib/rc.exim
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Run SMTP listening daemon, do queue runs every 10 mins.
 EXIM_ARGS="-bd -q10m"
diff --git a/network/exim/exim.Makefile b/network/exim/exim.Makefile
index 90ccf38ad8..4494a160fc 100644
--- a/network/exim/exim.Makefile
+++ b/network/exim/exim.Makefile
@@ -1,6 +1,8 @@
 ##################################################
 #          The Exim mail transport agent         #
 ##################################################
+# Copyright (c) The Exim Maintainers 2022 - 2023
+# SPDX-License-Identifier: GPL-2.0-or-later
 
 # This is the template for Exim's main build-time configuration file. It
 # contains settings that are independent of any operating system. These are
@@ -12,11 +14,12 @@
 # Exim distribution directory before running the "make" command.
 
 # Things that depend on the operating system have default settings in
-# OS/Makefile-Default, but these are overridden for some OS by files called
-# called OS/Makefile-<osname>. You can further override these by creating files
-# called Local/Makefile-<osname>, where "<osname>" stands for the name of your
-# operating system - look at the names in the OS directory to see which names
-# are recognized.
+# OS/Makefile-Default, but these are overridden for some OS by files
+# called OS/Makefile-<osname>. You can further override these settings by
+# creating files Local/Makefile-<osname>, and Local/Makefile-<build>.
+# The suffix "<osname>" stands for the name of your operating system - look
+# at the names in the OS directory to see which names are recognized,
+# and "<build>" is the content of the environment variable "build".
 
 # However, if you are building Exim for a single OS only, you don't need to
 # worry about setting up Local/Makefile-<osname>. Any build-time configuration
@@ -178,6 +181,108 @@ SPOOL_DIRECTORY=/var/spool/exim
 
 
 ###############################################################################
+#                            TLS                                              #
+###############################################################################
+# Exim is built by default to support the SMTP STARTTLS command, which implements
+# Transport Layer Security using SSL (Secure Sockets Layer). This requires you
+# must install the OpenSSL library package or the GnuTLS library. Exim contains
+# no cryptographic code of its own.
+
+# If you are running Exim as a (TLS) server, just building it with TLS support
+# is all you need to do, as tls_advertise_hosts is set to '*' by
+# default. But you are advised to create a suiteable certificate, and tell
+# Exim about it by means of the tls_certificate and tls_privatekey run
+# time options, otherwise Exim will create a self signed certificate on
+# the fly.  If you are running Exim only as a (TLS) client, building it with
+# TLS support is all you need to do.
+#
+# If you are using pkg-config then you should not need to worry where
+# the libraries and headers are installed, as the pkg-config .pc
+# specification should include all -L/-I information necessary.
+# Enabling the USE_*_PC options should be sufficient. If not using
+# pkg-config, then you have to specify the libraries, and you might
+# need to specify the locations too.
+
+# Uncomment the following lines if you want
+# to build Exim without any TLS support (either OpenSSL or GnuTLS):
+# DISABLE_TLS=yes
+# Unless you do this, you must define one of USE_OPENSSL or USE_GNUTLS
+# below.
+
+# If you are building with TLS, the library configuration must be done:
+
+# Uncomment this if you are using OpenSSL
+USE_OPENSSL=yes
+# Uncomment one of these settings if you are using OpenSSL; pkg-config vs not
+# and an optional location.
+USE_OPENSSL_PC=openssl
+# TLS_LIBS=-lssl -lcrypto
+# TLS_LIBS=-L/usr/local/openssl/lib -lssl -lcrypto
+
+# Uncomment this if you are using GnuTLS
+# USE_GNUTLS=yes
+# Uncomment one of these settings if you are using GnuTLS; pkg-config vs not
+# and an optional location. If you disable SUPPORT_DANE below, you
+# can remove the gnutls-dane references here.  Earlier versions of GnuTLS
+# required libtasn1 and libgrypt also; add if needed.
+# USE_GNUTLS_PC=gnutls gnutls-dane
+# TLS_LIBS=-lgnutls -lgnutls-dane
+# TLS_LIBS=-L/usr/local/gnu/lib -lgnutls -ltasn1 -lgcrypt -lgnutls-dane
+
+# If using GnuTLS older than 2.10 and using pkg-config then note that Exim's
+# build process will require libgcrypt-config to exist in your $PATH.  A
+# version that old is likely to become unsupported by Exim in 2017.
+
+# The security fix we provide with the gnutls_allow_auto_pkcs11 option
+# (4.82 PP/09) introduces a compatibility regression.  The symbol is
+# not available if GnuTLS is build without p11-kit (--without-p11-kit
+# configure option).  In this case use AVOID_GNUTLS_PKCS11=yes when
+# building Exim.
+# AVOID_GNUTLS_PKCS11=yes
+
+# If you are running Exim as a server, note that just building it with TLS
+# support is not all you need to do. You also need to set up a suitable
+# certificate, and tell Exim about it by means of the tls_certificate
+# and tls_privatekey run time options. You also need to set tls_advertise_hosts
+# to specify the hosts to which Exim advertises TLS support. On the other hand,
+# if you are running Exim only as a client, building it with TLS support
+# is all you need to do.
+
+# If you are using pkg-config then you should not need to worry where the
+# libraries and headers are installed, as the pkg-config .pc specification
+# should include all -L/-I information necessary.  If not using pkg-config
+# then you might need to specify the locations too.
+
+# Additional libraries and include files are required for both OpenSSL and
+# GnuTLS. The TLS_LIBS settings above assume that the libraries are installed
+# with all your other libraries. If they are in a special directory, you may
+# need something like
+
+# TLS_LIBS=-L/usr/local/openssl/lib -lssl -lcrypto
+
+# or
+
+# TLS_LIBS=-L/opt/gnu/lib -lgnutls -ltasn1 -lgcrypt -lgnutls-dane
+# If not using DANE under GnuTLS we can lose one library
+# TLS_LIBS=-L/opt/gnu/lib -lgnutls -ltasn1 -lgcrypt
+
+# TLS_LIBS is included only on the command for linking Exim itself, not on any
+# auxiliary programs. If the include files are not in a standard place, you can
+# set TLS_INCLUDE to specify where they are, for example:
+
+# TLS_INCLUDE=-I/usr/local/openssl/include/
+# or
+# TLS_INCLUDE=-I/opt/gnu/include
+
+# You don't need to set TLS_INCLUDE if the relevant directories are already
+# specified in INCLUDE.
+
+
+# Uncomment the following line to remove support for TLS Resumption
+# DISABLE_TLS_RESUME=yes
+
+
+###############################################################################
 #           THESE ARE THINGS YOU PROBABLY WANT TO SPECIFY                     #
 ###############################################################################
 
@@ -237,7 +342,7 @@ TRANSPORT_SMTP=yes
 # This one is special-purpose, and commonly not required, so it is not
 # included by default.
 
-# TRANSPORT_LMTP=yes
+TRANSPORT_LMTP=yes
 
 
 #------------------------------------------------------------------------------
@@ -296,7 +401,7 @@ SUPPORT_MBX=yes
 # For Redis you need to have hiredis installed on your system
 # (https://github.com/redis/hiredis).
 # Depending on where it is installed you may have to edit the CFLAGS
-# (often += -I/usr/local/include) and LDFLAGS (-lhiredis) lines.
+# (often += -I/usr/local/include) and LOOKUP_LIBS (-lhiredis) lines.
 
 # If your system has pkg-config then the _INCLUDE/_LIBS setting can be
 # handled for you automatically by also defining the _PC variable to reference
@@ -309,7 +414,11 @@ LOOKUP_DNSDB=yes
 LOOKUP_CDB=yes
 LOOKUP_DSEARCH=yes
 # LOOKUP_IBASE=yes
+# LOOKUP_JSON=yes
+LOOKUP_JSON_PC=jansson
 # LOOKUP_LDAP=yes
+# LOOKUP_LMDB=yes
+
 # LOOKUP_MYSQL=yes
 # LOOKUP_MYSQL_PC=mariadb
 # LOOKUP_NIS=yes
@@ -332,6 +441,9 @@ LOOKUP_SQLITE_PC=sqlite3
 # LOOKUP_NWILDLSEARCH=yes
 
 
+# Some platforms may need this for LOOKUP_NIS:
+# LIBS += -lnsl
+
 #------------------------------------------------------------------------------
 # If you have set LOOKUP_LDAP=yes, you should set LDAP_LIB_TYPE to indicate
 # which LDAP library you have. Unfortunately, though most of their functions
@@ -350,25 +462,27 @@ LDAP_LIB_TYPE=OPENLDAP2
 
 
 #------------------------------------------------------------------------------
-# The PCRE library is required for Exim.  There is no longer an embedded
+# The PCRE2 library is required for Exim.  There is no longer an embedded
 # version of the PCRE library included with the source code, instead you
-# must use a system library or build your own copy of PCRE.
+# must use a system library or build your own copy of PCRE2.
 # In either case you must specify the library link info here.  If the
-# PCRE header files are not in the standard search path you must also
+# PCRE2 header files are not in the standard search path you must also
 # modify the INCLUDE path (above)
 #
 # Use PCRE_CONFIG to query the pcre-config command (first found in $PATH)
 # to find the include files and libraries, else use PCRE_LIBS and set INCLUDE
 # too if needed.
 
-PCRE_CONFIG=yes
-# PCRE_LIBS=-lpcre
+PCRE2_CONFIG=yes
+# PCRE_LIBS=-lpcre2
 
 
 #------------------------------------------------------------------------------
-# Uncomment the following line to add DANE support
-# Note: Enabling this unconditionally overrides DISABLE_DNSSEC
-# For DANE under GnuTLS we need an additional library.  See TLS_LIBS below.
+# Comment out the following line to remove DANE support.
+# Note: DANE support requires DNSSEC support (the default) and
+# SUPPORT_TLS (the default).  For DANE under GnuTLS we need an additional
+# library.  See TLS_LIBS or USE_GNUTLS_PC below.
+
 SUPPORT_DANE=yes
 
 #------------------------------------------------------------------------------
@@ -378,12 +492,20 @@ SUPPORT_DANE=yes
 # don't need to set LOOKUP_INCLUDE if the relevant directories are already
 # specified in INCLUDE. The settings below are just examples; -lpq is for
 # PostgreSQL, -lgds is for Interbase, -lsqlite3 is for SQLite, -lhiredis
-# is for Redis.
+# is for Redis, -ljansson for JSON.
 #
 # You do not need to use this for any lookup information added via pkg-config.
 
 # LOOKUP_INCLUDE=-I /usr/local/ldap/include -I /usr/local/mysql/include -I /usr/local/pgsql/include
-# LOOKUP_LIBS=-L/usr/local/lib -lldap -llber -lmysqlclient -lpq -lgds -lsqlite3
+# LOOKUP_INCLUDE +=-I /usr/local/include
+# LOOKUP_LIBS=-L/usr/local/lib -lldap -llber -lmysqlclient -lpq -lgds -lsqlite3 -llmdb
+
+#------------------------------------------------------------------------------
+# If you included LOOKUP_LMDB above you will need the library. Depending
+# on where installed you may also need an include directory
+#
+# LOOKUP_INCLUDE += -I/usr/local/include
+# LOOKUP_LIBS += -llmdb
 
 # ...or just enable your favourite lookups and let GNUmake handle the rest
 
@@ -396,10 +518,11 @@ LOOKUP_INCLUDE+=-I/usr/include/mysql
 LOOKUP_LIBS+=-L/usr/lib$(LIBDIRSUFFIX)/mysql -lmysqlclient
 endif
 
+
 #------------------------------------------------------------------------------
 # Compiling the Exim monitor: If you want to compile the Exim monitor, a
 # program that requires an X11 display, then EXIM_MONITOR should be set to the
-# value "eximon.bin". Comment out this setting to disable compilation of the
+# value "eximon.bin". De-comment this setting to enable compilation of the
 # monitor. The locations of various X11 directories for libraries and include
 # files are defaulted in the OS/Makefile-Default file, but can be overridden in
 # local OS-specific make files.
@@ -461,15 +584,27 @@ DISABLE_MAL_MKS=yes
 # By default, Exim has support for checking the AD bit in a DNS response, to
 # determine if DNSSEC validation was successful.  If your system libraries
 # do not support that bit, then set DISABLE_DNSSEC to "yes"
-# Note: Enabling SUPPORT_DANE unconditionally overrides this setting.
+# Note: DNSSEC is required for DANE support.
 
 # DISABLE_DNSSEC=yes
 
 # To disable support for Events set DISABLE_EVENT to "yes"
-
 # DISABLE_EVENT=yes
 
 
+# Uncomment this line to remove support for early pipelining, per
+# https://datatracker.ietf.org/doc/draft-harris-early-pipe/
+# DISABLE_PIPE_CONNECT=yes
+
+
+# Uncomment the following to remove the fast-ramp two-phase-queue-run support
+# DISABLE_QUEUE_RAMP=yes
+
+# Uncomment the following lines to add SRS (Sender Rewriting Scheme) support
+# using only native facilities.
+SUPPORT_SRS=yes
+
+
 #------------------------------------------------------------------------------
 # Compiling Exim with experimental features. These are documented in
 # experimental-spec.txt. "Experimental" means that the way these features are
@@ -477,25 +612,23 @@ DISABLE_MAL_MKS=yes
 
 # Uncomment the following line to add support for talking to dccifd.  This
 # defaults the socket path to /usr/local/dcc/var/dccifd.
-# Doing so will also explicitly turn on the WITH_CONTENT_SCAN option.
+# This support also requires WITH_CONTENT_SCAN enabled.
 
 # EXPERIMENTAL_DCC=yes
 
-# Uncomment the following lines to add SRS (Sender rewriting scheme) support.
-# You need to have libsrs_alt installed on your system (srs.mirtol.com).
-# Depending on where it is installed you may have to edit the CFLAGS and
-# LDFLAGS lines.
-
-# EXPERIMENTAL_SRS=yes
-# CFLAGS  += -I/usr/local/include
-# LDFLAGS += -lsrs_alt
-
 # Uncomment the following line to add DMARC checking capability, implemented
 # using libopendmarc libraries. You must have SPF and DKIM support enabled also.
-# EXPERIMENTAL_DMARC=yes
-# DMARC_TLD_FILE= /etc/exim/opendmarc.tlds
+# SUPPORT_DMARC=yes
 # CFLAGS += -I/usr/local/include
 # LDFLAGS += -lopendmarc
+# Uncomment the following if you need to change the default. You can
+# override it at runtime (main config option dmarc_tld_file)
+# DMARC_TLD_FILE=/etc/exim/opendmarc.tlds
+#
+# Library version libopendmarc-1.4.1-1.fc33.x86_64  (on Fedora 33) is known broken;
+# 1.3.2-3 works.  It seems that the OpenDMARC project broke their API.
+# Use this option if you need to build with an old library (1.3.x)
+# DMARC_API=100300
 
 # Uncomment the following line to add ARC (Authenticated Received Chain)
 # support.  You must have SPF and DKIM support enabled also.
@@ -513,20 +646,11 @@ DISABLE_MAL_MKS=yes
 # Uncomment the following to include extra information in fail DSN message (bounces)
 # EXPERIMENTAL_DSN_INFO=yes
 
-# Uncomment the following to add LMDB lookup support
-# You need to have LMDB installed on your system (https://github.com/LMDB/lmdb)
-# Depending on where it is installed you may have to edit the CFLAGS and LDFLAGS lines.
-# EXPERIMENTAL_LMDB=yes
-# CFLAGS += -I/usr/local/include
-# LDFLAGS += -llmdb
-
 # Uncomment the following line to add queuefile transport support
 # EXPERIMENTAL_QUEUEFILE=yes
-
-# Uncomment the following to add REQUIRETLS support.
-# You must also have SUPPORT_TLS enabled.
-# Ref: https://datatracker.ietf.org/doc/draft-fenton-smtp-require-tls
-# EXPERIMENTAL_REQUIRETLS=yes
+#
+# Uncomment the following line to add XCLIENT support
+# EXPERIMENTAL_XCLIENT=yes
 
 ###############################################################################
 #                 THESE ARE THINGS YOU MIGHT WANT TO SPECIFY                  #
@@ -541,6 +665,29 @@ DISABLE_MAL_MKS=yes
 
 
 #------------------------------------------------------------------------------
+# Which DBM library to use.  If you do not specify a specific here, you get
+# the platform default.  Uncomment the pair of lines as preferred.
+# Note: when changing an installation from one DB type to another all the
+# hints-DB files, in spool/db, should be removed.
+
+# gdbm in native mode
+# USE_GDBM = yes
+# DBMLIB = -lgdbm
+
+# gdbm in Berkeley-DB compatibility mode
+# USE_NDBM = yes
+# DBMLIB = -lgdbm -lgdbm_compat
+
+# tdb
+# USE_TDB = yes
+# DBMLIB = -ltdb
+
+# Berkeley DB
+# USE_DB = yes
+# DBMLIB = -ldb
+
+
+#------------------------------------------------------------------------------
 # Although Exim is normally a setuid program, owned by root, it refuses to run
 # local deliveries as root by default. There is a runtime option called
 # "never_users" which lists the users that must never be used for local
@@ -655,6 +802,7 @@ FIXED_NEVER_USERS=root
 AUTH_CRAM_MD5=yes
 AUTH_CYRUS_SASL=yes
 AUTH_DOVECOT=yes
+AUTH_EXTERNAL=yes
 # AUTH_GSASL=yes
 # AUTH_GSASL_PC=libgsasl
 # AUTH_HEIMDAL_GSSAPI=yes
@@ -668,7 +816,6 @@ AUTH_TLS=yes
 # requires multiple pkg-config files to work with Exim, so the second example
 # above is needed.
 
-
 #------------------------------------------------------------------------------
 # If you specified AUTH_CYRUS_SASL above, you should ensure that you have the
 # Cyrus SASL library installed before trying to build Exim, and you probably
@@ -680,6 +827,9 @@ AUTH_LIBS=-lsasl2
 # AUTH_LIBS=-lgsasl
 # AUTH_LIBS=-lgssapi -lheimntlm -lkrb5 -lhx509 -lcom_err -lhcrypto -lasn1 -lwind -lroken -lcrypt
 
+# If using AUTH_GSASL with SCRAM methods, you should also be defining
+# SUPPORT_I18N to get standards-conformant support of utf8 normalization.
+
 
 #------------------------------------------------------------------------------
 # When Exim is decoding MIME "words" in header lines, most commonly for use
@@ -768,75 +918,6 @@ HEADERS_CHARSET="ISO-8859-1"
 
 
 #------------------------------------------------------------------------------
-# Exim can be built to support the SMTP STARTTLS command, which implements
-# Transport Layer Security using SSL (Secure Sockets Layer). To do this, you
-# must install the OpenSSL library package or the GnuTLS library. Exim contains
-# no cryptographic code of its own. Uncomment the following lines if you want
-# to build Exim with TLS support. If you don't know what this is all about,
-# leave these settings commented out.
-
-# This setting is required for any TLS support (either OpenSSL or GnuTLS)
-SUPPORT_TLS=yes
-
-# Uncomment one of these settings if you are using OpenSSL; pkg-config vs not
-USE_OPENSSL_PC=openssl
-# TLS_LIBS=-lssl -lcrypto
-
-# Uncomment the first and either the second or the third of these if you
-# are using GnuTLS.  If you have pkg-config, then the second, else the third.
-# USE_GNUTLS=yes
-# USE_GNUTLS_PC=gnutls
-# TLS_LIBS=-lgnutls -ltasn1 -lgcrypt
-
-# If using GnuTLS older than 2.10 and using pkg-config then note that Exim's
-# build process will require libgcrypt-config to exist in your $PATH.  A
-# version that old is likely to become unsupported by Exim in 2017.
-
-# The security fix we provide with the gnutls_allow_auto_pkcs11 option
-# (4.82 PP/09) introduces a compatibility regression.  The symbol is
-# not available if GnuTLS is build without p11-kit (--without-p11-kit
-# configure option).  In this case use AVOID_GNUTLS_PKCS11=yes when
-# building Exim.
-# AVOID_GNUTLS_PKCS11=yes
-
-# If you are running Exim as a server, note that just building it with TLS
-# support is not all you need to do. You also need to set up a suitable
-# certificate, and tell Exim about it by means of the tls_certificate
-# and tls_privatekey run time options. You also need to set tls_advertise_hosts
-# to specify the hosts to which Exim advertises TLS support. On the other hand,
-# if you are running Exim only as a client, building it with TLS support
-# is all you need to do.
-
-# If you are using pkg-config then you should not need to worry where the
-# libraries and headers are installed, as the pkg-config .pc specification
-# should include all -L/-I information necessary.  If not using pkg-config
-# then you might need to specify the locations too.
-
-# Additional libraries and include files are required for both OpenSSL and
-# GnuTLS. The TLS_LIBS settings above assume that the libraries are installed
-# with all your other libraries. If they are in a special directory, you may
-# need something like
-
-# TLS_LIBS=-L/usr/local/openssl/lib -lssl -lcrypto
-# or
-# TLS_LIBS=-L/opt/gnu/lib -lgnutls -ltasn1 -lgcrypt
-
-# For DANE under GnuTLS we need an additional library.
-# TLS_LIBS += -lgnutls-dane
-
-# TLS_LIBS is included only on the command for linking Exim itself, not on any
-# auxiliary programs. If the include files are not in a standard place, you can
-# set TLS_INCLUDE to specify where they are, for example:
-
-# TLS_INCLUDE=-I/usr/local/openssl/include/
-# or
-# TLS_INCLUDE=-I/opt/gnu/include
-
-# You don't need to set TLS_INCLUDE if the relevant directories are already
-# specified in INCLUDE.
-
-
-#------------------------------------------------------------------------------
 # The default distribution of Exim contains only the plain text form of the
 # documentation. Other forms are available separately. If you want to install
 # the documentation in "info" format, first fetch the Texinfo documentation
@@ -988,10 +1069,10 @@ EXTRALIBS += -ldl
 # If you want IDNA2008 mappings per RFCs 5890, 6530 and 6533, you additionally
 # need libidn2 and SUPPORT_I18N_2008.
 
-SUPPORT_I18N=yes
-LDFLAGS += -lidn
-# SUPPORT_I18N_2008=yes
-# LDFLAGS += -lidn -lidn2
+# SUPPORT_I18N=yes
+# LDFLAGS += -lidn
+SUPPORT_I18N_2008=yes
+LDFLAGS += -lidn -lidn2
 
 
 #------------------------------------------------------------------------------
@@ -1450,4 +1531,13 @@ PID_FILE_PATH=/var/run/exim.pid
 
 # ENABLE_DISABLE_FSYNC=yes
 
+#------------------------------------------------------------------------------
+# For development, add this to include code to time various stages and report.
+# CFLAGS += -DMEASURE_TIMING
+
+# For a very slightly smaller build, for constrained systems, uncomment this.
+# The feature involved is purely for debugging.
+
+# DISABLE_CLIENT_CMD_LOG=yes
+
 # End of EDITME for Exim 4.
diff --git a/network/exim/exim.SlackBuild b/network/exim/exim.SlackBuild
index 73e1fde929..c67e765b50 100644
--- a/network/exim/exim.SlackBuild
+++ b/network/exim/exim.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for Exim
 
-# Copyright 2012-2018 Thomas Morper, Augsburg, Germany
+# Copyright 2012-2024 Thomas Morper, Nürnberg, Germany
 # 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=exim
-VERSION=${VERSION:-4.92.1}
+VERSION=${VERSION:-4.97.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+# We need this when building/testing release candidates.
+SRCVERSION=${VERSION/_/-}
 
 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,9 +77,9 @@ fi
 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 $PRGNAM-$SRCVERSION
+tar xvf $CWD/$PRGNAM-$SRCVERSION.tar.xz
+cd $PRGNAM-$SRCVERSION
 chown -R root:root .
 find -L . \
   \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -98,8 +108,8 @@ mv $(readlink -f $PKG/usr/sbin/exim) $PKG/usr/sbin/exim
 
 # Additional symlinks provide compatibility with sendmail.
 mkdir -p $PKG/usr/lib     # no LIBDIRSUFFIX here!
-( cd $PKG/usr/lib;  ln -s /usr/sbin/exim sendmail )
-( cd $PKG/usr/sbin; ln -s /usr/sbin/exim sendmail )
+ln -s ../sbin/exim $PKG/usr/lib/sendmail
+ln -s exim $PKG/usr/sbin/sendmail
 
 # Install accompanying scripts and configs.
 mkdir -p $PKG/etc/{cron.daily,logrotate.d,rc.d}
@@ -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/network/exim/exim.info b/network/exim/exim.info
index e2caebde68..2f1f2df270 100644
--- a/network/exim/exim.info
+++ b/network/exim/exim.info
@@ -1,10 +1,10 @@
 PRGNAM="exim"
-VERSION="4.92.1"
+VERSION="4.97.1"
 HOMEPAGE="https://www.exim.org/"
-DOWNLOAD="https://ftp.exim.org/pub/exim/exim4/exim-4.92.1.tar.xz"
-MD5SUM="c047cb66e60557cec8f2dbc558cb5707"
+DOWNLOAD="https://ftp.exim.org/pub/exim/exim4/exim-4.97.1.tar.xz"
+MD5SUM="3fd68ae37720767619dd305b047fe8f9"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="%README%"
+REQUIRES="%README% perl-File-FcntlLock"
 MAINTAINER="Thomas Morper"
 EMAIL="thomas@beingboiled.info"
diff --git a/network/fail2ban/fail2ban.SlackBuild b/network/fail2ban/fail2ban.SlackBuild
index f5e29b948b..1ac086703e 100644
--- a/network/fail2ban/fail2ban.SlackBuild
+++ b/network/fail2ban/fail2ban.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware Package Build Script for fail2ban
 # Git Hub: https://github.com/fail2ban/fail2ban/
@@ -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="fail2ban"
-VERSION=${VERSION:-0.10.4}
+VERSION=${VERSION:-0.11.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
-BASH_COMPLETION=${BASH_COMPLETION:-no}
+BASH_COMPLETION=${BASH_COMPLETION:-yes}
 
 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}
@@ -91,17 +101,17 @@ rm -f $PKG/etc/fail2ban/paths-{arch,debian,fedora,freebsd,osx,opensuse}.conf.new
 
 # install bash completion script if requested
 if [ "$BASH_COMPLETION" = "yes" ]; then
-  install -D -m 0644 files/bash-completion $PKG/etc/bash_completion.d/fail2ban.new
+  install -D -m 0644 files/bash-completion $PKG/usr/share/bash-completion/completions/fail2ban
 fi
 
 # install logrotate script
 install -D -m 0644 files/fail2ban-logrotate $PKG/etc/logrotate.d/fail2ban.new
 
-# make directory for socket, pid file & db file
-mkdir -p $PKG/var/{run,lib}/fail2ban
+# make directory for db file
+mkdir -p $PKG/var/lib/fail2ban
 
 # remove /usr/share/doc
-rm -fr $PKG/usr/share
+rm -fr $PKG/usr/share/doc
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a CONTRIBUTING.md COPYING ChangeLog DEVELOP FILTERS MANIFEST \
@@ -115,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/network/fail2ban/fail2ban.info b/network/fail2ban/fail2ban.info
index 9663fc7f8c..74bc0d4172 100644
--- a/network/fail2ban/fail2ban.info
+++ b/network/fail2ban/fail2ban.info
@@ -1,8 +1,8 @@
 PRGNAM="fail2ban"
-VERSION="0.10.4"
+VERSION="0.11.2"
 HOMEPAGE="https://github.com/fail2ban/fail2ban/"
-DOWNLOAD="https://github.com/fail2ban/fail2ban/archive/0.10.4/fail2ban-0.10.4.tar.gz"
-MD5SUM="5df67c74c14e6da26df8e798deefca13"
+DOWNLOAD="https://github.com/fail2ban/fail2ban/archive/0.11.2/fail2ban-0.11.2.tar.gz"
+MD5SUM="dbeaad971a1127320b949b0f29d7b1f9"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/network/falkon/README b/network/falkon/README
deleted file mode 100644
index 3e46f00e6c..0000000000
--- a/network/falkon/README
+++ /dev/null
@@ -1,11 +0,0 @@
-Falkon is a KDE web browser using QtWebEngine rendering engine,
-previously known as QupZilla. It aims to be a lightweight web browser
-available through all major platforms.
-This project has been originally started only for educational
-purposes, but from its start, Falkon has grown into a feature-rich
-browser.
-
-Falkon has all standard functions you expect from a web browser.
-It includes bookmarks, history (both also in sidebar) and tabs.
-Above that, it has by default enabled blocking ads with a built-in
-AdBlock plugin.
diff --git a/network/falkon/falkon.SlackBuild b/network/falkon/falkon.SlackBuild
deleted file mode 100644
index df6df2e5ae..0000000000
--- a/network/falkon/falkon.SlackBuild
+++ /dev/null
@@ -1,100 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for falkon
-
-# Copyright 2018  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.
-
-PRGNAM=falkon
-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}
-
-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 {} \;
-
-# Handling this directory requires the KDE5 Framework
-rm -fR po
-
-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/doc/$PRGNAM-$VERSION
-cp -a CHANGELOG 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:-tgz}
diff --git a/network/falkon/falkon.info b/network/falkon/falkon.info
deleted file mode 100644
index 39afba46f1..0000000000
--- a/network/falkon/falkon.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="falkon"
-VERSION="3.0.1"
-HOMEPAGE="https://www.falkon.org"
-DOWNLOAD="https://download.kde.org/stable/falkon/3.0.1/falkon-3.0.1.tar.xz"
-MD5SUM="c6fb6433ac0f228667e2f763c02317c5"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="extra-cmake-modules qt5"
-MAINTAINER="Matteo Bernardini"
-EMAIL="ponce@slackbuilds.org"
diff --git a/network/falkon/slack-desc b/network/falkon/slack-desc
deleted file mode 100644
index f2d05d57bf..0000000000
--- a/network/falkon/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------------------------------------------------------|
-falkon: falkon (lightweight web browser)
-falkon:
-falkon: Falkon is a KDE web browser using QtWebEngine rendering engine,
-falkon: previously known as QupZilla. It aims to be a lightweight web browser
-falkon: available through all major platforms.
-falkon: This project has been originally started only for educational
-falkon: purposes, but from its start, Falkon has grown into a feature-rich
-falkon: browser.
-falkon:
-falkon: Homepage: https://www.falkon.org
-falkon:
diff --git a/network/fcgiwrap/fcgiwrap.SlackBuild b/network/fcgiwrap/fcgiwrap.SlackBuild
index 9d64052b68..34bef28cac 100644
--- a/network/fcgiwrap/fcgiwrap.SlackBuild
+++ b/network/fcgiwrap/fcgiwrap.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for fcgiwrap
 
@@ -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=fcgiwrap
 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"
+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 . \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 autoreconf -i
-CFLAGS="$SLKCFLAGS" \
+CFLAGS="$SLKCFLAGS -Wno-error=implicit-fallthrough=" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
@@ -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/network/fcgiwrap/fcgiwrap.info b/network/fcgiwrap/fcgiwrap.info
index 77c4681bdb..55a372a6d8 100644
--- a/network/fcgiwrap/fcgiwrap.info
+++ b/network/fcgiwrap/fcgiwrap.info
@@ -1,7 +1,7 @@
 PRGNAM="fcgiwrap"
 VERSION="1.1.0"
 HOMEPAGE="https://github.com/gnosek/fcgiwrap"
-DOWNLOAD="https://github.com/gnosek/fcgiwrap/archive/1.1.0.tar.gz"
+DOWNLOAD="https://github.com/gnosek/fcgiwrap/archive/1.1.0/fcgiwrap-1.1.0.tar.gz"
 MD5SUM="d14f56bda6758a6e02aa7b3fb125cbce"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/network/fdm/README b/network/fdm/README
index a426739e87..0c6db1a5b3 100644
--- a/network/fdm/README
+++ b/network/fdm/README
@@ -1,12 +1,13 @@
-fdm is a program to fetch mail and deliver it in various ways depending on a
-user-supplied ruleset.  Mail may be fetched from stdin, IMAP or POP3 servers,
-or from local maildirs, and filtered based on whether it matches a regexp,
-its size or age, or the output of a shell command.  It can be rewritten by
-an external process, dropped, left on the server, or delivered into maildirs,
-mboxes, to a file or pipe, or any combination.
+fdm is a program to fetch mail and deliver it in various ways
+depending on a user-supplied ruleset. Mail may be fetched from stdin,
+IMAP or POP3 servers, or from local maildirs, and filtered based on
+whether it matches a regexp, its size or age, or the output of a shell
+command. It can be rewritten by an external process, dropped, left on
+the server, or delivered into maildirs, mboxes, to a file or pipe, or
+any combination.
 
-fdm is designed to be lightweight but powerful, with a compact but clear
-configuration syntax.  It is primarily designed for single-user uses but may
-also be configured to deliver mail in a multi-user setup.  In this case,
-it uses privilege separation to minimise the amount of code running as
-the root user.
+fdm is designed to be lightweight but powerful, with a compact but
+clear configuration syntax. It is primarily designed for single-user
+uses but may also be configured to deliver mail in a multi-user setup.
+In this case, it uses privilege separation to minimise the amount of
+code running as the root user.
diff --git a/network/fdm/fdm.SlackBuild b/network/fdm/fdm.SlackBuild
index 4075e7519a..6331be088c 100644
--- a/network/fdm/fdm.SlackBuild
+++ b/network/fdm/fdm.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for fdm
 
@@ -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=fdm
-VERSION=${VERSION:-1.9}
+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
 
-CWD=$(pwd)
+# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
+# the name of the created package would be, and then exit. This information
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; 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/network/fdm/fdm.info b/network/fdm/fdm.info
index 5f27b079a6..61faf75f70 100644
--- a/network/fdm/fdm.info
+++ b/network/fdm/fdm.info
@@ -1,8 +1,8 @@
 PRGNAM="fdm"
-VERSION="1.9"
+VERSION="2.0"
 HOMEPAGE="https://github.com/nicm/fdm"
-DOWNLOAD="https://github.com/nicm/fdm/releases/download/1.9/fdm-1.9.tar.gz"
-MD5SUM="da8e2154621f85f426e2b808390f7ca7"
+DOWNLOAD="https://github.com/nicm/fdm/releases/download/2.0/fdm-2.0.tar.gz"
+MD5SUM="879affa3b30e8cc19c7a7f379a688b77"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/network/fdns/README b/network/fdns/README
new file mode 100644
index 0000000000..7fd34b88c5
--- /dev/null
+++ b/network/fdns/README
@@ -0,0 +1,12 @@
+FDNS
+
+FDNS was designed to run as a local DoH proxy on a Linux desktop, 
+or as a server for a small network. Lean and mean, it protects the 
+computers against some of the most common cyber threats, all while 
+improving the privacy and the system performance.
+
+FDNS is written in C and licensed under GPLv3. The number one job 
+is privacy. We use only DoH services from non-logging providers, 
+while preferring small operators such as open-source enthusiasts 
+and privacy-oriented non-profit organizations.
+
diff --git a/network/fdns/fdns.SlackBuild b/network/fdns/fdns.SlackBuild
new file mode 100644
index 0000000000..ae70518aed
--- /dev/null
+++ b/network/fdns/fdns.SlackBuild
@@ -0,0 +1,109 @@
+#!/bin/bash
+
+# Slackware build script for fdns
+
+#
+# Copyright 2020 Andreo F. Rissardo <andreotec@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=fdns
+VERSION=${VERSION:-0.9.68}
+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 {} \;
+
+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
+
+sed -i "s|lib/fdns|lib${LIBDIRSUFFIX}/fdns|" 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
+
+cp $TMP/$PRGNAM-$VERSION/{COPYING,README,RELNOTES} $PKG/usr/doc/$PRGNAM-$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/network/fdns/fdns.info b/network/fdns/fdns.info
new file mode 100644
index 0000000000..105257e186
--- /dev/null
+++ b/network/fdns/fdns.info
@@ -0,0 +1,10 @@
+PRGNAM="fdns"
+VERSION="0.9.68"
+HOMEPAGE="https://firejaildns.wordpress.com/"
+DOWNLOAD="https://github.com/netblue30/fdns/releases/download/v0.9.68/fdns-0.9.68.tar.xz"
+MD5SUM="041fd6610340b6b2a3c56446ccdff6c1"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Andreo F. Rissardo"
+EMAIL="andreotec@gmail.com"
diff --git a/network/fdns/slack-desc b/network/fdns/slack-desc
new file mode 100644
index 0000000000..8b7421c005
--- /dev/null
+++ b/network/fdns/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+    |-----handy-ruler------------------------------------------------------|
+fdns: fdns (Firejail DNS-over-HTTPS Proxy Server)
+fdns:
+fdns: FDNS was designed to run as a local DoH proxy on a Linux desktop,
+fdns: or as a server for a small network. Lean and mean, it protects the
+fdns: computers against some of the most common cyber threats, all while
+fdns: improving the privacy and the system performance. FDNS is written in
+fdns: C and licensed under GPLv3. The number one job is privacy. The number
+fdns: one job is privacy.
+fdns:
+fdns: https://firejaildns.wordpress.com
+fdns:
diff --git a/network/feather/README b/network/feather/README
new file mode 100644
index 0000000000..a5154540f8
--- /dev/null
+++ b/network/feather/README
@@ -0,0 +1,27 @@
+Feather is a free, open-source Monero wallet for Linux, Tails, macOS
+and Windows. It is written in C++ with the Qt framework.
+
+Copyright (c) 2020-2023, The Monero Project.
+
+Various features can be enabled/disabled by passing variables to the
+script (VAR=yes/no ./feather.SlackBuild):
+LOCALMONERO=yes|no (default: yes)
+    (disable LocalMonero feature)
+XMRIG=yes|no (default: yes)
+    (disable XMRig feature)
+DONATE_BEG=yes|no (default: yes)
+    (disable the dreaded donate requests)
+USE_DEVICE_TREZOR=yes|no (default:yes)
+    (disable Trezor hardware wallet support)
+WITH_SCANNER=yes|no (default:no)
+    (enable the webcam QR code scanner)
+
+As of version 2.5.2 of Feather, qt6 is now a mandatory dependency.
+
+tor is another optional dependency; a Tor daemon is required to
+connect to .onion nodes and the websocket server.
+
+If the XMRig feature is enabled, you can point to a system-wide binary
+for the miner executable (under the "Settings" tab in the "Miner" tab)
+by installing the xmrig package from SlackBuilds.org. Said binary will
+be located at "/usr/bin/xmrig".
diff --git a/network/feather/doinst.sh b/network/feather/doinst.sh
new file mode 100644
index 0000000000..a993650058
--- /dev/null
+++ b/network/feather/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/network/feather/feather.SlackBuild b/network/feather/feather.SlackBuild
new file mode 100644
index 0000000000..c0769c4b7e
--- /dev/null
+++ b/network/feather/feather.SlackBuild
@@ -0,0 +1,117 @@
+#!/bin/bash
+
+# Slackware build script for feather
+
+# Copyright Bloyburt 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=feather 
+VERSION=${VERSION:-2.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 the variable PRINT_PACKAGE_NAME is set, then this script will report what
+# the name of the created package would be, and then exit. This information
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; 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="-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 {} \;
+
+# Optional features can be enabled/disabled here
+[ "${LOCALMONERO:-yes}" = no ] && LOCALMONERO='-DLOCALMONERO=OFF'
+[ "${XMRIG:-yes}" = no ] && XMRIG='-DXMRIG=OFF'
+[ "${DONATE_BEG:-yes}" = no ] && DONATE_BEG='-DDONATE_BEG=OFF'
+[ "${USE_DEVICE_TREZOR:-yes}" = no ] && USE_DEVICE_TREZOR='-DUSE_DEVICE_TREZOR=OFF'
+[ "${WITH_SCANNER:-no}" = yes ] && WITH_SCANNER='-DWITH_SCANNER=ON'
+
+mkdir -p build
+cd build
+  cmake \
+    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    $LOCALMONERO \
+    $XMRIG \
+    $DONATE_BEG \
+    $USE_DEVICE_TREZOR \
+    $WITH_SCANNER \
+    -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 *.md LICENSE $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+# Copy the icon and desktop file into the package
+mkdir -p $PKG/usr/share/pixmaps/
+cp -a src/assets/images/appicons/256x256.png $PKG/usr/share/pixmaps/feather.png
+mkdir -p $PKG/usr/share/applications/
+cat src/assets/feather.desktop > $PKG/usr/share/applications/feather.desktop
+
+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/network/feather/feather.info b/network/feather/feather.info
new file mode 100644
index 0000000000..d78a7a434b
--- /dev/null
+++ b/network/feather/feather.info
@@ -0,0 +1,10 @@
+PRGNAM="feather"
+VERSION="2.5.2"
+HOMEPAGE="https://featherwallet.org/"
+DOWNLOAD="UNSUPPORTED"
+MD5SUM=""
+DOWNLOAD_x86_64="https://featherwallet.org/files/releases/source/feather-2.5.2.tar.gz"
+MD5SUM_x86_64="6bfcbb080db3f633312fcd629de1ab3d"
+REQUIRES="protobuf3 qt6 unbound zbar zxing-cpp"
+MAINTAINER="Bloyburt"
+EMAIL="alexpen@startmail.com"
diff --git a/network/feather/slack-desc b/network/feather/slack-desc
new file mode 100644
index 0000000000..8b0ea67966
--- /dev/null
+++ b/network/feather/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+       |-----handy-ruler------------------------------------------------------|
+feather: feather (Monero Wallet Client)
+feather:
+feather: Feather is a free, open-source Monero wallet for Linux, Tails, macOS
+feather: and Windows. It is written in C++ with the Qt framework.
+feather:
+feather: Copyright (c) 2020-2023, The Monero Project.
+feather:
+feather: Homepage: https://featherwallet.org/
+feather:
+feather:
+feather:
diff --git a/network/felinks/README b/network/felinks/README
new file mode 100644
index 0000000000..5a878fde58
--- /dev/null
+++ b/network/felinks/README
@@ -0,0 +1,72 @@
+Felinks is a maintained and up-to-date fork of ELinks, an advanced web
+browser.
+
+ELinks is an advanced and well-established feature-rich text mode web
+(HTTP/FTP/..) browser. ELinks can render both frames and tables, is
+highly customizable and can be extended via scripts. It is very portable
+and runs on a variety of platforms.  The ELinks official website is
+available at http://elinks.cz
+
+NOTE: Felinks will conflict with Elinks, so currently only one can be
+installed at a time.
+
+There are a number of options that can be used to add support for
+other protocols etc.  To enable or disable an option use the following
+method:
+
+  MOUSE=no ./elinks.SlackBuild
+or
+  MOUSE=no sh elinks.SlackBuild
+
+Multiple options can be combined.
+
+Category       Description                         Default Value
+
+System:
+
+FASTMEM        Direct use of system alloc          no
+CGI            Local CGI support                   no
+COMBINING      Unicode combining characters        no (experimental)
+UTF8           UTF-8 support                       yes
+IPV6           IPv6 support                        yes
+HTMLHL         HTML highlighting using DOM engine  no
+LZMA           LZMA encoding support               no
+TRE            REGEX SEARCH SUPPORT                yes
+BROTLI         BROTLI COMPRESSION                  yes
+DEBUG          Debug support (disables fastmem)    no
+XTERM          Xterm support (Enables X11)         no
+X11            X11 support                         no
+
+UI:
+
+MOUSE          Mouse support                       yes
+GPM            GPM (mouse) support                 yes
+EXMODE         Exmode (ex/vi CLI)                  no
+
+Colours:
+
+COLS88         88 Colours                          no
+COLS256        256 Colours                         no
+COLSTRUE       True Colours                        no
+
+Scripting:
+
+GUILE                                              no
+PERL                                               no
+PYTHON        (python3 required)                   no
+LUA                                                yes
+
+Protocols:
+
+BITTORRENT                                         no
+DATA                                               yes
+FSP                                                no
+FTP                                                yes
+FINGER                                             no
+GOPHER                                             no
+NNTP                                               no
+SMB                                                no
+
+OPTIONAL:
+
+python3 for python support (still experimental).
diff --git a/network/felinks/felinks.SlackBuild b/network/felinks/felinks.SlackBuild
new file mode 100644
index 0000000000..2331689b7c
--- /dev/null
+++ b/network/felinks/felinks.SlackBuild
@@ -0,0 +1,201 @@
+#!/bin/bash
+
+# Slackware build script for felinks
+# Copyright 2014 David Woodfall <dave@dawoodfall.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=felinks
+SRCNAM=elinks
+VERSION=${VERSION:-0.15.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}
+
+# Added -fno-strict-aliasing -Wno-pointer-sign for a much more peaceful build
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686 -fno-strict-aliasing -Wno-pointer-sign"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686 -fno-strict-aliasing -Wno-pointer-sign"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC -fno-strict-aliasing -Wno-pointer-sign"
+  # fix for multilib
+  SLKLDFLAGS="-m64"
+  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.?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 {} \;
+
+## System
+[ "${FASTMEM:-no}"    = "yes" ] && fastmem="--enable-fastmem"
+[ "${DEBUG:-no}"      = "yes" ] && debug="--enable-debug --disable-fastmem"
+[ "$DEBUG"            = "yes" ] && SLKCFLAGS="-ggdb $SLKCFLAGS"
+[ "${CGI:-no}"        = "yes" ] && cgi="--enable-cgi"
+[ "${COMBINING:-no}"  = "yes" ] && combining="--enable-combining"
+[ "${UTF8:-yes}"      = "no"  ] && utf8="--disable-utf-8"
+[ "${IPV6:-yes}"      = "no"  ] && ipv6="--disable-ipv6"
+[ "${HTMLHL:-no}"     = "yes" ] && htmlhl="--enable-html-highlight"
+[ "${LZMA:-no}"       = "yes" ] && lzma="--with-lzma"
+[ "${TRE:-no}"        = "no"  ] && tre="--without-tre"
+[ "${BROTLI:-no}"     = "no"  ] && brotli="--without-brotli"
+[ "${LIBDOM:-no}"     = "yes" ] && libdom="--with-libdom"
+[ "${XTERM:-no}"      = "no"  ] && xterm="--without-xterm"
+[ "$XTERM"            = "yes" ] && X11="yes"
+[ "${X11:-no}"        = "no"  ] && x11="--without-x"
+
+# UI
+[ "${MOUSE:-yes}"     = "no"  ] && mouse="--disable-mouse"
+[ "${GPM:-yes}"       = "no"  ] && gpm="--without-gpm"
+[ "${EXMODE:-no}"     = "yes" ] && exmode="--enable-exmode"
+
+# Colours
+[ "${COLS88:-no}"     = "yes" ] && cols88="--enable-88-colors"
+[ "${COLS256:-no}"    = "yes" ] && cols256="--enable-256-colors"
+[ "${COLSTRUE:-no}"   = "yes" ] && colstrue="--enable-true-colors"
+
+# Scripting
+[ "${GUILE:-no}"      = "yes" ] && guile="--with-guile"
+[ "${PERL:-no}"       = "yes" ] && perl="--with-perl"
+[ "${PYTHON:-no}"     = "yes" ] && python="--with-python"
+[ "${LUA:-yes}"       = "no"  ] && lua="--without-lua"
+[ "${ECMA:-yes}"      = "no"  ] && ecma="--disable-sm-scripting"
+
+# Protocols
+[ "${BITTORRENT:-no}" = "yes" ] && bittorrent="--enable-bittorrent"
+[ "${DATA:-yes}"      = "no"  ] && data="--disable-data"
+[ "${FSP:-no}"        = "yes" ] && fsp="--enable-fsp"
+[ "${FTP:-yes}"       = "no"  ] && ftp="--disable-ftp"
+[ "${FINGER:-no}"     = "yes" ] && finger="--enable-finger"
+[ "${GOPHER:-no}"     = "yes" ] && gopher="--enable-gopher"
+[ "${NNTP:-no}"       = "yes" ] && nntp="--enable-nntp"
+[ "${SMB:-no}"        = "yes" ] && smb="--enable-smb"
+
+./autogen.sh
+CFLAGS="$SLKCFLAGS -L/usr/lib$LIBDIRSUFFIX" \
+LDFLAGS="$SLKLDFLAGS" \
+  ./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib$LIBDIRSUFFIX \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --mandir=/usr/man \
+  --infodir=/usr/info \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  $fastmem \
+  $debug \
+  $cgi \
+  $combining \
+  $utf8 \
+  $ipv6 \
+  $htmlhl \
+  $lzma \
+  $tre \
+  $brotli \
+  $libdom \
+  $xterm \
+  $x11 \
+  $mouse \
+  $gpm \
+  $exmode \
+  $cols88 \
+  $cols256 \
+  $colstrue \
+  $guile \
+  $perl \
+  $python \
+  $lua \
+  $ecma \
+  $bittorrent \
+  $data \
+  $fsp \
+  $ftp \
+  $finger \
+  $gopher \
+  $nntp \
+  $smb \
+  --build=$ARCH-slackware-linux
+
+  make
+  make install DESTDIR=$PKG
+
+# Don't clobber the one supplied by glibc-i18n.
+rm -f $PKG/usr/share/locale/locale.alias
+
+if [ "${DEBUG:-no}" = "no" ]; then
+  strip --strip-unneeded $PKG/usr/bin/$SRCNAM
+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
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+  AUTHORS BUGS COPYING NEWS README SITES THANKS TODO \
+  ChangeLog doc/*txt contrib \
+  $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+# Remove any .git remnants
+find $PKG -name ".git*" -exec rm -vrf {} \;
+
+mkdir -p $PKG/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/network/felinks/felinks.info b/network/felinks/felinks.info
new file mode 100644
index 0000000000..4f6c2a440a
--- /dev/null
+++ b/network/felinks/felinks.info
@@ -0,0 +1,10 @@
+PRGNAM="felinks"
+VERSION="0.15.0"
+HOMEPAGE="https://github.com/rkd77/elinks"
+DOWNLOAD="https://github.com/rkd77/elinks/archive/v0.15.0/elinks-0.15.0.tar.gz"
+MD5SUM="52028102283424664c2ac2bdd23e991f"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="D Woodfall"
+EMAIL="dave@slackbuilds.org"
diff --git a/network/felinks/slack-desc b/network/felinks/slack-desc
new file mode 100644
index 0000000000..1a0bba4cc9
--- /dev/null
+++ b/network/felinks/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.  Line
+# up the first '|' above the ':' following the base package name, and the '|'
+# on the right side marks the last column you can put a 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------------------------------------------------------|
+felinks: felinks (A fork of Elinks, the web browser)
+felinks:
+felinks: Felinks is a maintained and up-to-date fork of ELinks, an advanced
+felinks: web browser.
+felinks:
+felinks: https://github.com/rkd77/felinks
+felinks:
+felinks:
+felinks:
+felinks:
+felinks:
diff --git a/network/ferm/README b/network/ferm/README
index bd52bca78e..33d44d4a48 100644
--- a/network/ferm/README
+++ b/network/ferm/README
@@ -1,4 +1,5 @@
-ferm is a tool to maintain complex firewalls, without having the trouble to
-rewrite the complex rules over and over again.
-ferm allows the entire firewall rule set to be stored in a separate file, and
-to be loaded with one command.
+ferm is a tool to maintain complex firewalls, without having the trouble
+to rewrite the complex rules over and over again.
+
+ferm allows the entire firewall rule set to be stored in a separate
+file, and to be loaded with one command.
diff --git a/network/ferm/README.SLACKWARE b/network/ferm/README.SLACKWARE
new file mode 100644
index 0000000000..611596f48c
--- /dev/null
+++ b/network/ferm/README.SLACKWARE
@@ -0,0 +1,22 @@
+Ferm comes with a systemd unit file that can be used to run ferm on a predefined
+configuration file (/etc/ferm.conf) at boot to automatically setup the firewall.
+
+A simple rc.d script is being provided with this package that mimics what the
+unit file does. If you want to automatically run ferm at boot and stop it at
+shutdown, make sure you create the /etc/ferm.conf file and:
+
+chmod 0755 /etc/rc.d/rc.ferm
+cat >> /etc/rc.d/rc.local <<EOF
+if [ -x /etc/rc.d/rc.ferm ]
+then
+	/etc/rc.d/rc.ferm start
+fi
+
+EOF
+cat >> /etc/rc.d/rc.local_shutdown <<EOF
+if [ -x /etc/rc.d/rc.ferm ]
+then
+	/etc/rc.d/rc.ferm stop
+fi
+
+EOF
diff --git a/network/ferm/doinst.sh b/network/ferm/doinst.sh
new file mode 100644
index 0000000000..fe5a0c79e3
--- /dev/null
+++ b/network/ferm/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.ferm.new
diff --git a/network/ferm/ferm.SlackBuild b/network/ferm/ferm.SlackBuild
index f2d4479129..e85e3f096b 100644
--- a/network/ferm/ferm.SlackBuild
+++ b/network/ferm/ferm.SlackBuild
@@ -1,41 +1,46 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for ferm
 
-# Copyright (c) 2011 Alan Alberghini <414N@slacky.it>
+# Copyright (c) 2021 Alan Alberghini <414N@slacky.it>
 # 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.
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
 #
-#   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.
-# -----------------------------------------------------------------------------
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
 #
-# Build history:
-#
-# 1 - Initial release.
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=ferm
-VERSION=${VERSION:-2.4.1}
+VERSION=${VERSION:-2.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}
@@ -50,13 +55,18 @@ 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 {} \;
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -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 PREFIX=$PKG/usr MANDIR=$PKG/usr/man/man1 DOCDIR=$PKG/usr/doc/$PRGNAM-$VERSION
 
+# Remove systemd specifics
+rm -r $PKG/usr/lib/systemd
+
+install -Dm0644 $CWD/rc.ferm $PKG/etc/rc.d/rc.ferm.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
 
@@ -64,6 +74,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/network/ferm/ferm.info b/network/ferm/ferm.info
index ae1e0e8c6e..877d205f36 100644
--- a/network/ferm/ferm.info
+++ b/network/ferm/ferm.info
@@ -1,10 +1,10 @@
 PRGNAM="ferm"
-VERSION="2.4.1"
+VERSION="2.5.1"
 HOMEPAGE="http://ferm.foo-projects.org/"
-DOWNLOAD="http://ferm.foo-projects.org/download/2.4/ferm-2.4.1.tar.xz"
-MD5SUM="4d359bc809887bcf401eef7e76012e5c"
+DOWNLOAD="http://ferm.foo-projects.org/download/2.5/ferm-2.5.1.tar.xz"
+MD5SUM="6d14d9e5e672885bc6f2fceafbf2942f"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES=""
+REQUIRES="perl-net-dns"
 MAINTAINER="Alan Alberghini"
 EMAIL="414N@slacky.it"
diff --git a/network/ferm/rc.ferm b/network/ferm/rc.ferm
new file mode 100644
index 0000000000..838a775ca5
--- /dev/null
+++ b/network/ferm/rc.ferm
@@ -0,0 +1,77 @@
+#!/bin/sh
+#
+# /etc/rc.d/rc.ferm
+#
+# To make ferm automatically apply rules at boot, make this
+# file executable:  chmod 755 /etc/rc.d/rc.ferm
+
+CONFIG_FILE=/etc/ferm.conf
+RUN_FILE=/var/run/ferm.run
+FERM=/usr/sbin/ferm
+
+set -eE
+
+log_err()
+{
+	>&2 echo "$1" 
+}
+
+check_cfg()
+{
+	if [ ! -e "$CONFIG_FILE" ]
+	then
+		log_err "required config file $CONFIG_FILE missing!"
+		return 1
+	fi
+}
+service_start()
+{
+	if [ ! -e "$RUN_FILE" ]
+	then
+		"$FERM" "$CONFIG_FILE"
+	else
+		log_err "ferm rules seem to have been already been applied ($RUN_FILE present). Aborting"
+		return 1
+	fi
+
+}
+
+service_stop()
+{
+	if [ -e "$RUN_FILE" ]
+	then
+		"$FERM" -F "$CONFIG_FILE"
+	else
+		log_err "Could not find $RUN_FILE to assess if ferm was service_started. Aborting"
+		return 1
+	fi
+}
+
+
+case "$1" in
+	'start')
+		if service_start
+		then
+			touch "$RUN_FILE"
+		else
+			log_err "Error starting service"
+			exit 1
+		fi
+		;;
+	'stop')
+		if service_stop
+		then
+			rm -f "$RUN_FILE"
+		else
+			log_err "Error stopping service"
+			exit 1
+		fi
+		;;
+	'restart')
+		service_stop && service_start
+		;;
+	*)
+		echo "Usage: $0 {start|stop|restart}"
+		;;
+esac
+
diff --git a/network/ferm/slack-desc b/network/ferm/slack-desc
index 355186a152..b7c2e0210d 100644
--- a/network/ferm/slack-desc
+++ b/network/ferm/slack-desc
@@ -1,12 +1,12 @@
 # HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct.  It's also
+# The "handy ruler" below makes it easier to edit a package description.  Line
+# up the first '|' above the ':' following the base package name, and the '|'
+# on the right side marks the last column you can put a character in.  You must
+# make exactly 11 lines for the formatting to be correct.  It's also
 # customary to leave one space after the ':' except on otherwise blank lines.
 
     |-----handy-ruler------------------------------------------------------|
-ferm: ferm (for Easy Rule Making)
+ferm: ferm (For Easy Rule Making)
 ferm:
 ferm: ferm is a tool to maintain complex firewalls, without having the
 ferm: trouble to rewrite the complex rules over and over again. ferm allows
diff --git a/network/filezilla/README b/network/filezilla/README
index c5a2911d60..f4398a33dc 100644
--- a/network/filezilla/README
+++ b/network/filezilla/README
@@ -1,7 +1,7 @@
 FileZilla Client is a fast and reliable cross-platform FTP, FTPS and
-SFTP client with lots of useful features and an intuitive graphical user
-interface.
+SFTP client with lots of useful features and an intuitive graphical
+user interface.
 
-pugixml is an optional dependency - to use an installed version of pugixml,
-run the script as "PUGIXML=yes ./filezilla.SlackBuild" - otherwise, the
-build will use an included copy of pugixml.
+pugixml is an optional dependency - to use an installed version of
+pugixml, run the script as "PUGIXML=yes ./filezilla.SlackBuild" -
+otherwise, the build will use an included copy of pugixml.
diff --git a/network/filezilla/filezilla.SlackBuild b/network/filezilla/filezilla.SlackBuild
index 02ef99af3e..ecbbaa2ddb 100644
--- a/network/filezilla/filezilla.SlackBuild
+++ b/network/filezilla/filezilla.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 # Slackware build script for filezilla
 
 # Copyright 2007-2009 Grigorios Bouzakis <grbzks@xsmail.com>
-# Copyright 2010-2019 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
+# Copyright 2010-2023 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
 # All rights reserved.
 #
 # Permission to use, copy, modify, and distribute this software for any purpose
@@ -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=filezilla
-VERSION=${VERSION:-3.42.1}
+VERSION=${VERSION:-3.66.5}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -33,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}
@@ -67,7 +74,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/FileZilla_${VERSION}_src.tar.bz2
+tar xvf $CWD/FileZilla_${VERSION}_src.tar.xz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
@@ -76,6 +83,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 {} \;
 
+# Needed for gcc >= 10.x
+patch -p1 < $CWD/interface_Mainfrm_h_include_list.patch
+
 ./configure \
   --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
@@ -93,6 +103,8 @@ find -L . \
 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
 
@@ -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/network/filezilla/filezilla.info b/network/filezilla/filezilla.info
index bcc1154e2f..2fbdb6d9bc 100644
--- a/network/filezilla/filezilla.info
+++ b/network/filezilla/filezilla.info
@@ -1,10 +1,10 @@
 PRGNAM="filezilla"
-VERSION="3.42.1"
+VERSION="3.66.5"
 HOMEPAGE="https://filezilla-project.org/"
-DOWNLOAD="https://download.filezilla-project.org/client/FileZilla_3.42.1_src.tar.bz2"
-MD5SUM="00e2f8ff0c1ad9802c0eed6488c3565a"
+DOWNLOAD="https://download.filezilla-project.org/client/FileZilla_3.66.5_src.tar.xz"
+MD5SUM="7e063566849d2a83fc943b69a5aa219d"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="wxGTK3 libfilezilla"
+REQUIRES="wxWidgets libfilezilla"
 MAINTAINER="Willy Sudiarto Raharjo"
 EMAIL="willysr@slackbuilds.org"
diff --git a/network/filezilla/interface_Mainfrm_h_include_list.patch b/network/filezilla/interface_Mainfrm_h_include_list.patch
new file mode 100644
index 0000000000..3977ba657c
--- /dev/null
+++ b/network/filezilla/interface_Mainfrm_h_include_list.patch
@@ -0,0 +1,12 @@
+Index: filezilla-3.47.2.1/src/interface/Mainfrm.h
+===================================================================
+--- filezilla-3.47.2.1.orig/src/interface/Mainfrm.h
++++ filezilla-3.47.2.1/src/interface/Mainfrm.h
+@@ -6,6 +6,7 @@
+ #include "notification.h"
+ #include "serverdata.h"
+ 
++#include <list>
+ #include <wx/timer.h>
+ 
+ #ifndef __WXMAC__
diff --git a/network/firehol/README b/network/firehol/README
index 3759035aae..a8a41e988b 100644
--- a/network/firehol/README
+++ b/network/firehol/README
@@ -1,26 +1,28 @@
-firehol is an easy to use but powerfull iptables stateful firewall for
-humans.
+firehol is an easy to use but powerful iptables stateful firewall
+for humans.
 
-FireHOL uses an extremely simple but powerfull way to define firewall rules
-which it turns into complete stateful iptables firewalls.  FireHOL is a
-generic firewall generator, meaning that you can design any kind of local
-or routing stateful packet filtering firewalls with ease.
+FireHOL uses an extremely simple but powerfull way to define firewall
+rules which it turns into complete stateful iptables firewalls.
+FireHOL is a generic firewall generator, meaning that you can design
+any kind of local or routing stateful packet filtering firewalls with
+ease.
 
-You can run FireHOL with the 'helpme' argument, to get a configuration file
-for the system run, which you can modify according to your needs.
+You can run FireHOL with the 'helpme' argument, to get a configuration
+file for the system run, which you can modify according to your needs.
 
-You can find example config files in /usr/doc/firehol-<ver>/examples. This
-directory contains examples from a simple client machine, to a lan-wan
-gateway or an office server.
+You can find example config files in
+/usr/doc/firehol-<ver>/examples. This directory contains examples from
+a simple client machine, to a lan-wan gateway or an office server.
 
-The default config file in the package contains only a note about where to
-find config file examples (/usr/doc/firehol-<ver>/examples), because it is
-empty it is not handled as a usual config file. If a user has a real one,
-this "example" is simply deleted.
+The default config file in the package contains only a note about
+where to find config file examples (/usr/doc/firehol-<ver>/examples),
+because it is empty it is not handled as a usual config file. If a
+user has a real one, this "example" is simply deleted.
 
 There is a get-iana.sh script to fetch reserved IPs from iana, It is
-renamed to firehol-get-iana, and placed to /usr/sbin. You have to run it at
-least once, to silence firehol startup warnings about missing files.
+renamed to firehol-get-iana, and placed to /usr/sbin. You have to run
+it at least once, to silence firehol startup warnings about missing
+files.
 
 There is an adblock.sh script to fetch the IPs of popular add servers,
 which can be blacklisted, see the file for the details. It is renamed to
diff --git a/network/firehol/firehol.SlackBuild b/network/firehol/firehol.SlackBuild
index 8b0fcc57fb..68e74d4c2b 100644
--- a/network/firehol/firehol.SlackBuild
+++ b/network/firehol/firehol.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for FireHOL
 
@@ -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=firehol
 VERSION=${VERSION:-1.296}
 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}
@@ -86,5 +96,5 @@ cat $CWD/rc.firehol > $PKG/etc/rc.d/rc.firehol.new
 
 # create 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/network/firewalld/README b/network/firewalld/README
index 75d957740a..1821f7afae 100644
--- a/network/firewalld/README
+++ b/network/firewalld/README
@@ -1,6 +1,8 @@
-firewalld provides a dynamically managed firewall with support for
+Firewalld provides a dynamically managed firewall with support for
 network or firewall zones to define the trust level of network
 connections or interfaces. It has support for IPv4, IPv6 firewall
 settings and for ethernet bridges and a separation of runtime and
 permanent configuration options. It also provides an interface for
 services or applications to add ip*tables and ebtables rules directly.
+
+Please read the README.SLACKWARE file for additional information.
diff --git a/network/firewalld/README.SLACKWARE b/network/firewalld/README.SLACKWARE
new file mode 100644
index 0000000000..a5a7404a61
--- /dev/null
+++ b/network/firewalld/README.SLACKWARE
@@ -0,0 +1,20 @@
+The package provided by the upstream project already includes 
+/etc/init.d/firewalld which will get executed on boot by
+/etc/rc.d/rc.sysvinit. So technically, you don't have to 
+use the custom rc.firewalld. I have provided a patch that
+changes /etc/sysconfig/ to /etc/default in order to source 
+any custom arguments.
+
+Otherwise, feel free to chmod -x /etc/init.d/firewalld
+and chmod +x /etc/rc.d/rc.firewalld then add it to your
+/etc/rc.d/rc.local like so:
+
+if [ -x /etc/rc.d/rc.firewalld ]; then
+        /etc/rc.d/rc.firewalld start
+fi
+
+and the following to /etc/rc.d/rc.local_shutdown:
+
+if [ -x /etc/rc.d/rc.firewalld ]; then
+        /etc/rc.d/rc.firewalld stop
+fi
diff --git a/network/firewalld/doinst.sh b/network/firewalld/doinst.sh
index 9f4fb5fbe4..799720f36c 100644
--- a/network/firewalld/doinst.sh
+++ b/network/firewalld/doinst.sh
@@ -22,11 +22,13 @@ preserve_perms() {
   config $NEW
 }
 
-config etc/dbus-1/system.d/FirewallD.conf.new
+config etc/default/firewalld.new
 config etc/firewall/applet.conf.new
 config etc/firewalld/firewalld.conf.new
-config etc/default/firewalld.new
-preserve_perms etc/rc.d/rc.FireWallD.new
+config etc/firewalld/lockdown-whitelist.xml.new
+config etc/logrotate.d/firewalld.new
+
+preserve_perms etc/rc.d/rc.firewalld.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/network/firewalld/firewalld.SlackBuild b/network/firewalld/firewalld.SlackBuild
index ad54c23725..a20957043e 100644
--- a/network/firewalld/firewalld.SlackBuild
+++ b/network/firewalld/firewalld.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for firewalld
 
-# Copyright 2017  Robby Workman, Tuscaloosa, Alabama, USA
+# Copyright 2017,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=firewalld
-VERSION=${VERSION:-0.5.1}
+VERSION=${VERSION:-1.3.3}
 BUILD=${BUILD:-2}
 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,10 +76,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 {} \;
 
-./autogen.sh
+# Let's patch the init.d script to use /etc/default instead of
+# /etc/sysconfig to source arguments.
+patch -p1 < $CWD/init.patch
 
+PYTHON="/usr/bin/python3" \
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
+./autogen.sh
 ./configure \
   --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
@@ -88,15 +99,10 @@ CXXFLAGS="$SLKCFLAGS" \
 make
 make install DESTDIR=$PKG
 
-mv $PKG/etc/dbus-1/system.d/FirewallD.conf $PKG/etc/dbus-1/system.d/FirewallD.conf.new
-mv $PKG/etc/firewall/applet.conf $PKG/etc/firewall/applet.conf.new
-mv $PKG/etc/firewalld/firewalld.conf $PKG/etc/firewalld/firewalld.conf.new
-mv $PKG/etc/sysconfig/firewalld $PKG/etc/sysconfig/firewalld.new
-mv $PKG/etc/sysconfig $PKG/etc/default
-
-mkdir -p $PKG/etc/rc.d
-cat $CWD/rc.FireWallD > $PKG/etc/rc.d/rc.FireWallD.new
+# Don't ship .la files:
+rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la
 
+# We don't need systemd here.
 rm -rf $PKG/usr/lib/systemd
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
@@ -105,10 +111,24 @@ 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/lib
+mv $PKG/etc/modprobe.d $PKG/lib
+
+mv $PKG/etc/sysconfig $PKG/etc/default
+mv $PKG/etc/default/firewalld $PKG/etc/default/firewalld.new
+
+mv $PKG/etc/firewall/applet.conf $PKG/etc/firewall/applet.conf.new
+
+mv $PKG/etc/firewalld/firewalld.conf $PKG/etc/firewalld/firewalld.conf.new
+mv $PKG/etc/firewalld/lockdown-whitelist.xml $PKG/etc/firewalld/lockdown-whitelist.xml.new
+
+mv $PKG/etc/logrotate.d/firewalld $PKG/etc/logrotate.d/firewalld.new
+
+rm -rf $PKG/etc/rc.d/init.d
+cat $CWD/rc.firewalld > $PKG/etc/rc.d/rc.firewalld.new
+
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
-  COPYING README TODO doc/html \
-  $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a COPYING README.md doc/html $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
@@ -116,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/network/firewalld/firewalld.info b/network/firewalld/firewalld.info
index 3b3e69f304..80ccb3db8d 100644
--- a/network/firewalld/firewalld.info
+++ b/network/firewalld/firewalld.info
@@ -1,10 +1,10 @@
 PRGNAM="firewalld"
-VERSION="0.5.1"
-HOMEPAGE="https://github.com/t-woerner/firewalld/"
-DOWNLOAD="https://github.com/t-woerner/firewalld/archive/v0.5.1.tar.gz#/firewalld-0.5.1.tar.gz"
-MD5SUM="38de1fad38d5635f04f8eb44bc2e25b1"
+VERSION="1.3.3"
+HOMEPAGE="https://github.com/firewalld/firewalld/"
+DOWNLOAD="https://github.com/firewalld/firewalld/archive/refs/tags/v1.3.3/firewalld-1.3.3.tar.gz"
+MD5SUM="2eebac7c58bee285ff0c149bc2b18445"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="python-slip decorator"
+REQUIRES="python-slip python3-decorator"
 MAINTAINER="stormtracknole"
 EMAIL="stormtracknole@gmail.com"
diff --git a/network/firewalld/init.patch b/network/firewalld/init.patch
new file mode 100644
index 0000000000..a775133fab
--- /dev/null
+++ b/network/firewalld/init.patch
@@ -0,0 +1,12 @@
+--- firewalld-0.8.6.orig/config/firewalld.init	2020-12-15 12:57:05.000000000 -0600
++++ firewalld-0.8.6/config/firewalld.init	2021-05-02 20:44:35.229976749 -0500
+@@ -29,7 +29,7 @@
+ prog="firewalld"
+ #config="/etc/firewalld/firewalld.conf"
+ 
+-[ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog
++[ -e /etc/default/$prog ] && . /etc/default/$prog
+ 
+ lockfile=/var/lock/subsys/$prog
+ 
+
diff --git a/network/firewalld/rc.FireWallD b/network/firewalld/rc.firewalld
index aa0d91b3dc..aa0d91b3dc 100644
--- a/network/firewalld/rc.FireWallD
+++ b/network/firewalld/rc.firewalld
diff --git a/network/flexget/flexget.SlackBuild b/network/flexget/flexget.SlackBuild
index 631bff5375..f10b85810b 100644
--- a/network/flexget/flexget.SlackBuild
+++ b/network/flexget/flexget.SlackBuild
@@ -1,10 +1,11 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for flexget
 
 # Generated by Alien's SlackBuild Toolkit: http://slackware.com/~alien/AST
 # Copyright 2009-2010  Eric Hameleers, Eindhoven, Netherlands
 # Copyright 2014-2017  Dimitris Zlatanidis  Orestiada, Greece
+# Copyright 2022-2024  fourtysixandtwo <fourtysixandtwo@sliderr.net>
 # Written by Lionel Young <redtricycle@gmail.com>
 #
 # All rights reserved.
@@ -26,16 +27,19 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20220515 46and2: Updated version, removed python2, New maintainer.
+# 20220908 46and2: Updated version.
+# -build process changed to fix issue with versions >3.3.20.
+# 20230915 46and2: Updated version, deps, various fixes.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=flexget
 SRCNAM=FlexGet
-PRGNAM=${SRCNAM,,}
-VERSION=${VERSION:-2.11.9}
+VERSION=${VERSION:-3.9.19}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -45,6 +49,15 @@ if [ -z "$ARCH" ]; then
   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
@@ -56,14 +69,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 {} \+
 
 # Remove versions from requirements
 sed -i "s/==.*//" requirements.txt
 
-python setup.py install --root=$PKG
+# remove modules already included in python3.9 or win32
+sed -i -E -e '/^(backports-zoneinfo|pkgutil-resolve-name)/d' \
+  -e '/^(pywin32|win32-setctime)/d' requirements.txt
+
+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
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a LICENSE README.rst PKG-INFO $PKG/usr/doc/$PRGNAM-$VERSION
@@ -74,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/network/flexget/flexget.info b/network/flexget/flexget.info
index 0cd6588dc5..3aeb1d5c53 100644
--- a/network/flexget/flexget.info
+++ b/network/flexget/flexget.info
@@ -1,10 +1,10 @@
 PRGNAM="flexget"
-VERSION="2.11.9"
+VERSION="3.9.19"
 HOMEPAGE="https://flexget.com/"
-DOWNLOAD="https://pypi.python.org/packages/d7/e4/e543975ddfee11b138af0096cdcb21fe730d0297bb0f43d014b7818e14b9/FlexGet-2.11.9.tar.gz"
-MD5SUM="d6c6636c25d96e3c1ee7eb4628cef4d0"
+DOWNLOAD="https://files.pythonhosted.org/packages/source/f/flexget/FlexGet-3.9.19.tar.gz"
+MD5SUM="148a5eb3cb226fec011f568a42a5f573"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="feedparser SQLAlchemy PyYAML BeautifulSoup4 html5lib PyRSS2Gen pynzb rpyc path.py pathlib guessit APScheduler terminaltables colorclass CherryPy Flask-RESTful flask-restplus Flask-Compress Flask-Login Flask-Cors pyparsing zxcvbn-python python-future python-requests"
-MAINTAINER="Dimitris Zlatanidis"
-EMAIL="d.zlatanidis@gmail.com"
+REQUIRES="feedparser SQLAlchemy BeautifulSoup4 html5lib python3-PyRSS2Gen python3-pynzb python3-rpyc python3-guessit python3-APScheduler python3-CherryPy python3-Flask-RESTful python3-Flask-RESTX python3-Flask-Compress python3-Flask-Login python3-Flask-Cors python3-zxcvbn python3-rich pytz-deprecation-shim python3-loguru tzdata python3-psutil colorama CommonMark python3-brotlicffi"
+MAINTAINER="fourtysixandtwo"
+EMAIL="fourtysixandtwo@sliderr.net"
diff --git a/network/floorp-bin/README b/network/floorp-bin/README
new file mode 100644
index 0000000000..0a950e6c36
--- /dev/null
+++ b/network/floorp-bin/README
@@ -0,0 +1,8 @@
+Floorp is a fork of Firefox from Japan with a highly customizable UI and
+better privacy and security defaults.
+
+This is repackaged for Slackware from the official GitHub repository. 
+It installs to /usr/lib64 by default (like Firefox) but you can 
+install it anywhere you want with the INSTALLDIR variable.
+
+Example: INSTALLDIR="/opt" ./floorp-bin.SlackBuild
diff --git a/network/hipchat2/doinst.sh b/network/floorp-bin/doinst.sh
index 65c7e2eeb9..65c7e2eeb9 100644
--- a/network/hipchat2/doinst.sh
+++ b/network/floorp-bin/doinst.sh
diff --git a/network/floorp-bin/floorp-bin.SlackBuild b/network/floorp-bin/floorp-bin.SlackBuild
new file mode 100644
index 0000000000..0c0313f8f3
--- /dev/null
+++ b/network/floorp-bin/floorp-bin.SlackBuild
@@ -0,0 +1,111 @@
+#!/bin/bash
+
+# Slackware build script for floorp-bin
+
+# Copyright 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=floorp-bin
+VERSION=${VERSION:-11.11.1}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+INSTALLDIR=${INSTALLDIR:-/usr/lib64}
+
+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="${ARCH:-$(uname -m)}"
+if [ "$ARCH" != "x86_64" ]; then
+	echo "$ARCH is not supported for $PRGNAM-$VERSION."
+	exit 1;
+fi
+
+if [ -n "${PRINT_PACKAGE_NAME}" ]; then
+	echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+	exit 0
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+rm -rf floorp-$VERSION-linux-x86_64
+tar xvf $CWD/floorp-$VERSION.linux-x86_64.tar.?z*
+cd floorp
+
+mkdir -p $PKG/$INSTALLDIR/floorp
+mkdir -p $PKG/usr/share/{applications,pixmaps}
+mkdir -p $PKG/usr/bin
+mkdir -p $PKG/$INSTALLDIR/floorp/distribution
+cp $CWD/floorp.desktop $PKG/usr/share/applications
+mv * $PKG/$INSTALLDIR/floorp
+cp $PKG/$INSTALLDIR/floorp/browser/chrome/icons/default/default128.png $PKG/usr/share/pixmaps/floorp.png
+chmod +x $PKG/$INSTALLDIR/floorp/floorp
+
+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
+
+# Launch Floorp from the terminal
+install -Dm755 /dev/stdin $PKG/usr/bin/floorp << EOF
+#!/bin/sh
+#
+# Shell script to start the Floorp browser.
+#
+
+# Start Floorp:
+exec $INSTALLDIR/floorp/floorp "\$@"
+EOF
+
+# Disable auto updating
+install -Dvm644 /dev/stdin $PKG/$INSTALLDIR/floorp/distribution/policies.json << EOF
+{
+  "policies": {
+    "DisableAppUpdate": true
+  }
+}
+EOF
+
+# Make package
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/network/floorp-bin/floorp-bin.info b/network/floorp-bin/floorp-bin.info
new file mode 100644
index 0000000000..d428c39fca
--- /dev/null
+++ b/network/floorp-bin/floorp-bin.info
@@ -0,0 +1,10 @@
+PRGNAM="floorp-bin"
+VERSION="11.11.1"
+HOMEPAGE="https://floorp.app/en/"
+DOWNLOAD="UNSUPPORTED"
+MD5SUM=""
+DOWNLOAD_x86_64="https://github.com/Floorp-Projects/Floorp/releases/download/v11.11.1/floorp-11.11.1.linux-x86_64.tar.bz2"
+MD5SUM_x86_64="86c098def8fce66190221169192cbdbd"
+REQUIRES=""
+MAINTAINER="Hunter Ellett"
+EMAIL="hunter2k1@disroot.org"
diff --git a/network/floorp-bin/floorp.desktop b/network/floorp-bin/floorp.desktop
new file mode 100644
index 0000000000..bab1fb08b6
--- /dev/null
+++ b/network/floorp-bin/floorp.desktop
@@ -0,0 +1,273 @@
+[Desktop Entry]
+Version=1.0
+Name=Floorp
+GenericName=Web Browser
+GenericName[ca]=Navegador web
+GenericName[cs]=Webový prohlížeč
+GenericName[es]=Navegador web
+GenericName[fa]=مرورگر اینترنتی
+GenericName[fi]=WWW-selain
+GenericName[fr]=Navigateur Web
+GenericName[hu]=Webböngésző
+GenericName[it]=Browser Web
+GenericName[ja]=ウェブ・ブラウザ
+GenericName[ko]=웹 브라우저
+GenericName[nb]=Nettleser
+GenericName[nl]=Webbrowser
+GenericName[nn]=Nettlesar
+GenericName[no]=Nettleser
+GenericName[pl]=Przeglądarka WWW
+GenericName[pt]=Navegador Web
+GenericName[pt_BR]=Navegador Web
+GenericName[sk]=Internetový prehliadač
+GenericName[sv]=Webbläsare
+Comment=Browse the Web
+Comment[ca]=Navegueu per el web
+Comment[cs]=Prohlížení stránek World Wide Webu
+Comment[de]=Im Internet surfen
+Comment[es]=Navegue por la web
+Comment[fa]=صفحات شبکه جهانی اینترنت را مرور نمایید
+Comment[fi]=Selaa Internetin WWW-sivuja
+Comment[fr]=Navigue sur Internet
+Comment[hu]=A világháló böngészése
+Comment[it]=Esplora il web
+Comment[ja]=ウェブを閲覧します
+Comment[ko]=웹을 돌아 다닙니다
+Comment[nb]=Surf på nettet
+Comment[nl]=Verken het internet
+Comment[nn]=Surf på nettet
+Comment[no]=Surf på nettet
+Comment[pl]=Przeglądanie stron WWW
+Comment[pt]=Navegue na Internet
+Comment[pt_BR]=Navegue na Internet
+Comment[sk]=Prehliadanie internetu
+Comment[sv]=Surfa på webben
+Exec=floorp --class="floorp" %u
+Icon=floorp
+Terminal=false
+Type=Application
+MimeType=text/html;text/xml;application/xhtml+xml;application/vnd.mozilla.xul+xml;text/mml;x-scheme-handler/http;x-scheme-handler/https;
+Categories=Network;WebBrowser;
+Keywords=web;browser;internet;
+Actions=new-window;new-private-window;profile-manager-window;
+
+[Desktop Action new-window]
+Name=Open a New Window
+Name[ach]=Dirica manyen
+Name[af]=Nuwe venster
+Name[an]=Nueva finestra
+Name[ar]=نافذة جديدة
+Name[as]=নতুন উইন্ডো
+Name[ast]=Ventana nueva
+Name[az]=Yeni Pəncərə
+Name[be]=Новае акно
+Name[bg]=Нов прозорец
+Name[bn-BD]=নতুন উইন্ডো (N)
+Name[bn-IN]=নতুন উইন্ডো
+Name[br]=Prenestr nevez
+Name[brx]=गोदान उइन्ड'(N)
+Name[bs]=Novi prozor
+Name[ca]=Finestra nova
+Name[cak]=K'ak'a' tzuwäch
+Name[cs]=Nové okno
+Name[cy]=Ffenestr Newydd
+Name[da]=Nyt vindue
+Name[de]=Neues Fenster
+Name[dsb]=Nowe wokno
+Name[el]=Νέο παράθυρο
+Name[en-GB]=New Window
+Name[en-US]=New Window
+Name[en-ZA]=New Window
+Name[eo]=Nova fenestro
+Name[es-AR]=Nueva ventana
+Name[es-CL]=Nueva ventana
+Name[es-ES]=Nueva ventana
+Name[es-MX]=Nueva ventana
+Name[et]=Uus aken
+Name[eu]=Leiho berria
+Name[fa]=پنجره جدید‌
+Name[ff]=Henorde Hesere
+Name[fi]=Uusi ikkuna
+Name[fr]=Nouvelle fenêtre
+Name[fy-NL]=Nij finster
+Name[ga-IE]=Fuinneog Nua
+Name[gd]=Uinneag ùr
+Name[gl]=Nova xanela
+Name[gn]=Ovetã pyahu
+Name[gu-IN]=નવી વિન્ડો
+Name[he]=חלון חדש
+Name[hi-IN]=नया विंडो
+Name[hr]=Novi prozor
+Name[hsb]=Nowe wokno
+Name[hu]=Új ablak
+Name[hy-AM]=Նոր Պատուհան
+Name[id]=Jendela Baru
+Name[is]=Nýr gluggi
+Name[it]=Nuova finestra
+Name[ja]=新しいウィンドウ
+Name[ja-JP-mac]=新規ウインドウ
+Name[ka]=ახალი ფანჯარა
+Name[kk]=Жаңа терезе
+Name[km]=បង្អួច​​​ថ្មី
+Name[kn]=ಹೊಸ ಕಿಟಕಿ
+Name[ko]=새 창
+Name[kok]=नवें जनेल
+Name[ks]=نئئ وِنڈو
+Name[lij]=Neuvo barcon
+Name[lo]=ຫນ້າຕ່າງໃຫມ່
+Name[lt]=Naujas langas
+Name[ltg]=Jauns lūgs
+Name[lv]=Jauns logs
+Name[mai]=नव विंडो
+Name[mk]=Нов прозорец
+Name[ml]=പുതിയ ജാലകം
+Name[mr]=नवीन पटल
+Name[ms]=Tetingkap Baru
+Name[my]=ဝင်းဒိုးအသစ်
+Name[nb-NO]=Nytt vindu
+Name[ne-NP]=नयाँ सञ्झ्याल
+Name[nl]=Nieuw venster
+Name[nn-NO]=Nytt vindauge
+Name[or]=ନୂତନ ୱିଣ୍ଡୋ
+Name[pa-IN]=ਨਵੀਂ ਵਿੰਡੋ
+Name[pl]=Nowe okno
+Name[pt-BR]=Nova janela
+Name[pt-PT]=Nova janela
+Name[rm]=Nova fanestra
+Name[ro]=Fereastră nouă
+Name[ru]=Новое окно
+Name[sat]=नावा विंडो (N)
+Name[si]=නව කවුළුවක්
+Name[sk]=Nové okno
+Name[sl]=Novo okno
+Name[son]=Zanfun taaga
+Name[sq]=Dritare e Re
+Name[sr]=Нови прозор
+Name[sv-SE]=Nytt fönster
+Name[ta]=புதிய சாளரம்
+Name[te]=కొత్త విండో
+Name[th]=หน้าต่างใหม่
+Name[tr]=Yeni pencere
+Name[tsz]=Eraatarakua jimpani
+Name[uk]=Нове вікно
+Name[ur]=نیا دریچہ
+Name[uz]=Yangi oyna
+Name[vi]=Cửa sổ mới
+Name[wo]=Palanteer bu bees
+Name[xh]=Ifestile entsha
+Name[zh-CN]=新建窗口
+Name[zh-TW]=開新視窗
+Exec=floorp --class="floorp" --new-window %u
+
+[Desktop Action new-private-window]
+Name=Open a New Private Window
+Name[ach]=Dirica manyen me mung
+Name[af]=Nuwe privaatvenster
+Name[an]=Nueva finestra privada
+Name[ar]=نافذة خاصة جديدة
+Name[as]=নতুন ব্যক্তিগত উইন্ডো
+Name[ast]=Ventana privada nueva
+Name[az]=Yeni Məxfi Pəncərə
+Name[be]=Новае акно адасаблення
+Name[bg]=Нов прозорец за поверително сърфиране
+Name[bn-BD]=নতুন ব্যক্তিগত উইন্ডো
+Name[bn-IN]=নতুন ব্যক্তিগত উইন্ডো
+Name[br]=Prenestr merdeiñ prevez nevez
+Name[brx]=गोदान प्राइभेट उइन्ड'
+Name[bs]=Novi privatni prozor
+Name[ca]=Finestra privada nova
+Name[cak]=K'ak'a' ichinan tzuwäch
+Name[cs]=Nové anonymní okno
+Name[cy]=Ffenestr Breifat Newydd
+Name[da]=Nyt privat vindue
+Name[de]=Neues privates Fenster
+Name[dsb]=Nowe priwatne wokno
+Name[el]=Νέο παράθυρο ιδιωτικής περιήγησης
+Name[en-GB]=New Private Window
+Name[en-US]=New Private Window
+Name[en-ZA]=New Private Window
+Name[eo]=Nova privata fenestro
+Name[es-AR]=Nueva ventana privada
+Name[es-CL]=Nueva ventana privada
+Name[es-ES]=Nueva ventana privada
+Name[es-MX]=Nueva ventana privada
+Name[et]=Uus privaatne aken
+Name[eu]=Leiho pribatu berria
+Name[fa]=پنجره ناشناس جدید
+Name[ff]=Henorde Suturo Hesere
+Name[fi]=Uusi yksityinen ikkuna
+Name[fr]=Nouvelle fenêtre de navigation privée
+Name[fy-NL]=Nij priveefinster
+Name[ga-IE]=Fuinneog Nua Phríobháideach
+Name[gd]=Uinneag phrìobhaideach ùr
+Name[gl]=Nova xanela privada
+Name[gn]=Ovetã ñemi pyahu
+Name[gu-IN]=નવી ખાનગી વિન્ડો
+Name[he]=חלון פרטי חדש
+Name[hi-IN]=नयी निजी विंडो
+Name[hr]=Novi privatni prozor
+Name[hsb]=Nowe priwatne wokno
+Name[hu]=Új privát ablak
+Name[hy-AM]=Սկսել Գաղտնի դիտարկում
+Name[id]=Jendela Mode Pribadi Baru
+Name[is]=Nýr huliðsgluggi
+Name[it]=Nuova finestra anonima
+Name[ja]=新しいプライベートウィンドウ
+Name[ja-JP-mac]=新規プライベートウインドウ
+Name[ka]=ახალი პირადი ფანჯარა
+Name[kk]=Жаңа жекелік терезе
+Name[km]=បង្អួច​ឯកជន​ថ្មី
+Name[kn]=ಹೊಸ ಖಾಸಗಿ ಕಿಟಕಿ
+Name[ko]=새 사생활 보호 모드
+Name[kok]=नवो खाजगी विंडो
+Name[ks]=نْو پرایوٹ وینڈو&amp;
+Name[lij]=Neuvo barcon privou
+Name[lo]=ເປີດຫນ້າຕ່າງສວນຕົວຂື້ນມາໃຫມ່
+Name[lt]=Naujas privataus naršymo langas
+Name[ltg]=Jauns privatais lūgs
+Name[lv]=Jauns privātais logs
+Name[mai]=नया निज विंडो (W)
+Name[mk]=Нов приватен прозорец
+Name[ml]=പുതിയ സ്വകാര്യ ജാലകം
+Name[mr]=नवीन वैयक्तिक पटल
+Name[ms]=Tetingkap Persendirian Baharu
+Name[my]=New Private Window
+Name[nb-NO]=Nytt privat vindu
+Name[ne-NP]=नयाँ निजी सञ्झ्याल
+Name[nl]=Nieuw privévenster
+Name[nn-NO]=Nytt privat vindauge
+Name[or]=ନୂତନ ବ୍ୟକ୍ତିଗତ ୱିଣ୍ଡୋ
+Name[pa-IN]=ਨਵੀਂ ਪ੍ਰਾਈਵੇਟ ਵਿੰਡੋ
+Name[pl]=Nowe okno prywatne
+Name[pt-BR]=Nova janela privativa
+Name[pt-PT]=Nova janela privada
+Name[rm]=Nova fanestra privata
+Name[ro]=Fereastră privată nouă
+Name[ru]=Новое приватное окно
+Name[sat]=नावा निजेराक् विंडो (W )
+Name[si]=නව පුද්ගලික කවුළුව (W)
+Name[sk]=Nové okno v režime Súkromné prehliadanie
+Name[sl]=Novo zasebno okno
+Name[son]=Sutura zanfun taaga
+Name[sq]=Dritare e Re Private
+Name[sr]=Нови приватан прозор
+Name[sv-SE]=Nytt privat fönster
+Name[ta]=புதிய தனிப்பட்ட சாளரம்
+Name[te]=కొత్త ఆంతరంగిక విండో
+Name[th]=หน้าต่างส่วนตัวใหม่
+Name[tr]=Yeni gizli pencere
+Name[tsz]=Juchiiti eraatarakua jimpani
+Name[uk]=Приватне вікно
+Name[ur]=نیا نجی دریچہ
+Name[uz]=Yangi maxfiy oyna
+Name[vi]=Cửa sổ riêng tư mới
+Name[wo]=Panlanteeru biir bu bees
+Name[xh]=Ifestile yangasese entsha
+Name[zh-CN]=新建隐私浏览窗口
+Name[zh-TW]=新增隱私視窗
+Exec=floorp --class="floorp" --private-window %u
+
+[Desktop Action profile-manager-window]
+Name=Open the Profile Manager
+Name[cs]=Správa profilů
+Exec=floorp --class="floorp" --ProfileManager %u
diff --git a/network/floorp-bin/slack-desc b/network/floorp-bin/slack-desc
new file mode 100644
index 0000000000..24a70310ca
--- /dev/null
+++ b/network/floorp-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 ':'.
+
+          |-----handy-ruler------------------------------------------------------|
+floorp-bin: floorp-bin (Web browser)
+floorp-bin:
+floorp-bin: Floorp is an advanced fork of Firefox with UI and security
+floorp-bin: improvements.
+floorp-bin:
+floorp-bin: https://floorp.app/en/
+floorp-bin:
+floorp-bin:
+floorp-bin:
+floorp-bin:
+floorp-bin:
diff --git a/network/flvstreamer/README b/network/flvstreamer/README
index cd249d2b6e..77e43de8f6 100644
--- a/network/flvstreamer/README
+++ b/network/flvstreamer/README
@@ -1,8 +1,10 @@
-flvstreamer is an open source command-line RTMP client intended to stream audio
-or video content from all types of flash or rtmp servers. Forked from rtmpdump
-v1.6 with encrypted rtmp and swf verification support removed. 
+flvstreamer is an open source command-line RTMP client intended
+to stream audio or video content from all types of flash or rtmp
+servers. Forked from rtmpdump v1.6 with encrypted rtmp and swf
+verification support removed.
 
-This tool provides free interoperability with the previously undocumented adobe
-RTMP protocol so widely in use on the internet today. It was developed entirely
-by reverse engineering methods and without access to any proprietary or
-restrictive-license protocol specifications.
+This tool provides free interoperability with the previously
+undocumented adobe RTMP protocol so widely in use on the internet
+today. It was developed entirely by reverse engineering methods and
+without access to any proprietary or restrictive-license protocol
+specifications.
diff --git a/network/flvstreamer/flvstreamer.SlackBuild b/network/flvstreamer/flvstreamer.SlackBuild
index 52103c2fbc..9ee1c3cdb8 100644
--- a/network/flvstreamer/flvstreamer.SlackBuild
+++ b/network/flvstreamer/flvstreamer.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for flvstreamer
 
@@ -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=flvstreamer
 VERSION=${VERSION:-2.1c}
 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/network/fping/README b/network/fping/README
index f989e116d1..2541823573 100644
--- a/network/fping/README
+++ b/network/fping/README
@@ -1,4 +1,7 @@
-fping is a ping(1) like program which uses the Internet Control Message
-Protocol (ICMP) echo request to determine if a host is up. fping is
-different from ping in that you can specify any number of hosts on the
-command line, or specify a file containing the lists of hosts to ping.
+fping (send ICMP ECHO_REQUEST packets to network hosts)
+
+fping is a program to send ICMP echo probes to network hosts, similar
+to ping, but much better performing when pinging multiple hosts.
+
+NOTE: Old fping and fping6 packages are no longer needed, and should
+probably be removed before installing this one.
diff --git a/network/fping/fping.SlackBuild b/network/fping/fping.SlackBuild
index e3d137350e..73670559b0 100644
--- a/network/fping/fping.SlackBuild
+++ b/network/fping/fping.SlackBuild
@@ -1,33 +1,34 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for fping
-# Copyright (c) 2008, Written by Mark Walling <mark@markwalling.org>
 
+# Copyright 2015, 2016, 2020  Mario Preksavec, Zagreb, Croatia
 # 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.
+# 1. 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.
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=fping
-VERSION=${VERSION:-2.4b2_to}
+VERSION=${VERSION:-5.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -37,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,14 +70,14 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar -xzvf $CWD/$PRGNAM.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 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
@@ -78,24 +86,28 @@ CXXFLAGS="$SLKCFLAGS" \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
   --sysconfdir=/etc \
   --localstatedir=/var \
-  --mandir=/usr/man
+  --mandir=/usr/man \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --enable-ipv4 \
+  --enable-ipv6 \
+  --build=$ARCH-slackware-linux
+
 make
 make 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
 
-( 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 COPYING ChangeLog README INSTALL $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a CHANGELOG.md COPYING INSTALL README.md doc/README.1992 \
+  $PKG/usr/doc/$PRGNAM-$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/network/fping/fping.info b/network/fping/fping.info
index 9807786c93..883aa40729 100644
--- a/network/fping/fping.info
+++ b/network/fping/fping.info
@@ -1,10 +1,10 @@
 PRGNAM="fping"
-VERSION="2.4b2_to"
-HOMEPAGE="http://fping.sourceforge.net/"
-DOWNLOAD="http://fping.sourceforge.net/download/fping.tar.gz"
-MD5SUM="d5e8be59e307cef76bc479e1684df705"
+VERSION="5.0"
+HOMEPAGE="http://fping.org/"
+DOWNLOAD="http://fping.org/dist/fping-5.0.tar.gz"
+MD5SUM="6af4c39bf012af75f93983d0efa242b0"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Mark Walling"
-EMAIL="mark@markwalling.org"
+MAINTAINER="Mario Preksavec"
+EMAIL="mario at slackware dot hr"
diff --git a/network/fping/slack-desc b/network/fping/slack-desc
index 4a4d21fbb6..4fb3962c17 100644
--- a/network/fping/slack-desc
+++ b/network/fping/slack-desc
@@ -6,14 +6,14 @@
 # customary to leave one space after the ':' except on otherwise blank lines.
 
      |-----handy-ruler------------------------------------------------------|
-fping: fping (a ping like program to send ICMP echo requests)
+fping: fping (send ICMP ECHO_REQUEST packets to network hosts)
+fping:
+fping: fping is a program to send ICMP echo probes to network hosts, similar
+fping: to ping, but much better performing when pinging multiple hosts.
+fping:
+fping: Homepage: http://fping.org/
+fping:
 fping:
-fping: fping is a ping(1) like program which uses the Internet Control
-fping: Message Protocol (ICMP) echo request to determine if a host is up.
-fping: fping is different from ping in that you can specify any number of
-fping: hosts on the command line, or specify a file containing the lists of
-fping: hosts to ping.
 fping:
-fping: http://fping.sourceforge.net/
 fping:
 fping:
diff --git a/network/fping3/README b/network/fping3/README
deleted file mode 100644
index 8370986017..0000000000
--- a/network/fping3/README
+++ /dev/null
@@ -1,7 +0,0 @@
-fping3 (send ICMP ECHO_REQUEST packets to network hosts)
-
-fping is a program to send ICMP echo probes to network hosts, similar to ping,
-but much better performing when pinging multiple hosts.
-
-NOTE: Old fping and fping6 packages are no longer needed, and should probably
-be removed before installing this one.
diff --git a/network/fping3/fping3.SlackBuild b/network/fping3/fping3.SlackBuild
deleted file mode 100644
index 06fe8076bc..0000000000
--- a/network/fping3/fping3.SlackBuild
+++ /dev/null
@@ -1,103 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for fping3
-
-# Copyright 2015, 2016  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=fping3
-SRCNAM=fping
-VERSION=${VERSION:-3.13}
-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/$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 \
-  --enable-ipv4 \
-  --enable-ipv6 \
-  --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 ChangeLog INSTALL README doc/README.1992 $PKG/usr/doc/$PRGNAM-$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/network/fping3/fping3.info b/network/fping3/fping3.info
deleted file mode 100644
index 6f597a3c17..0000000000
--- a/network/fping3/fping3.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="fping3"
-VERSION="3.13"
-HOMEPAGE="http://fping.org/"
-DOWNLOAD="http://fping.org/dist/fping-3.13.tar.gz"
-MD5SUM="a39134baca6bc6ced56191cb51fb0dc2"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Mario Preksavec"
-EMAIL="mario at slackware dot hr"
diff --git a/network/fping3/slack-desc b/network/fping3/slack-desc
deleted file mode 100644
index e65a12eed9..0000000000
--- a/network/fping3/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------------------------------------------------------|
-fping3: fping3 (send ICMP ECHO_REQUEST packets to network hosts)
-fping3:
-fping3: fping is a program to send ICMP echo probes to network hosts, similar
-fping3: to ping, but much better performing when pinging multiple hosts.
-fping3:
-fping3: Homepage: http://fping.org/
-fping3:
-fping3:
-fping3:
-fping3:
-fping3:
diff --git a/network/fping6/README b/network/fping6/README
deleted file mode 100644
index f989e116d1..0000000000
--- a/network/fping6/README
+++ /dev/null
@@ -1,4 +0,0 @@
-fping is a ping(1) like program which uses the Internet Control Message
-Protocol (ICMP) echo request to determine if a host is up. fping is
-different from ping in that you can specify any number of hosts on the
-command line, or specify a file containing the lists of hosts to ping.
diff --git a/network/fping6/README.SLACKWARE b/network/fping6/README.SLACKWARE
deleted file mode 100644
index b6e36445f0..0000000000
--- a/network/fping6/README.SLACKWARE
+++ /dev/null
@@ -1,6 +0,0 @@
-The download link points to Debian server, as the package on the original site
-actually is missing IPv6 support - while it claims to be version 2.4b2_to-ipv6,
-it's actually 2.4b2_to.
-Additionally, patches from Debian are applied to make IPv6 compile time flag,
-introduce source IP support, improve manpage and other things.
-To avoid conflicts with standard fping, this version is installed as fping6.
diff --git a/network/fping6/fping.8.diff b/network/fping6/fping.8.diff
deleted file mode 100644
index 87b479152b..0000000000
--- a/network/fping6/fping.8.diff
+++ /dev/null
@@ -1,66 +0,0 @@
---- fping-2.4b2-to-ipv6.orig/fping.8
-+++ fping-2.4b2-to-ipv6/fping.8
-@@ -1,4 +1,4 @@
--.TH fping l

-+.TH fping 8

- .SH NAME

- fping \- send ICMP ECHO_REQUEST packets to network hosts

- .SH SYNOPSIS

-@@ -12,9 +12,9 @@
- 

-       

- .B fping 

--is a 

--.MS ping 8

--like program which uses the Internet Control

-+is a program like

-+.B ping(8)

-+which uses the Internet Control

- Message Protocol (ICMP) echo request to determine if a target host is

- responding. 

- .B fping 

-@@ -37,8 +37,7 @@
- ).

- .PP

- Unlike 

--.B ping

--,

-+.B ping,

- .B fping 

- is meant to be used in scripts, so its output is designed to be 

- easy to parse.

-@@ -130,12 +129,16 @@
- a target will be made, not including the first try.

- .IP \fB-s\fR 5

- Print cumulative statistics upon exit.

-+.IP \fB-S\fIaddr\fR 5

-+Set source address.

- .IP \fB-t\fIn\fR 5

- Initial target timeout in milliseconds (default 500). In the default

- mode, this is the amount of time that 

- .B fping

- waits for a response to its first request.  Successive timeouts are

- multiplied by the backoff factor.

-+.IP \fB-T\fIn\fR 5

-+Select timeout in seconds (default 10).

- .IP \fB-u\fR 5

- Show targets that are unreachable.

- .IP \fB-v\fR 5

-@@ -152,7 +155,7 @@
- example none the less. 

- .nf

- 

--#!/usr/local/bin/perl

-+#!/usr/bin/perl

- require 'open2.pl';

- 

- $MAILTO = "root";

-@@ -178,7 +181,7 @@
- that are currently reachable.

- .nf

- 

--#!/usr/local/bin/perl

-+#!/usr/bin/perl

- 

- $hosts_to_backup = `cat /etc/hosts.backup | fping -a`;

- 

diff --git a/network/fping6/fping.c.diff b/network/fping6/fping.c.diff
deleted file mode 100644
index ae51175477..0000000000
--- a/network/fping6/fping.c.diff
+++ /dev/null
@@ -1,421 +0,0 @@
---- fping-2.4b2-to-ipv6.orig/fping.c
-+++ fping-2.4b2-to-ipv6/fping.c
-@@ -24,7 +24,7 @@
-  *
-  * Original author:  Roland Schemers  <schemers@stanford.edu>
-  * IPv6 Support:     Jeroen Massar    <jeroen@unfix.org / jeroen@ipng.nl>
-- *
-+ * Bugfixes, byte order & senseful seq.-numbers: Stephan Fuhrmann (stephan.fuhrmann AT 1und1.de)
-  *
-  *
-  * RCS header information no longer used.  It has been moved to the
-@@ -42,7 +42,6 @@
-  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
-  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-  */
--#define IPV6 1						/* This should be a compiler option, or even better be done from the Makefile... ;) */
- 
- #ifndef _NO_PROTO
- #if !__STDC__ && !defined( __cplusplus ) && !defined( FUNCPROTO ) \
-@@ -101,13 +100,8 @@
- #endif
- #include <netinet/in_systm.h>
- 
--/* Linux has bizarre ip.h and ip_icmp.h */
--#if defined( __linux__ )
--#include "linux.h"
--#else
- #include <netinet/ip.h>
- #include <netinet/ip_icmp.h>
--#endif /* defined(__linux__) */
- 
- #include <arpa/inet.h>
- #include <netdb.h>
-@@ -150,7 +144,11 @@
- #define MIN_PING_DATA	sizeof( PING_DATA )
- #define	MAX_IP_PACKET	65536	/* (theoretical) max IP packet size */
- #define SIZE_IP_HDR		20
-+#ifndef IPV6
- #define SIZE_ICMP_HDR	ICMP_MINLEN		/* from ip_icmp.h */
-+#else
-+#define SIZE_ICMP_HDR	sizeof(FPING_ICMPHDR)
-+#endif
- #define MAX_PING_DATA	( MAX_IP_PACKET - SIZE_IP_HDR - SIZE_ICMP_HDR )
- 
- /* sized so as to be like traditional ping */
-@@ -283,6 +281,12 @@
- u_int count = 1;
- u_int trials;
- u_int report_interval = 0;
-+int src_addr_present = 0;
-+#ifndef IPV6
-+struct in_addr src_addr;
-+#else
-+struct in6_addr src_addr;
-+#endif
- 
- /* global stats */
- long max_reply = 0;
-@@ -292,6 +296,7 @@
- int max_hostname_len = 0;
- int num_jobs = 0;					/* number of hosts still to do */
- int num_hosts;						/* total number of hosts */
-+int max_seq_sent = 0;				/* maximum sequence number sent so far */
- int num_alive = 0,					/* total number alive */
-     num_unreachable = 0,			/* total number unreachable */
-     num_noaddress = 0;				/* total number of addresses not found */
-@@ -408,6 +413,11 @@
- 	struct protoent *proto;
- 	char *buf;
- 	uid_t uid;
-+#ifndef IPV6
-+	struct sockaddr_in sa;
-+#else
-+	struct sockaddr_in6 sa;
-+#endif
- 	/* check if we are root */
- 
- 	if( geteuid() )
-@@ -439,7 +449,7 @@
- 
- #ifdef IPV6
- 	/*
--	 * let the kerel pass extension headers of incoming packets,
-+	 * let the kernel pass extension headers of incoming packets,
- 	 * for privileged socket options
- 	 */
- #ifdef IPV6_RECVHOPOPTS
-@@ -474,6 +484,35 @@
- 		    sizeof(opton)))
- 			err(1, "setsockopt(IPV6_RTHDR)");
- #endif
-+#ifndef USE_SIN6_SCOPE_ID
-+#ifdef IPV6_RECVPKTINFO
-+		if (setsockopt(s, IPPROTO_IPV6, IPV6_RECVPKTINFO, &opton,
-+		    sizeof(opton)))
-+			err(1, "setsockopt(IPV6_RECVPKTINFO)");
-+#else  /* old adv. API */
-+		if (setsockopt(s, IPPROTO_IPV6, IPV6_PKTINFO, &opton,
-+		    sizeof(opton)))
-+			err(1, "setsockopt(IPV6_PKTINFO)");
-+#endif
-+#endif /* USE_SIN6_SCOPE_ID */
-+#ifdef IPV6_RECVHOPLIMIT
-+		if (setsockopt(s, IPPROTO_IPV6, IPV6_RECVHOPLIMIT, &opton,
-+		    sizeof(opton)))
-+			err(1, "setsockopt(IPV6_RECVHOPLIMIT)");
-+#else  /* old adv. API */
-+		if (setsockopt(s, IPPROTO_IPV6, IPV6_HOPLIMIT, &opton,
-+		    sizeof(opton)))
-+			err(1, "setsockopt(IPV6_HOPLIMIT)");
-+#endif
-+#ifdef IPV6_CHECKSUM
-+#ifndef SOL_RAW
-+#define SOL_RAW IPPROTO_IPV6
-+#endif
-+		opton = 2;
-+		if (setsockopt(s, SOL_RAW, IPV6_CHECKSUM, &opton,
-+		    sizeof(opton)))
-+			err(1, "setsockopt(SOL_RAW,IPV6_CHECKSUM)");
-+#endif
- #endif
- 
- 	if( ( uid = getuid() ) )
-@@ -491,7 +530,7 @@
- 
- 	/* get command line options */
- 
--	while( ( c = getopt( argc, argv, "gedhlmnqusaAvz:t:i:p:f:r:c:b:C:Q:B:" ) ) != EOF )
-+	while( ( c = getopt( argc, argv, "gedhlmnqusaAvz:t:i:p:f:r:c:b:C:Q:B:S:I:T:" ) ) != EOF )
- 	{
- 		switch( c )
- 		{
-@@ -502,7 +541,7 @@
- 			break;
- 		
- 		case 'r':
--			if( !( retry = ( u_int )atoi( optarg ) ) )
-+			if( ( retry = ( u_int )atoi( optarg ) ) < 0 )
- 				usage();
- 
- 			break;
-@@ -639,6 +678,27 @@
- 			generate_flag = 1;
- 			break;
- 
-+		case 'S':
-+#ifndef IPV6
-+			if( ! inet_pton( AF_INET, optarg, &src_addr ) )
-+#else
-+			if( ! inet_pton( AF_INET6, optarg, &src_addr ) )
-+#endif
-+				usage();
-+			src_addr_present = 1;
-+			break;
-+
-+		case 'I':
-+		        if (setsockopt(s, SOL_SOCKET, SO_BINDTODEVICE, optarg,
-+		                   strlen(optarg)))
-+			        err(1, "setsockopt(AF_INET, SO_BINDTODEVICE)");
-+		        break;
-+
-+		case 'T':
-+		        if ( ! ( select_time = ( u_int )atoi( optarg ) * 100 ) )
-+				usage();
-+		        break;
-+
- 		default:
- 			usage();
- 			break;
-@@ -821,7 +881,7 @@
- 			errno_crash_and_burn( "fopen" );
- 
- 
--		while( fgets( line, 132, ping_file ) )
-+		while( fgets( line, sizeof(line), ping_file ) )
- 		{
- 			if( sscanf( line, "%s", host ) != 1 )
- 				continue;
-@@ -962,6 +1022,22 @@
- 	if( !num_hosts )
- 		exit( 2 );
- 
-+	/* set the source address */
-+
-+	if( src_addr_present )
-+	{
-+		memset( &sa, 0, sizeof( sa ) );
-+#ifndef IPV6
-+		sa.sin_family = AF_INET;
-+		sa.sin_addr = src_addr;
-+#else
-+		sa.sin6_family = AF_INET6;
-+		sa.sin6_addr = src_addr;
-+#endif
-+		if ( bind( s, (struct sockaddr *)&sa, sizeof( sa ) ) < 0 )
-+			errno_crash_and_burn( "cannot bind source address" );
-+	}
-+
- 	/* allocate array to hold outstanding ping requests */
- 
- 	table = ( HOST_ENTRY** )malloc( sizeof( HOST_ENTRY* ) * num_hosts );
-@@ -1112,7 +1188,7 @@
- 		/* but allow time for the last one to come in */
- 		if( count_flag )
- 		{
--			if( ( cursor->num_sent >= count ) && ( ht > cursor->timeout ) )
-+			if( ( cursor->num_sent >= count ) && ( cursor->num_recv >= count || ht > cursor->timeout ) )
- 			{
- 				remove_job( cursor );
- 				continue;
-@@ -1153,6 +1229,7 @@
- 	
- 	finish();
- 
-+	return 0;
- } /* main() */
- 
- 
-@@ -1382,15 +1459,15 @@
- 		if( h->num_recv_i <= h->num_sent_i )
- 		{
- 			fprintf( stderr, " xmt/rcv/%%loss = %d/%d/%d%%",
--				h->num_sent_i, h->num_recv_i,
--				( ( h->num_sent_i - h->num_recv_i ) * 100 ) / h->num_sent_i );
-+				h->num_sent_i, h->num_recv_i, h->num_sent_i > 0 ?
-+				( ( h->num_sent_i - h->num_recv_i ) * 100 ) / h->num_sent_i : 0 );
- 
- 		}/* IF */
- 		else
- 		{
- 			fprintf( stderr, " xmt/rcv/%%return = %d/%d/%d%%",
--				h->num_sent_i, h->num_recv_i,
--				( ( h->num_recv_i * 100 ) / h->num_sent_i ) );
-+				h->num_sent_i, h->num_recv_i, h->num_sent_i > 0 ?
-+				( ( h->num_recv_i * 100 ) / h->num_sent_i ) : 0 );
- 
- 		}/* ELSE */
- 
-@@ -1504,12 +1581,15 @@
- 	icp = ( FPING_ICMPHDR* )buffer;
- 
- 	gettimeofday( &h->last_send_time, &tz );
-+	int myseq = h->num_sent * num_hosts + h->i;
-+	max_seq_sent = myseq > max_seq_sent ? myseq : max_seq_sent;
-+
- #ifndef IPV6
- 	icp->icmp_type = ICMP_ECHO;
- 	icp->icmp_code = 0;
- 	icp->icmp_cksum = 0;
--	icp->icmp_seq = h->i;
--	icp->icmp_id = ident;
-+	icp->icmp_seq = htons(myseq);
-+	icp->icmp_id = htons(ident);
- 
- 	pdp = ( PING_DATA* )( buffer + SIZE_ICMP_HDR );
- 	pdp->ping_ts = h->last_send_time;
-@@ -1519,8 +1599,8 @@
- #else
- 	icp->icmp6_type = ICMP6_ECHO_REQUEST;
- 	icp->icmp6_code = 0;
--	icp->icmp6_seq = h->i;
--	icp->icmp6_id = ident;
-+	icp->icmp6_seq = htons(myseq);
-+	icp->icmp6_id = htons(ident);
- 
- 	pdp = ( PING_DATA* )( buffer + SIZE_ICMP_HDR );
- 	pdp->ping_ts = h->last_send_time;
-@@ -1667,25 +1747,25 @@
- 	}/* IF */
- 
- #ifndef IPV6
--	if( icp->icmp_id != ident )
-+	if( ntohs(icp->icmp_id) != ident )
- #else
--	if( icp->icmp6_id != ident )
-+	if( ntohs(icp->icmp6_id) != ident )
- #endif
- 		return 1; /* packet received, but not the one we are looking for! */
- 
- 	num_pingreceived++;
- 
- #ifndef IPV6
--	if( icp->icmp_seq  >= ( n_short )num_hosts )
-+	if( ntohs(icp->icmp_seq)  > max_seq_sent )
- #else
--	if( icp->icmp6_seq  >= ( n_short )num_hosts )
-+	if( ntohs(icp->icmp6_seq) > max_seq_sent )
- #endif
- 		return( 1 ); /* packet received, don't worry about it anymore */
- 
- #ifndef IPV6
--	n = icp->icmp_seq;
-+	n = ntohs(icp->icmp_seq) % num_hosts;
- #else
--	n = icp->icmp6_seq;
-+	n = ntohs(icp->icmp6_seq) % num_hosts;
- #endif
- 	h = table[n];
- 
-@@ -1824,6 +1904,7 @@
- 	
- 	}/* IF */
- 	
-+	fflush( stdout );
- 	return num_jobs;
- 
- } /* wait_for_reply() */
-@@ -1875,11 +1956,11 @@
- 		sent_icmp = ( struct icmp* )( c + 28 );
- 		
- 		if( ( sent_icmp->icmp_type == ICMP_ECHO ) &&
--			( sent_icmp->icmp_id == ident ) &&
--			( sent_icmp->icmp_seq < ( n_short )num_hosts ) )
-+			( ntohs(sent_icmp->icmp_id) == ident ) &&
-+			( ntohs(sent_icmp->icmp_seq) <= ( n_short )max_seq_sent ) )
- 		{
- 			/* this is a response to a ping we sent */
--			h = table[sent_icmp->icmp_seq];
-+			h = table[ntohs(sent_icmp->icmp_seq) % num_hosts];
- 			
- 			if( p->icmp_code > ICMP_UNREACH_MAXTYPE )
- 			{
-@@ -1888,11 +1969,11 @@
- 
- #else
- 		if( ( sent_icmp->icmp6_type == ICMP_ECHO ) &&
--			( sent_icmp->icmp6_id == ident ) &&
--			( sent_icmp->icmp6_seq < ( n_short )num_hosts ) )
-+			( ntohs(sent_icmp->icmp6_id) == ident ) &&
-+			( ntohs(sent_icmp->icmp6_seq) <= ( n_short )max_seq_sent ) )
- 		{
- 			/* this is a response to a ping we sent */
--			h = table[sent_icmp->icmp6_seq];
-+			h = table[ntohs(sent_icmp->icmp6_seq) % num_hosts];
- 			
- 			if( p->icmp6_code > ICMP_UNREACH_MAXTYPE )
- 			{
-@@ -1930,24 +2011,24 @@
- 	case ICMP_PARAMPROB:
- 		sent_icmp = ( FPING_ICMPHDR* )( c + 28 );
- #ifndef IPV6
--		if( ( sent_icmp->icmp_type = ICMP_ECHO ) && 
--			( sent_icmp->icmp_id = ident ) &&
--			( sent_icmp->icmp_seq < ( n_short )num_hosts ) )
-+		if( ( sent_icmp->icmp_type == ICMP_ECHO ) &&
-+			( ntohs(sent_icmp->icmp_id) == ident ) &&
-+			( ntohs(sent_icmp->icmp_seq) <= ( n_short )max_seq_sent ) )
- 		{
- 			/* this is a response to a ping we sent */
--			h = table[sent_icmp->icmp_seq];
-+			h = table[ntohs(sent_icmp->icmp_seq) % num_hosts];
- 			fprintf( stderr, "%s from %s for ICMP Echo sent to %s",
- 				icmp_type_str[p->icmp_type], inet_ntoa( addr->sin_addr ), h->host );
-       
- 			if( inet_addr( h->host ) == -1 )
- 				fprintf( stderr, " (%s)", inet_ntoa( h->saddr.sin_addr ) );
- #else
--		if( ( sent_icmp->icmp6_type = ICMP_ECHO ) && 
--			( sent_icmp->icmp6_id = ident ) &&
--			( sent_icmp->icmp6_seq < ( n_short )num_hosts ) )
-+		if( ( sent_icmp->icmp6_type == ICMP_ECHO ) &&
-+			( ntohs(sent_icmp->icmp6_id) == ident ) &&
-+			( ntohs(sent_icmp->icmp6_seq) <= ( n_short )max_seq_sent ) )
- 		{
- 			/* this is a response to a ping we sent */
--			h = table[sent_icmp->icmp6_seq];
-+			h = table[ntohs(sent_icmp->icmp6_seq) % num_hosts];
- 			fprintf( stderr, "%s from %s for ICMP Echo sent to %s",
- 				icmp_type_str[p->icmp6_type], addr_ascii, h->host );
-       
-@@ -2165,20 +2246,33 @@
- 	struct addrinfo		*res, hints;
- 	int						ret_ga;
- 	char						*hostname;
-+	size_t len;
- 
- 	/* getaddrinfo */
- 	bzero(&hints, sizeof(struct addrinfo));
--	hints.ai_flags = AI_CANONNAME;
-+	hints.ai_flags = name_flag ? AI_CANONNAME : 0;
- 	hints.ai_family = AF_INET6;
- 	hints.ai_socktype = SOCK_RAW;
- 	hints.ai_protocol = IPPROTO_ICMPV6;
- 
- 	ret_ga = getaddrinfo(name, NULL, &hints, &res);
--	if (ret_ga) errx(1, "%s", gai_strerror(ret_ga));
-+	if (ret_ga) {
-+		if(!quiet_flag)
-+			warnx("%s", gai_strerror(ret_ga));
-+		num_noaddress++;
-+		return; 
-+	}
- 	if (res->ai_canonname) hostname = res->ai_canonname;
- 	else hostname = name;
--	if (!res->ai_addr) errx(1, "getaddrinfo failed");
--	(void)memcpy(&dst, res->ai_addr, sizeof(FPING_SOCKADDR)); /*res->ai_addrlen);*/
-+	if (!res->ai_addr) {
-+		if(!quiet_flag)
-+			warnx("getaddrinfo failed");
-+		num_noaddress++;
-+		return; 
-+	}
-+	len = res->ai_addrlen;
-+	if (len > sizeof(FPING_SOCKADDR)) len = sizeof(FPING_SOCKADDR);
-+	(void)memcpy(&dst, res->ai_addr, len);
- 	add_addr(name, name, &dst);
- #endif
- } /* add_name() */
-@@ -2730,9 +2824,11 @@
- 	fprintf( stderr, "                (in looping and counting modes, default %d)\n", perhost_interval / 100 );
- 	fprintf( stderr, "   -q         quiet (don't show per-target/per-ping results)\n" );
- 	fprintf( stderr, "   -Q n       same as -q, but show summary every n seconds\n" );
--	fprintf( stderr, "   -r n       number of retries (default %d)\n", retry );
-+	fprintf( stderr, "   -r n       number of retries (default %d)\n", DEFAULT_RETRY );
- 	fprintf( stderr, "   -s         print final stats\n" );
-+	fprintf( stderr, "   -S addr    set source address\n" );
- 	fprintf( stderr, "   -t n       individual target initial timeout (in millisec) (default %d)\n", timeout / 100 );
-+	fprintf( stderr, "   -T n       set select timeout (default %d)\n", select_time / 100 );
- 	fprintf( stderr, "   -u         show targets that are unreachable\n" );
- 	fprintf( stderr, "   -v         show version\n" );
- 	fprintf( stderr, "   targets    list of targets to check (if no -f specified)\n" );
diff --git a/network/fping6/fping6.SlackBuild b/network/fping6/fping6.SlackBuild
deleted file mode 100644
index f2e9061579..0000000000
--- a/network/fping6/fping6.SlackBuild
+++ /dev/null
@@ -1,114 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for fping with IPv6 and source IP setting
-# support
-# Copyright (c) 2008, Written by Mark Walling <mark@markwalling.org>
-# IPv6 modifications by Richlv
-
-# 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=fping6
-VERSION=${VERSION:-2.4b2_to_ipv6}
-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}
-
-PRGNAM_ARCHIVE=fping
-VERSION_ARCHIVE=2.4b2-to-ipv6
-VERSION_SOURCE=2.4b2_to-ipv6
-
-if [ "$ARCH" = "i586" ]; then
-  SLKCFLAGS="-O2 -march=i586 -mtune=i686 -DIPV6=1"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686 -mtune=i686 -DIPV6=1"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC -DIPV6=1"
-  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_ARCHIVE}_$VERSION_ARCHIVE.orig.tar.gz
-cd ${PRGNAM_ARCHIVE}-$VERSION_SOURCE
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -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 < $CWD/fping.c.diff
-patch < $CWD/fping.8.diff
-
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
-  --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --sysconfdir=/etc \
-  --localstatedir=/var \
-  --mandir=/usr/man
-
-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/man/man8/$PRGNAM_ARCHIVE.8 $PKG/usr/man/man8/$PRGNAM.8
-mv $PKG/usr/sbin/$PRGNAM_ARCHIVE $PKG/usr/sbin/$PRGNAM
-
-( 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 COPYING ChangeLog README 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}
diff --git a/network/fping6/fping6.info b/network/fping6/fping6.info
deleted file mode 100644
index d517d71fd5..0000000000
--- a/network/fping6/fping6.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="fping6"
-VERSION="2.4b2_to_ipv6"
-HOMEPAGE="http://fping.sourceforge.net/"
-DOWNLOAD="http://ponce.cc/slackware/sources/repo/fping_2.4b2-to-ipv6.orig.tar.gz"
-MD5SUM="3ad516765514249a40d3c5b6caab812a"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Richlv"
-EMAIL="richlv@nakts.net"
diff --git a/network/fping6/slack-desc b/network/fping6/slack-desc
deleted file mode 100644
index 16acb60ac1..0000000000
--- a/network/fping6/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------------------------------------------------------|
-fping6: fping6 (a ping like program to send ICMP echo requests to IPv6 hosts)
-fping6:
-fping6: fping6 is a ping(1) like program which uses the Internet Control
-fping6: Message Protocol (ICMP) echo request to determine if a host is up.
-fping6: fping6 is different from ping in that you can specify any number of
-fping6: hosts on the command line, or specify a file containing the lists of
-fping6: hosts to ping.
-fping6: This version of fping is compiled with IPv6 support, and additional
-fping6: changes from Debian patch (including source address support).
-fping6: http://fping.sourceforge.net/
-fping6: http://packages.debian.org/sid/fping
diff --git a/network/fqterm/fqterm.SlackBuild b/network/fqterm/fqterm.SlackBuild
index b90004e147..2327eda5c0 100644
--- a/network/fqterm/fqterm.SlackBuild
+++ b/network/fqterm/fqterm.SlackBuild
@@ -1,40 +1,45 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for fqterm
 
 # Written by vvoody <vvoodywang@gmail.com>
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=fqterm
-VERSION=${VERSION:-0.9.8.2}
-SVNVER=svn1076
+VERSION=${VERSION:-0.9.8.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"
-  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
@@ -42,15 +47,15 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM
-tar xvf $CWD/$PRGNAM-$VERSION-$SVNVER.tar.gz
-cd $PRGNAM
+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 {} \;
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -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
@@ -58,17 +63,16 @@ cd build
     -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
     -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
     -DCMAKE_INSTALL_PREFIX:PATH="/usr" \
-    -DLIB_SUFFIX=${LIBDIRSUFFIX} \
     ..
   make
   make install DESTDIR=$PKG
 cd -
 
-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
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a LICENSE INSTALL.txt README.txt $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a LICENSE INSTALL.txt README* $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
@@ -76,4 +80,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/network/fqterm/fqterm.info b/network/fqterm/fqterm.info
index 787760d96c..71e08759df 100644
--- a/network/fqterm/fqterm.info
+++ b/network/fqterm/fqterm.info
@@ -1,10 +1,10 @@
 PRGNAM="fqterm"
-VERSION="0.9.8.2"
+VERSION="0.9.8.4"
 HOMEPAGE="https://github.com/mytbk/fqterm"
-DOWNLOAD="http://ftp1.fr.freebsd.org/pub/frugalware/frugalware-stable/source/xlib-extra/fqterm/fqterm-0.9.8.2-svn1076.tar.gz"
-MD5SUM="eaf7b51c1e3e0f13351f9f5678996d51"
+DOWNLOAD="https://github.com/mytbk/fqterm/archive/0.9.8.4/fqterm-0.9.8.4.tar.gz"
+MD5SUM="d7d9500806055def62456550fe33173e"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES=""
+REQUIRES="qt4"
 MAINTAINER="vvoody"
 EMAIL="vvoodywang@gmail.com"
diff --git a/network/franz/README b/network/franz/README
new file mode 100644
index 0000000000..63bc085c60
--- /dev/null
+++ b/network/franz/README
@@ -0,0 +1,5 @@
+Franz is your messaging app for WhatsApp, Facebook Messenger, Slack,
+Telegram and many many more.
+
+You need to sign up for Franz account before you can use this
+application.
diff --git a/network/CherryMusic/doinst.sh b/network/franz/doinst.sh
index 5fb28930db..5fb28930db 100644
--- a/network/CherryMusic/doinst.sh
+++ b/network/franz/doinst.sh
diff --git a/network/franz/franz.SlackBuild b/network/franz/franz.SlackBuild
new file mode 100644
index 0000000000..26ee5d2912
--- /dev/null
+++ b/network/franz/franz.SlackBuild
@@ -0,0 +1,80 @@
+#!/bin/bash
+
+# Slackware build script for franz
+
+# Copyright 2020-2022 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=franz
+VERSION=${VERSION:-5.10.0}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+       *) 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
+  SRCARCH="amd64"
+else
+  echo "This system is unsupported.  Aborting."
+  exit 1
+fi
+
+# No flags/configure needed as it is just a binary repackaging.
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $PKG
+ar p $CWD/${PRGNAM}_${VERSION}_${SRCARCH}.deb data.tar.xz | tar xJv
+cd $PKG
+chown -R root:root .
+find . -type d -exec chmod 0755 {} \;
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -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/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PWD/install/doinst.sh
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/network/franz/franz.info b/network/franz/franz.info
new file mode 100644
index 0000000000..58aed257bf
--- /dev/null
+++ b/network/franz/franz.info
@@ -0,0 +1,10 @@
+PRGNAM="franz"
+VERSION="5.10.0"
+HOMEPAGE="https://meetfranz.com/"
+DOWNLOAD="UNSUPPORTED"
+MD5SUM=""
+DOWNLOAD_x86_64="https://github.com/meetfranz/franz/releases/download/v5.10.0/franz_5.10.0_amd64.deb"
+MD5SUM_x86_64="ee2ba15989bdfd38c81436d9c6af4b7f"
+REQUIRES=""
+MAINTAINER="Willy Sudiarto Raharjo"
+EMAIL="willysr@slackbuilds.org"
diff --git a/network/franz/slack-desc b/network/franz/slack-desc
new file mode 100644
index 0000000000..a42a23a70a
--- /dev/null
+++ b/network/franz/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+     |-----handy-ruler------------------------------------------------------|
+franz: franz (Messaging App Unification)
+franz:
+franz: Franz is your messaging app for WhatsApp, Facebook Messenger, Slack,
+franz: Telegram and many many more.
+franz:
+franz:
+franz:
+franz:
+franz: Project: https://meetfranz.com/
+franz:
+franz:
diff --git a/network/freedownloadmanager/README b/network/freedownloadmanager/README
new file mode 100644
index 0000000000..fd4ba6cd9a
--- /dev/null
+++ b/network/freedownloadmanager/README
@@ -0,0 +1,7 @@
+It's a cross-platform powerful modern download accelerator and
+organizer for Windows, macOS, Android, and Linux. Compatible with
+the most popular browsers Google Chrome, Mozilla Firefox,
+Microsoft Edge, Internet Explorer and Safari.
+
+Note: the debian package file is unversioned so MD5SUM and VERSION
+might change unexpectedly
diff --git a/network/Icecat/doinst.sh b/network/freedownloadmanager/doinst.sh
index aea0f894eb..aea0f894eb 100644
--- a/network/Icecat/doinst.sh
+++ b/network/freedownloadmanager/doinst.sh
diff --git a/network/freedownloadmanager/freedownloadmanager.SlackBuild b/network/freedownloadmanager/freedownloadmanager.SlackBuild
new file mode 100644
index 0000000000..aebf680763
--- /dev/null
+++ b/network/freedownloadmanager/freedownloadmanager.SlackBuild
@@ -0,0 +1,96 @@
+#!/bin/bash
+
+# Slackware build script for freedownloadmanager
+
+# Copyright 2020 Andre Fernando, Indonesia
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=freedownloadmanager
+VERSION=${VERSION:-6.16.0.4468}
+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
+mkdir -p $PRGNAM
+cd $PRGNAM
+ar -x $CWD/${PRGNAM}.deb
+tar xvf data.tar.xz -C $PKG
+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 {} \;
+
+find $PKG -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
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/network/freedownloadmanager/freedownloadmanager.info b/network/freedownloadmanager/freedownloadmanager.info
new file mode 100644
index 0000000000..9469b5fffd
--- /dev/null
+++ b/network/freedownloadmanager/freedownloadmanager.info
@@ -0,0 +1,10 @@
+PRGNAM="freedownloadmanager"
+VERSION="6.16.0.4468"
+HOMEPAGE="https://www.freedownloadmanager.org"
+DOWNLOAD="https://dn3.freedownloadmanager.org/6/latest/freedownloadmanager.deb"
+MD5SUM="d5c4888ca4ebf7473af898c98e943bf5"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Andre Fernando"
+EMAIL="ando344@gmail.com"
diff --git a/network/freedownloadmanager/slack-desc b/network/freedownloadmanager/slack-desc
new file mode 100644
index 0000000000..510d2b1e67
--- /dev/null
+++ b/network/freedownloadmanager/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+                   |-----handy-ruler------------------------------------------------------|
+freedownloadmanager: freedownloadmanager (Powerful Download Accelerator and Organizer)
+freedownloadmanager:
+freedownloadmanager: It's a cross-platform powerful modern download accelerator and
+freedownloadmanager: organizer for Windows, macOS, Android, and Linux. Compatible with
+freedownloadmanager: the most popular browsers Google Chrome, Mozilla Firefox,
+freedownloadmanager: Microsoft Edge, Internet Explorer and Safari.
+freedownloadmanager:
+freedownloadmanager: Homepage: https://www.freedownloadmanager.org
+freedownloadmanager:
+freedownloadmanager:
+freedownloadmanager:
diff --git a/network/freeradius-server/README b/network/freeradius-server/README
index a003ad68ee..9e3a3b3851 100644
--- a/network/freeradius-server/README
+++ b/network/freeradius-server/README
@@ -1,11 +1,12 @@
 FreeRADIUS Server (Radius protocol server)
 
-The FreeRADIUS Server is a daemon for unix and unix like operating systems 
-which allows one to set up a radius protocol server, which can be used for 
-Authentication and Accounting various types of network access.  To use the 
-server, you also need a correctly setup client which will talk to it, 
-including terminal servers, Ethernet Switches, Wireless Access Points or a 
-PC with appropriate software which emulates it (PortSlave, radiusclient etc).
+The FreeRADIUS Server is a daemon for unix and unix like operating
+systems which allows one to set up a radius protocol server, which can
+be used for Authentication and Accounting various types of network
+access.  To use the server, you also need a correctly setup client
+which will talk to it, including terminal servers, Ethernet Switches,
+Wireless Access Points or a PC with appropriate software which
+emulates it (PortSlave, radiusclient etc).
 
 See README.SLACKWARE (which is also installed with the package docs) for
 setup, configuration, and usage hints.
diff --git a/network/freeradius-server/freeradius-server.SlackBuild b/network/freeradius-server/freeradius-server.SlackBuild
index e72487437e..6c55cc51ef 100644
--- a/network/freeradius-server/freeradius-server.SlackBuild
+++ b/network/freeradius-server/freeradius-server.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for FreeRADIUS Server
 
@@ -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=freeradius-server
-VERSION=${VERSION:-2.2.9}
-BUILD=${BUILD:-1}
+VERSION=${VERSION:-3.0.21}
+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"
@@ -84,7 +94,7 @@ CXXFLAGS="$SLKCFLAGS" \
   --build=$ARCH-slackware-linux
 
 make
-make install R=$PKG
+make -j1 install R=$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
@@ -109,9 +119,11 @@ 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
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/network/freeradius-server/freeradius-server.info b/network/freeradius-server/freeradius-server.info
index 98b1a931e0..57ca94bf53 100644
--- a/network/freeradius-server/freeradius-server.info
+++ b/network/freeradius-server/freeradius-server.info
@@ -1,8 +1,8 @@
 PRGNAM="freeradius-server"
-VERSION="2.2.9"
+VERSION="3.0.21"
 HOMEPAGE="http://www.freeradius.org/"
-DOWNLOAD="http://ponce.cc/slackware/sources/repo/freeradius-server-2.2.9.tar.bz2"
-MD5SUM="d1398327ba4e23c75da06d8a0e01096b"
+DOWNLOAD="ftp://ftp.freeradius.org/pub/freeradius/freeradius-server-3.0.21.tar.bz2"
+MD5SUM="8b7f794f2ac0d686d9aecfa083a63614"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/network/freerapid/freerapid.SlackBuild b/network/freerapid/freerapid.SlackBuild
index 23fe6b14a9..0500d83c67 100644
--- a/network/freerapid/freerapid.SlackBuild
+++ b/network/freerapid/freerapid.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 #
 # Slackware build script for freerapid.
 #
@@ -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=freerapid
 SRCNAM=FreeRapid
 VERSION=${VERSION:-0.9u4}
 BUILD=${BUILD:-4}
 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}
@@ -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/network/freerapid/freerapid.info b/network/freerapid/freerapid.info
index 746777ec99..c91f43be93 100644
--- a/network/freerapid/freerapid.info
+++ b/network/freerapid/freerapid.info
@@ -5,6 +5,6 @@ DOWNLOAD="http://ponce.cc/slackware/sources/repo/FreeRapid-0.9u4.zip"
 MD5SUM="a067ecbd37ac7c83a795c34a3dc6388f"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="jdk"
+REQUIRES="zulu-openjdk8"
 MAINTAINER="Edinaldo P. Silva"
 EMAIL="edps.mundognu@gmail.com"
diff --git a/network/freerdp/README b/network/freerdp/README
deleted file mode 100644
index 8242c54f90..0000000000
--- a/network/freerdp/README
+++ /dev/null
@@ -1,6 +0,0 @@
-FreeRDP is a free implementation of the Remote Desktop Protocol (RDP),
-released under the Apache license.
-
-ffmpeg dependency can be turned off with:
-
-  USE_FFMPEG=no ./freerdp.SlackBuild
diff --git a/network/freerdp/freerdp.SlackBuild b/network/freerdp/freerdp.SlackBuild
deleted file mode 100644
index e88664c54e..0000000000
--- a/network/freerdp/freerdp.SlackBuild
+++ /dev/null
@@ -1,117 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for freerdp
-# free implementation of the Remote Desktop Protocol
-
-# Copyright 2010,2012 Niels Horn, Rio de Janeiro, RJ, Brazil
-# Copyright 2015 Mario Preksavec <mario@slackware.hr>
-# Copyright 2015-2018 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=freerdp
-VERSION=${VERSION:-git20180405}
-COMMIT=${COMMIT:-a9ecd6a6ccc71130805a6bf3214c169fc42746ba}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-DIRNAME=FreeRDP-$COMMIT
-
-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
-
-USE_FFMPEG=${USE_FFMPEG:-yes}
-case "$USE_FFMPEG" in
-  yes) WITH_FFMPEG=ON ;;
-    *) WITH_FFMPEG=OFF ;;
-esac
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $DIRNAME
-tar xvf $CWD/$COMMIT.tar.gz
-cd $DIRNAME
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -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 $(pkg-config --cflags gstreamer-base-1.0)" \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DWITH_CUPS=ON \
-    -DWITH_FFMPEG=$WITH_FFMPEG \
-    -DWITH_LIBSYSTEMD=OFF \
-    -DWITH_WAYLAND=OFF \
-    -DWITH_PULSE=ON \
-    -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
-
-# Need to move man, cmake flag does not work
-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 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}
diff --git a/network/freerdp/freerdp.info b/network/freerdp/freerdp.info
deleted file mode 100644
index 353a8a7219..0000000000
--- a/network/freerdp/freerdp.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="freerdp"
-VERSION="git20180405"
-HOMEPAGE="http://www.freerdp.com/"
-DOWNLOAD="https://sourceforge.net/projects/slackbuildsdirectlinks/files/freerdp/a9ecd6a6ccc71130805a6bf3214c169fc42746ba.tar.gz"
-MD5SUM="70f2d81876739d4e29dce805ece70b28"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="ffmpeg"
-MAINTAINER="Philip van der Hoeven"
-EMAIL="philip@vd-hoeven.nl"
diff --git a/network/freerdp/slack-desc b/network/freerdp/slack-desc
deleted file mode 100644
index 6d69199106..0000000000
--- a/network/freerdp/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------------------------------------------------------|
-freerdp: freerdp (Free implementation of the RDP protocol)
-freerdp:
-freerdp: FreeRDP is a free implementation of the Remote Desktop Protocol (RDP),
-freerdp: released under the Apache license.
-freerdp:
-freerdp: Homepage: http://www.freerdp.com/
-freerdp:
-freerdp:
-freerdp:
-freerdp:
-freerdp:
diff --git a/network/frostwire/frostwire.SlackBuild b/network/frostwire/frostwire.SlackBuild
index 08b2393467..e5ff79e0f6 100644
--- a/network/frostwire/frostwire.SlackBuild
+++ b/network/frostwire/frostwire.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 #
 # Slackware build script for frostwire
 # Based on SlackBuild for LimeWire by Robby Workman
@@ -28,14 +28,24 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=frostwire
 VERSION=${VERSION:-6.7.9}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 ARCH=noarch	# Leave this alone for frostwire
 
-CWD=$(pwd)
+# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
+# the name of the created package would be, and then exit. This information
+# could be useful to other scripts.
+if [ ! -z "${PRINT_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 @@ 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 {} \;
 find . -type d -name '.svn' | xargs rm -rf
-/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/network/frostwire/frostwire.info b/network/frostwire/frostwire.info
index b8472a97df..ff16f31dd4 100644
--- a/network/frostwire/frostwire.info
+++ b/network/frostwire/frostwire.info
@@ -5,6 +5,6 @@ DOWNLOAD="https://dl.frostwire.com/frostwire/6.7.9/frostwire-6.7.9.noarch.tar.gz
 MD5SUM="934ab67ea1be867a9e9ab80f322a4c56"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="jdk"
+REQUIRES="zulu-openjdk8"
 MAINTAINER="Donald Cooley"
 EMAIL="chytraeu@sdf.org"
diff --git a/network/frr/frr.SlackBuild b/network/frr/frr.SlackBuild
index 701fd9696a..a480815a29 100644
--- a/network/frr/frr.SlackBuild
+++ b/network/frr/frr.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for frr
 
-# Copyright 2018 Thibaut Notteboom, Paris, FRANCE
+# Copyright 2018-2023 Thibaut Notteboom, Paris, 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=frr
-VERSION=${VERSION:-6.0}
+VERSION=${VERSION:-9.0.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}
@@ -49,6 +56,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=""
@@ -65,7 +75,7 @@ Before running this script, please add them with the following commands:
 
 groupadd -g 357 frr
 groupadd -g 358 frrvty
-useradd -c "FRR FRRouting suite" -d /var/run/frr -s /bin/false -u 357 -g frr -G frrvty frr
+useradd -c "FRR FRRouting suite" -d /var/lib/frr -s /bin/false -u 357 -g frr -G frrvty frr
 
 EOF
   exit 1
@@ -84,8 +94,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 {} \;
 
-./bootstrap.sh
+autoreconf -fvi
 
+# docs disabled due to no python2-sphinx
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
@@ -93,7 +104,7 @@ CXXFLAGS="$SLKCFLAGS" \
   --sbindir=/usr/sbin \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
   --sysconfdir=/etc/frr \
-  --localstatedir=/var/run/frr \
+  --localstatedir=/var/lib/frr \
   --mandir=/usr/man \
   --docdir=/usr/doc/$PRGNAM-$VERSION \
   --infodir=/usr/info \
@@ -110,6 +121,8 @@ CXXFLAGS="$SLKCFLAGS" \
   --enable-fpm \
   --enable-vtysh \
   --enable-watchfrr \
+  --disable-doc \
+  --disable-doc-html \
   --disable-systemd \
   --disable-static \
   --without-libpam \
@@ -118,37 +131,29 @@ CXXFLAGS="$SLKCFLAGS" \
 make
 make install-strip DESTDIR=$PKG
 
-install -d -m 750 -o frr -g frr $PKG/etc/frr $PKG/var/log/frr $PKG/var/run/frr
+install -d -m 750 -o frr -g frr $PKG/etc/frr $PKG/var/log/frr $PKG/var/lib/frr
 
-install -D -m 640 -o frr -g frr redhat/daemons $PKG/etc/frr/daemons.new
+install -D -m 640 -o frr -g frr tools/etc/frr/daemons $PKG/etc/frr/daemons.new
 install -D -m 640 -o frr -g frrvty tools/etc/frr/vtysh.conf $PKG/etc/frr/vtysh.conf.new
 
-install -D -m 644 redhat/frr.init $PKG/etc/rc.d/rc.frr.new
+install -D -m 644 $PKG/usr/sbin/frrinit.sh $PKG/etc/rc.d/rc.frr.new
 install -D -m 644 redhat/frr.logrotate $PKG/etc/logrotate.d/frr.new
 
-install -D -m 644 bgpd/BGP4-MIB.txt $PKG/usr/share/snmp/mibs/BGP4-MIB.txt
-install -D -m 644 eigrpd/EIGRP-MIB.txt $PKG/usr/share/snmp/mibs/EIGRP-MIB.txt
-install -D -m 644 ospf6d/OSPFv3-MIB.txt $PKG/usr/share/snmp/mibs/OSPFv3-MIB.txt
-install -D -m 644 ospfd/OSPF-MIB.txt $PKG/usr/share/snmp/mibs/OSPF-MIB.txt
-install -D -m 644 ospfd/OSPF-TRAP-MIB.txt $PKG/usr/share/snmp/mibs/OSPF-TRAP-MIB.txt
-install -D -m 644 ripd/RIPv2-MIB.txt $PKG/usr/share/snmp/mibs/RIPv2-MIB.txt
-
-# Fix paths
-sed -i 's|usr/lib/frr|usr/sbin|g' $PKG/etc/rc.d/rc.frr.new $PKG/etc/frr/daemons.new
+sed -i 's|#!/usr/bin/python|#!/usr/bin/python3|g' $PKG/usr/sbin/{frr-reload.py,generate_support_bundle.py}
 
-# Don't ship .la files:
 rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la
 rm -f $PKG/usr/lib${LIBDIRSUFFIX}/frr/modules/*.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
+# disable man and info for now
+#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*
+#rm -f $PKG/usr/info/dir
+#gzip -9 $PKG/usr/info/*.info*
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
-  AUTHORS COPYING* ChangeLog INSTALL NEWS README* \
+  COPYING* README.md \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
@@ -157,4 +162,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/network/frr/frr.info b/network/frr/frr.info
index d653abc141..a3b70cd50d 100644
--- a/network/frr/frr.info
+++ b/network/frr/frr.info
@@ -1,10 +1,10 @@
 PRGNAM="frr"
-VERSION="6.0"
+VERSION="9.0.2"
 HOMEPAGE="https://frrouting.org/"
-DOWNLOAD="https://github.com/FRRouting/frr/archive/frr-6.0/frr-frr-6.0.tar.gz"
-MD5SUM="f7584302a8837194021b82ae646d5e2d"
+DOWNLOAD="https://github.com/FRRouting/frr/archive/frr-9.0.2/frr-frr-9.0.2.tar.gz"
+MD5SUM="65ed7949becc65255c3ff17dc049363e"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="perl-xml-libxml c-ares ipaddr-py Sphinx rtrlib"
+REQUIRES="perl-xml-libxml ipaddr-py libyang protobuf-c rtrlib Sphinx"
 MAINTAINER="Thibaut Notteboom"
 EMAIL="thibaut.notteboom@gmail.com"
diff --git a/network/ftp-cloudfs/README b/network/ftp-cloudfs/README
index c0a491dff9..44249c3e48 100644
--- a/network/ftp-cloudfs/README
+++ b/network/ftp-cloudfs/README
@@ -2,8 +2,8 @@ ftp-cloudfs is a ftp server acting as a proxy to OpenStack Object
 Storage (swift). It allow you to connect via any FTP client to do
 upload/download or create containers.
 
-By default the server will bind to port 2021 which allow to be run as a non
-root/administrator user.
+By default the server will bind to port 2021 which allow to be run as a
+non root/administrator user.
 
 It supports pseudo-hierarchical folders/directories as described in the
 OpenStack Object Storage API.
diff --git a/network/ftp-cloudfs/ftp-cloudfs.SlackBuild b/network/ftp-cloudfs/ftp-cloudfs.SlackBuild
index 089dd46ea7..8cbd6e19d2 100644
--- a/network/ftp-cloudfs/ftp-cloudfs.SlackBuild
+++ b/network/ftp-cloudfs/ftp-cloudfs.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for "ftp-cloudfs".
 
@@ -24,27 +24,37 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=ftp-cloudfs
 SRCNAM=ftpcloudfs
 VERSION=${VERSION:-0.35}
 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,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
+python2 setup.py install --root $PKG
 
 mkdir -p $PKG/etc
 install -m 0644 $SRCNAM.conf.example $PKG/etc/$SRCNAM.conf.new
@@ -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/network/ftp-cloudfs/ftp-cloudfs.info b/network/ftp-cloudfs/ftp-cloudfs.info
index 2c4d44355a..7d3a23d5af 100644
--- a/network/ftp-cloudfs/ftp-cloudfs.info
+++ b/network/ftp-cloudfs/ftp-cloudfs.info
@@ -1,10 +1,10 @@
 PRGNAM="ftp-cloudfs"
 VERSION="0.35"
 HOMEPAGE="https://github.com/cloudfs/ftp-cloudfs/"
-DOWNLOAD="https://github.com/cloudfs/ftp-cloudfs/archive/0.35.tar.gz"
+DOWNLOAD="https://slackware.uk/~urchlay/src/ftp-cloudfs-0.35.tar.gz"
 MD5SUM="8c3374bba8253b2e30fa63f0926be360"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="pyftpdlib python-daemon python-memcached python-swiftclient"
+REQUIRES="pyftpdlib python2-daemon python2-memcached python2-swiftclient"
 MAINTAINER="Marcel Saegebarth"
 EMAIL="marc@mos6581.de"
diff --git a/network/fujinet-pc/README b/network/fujinet-pc/README
new file mode 100644
index 0000000000..df9c8f7fa0
--- /dev/null
+++ b/network/fujinet-pc/README
@@ -0,0 +1,24 @@
+fujinet-pc (Linux port of FujiNet firmware)
+
+FujiNet is a network adaptor for the Atari 8-bit line of computers. It
+has many features, including the ability to netboot the Atari from a
+disk image on an Internet TNFS server. It's a piece of hardware which
+plugs into the Atari's SIO port and connects to a wireless network.
+
+fujinet-pc is a Linux port of the FujiNet firmware, which allows using
+most of the FujiNet's features with just an SIO2PC cable and a PC.
+The package contains both fujinet-pc and the Atari disk images from
+the fujinet-sd-card git repo.
+
+See https://github.com/FujiNetWIFI/fujinet-pc for the current
+status of fujinet-pc. See also the FujiNet documentation wiki:
+https://github.com/FujiNetWIFI/fujinet-platformio/wiki
+
+Since fujinet-pc wasn't designed to be installed systemwide on a Linux
+system, this SlackBuild includes a wrapper script which allows each
+user to have a fujinet-pc environment in his home directory. Simply
+run "fujinet-pc" or choose FujiNet-PC from your desktop's application
+menu; the ~/.fujinet-pc directory will be created and populated if it
+doesn't already exist.
+
+To exit fujinet-pc, press ^C or close the terminal it's running in.
diff --git a/network/fujinet-pc/doinst.sh b/network/fujinet-pc/doinst.sh
new file mode 100644
index 0000000000..3e5691a052
--- /dev/null
+++ b/network/fujinet-pc/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/network/fujinet-pc/fnconfig.ini.gz b/network/fujinet-pc/fnconfig.ini.gz
new file mode 100644
index 0000000000..927f41f4c2
--- /dev/null
+++ b/network/fujinet-pc/fnconfig.ini.gz
diff --git a/network/fujinet-pc/fujinet-pc.1 b/network/fujinet-pc/fujinet-pc.1
new file mode 100644
index 0000000000..21b51e4e2c
--- /dev/null
+++ b/network/fujinet-pc/fujinet-pc.1
@@ -0,0 +1,157 @@
+.\" 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 "FUJINET-PC" 1 "2022-07-19" "2206.1" "SlackBuilds.org"
+.SH NAME
+fujinet-pc \- peripheral emulator and network adaptor for Atari 8-bit computers
+.\" RST source for fujinet-pc(1) man page. Convert with:
+.
+.\" rst2man.py fujinet-pc.rst > fujinet-pc.1
+.
+.\" rst2man.py comes from the SBo development/docutils package.
+.
+.SH SYNOPSIS
+.sp
+fujinet\-pc [\fB\-V\fP] [\fB\-u\fP \fIhost:port\fP] [\fB\-c\fP \fIconfig\-file\fP] [\fB\-s\fP \fISD\-directory\fP]
+.SH DESCRIPTION
+.sp
+FujiNet is a network adaptor for the Atari 8\-bit line of computers. It
+has many features, including the ability to netboot the Atari from a
+disk image on an Internet TNFS server. It\(aqs a piece of hardware which
+plugs into the Atari\(aqs SIO port and connects to a wireless network.
+.sp
+fujinet\-pc is a Linux port of the FujiNet firmware, which allows using
+most of the FujiNet\(aqs features with just an SIO2PC cable and a PC.
+.sp
+FujiNet features that work with fujinet\-pc:
+.INDENT 0.0
+.INDENT 3.5
+.INDENT 0.0
+.IP \(bu 2
+Disk drive (D:) emulation with support for ATR disk images and XEX files (no ATX yet)
+.IP \(bu 2
+Modem emulation (R:)
+.IP \(bu 2
+Printer emulation (P:)
+.IP \(bu 2
+APETIME protocol
+.IP \(bu 2
+TNFS File System to access image files over network
+.IP \(bu 2
+Web interface to control program\(aqs settings, browse TNFS hosts and mount disk images
+.IP \(bu 2
+FujiNet network device (N:) with support for various network protocols:
+TCP, UDP, TNFS, HTTP, FTP, Telnet \fB[*]\fP
+.UNINDENT
+.UNINDENT
+.UNINDENT
+.sp
+Not (yet) working:
+.INDENT 0.0
+.INDENT 3.5
+.INDENT 0.0
+.IP \(bu 2
+CP/M emulation
+.IP \(bu 2
+SSH and SMB support for N:
+.IP \(bu 2
+SAM voice synthesizer
+.IP \(bu 2
+MIDIMaze support
+.IP \(bu 2
+Program recorder (tape) emulation
+.UNINDENT
+.UNINDENT
+.UNINDENT
+.sp
+\fB[*]\fP Note that some applications using the N: device may rely on the SIO
+\fBPROCEED\fP line being connected. Most SIO2PC cables don\(aqt have this
+line connected.
+.SH OPTIONS
+.INDENT 0.0
+.TP
+.B \fB\-V\fP
+Print version number (including build date and OS).
+.TP
+.B \fB\-u\fP \fIhost:port\fP
+Host interface and port to listen on, for the web user interface. Default is
+\fB0.0.0.0:8000\fP, meaning TCP port 8000 on all interfaces. To access the
+web UI, point a browser at e.g. \fBhttp://localhost:8000\fP\&. Leaving off
+the \fI:port\fP isn\(aqt actually an error, but it causes \fBfujinet\-pc\fP to
+choose a random port number (which it doesn\(aqt tell you; you\(aqd have
+to use \fBnetstat\fP(8) to find it).
+.TP
+.B \fB\-c\fP \fIconfig\-file\fP
+Use \fIconfig\-file\fP instead of the default \fBfnconfig.ini\fP\&.
+.TP
+.B \fB\-s\fP \fISD\-directory\fP
+Use \fISD\-directory\fP instead of the default \fBSD/\fP for the virtual
+SD card.
+.UNINDENT
+.SH FILES
+.INDENT 0.0
+.TP
+.B \fB~/.fujinet\-pc/\fP
+The default directory for \fBfujinet\-pc\fP, containing the following:
+.TP
+.B \fBfnconfig.ini\fP
+The default config file for \fBfujinet\-pc\fP\&. This is where settings
+are saved when they\(aqre changed with the web user interface. This file
+can also be edited with a regular text editor.
+.TP
+.B \fBSD/\fP
+The FujiNet hardware device has a slot for a Micro\-SD card. For fujinet\-pc,
+the contents of this directory will be available in the host list, under
+the name \fBSD\fP\&. The default contents of this directory include a good
+selection of DOS and utility disk images.
+.UNINDENT
+.\" AUTHOR
+.
+.\" ======
+.
+.\" normally I would put the upstream author's name here, but I have
+.
+.\" no idea what it is. The github user is just called FujiNetWIFI,
+.
+.\" and I haven't found any contact info anywhere in the source git
+.
+.\" repo. *shrug*.
+.
+.SH COPYRIGHT
+.sp
+See the file /usr/doc/fujinet\-pc\-2206.1/LICENSE for license information.
+.SH SEE ALSO
+.sp
+\fBatariserver\fP(1), \fBtnfsd\fP(1), \fBtnfs\-fuse\fP(1)
+.sp
+The fujinet\-pc homepage: \fI\%https://github.com/FujiNetWIFI/fujinet\-pc\fP
+.sp
+The FujiNet documentation wiki: \fI\%https://github.com/FujiNetWIFI/fujinet\-platformio/wiki\fP
+.\" Generated by docutils manpage writer.
+.
diff --git a/network/fujinet-pc/fujinet-pc.SlackBuild b/network/fujinet-pc/fujinet-pc.SlackBuild
new file mode 100644
index 0000000000..febf79d1da
--- /dev/null
+++ b/network/fujinet-pc/fujinet-pc.SlackBuild
@@ -0,0 +1,135 @@
+#!/bin/bash
+
+# Slackware build script for fujinet-pc
+
+# 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=fujinet-pc
+VERSION=${VERSION:-2206.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
+
+SRCVER="release-$VERSION"
+
+SDVER="${SDVER:-2021-04-29}"
+
+HOST="${HOST:-$( hostname -s )}"
+PORT="${PORT:-/dev/ttyUSB0}"
+
+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 /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
+
+PKGDOC=$PKG/usr/doc/$PRGNAM-$VERSION
+PKGBIN=$PKG/usr/bin
+PKGLIBX=$PKG/usr/libexec/$PRGNAM
+PKGSHARE=$PKG/usr/share/$PRGNAM
+mkdir -p $PKGDOC $PKGBIN $PKGLIBX $PKGSHARE
+
+# fujinet-pc itself:
+mkdir -p build
+cd build
+  cmake \
+    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_BUILD_TYPE=Release ..
+  make VERBOSE=1
+  make dist
+  install -s -m2755 -oroot -gdialout dist/fujinet $PKGLIBX/fujinet
+
+  cp -a dist/{SD,data} $PKGSHARE
+
+  # we don't need the upstream run-fujinet script
+cd ..
+
+cp -a CREDITS.md README.md LICENSE $PKGDOC
+
+# config file has \r\n line endings, keep it gzipped in git to avoid
+# git "fixing" it.
+gzip -dc < $CWD/fnconfig.ini.gz | \
+  sed -e "s,_HOST_,$HOST," \
+      -e "s,_PORT_,$PORT," \
+  > $PKGSHARE/fnconfig.ini
+
+# our wrapper script replaces run-fujinet
+install -m0755 -oroot -groot $CWD/$PRGNAM.sh $PKGBIN/$PRGNAM
+
+# fujinet-sd-card content:
+tar xvfC \
+  $CWD/fujinet-sd-card-fujinet-sd-card-$SDVER.tar.gz \
+  $PKGSHARE/SD \
+  --strip-components=1
+
+ln -s ../../share/$PRGNAM/SD/README.md $PKGDOC/README-fujinet-sd-card.md
+
+# .desktop and man page written for this SlackBuild.
+mkdir -p $PKG/usr/man/man1
+gzip -9c < $CWD/$PRGNAM.1 > $PKG/usr/man/man1/$PRGNAM.1.gz
+
+mkdir -p $PKG/usr/share/applications
+cat $CWD/$PRGNAM.desktop > $PKG/usr/share/applications/$PRGNAM.desktop
+
+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!" \
+          $PKGSHARE/data/www/favicon.ico \
+          PNG32:$DIR/$PRGNAM.png
+done
+
+mkdir -p $PKG/usr/share/pixmaps
+ln -s ../icons/hicolor/48x48/apps/$PRGNAM.png $PKG/usr/share/pixmaps/$PRGNAM.png
+
+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/network/fujinet-pc/fujinet-pc.desktop b/network/fujinet-pc/fujinet-pc.desktop
new file mode 100644
index 0000000000..e288dea544
--- /dev/null
+++ b/network/fujinet-pc/fujinet-pc.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Version=1.0
+Name=FujiNet-PC
+GenericName=Atari 8-bit Peripheral Emulator
+Icon=fujinet-pc
+Exec=/usr/bin/fujinet-pc
+Terminal=true
+Type=Application
+Categories=Network;
diff --git a/network/fujinet-pc/fujinet-pc.info b/network/fujinet-pc/fujinet-pc.info
new file mode 100644
index 0000000000..8dc82909f1
--- /dev/null
+++ b/network/fujinet-pc/fujinet-pc.info
@@ -0,0 +1,12 @@
+PRGNAM="fujinet-pc"
+VERSION="2206.1"
+HOMEPAGE="https://github.com/FujiNetWIFI/fujinet-pc"
+DOWNLOAD="https://github.com/FujiNetWIFI/fujinet-pc/archive/release-2206.1/fujinet-pc-release-2206.1.tar.gz \
+          https://github.com/FujiNetWIFI/fujinet-sd-card/archive/fujinet-sd-card-2021-04-29/fujinet-sd-card-fujinet-sd-card-2021-04-29.tar.gz"
+MD5SUM="f1d3dd2aafaf052309a56601ab5a448e \
+        d53e0b655351b987223106fadee9e5a2"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="B. Watson"
+EMAIL="urchlay@slackware.uk"
diff --git a/network/fujinet-pc/fujinet-pc.rst b/network/fujinet-pc/fujinet-pc.rst
new file mode 100644
index 0000000000..0296f813df
--- /dev/null
+++ b/network/fujinet-pc/fujinet-pc.rst
@@ -0,0 +1,117 @@
+.. RST source for fujinet-pc(1) man page. Convert with:
+..   rst2man.py fujinet-pc.rst > fujinet-pc.1
+.. rst2man.py comes from the SBo development/docutils package.
+
+.. |version| replace:: 2206.1
+.. |date| date::
+
+==========
+fujinet-pc
+==========
+
+-----------------------------------------------------------------
+peripheral emulator and network adaptor for Atari 8-bit computers
+-----------------------------------------------------------------
+
+:Manual section: 1
+:Manual group: SlackBuilds.org
+:Date: |date|
+:Version: |version|
+
+SYNOPSIS
+========
+
+fujinet-pc [**-V**] [**-u** *host:port*] [**-c** *config-file*] [**-s** *SD-directory*]
+
+DESCRIPTION
+===========
+
+FujiNet is a network adaptor for the Atari 8-bit line of computers. It
+has many features, including the ability to netboot the Atari from a
+disk image on an Internet TNFS server. It's a piece of hardware which
+plugs into the Atari's SIO port and connects to a wireless network.
+
+fujinet-pc is a Linux port of the FujiNet firmware, which allows using
+most of the FujiNet's features with just an SIO2PC cable and a PC.
+
+FujiNet features that work with fujinet-pc:
+
+  - Disk drive (D:) emulation with support for ATR disk images and XEX files (no ATX yet)
+  - Modem emulation (R:)
+  - Printer emulation (P:)
+  - APETIME protocol
+  - TNFS File System to access image files over network
+  - Web interface to control program's settings, browse TNFS hosts and mount disk images
+  - FujiNet network device (N:) with support for various network protocols:
+    TCP, UDP, TNFS, HTTP, FTP, Telnet **[\*]**
+
+Not (yet) working:
+
+  - CP/M emulation
+  - SSH and SMB support for N:
+  - SAM voice synthesizer
+  - MIDIMaze support
+  - Program recorder (tape) emulation
+
+**[\*]** Note that some applications using the N: device may rely on the SIO
+**PROCEED** line being connected. Most SIO2PC cables don't have this
+line connected.
+
+OPTIONS
+=======
+
+**-V**
+  Print version number (including build date and OS).
+
+**-u** *host:port*
+  Host interface and port to listen on, for the web user interface. Default is
+  **0.0.0.0:8000**, meaning TCP port 8000 on all interfaces. To access the
+  web UI, point a browser at e.g. **http://localhost:8000**. Leaving off
+  the *:port* isn't actually an error, but it causes **fujinet-pc** to
+  choose a random port number (which it doesn't tell you; you'd have
+  to use **netstat**\(8) to find it).
+
+**-c** *config-file*
+  Use *config-file* instead of the default **fnconfig.ini**.
+
+**-s** *SD-directory*
+  Use *SD-directory* instead of the default **SD/** for the virtual
+  SD card.
+
+FILES
+=====
+
+**~/.fujinet-pc/**
+  The default directory for **fujinet-pc**, containing the following:
+
+**fnconfig.ini**
+  The default config file for **fujinet-pc**. This is where settings
+  are saved when they're changed with the web user interface. This file
+  can also be edited with a regular text editor.
+
+**SD/**
+  The FujiNet hardware device has a slot for a Micro-SD card. For fujinet-pc,
+  the contents of this directory will be available in the host list, under
+  the name **SD**. The default contents of this directory include a good
+  selection of DOS and utility disk images.
+
+.. AUTHOR
+.. ======
+.. normally I would put the upstream author's name here, but I have
+.. no idea what it is. The github user is just called FujiNetWIFI,
+.. and I haven't found any contact info anywhere in the source git
+.. repo. *shrug*.
+
+COPYRIGHT
+=========
+
+See the file /usr/doc/fujinet-pc-|version|/LICENSE for license information.
+
+SEE ALSO
+========
+
+**atariserver**\(1), **tnfsd**\(1), **tnfs-fuse**\(1)
+
+The fujinet-pc homepage: https://github.com/FujiNetWIFI/fujinet-pc
+
+The FujiNet documentation wiki: https://github.com/FujiNetWIFI/fujinet-platformio/wiki
diff --git a/network/fujinet-pc/fujinet-pc.sh b/network/fujinet-pc/fujinet-pc.sh
new file mode 100644
index 0000000000..51e44f101e
--- /dev/null
+++ b/network/fujinet-pc/fujinet-pc.sh
@@ -0,0 +1,33 @@
+#!/bin/sh
+
+SHARE=/usr/share/fujinet-pc
+EXE=/usr/libexec/fujinet-pc/fujinet
+
+if [ "$1" = "-help" -o "$1" = "--help" -o "$1" = "-h" ]; then
+  echo -n "Usage: $( basename $0 ) "
+  $EXE --help 2>&1 | grep '^Usage:' | cut -d' ' -f3-
+  exit 0
+fi
+
+FUJINET_HOME="${FUJINET_HOME:-$HOME/.fujinet-pc}"
+if [ ! -e "$FUJINET_HOME" ]; then
+  echo "$FUJINET_HOME does not exist, populating from $SHARE"
+  mkdir -p "$FUJINET_HOME" || exit 1
+  cp -a $SHARE/* "$FUJINET_HOME" || exit 1
+fi
+
+cd "$FUJINET_HOME" || exit 1
+
+echo "Starting FujiNet"
+$EXE "$@"
+rc=$?
+
+# from sysexits.h
+# #define EX_TEMPFAIL     75      /* temp failure; user is invited to retry */
+while [ $rc -eq 75 ]; do
+    echo "Restarting FujiNet"
+    $EXE "$@"
+    rc=$?
+done
+
+echo "FujiNet ended with exit code $rc"
diff --git a/network/fujinet-pc/slack-desc b/network/fujinet-pc/slack-desc
new file mode 100644
index 0000000000..745c06b444
--- /dev/null
+++ b/network/fujinet-pc/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+          |-----handy-ruler------------------------------------------------------|
+fujinet-pc: fujinet-pc (Linux port of FujiNet firmware)
+fujinet-pc:
+fujinet-pc: FujiNet is a network adaptor for the Atari 8-bit line of computers. It
+fujinet-pc: has many features, including the ability to netboot the Atari from a
+fujinet-pc: disk image on an Internet TNFS server. It's a piece of hardware which
+fujinet-pc: plugs into the Atari's SIO port and connects to a wireless network.
+fujinet-pc:
+fujinet-pc: fujinet-pc is a Linux port of the FujiNet firmware, which allows using
+fujinet-pc: most of the FujiNet's features with just an SIO2PC cable and a PC.
+fujinet-pc:
+fujinet-pc:
diff --git a/network/fwbuilder/README b/network/fwbuilder/README
deleted file mode 100644
index db28272397..0000000000
--- a/network/fwbuilder/README
+++ /dev/null
@@ -1,6 +0,0 @@
-Firewall Builder is multi-platform firewall configuration and management 
-tool.  It consists of a GUI and set of policy compilers for various firewall 
-platforms. Firewall Builder uses object-oriented approach, it helps the 
-administrator maintain a database of network objects and allows policy 
-editing using simple drag-and-drop operations. Firewall Builder currently 
-supports iptables, ipfilter, OpenBSD PF, and Cisco PIX. 
diff --git a/network/fwbuilder/fwbuilder-5.0.0.3568-ldflags.patch b/network/fwbuilder/fwbuilder-5.0.0.3568-ldflags.patch
deleted file mode 100644
index d9df8429d3..0000000000
--- a/network/fwbuilder/fwbuilder-5.0.0.3568-ldflags.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Naurp fwbuilder-5.0.0.3568.orig//qmake.inc.in fwbuilder-5.0.0.3568//qmake.inc.in
---- fwbuilder-5.0.0.3568.orig//qmake.inc.in	2011-07-25 19:27:44.000000000 -0400
-+++ fwbuilder-5.0.0.3568//qmake.inc.in	2011-08-19 17:00:41.259985388 -0400
-@@ -39,6 +39,7 @@ unix {
-     QMAKE_CFLAGS_RELEASE += -Wno-unused-parameter
-     QMAKE_CXXFLAGS_DEBUG += -Wno-unused-parameter
-     QMAKE_CXXFLAGS_RELEASE += -Wno-unused-parameter
-+    QMAKE_LFLAGS = @LDFLAGS@
- 
-     !macx {
- 
diff --git a/network/fwbuilder/fwbuilder-5.1.0.3599-gcc47.patch b/network/fwbuilder/fwbuilder-5.1.0.3599-gcc47.patch
deleted file mode 100644
index c909028467..0000000000
--- a/network/fwbuilder/fwbuilder-5.1.0.3599-gcc47.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -ruN fwbuilder-5.1.0.3599.orig/src/libfwbuilder/src/fwbuilder/ThreadTools.h fwbuilder-5.1.0.3599/src/libfwbuilder/src/fwbuilder/ThreadTools.h
---- fwbuilder-5.1.0.3599.orig/src/libfwbuilder/src/fwbuilder/ThreadTools.h	2012-03-23 07:10:54.000000000 +0100
-+++ fwbuilder-5.1.0.3599/src/libfwbuilder/src/fwbuilder/ThreadTools.h	2012-06-27 02:33:32.122340892 +0200
-@@ -31,6 +31,7 @@
- 
- #include <time.h> //for time_t definition
- #include <pthread.h>
-+#include <unistd.h>
- 
- #include <string>
- #include <queue>
diff --git a/network/fwbuilder/fwbuilder.SlackBuild b/network/fwbuilder/fwbuilder.SlackBuild
deleted file mode 100644
index dc33654e30..0000000000
--- a/network/fwbuilder/fwbuilder.SlackBuild
+++ /dev/null
@@ -1,109 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for libfwbuilder
-
-# Written by David Somero <dsomero@hotmail.com>
-# Derived from Slackware's Slackbuilds.
-#
-# Copyright 2008, 2009  Patrick J. Volkerding, Sebeka, Minnesota, USA
-# Copyright 2010-2011  David Somero (dsomero@hotmail.com) Athens, TN, 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=fwbuilder
-VERSION=${VERSION:-5.1.0.3599}
-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 {} \;
-
-patch -p1 -i $CWD/fwbuilder-5.0.0.3568-ldflags.patch
-patch -p1 -i $CWD/fwbuilder-5.1.0.3599-gcc47.patch
-
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./autogen.sh \
-  --prefix=/usr \
-  --mandir=/usr/man \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --with-docdir=/usr/doc/$PRGNAM-$VERSION \
-  --without-ccache \
-  --without-distcc \
-  --build=$ARCH-slackware-linux
-
-make
-make INSTALL_ROOT=$PKG install
-
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-# Move incorrectly installed man pages; stupid configure overrides our settings.
-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
-
-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/network/fwbuilder/fwbuilder.info b/network/fwbuilder/fwbuilder.info
deleted file mode 100644
index f7637e3fd5..0000000000
--- a/network/fwbuilder/fwbuilder.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="fwbuilder"
-VERSION="5.1.0.3599"
-HOMEPAGE="https://web.archive.org/web/20180131074714/http://www.fwbuilder.org/"
-DOWNLOAD="http://downloads.sourceforge.net/project/fwbuilder/Current_Packages/5.1.0/fwbuilder-5.1.0.3599.tar.gz"
-MD5SUM="331ce22eb8fb770a70395c3744f5092f"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="David Somero"
-EMAIL="dsomero@hotmail.com"
diff --git a/network/fwbuilder/slack-desc b/network/fwbuilder/slack-desc
deleted file mode 100644
index dd5080da5e..0000000000
--- a/network/fwbuilder/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------------------------------------------------------|
-fwbuilder: fwbuilder (Firewall creation utility)
-fwbuilder:
-fwbuilder: Firewall Builder consists of a GUI and set of policy compilers for
-fwbuilder: various firewall platforms. It helps users maintain a database of
-fwbuilder: objects and allows policy editing using simple drag-and-drop
-fwbuilder: operations. Firewall Builder currently supports iptables, ipfilter,
-fwbuilder: OpenBSD PF and Cisco PIX.
-fwbuilder:
-fwbuilder:
-fwbuilder:
-fwbuilder:
diff --git a/network/fwknop/fwknop.SlackBuild b/network/fwknop/fwknop.SlackBuild
index cedba3cc50..f67276bdff 100644
--- a/network/fwknop/fwknop.SlackBuild
+++ b/network/fwknop/fwknop.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for fwknop
 #
@@ -18,10 +18,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=fwknop
 VERSION=${VERSION:-2.6.9}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-3}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -31,7 +34,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
+# the name of the created package would be, and then exit. This information
+# could be useful to other scripts.
+if [ ! -z "${PRINT_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 @@ find -L . \
  \( -perm 666 -o -perm 664 -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 \
@@ -97,9 +107,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/network/fwknop/fwknop.info b/network/fwknop/fwknop.info
index 0446408d1f..e745237ec8 100644
--- a/network/fwknop/fwknop.info
+++ b/network/fwknop/fwknop.info
@@ -6,5 +6,5 @@ MD5SUM="f195bd31e7dc7df2e9b0c35cd80655b7"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Eric B. Pratt"
-EMAIL="eric.b.pratt@gmail.com"
+MAINTAINER="Sergey Poznyakoff"
+EMAIL="gray@gnu.org"
diff --git a/network/gajim/README b/network/gajim/README
index 0e7fb06135..6e6856a15e 100644
--- a/network/gajim/README
+++ b/network/gajim/README
@@ -1,5 +1,12 @@
-As of the 0.16 version, gajim uses it's own non-blocking xmpp implementation
-called nbxmpp (python-nbxmpp on slackbuilds.org). This is required to build.
+gajim is a GTK3-based Jabber client featuring tabbed interface,
+tray icon and notifications, encryption support, local link
+(Zeroconf/Bonjour) and other interesting things.
 
-For encryption PyOpenSSL is used, which is not required for building, but
-produces a warning message on connection if not installed.
+Optional dependencies:
+   gspell
+   gst-plugins-ugly
+   gst-plugins-bad-nonfree
+
+Note that 1.5.4 is the last version to support Python 3.9, so there
+will be no more updates of this slackbuild until the next Slackware
+release.
diff --git a/network/gajim/gajim.SlackBuild b/network/gajim/gajim.SlackBuild
index d3665b9350..1e38de8bd4 100644
--- a/network/gajim/gajim.SlackBuild
+++ b/network/gajim/gajim.SlackBuild
@@ -1,8 +1,9 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for Gajim
 #
 # Copyright 2014-2018 Ruben Schuller
+# Copyright 2022-2023 Andrew Clemons, Tokyo Japan
 #
 # 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=gajim
-VERSION=${VERSION:-0.16.9}
+VERSION=${VERSION:-1.5.4}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -36,32 +40,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=""
-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
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
@@ -70,19 +64,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 {} \;
 
-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
+# our pango is too old, but it seems a somewhat arbitrary version was chosen.
+# This version of Gajim seems to work fine with our pango in 15.0.
+sed -i "/_MIN_PANGO_VER/s/'1.50.0'/'1.48.0'/g" gajim/gajim.py
+
+python3 -m build --wheel --no-isolation
+
+python3 -m installer --destdir "$PKG" dist/*.whl
 
-make
-make install DESTDIR=$PKG
+mv $PKG/usr/share/man $PKG/usr/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
@@ -98,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/network/gajim/gajim.info b/network/gajim/gajim.info
index 5cbd0123c2..49c97e2fcd 100644
--- a/network/gajim/gajim.info
+++ b/network/gajim/gajim.info
@@ -1,10 +1,10 @@
 PRGNAM="gajim"
-VERSION="0.16.9"
-HOMEPAGE="http://www.gajim.org"
-DOWNLOAD="https://gajim.org/downloads/0.16/gajim-0.16.9.tar.bz2"
-MD5SUM="87684533b7d6a9611fe28a9b7fca296d"
+VERSION="1.5.4"
+HOMEPAGE="https://gajim.org/"
+DOWNLOAD="https://gajim.org/downloads/1.5/gajim-1.5.4.tar.gz"
+MD5SUM="64affe8a670a34fca67808ca1cb5b664"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="pyOpenSSL python-nbxmpp pycrypto"
-MAINTAINER="Ruben Schuller"
-EMAIL="sb@rbn.im"
+REQUIRES="python3-build python3-wheel python-nbxmpp cryptography css-parser python3-keyring gtksourceview4 gsound python-qrcode python-axolotl python-gnupg gst-python"
+MAINTAINER="Andrew Clemons"
+EMAIL="andrew.clemons@gmail.com"
diff --git a/network/gajim/slack-desc b/network/gajim/slack-desc
index 6019eadf37..bb25670c10 100644
--- a/network/gajim/slack-desc
+++ b/network/gajim/slack-desc
@@ -8,12 +8,12 @@
      |-----handy-ruler------------------------------------------------------|
 gajim: gajim (full featured and easy to use Jabber client)
 gajim:
-gajim: Jabber is a GTK2-based Jabber client featuring tabbed interface,
+gajim: Jabber is a GTK3-based Jabber client featuring tabbed interface,
 gajim: tray icon and notifications, encryption support, local link
 gajim: (Zeroconf/Bonjour) and other interesting things.
 gajim:
 gajim:
 gajim:
 gajim:
-gajim: Website: http://www.gajim.org
+gajim: Website: https://gajim.org/
 gajim:
diff --git a/network/gallery-dl/README b/network/gallery-dl/README
new file mode 100644
index 0000000000..ae9a368ad5
--- /dev/null
+++ b/network/gallery-dl/README
@@ -0,0 +1,9 @@
+gallery-dl (Command line image scraper)
+
+gallery-dl is a command-line program to download image galleries and
+collections from several image hosting sites. It is a cross-platform
+tool with many configuration options and powerful filenaming 
+capabilities. 
+
+Optional dependencies include yt-dlp/youtube-dl for video downloads and
+pysocks for SOCKS proxy support.
diff --git a/network/gallery-dl/gallery-dl.SlackBuild b/network/gallery-dl/gallery-dl.SlackBuild
new file mode 100644
index 0000000000..570bb808ed
--- /dev/null
+++ b/network/gallery-dl/gallery-dl.SlackBuild
@@ -0,0 +1,87 @@
+#!/bin/bash
+
+# Slackware build script for gallery-dl
+
+# 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=gallery-dl
+VERSION=${VERSION:-1.26.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 [ ! -z "${PRINT_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 man PREFIX=/usr DESTDIR=$PKG
+make completion PREFIX=/usr DESTDIR=$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
+
+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 LICENSE docs/formatting.md docs/gallery-dl-example.conf docs/gallery-dl.conf docs/options.md docs/supportedsites.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/network/gallery-dl/gallery-dl.info b/network/gallery-dl/gallery-dl.info
new file mode 100644
index 0000000000..f5b7bf9139
--- /dev/null
+++ b/network/gallery-dl/gallery-dl.info
@@ -0,0 +1,10 @@
+PRGNAM="gallery-dl"
+VERSION="1.26.8"
+HOMEPAGE="https://github.com/mikf/gallery-dl"
+DOWNLOAD="https://github.com/mikf/gallery-dl/archive/v1.26.8/gallery-dl-1.26.8.tar.gz"
+MD5SUM="1922ddc39c6f79dc7389ab8964bbf6a7"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Samuel Young"
+EMAIL="samyoung12788@gmail.com"
diff --git a/network/gallery-dl/slack-desc b/network/gallery-dl/slack-desc
new file mode 100644
index 0000000000..bfb617a755
--- /dev/null
+++ b/network/gallery-dl/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+          |-----handy-ruler------------------------------------------------------|
+gallery-dl: gallery-dl (Command line image scraper)
+gallery-dl:
+gallery-dl: gallery-dl is a command-line program to download image galleries and
+gallery-dl: collections from several image hosting sites. It is a cross-platform
+gallery-dl: tool with many configuration options and powerful filenaming capabi-
+gallery-dl: lities. 
+gallery-dl:
+gallery-dl:
+gallery-dl:
+gallery-dl: Homepage: https://github.com/mikf/gallery-dl
+gallery-dl:
diff --git a/network/ganglia-web/README b/network/ganglia-web/README
deleted file mode 100644
index b3f8439a86..0000000000
--- a/network/ganglia-web/README
+++ /dev/null
@@ -1,7 +0,0 @@
-Ganglia is a scalable distributed monitoring system for high-performance 
-computing systems such as clusters and Grids. It is based on a hierarchical
-design targeted at federations of clusters.
-
-The Ganglia web frontend files will be stored under /var/www/htdocs/ganglia
-directory. You can set WWWPATH to the desired place for your web server.
-Example:    WWWPATH=/var/www/ganglia ./ganglia-web.SlackBuild
diff --git a/network/ganglia-web/doinst.sh b/network/ganglia-web/doinst.sh
deleted file mode 100644
index 63bedaf35d..0000000000
--- a/network/ganglia-web/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/httpd/extra/ganglia.conf.new
diff --git a/network/ganglia-web/ganglia-web.SlackBuild b/network/ganglia-web/ganglia-web.SlackBuild
deleted file mode 100644
index 694fa060e1..0000000000
--- a/network/ganglia-web/ganglia-web.SlackBuild
+++ /dev/null
@@ -1,96 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for Ganglia-web
-
-# Copyright 2016 Emmanuel N. Millán, Mendoza, 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.
-
-PRGNAM=ganglia-web
-VERSION=${VERSION:-3.7.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}
-
-WWWPATH=${WWWPATH:-/var/www/htdocs/ganglia}
-DOCUMENTATION="AUTHORS COPYING README TODO"
-
-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 GDESTDIR=${PKG}${WWWPATH} \
-	GCONFDIR=${PKG}/etc/ganglia-web \
-	GWEB_STATEDIR=${PKG}/var/lib/ganglia-web \
-	GMETAD_ROOTDIR=${PKG}/var/lib/ganglia \
-	APACHE_USER=apache
-
-mkdir -p $PKG/etc/httpd/extra
-sed -e "s|@GDESTDIR@|${WWWPATH}|g" apache.conf.in > apache.conf
-sed -i 's/AllowOverride All/AllowOverride All\n\tRequire all granted/' apache.conf
-cat apache.conf > $PKG/etc/httpd/extra/ganglia.conf.new
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a $DOCUMENTATION $PKG/usr/doc/$PRGNAM-$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/network/ganglia-web/ganglia-web.info b/network/ganglia-web/ganglia-web.info
deleted file mode 100644
index b73bd5069f..0000000000
--- a/network/ganglia-web/ganglia-web.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="ganglia-web"
-VERSION="3.7.2"
-HOMEPAGE="http://ganglia.info/"
-DOWNLOAD="http://downloads.sourceforge.net/ganglia/ganglia-web-3.7.2.tar.gz"
-MD5SUM="a2d87edcf2914a053aa6be0ee4d57c29"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="ganglia"
-MAINTAINER="Emmanuel N. Millan"
-EMAIL="emmanueln __at__ gmail.com"
diff --git a/network/ganglia-web/slack-desc b/network/ganglia-web/slack-desc
deleted file mode 100644
index 7c8878dc85..0000000000
--- a/network/ganglia-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------------------------------------------------------|
-ganglia-web: ganglia-web (distributed monitoring system web interface)
-ganglia-web:
-ganglia-web: Ganglia Web 2 (gweb2) is a refresh of the Ganglia PHP UI.
-ganglia-web:
-ganglia-web: Homepage: http://ganglia.info/
-ganglia-web:
-ganglia-web:
-ganglia-web:
-ganglia-web:
-ganglia-web:
-ganglia-web:
diff --git a/network/ganglia/README b/network/ganglia/README
deleted file mode 100644
index 6d8f64dcd5..0000000000
--- a/network/ganglia/README
+++ /dev/null
@@ -1,17 +0,0 @@
-ganglia (distributed monitoring system)
-
-Ganglia is a scalable distributed monitoring system for high-performance 
-computing systems such as clusters and Grids. It is based on a hierarchical
-design targeted at federations of clusters.
-
-1. This SlackBuild is just going to build Ganglia without 'gmetad', which 
-   collects information from ganglia monitor clients, and writes them to RRD
-   databases. If you want to enable this, you'll have to enable it with the 
-   OPT variable and 'gmetad' as value, then execute the build script as 
-   follows:    OPT=gmetad ./ganglia.SlackBuild
-
-   In order to build gmetad as part of this package, you'll need to have 
-   RRDTool installed.  It is available from SlackBuilds.org.
-
-2. The Ganglia web frontend is distributed as a separated SlackBuild:
-   ganglia-web.
diff --git a/network/ganglia/doinst.sh b/network/ganglia/doinst.sh
deleted file mode 100644
index 6d02270893..0000000000
--- a/network/ganglia/doinst.sh
+++ /dev/null
@@ -1,34 +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/ganglia/gmond.conf.new
-preserve_perms etc/rc.d/rc.gmond.new
-
-if [ -e etc/ganglia/gmetad.conf.new ]; then
-  config etc/ganglia/gmetad.conf.new
-fi
-
-if [ -e etc/rc.d/rc.gmetad.new ]; then
-  preserve_perms etc/rc.d/rc.gmetad.new
-fi
diff --git a/network/ganglia/ganglia.SlackBuild b/network/ganglia/ganglia.SlackBuild
deleted file mode 100644
index eef0dc9066..0000000000
--- a/network/ganglia/ganglia.SlackBuild
+++ /dev/null
@@ -1,133 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for Ganglia
-
-# Copyright 2008 Cherife Li <cherife-#-dotimes.com>
-# All rights reserved.
-#
-# Copyright 2016 Emmanuel N. Millán, Mendoza, 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.
-
-PRGNAM=ganglia
-VERSION=${VERSION:-3.7.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}
-
-DOCUMENTATION="AUTHORS COPYING ChangeLog INSTALL NEWS README*"
-
-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 [ -n "$OPT" ]; then
-   if [ "$OPT" = 'gmetad' ]; then
-      OPT='--with-gmetad'
-   else
-      unset -v OPT
-   fi
-fi
-
-
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
-  --prefix=/usr \
-  --sysconfdir=/etc \
-  --localstatedir=/var \
-  --enable-static=no \
-  --enable-gexeca \
-  --enable-status \
-  --mandir=/usr/man \
-  --docdir=/usr/doc/$PRGNAM-$VERSION \
-  --build=$ARCH-slackware-linux \
-  $OPT
-
-make
-make install DESTDIR=$PKG
-
-mkdir -p $PKG/etc/rc.d
-mkdir -p $PKG/etc/ganglia
-./gmond/gmond -t > $PKG/etc/ganglia/gmond.conf.new
-sed -e 's|daemon $GMOND|daemon $GMOND -c /etc/ganglia/gmond.conf|g' gmond/gmond.init > $PKG/etc/rc.d/rc.gmond.new
-
-if [ -n "$OPT" ]; then
-  cat gmetad/gmetad.conf > $PKG/etc/ganglia/gmetad.conf.new
-  sed -e 's|daemon $GMETAD|daemon $GMETAD -c /etc/ganglia/gmetad.conf|g' gmetad/gmetad.init > $PKG/etc/rc.d/rc.gmetad.new
-  rm $PKG/etc/gmetad.conf
-  mkdir -p /var/lib/ganglia/rrds
-  chown nobody.nogroup -R /var/lib/ganglia/rrds
-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 $DOCUMENTATION $PKG/usr/doc/$PRGNAM-$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/network/ganglia/ganglia.info b/network/ganglia/ganglia.info
deleted file mode 100644
index 4cb092a787..0000000000
--- a/network/ganglia/ganglia.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="ganglia"
-VERSION="3.7.2"
-HOMEPAGE="http://ganglia.info/"
-DOWNLOAD="http://downloads.sourceforge.net/ganglia/ganglia-3.7.2.tar.gz"
-MD5SUM="49c5cd0292fdfb57d098ac76b6e97672"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="confuse"
-MAINTAINER="Emmanuel N. Millan"
-EMAIL="emmanueln __at__ gmail.com"
diff --git a/network/ganglia/slack-desc b/network/ganglia/slack-desc
deleted file mode 100644
index 264f6dcbbb..0000000000
--- a/network/ganglia/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------------------------------------------------------|
-ganglia: ganglia (distributed monitoring system)
-ganglia:
-ganglia: Ganglia is a scalable distributed monitoring system for
-ganglia: high-performance computing systems such as clusters and Grids. It
-ganglia: is based on a hierarchical design targeted at federations
-ganglia: of clusters.
-ganglia:
-ganglia: Homepage: http://ganglia.info/
-ganglia:
-ganglia:
-ganglia:
diff --git a/network/gemget-bin/README b/network/gemget-bin/README
new file mode 100644
index 0000000000..831f8e22ba
--- /dev/null
+++ b/network/gemget-bin/README
@@ -0,0 +1,12 @@
+gemget-bin (file downloader for gemini protocol)
+
+gemget is a command line downloader for the Gemini protocol. It works
+well with streams and can print headers for debugging as well. It's
+basically the equivalent of wget, for gemini:// URLs.
+
+Since this is a binary repack, only i586/i686, x86_64, and aarch64 are
+supported. For aarch64, download the file here:
+
+https://github.com/makew0rld/gemget/releases/download/v1.9.0/gemget_1.9.0_linux_arm64
+
+Its md5sum is a3e858cb4d08729bba30d8ade5e313cf.
diff --git a/network/gemget-bin/docs/LICENSE b/network/gemget-bin/docs/LICENSE
new file mode 100644
index 0000000000..ee7b3fc619
--- /dev/null
+++ b/network/gemget-bin/docs/LICENSE
@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2020 makeworld
+
+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.
diff --git a/network/gemget-bin/docs/README.md b/network/gemget-bin/docs/README.md
new file mode 100644
index 0000000000..952e51add4
--- /dev/null
+++ b/network/gemget-bin/docs/README.md
@@ -0,0 +1,91 @@
+# gemget
+
+A command line downloader for the [Gemini protocol](https://gemini.circumlunar.space/).
+It works well with streams and can print headers for debugging as well.
+
+```
+gemget [option]... URL...
+
+Usage of ./gemget:
+  -e, --add-extension          Add .gmi extensions to gemini files that don't have it, like directories.
+                               
+      --cert string            Path to a PEM encoded TLS client certificate to be sent with the request.
+                               
+      --connect-timeout uint   Max time allowed to form a connection and get the header, in seconds.
+                               Set to 0 for no timeout. (default 15)
+  -d, --directory string       
+                               The directory where downloads go (default ".")
+      --header                 
+                               Print out (even with --quiet) the response header to stdout in the format:
+                               Header: <status> <meta>
+                               
+  -f, --input-file string      Input file with a single URL on each line. Empty lines or lines starting
+                               with # are ignored. URLs on the command line will be processed first.
+                               
+  -i, --insecure               Skip checking the cert
+                               
+      --key string             Path to a PEM encoded TLS key for the provided client cert.
+                               
+  -m, --max-size string        Set the file size limit. Any download that exceeds this size will
+                               cause an Info output and be deleted.
+                               Leaving it blank or setting to zero bytes will result in no limit.
+                               This flag is ignored when outputting to stdout.
+                               Format: <num> <optional-byte-size>
+                               Examples: 423, 3.2KiB, '2.5 MB', '22 MiB', '10gib', 3M
+                               
+  -t, --max-time uint          Set the downloading time limit, in seconds. Any download that
+                               takes longer will cause an Info output and be deleted.
+                               
+      --no-progress-bar        Disable the progress bar output.
+                               
+  -o, --output string          Output path, for when there is only one URL.
+                               '-' means stdout and implies --quiet.
+                               It overrides --directory.
+                               
+  -p, --proxy string           A proxy that can requests are sent to instead.
+                               Can be a domain or IP with port. Port 1965 is assumed otherwise.
+                               
+  -q, --quiet                  Neither info strings or the progress bar will be printed.
+                               Note that normally infos are printed to stderr, not stdout.
+                               
+  -r, --redirects uint         How many redirects to follow before erroring out. (default 5)
+  -s, --skip                   Move to the next URL when one fails.
+  --socks string               Host/address for a SOCKS5 proxy
+  --socks-pass string          Password for a SOCKS5 proxy (optional)
+  --socks-user string          Username for a SOCKS5 proxy (optional)
+
+  -v, --version                Find out what version of gemget you're running.
+```
+
+## Project Status
+
+gemget is in maintenance mode. See my [blog post](https://www.makeworld.space/2023/08/bye_gemini.html) for details.
+
+## Installation
+Install a binary of the most recent release from the [releases page](https://github.com/makeworld-the-better-one/gemget/releases/). On Unix-based systems you will have to make the file executable with `chmod +x <filename>`. You can rename the file to just `gemget` for easy access, and move it to `/usr/local/bin/`.
+
+If you have Go installed, you can also install it using the Makefile. Make sure to use GNU Make.
+
+```shell
+git clone https://github.com/makeworld-the-better-one/gemget
+cd gemget
+# git checkout v1.2.3 # Optionally pin to a specific version instead of the latest commit
+make
+sudo make install
+```
+
+## Arch Linux
+
+Arch Linux users can install gemget from AUR. It has the package name `gemget`, and is maintained by @dalz.
+
+```shell
+yay -S gemget
+```
+
+
+## Features to add
+- [x] Support client certificates
+- [ ] Support interactive input for status code 10 & 11
+
+## License
+This project is under the [MIT License](./LICENSE).
diff --git a/network/gemget-bin/gemget-bin.SlackBuild b/network/gemget-bin/gemget-bin.SlackBuild
new file mode 100644
index 0000000000..ad8e24fcdb
--- /dev/null
+++ b/network/gemget-bin/gemget-bin.SlackBuild
@@ -0,0 +1,71 @@
+#!/bin/bash
+
+# Slackware build script for gemget-bin
+
+# 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=gemget-bin
+SRCNAM=gemget
+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=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}
+
+EXE=""
+case "$ARCH" in
+  i?86)    EXE=${SRCNAM}_${VERSION}_linux_32-bit ;;
+  x86_64)  EXE=${SRCNAM}_${VERSION}_linux_64-bit ;;
+  aarch64) EXE=${SRCNAM}_${VERSION}_linux_arm64  ;;
+esac
+
+if [ "$EXE" = "" ]; then
+  cat <<EOF
+===================================================
+Sorry, ARCH="$ARCH" is not supported.
+Only i586, i686, x86_64, and aarch64 are supported.
+===================================================
+EOF
+  exit 1
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $PKG
+install -D -m0755 -oroot -groot $CWD/$EXE usr/bin/$SRCNAM
+
+# the binary includes no docs. so they're included with the SlackBuild
+# (taken from the git repo at https://github.com/makew0rld/gemget).
+
+PKGDOC=$PKG/usr/doc/$PRGNAM-$VERSION
+mkdir -p $PKGDOC
+install -m0644 -oroot -groot $CWD/docs/* $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/network/gemget-bin/gemget-bin.info b/network/gemget-bin/gemget-bin.info
new file mode 100644
index 0000000000..0a6b959c23
--- /dev/null
+++ b/network/gemget-bin/gemget-bin.info
@@ -0,0 +1,10 @@
+PRGNAM="gemget-bin"
+VERSION="1.9.0"
+HOMEPAGE="https://github.com/makew0rld/gemget/"
+DOWNLOAD="https://github.com/makew0rld/gemget/releases/download/v1.9.0/gemget_1.9.0_linux_32-bit"
+MD5SUM="6e5d9c6d38abee20ad4dccedafe978a7"
+DOWNLOAD_x86_64="https://github.com/makew0rld/gemget/releases/download/v1.9.0/gemget_1.9.0_linux_64-bit"
+MD5SUM_x86_64="d0bfc8118c379c4dfaf6872ff32eef3a"
+REQUIRES=""
+MAINTAINER="B. Watson"
+EMAIL="urchlay@slackware.uk"
diff --git a/network/gemget-bin/slack-desc b/network/gemget-bin/slack-desc
new file mode 100644
index 0000000000..ffc39ee66a
--- /dev/null
+++ b/network/gemget-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------------------------------------------------------|
+gemget-bin: gemget-bin (file downloader for gemini protocol)
+gemget-bin:
+gemget-bin: gemget is a command line downloader for the Gemini protocol. It works
+gemget-bin: well with streams and can print headers for debugging as well. It's
+gemget-bin: basically the equivalent of wget, for gemini:// URLs.
+gemget-bin:
+gemget-bin:
+gemget-bin:
+gemget-bin:
+gemget-bin:
+gemget-bin:
diff --git a/network/geoipupdate/README b/network/geoipupdate/README
index a1c0d6be1f..6610953c35 100644
--- a/network/geoipupdate/README
+++ b/network/geoipupdate/README
@@ -1,3 +1,3 @@
-MaxMind provides the GeoIP Update program, which performs automatic updates
-for both GeoIP2 and GeoIP Legacy binary databases. GeoIP updates require
-an active GeoIP subscription.
+MaxMind provides the GeoIP Update program, which performs automatic
+updates for both GeoIP2 and GeoIP Legacy binary databases. GeoIP
+updates require an active GeoIP subscription.
diff --git a/network/geoipupdate/geoipupdate.SlackBuild b/network/geoipupdate/geoipupdate.SlackBuild
index d87506da5f..a3d2e6f617 100644
--- a/network/geoipupdate/geoipupdate.SlackBuild
+++ b/network/geoipupdate/geoipupdate.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for geoipupdate
 
@@ -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=geoipupdate
 VERSION=${VERSION:-2.5.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}
@@ -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/network/geomyidae/README b/network/geomyidae/README
index 8899a4b95e..131dc73a22 100644
--- a/network/geomyidae/README
+++ b/network/geomyidae/README
@@ -6,8 +6,18 @@ Features:
 * cgi support (.cgi files are executed)
 * search support in CGI files
 * logging (-l option) and loglevels (-v option)
+* optional TLS support
 
 An rc.geomyidae is included which takes its startup options
 from the $GEOMYIDAE_ARGS environmental variable. Read
 /usr/doc/geomyidae-$VERSION/README for a list of the full
 options.
+
+The gph.vim ftdetect and syntax files are now installed into
+/usr/share/vim/ so there is no need to copy them manually.
+
+OPTIONAL:
+
+libtls or libressl for TLS support and:
+
+  TLS=yes ./geomyidae.SlackBuild
diff --git a/network/geomyidae/geomyidae.SlackBuild b/network/geomyidae/geomyidae.SlackBuild
index 2db6aaeebc..924012c8e4 100644
--- a/network/geomyidae/geomyidae.SlackBuild
+++ b/network/geomyidae/geomyidae.SlackBuild
@@ -1,7 +1,7 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for geomyidae
-# Copyright 2017 David Woodfall <dave@dawoodfall.net>
+# Copyright 2017 David Woodfall <dave@slackbuilds.org>
 # 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=geomyidae
-VERSION=${VERSION:-v0.34}
+VERSION=${VERSION:-0.69}
 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}
@@ -58,42 +68,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 $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 {} \;
+find . -perm /111 -a \! -perm 755 -a -exec chmod 755 {} + \
+ -o \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} +
+
+# check libtls installed
+if pkg-config --exists libtls && [[ $TLS =~ YES|yes ]]; then
+  # extra flags for TLS
+  SLKCFLAGS="$SLKCFLAGS -I/opt/libressl/include"
+  SLKLDFLAGS=-L/opt/libressl/lib$LIBDIRSUFFIX
+  SLKPKG_CONFIG_PATH=/opt/libressl/lib$LIBDIRSUFFIX/pkgconfig:
+  SLKLD_LIBRARY_PATH=/opt/libressl/lib$LIBDIRSUFFIX:
+else
+  # comment out TLS flags
+  sed -i "s,^TLS_CFLAGS,#&," Makefile
+  sed -i "s,^TLS_LDFLAGS,#&," Makefile
+fi
 
 sed -i 's,PREFIX =.*,PREFIX = /usr,' Makefile
 sed -i 's,MANDIR = .*,MANDIR = ${PREFIX}/man/man8,' Makefile
 
 CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-make
+LDFLAGS="$LDFLAGS $SLKLDFLAGS" \
+PKG_CONFIG_PATH="${SLKPKG_CONFIG_PATH}${PKG_CONFIG_PATH}" \
+LD_LIBRARY_PATH="${SLKLD_LIBRARY_PATH}${LD_LIBRARY_PATH}" \
+make PREFIX=/usr MANDIR=${PREFIX}/man/man8
 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 vim files
+for dir in ftdetect syntax; do
+  install -D -m 0644 gph/vim/$dir/gph.vim $PKG/usr/share/vim/$dir/gph.vim
+done
 
 mkdir -p $PKG/etc/rc.d
 cat rc.d/rc.geomyidae > $PKG/etc/rc.d/rc.geomyidae.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
+strip --strip-unneeded $PKG/usr/bin/geomyidae
+gzip -9 $PKG/usr/man/man8/geomyidae.8
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
-  LICENSE README LINKS index.gph gph \
+  CGI.md LICENSE README LINKS index.gph gph/ docker/ \
+  haproxy/ patches/ cgi-examples/ \
+  tls-gen-selfsign-cert.sh \
+  xinetd-gopher-request-filter.conf \
+  xinetd-gopher-request-filter.sh \
+  geomyidae.svg \
   $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 -c 644 '{}' +
+
 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/network/geomyidae/geomyidae.info b/network/geomyidae/geomyidae.info
index 68dc8ffdc6..b7325fc82c 100644
--- a/network/geomyidae/geomyidae.info
+++ b/network/geomyidae/geomyidae.info
@@ -1,10 +1,10 @@
 PRGNAM="geomyidae"
-VERSION="v0.34"
-HOMEPAGE="gopher://bitreich.org/1/scm/geomyidae/log.gph"
-DOWNLOAD="ftp://bitreich.org/releases/geomyidae/geomyidae-v0.34.tgz"
-MD5SUM="75c4e5864afc184514372b0a5922242d"
+VERSION="0.69"
+HOMEPAGE="http://r-36.net/scm/geomyidae/log.html"
+DOWNLOAD="ftp://bitreich.org/releases/geomyidae/geomyidae-v0.69.tar.gz"
+MD5SUM="a84ee793323acf83decef74a7601191d"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Dave Woodfall"
-EMAIL="dave@tty1.uk"
+MAINTAINER="D Woodfall"
+EMAIL="dave@slackbuilds.org"
diff --git a/network/geomyidae/slack-desc b/network/geomyidae/slack-desc
index 5112a071f8..f4cff64806 100644
--- a/network/geomyidae/slack-desc
+++ b/network/geomyidae/slack-desc
@@ -14,6 +14,6 @@ geomyidae: * dir listings (if no index.gph was found)
 geomyidae: * cgi support (.cgi files are executed)
 geomyidae: * search support in CGI files
 geomyidae: * logging (-l option) and loglevels (-v option)
+geomyidae: * optional TLS support
 geomyidae:
 geomyidae: gopher://bitreich.org/1/scm/geomyidae/log.gph
-geomyidae:
diff --git a/network/glassfish/README b/network/glassfish/README
deleted file mode 100644
index 0d54e4fd07..0000000000
--- a/network/glassfish/README
+++ /dev/null
@@ -1,16 +0,0 @@
-Glassfish is an open-source application server for the Java EE platform.
-Glassfish is the reference implementation of Java EE and as such supports
-Enterprise JavaBeans, JPA, JavaServer Faces, JMS, RMI, JavaServer Pages and
-servlets.
-
-You must have a "glassfish" user and a "glassfish" group to run this script:
-  groupadd -g 263 glassfish
-  useradd -u 263 -g glassfish -d /var/lib/glassfish -s /bin/false glassfish
-
-The SlackBuild will use /var/lib/glassfish to store domain and node
-configuration files. The default domain1 will be installed to /var/lib but note
-that this will be overwritten on upgrade, so it is advised to install any
-applications into a differently-named domain.
-
-The rc.glassfish script will operate on the default domain unless another is
-specified on the command line.
diff --git a/network/glassfish/asadmin b/network/glassfish/asadmin
deleted file mode 100644
index 59c7b2a472..0000000000
--- a/network/glassfish/asadmin
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-/opt/glassfish3/bin/asadmin "$@"
diff --git a/network/glassfish/doinst.sh b/network/glassfish/doinst.sh
deleted file mode 100644
index 127eb56cc6..0000000000
--- a/network/glassfish/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.glassfish.new
diff --git a/network/glassfish/glassfish.SlackBuild b/network/glassfish/glassfish.SlackBuild
deleted file mode 100644
index b0c04cb2ff..0000000000
--- a/network/glassfish/glassfish.SlackBuild
+++ /dev/null
@@ -1,93 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for glassfish
-
-# Copyright 2014 Benjamin Trigona-Harany
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
-#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
-#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (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=glassfish
-VERSION=${VERSION:-4.1}
-ARCH=noarch
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-MAJORVER=$(echo $VERSION | cut -d. -f1)
-
-set -e
-
-if ! getent group glassfish 2>&1 > /dev/null; then
-    echo "  You must have a \"glassfish\" group to run this script."
-    echo "    # groupadd -g 263 glassfish"
-    exit 1
-elif ! getent passwd glassfish 2>&1 > /dev/null; then
-    echo "  You must have a \"glassfish\" user to run this script."
-    echo "    # useradd -u 263 -g glassfish -d /var/lib/glassfish -s /bin/false glassfish"
-    exit 1
-fi
-
-rm -rf $PKG
-mkdir -p $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM$MAJORVER
-unzip $CWD/$PRGNAM-$VERSION-web.zip
-cd $PRGNAM$MAJORVER
-
-mkdir -p $PKG/usr/share/$PRGNAM
-cp -r bin glassfish javadb pkg $PKG/usr/share/$PRGNAM
-find $PKG/usr/share/$PRGNAM -name "*.bat" -exec rm {} +
-sed -i "s/^\(AS_INSTALL=\).*/\1\/usr\/share\/$PRGNAM\/glassfish/g" $PKG/usr/share/$PRGNAM/bin/asadmin
-sed -i "s/^\(AS_DEF_DOMAINS_PATH=\).*/\1\"\/var\/lib\/glassfish\/domains\"/" $PKG/usr/share/$PRGNAM/glassfish/config/asenv.conf
-sed -i "s/^\(AS_DEF_NODES_PATH=\).*/\1\"\/var\/lib\/glassfish\/nodes\"/" $PKG/usr/share/$PRGNAM/glassfish/config/asenv.conf
-
-mkdir -p $PKG/usr/bin
-ln -s $PKG/usr/share/$PRGNAM/bin/asadmin $PKG/usr/bin
-
-mkdir -p $PKG/var/lib/$PRGNAM
-mv $PKG/usr/share/$PRGNAM/glassfish/domains $PKG/var/lib/glassfish
-mkdir -p $PKG/var/lib/$PRGNAM/nodes
-
-mkdir -p $PKG/etc/rc.d
-cat $CWD/rc.glassfish > $PKG/etc/rc.d/rc.glassfish.new
-
-chown -R glassfish:glassfish $PKG/var/lib/$PRGNAM
-
-find $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 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
-
-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/network/glassfish/glassfish.info b/network/glassfish/glassfish.info
deleted file mode 100644
index 6e93aaa51c..0000000000
--- a/network/glassfish/glassfish.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="glassfish"
-VERSION="4.1"
-HOMEPAGE="http://glassfish.java.net"
-DOWNLOAD="http://download.java.net/glassfish/4.1/release/glassfish-4.1-web.zip"
-MD5SUM="252ab55a3ce890570092009df5fc6e6b"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="jdk"
-MAINTAINER="orphaned - no maintainer"
-EMAIL="nobody@nowhere"
diff --git a/network/glassfish/rc.glassfish b/network/glassfish/rc.glassfish
deleted file mode 100644
index eb4389fa52..0000000000
--- a/network/glassfish/rc.glassfish
+++ /dev/null
@@ -1,64 +0,0 @@
-#!/bin/sh
-
-# Glassfish startup script for Slackware Linux
-
-# $Date: 2014/11/11 $
-#
-# Copyright 2014 Benjamin Trigona-Harany <slackbuilds@jaxartes.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.
-
-DOMAIN=${2:-domain1}
-
-start()
-{
-    /usr/bin/sudo -u glassfish /usr/bin/asadmin start-domain $DOMAIN
-}
-
-stop()
-{
-    /usr/bin/sudo -u glassfish /usr/bin/asadmin stop-domain $DOMAIN
-}
-
-restart()
-{
-    /usr/bin/sudo -u glassfish /usr/bin/asadmin restart-domain $DOMAIN
-}
-
-status()
-{
-    /usr/bin/sudo -u glassfish /usr/bin/asadmin list-domains
-}
-
-case "$1" in
-'start')
-  start
-  ;;
-'stop')
-  stop
-  ;;
-'restart')
-  restart
-  ;;
-'status')
-  status
-  ;;
-*)
-  echo "usage $0 start|stop|restart|status [DOMAIN]"
-esac
diff --git a/network/glassfish/slack-desc b/network/glassfish/slack-desc
deleted file mode 100644
index 20e30c645b..0000000000
--- a/network/glassfish/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------------------------------------------------------|
-glassfish: glassfish (Java EE Application Server)
-glassfish:
-glassfish: Glassfish is an open-source application server for the Java EE
-glassfish: platform. It supports Enterprise JavaBeans, JPA, JavaServer Faces,
-glassfish: JMS, RMI, JavaServer Pages and servlets.
-glassfish:
-glassfish:
-glassfish:
-glassfish:
-glassfish:
-glassfish:
diff --git a/network/glewlwyd/README b/network/glewlwyd/README
index 87abbc3f2e..097e1973db 100644
--- a/network/glewlwyd/README
+++ b/network/glewlwyd/README
@@ -3,9 +3,17 @@ Glewlwyd Oauth 2 authentication server
 Oauth 2 Server providing JSON Web Tokens for identification.
 
 Lightweight, fast and easy to install on small systems.
-Requires a MySql or SQLite3 database.
+Requires a MySql, PostgreSQL or SQLite3 database.
 Handles LDAP or database for users backend.
 
 The API backend is fully written in language C, it's based on Ulfius
 HTTP framework, Hoel database framework and Libjwt JSON Web Tokens
 library.
+
+Set GLEWLWYD_SQLITE_INIT=1 to initialize, if it doesn't exist already,
+a proper SQLite /var/cache/glewlwyd/glewlwyd.db when installing the
+package.
+
+The sample configuration file in /etc/glewlwyd/glewlwyd.conf.sample
+is then directly usable with the pretty insecure admin/password
+credentials.
diff --git a/network/glewlwyd/glewlwyd.SlackBuild b/network/glewlwyd/glewlwyd.SlackBuild
index 7b965d8505..9664c0f555 100644
--- a/network/glewlwyd/glewlwyd.SlackBuild
+++ b/network/glewlwyd/glewlwyd.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 # Slackware build script for glewlwyd
 #
 # Yth | Pont-en-Royans, France | yth@ythogtha.org
@@ -20,10 +20,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=glewlwyd
-VERSION=${VERSION:-1.4.9}
+VERSION=${VERSION:-2.7.6}
+SRCVER=$(tr _ - <<< ${VERSION})
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -33,22 +37,32 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
+# the name of the created package would be, and then exit. This information
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; 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 -Wno-error=maybe-uninitialized"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686 -Wno-error=maybe-uninitialized"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC -Wno-error=maybe-uninitialized"
+  LIBDIRSUFFIX="64"
+elif [ "$ARCH" = "aarch64" ]; then
   SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
 else
-  SLKCFLAGS="-O2"
+  SLKCFLAGS="-O2 -Wno-error=maybe-uninitialized"
   LIBDIRSUFFIX=""
 fi
 
@@ -58,8 +72,8 @@ 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/$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 \
@@ -74,6 +88,7 @@ cd build
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DCMAKE_INSTALL_DOCDIR=doc/$PRGNAM-$VERSION \
     -DCMAKE_INSTALL_SYSCONFDIR=/etc \
+    -DCMAKE_INSTALL_MANDIR=/usr/man \
     -DCMAKE_BUILD_TYPE=Release ..
   make VERBOSE=1
   make install DESTDIR=$PKG
@@ -82,7 +97,17 @@ 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/man8
+install -m 644 docs/glewlwyd.8 $PKG/usr/man/man8
+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 directory for SQLite3 database
+mkdir -p $PKG/var/cache/glewlwyd/
 mv $PKG/etc/glewlwyd/glewlwyd.conf $PKG/etc/glewlwyd/glewlwyd.conf.sample
+if [ ! -z "$LIBDIRSUFFIX" ]; then
+	sed -i 's#/usr/lib.*/glewlwyd/#/usr/lib'${LIBDIRSUFFIX}'/glewlwyd/#g' $PKG/etc/glewlwyd/glewlwyd.conf.sample
+fi
 
 mkdir -p $PKG/etc/rc.d/
 install -m 755 $CWD/rc.$PRGNAM $PKG/etc/rc.d/rc.$PRGNAM.new
@@ -96,6 +121,13 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 echo "preserve_perms etc/rc.d/rc.$PRGNAM.new" >> $PKG/install/doinst.sh
+if [ ! -z $GLEWLWYD_SQLITE_INIT ]; then
+	cat >>  $PKG/install/doinst.sh <<EOF
+if [ ! -f /var/cache/glewlwyd/glewlwyd.db ];then
+   sqlite3 /var/cache/glewlwyd/glewlwyd.db < /usr/share/glewlwyd/docs/database/init.sqlite3.sql
+fi
+EOF
+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/network/glewlwyd/glewlwyd.info b/network/glewlwyd/glewlwyd.info
index e6ddef6f7b..7e8db29bc0 100644
--- a/network/glewlwyd/glewlwyd.info
+++ b/network/glewlwyd/glewlwyd.info
@@ -1,10 +1,10 @@
 PRGNAM="glewlwyd"
-VERSION="1.4.9"
+VERSION="2.7.6"
 HOMEPAGE="https://github.com/babelouest/glewlwyd"
-DOWNLOAD="https://github.com/babelouest/glewlwyd/archive/v1.4.9/glewlwyd-1.4.9.tar.gz"
-MD5SUM="e941f5a92f51be42384210136c71cf48"
+DOWNLOAD="https://github.com/babelouest/glewlwyd/archive/v2.7.6/glewlwyd-2.7.6.tar.gz"
+MD5SUM="43d3dab8ec1f0a4213f8810eef832225"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="libconfig libjwt hoel"
+REQUIRES="libconfig oath-toolkit libcbor hoel iddawc"
 MAINTAINER="Yth - Arnaud"
 EMAIL="yth@ythogtha.org"
diff --git a/network/glewlwyd/slack-desc b/network/glewlwyd/slack-desc
index 9b13c25bf0..2b2ecd83af 100644
--- a/network/glewlwyd/slack-desc
+++ b/network/glewlwyd/slack-desc
@@ -10,7 +10,7 @@ glewlwyd: glewlwyd (Oauth 2 authentication server)
 glewlwyd:
 glewlwyd: Oauth 2 Server providing JSON Web Tokens for identification.
 glewlwyd: Lightweight, fast and easy to install on small systems.
-glewlwyd: Requires a MySql or SQLite3 database.
+glewlwyd: Requires a MySql, PostgreSQL or SQLite3 database.
 glewlwyd: Handles LDAP or database for users backend.
 glewlwyd:
 glewlwyd: The API backend is fully written in language C.
diff --git a/network/glusterfs/glusterfs.SlackBuild b/network/glusterfs/glusterfs.SlackBuild
index 099eb7f2ee..3ded72e7ab 100644
--- a/network/glusterfs/glusterfs.SlackBuild
+++ b/network/glusterfs/glusterfs.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for GlusterFS
 
@@ -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=glusterfs
 VERSION=${VERSION:-4.1.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}
@@ -70,7 +80,7 @@ find -L . \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 ./autogen.sh
-CFLAGS="$SLKCFLAGS" \
+CFLAGS="$SLKCFLAGS -w -Wl,--allow-multiple-definition" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
@@ -93,8 +103,8 @@ rm -f \
   $PKG/etc/$PRGNAM/gluster-rsyslog-5.8.conf \
   $PKG/etc/$PRGNAM/gluster-rsyslog-7.2.conf
 
-install -D -m 0755 extras/command-completion/gluster.bash \
-  $PKG/etc/bash_completion.d/gluster-bash-completion.sh
+install -D -m 0644 extras/command-completion/gluster.bash \
+  $PKG/usr/share/bash-completion/completions/gluster
 
 mv $PKG/etc/$PRGNAM/eventsconfig.json $PKG/etc/$PRGNAM/eventsconfig.json.new
 mv $PKG/etc/$PRGNAM/glusterd.vol $PKG/etc/$PRGNAM/glusterd.vol.new
@@ -115,9 +125,11 @@ install -D -m 0644 extras/init.d/glusterd-Redhat $PKG/etc/rc.d/rc.glusterd.new
 cp -a COPYING-GPLV2 COPYING-LGPLV3 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
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/network/glusterfs/glusterfs.info b/network/glusterfs/glusterfs.info
index cb4905c8b1..ccd7764471 100644
--- a/network/glusterfs/glusterfs.info
+++ b/network/glusterfs/glusterfs.info
@@ -1,7 +1,7 @@
 PRGNAM="glusterfs"
 VERSION="4.1.0"
 HOMEPAGE="https://www.gluster.org/"
-DOWNLOAD="https://download.gluster.org/pub/gluster/glusterfs/4.1/4.1.0/glusterfs-4.1.0.tar.gz"
+DOWNLOAD="https://download.gluster.org/pub/gluster/glusterfs/01.old-releases/4.1/4.1.0/glusterfs-4.1.0.tar.gz"
 MD5SUM="2b9cd00fb6a1eff2f84489b7883303b7"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/network/gmi100/README b/network/gmi100/README
new file mode 100644
index 0000000000..e86f3f77a8
--- /dev/null
+++ b/network/gmi100/README
@@ -0,0 +1,6 @@
+gmi100 (Gemini CLI protocol client written in 100 lines of ANSI C)
+
+I tried to pack as much as possible in 100 lines of ANSI C. Initially
+I struggled to fit simple TLS connection in such small space but
+eventually I ended up with CLI client capable of efficient navigation
+between capsules of Gemini space.
diff --git a/network/gmi100/gmi100.1 b/network/gmi100/gmi100.1
new file mode 100644
index 0000000000..51c022e5de
--- /dev/null
+++ b/network/gmi100/gmi100.1
@@ -0,0 +1,83 @@
+.TH GMI100 1 "2024-03-03"
+.SH NAME
+gmi100 \- Gemini CLI protocol client written in 100 lines of ANSI C.
+.SH SYNOPSIS
+.B gmi100
+.IR [PAGER]
+.SH DESCRIPTION
+Other similar Gemini client projects written in few lines of code
+successfully shows how simple Gemini protocol is. This code is far from
+straight forward. But I had a different goal in mind.
+
+I tried to pack as much as possible in 100 lines of ANSI C. Initially I
+struggled to fit simple TLS connection in such small space but
+eventually I ended up with CLI client capable of efficient navigation
+between capsules of Gemini space.
+
+.SH ACTIONS
+.TP
+.BR "N"
+Number of link on current capsule
+.TP
+.BR "r"
+Refresh current capsule
+.TP
+.BR "u"
+Go "up" in URL directory path
+.TP
+.BR "b"
+Go back in browsing history
+.TP
+.BR "c"
+Print current capsule URI
+.TP
+.BR "q" 
+Quit
+.TP
+.BR "?" 
+Search, geminispace.info/search is used by default
+.TP
+.BR "!"
+Shell command prefixed, run it on current capsule
+.
+.SH USAGE EXAMPLES 
+.
+.TP
+.BR "gmi100 cat"
+Using "cat" as pager
+.TP
+.BR "gmi100> ACTION"
+On prompt: execute any action (as above mentioned)
+.TP
+.BR "gmi100> geminiprotocol.net"
+On prompt: go to capsule
+.TP
+.BR "gmi100> 3"
+On prompt: go to link number 3 of current capsule
+.TP
+.BR "gmi100> !nsxiv"
+On prompt: open file of current URL with nsxiv (image)
+.
+.SH HISTORY
+After you run the program it will open or create history .gmi100 file.
+Then every page you visits that is not a redirection to other page and
+doesn't ask you for input will be appended at the end of history file.
+File is never cleaned up by program itself to make history persistent
+between sessions but that means cleaning up browsing history is your
+responsibility. But this also gives you an control over history file
+content. You can for example append some links that you want to visit
+in next session to have easier access to them just by running program
+and pressing "b" which will navigate to last link from history file.
+
+During browsing session typing "b" in program prompt for the first time
+will result in navigation to last link in history file. Then if you
+type "b" again it will open second to last link from history. But it
+will also append that link at the end. You can input "b" multiple times
+and it will always go back by one link in history and append it at then
+end of history file at the same time. Only if you decide to navigate to
+other page by typing URL or choosing link number you will break that
+cycle. Then history "pointer" will go back to the very bottom of the
+history file.
+
+.SH AUTHOR
+irek@gabr.pl
diff --git a/network/gmi100/gmi100.SlackBuild b/network/gmi100/gmi100.SlackBuild
new file mode 100644
index 0000000000..55fb39901c
--- /dev/null
+++ b/network/gmi100/gmi100.SlackBuild
@@ -0,0 +1,101 @@
+#!/bin/bash
+
+# Slackware build script for gmi100
+
+# 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=gmi100
+VERSION=${VERSION:-20231020_f5c69e3}
+COMMIT=f5c69e316781e8d411b46c1d901f3f9fc23f16cf
+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-$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 {} \;
+
+./build
+
+mkdir -p $PKG/usr/{bin,man/man1}
+
+cp $PRGNAM $PKG/usr/bin
+cp $CWD/$PRGNAM.1 $PKG/usr/man/man1
+
+strip --strip-unneeded $PKG/usr/bin/$PRGNAM
+gzip -9 $PKG/usr/man/man?/*.?
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp 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/network/gmi100/gmi100.info b/network/gmi100/gmi100.info
new file mode 100644
index 0000000000..0ee80fef88
--- /dev/null
+++ b/network/gmi100/gmi100.info
@@ -0,0 +1,10 @@
+PRGNAM="gmi100"
+VERSION="20231020_f5c69e3"
+HOMEPAGE="https://github.com/ir33k/gmi100"
+DOWNLOAD="https://github.com/ir33k/gmi100/archive/f5c69e3/gmi100-f5c69e316781e8d411b46c1d901f3f9fc23f16cf.tar.gz"
+MD5SUM="f73987208cadafb025c7a75b21e9be84"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="G. Galdini"
+EMAIL="jake@dioniso.com.br"
diff --git a/network/gmi100/slack-desc b/network/gmi100/slack-desc
new file mode 100644
index 0000000000..0d36bc5b0e
--- /dev/null
+++ b/network/gmi100/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+      |-----handy-ruler------------------------------------------------------|
+gmi100: gmi100 (Gemini CLI protocol client written in 100 lines of ANSI C)
+gmi100:
+gmi100: gmi100 has been written by irek <irek@gabr.pl>
+gmi100:
+gmi100: Homepage: https://github.com/ir33k/gmi100
+gmi100:
+gmi100:
+gmi100:
+gmi100:
+gmi100:
+gmi100:
diff --git a/network/gmvault/README b/network/gmvault/README
deleted file mode 100644
index b1038f10ae..0000000000
--- a/network/gmvault/README
+++ /dev/null
@@ -1 +0,0 @@
-Tool to backup and restore your Gmail emails at will.
diff --git a/network/gmvault/gmvault.SlackBuild b/network/gmvault/gmvault.SlackBuild
deleted file mode 100644
index b996203a28..0000000000
--- a/network/gmvault/gmvault.SlackBuild
+++ /dev/null
@@ -1,85 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for gmvault
-
-# Copyright 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=gmvault
-VERSION=${VERSION:-1.9.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 {} \;
-
-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 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/network/gmvault/gmvault.info b/network/gmvault/gmvault.info
deleted file mode 100644
index 5ee6da4e26..0000000000
--- a/network/gmvault/gmvault.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="gmvault"
-VERSION="1.9.1"
-HOMEPAGE="http://gmvault.org/"
-DOWNLOAD="https://pypi.python.org/packages/43/a2/a67be562a045b96aaa9f984cb1c178c7649bb53523535615e0b79064e1f9/gmvault-1.9.1.tar.gz"
-MD5SUM="4ad5ebd59147f12e30e6ba971ace7834"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="Logbook IMAPClient python-chardet"
-MAINTAINER="Dimitris Zlatanidis"
-EMAIL="d.zlatanidis@gmail.com"
diff --git a/network/gmvault/slack-desc b/network/gmvault/slack-desc
deleted file mode 100644
index ff804e5a91..0000000000
--- a/network/gmvault/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------------------------------------------------------|
-gmvault: gmvault (gmail backup-restore tool)
-gmvault:
-gmvault: Tool to backup and restore your Gmail emails at will.
-gmvault:
-gmvault: Homepage: http://gmvault.org/
-gmvault:
-gmvault:
-gmvault:
-gmvault:
-gmvault:
-gmvault:
diff --git a/network/gnirehtet-bin/README b/network/gnirehtet-bin/README
new file mode 100644
index 0000000000..5d0faab424
--- /dev/null
+++ b/network/gnirehtet-bin/README
@@ -0,0 +1,44 @@
+gnirehtet is a tool that provides reverse tethering for Android
+
+This is a repackage of the 64 bit binary supplied by upstream,
+the version written in Rust.
+
+gnirehtet requires adb as runtime dependency. adb is part of the
+package android-tools on slackbuilds.org . adb must be in PATH,
+so if it's not installed through the aforementioned package,
+either alter PATH or drop it into the current working directory,
+so gnirehtet finds it.
+
+gnirehtet requires the Android device to be switched to
+Developer Mode and have the following options switched on
+(tested on a Redmi 9C NFC phone):
+
+- USB debugging
+- Install via USB
+- USB debugging (Security settings)
+
+`gnirehtet install` requires gnirehtet.apk in current directory
+(I am not sure about it?)
+gnirehtet.apk is packaged into /usr/share/gnirehtet/. Copy or symlink it
+from there into current directory
+When running `gnirehtet install`, despite having the "Install via USB"
+option enabled, if adb fails, just copy `gnirehtet.apk` to the phone
+and install it directly from the phone
+
+gnirehtet-2.5 has two problems:
+
+1. Sometimes the client (the phone) randomly disconnects. gnirehtet
+prints a log message to stdout, but keeps working. The simplest
+(but sometimes inconvenient) fix is to restart gnirehtet on the
+desktop. This is true for both `gnirehtet run` and `gnirehtet autorun`
+commands. A workaround that automates the restart of gnirehtet in
+such situations is described in comments here:
+
+https://github.com/Genymobile/gnirehtet/issues/352
+
+2. When hitting the square soft key in Android to kill all apps that
+run in background, gnirehtet gets killed too, the phone disconnects
+from the server running the desktop and the problem is reduced to 1.
+the workaround described there fixes 2. as well
+
+This binary was compiled on Aug 16, 2020.
diff --git a/network/gnirehtet-bin/gnirehtet-bin.SlackBuild b/network/gnirehtet-bin/gnirehtet-bin.SlackBuild
new file mode 100644
index 0000000000..f7c42c6626
--- /dev/null
+++ b/network/gnirehtet-bin/gnirehtet-bin.SlackBuild
@@ -0,0 +1,84 @@
+#!/bin/bash
+
+# Slackware build script for gnirehtet-bin
+# 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=gnirehtet-bin
+BINNAM=gnirehtet
+VERSION=${VERSION:-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 the variable PRINT_PACKAGE_NAME is set, then this script will report what
+# the name of the created package would be, and then exit. This information
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; 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 $TMP
+rm -rf $BINNAM-rust-linux64
+unzip $CWD/$BINNAM-rust-linux64-v$VERSION.zip
+cd $BINNAM-rust-linux64
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -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 $BINNAM $PKG/usr/bin/$BINNAM
+
+install -D -m 0644 $BINNAM.apk $PKG/usr/share/$BINNAM/$BINNAM.apk
+
+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/network/gnirehtet-bin/gnirehtet-bin.info b/network/gnirehtet-bin/gnirehtet-bin.info
new file mode 100644
index 0000000000..4f36f3d041
--- /dev/null
+++ b/network/gnirehtet-bin/gnirehtet-bin.info
@@ -0,0 +1,10 @@
+PRGNAM="gnirehtet-bin"
+VERSION="2.5"
+HOMEPAGE="https://github.com/Genymobile/gnirehtet"
+DOWNLOAD="UNSUPPORTED"
+MD5SUM=""
+DOWNLOAD_x86_64="https://github.com/Genymobile/gnirehtet/releases/download/v2.5/gnirehtet-rust-linux64-v2.5.zip"
+MD5SUM_x86_64="48d29d23691d6a1daebca68573684d4a"
+REQUIRES=""
+MAINTAINER="toolonely"
+EMAIL="lonely_@tutanota.com"
diff --git a/network/gnirehtet-bin/slack-desc b/network/gnirehtet-bin/slack-desc
new file mode 100644
index 0000000000..14df637cb7
--- /dev/null
+++ b/network/gnirehtet-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------------------------------------------------------|
+gnirehtet-bin: gnirehtet-bin (reverse tethering for Android)
+gnirehtet-bin:
+gnirehtet-bin: gnirehtet is a tool that provides reverse tethering for Android
+gnirehtet-bin:
+gnirehtet-bin:
+gnirehtet-bin: This is a repackage of the 64 bit binary supplied by upstream,
+gnirehtet-bin: the version written in Rust.
+gnirehtet-bin:
+gnirehtet-bin: https://github.com/Genymobile/gnirehtet
+gnirehtet-bin:
+gnirehtet-bin:
diff --git a/network/gnome-bluetooth/gnome-bluetooth.SlackBuild b/network/gnome-bluetooth/gnome-bluetooth.SlackBuild
index 9e9f182aea..d381647dab 100644
--- a/network/gnome-bluetooth/gnome-bluetooth.SlackBuild
+++ b/network/gnome-bluetooth/gnome-bluetooth.SlackBuild
@@ -1,8 +1,9 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for gnome-bluetooth
 
 # Copyright 2016-2018  Chris Farrell <timcowchip@gorge.net>
+# Copyright 2022       Juan M. Lasca <juanmlasca@gmail.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=gnome-bluetooth
-VERSION=${VERSION:-3.20.1}
-BUILD=${BUILD:-1}
+VERSION=${VERSION:-3.34.5}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,19 +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 -pipe -march=i586 -mtune=i686"
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -pipe -march=i686 -mtune=i686"
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -m64 -pipe -fPIC"
+  SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
 else
   SLKCFLAGS="-O2"
@@ -56,11 +64,9 @@ fi
 
 set -e
 
-DOCS="AUTHORS COPYING COPYING.LIB INSTALL NEWS README"
-
 rm -rf $PKG
-mkdir -p $WRK $PKG $OUTPUT
-cd $WRK
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
 rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
 cd $PRGNAM-$VERSION
@@ -71,44 +77,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 {} \;
 
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
-  --build=$ARCH-slackware-linux \
-  --prefix=/usr \
-  --exec-prefix=/usr \
-  --bindir=/usr/bin \
-  --sbindir=/usr/sbin \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --includedir=/usr/include \
-  --mandir=/usr/man \
-  --infodir=/usr/info \
-  --sysconfdir=/etc \
-  --docdir=/usr/doc/$PRGNAM-$VERSION \
-  --disable-static \
-  --enable-shared \
-  --disable-gtk-doc \
-  --disable-schemas-compile \
-  --enable-introspection=yes \
-  --enable-compile-warnings=no \
-  --localstatedir=/var \
-  --sharedstatedir=/var/lib \
-  --disable-static --enable-shared \
-  --disable-gtk-doc \
-  --disable-schemas-compile \
-  --enable-introspection=yes \
-  --enable-compile-warnings=no
-
-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
+# Special thanks to Bob Funk, who kindly pointed this problem out and
+# provided a link to the patch fixing it.
+cat $CWD/patches/01-meson.patch | patch -p1 || exit
+
+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 ..
+
+# handle icon size problem: resize it if Imagemagick is installed,
+# delete them otherwise
+if [ -x /usr/bin/convert ]; then
+    /usr/bin/convert \
+        $PKG/usr/share/icons/hicolor/48x48/status/bluetooth-active.png \
+        -resize 24x24 \
+        $PKG/usr/share/icons/hicolor/24x24/status/bluetooth-active.png
+else
+    rm -fr $PKG/usr/share/icons/hicolor/24x24
+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
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a $DOCS  $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+   AUTHORS COPYING COPYING.LIB MAINTAINERS README.md \
+   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
@@ -116,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/network/gnome-bluetooth/gnome-bluetooth.info b/network/gnome-bluetooth/gnome-bluetooth.info
index d64f248740..f3381ab043 100644
--- a/network/gnome-bluetooth/gnome-bluetooth.info
+++ b/network/gnome-bluetooth/gnome-bluetooth.info
@@ -1,10 +1,10 @@
 PRGNAM="gnome-bluetooth"
-VERSION="3.20.1"
+VERSION="3.34.5"
 HOMEPAGE="https://wiki.gnome.org/Projects/GnomeBluetooth"
-DOWNLOAD="http://download.gnome.org/sources/gnome-bluetooth/3.20/gnome-bluetooth-3.20.1.tar.xz"
-MD5SUM="0768931f17eaba8b05eddacf17204f60"
+DOWNLOAD="https://download.gnome.org/sources/gnome-bluetooth/3.34/gnome-bluetooth-3.34.5.tar.xz"
+MD5SUM="d83faa54abaf64bb40b5313bc233e74e"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Chris Farrell"
-EMAIL="timcowchip@gorge.net"
+MAINTAINER="Juan M. Lasca"
+EMAIL="juanmlasca@gmail.com"
diff --git a/network/gnome-bluetooth/patches/01-meson.patch b/network/gnome-bluetooth/patches/01-meson.patch
new file mode 100644
index 0000000000..79c0a08725
--- /dev/null
+++ b/network/gnome-bluetooth/patches/01-meson.patch
@@ -0,0 +1,17 @@
+# 08/02/2023: Allow newer versions of meson to build this package.
+#             Special thanks to Bob Funk who kindly pointed this out.
+# Original patch url: https://gitlab.gnome.org/GNOME/gnome-bluetooth/-/commit/755fd758f866d3a3f7ca482942beee749f13a91e.patch            
+
+diff --git a/sendto/meson.build b/sendto/meson.build
+index 24a4e394..3e233a03 100644
+--- a/sendto/meson.build
++++ b/sendto/meson.build
+@@ -22,7 +22,6 @@ desktop_in = configure_file(
+ )
+ 
+ i18n.merge_file (
+-  desktop,
+   type: 'desktop',
+   input: desktop_in,
+   output: desktop,
+-- 
diff --git a/network/gnome-bluetooth/slack-desc b/network/gnome-bluetooth/slack-desc
index 23df9481b3..0d53772262 100644
--- a/network/gnome-bluetooth/slack-desc
+++ b/network/gnome-bluetooth/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------------------------------------------------------|
 gnome-bluetooth: gnome-bluetooth (GNOME Bluetooth support)
 gnome-bluetooth:
 gnome-bluetooth: Gnome-Bluetooth provides desktop level support for Bluetooth
diff --git a/network/gnome-remote-desktop/README b/network/gnome-remote-desktop/README
new file mode 100644
index 0000000000..b1cd452f33
--- /dev/null
+++ b/network/gnome-remote-desktop/README
@@ -0,0 +1,11 @@
+Remote desktop daemon for GNOME using pipewire, allowing you to connect
+to your machine remotely.
+
+Note: On Slackware the gnome-remote-desktop daemon must be started and
+stopped manually. There are controls to start/stop the daemon in the
+gnome-control-center "Sharing" panel, but these controls are hard-coded
+to talk to systemd and will not start/stop the daemon. Instead, the 
+daemon can be run directly from its installed path of:
+
+ /usr/libexec/gnome-remote-desktop
+
diff --git a/network/gnome-remote-desktop/doinst.sh b/network/gnome-remote-desktop/doinst.sh
new file mode 100644
index 0000000000..56b9e419c1
--- /dev/null
+++ b/network/gnome-remote-desktop/doinst.sh
@@ -0,0 +1,6 @@
+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/network/gnome-remote-desktop/gnome-remote-desktop.SlackBuild b/network/gnome-remote-desktop/gnome-remote-desktop.SlackBuild
new file mode 100644
index 0000000000..d4c87a8003
--- /dev/null
+++ b/network/gnome-remote-desktop/gnome-remote-desktop.SlackBuild
@@ -0,0 +1,111 @@
+#!/bin/bash
+
+# Slackware build script for gnome-remote-desktop
+
+# 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=gnome-remote-desktop
+VERSION=${VERSION:-41.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.?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 \
+    -Dsystemd=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
+
+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
+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/network/gnome-remote-desktop/gnome-remote-desktop.info b/network/gnome-remote-desktop/gnome-remote-desktop.info
new file mode 100644
index 0000000000..b5945445bd
--- /dev/null
+++ b/network/gnome-remote-desktop/gnome-remote-desktop.info
@@ -0,0 +1,10 @@
+PRGNAM="gnome-remote-desktop"
+VERSION="41.3"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-remote-desktop"
+DOWNLOAD="https://download.gnome.org/core/41/41.8/sources/gnome-remote-desktop-41.3.tar.xz"
+MD5SUM="48de4a64f420ed48f39d9cb0f940f537"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="nv-codec-headers"
+MAINTAINER="Bob Funk"
+EMAIL="bobfunk11@gmail.com"
diff --git a/network/gnome-remote-desktop/slack-desc b/network/gnome-remote-desktop/slack-desc
new file mode 100644
index 0000000000..9ebc0e042c
--- /dev/null
+++ b/network/gnome-remote-desktop/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 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-remote-desktop: gnome-remote-desktop (GNOME Remote Desktop)
+gnome-remote-desktop:
+gnome-remote-desktop: Remote desktop daemon for GNOME using pipewire. 
+gnome-remote-desktop:
+gnome-remote-desktop:
+gnome-remote-desktop:
+gnome-remote-desktop:
+gnome-remote-desktop:
+gnome-remote-desktop:
+gnome-remote-desktop: https://gitlab.gnome.org/GNOME/gnome-remote-desktop
+gnome-remote-desktop:
diff --git a/network/gnome-shell-extension-gsconnect/README b/network/gnome-shell-extension-gsconnect/README
new file mode 100644
index 0000000000..dc471760fd
--- /dev/null
+++ b/network/gnome-shell-extension-gsconnect/README
@@ -0,0 +1,8 @@
+The KDE Connect project allows devices to securely share content such
+as notifications and files as well as interactive features such as SMS
+messaging and remote input. The KDE Connect team maintains cross-desktop
+, Android and Sailfish applications as well as an interface for KDE
+Plasma. GSConnect is a complete implementation of KDE Connect especially
+for GNOME Shell with Nautilus, Chrome and Firefox integration. It is 
+does not rely on the KDE Connect desktop application and will not work 
+with it installed.
diff --git a/network/gnome-shell-extension-gsconnect/doinst.sh b/network/gnome-shell-extension-gsconnect/doinst.sh
new file mode 100644
index 0000000000..b123c0cd8d
--- /dev/null
+++ b/network/gnome-shell-extension-gsconnect/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 [ -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/network/gnome-shell-extension-gsconnect/gnome-shell-extension-gsconnect.SlackBuild b/network/gnome-shell-extension-gsconnect/gnome-shell-extension-gsconnect.SlackBuild
new file mode 100644
index 0000000000..a9e2500549
--- /dev/null
+++ b/network/gnome-shell-extension-gsconnect/gnome-shell-extension-gsconnect.SlackBuild
@@ -0,0 +1,112 @@
+#!/bin/bash
+
+# Slackware build script for gnome-shell-extension-gsconnect
+
+# Copyright 2022 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=gnome-shell-extension-gsconnect
+VERSION=${VERSION:-49}
+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 \
+    --libdir=/usr/lib${LIBDIRSUFFIX} \
+    --localstatedir=/var \
+    --mandir=/usr/man \
+    --prefix=/usr \
+    --sysconfdir=/etc \
+    -Dnemo=true \
+    -Dinstalled_tests=false \
+    -Dstrip=true 
+  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 CODE_OF_CONDUCT.md  LICENSE    RELEASE_CHECKLIST.md CONTRIBUTING.md README.md \
+      $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+install -Dpm 0644 $CWD/nautilus-gsconnect.metainfo.xml -t $PKG/usr/share/metainfo/
+install -Dpm 0644 $CWD/nemo-gsconnect.metainfo.xml -t  $PKG/usr/share/metainfo/
+
+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/network/gnome-shell-extension-gsconnect/gnome-shell-extension-gsconnect.info b/network/gnome-shell-extension-gsconnect/gnome-shell-extension-gsconnect.info
new file mode 100644
index 0000000000..0d8d9020eb
--- /dev/null
+++ b/network/gnome-shell-extension-gsconnect/gnome-shell-extension-gsconnect.info
@@ -0,0 +1,10 @@
+PRGNAM="gnome-shell-extension-gsconnect"
+VERSION="49"
+HOMEPAGE="https://github.com/GSConnect/gnome-shell-extension-gsconnect"
+DOWNLOAD="https://github.com/GSConnect/gnome-shell-extension-gsconnect/archive/v49/gnome-shell-extension-gsconnect-49.tar.gz"
+MD5SUM="7b5b45afd32309ecadecda39ad8e0d42"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="AppStream"
+MAINTAINER="Nathaniel Russell"
+EMAIL="naterussell83@gmail.com"
diff --git a/network/gnome-shell-extension-gsconnect/nautilus-gsconnect.metainfo.xml b/network/gnome-shell-extension-gsconnect/nautilus-gsconnect.metainfo.xml
new file mode 100644
index 0000000000..6d5ce240d1
--- /dev/null
+++ b/network/gnome-shell-extension-gsconnect/nautilus-gsconnect.metainfo.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<component type="addon">
+  <id>nautilus-gsconnect</id>
+  <extends>nautilus.desktop</extends>
+  <name>Nautilus extension for GSConnect</name>
+  <summary>Nautilus extension for GSConnect</summary>
+  <url type="homepage">https://github.com/andyholmes/gnome-shell-extension-gsconnect/</url>
+  <metadata_license>CC0-1.0</metadata_license>
+  <project_license>GPL-2.0-only</project_license>
+  <update_contact>melmorabity@fedoraproject.org</update_contact>
+</component>
diff --git a/network/gnome-shell-extension-gsconnect/nemo-gsconnect.metainfo.xml b/network/gnome-shell-extension-gsconnect/nemo-gsconnect.metainfo.xml
new file mode 100644
index 0000000000..f5743e712d
--- /dev/null
+++ b/network/gnome-shell-extension-gsconnect/nemo-gsconnect.metainfo.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<component type="addon">
+  <id>nemo-gsconnect</id>
+  <extends>nemo.desktop</extends>
+  <name>Nemo extension for GSConnect</name>
+  <summary>Nemo extension for GSConnect</summary>
+  <url type="homepage">https://github.com/andyholmes/gnome-shell-extension-gsconnect/</url>
+  <metadata_license>CC0-1.0</metadata_license>
+  <project_license>GPL-2.0-only</project_license>
+  <update_contact>melmorabity@fedoraproject.org</update_contact>
+</component>
diff --git a/network/gnome-shell-extension-gsconnect/slack-desc b/network/gnome-shell-extension-gsconnect/slack-desc
new file mode 100644
index 0000000000..abd364a514
--- /dev/null
+++ b/network/gnome-shell-extension-gsconnect/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 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-shell-extension-gsconnect: gnome-shell-extension-gsconnect ( SMS messaging )
+gnome-shell-extension-gsconnect:
+gnome-shell-extension-gsconnect: GSConnect is a complete implementation of KDE Connect especially for
+gnome-shell-extension-gsconnect: GNOME Shell with Nautilus, Chrome and Firefox integration.
+gnome-shell-extension-gsconnect: It is does not rely on the KDE Connect desktop application and will
+gnome-shell-extension-gsconnect: not work with it installed.
+gnome-shell-extension-gsconnect:
+gnome-shell-extension-gsconnect:
+gnome-shell-extension-gsconnect: https://gitlab.com/arcmenu/ArcMenu
+gnome-shell-extension-gsconnect:
+gnome-shell-extension-gsconnect:
diff --git a/network/gnome-user-share/README b/network/gnome-user-share/README
new file mode 100644
index 0000000000..b153632230
--- /dev/null
+++ b/network/gnome-user-share/README
@@ -0,0 +1,22 @@
+gnome-user-share is a small package that binds together various free
+software projects to bring easy to use user-level file sharing to the
+masses.
+
+The program is meant to run in the background when the user is logged
+in, and when file sharing is enabled a webdav server is started that
+shares the $HOME/Public folder. The share is then published to all
+computers on the local network using mDNS/rendezvous, so that it shows
+up in the Network location in Gnome.
+
+The dav server used is apache, so you need that installed. Avahi or 
+Howl is used for mDNS support, so you need to have that installed and
+mDNSResolver running.
+
+Note: On Slackware the gnome-user-share daemon must be started and 
+stopped manually. There are controls to start/stop the daemon in the
+gnome-control-center "Sharing" panel, but these controls are hard-coded
+to talk to systemd and will not start/stop the daemon. Instead, the 
+daemon can be run directly from its installed path of:
+
+ /usr/libexec/gnome-user-share-webdav
+
diff --git a/network/gnome-user-share/doinst.sh b/network/gnome-user-share/doinst.sh
new file mode 100644
index 0000000000..f6a6676883
--- /dev/null
+++ b/network/gnome-user-share/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/network/gnome-user-share/gnome-user-share.SlackBuild b/network/gnome-user-share/gnome-user-share.SlackBuild
new file mode 100644
index 0000000000..a4980fdf6e
--- /dev/null
+++ b/network/gnome-user-share/gnome-user-share.SlackBuild
@@ -0,0 +1,114 @@
+#!/bin/bash
+
+# Slackware build script for gnome-user-share
+
+# 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-user-share
+VERSION=${VERSION:-3.34.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 \
+    -Dsystemduserunitdir=no \
+    -Dmodules_path=/usr/lib${LIBDIRSUFFIX}/httpd/modules \
+    -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
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+  COPYING ChangeLog.pre-git MAINTAINERS 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/network/gnome-user-share/gnome-user-share.info b/network/gnome-user-share/gnome-user-share.info
new file mode 100644
index 0000000000..e543dc1adb
--- /dev/null
+++ b/network/gnome-user-share/gnome-user-share.info
@@ -0,0 +1,10 @@
+PRGNAM="gnome-user-share"
+VERSION="3.34.0"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-user-share"
+DOWNLOAD="https://download.gnome.org/core/41/41.8/sources/gnome-user-share-3.34.0.tar.xz"
+MD5SUM="a3d983d0cf8357832229ff96172418d8"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="nautilus mod_dnssd"
+MAINTAINER="Bob Funk"
+EMAIL="bobfunk11@gmail.com"
diff --git a/network/gnome-user-share/slack-desc b/network/gnome-user-share/slack-desc
new file mode 100644
index 0000000000..0c7548433c
--- /dev/null
+++ b/network/gnome-user-share/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 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-user-share: gnome-user-share (User level file sharing)
+gnome-user-share:
+gnome-user-share: gnome-user-share is a small package that binds together various free
+gnome-user-share: software projects to bring easy to use user-level file sharing to the
+gnome-user-share: masses. 
+gnome-user-share:
+gnome-user-share: This is part of the GNOME core distribution.
+gnome-user-share:
+gnome-user-share:
+gnome-user-share: https://gitlab.gnome.org/GNOME/gnome-user-share
+gnome-user-share:
diff --git a/network/gns3/README b/network/gns3/README
index 235a51556c..4ac3567075 100644
--- a/network/gns3/README
+++ b/network/gns3/README
@@ -4,11 +4,11 @@ networks.  To allow complete simulations, GNS3 is strongly linked with:
   * Dynagen, a text-based front-end for Dynamips.
   * Pemu, a Cisco PIX firewall emulator based on Qemu.
 
-GNS3 is an excellent complementary tool to real labs for Cisco network 
-engineers, administrators and people wanting to pass certifications such 
-as CCNA, CCNP, CCIP or CCIE.  It can also be used to experiment features 
-of Cisco IOS or to check configurations that need to be deployed later on 
-real routers.
+GNS3 is an excellent complementary tool to real labs for Cisco network
+engineers, administrators and people wanting to pass certifications
+such as CCNA, CCNP, CCIP or CCIE. It can also be used to experiment
+features of Cisco IOS or to check configurations that need to be
+deployed later on real routers.
 
 Features overview
   * Design of high quality and complex network topologies.
@@ -17,7 +17,8 @@ Features overview
   * Connection of the simulated network to the real world!
   * Packet capture using Wireshark.
 
-Important notice: users have to provide their own Cisco IOS to use with GNS3. 
-It is also recommended to read the documentation _before_ starting the program.
-As of version 0.8.7 the package for dynamips has to be installed separately.
-Port 127.0.0.1:7200 has to be open on your firewall.
+Important notice: users have to provide their own Cisco IOS to use
+with GNS3. It is also recommended to read the documentation _before_
+starting the program. As of version 0.8.7 the package for dynamips
+has to be installed separately.  Port 127.0.0.1:7200 has to be open on
+your firewall.
diff --git a/network/gns3/gns3.SlackBuild b/network/gns3/gns3.SlackBuild
index ae5100a44d..7f9d846190 100644
--- a/network/gns3/gns3.SlackBuild
+++ b/network/gns3/gns3.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for gns3 (http://www.gns3.net)
 
@@ -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=gns3
 VERSION=${VERSION:-0.8.7}
 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}
@@ -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/network/go-ipfs/go-ipfs.SlackBuild b/network/go-ipfs/go-ipfs.SlackBuild
index 101c6a0286..025f73a649 100644
--- a/network/go-ipfs/go-ipfs.SlackBuild
+++ b/network/go-ipfs/go-ipfs.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for go-ipfs
 
@@ -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-ipfs
-VERSION=${VERSION:-0.4.20}
+VERSION=${VERSION:-0.4.23}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -41,7 +44,14 @@ case $ARCH in
   *) IPFSARCH=$ARCH ;;
 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}
@@ -69,7 +79,7 @@ cp -a * \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 cp -a $CWD/README $PKG/usr/doc/$PRGNAM-$VERSION/README.SBo
-rm $PKG/usr/doc/$PRGNAM-$VERSION/build-log
+#rm $PKG/usr/doc/$PRGNAM-$VERSION/build-log || echo -ne '' # let's ignore minor error
 
 mv $PKG/usr/doc/$PRGNAM-$VERSION/ipfs $PKG/usr/bin/
 
@@ -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/network/go-ipfs/go-ipfs.info b/network/go-ipfs/go-ipfs.info
index 43b1c3dc78..59e8cf71f6 100644
--- a/network/go-ipfs/go-ipfs.info
+++ b/network/go-ipfs/go-ipfs.info
@@ -1,10 +1,10 @@
 PRGNAM="go-ipfs"
-VERSION="0.4.20"
-HOMEPAGE="https://ipfs.io/"
-DOWNLOAD="https://dist.ipfs.io/go-ipfs/v0.4.20/go-ipfs_v0.4.20_linux-386.tar.gz"
-MD5SUM="f2fe783324642d196ada103c0e7231cc"
-DOWNLOAD_x86_64="https://dist.ipfs.io/go-ipfs/v0.4.20/go-ipfs_v0.4.20_linux-amd64.tar.gz"
-MD5SUM_x86_64="ad860f09a92c69adee0b9691aea06749"
+VERSION="0.4.23"
+HOMEPAGE="https://dist.ipfs.io/#go-ipfs"
+DOWNLOAD="https://dist.ipfs.io/go-ipfs/v0.4.23/go-ipfs_v0.4.23_linux-386.tar.gz"
+MD5SUM="dd09c03a2254b8a5682efa02b4c38124"
+DOWNLOAD_x86_64="https://dist.ipfs.io/go-ipfs/v0.4.23/go-ipfs_v0.4.23_linux-amd64.tar.gz"
+MD5SUM_x86_64="357270a1a368a095e69728b2dcf7952c"
 REQUIRES=""
 MAINTAINER="Marcin Szychowski"
 EMAIL="szycha@gmail.com"
diff --git a/network/go-sendxmpp/README b/network/go-sendxmpp/README
new file mode 100644
index 0000000000..3475f1193d
--- /dev/null
+++ b/network/go-sendxmpp/README
@@ -0,0 +1,6 @@
+Go-sendxmpp is a little command line tool to send messages or files to
+an XMPP contact or a multi user chat.
+
+XMPP is an open, non-proprietary protocol for instant messaging.
+
+google-go-lang is needed only at build time.
diff --git a/network/go-sendxmpp/go-sendxmpp.SlackBuild b/network/go-sendxmpp/go-sendxmpp.SlackBuild
new file mode 100644
index 0000000000..eaf6b43162
--- /dev/null
+++ b/network/go-sendxmpp/go-sendxmpp.SlackBuild
@@ -0,0 +1,110 @@
+#!/bin/bash
+
+# Slackware build script for go-sendxmpp
+
+# 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=go-sendxmpp
+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
+
+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
+tar xvf $CWD/$PRGNAM-v$VERSION.tar.gz
+cd $PRGNAM-v$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
+  find -L $CWD -maxdepth 1 -type f -regex ".*/${NAME}-[^-]*\.tar\.gz" \
+    -exec tar xvf '{}' \;
+  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
+
+install -sDm 0755 go-sendxmpp -t $PKG/usr/bin
+
+mkdir -p $PKG/usr/man/man{1,5}
+gzip -9 -c man/go-sendxmpp.1 > $PKG/usr/man/man1/go-sendxmpp.1.gz
+gzip -9 -c man/go-sendxmpp.5 > $PKG/usr/man/man5/go-sendxmpp.5.gz
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a 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/network/go-sendxmpp/go-sendxmpp.info b/network/go-sendxmpp/go-sendxmpp.info
new file mode 100644
index 0000000000..9a5e66c56b
--- /dev/null
+++ b/network/go-sendxmpp/go-sendxmpp.info
@@ -0,0 +1,38 @@
+PRGNAM="go-sendxmpp"
+VERSION="0.9.0"
+HOMEPAGE="https://salsa.debian.org/mdosch/go-sendxmpp"
+DOWNLOAD="https://salsa.debian.org/mdosch/go-sendxmpp/-/archive/v0.9.0/go-sendxmpp-v0.9.0.tar.gz \
+          https://github.com/ProtonMail/go-crypto/archive/v1.0.0/go-crypto-v1.0.0.tar.gz \
+          https://github.com/ProtonMail/go-mime/archive/7d82a38/go-mime-7d82a3887f2f.tar.gz \
+          https://github.com/ProtonMail/gopenpgp/archive/v2.7.5/gopenpgp-v2.7.5.tar.gz \
+          https://github.com/beevik/etree/archive/v1.3.0/etree-v1.3.0.tar.gz \
+          https://github.com/cloudflare/circl/archive/v1.3.7/circl-v1.3.7.tar.gz \
+          https://github.com/gabriel-vasile/mimetype/archive/v1.4.3/mimetype-v1.4.3.tar.gz \
+          https://github.com/pborman/getopt/archive/v2.1.0/getopt-v2.1.0.tar.gz \
+          https://github.com/pkg/errors/archive/v0.9.1/errors-v0.9.1.tar.gz \
+          https://github.com/xmppo/go-xmpp/archive/v0.1.4/go-xmpp-v0.1.4.tar.gz \
+          https://github.com/golang/crypto/archive/v0.21.0/crypto-v0.21.0.tar.gz \
+          https://github.com/golang/net/archive/v0.22.0/net-v0.22.0.tar.gz \
+          https://github.com/golang/sys/archive/v0.18.0/sys-v0.18.0.tar.gz \
+          https://github.com/golang/text/archive/v0.14.0/text-v0.14.0.tar.gz \
+          https://salsa.debian.org/mdosch/xmppsrv/-/archive/v0.2.6/xmppsrv-v0.2.6.tar.gz"
+MD5SUM="424c91bfcbbf2f89bd0d58c51ff441eb \
+        207b3050d2cdc7c5bcc8242728fb7c68 \
+        a6ae51724981dd98d1564dba0df3979a \
+        de949ecba9611996b8b1bce236f3ffab \
+        bcc3bfd5bf559f4d4286d43302d1fda0 \
+        c74011ad16e17b92a496716febc60d33 \
+        de49151a4ae6474bb08145b0e9c67288 \
+        c52d24206b9fe29454e909a6ecbefe99 \
+        0951216925c98fda75a484a528b06af6 \
+        6700b141567cce38c36df85a1e0a43c2 \
+        9ef8f2085d691627afbc872f68d01ddc \
+        6c0ddb8598f1e0aa28a12842045172e4 \
+        e00453d8847cde61907bcbee219c44bb \
+        9f64144d4b1647ce4597abf657028a8d \
+        e8e409d942149234a415c1299ebedb52"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="google-go-lang"
+MAINTAINER="Alexander Verbovetsky"
+EMAIL="alik@ejik.org"
diff --git a/network/go-sendxmpp/modules.txt b/network/go-sendxmpp/modules.txt
new file mode 100644
index 0000000000..980e58fc90
--- /dev/null
+++ b/network/go-sendxmpp/modules.txt
@@ -0,0 +1,101 @@
+# github.com/ProtonMail/go-crypto v1.0.0
+## explicit; go 1.13
+github.com/ProtonMail/go-crypto/bitcurves
+github.com/ProtonMail/go-crypto/brainpool
+github.com/ProtonMail/go-crypto/eax
+github.com/ProtonMail/go-crypto/internal/byteutil
+github.com/ProtonMail/go-crypto/ocb
+github.com/ProtonMail/go-crypto/openpgp
+github.com/ProtonMail/go-crypto/openpgp/aes/keywrap
+github.com/ProtonMail/go-crypto/openpgp/armor
+github.com/ProtonMail/go-crypto/openpgp/clearsign
+github.com/ProtonMail/go-crypto/openpgp/ecdh
+github.com/ProtonMail/go-crypto/openpgp/ecdsa
+github.com/ProtonMail/go-crypto/openpgp/eddsa
+github.com/ProtonMail/go-crypto/openpgp/elgamal
+github.com/ProtonMail/go-crypto/openpgp/errors
+github.com/ProtonMail/go-crypto/openpgp/internal/algorithm
+github.com/ProtonMail/go-crypto/openpgp/internal/ecc
+github.com/ProtonMail/go-crypto/openpgp/internal/encoding
+github.com/ProtonMail/go-crypto/openpgp/packet
+github.com/ProtonMail/go-crypto/openpgp/s2k
+# github.com/ProtonMail/go-mime v0.0.0-20230322103455-7d82a3887f2f
+## explicit; go 1.12
+github.com/ProtonMail/go-mime
+# github.com/ProtonMail/gopenpgp/v2 v2.7.5
+## explicit; go 1.15
+github.com/ProtonMail/gopenpgp/v2/armor
+github.com/ProtonMail/gopenpgp/v2/constants
+github.com/ProtonMail/gopenpgp/v2/crypto
+github.com/ProtonMail/gopenpgp/v2/internal
+# github.com/beevik/etree v1.3.0
+## explicit; go 1.13
+github.com/beevik/etree
+# github.com/cloudflare/circl v1.3.7
+## explicit; go 1.19
+github.com/cloudflare/circl/dh/x25519
+github.com/cloudflare/circl/dh/x448
+github.com/cloudflare/circl/ecc/goldilocks
+github.com/cloudflare/circl/internal/conv
+github.com/cloudflare/circl/internal/sha3
+github.com/cloudflare/circl/math
+github.com/cloudflare/circl/math/fp25519
+github.com/cloudflare/circl/math/fp448
+github.com/cloudflare/circl/math/mlsbset
+github.com/cloudflare/circl/sign
+github.com/cloudflare/circl/sign/ed25519
+github.com/cloudflare/circl/sign/ed448
+# github.com/gabriel-vasile/mimetype v1.4.3
+## explicit; go 1.20
+github.com/gabriel-vasile/mimetype
+github.com/gabriel-vasile/mimetype/internal/charset
+github.com/gabriel-vasile/mimetype/internal/json
+github.com/gabriel-vasile/mimetype/internal/magic
+# github.com/pborman/getopt/v2 v2.1.0
+## explicit; go 1.13
+github.com/pborman/getopt/v2
+# github.com/pkg/errors v0.9.1
+## explicit
+github.com/pkg/errors
+# github.com/xmppo/go-xmpp v0.1.4
+## explicit; go 1.21.5
+github.com/xmppo/go-xmpp
+# golang.org/x/crypto v0.21.0
+## explicit; go 1.18
+golang.org/x/crypto/argon2
+golang.org/x/crypto/blake2b
+golang.org/x/crypto/cast5
+golang.org/x/crypto/hkdf
+golang.org/x/crypto/pbkdf2
+golang.org/x/crypto/sha3
+# golang.org/x/net v0.22.0
+## explicit; go 1.18
+golang.org/x/net/html
+golang.org/x/net/html/atom
+golang.org/x/net/internal/socks
+golang.org/x/net/proxy
+# golang.org/x/sys v0.18.0
+## explicit; go 1.18
+golang.org/x/sys/cpu
+# 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/htmlindex
+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/encoding/unicode
+golang.org/x/text/internal/language
+golang.org/x/text/internal/language/compact
+golang.org/x/text/internal/tag
+golang.org/x/text/internal/utf8internal
+golang.org/x/text/language
+golang.org/x/text/runes
+golang.org/x/text/transform
+# salsa.debian.org/mdosch/xmppsrv v0.2.6
+## explicit; go 1.16
+salsa.debian.org/mdosch/xmppsrv
diff --git a/network/go-sendxmpp/slack-desc b/network/go-sendxmpp/slack-desc
new file mode 100644
index 0000000000..27eaa376e1
--- /dev/null
+++ b/network/go-sendxmpp/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+           |-----handy-ruler------------------------------------------------------|
+go-sendxmpp: go-sendxmpp (send xmpp messages from the command line)
+go-sendxmpp:
+go-sendxmpp:
+go-sendxmpp: Go-sendxmpp is a little command line tool to send messages or files
+go-sendxmpp: to an XMPP contact or a multi user chat.
+go-sendxmpp:
+go-sendxmpp: XMPP is an open, non-proprietary protocol for instant messaging.
+go-sendxmpp:
+go-sendxmpp: Homepage: https://salsa.debian.org/mdosch/go-sendxmpp
+go-sendxmpp:
+go-sendxmpp:
diff --git a/network/gofiche/gofiche.SlackBuild b/network/gofiche/gofiche.SlackBuild
index ea08181341..a5457ff09e 100644
--- a/network/gofiche/gofiche.SlackBuild
+++ b/network/gofiche/gofiche.SlackBuild
@@ -1,7 +1,7 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for gofiche
-# Copyright 2017 Dave <dave@dawoodfall.net>
+# Copyright 2017 Dave <dave@slackbuilds.org>
 # 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=gofiche
 VERSION=${VERSION:-1.0.3}
 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}
@@ -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/network/gofiche/gofiche.info b/network/gofiche/gofiche.info
index 1063c9262e..b74339669c 100644
--- a/network/gofiche/gofiche.info
+++ b/network/gofiche/gofiche.info
@@ -6,5 +6,5 @@ MD5SUM="ffd4be08dca177c5f098d176ed85ed2b"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="David Woodfall"
-EMAIL="dave@dawoodfall.net"
+MAINTAINER="D Woodfall"
+EMAIL="dave@slackbuilds.org"
diff --git a/network/goimapnotify/README b/network/goimapnotify/README
new file mode 100644
index 0000000000..550f17545a
--- /dev/null
+++ b/network/goimapnotify/README
@@ -0,0 +1,2 @@
+Execute scripts on IMAP mailbox changes (new/deleted/updated messages)
+using IDLE, Golang version.
diff --git a/network/goimapnotify/go.mod b/network/goimapnotify/go.mod
new file mode 100644
index 0000000000..7dd7616515
--- /dev/null
+++ b/network/goimapnotify/go.mod
@@ -0,0 +1,15 @@
+module gitlab.com/shackra/goimapnotify
+
+go 1.21.6
+
+require (
+	github.com/emersion/go-imap v1.2.1
+	github.com/emersion/go-imap-idle v0.0.0-20210907174914-db2568431445
+	github.com/emersion/go-sasl v0.0.0-20231106173351-e73c9f7bad43
+	github.com/sirupsen/logrus v1.9.3
+)
+
+require (
+	golang.org/x/sys v0.18.0 // indirect
+	golang.org/x/text v0.14.0 // indirect
+)
diff --git a/network/goimapnotify/go.sum b/network/goimapnotify/go.sum
new file mode 100644
index 0000000000..b58b347ff4
--- /dev/null
+++ b/network/goimapnotify/go.sum
@@ -0,0 +1,39 @@
+github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
+github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/emersion/go-imap v1.0.6/go.mod h1:yKASt+C3ZiDAiCSssxg9caIckWF/JG7ZQTO7GAmvicU=
+github.com/emersion/go-imap v1.2.1 h1:+s9ZjMEjOB8NzZMVTM3cCenz2JrQIGGo5j1df19WjTA=
+github.com/emersion/go-imap v1.2.1/go.mod h1:Qlx1FSx2FTxjnjWpIlVNEuX+ylerZQNFE5NsmKFSejY=
+github.com/emersion/go-imap-idle v0.0.0-20210907174914-db2568431445 h1:dAGbaaU4LLupO7dnYZaELOoI3RoVDNi5DCGejLe8a7c=
+github.com/emersion/go-imap-idle v0.0.0-20210907174914-db2568431445/go.mod h1:N/6S3dRTVt8xT867m+476C16+v/Fq4WZYvh2Chg0nmg=
+github.com/emersion/go-message v0.11.1/go.mod h1:C4jnca5HOTo4bGN9YdqNQM9sITuT3Y0K6bSUw9RklvY=
+github.com/emersion/go-message v0.15.0 h1:urgKGqt2JAc9NFJcgncQcohHdiYb803YTH9OQwHBHIY=
+github.com/emersion/go-message v0.15.0/go.mod h1:wQUEfE+38+7EW8p8aZ96ptg6bAb1iwdgej19uXASlE4=
+github.com/emersion/go-sasl v0.0.0-20191210011802-430746ea8b9b/go.mod h1:G/dpzLu16WtQpBfQ/z3LYiYJn3ZhKSGWn83fyoyQe/k=
+github.com/emersion/go-sasl v0.0.0-20200509203442-7bfe0ed36a21/go.mod h1:iL2twTeMvZnrg54ZoPDNfJaJaqy0xIQFuBdrLsmspwQ=
+github.com/emersion/go-sasl v0.0.0-20231106173351-e73c9f7bad43 h1:hH4PQfOndHDlpzYfLAAfl63E8Le6F2+EL/cdhlkyRJY=
+github.com/emersion/go-sasl v0.0.0-20231106173351-e73c9f7bad43/go.mod h1:iL2twTeMvZnrg54ZoPDNfJaJaqy0xIQFuBdrLsmspwQ=
+github.com/emersion/go-textwrapper v0.0.0-20160606182133-d0e65e56babe/go.mod h1:aqO8z8wPrjkscevZJFVE1wXJrLpC5LtJG7fqLOsPb2U=
+github.com/emersion/go-textwrapper v0.0.0-20200911093747-65d896831594 h1:IbFBtwoTQyw0fIM5xv1HF+Y+3ZijDR839WMulgxCcUY=
+github.com/emersion/go-textwrapper v0.0.0-20200911093747-65d896831594/go.mod h1:aqO8z8wPrjkscevZJFVE1wXJrLpC5LtJG7fqLOsPb2U=
+github.com/martinlindhe/base36 v1.0.0/go.mod h1:+AtEs8xrBpCeYgSLoY/aJ6Wf37jtBuR0s35750M27+8=
+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/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ=
+github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
+github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
+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/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4=
+golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
+golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
+golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
+golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
+golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
+golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+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=
diff --git a/network/goimapnotify/goimapnotify.SlackBuild b/network/goimapnotify/goimapnotify.SlackBuild
new file mode 100644
index 0000000000..4f84f8f0b9
--- /dev/null
+++ b/network/goimapnotify/goimapnotify.SlackBuild
@@ -0,0 +1,108 @@
+#!/bin/bash
+
+# Slackware build script for goimapnotify
+
+# 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=goimapnotify
+VERSION=${VERSION:-2.3.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"
+  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
+
+cat $CWD/go.mod > go.mod
+cat $CWD/go.sum > go.sum
+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
+  find -L $CWD -maxdepth 1 -type f -regex ".*/${NAME}-[^-]*\.tar\.gz" \
+    -exec tar xvf '{}' \;
+  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
+
+install -sDm 755 goimapnotify -t $PKG/usr/bin
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a CHANGELOG.rst 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/network/goimapnotify/goimapnotify.info b/network/goimapnotify/goimapnotify.info
new file mode 100644
index 0000000000..d28f3389f0
--- /dev/null
+++ b/network/goimapnotify/goimapnotify.info
@@ -0,0 +1,22 @@
+PRGNAM="goimapnotify"
+VERSION="2.3.12"
+HOMEPAGE="https://gitlab.com/shackra/goimapnotify"
+DOWNLOAD="https://gitlab.com/shackra/goimapnotify/-/archive/2.3.12/goimapnotify-2.3.12.tar.gz \
+          https://github.com/emersion/go-imap/archive/v1.2.1/go-imap-v1.2.1.tar.gz \
+          https://github.com/emersion/go-imap-idle/archive/db25684/go-imap-idle-db2568431445.tar.gz \
+          https://github.com/emersion/go-sasl/archive/e73c9f7/go-sasl-e73c9f7bad43.tar.gz \
+          https://github.com/sirupsen/logrus/archive/v1.9.3/logrus-v1.9.3.tar.gz \
+          https://github.com/golang/sys/archive/v0.18.0/sys-v0.18.0.tar.gz \
+          https://github.com/golang/text/archive/v0.14.0/text-v0.14.0.tar.gz"
+MD5SUM="ace5c852d7c851e4cb9da3f4c576bba9 \
+        337ec4e15b3b9435bec02d0b4c634797 \
+        0c60834c277747653bf1d883ac7660b2 \
+        efc2190ae65129b3e2531a9258181e98 \
+        29e75bd7c106e1853d2a9de8bd17dbb0 \
+        e00453d8847cde61907bcbee219c44bb \
+        9f64144d4b1647ce4597abf657028a8d"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="google-go-lang"
+MAINTAINER="Alexander Verbovetsky"
+EMAIL="alik@ejik.org"
diff --git a/network/goimapnotify/modules.txt b/network/goimapnotify/modules.txt
new file mode 100644
index 0000000000..0429696a1f
--- /dev/null
+++ b/network/goimapnotify/modules.txt
@@ -0,0 +1,27 @@
+# github.com/emersion/go-imap v1.2.1
+## explicit; go 1.13
+github.com/emersion/go-imap
+github.com/emersion/go-imap/backend
+github.com/emersion/go-imap/client
+github.com/emersion/go-imap/commands
+github.com/emersion/go-imap/responses
+github.com/emersion/go-imap/server
+github.com/emersion/go-imap/utf7
+# github.com/emersion/go-imap-idle v0.0.0-20210907174914-db2568431445
+## explicit; go 1.13
+github.com/emersion/go-imap-idle
+# github.com/emersion/go-sasl v0.0.0-20231106173351-e73c9f7bad43
+## explicit; go 1.12
+github.com/emersion/go-sasl
+# github.com/sirupsen/logrus v1.9.3
+## explicit; go 1.13
+github.com/sirupsen/logrus
+# golang.org/x/sys v0.18.0
+## explicit; go 1.18
+golang.org/x/sys/unix
+golang.org/x/sys/windows
+# golang.org/x/text v0.14.0
+## explicit; go 1.18
+golang.org/x/text/encoding
+golang.org/x/text/encoding/internal/identifier
+golang.org/x/text/transform
diff --git a/network/goimapnotify/slack-desc b/network/goimapnotify/slack-desc
new file mode 100644
index 0000000000..99f801ff77
--- /dev/null
+++ b/network/goimapnotify/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+            |-----handy-ruler------------------------------------------------------|
+goimapnotify: goimapnotify (IMAP IDLE notifications)
+goimapnotify:
+goimapnotify:
+goimapnotify: Execute scripts on IMAP mailbox changes (new/deleted/updated
+goimapnotify: messages) using IDLE, Golang version.
+goimapnotify:
+goimapnotify:
+goimapnotify:
+goimapnotify: Homepage: https://gitlab.com/shackra/goimapnotify
+goimapnotify:
+goimapnotify:
diff --git a/network/googlecl/googlecl.SlackBuild b/network/googlecl/googlecl.SlackBuild
index c7ca747ff6..36c9de259d 100644
--- a/network/googlecl/googlecl.SlackBuild
+++ b/network/googlecl/googlecl.SlackBuild
@@ -1,13 +1,16 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for googlecl
 
 # Written by Jakob Nylin <jakob[dot]nylin[at]gmail[dot]com>
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=googlecl
 VERSION=${VERSION:-0.9.15}
 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}
@@ -50,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/network/googler/README b/network/googler/README
index a899eb7a20..169f1726fc 100644
--- a/network/googler/README
+++ b/network/googler/README
@@ -1,15 +1,17 @@
-googler is a power tool to Google (Web & News) and Google Site Search from the
-command-line. It shows the title, URL and abstract for each result, which can
-be directly opened in a browser from the terminal. Results are fetched in
-pages (with page navigation). Supports sequential searches in a single googler
+googler is a power tool to Google (Web & News) and Google
+Site Search from the command-line. It shows the title, URL
+and abstract for each result, which can be directly opened in
+a browser from the terminal. Results are fetched in pages (with
+page navigation). Supports sequential searches in a single googler
 instance.
 
-googler was initially written to cater to headless servers without X. You can
-integrate it with a text-based browser. However, it has grown into a very
-handy and flexible utility that delivers much more. For example, fetch any
-number of results or start anywhere, limit search by any duration, define
-aliases to google search any number of websites, switch domains easily... all
-of this in a very clean interface without ads or stray URLs. The shell
-completion scripts make sure you don't need to remember any options.
+googler was initially written to cater to headless servers without
+X. You can integrate it with a text-based browser. However, it has
+grown into a very handy and flexible utility that delivers much
+more. For example, fetch any number of results or start anywhere,
+limit search by any duration, define aliases to google search any
+number of websites, switch domains easily... all of this in a very
+clean interface without ads or stray URLs. The shell completion
+scripts make sure you don't need to remember any options.
 
 googler isn't affiliated to Google in any way.
diff --git a/network/googler/googler.SlackBuild b/network/googler/googler.SlackBuild
index 703f484c87..7a66ad5893 100644
--- a/network/googler/googler.SlackBuild
+++ b/network/googler/googler.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for googler
 
-# Copyright 2017-2019  Dimitris Zlatanidis  Orestiada, Greece
+# Copyright 2017-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=googler
-VERSION=${VERSION:-3.8}
+VERSION=${VERSION:-4.3.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}
@@ -77,9 +87,9 @@ mkdir -p $PKG/usr/bin
 install -D -m0755 $PRGNAM $PKG/usr/bin
 
 # Install bash completion file
-mkdir -p $PKG/etc/bash_completion.d
-install -D -m0744 auto-completion/bash/${PRGNAM}-completion.bash \
-    $PKG/etc/bash_completion.d/${PRGNAM}-completion.bash
+mkdir -p $PKG/usr/share/bash-completion/completions
+install -D -m0644 auto-completion/bash/${PRGNAM}-completion.bash \
+    $PKG/usr/share/bash-completion/completions/$PRGNAM
 
 # Install zsh completion file
 mkdir -p $PKG/usr/share/site-functions
@@ -105,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/network/googler/googler.info b/network/googler/googler.info
index b6d8f0efec..fd025052ad 100644
--- a/network/googler/googler.info
+++ b/network/googler/googler.info
@@ -1,10 +1,10 @@
 PRGNAM="googler"
-VERSION="3.8"
+VERSION="4.3.2"
 HOMEPAGE="https://github.com/jarun/googler"
-DOWNLOAD="https://github.com/jarun/googler/archive/v3.8/googler-3.8.tar.gz"
-MD5SUM="22f904a6621722f193fc202fba2cdc7f"
+DOWNLOAD="https://github.com/jarun/googler/archive/v4.3.2/googler-4.3.2.tar.gz"
+MD5SUM="73e1c22bd731e259a5671389eb4bc8be"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="python3"
+REQUIRES=""
 MAINTAINER="Dimitris Zlatanidis"
 EMAIL="d.zlatanidis@gmail.com"
diff --git a/network/gophernicus/README b/network/gophernicus/README
index 1e1c73cb2e..e430d7e136 100644
--- a/network/gophernicus/README
+++ b/network/gophernicus/README
@@ -1,13 +1,5 @@
 gophernicus (gopher server)
 
 Gophernicus is a modern full-featured (and hopefully) secure gopher
-daemon for inetd.
-
-You may want to add this line to your /etc/inetd.conf and then restart
-or kill -HUP the inetd process:
-
-gopher  stream  tcp  nowait  nobody  /usr/sbin/in.gophernicus  in.gophernicus -h <your-hostname>
-
-Alternatively, gophernicus can be configured to run under xinetd.
-This is done automatically when xinetd is present on the system at
-build time.
+daemon for inetd or xinetd. See README.SBo for instructions on how to
+configure inetd or xinetd to run gophernicus.
diff --git a/network/gophernicus/README.SBo b/network/gophernicus/README.SBo
new file mode 100644
index 0000000000..755f487486
--- /dev/null
+++ b/network/gophernicus/README.SBo
@@ -0,0 +1,8 @@
+To run under inetd, add this line to your /etc/inetd.conf and then
+restart or kill -HUP the inetd process:
+
+gopher  stream  tcp  nowait  nobody  /usr/sbin/in.gophernicus  in.gophernicus -h <your-hostname>
+
+To run under xinetd, just restart or kill -HUP the xinetd process
+after installing the package. This assumes you already have xinetd
+installed and running.
diff --git a/network/gophernicus/git2tarxz.sh b/network/gophernicus/git2tarxz.sh
index e4937ba1c4..2da7118d54 100644
--- a/network/gophernicus/git2tarxz.sh
+++ b/network/gophernicus/git2tarxz.sh
@@ -46,7 +46,7 @@ Archive created: $PRGNAM-$VERSION.tar.xz
 Update $PRGNAM.info with:
 
 VERSION="$VERSION"
-DOWNLOAD="http://urchlay.naptime.net/~urchlay/src/$PRGNAM-$VERSION.tar.xz"
+DOWNLOAD="https://slackware.uk/~urchlay/src/$PRGNAM-$VERSION.tar.xz"
 MD5SUM="$( md5sum $PRGNAM-$VERSION.tar.xz | cut -d' ' -f1 )"
 
 Don't forget to upload the new source!
diff --git a/network/gophernicus/gophernicus.SlackBuild b/network/gophernicus/gophernicus.SlackBuild
index ab8ca83fee..127c92b3a8 100644
--- a/network/gophernicus/gophernicus.SlackBuild
+++ b/network/gophernicus/gophernicus.SlackBuild
@@ -1,9 +1,9 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for Gophernicus
 
 # Copyright 2012-2015  Fridrich von Stauffenberg <email removed>
-# Copyright 2018 B. Watson <yalhcru@gmail.com>
+# Copyright 2018 B. Watson <urchlay@slackware.uk>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,6 +23,7 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20210911 bkw: update for v3.1.1.
 # 20180722 bkw:
 # - Take over maintenance.
 # - Update for latest upstream 'rolling release' version.
@@ -32,10 +33,13 @@
 # - Don't install compile instructions in doc dir.
 # - Add git2tarxz.sh to make upgrading easier in the future.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=gophernicus
-VERSION=${VERSION:-2.5v101}
+VERSION=${VERSION:-3.1.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -45,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}
@@ -69,7 +77,7 @@ set -e
 PKGDOC=$PKG/usr/doc/$PRGNAM-$VERSION
 
 rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
+mkdir -p $TMP $PKG $OUTPUT $PKG/etc
 cd $TMP
 rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.?z
@@ -77,15 +85,26 @@ cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . -perm /111 -exec chmod 755 {} + -o -exec chmod 644 {} +
 
-patch -p1 < $CWD/Makefile.patch
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --sysconfig=/etc/$PRGNAM \
+  --mandir=/usr/man \
+  --os=linux \
+  --listener=inetd,xinetd
+
+make LDFLAGS="-lnsl"
+make install DESTDIR="$PKG"
 
-# 'make install' strips the binary already.
-make all CFLAGS="$SLKCFLAGS"
-make install DOCDIR="$PKGDOC" DESTDIR=$PKG
+# binary already stripped
+gzip -9 $PKG/usr/man/man?/*.*
 
-# Don't need this:
-rm -f $PKGDOC/INSTALL
+# do not ship this!
+rm -rf $PKG/etc/inetd.conf
 
+mkdir -p $PKGDOC
+cp -a LIC* README* change* gophermap.sample gophertag $PKGDOC
 cat $CWD/$PRGNAM.SlackBuild > $PKGDOC/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
@@ -93,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/network/gophernicus/gophernicus.info b/network/gophernicus/gophernicus.info
index 8986cecfd3..6efc7b04db 100644
--- a/network/gophernicus/gophernicus.info
+++ b/network/gophernicus/gophernicus.info
@@ -1,10 +1,10 @@
 PRGNAM="gophernicus"
-VERSION="2.5v101"
+VERSION="3.1.1"
 HOMEPAGE="https://github.com/kimholviala/gophernicus"
-DOWNLOAD="http://urchlay.naptime.net/~urchlay/src/gophernicus-2.5v101.tar.xz"
-MD5SUM="a95b9c71bf67581b66703d979e5e3789"
+DOWNLOAD="https://github.com/gophernicus/gophernicus/releases/download/3.1.1/gophernicus-3.1.1.tar.xz"
+MD5SUM="4282ec7115a86205fa09f8099432ac1f"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
 MAINTAINER="B. Watson"
-EMAIL="yalhcru@gmail.com"
+EMAIL="urchlay@slackware.uk"
diff --git a/network/gophernicus/slack-desc b/network/gophernicus/slack-desc
index 07356b2de3..510b70c3a8 100644
--- a/network/gophernicus/slack-desc
+++ b/network/gophernicus/slack-desc
@@ -9,7 +9,7 @@
 gophernicus: gophernicus (gopher server)
 gophernicus:
 gophernicus: Gophernicus is a modern full-featured (and hopefully) secure gopher
-gophernicus: daemon for inetd.
+gophernicus: daemon for inetd or xinetd.
 gophernicus:
 gophernicus: Homepage: gopher://gophernicus.org
 gophernicus:       or: https://github.com/kimholviala/gophernicus
diff --git a/network/gq/README b/network/gq/README
deleted file mode 100644
index a813efccfc..0000000000
--- a/network/gq/README
+++ /dev/null
@@ -1,5 +0,0 @@
-GQ is a GTK+ LDAP client and browser utility. It can be used for searching a
-LDAP directory as well as browsing it using a tree view. Furthermore, it lets
-you inspect the LDAP schema a server is using. 
-
-Install gq if you need a graphical tool to manage the contents of a LDAP server.
diff --git a/network/gq/doinst.sh b/network/gq/doinst.sh
deleted file mode 100644
index 0fb9c8b686..0000000000
--- a/network/gq/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 [ -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/network/gq/gcc.patch b/network/gq/gcc.patch
deleted file mode 100644
index 4e6da28e65..0000000000
--- a/network/gq/gcc.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: gq-1.2.3/configure
-===================================================================
---- gq-1.2.3.orig/configure
-+++ gq-1.2.3/configure
-@@ -6167,7 +6167,7 @@ if test "${ac_cv_lib_ssl_SSL_new+set}" =
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-lssl  $LIBS"
-+LIBS="`pkg-config --libs openssl` $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -6223,7 +6223,7 @@ fi
- { echo "$as_me:$LINENO: result: $ac_cv_lib_ssl_SSL_new" >&5
- echo "${ECHO_T}$ac_cv_lib_ssl_SSL_new" >&6; }
- if test $ac_cv_lib_ssl_SSL_new = yes; then
--  LIBS="-lssl $LIBS"
-+  LIBS="`pkg-config --libs openssl` $LIBS"
- 
- fi
- 
diff --git a/network/gq/glib-single-include.patch b/network/gq/glib-single-include.patch
deleted file mode 100644
index f09733155e..0000000000
--- a/network/gq/glib-single-include.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-Index: gq-1.2.3/src/gq-hash.h
-===================================================================
---- gq-1.2.3.orig/src/gq-hash.h
-+++ gq-1.2.3/src/gq-hash.h
-@@ -24,7 +24,7 @@
- #ifndef GQ_ENCRYPTION_H
- #define GQ_ENCRYPTION_H
- 
--#include <glib/garray.h>
-+#include <glib.h>
- #include "util.h"
- 
- G_BEGIN_DECLS
-Index: gq-1.2.3/src/gq-server-list.h
-===================================================================
---- gq-1.2.3.orig/src/gq-server-list.h
-+++ gq-1.2.3/src/gq-server-list.h
-@@ -26,7 +26,7 @@
- #ifndef GQ_SERVER_LIST_H
- #define GQ_SERVER_LIST_H
- 
--#include <glib/gmacros.h>
-+#include <glib.h>
- #include "gq-server.h" // for GqServer
- 
- G_BEGIN_DECLS
-Index: gq-1.2.3/src/state.c
-===================================================================
---- gq-1.2.3.orig/src/state.c
-+++ gq-1.2.3/src/state.c
-@@ -36,7 +36,7 @@
- #include <errno.h>
- 
- #include <glib/gi18n.h>
--#include <glib/gmessages.h>
-+#include <glib.h>
- #include <gtk/gtk.h>
- 
- #include "xmlparse.h"
diff --git a/network/gq/gq.SlackBuild b/network/gq/gq.SlackBuild
deleted file mode 100644
index 188fdceb83..0000000000
--- a/network/gq/gq.SlackBuild
+++ /dev/null
@@ -1,111 +0,0 @@
-#!/bin/sh
-
-# Copyright 2010 Chris Abela <chris.abela@maltats>
-# Copyright 2014-2017  Ryan P.C. McQuen, WA, ryanpcmcquen@member.fsf.org
-# Copyright 2017  Dhaby Xiloj, slack.dhabyx@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=gq
-VERSION=${VERSION:-1.2.3}
-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
-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 {} \;
-
-# Starting with glib 2.32 it is now mandatory to
-# include glib.h instead of individual headers.
-patch -p1 -i $CWD/glib-single-include.patch
-# Fix for gcc
-patch -p1 -i $CWD/gcc.patch
-
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
-  --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --sysconfdir=/etc \
-  --localstatedir=/var \
-  --mandir=/usr/man \
-  --docdir=/usr/doc/$PRGNAM-$VERSION \
-  --disable-update-mimedb \
-  --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
-
-# Correct the desktop icon
-ln -s gq/gq.xpm $PKG/usr/share/pixmaps/
-sed -i 's/Icon=gq/Icon=gq\.xpm/' $PKG/usr/share/applications/gq.desktop
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
-  AUTHORS COPYING ChangeLog 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/network/gq/gq.info b/network/gq/gq.info
deleted file mode 100644
index e7d671d3d6..0000000000
--- a/network/gq/gq.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="gq"
-VERSION="1.2.3"
-HOMEPAGE="https://sourceforge.net/projects/gqclient/"
-DOWNLOAD="https://downloads.sourceforge.net/gqclient/gq-1.2.3.tar.gz"
-MD5SUM="c4b40f095961da936abfc8f42d57e4fe"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="DhabyX"
-EMAIL="slack.dhabyx@gmail.com"
diff --git a/network/gq/slack-desc b/network/gq/slack-desc
deleted file mode 100644
index 355e158fed..0000000000
--- a/network/gq/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------------------------------------------------------|
-gq: gq (gtk+ ldap client and browser utility)
-gq:
-gq: GQ is a GTK+ LDAP client and browser utility. It can be used for
-gq: searching a LDAP directory as well as browsing it using a tree
-gq: view. Furthermore, it lets you inspect the LDAP schema a server
-gq: is using.
-gq:
-gq: Install gq if you need a graphical tool to manage the contents of
-gq: a LDAP server.
-gq:
-gq: Homepage: http://sourceforge.net/projects/gqclient/
diff --git a/network/graphite-carbon/README b/network/graphite-carbon/README
deleted file mode 100644
index adac9f0ee4..0000000000
--- a/network/graphite-carbon/README
+++ /dev/null
@@ -1,8 +0,0 @@
-graphite-carbon (Backend data caching and persistence daemon for Graphite)
-
-Graphite is a web application using the Twisted framework to provide real-time
-visualization and storage of numeric time-series data.  The Carbon daemon
-processes the incoming time-series data and saves it as Whisper database files.
-
-See README.SLACKWARE (which is also installed with the package docs) for
-setup, configuration, and usage hints.
diff --git a/network/graphite-carbon/README.SLACKWARE b/network/graphite-carbon/README.SLACKWARE
deleted file mode 100644
index 0f97aacb9f..0000000000
--- a/network/graphite-carbon/README.SLACKWARE
+++ /dev/null
@@ -1,15 +0,0 @@
-You may wish to add these lines to /etc/rc.d/rc.local to start the service:
-
-if [ -x /etc/rc.d/rc.carbon-cache ]; then
-  /etc/rc.d/rc.carbon-cache start
-fi
-
-You may also add these lines to /etc/rc.d/rc.local_shutdown:
-
-if [ -x /etc/rc.d/rc.carbon-cache ]; then
-  /etc/rc.d/rc.carbon-cache stop
-fi
-
-Remember to give executable permission to /etc/rc.d/rc.local_shutdown:
-
-  chmod 0755 /etc/rc.d/rc.local_shutdown
diff --git a/network/graphite-carbon/doinst.sh b/network/graphite-carbon/doinst.sh
deleted file mode 100644
index b11adc4f0f..0000000000
--- a/network/graphite-carbon/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
-}
-
-for i in etc/rc.d/rc.carbon-*.new ; do preserve_perms $i ; done
-for i in etc/carbon/*.new etc/logrotate.d/graphite-carbon.new ; do config $i ; done
diff --git a/network/graphite-carbon/graphite-carbon.SlackBuild b/network/graphite-carbon/graphite-carbon.SlackBuild
deleted file mode 100644
index 62823d82ef..0000000000
--- a/network/graphite-carbon/graphite-carbon.SlackBuild
+++ /dev/null
@@ -1,134 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for graphite-carbon
-
-# 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-carbon
-VERSION=${VERSION:-0.9.15}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-SRCNAM=carbon
-
-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
-
-# Bail if user or group isn't valid on your system
-if ! grep ^graphite: /etc/passwd 2>&1 > /dev/null; then
-
-cat << EOF
-
-  You must have graphite user and a group to run this script
-
-  # groupadd -g 299 graphite
-  # useradd -u 299 -d /var/lib/graphite -s /bin/false -g graphite graphite
-
-EOF
-
-  exit
-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 {} \;
-
-# Set some sane defaults
-patch -p1 <$CWD/patches/carbon.conf.example.diff
-# We don't have a RedHat system
-patch -p1 <$CWD/patches/setup.cfg.diff
-# Look for config file in /etc/carbon
-patch -p1 <$CWD/patches/validate-storage-schemas.py.diff
-
-python setup.py install --root=$PKG
-
-# Need some dirs
-mkdir -p $PKG/etc/{rc.d,logrotate.d} $PKG/var/{lib/graphite/whisper,log/carbon}
-chown -R graphite:graphite $PKG/var/lib/graphite $PKG/var/log/carbon
-
-# Install rc script
-install -D -m0644 -oroot -groot $CWD/rc.carbon-cache \
-  $PKG/etc/rc.d/rc.carbon-cache.new
-
-# Logrotate script
-install -D -m0644 -oroot -groot $CWD/graphite-carbon.logrotate \
-  $PKG/etc/logrotate.d/graphite-carbon.new
-
-# Configuration goes into /etc/carbon
-mv $PKG/usr/conf $PKG/etc/carbon
-for i in $PKG/etc/carbon/*.example ; do mv $i ${i/.example/.new} ; done
-
-# Do we really want .py suffix in /usr/bin
-for i in $PKG/usr/bin/*.py ; do mv $i ${i/.py/} ; done
-
-# Cruft removal
-rm -rf $PKG/usr/{storage,examples}
-
-# Manpages thanks to Debian folks!
-mkdir -p $PKG/usr/man
-cp -r $CWD/man1 $PKG/usr/man
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a LICENSE $CWD/README.SLACKWARE $PKG/usr/doc/$PRGNAM-$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/network/graphite-carbon/graphite-carbon.info b/network/graphite-carbon/graphite-carbon.info
deleted file mode 100644
index 7bc565d938..0000000000
--- a/network/graphite-carbon/graphite-carbon.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="graphite-carbon"
-VERSION="0.9.15"
-HOMEPAGE="https://github.com/graphite-project/"
-DOWNLOAD="https://github.com/graphite-project/carbon/archive/0.9.15/carbon-0.9.15.tar.gz"
-MD5SUM="1962b92b8b672b33d99b00c303fdd5aa"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="python-whisper python-twisted"
-MAINTAINER="Mario Preksavec"
-EMAIL="mario at slackware dot hr"
diff --git a/network/graphite-carbon/graphite-carbon.logrotate b/network/graphite-carbon/graphite-carbon.logrotate
deleted file mode 100644
index 7b769425a8..0000000000
--- a/network/graphite-carbon/graphite-carbon.logrotate
+++ /dev/null
@@ -1,13 +0,0 @@
-/var/log/carbon/*.log {
-	weekly
-	missingok
-	rotate 7
-	compress
-	delaycompress
-	notifempty
-	create 644 graphite graphite
-	sharedscripts
-	postrotate
-		/etc/rc.d/rc.carbon-cache restart > /dev/null
-	endscript
-}
diff --git a/network/graphite-carbon/man1/carbon-aggregator.1 b/network/graphite-carbon/man1/carbon-aggregator.1
deleted file mode 100644
index a8ab95294d..0000000000
--- a/network/graphite-carbon/man1/carbon-aggregator.1
+++ /dev/null
@@ -1,56 +0,0 @@
-.TH CARBON-AGGREGATOR 1
-.SH NAME
-carbon-aggregator \- buffer metrics over time before reporting to carbon-cache
-.SH SYNOPSYS
-.nf
-.fam C
-\fbcarbon-aggregator\fP [options] start
-.fam T
-.fi
-.SH DESCRIPTION
-carbon-aggregator can be run in front of carbon-cache to buffer metrics over
-time before reporting them into whisper.
-.PP
-The options are described below.
-.SH OPTIONS
-.TP
-.B
-\-h, \-\-help
-Show the embedded help.
-.TP
-.B
-\-\-debug
-Run in the foreground, log to stdout
-.TP
-.B
-\-\-profile=PROFILE
-Record performance profile data to the given file
-.TP
-.B
-\-\-pidfile=PIDFILE
-Write pid to the given file
-.TP
-.B
-\-\-config=CONFIG
-Use the given config file
-.TP
-.B
-\-\-logdir=LOGDIR
-Write logs in the given directory
-.TP
-.B
-\-\-instance=INSTANCE
-Manage a specific carbon instance
-.TP
-.B
-\-\-rules=RULES
-Use the given aggregation rules file.
-.TP
-.B
-\-\-rewrite-rules=REWRITE_RULES
-Use the given rewrite rules file.
-.SH AUTHOR
-\fBcarbon-aggregator\fP, created by Chris Davis.
-.PP
-This manual page was written by Jonas Genannt <jonas.genannt@capi2name.de, for
-the Debian project (but may be used by others).
diff --git a/network/graphite-carbon/man1/carbon-cache.1 b/network/graphite-carbon/man1/carbon-cache.1
deleted file mode 100644
index 39174d7449..0000000000
--- a/network/graphite-carbon/man1/carbon-cache.1
+++ /dev/null
@@ -1,50 +0,0 @@
-.TH CARBON-CACHE 1
-.SH NAME
-carbon-cache \- accepts metrics over various protocols and writes them to disk
-.SH SYNOPSYS
-.nf
-.fam C
-\fbcarbon-cache\fP [options] start
-.fam T
-.fi
-.SH DESCRIPTION
-carbon-cache accepts metrics over various protocols and writes them to disk as
-efficiently as possible. This requires caching metric values in RAM as they are
-received, and flushing them to disk on an interval using the underlying
-whisper library.
-.PP
-The options are described below.
-.SH OPTIONS
-.TP
-.B
-\-h, \-\-help
-Show the embedded help.
-.TP
-.B
-\-\-debug
-Run in the foreground, log to stdout
-.TP
-.B
-\-\-profile=PROFILE
-Record performance profile data to the given file
-.TP
-.B
-\-\-pidfile=PIDFILE
-Write pid to the given file
-.TP
-.B
-\-\-config=CONFIG
-Use the given config file
-.TP
-.B
-\-\-logdir=LOGDIR
-Write logs in the given directory
-.TP
-.B
-\-\-instance=INSTANCE
-Manage a specific carbon instance
-.SH AUTHOR
-\fBcarbon-cache\fP, created by Chris Davis.
-.PP
-This manual page was written by Jonas Genannt <jonas.genannt@capi2name.de, for
-the Debian project (but may be used by others).
diff --git a/network/graphite-carbon/man1/carbon-client.1 b/network/graphite-carbon/man1/carbon-client.1
deleted file mode 100644
index d954d4158f..0000000000
--- a/network/graphite-carbon/man1/carbon-client.1
+++ /dev/null
@@ -1,43 +0,0 @@
-.TH CARBON-CLIENT 1
-.SH NAME
-carbon-client \- Graphite client to reroute carbon data
-.SH SYNOPSYS
-.nf
-.fam C
-\fbcarbon-client\fP [options]
-.fam T
-.fi
-.SH DESCRIPTION
-Graphite client to reroute carbon data
-.PP
-The options are described below.
-.SH OPTIONS
-.TP
-.B
-\-h, \-\-help
-Show the embedded help.
-.TP
-.B
-\-\-debug
-Log debug info to stdout
-.TP
-.B
-\-\-keyfunc=KEYFUNC
-Use a custom key function (path/to/module.py:myFunc)
-.TP
-.B
-\-\-replication=REPLICATION
-Replication factor
-.TP
-.B
-\-\-routing=ROUTING
-Routing method: "consistent-hashing" (default) or "relay"
-.TP
-.B
-\-\-relayrules=RELAYRULES
-relay-rules.conf file to use for relay routing
-.SH AUTHOR
-\fBcarbon-client\fP, created by Chris Davis.
-.PP
-This manual page was written by Jonas Genannt <jonas.genannt@capi2name.de, for
-the Debian project (but may be used by others).
diff --git a/network/graphite-carbon/man1/carbon-relay.1 b/network/graphite-carbon/man1/carbon-relay.1
deleted file mode 100644
index 0ee27548b3..0000000000
--- a/network/graphite-carbon/man1/carbon-relay.1
+++ /dev/null
@@ -1,51 +0,0 @@
-.TH CARBON-RELAY 1
-.SH NAME
-carbon-relay \- replication and sharding data
-.SH SYNOPSYS
-.nf
-.fam C
-\fbcarbon-relay\fP [options] start
-.fam T
-.fi
-.SH DESCRIPTION
-carbon-relay serves two distinct purposes: replication and sharding.
-.PP
-The options are described below.
-.SH OPTIONS
-.TP
-.B
-\-h, \-\-help
-Show the embedded help.
-.TP
-.B
-\-\-debug
-Run in the foreground, log to stdout
-.TP
-.B
-\-\-profile=PROFILE
-Record performance profile data to the given file
-.TP
-.B
-\-\-pidfile=PIDFILE
-Write pid to the given file
-.TP
-.B
-\-\-config=CONFIG
-Use the given config file
-.TP
-.B
-\-\-logdir=LOGDIR
-Write logs in the given directory
-.TP
-.B
-\-\-instance=INSTANCE
-Manage a specific carbon instance
-.TP
-.B
-\-\-rules=RULES
-se the given relay rules file.
-.SH AUTHOR
-\fBcarbon-relay\fP, created by Chris Davis.
-.PP
-This manual page was written by Jonas Genannt <jonas.genannt@capi2name.de, for
-the Debian project (but may be used by others).
diff --git a/network/graphite-carbon/man1/validate-storage-schemas.1 b/network/graphite-carbon/man1/validate-storage-schemas.1
deleted file mode 100644
index 07eadb3358..0000000000
--- a/network/graphite-carbon/man1/validate-storage-schemas.1
+++ /dev/null
@@ -1,17 +0,0 @@
-.TH VALIDATE-STORAGE-SCHEMAS 1
-.SH NAME
-validate-storage-schemas \- validates the storage schemas
-.SH SYNOPSYS
-.nf
-.fam C
-\fbvalidate-storage-schemas\fP
-.fam T
-.fi
-.SH DESCRIPTION
-validates the storage schemas from the configuration
-file /etc/carbon/storage-schemas.conf.
-.SH AUTHOR
-\fBvalidate-storage-schemas\fP, created by Chris Davis.
-.PP
-This manual page was written by Jonas Genannt <jonas.genannt@capi2name.de, for
-the Debian project (but may be used by others).
diff --git a/network/graphite-carbon/patches/carbon.conf.example.diff b/network/graphite-carbon/patches/carbon.conf.example.diff
deleted file mode 100644
index cd72206d45..0000000000
--- a/network/graphite-carbon/patches/carbon.conf.example.diff
+++ /dev/null
@@ -1,41 +0,0 @@
---- carbon-0.9.13-pre1/conf/carbon.conf.example.orig	2014-12-31 17:50:50.000000000 +0100
-+++ carbon-0.9.13-pre1/conf/carbon.conf.example	2015-02-04 00:36:17.680898110 +0100
-@@ -14,30 +14,21 @@
- # To change other directory paths, add settings to this file. The following
- # configuration variables are available with these default values:
- #
--#   STORAGE_DIR    = $GRAPHITE_STORAGE_DIR
--#   LOCAL_DATA_DIR = STORAGE_DIR/whisper/
--#   WHITELISTS_DIR = STORAGE_DIR/lists/
--#   CONF_DIR       = STORAGE_DIR/conf/
--#   LOG_DIR        = STORAGE_DIR/log/
--#   PID_DIR        = STORAGE_DIR/
--#
--# For FHS style directory structures, use:
--#
--#   STORAGE_DIR    = /var/lib/carbon/
--#   CONF_DIR       = /etc/carbon/
--#   LOG_DIR        = /var/log/carbon/
--#   PID_DIR        = /var/run/
--#
--#LOCAL_DATA_DIR = /opt/graphite/storage/whisper/
-+STORAGE_DIR    = /var/lib/graphite/
-+CONF_DIR       = /etc/carbon/
-+LOG_DIR        = /var/log/carbon/
-+PID_DIR        = /var/run/
-+
-+LOCAL_DATA_DIR = /var/lib/graphite/whisper/
- 
- # Enable daily log rotation. If disabled, carbon will automatically re-open
- # the file if it's rotated out of place (e.g. by logrotate daemon)
--ENABLE_LOGROTATION = True
-+ENABLE_LOGROTATION = False
- 
- # Specify the user to drop privileges to
- # If this is blank carbon runs as the user that invokes it
- # This user must have write access to the local data directory
--USER =
-+USER = graphite
- #
- # NOTE: The above settings must be set under [relay] and [aggregator]
- #       to take effect for those daemons as well
diff --git a/network/graphite-carbon/patches/setup.cfg.diff b/network/graphite-carbon/patches/setup.cfg.diff
deleted file mode 100644
index 67f266d360..0000000000
--- a/network/graphite-carbon/patches/setup.cfg.diff
+++ /dev/null
@@ -1,12 +0,0 @@
---- carbon-0.9.13-pre1/setup.cfg.orig	2015-02-04 00:37:23.199169196 +0100
-+++ carbon-0.9.13-pre1/setup.cfg	2015-02-04 00:37:45.198588654 +0100
-@@ -1,9 +0,0 @@
--[install]
--prefix = /opt/graphite
--install-lib = %(prefix)s/lib
--
--[bdist_rpm]
--requires = python-twisted
--           whisper
--
--post-install = distro/redhat/misc/postinstall
diff --git a/network/graphite-carbon/patches/validate-storage-schemas.py.diff b/network/graphite-carbon/patches/validate-storage-schemas.py.diff
deleted file mode 100644
index ed6dad7b0f..0000000000
--- a/network/graphite-carbon/patches/validate-storage-schemas.py.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- carbon-0.9.13-pre1/bin/validate-storage-schemas.py.orig	2014-12-31 17:50:50.000000000 +0100
-+++ carbon-0.9.13-pre1/bin/validate-storage-schemas.py	2015-02-04 00:40:16.244602801 +0100
-@@ -22,7 +22,7 @@
-   SCHEMAS_FILE = sys.argv[1]
-   print "Loading storage-schemas configuration from: '%s'" % SCHEMAS_FILE
- else:
--  SCHEMAS_FILE = realpath(join(dirname(__file__), '..', 'conf', 'storage-schemas.conf'))
-+  SCHEMAS_FILE = '/etc/carbon/storage-schemas.conf'
-   print "Loading storage-schemas configuration from default location at: '%s'" % SCHEMAS_FILE
- 
- config_parser = ConfigParser()
diff --git a/network/graphite-carbon/rc.carbon-cache b/network/graphite-carbon/rc.carbon-cache
deleted file mode 100644
index ee7c98630e..0000000000
--- a/network/graphite-carbon/rc.carbon-cache
+++ /dev/null
@@ -1,57 +0,0 @@
-#!/bin/sh
-#
-# Start/stop/restart the carbon-cache daemon
-# Written by Mario Preksavec <mario@slackware.hr>
-
-BIN_FILE=/usr/bin/carbon-cache
-PID_FILE=/var/run/carbon-cache.pid
-CONF_FILE=/etc/carbon/carbon.conf
-
-rc_start() {
-  if [ -x $BIN_FILE ] && [ -f $CONF_FILE ]; then
-    if [ -f $PID_FILE ] && kill -0 $(cat $PID_FILE) 2>/dev/null; then
-      echo "carbon-cache daemon already running"
-    else
-      echo "Starting carbon-cache daemon:  $BIN"
-      $BIN_FILE --config=$CONF_FILE --pidfile=$PID_FILE start
-    fi
-  fi
-}
-
-rc_stop() {
-  if [ -f $PID_FILE ] && kill -0 $(cat $PID_FILE) 2>/dev/null; then
-    echo "Stopping carbon-cache daemon:  $BIN"
-    $BIN_FILE --config=$CONF_FILE --pidfile=$PID_FILE stop \
-      && rm -f $PID_FILE
-  fi
-}
-
-rc_status() {
-  if [ -f $PID_FILE ] && kill -0 $(cat $PID_FILE) 2>/dev/null; then
-    $BIN_FILE --config=$CONF_FILE --pidfile=$PID_FILE status
-  fi
-}
-
-rc_restart() {
-  rc_stop
-  sleep 1
-  rc_start
-}
-
-case "$1" in
-  'start')
-    rc_start
-  ;;
-  'stop')
-    rc_stop
-  ;;
-  'restart')
-    rc_restart
-  ;;
-  'status')
-    rc_status
-  ;;
-  *)
-    echo "usage $0 start|stop|restart|status"
-  ;;
-esac
diff --git a/network/graphite-carbon/slack-desc b/network/graphite-carbon/slack-desc
deleted file mode 100644
index 4136bf704b..0000000000
--- a/network/graphite-carbon/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-carbon: graphite-carbon (Backend data caching and daemon for Graphite)
-graphite-carbon:
-graphite-carbon: Graphite is a web application using the Twisted framework to provide
-graphite-carbon: real-time visualization and storage of numeric time-series data.
-graphite-carbon: The Carbon daemon processes the incoming time-series data and saves
-graphite-carbon: it as Whisper database files.
-graphite-carbon:
-graphite-carbon: Homepage: https://github.com/graphite-project/
-graphite-carbon:
-graphite-carbon:
-graphite-carbon:
diff --git a/network/greenbone-security-assistant/README b/network/greenbone-security-assistant/README
deleted file mode 100644
index 550f72c716..0000000000
--- a/network/greenbone-security-assistant/README
+++ /dev/null
@@ -1,125 +0,0 @@
-greenbone-security-assistant (UI for OpenVAS)
-
-This is the UI the Open Vulnerability Assessment System (OpenVAS).
-
-###### Known Problems ######
-
-- PDF report generation is broken.  This may get fixed in a future slackbuild.
-
-- All the daemons run as root.  There's no (working) configuration options
-  or documentation to change this behavior.
-
-- There are a number of tests that depend on other software packages that are
-  not available as slackbuilds at this time.  Stay tuned.
-
-- If you're running in a VM environment, or on a headless server, then
-  installing haveged is recommended, particularly for step 11 below.
-
-###### Upgrade Notes ######
-
-If you're updating from OpenVAS-7 to OpenVAS-8, please note the following.
-(See: http://www.openvas.org/install-source.html if you're unsure which
-version you're running.)
-
-Openvas now uses redis as a temporary database while running scans.  You will
-need redis installed and running, as well as hiredis.  See step 2 below on
-how to configure redis.
-
-Before running openvas-manager, you'll need to migrate the database.  Simply
-run:
-# openvasmd --migrate
-
-###### Installation Instructions ######
-
-These instructions assume you're familiar with slackbuilds.  If not, please
-refer to http://slackbuilds.org/howto/ .
-
-1. Build and install hiredis.
-
-2. Build and install redis.  You need to uncomment the following 2 lines in the
-   /etc/redis/redis.conf file:
-#unixsocket /tmp/redis.sock
-#unixsocketperm 700
-   Now start up redis:
-# sh /etc/rc.d/rc.redis start
-
-3. Build and install openvas-libraries.
-
-4. Build and install openvas-scanner.
-
-5. You need a Certificate Authority and server certificate. Run the following
-   command:
-# openvas-mkcert
-
-6. You need the NVT's (Network Vulnerability Tests).  Run the following
-   command to sync.  In the future, you can do this through the
-   greenbone-security-assistant interface.  This will take a minute or so
-   with a blazing fast internet connection. YMMV.
-# openvas-nvt-sync
-
-7. Start the openvas-scanner daemon.
-# sh /etc/rc.d/rc.openvassd start
-
-8. Build and install openvas-manager.
-
-9. You need client certificates for manager to talk to scanner.  Use the
-   following command.
-# openvas-mkcert-client -n -i
-
-10. Initialize the manager database.  This will take a while, so be patient.
-# openvasmd --rebuild
-
-11. You want encrypted credentials in the DB, so do this now.
-# openvasmd --create-credentials-encryption-key
-   This may take a while, so it's best to create some entropy by skipping to
-   #13-#15 and then coming back, if needed.
-
-12. Create a user.
-# openvasmd --create-user=cary
-    If you find the assigned password hard to remember, you can change it
-    right now.
-# openvasmd --user=cary --new-password=mekmitasdigoat
-
-13. Sync SCAP data.  This will take some time.
-# openvas-scapdata-sync
-
-14. Sync CERT data.
-# openvas-certdata-sync
-
-15. Update port names.
-# wget http://www.iana.org/assignments/service-names-port-numbers/service-names-port-numbers.xml
-# openvas-portnames-update service-names-port-numbers.xml
-# rm service-names-port-numbers.xml
-
-16. Start the openvas-manager daemon.
-# sh /etc/rc.d/rc.openvasmd start
-
-17. Build and install libmicrohttpd.
-
-18. Build and install greenbone-security-assistant.
-
-19. Launch the greenbone-security-assistant.
-# sh /etc/rc.d/rc.gsad start
-
-20. Open file:///var/lib/openvas/CA/cacert.pem in your browser to import the
-        certificate that you created in step 5 above.
-
-21. Point your browser at https://<YOUR HOSTNAME>:9392 and log in with your
-        username/password from #12.
-
-22. [Optional] Build and install openvas-cli.  You'll need this if you ever
-    want to script tests.
-
-That's it!  If you run into any problems, you can try running the
-openvas-check-setup script found here:
-  https://svn.wald.intevation.org/svn/openvas/trunk/tools/openvas-check-setup
-
-If you don't have a web-server running, you can edit the /etc/rc.d/rc.gsad
-script to remove the "-p 9392" option, and it will run on port 443.
-
-Please let me know if you run into any problems.  Patches welcome!
-
-Have Fun!
-
-Kent Fritz
-mailto:fritz.kent@gmail.com
diff --git a/network/greenbone-security-assistant/doinst.sh b/network/greenbone-security-assistant/doinst.sh
deleted file mode 100644
index f431bbcc60..0000000000
--- a/network/greenbone-security-assistant/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/rc.d/rc.gsad.new
-config etc/openvas/gsad_log.conf.new
diff --git a/network/greenbone-security-assistant/greenbone-security-assistant.SlackBuild b/network/greenbone-security-assistant/greenbone-security-assistant.SlackBuild
deleted file mode 100644
index 516d35cc86..0000000000
--- a/network/greenbone-security-assistant/greenbone-security-assistant.SlackBuild
+++ /dev/null
@@ -1,105 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for greenbone-security-assistant
-
-# Copyright 2015,2017 Kent Fritz, Mountain View, CA
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
-#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
-#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (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=greenbone-security-assistant
-VERSION=${VERSION:-6.0.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 {} \;
-
-mkdir -p build
-cd build
-  cmake \
-    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DLOCALSTATEDIR=/var \
-    -DSYSCONFDIR=/etc \
-    -DCMAKE_BUILD_TYPE=Release ..
-  make
-  make install DESTDIR=$PKG
-cd ..
-
-mkdir -p $PKG/etc/rc.d
-cat $CWD/rc.gsad > $PKG/etc/rc.d/rc.gsad.new
-chmod 0644 $PKG/etc/rc.d/rc.gsad.new
-mv $PKG/etc/openvas/gsad_log.conf $PKG/etc/openvas/gsad_log.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
-
-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 CHANGES 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/network/greenbone-security-assistant/greenbone-security-assistant.info b/network/greenbone-security-assistant/greenbone-security-assistant.info
deleted file mode 100644
index c7e67e9014..0000000000
--- a/network/greenbone-security-assistant/greenbone-security-assistant.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="greenbone-security-assistant"
-VERSION="6.0.12"
-HOMEPAGE="http://www.openvas.org"
-DOWNLOAD="http://wald.intevation.org/frs/download.php/2442/greenbone-security-assistant-6.0.12.tar.gz"
-MD5SUM="362ddc36292a16d3a55c90bda044b377"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="openvas-libraries libmicrohttpd"
-MAINTAINER="Kent Fritz"
-EMAIL="fritz.kent@gmail.com"
diff --git a/network/greenbone-security-assistant/rc.gsad b/network/greenbone-security-assistant/rc.gsad
deleted file mode 100644
index 9ed7614a70..0000000000
--- a/network/greenbone-security-assistant/rc.gsad
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/bin/sh
-#
-# /etc/rc.d/rc.gsad
-#
-# Start/stop/restart the Greenbone Security Assistant Daemon.
-#
-# To make Greenbone SA start automatically at boot, make this
-# file executable:  chmod 755 /etc/rc.d/rc.gsad
-# and add to rc.local:
-# if [ -x /etc/rc.d/rc.gsad ]; then
-#   . /etc/rc.d/rc.gsad start
-# fi
-#
-
-GSAD_PATH=/usr/sbin
-GSAD_BIN=gsad
-GSAD_OPTIONS="-p 9392 --timeout=60 --gnutls-priorities=SECURE128:-VERS-SSL3.0"
-GSAD_CMD="$GSAD_PATH/$GSAD_BIN $GSAD_OPTIONS"
-
-gsad_start() {
-  echo Starting Greenbone Security Assistant: $GSAD_CMD
-  $GSAD_CMD
-}
-
-gsad_stop() {
-  echo "Stopping Greenbone Security Assistant"
-  /bin/killall $GSAD_BIN
-}
-
-gsad_restart() {
-  gsad_stop
-  gsad_start
-}
-
-case "$1" in
-'start')
-  gsad_start
-  ;;
-'stop')
-  gsad_stop
-  ;;
-'restart')
-  gsad_restart
-  ;;
-*)
-  echo "usage $0 start|stop|restart"
-esac
diff --git a/network/greenbone-security-assistant/slack-desc b/network/greenbone-security-assistant/slack-desc
deleted file mode 100644
index a17ed0d15c..0000000000
--- a/network/greenbone-security-assistant/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------------------------------------------------------|
-greenbone-security-assistant: greenbone-security-assistant (UI for OpenVAS)
-greenbone-security-assistant:
-greenbone-security-assistant: This is the UI for the Open Vulnerability Assessment System (OpenVAS).
-greenbone-security-assistant:
-greenbone-security-assistant: For more information, please refer to the OpenVAS website available
-greenbone-security-assistant: at http://www.openvas.org/ .
-greenbone-security-assistant:
-greenbone-security-assistant:
-greenbone-security-assistant:
-greenbone-security-assistant:
-greenbone-security-assistant:
diff --git a/network/grpcurl/README b/network/grpcurl/README
new file mode 100644
index 0000000000..ea941d7dd5
--- /dev/null
+++ b/network/grpcurl/README
@@ -0,0 +1,10 @@
+grpcurl is a command-line tool that lets you interact with gRPC servers.
+It's basically curl for gRPC servers.
+
+The main purpose for this tool is to invoke RPC methods on a gRPC server
+from the command-line. gRPC servers use a binary encoding on the wire
+(protocol buffers, or "protobufs" for short). So they are basically
+impossible to interact with using regular curl (and older versions of
+curl that do not support HTTP/2 are of course non-starters). This
+program accepts messages using JSON encoding, which is much more
+friendly for both humans and scripts.
diff --git a/network/grpcurl/grpcurl.SlackBuild b/network/grpcurl/grpcurl.SlackBuild
new file mode 100644
index 0000000000..bea2084a5f
--- /dev/null
+++ b/network/grpcurl/grpcurl.SlackBuild
@@ -0,0 +1,96 @@
+#!/bin/bash
+
+# Slackware build script for grpcurl
+
+# Copyright 2023 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=grpcurl
+VERSION=${VERSION:-1.8.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}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+  PKG_ARCH=x86_32
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+  PKG_ARCH=x86_32
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+  PKG_ARCH=x86_64
+else
+  echo "$ARCH is not supported."
+  exit 1
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+mkdir -p $PRGNAM-$VERSION
+cd $PRGNAM-$VERSION
+tar xvf $CWD/${PRGNAM}_${VERSION}_linux_${PKG_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
+install -D -m755 $PRGNAM $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
+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/network/grpcurl/grpcurl.info b/network/grpcurl/grpcurl.info
new file mode 100644
index 0000000000..7c1469a793
--- /dev/null
+++ b/network/grpcurl/grpcurl.info
@@ -0,0 +1,10 @@
+PRGNAM="grpcurl"
+VERSION="1.8.9"
+HOMEPAGE="https://github.com/fullstorydev/grpcurl"
+DOWNLOAD="https://github.com/fullstorydev/grpcurl/releases/download/v1.8.9/grpcurl_1.8.9_linux_x86_32.tar.gz"
+MD5SUM="1b3e38d697d16b8fa0bd9aa0aef588ae"
+DOWNLOAD_x86_64="https://github.com/fullstorydev/grpcurl/releases/download/v1.8.9/grpcurl_1.8.9_linux_x86_64.tar.gz"
+MD5SUM_x86_64="9d134e5618bf35440e0ddc7cdef77127"
+REQUIRES=""
+MAINTAINER="Ebben Aries"
+EMAIL="slackbuilds@dscp.org"
diff --git a/network/grpcurl/slack-desc b/network/grpcurl/slack-desc
new file mode 100644
index 0000000000..38b69f4563
--- /dev/null
+++ b/network/grpcurl/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+       |-----handy-ruler------------------------------------------------------|
+grpcurl: grpcurl (curl for gRPC)
+grpcurl:
+grpcurl: grpcurl is a command-line tool that lets you interact with gRPC
+grpcurl: servers. It's basically curl for gRPC servers.
+grpcurl:
+grpcurl:
+grpcurl: Homepage: https://github.com/fullstorydev/grpcurl
+grpcurl:
+grpcurl:
+grpcurl:
+grpcurl:
diff --git a/network/grsync/grsync.SlackBuild b/network/grsync/grsync.SlackBuild
index 222cf8102e..27dc71729c 100644
--- a/network/grsync/grsync.SlackBuild
+++ b/network/grsync/grsync.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for grsync
 
-# Copyright 2013-2016 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy
+# Copyright 2013-2021 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=grsync
-VERSION=${VERSION:-1.2.6}
+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}
@@ -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/network/grsync/grsync.info b/network/grsync/grsync.info
index 68d70b398f..cf1f3654ec 100644
--- a/network/grsync/grsync.info
+++ b/network/grsync/grsync.info
@@ -1,8 +1,8 @@
 PRGNAM="grsync"
-VERSION="1.2.6"
-HOMEPAGE="http://www.opbyte.it/grsync/"
-DOWNLOAD="http://downloads.sf.net/grsync/grsync-1.2.6.tar.gz"
-MD5SUM="eb2b39e68a04ea5b9c92bcb7d9401e80"
+VERSION="1.3.0"
+HOMEPAGE="https://www.opbyte.it/grsync/"
+DOWNLOAD="https://downloads.sf.net/grsync/grsync-1.3.0.tar.gz"
+MD5SUM="be1c0dfb9c76ec923fa35ad9db624bb8"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/network/gtk-gnutella/README b/network/gtk-gnutella/README
index 93d1711e77..0a84d90737 100644
--- a/network/gtk-gnutella/README
+++ b/network/gtk-gnutella/README
@@ -1,4 +1,4 @@
-GTK Gnutella is a fully featured Gnutella servent designed to share any
-type of file the user wishes to share.  gtk-gnutella implements compressed
-gnutella net connections, ultra and leaf nodes, Partial File Sharing, Push
-Proxies and Passive/Active Remote Queueing (PARQ).
+GTK Gnutella is a fully featured Gnutella servent designed to share
+any type of file the user wishes to share. gtk-gnutella implements
+compressed gnutella net connections, ultra and leaf nodes, Partial
+File Sharing, Push Proxies and Passive/Active Remote Queueing (PARQ).
diff --git a/network/gtk-gnutella/gtk-gnutella.SlackBuild b/network/gtk-gnutella/gtk-gnutella.SlackBuild
index f63856fa81..375f762686 100644
--- a/network/gtk-gnutella/gtk-gnutella.SlackBuild
+++ b/network/gtk-gnutella/gtk-gnutella.SlackBuild
@@ -1,13 +1,16 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for GTK Gnutella
 
 # Written by Zbigniew Baniewski <Zbigniew [dot] Baniewski [at] gmail [dot] com>
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=gtk-gnutella
-VERSION=${VERSION:-1.1.14}
+VERSION=${VERSION:-1.2.2}
 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}
@@ -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/network/gtk-gnutella/gtk-gnutella.info b/network/gtk-gnutella/gtk-gnutella.info
index 0dd5ea6d13..ba252136e1 100644
--- a/network/gtk-gnutella/gtk-gnutella.info
+++ b/network/gtk-gnutella/gtk-gnutella.info
@@ -1,8 +1,8 @@
 PRGNAM="gtk-gnutella"
-VERSION="1.1.14"
+VERSION="1.2.2"
 HOMEPAGE="https://sourceforge.net/projects/gtk-gnutella/"
-DOWNLOAD="https://downloads.sourceforge.net/gtk-gnutella/gtk-gnutella-1.1.14.tar.xz"
-MD5SUM="75414544a8a7bacd5c75b207e235de73"
+DOWNLOAD="https://downloads.sourceforge.net/gtk-gnutella/gtk-gnutella-1.2.2.tar.xz"
+MD5SUM="6ca8152dd06feed7fd83a97978efcf3b"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/network/gtmess/README b/network/gtmess/README
deleted file mode 100644
index 7dd1ebb185..0000000000
--- a/network/gtmess/README
+++ /dev/null
@@ -1,3 +0,0 @@
-Gtmess is a lightweight console MSN Messenger client (only MSN-protocol)
-for Linux and other unix systems, (bsd, macos, solaris, irix, etc.) that
-conform to the POSIX standard.
diff --git a/network/gtmess/gtmess.SlackBuild b/network/gtmess/gtmess.SlackBuild
deleted file mode 100644
index 689b135078..0000000000
--- a/network/gtmess/gtmess.SlackBuild
+++ /dev/null
@@ -1,99 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for gtmess
-
-# Copyright 2011 Hans Strijards E-mail:hannesworst@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=gtmess
-VERSION=${VERSION:-0.97}
-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"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=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 \
-./configure \
-  --prefix=/usr \
-  --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 \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-gzip -9 $PKG/usr/man/man?/*
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
-  AUTHORS COPYING NEWS 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
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/network/gtmess/gtmess.info b/network/gtmess/gtmess.info
deleted file mode 100644
index c77742478d..0000000000
--- a/network/gtmess/gtmess.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="gtmess"
-VERSION="0.97"
-HOMEPAGE="http://gtmess.sourceforge.net/"
-DOWNLOAD="http://downloads.sourceforge.net/gtmess/gtmess-0.97.tar.gz"
-MD5SUM="d9526ffd117a22283f477cb15d05807e"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Hannes Worst"
-EMAIL="hannesworst@gmail.com"
diff --git a/network/gtmess/slack-desc b/network/gtmess/slack-desc
deleted file mode 100644
index 8dee6420a2..0000000000
--- a/network/gtmess/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------------------------------------------------------|
-gtmess: gtmess (Console based MSN-client)
-gtmess:
-gtmess: a console MSN Messenger client for Linux and other unix systems
-gtmess: (bsd, macos, solaris, irix, etc.) that conform to the POSIX standard.
-gtmess:
-gtmess:
-gtmess:
-gtmess:
-gtmess:
-gtmess:
-gtmess: Home: http://gtmess.sourceforge.net/
diff --git a/network/gtorrentviewer/README b/network/gtorrentviewer/README
index 1d1e56ec43..e7af7de9e8 100644
--- a/network/gtorrentviewer/README
+++ b/network/gtorrentviewer/README
@@ -1,3 +1,5 @@
+gtorrentviewer (A torrent viewer and editor)
+
 GTorrentViewer is a GTK2-based viewer and editor for BitTorrent meta
 files. It is able to retrieve information from trackers, check files,
 show detailed information, and modify .torrent files without having
@@ -5,6 +7,6 @@ to start downloading.
 
 The purpose of GTorrentViewer is to give the ability to see and modify
 all the possible information from .torrent files without having to start
-downloading and the ability to see in real time the current number of
+downloading, and the ability to see in real time the current number of
 seeds and peers on the torrent, so you will always know the status
-before start the download.
+before starting the download.
diff --git a/network/gtorrentviewer/doinst.sh b/network/gtorrentviewer/doinst.sh
index 9a8ded3c60..3edf8699cf 100644
--- a/network/gtorrentviewer/doinst.sh
+++ b/network/gtorrentviewer/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 -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/network/gtorrentviewer/gtorrentviewer.SlackBuild b/network/gtorrentviewer/gtorrentviewer.SlackBuild
index 4f59f5801e..90b73f2eb6 100644
--- a/network/gtorrentviewer/gtorrentviewer.SlackBuild
+++ b/network/gtorrentviewer/gtorrentviewer.SlackBuild
@@ -1,9 +1,10 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for gtorrentviewer
 
+# Copyright 2023 B. Watson
 # Copyright 2018 Donald Cooley South Haven, Indiana USA
-# Copyright 2010, 2012  Binh Nguyen <binhvng@gmail.com>
+# Copyright 2010, 2012  Binh Nguyen
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,11 +24,22 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20231107 bkw: BUILD=5
+# - take over maintenance.
+# - patch various segfault issues.
+# - remove generic INSTALL from doc dir.
+# - fix .desktop file.
+# - new-style icon.
+# - slight grammar fix in README and man page.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=gtorrentviewer
 SRCNAM=GTorrentViewer
 VERSION=${VERSION:-0.2b}
-BUILD=${BUILD:-4}
+BUILD=${BUILD:-5}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -37,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}
@@ -65,27 +81,24 @@ 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 {} +
+
+# 20231107 bkw: most of these patches came from ALT Linux:
+# https://git.altlinux.org/srpms/g/gtorrentviewer.git?a=tree;hb=0.2b-alt4_38
+# ...but a couple of them were "-p0" patches. I reworked them to apply
+# with "patch -p1". The curl-types, desktop, and dso-linking patches aren't
+# needed because their issues are fixed by code in this script.
+# The manpage patch is a grammar fix, done by me.
+for i in `cat $CWD/patches/series`; do
+  echo "=== applying $i"
+  patch -p1 < $CWD/patches/$i
+done
 
 # Fix building against newer cURL
-sed -i 's|#include <curl/types.h>||g' src/main.c
-
-# Fix linking of libm
-patch -p1 < $CWD/patches/fix_linking_libm.diff
-
-# The following 2 patches are from Fedora 13
-
-# Let drag and drop work with URIs as well as files
-patch -p1 < $CWD/patches/gtorrentviewer-0.2b-desktop.patch
-
-# Fix crash due to use of uninitialized GValue
-# Thanks to Niels Horn for pointing this out
-patch -p1 < $CWD/patches/GTorrentViewer-0.2b-tracker-details-refresh.patch
+sed -i '/#include <curl\/types.h>/d' src/main.c
 
+LIBS="-lm" \
 CFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
@@ -96,23 +109,23 @@ CFLAGS="$SLKCFLAGS" \
   --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
+# 20231107 bkw: ship .desktop with corrections already applied.
+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
+mkdir -p $PKG/usr/share/icons/hicolor/48x48
+ln -s ../../../pixmaps/$PRGNAM.png $PKG/usr/share/icons/hicolor/48x48/$PRGNAM.png
 
-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
+PKGDOC=$PKG/usr/doc/$PRGNAM-$VERSION
+mkdir -p $PKGDOC
+cp -a AUTHORS COPYING ChangeLog README $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/network/gtorrentviewer/gtorrentviewer.desktop b/network/gtorrentviewer/gtorrentviewer.desktop
new file mode 100644
index 0000000000..42bb9ab276
--- /dev/null
+++ b/network/gtorrentviewer/gtorrentviewer.desktop
@@ -0,0 +1,12 @@
+[Desktop Entry]
+Name=Torrent Metainfo Viewer
+GenericName=Torrent Viewer
+Comment=Viewer and Editor for .torrent files
+Exec=gtorrentviewer %f
+Icon=gtorrentviewer
+StartupNotify=false
+Terminal=false
+Type=Application
+Categories=Network;
+MimeType=application/x-bittorrent;
+Version=1.0
diff --git a/network/gtorrentviewer/gtorrentviewer.info b/network/gtorrentviewer/gtorrentviewer.info
index 7f3405ecb1..069a2fd9ff 100644
--- a/network/gtorrentviewer/gtorrentviewer.info
+++ b/network/gtorrentviewer/gtorrentviewer.info
@@ -6,5 +6,5 @@ MD5SUM="c29058a09f26693863404ecdb2580770"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Donald Cooley"
-EMAIL="chytraeu@sdf.org"
+MAINTAINER="B. Watson"
+EMAIL="urchlay@slackware.uk"
diff --git a/network/gtorrentviewer/patches/GTorrentViewer-0.2b-format.patch b/network/gtorrentviewer/patches/GTorrentViewer-0.2b-format.patch
new file mode 100644
index 0000000000..9b1d7e3484
--- /dev/null
+++ b/network/gtorrentviewer/patches/GTorrentViewer-0.2b-format.patch
@@ -0,0 +1,48 @@
+diff -Naur GTorrentViewer-0.2b/src/mainwindow.c GTorrentViewer-0.2b.patched/src/mainwindow.c
+--- GTorrentViewer-0.2b/src/mainwindow.c	2004-10-26 00:37:58.000000000 -0400
++++ GTorrentViewer-0.2b.patched/src/mainwindow.c	2023-11-07 20:56:10.027535819 -0500
+@@ -634,7 +634,7 @@
+   /* create the open file thread */
+   if(g_thread_create(open_torrent_file, filename, FALSE, &err) == NULL)
+   {
+-    g_warning(err->message);
++    g_warning("%s", err->message);
+     g_free(filename);
+     g_error_free(err);
+   } 
+@@ -671,7 +671,7 @@
+ 
+   if(g_thread_create(tracker_scrape, tracker, FALSE, &err) == NULL)
+   {
+-    g_warning(err->message);
++    g_warning("%s", err->message);
+     g_free(tracker);
+     g_error_free(err);
+   } 
+@@ -722,7 +722,7 @@
+        filename = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(dialog));
+        if(g_thread_create(check_files, filename, FALSE, &err) == NULL)
+        {
+-         g_warning(err->message);
++         g_warning("%s", err->message);
+          g_free(filename); 
+          g_error_free(err);
+        }
+@@ -755,7 +755,7 @@
+ 
+   if(g_thread_create(tracker_scrape, tracker, FALSE, &err) == NULL)
+   {
+-    g_warning(err->message);
++    g_warning("%s", err->message);
+     g_error_free(err);
+   } 
+   
+@@ -853,7 +853,7 @@
+     {
+       if(g_thread_create(open_torrent_file, filename, FALSE, &err) == NULL)
+       {
+-        g_warning(err->message);
++        g_warning("%s", err->message);
+         g_free(filename);
+         g_error_free(err);
+       } 
diff --git a/network/gtorrentviewer/patches/GTorrentViewer-0.2b-missing-tracker.patch b/network/gtorrentviewer/patches/GTorrentViewer-0.2b-missing-tracker.patch
new file mode 100644
index 0000000000..8e1f3a4a06
--- /dev/null
+++ b/network/gtorrentviewer/patches/GTorrentViewer-0.2b-missing-tracker.patch
@@ -0,0 +1,12 @@
+diff -Naur GTorrentViewer-0.2b/src/mainwindow.c GTorrentViewer-0.2b.patched/src/mainwindow.c
+--- GTorrentViewer-0.2b/src/mainwindow.c	2023-11-07 21:01:19.243506719 -0500
++++ GTorrentViewer-0.2b.patched/src/mainwindow.c	2023-11-07 21:02:04.947502418 -0500
+@@ -423,7 +423,7 @@
+ 
+   node = benc_node_find_key(torrent, "announce");
+   gtk_list_store_append(liststore, &iter);
+-  gtk_list_store_set(liststore, &iter, 0, benc_node_data(node), -1);
++  gtk_list_store_set(liststore, &iter, 0, node!=NULL?benc_node_data(node):"", -1);
+ 
+   node = benc_node_find_key(torrent, "announce-list");
+   if(node != NULL) /* multi-tracker support */
diff --git a/network/gtorrentviewer/patches/fix_linking_libm.diff b/network/gtorrentviewer/patches/fix_linking_libm.diff
deleted file mode 100644
index 4be5b63bb3..0000000000
--- a/network/gtorrentviewer/patches/fix_linking_libm.diff
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nur GTorrentViewer-0.2b.orig/src/Makefile.in GTorrentViewer-0.2b/src/Makefile.in
---- GTorrentViewer-0.2b.orig/src/Makefile.in	2004-10-25 23:42:16.000000000 -0500
-+++ GTorrentViewer-0.2b/src/Makefile.in	2012-09-09 23:31:34.092115981 -0500
-@@ -115,7 +115,7 @@
- 
- CFLAGS = @CFLAGS@ @CURL_CFLAGS@ @GTK_CFLAGS@
- 
--LDADD = @GTK_LIBS@ @CURL_LIBS@
-+LDADD = @GTK_LIBS@ @CURL_LIBS@ -lm
- 
- bin_PROGRAMS = gtorrentviewer
- 
diff --git a/network/gtorrentviewer/patches/gtorrentviewer-0.2b-desktop.patch b/network/gtorrentviewer/patches/gtorrentviewer-0.2b-desktop.patch
deleted file mode 100644
index ca12b05ec3..0000000000
--- a/network/gtorrentviewer/patches/gtorrentviewer-0.2b-desktop.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- GTorrentViewer-0.2b/data/gtorrentviewer.desktop.in.orig	2004-10-21 05:40:16.000000000 +0100
-+++ GTorrentViewer-0.2b/data/gtorrentviewer.desktop.in	2007-08-12 12:14:52.000000000 +0100
-@@ -2,7 +2,7 @@
- _Name=Torrent Metainfo Viewer
- _GenericName=Torrent Viewer
- _Comment=Viewer and Editor for .torrent files
--Exec=gtorrentviewer %U
-+Exec=gtorrentviewer %f
- Icon=gtorrentviewer.png
- StartupNotify=false
- Terminal=false
-@@ -10,4 +10,4 @@
- Encoding=UTF-8
- Categories=Application;Network;
- MimeType=application/x-bittorrent;
--Version=0.2
-+Version=1.0
diff --git a/network/gtorrentviewer/patches/gtorrentviewer-0.2b-trackerdetails.patch b/network/gtorrentviewer/patches/gtorrentviewer-0.2b-trackerdetails.patch
new file mode 100644
index 0000000000..dbdb68d62c
--- /dev/null
+++ b/network/gtorrentviewer/patches/gtorrentviewer-0.2b-trackerdetails.patch
@@ -0,0 +1,56 @@
+diff --git a/src/main.c b/src/main.c
+index fc51205..a770768 100644
+--- a/src/main.c
++++ b/src/main.c
+@@ -336,12 +336,8 @@ tracker_scrape(gpointer tracker)
+     SHA1((guint8*)string, number, (guint8*)torrent_sha);
+     g_free(string);
+ 
+-    if(g_str_has_suffix((gchar*)tracker, "info_hash="))
+-      string = util_convert_to_hex(torrent_sha, SHA_DIGEST_LENGTH, "%"); 
+-    else
+-      string = g_strdup(" ");
+-
+-    host = g_strdup_printf("%s%s", (gchar*)tracker, string);
++    string = util_convert_to_hex(torrent_sha, SHA_DIGEST_LENGTH, "%");
++    host = g_strdup_printf("%s?info_hash=%s", (gchar*)tracker, string);
+     g_free(string);
+ 
+     string = g_strrstr(host, "announce");
+diff --git a/src/mainwindow.c b/src/mainwindow.c
+index 6b1bbf0..415098e 100644
+--- a/src/mainwindow.c
++++ b/src/mainwindow.c
+@@ -421,23 +421,23 @@ mainwindow_fill_trackers_tab(MainWindow const *mwin, BencNode *torrent)
+ 
+   gtk_combo_box_set_active(mwin->TrackerComboBox, -1); 
+ 
++  node = benc_node_find_key(torrent, "announce");
++  gtk_list_store_append(liststore, &iter);
++  gtk_list_store_set(liststore, &iter, 0, benc_node_data(node), -1);
++
+   node = benc_node_find_key(torrent, "announce-list");
+-  if(node == NULL) /* no multi-tracker */
+-  {
+-    node = benc_node_find_key(torrent, "announce");
+-    gtk_list_store_append(liststore, &iter);
+-    gtk_list_store_set(liststore, &iter, 0, benc_node_data(node), -1);
+-  }
+-  else /* multi-tracker  support */
++  if(node != NULL) /* multi-tracker support */
+   {
+-    node = benc_node_first_child(node);
+-    if(node != NULL)
++    for (node = benc_node_first_child(node); node != NULL;
++         node = benc_node_next_sibling(node))
++    {
+       for(subnode = benc_node_first_child(node); subnode != NULL; 
+           subnode = benc_node_next_sibling(subnode))
+       {
+         gtk_list_store_append(liststore, &iter);
+         gtk_list_store_set(liststore, &iter, 0, benc_node_data(subnode), -1);
+       }
++    }
+   }
+   
+   gtk_combo_box_set_model(mwin->TrackerComboBox, GTK_TREE_MODEL(liststore));
diff --git a/network/gtorrentviewer/patches/manpage.diff b/network/gtorrentviewer/patches/manpage.diff
new file mode 100644
index 0000000000..99909b805e
--- /dev/null
+++ b/network/gtorrentviewer/patches/manpage.diff
@@ -0,0 +1,23 @@
+diff -Naur GTorrentViewer-0.2b/data/gtorrentviewer.1 GTorrentViewer-0.2b.patched/data/gtorrentviewer.1
+--- GTorrentViewer-0.2b/data/gtorrentviewer.1	2004-10-18 18:40:11.000000000 -0400
++++ GTorrentViewer-0.2b.patched/data/gtorrentviewer.1	2023-11-07 22:30:10.103005035 -0500
+@@ -14,8 +14,8 @@
+ .PP
+ The purpose of GTorrentViewer is to give the ability to see and modify all
+ the possible information from .torrent files without having to start
+-downloading and the ability to see in real time the current number of seeds
+-and peers on the torrent, so you will always know the status before start
++downloading, and the ability to see in real time the current number of seeds
++and peers on the torrent, so you will always know the status before starting
+ the download.
+ .SH OPTIONS
+ gtorrentviewer options:
+@@ -24,7 +24,7 @@
+ output version information and exit.
+ .TP
+ .B \-h, \-\-help
+-display a option overview and exit.
++display an option overview and exit.
+ .SH AUTHOR
+ GTorrentViewer was written by Alejandro Claro <ap0lly0n@users.sourceforge.net>.
+ .PP
diff --git a/network/gtorrentviewer/patches/series b/network/gtorrentviewer/patches/series
new file mode 100644
index 0000000000..c9c40df86d
--- /dev/null
+++ b/network/gtorrentviewer/patches/series
@@ -0,0 +1,5 @@
+GTorrentViewer-0.2b-tracker-details-refresh.patch
+gtorrentviewer-0.2b-trackerdetails.patch
+GTorrentViewer-0.2b-format.patch
+GTorrentViewer-0.2b-missing-tracker.patch
+manpage.diff
diff --git a/network/guacamole-client/guacamole-client.SlackBuild b/network/guacamole-client/guacamole-client.SlackBuild
index 395599d0c1..f23206b454 100644
--- a/network/guacamole-client/guacamole-client.SlackBuild
+++ b/network/guacamole-client/guacamole-client.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for guacamole-client
 
-# Copyright 2015-2017 Zhu Qun-Ying
+# Copyright 2015-2020 Zhu Qun-Ying
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -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=guacamole-client
-VERSION=${VERSION:-1.0.0}
+VERSION=${VERSION:-1.1.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
 
-CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -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-noarch-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/network/guacamole-client/guacamole-client.info b/network/guacamole-client/guacamole-client.info
index 80a5842106..225c2d5f65 100644
--- a/network/guacamole-client/guacamole-client.info
+++ b/network/guacamole-client/guacamole-client.info
@@ -1,8 +1,8 @@
 PRGNAM="guacamole-client"
-VERSION="1.0.0"
+VERSION="1.1.0"
 HOMEPAGE="https://guacamole.apache.org"
-DOWNLOAD="http://archive.apache.org/dist/guacamole/1.0.0/binary/guacamole-1.0.0.war"
-MD5SUM="b190718b63e80442b0c3642e5bd4bca8"
+DOWNLOAD="http://archive.apache.org/dist/guacamole/1.1.0/binary/guacamole-1.1.0.war"
+MD5SUM="b41ad2663c424516241346863662fa4b"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="apache-tomcat"
diff --git a/network/guacamole-client/slack-desc b/network/guacamole-client/slack-desc
index 64c6538b27..9185d176c7 100644
--- a/network/guacamole-client/slack-desc
+++ b/network/guacamole-client/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------------------------------------------------------|
 guacamole-client: guacamole-client (Guacamole client)
 guacamole-client:
 guacamole-client: guacamole-client contains all Java and JavaScript components
diff --git a/network/guacamole-server/README b/network/guacamole-server/README
deleted file mode 100644
index b3edeadb9b..0000000000
--- a/network/guacamole-server/README
+++ /dev/null
@@ -1,9 +0,0 @@
-guacamole-server - Guacamole server
-
-guacamole-server contains all the native, server-side components
-required by Guacamole to connect to remote desktops.  It provides
-a common C library, libguac, which all other native components
-depend on, as well as separate libraries for each supported
-protocol, and guacd, the heart of Guacamole.
-
-libwebp is an optional dependency.
diff --git a/network/guacamole-server/doinst.sh b/network/guacamole-server/doinst.sh
deleted file mode 100644
index e696e66243..0000000000
--- a/network/guacamole-server/doinst.sh
+++ /dev/null
@@ -1,22 +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
-}
-
-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.guacd.new
diff --git a/network/guacamole-server/guacamole-server.SlackBuild b/network/guacamole-server/guacamole-server.SlackBuild
deleted file mode 100644
index 4faaafa5c8..0000000000
--- a/network/guacamole-server/guacamole-server.SlackBuild
+++ /dev/null
@@ -1,109 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for guacamole-server
-
-# Copyright 2015-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=guacamole-server
-VERSION=${VERSION:-1.0.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
-
-SRC_DIR=$PRGNAM-$VERSION
-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 $SRC_DIR
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-cd $SRC_DIR
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -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 system uuid library from util-linux instead of OSSP uuid
-for file in $CWD/patch/* ; do
-    patch -p1 < $file
-done
-autoreconf -fi
-
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
-  --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --sysconfdir=/etc \
-  --with-init-dir=/etc/rc.d \
-  --localstatedir=/var \
-  --mandir=/usr/man \
-  --docdir=/usr/doc/$PRGNAM-$VERSION \
-  --enable-static=no \
-  --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 -a README LICENSE NOTICE CONTRIBUTING $PKG/usr/doc/$PRGNAM-$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
-
-mv $PKG/etc/rc.d/guacd $PKG/etc/rc.d/rc.guacd.new
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/network/guacamole-server/guacamole-server.info b/network/guacamole-server/guacamole-server.info
deleted file mode 100644
index 09d9d5d678..0000000000
--- a/network/guacamole-server/guacamole-server.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="guacamole-server"
-VERSION="1.0.0"
-HOMEPAGE="http://guacamole.apache.org/"
-DOWNLOAD="https://github.com/apache/guacamole-server/archive/1.0.0/guacamole-server-1.0.0.tar.gz"
-MD5SUM="5081a0670bcd693dd4d5fea60ab5ca5d"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="libtelnet freerdp"
-MAINTAINER="Zhu Qun-Ying"
-EMAIL="zhu.qunying@gmail.com"
diff --git a/network/guacamole-server/patch/typescript.patch b/network/guacamole-server/patch/typescript.patch
deleted file mode 100644
index 02785b4ce8..0000000000
--- a/network/guacamole-server/patch/typescript.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- guacamole-server-0.9.14/src/terminal/terminal/typescript.h	2018-01-01 13:23:37.000000000 -0800
-+++ guacamole-server-0.9.14-new/src/terminal/terminal/typescript.h	2018-01-26 17:11:22.180187667 -0800
-@@ -97,7 +97,7 @@
-      * The full path to the file which will contain the timing information for
-      * this typescript.
-      */
--    char timing_filename[GUAC_TERMINAL_TYPESCRIPT_MAX_NAME_LENGTH];
-+    char timing_filename[GUAC_TERMINAL_TYPESCRIPT_MAX_NAME_LENGTH + sizeof(GUAC_TERMINAL_TYPESCRIPT_TIMING_SUFFIX) + 1];
- 
-     /**
-      * The file descriptor of the file into which raw terminal output should be
diff --git a/network/guacamole-server/patch/uuid.patch b/network/guacamole-server/patch/uuid.patch
deleted file mode 100644
index 9107ab2e92..0000000000
--- a/network/guacamole-server/patch/uuid.patch
+++ /dev/null
@@ -1,73 +0,0 @@
---- guacamole-server-0.9.8/configure.ac	2015-09-04 17:36:05.000000000 -0700
-+++ guacamole-server-0.9.8.new/configure.ac	2015-11-27 16:36:00.229847035 -0800
-@@ -68,19 +68,25 @@
- 
- # OSSP UUID
- AC_CHECK_LIB([ossp-uuid], [uuid_make], [UUID_LIBS=-lossp-uuid],
--             AC_CHECK_LIB([uuid], [uuid_make], [UUID_LIBS=-luuid],
-+             AC_CHECK_LIB([uuid], [uuid_generate], [UUID_LIBS=-luuid],
-                           AC_MSG_ERROR("The OSSP UUID library is required")))
- 
- # Check for and validate OSSP uuid.h header
--AC_CHECK_HEADERS([ossp/uuid.h])
--AC_CHECK_DECL([uuid_make],,
--              AC_MSG_ERROR("No OSSP uuid.h found in include path"),
-+AC_CHECK_HEADERS([ossp/uuid.h], [uuid/uuid.h])
-+AC_CHECK_DECL([uuid_make],, ,
-               [#ifdef HAVE_OSSP_UUID_H
-                #include <ossp/uuid.h>
-                #else
-                #include <uuid.h>
-                #endif
-                ])
-+AC_CHECK_DECL([uuid_generate],, ,
-+              [#ifdef HAVE_OSSP_UUID_H
-+               #include <ossp/uuid.h>
-+               #else
-+               #include <uuid/uuid.h>
-+               #endif
-+               ])
- 
- # cunit
- AC_CHECK_LIB([cunit], [CU_run_test], [CUNIT_LIBS=-lcunit])
---- incubator-guacamole-server-0.9.10-incubating/src/libguac/id.c	2016-12-18 10:44:24.000000000 -0800
-+++ incubator-guacamole-server-0.9.10-incubating.new/src/libguac/id.c	2017-01-20 14:48:45.273476934 -0800
-@@ -25,7 +25,7 @@
- #ifdef HAVE_OSSP_UUID_H
- #include <ossp/uuid.h>
- #else
--#include <uuid.h>
-+#include <uuid/uuid.h>
- #endif
- 
- #include <stdlib.h>
-@@ -34,6 +34,7 @@
- 
-     char* buffer;
-     char* identifier;
-+#ifdef HAVE_OSSP_UUID_H
-     size_t identifier_length;
- 
-     uuid_t* uuid;
-@@ -75,6 +76,21 @@
-     }
- 
-     uuid_destroy(uuid);
-+#else
-+    uuid_t uuid;
-+#define UUID_LEN_STR 36
-+
-+    buffer = malloc (UUID_LEN_STR + 2);
-+    if (buffer == NULL) {
-+        guac_error = GUAC_STATUS_NO_MEMORY;
-+        guac_error_message = "Could not allocate memory for connection ID";
-+        return NULL;
-+    }
-+    identifier = buffer + 1;
-+
-+    uuid_generate (uuid);
-+    uuid_unparse (uuid, identifier);
-+#endif
- 
-     buffer[0] = prefix;
-     buffer[UUID_LEN_STR + 1] = '\0';
diff --git a/network/guacamole-server/slack-desc b/network/guacamole-server/slack-desc
deleted file mode 100644
index 3d4e42ab20..0000000000
--- a/network/guacamole-server/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------------------------------------------------------|
-guacamole-server: guacamole-server (Guacamole server)
-guacamole-server:
-guacamole-server: guacamole-server contains all the native, server-side
-guacamole-server: components required by Guacamole to connect to remote
-guacamole-server: desktops.  It provides a common C library, libguac, which all
-guacamole-server: other native components depend on, as well as separate
-guacamole-server: libraries for each supported protocol, and guacd, the heart
-guacamole-server: of Guacamole.
-guacamole-server:
-guacamole-server: http://guacamole.apache.org/
-guacamole-server:
diff --git a/network/gui-ufw/README b/network/gui-ufw/README
index 86b61616fb..86c241f63a 100644
--- a/network/gui-ufw/README
+++ b/network/gui-ufw/README
@@ -2,11 +2,6 @@ gui-ufw (GUI for Uncomplicated Firewall)
 
 A very user-friendly and uncomplicated way to manage ufw.
 
-
-This version requires that python-distutils-extra be built with python3
-support by passing PYTHON3=yes ./python-distutils-extra.SlackBuild when
-building.
-
-This version also requires webkit2gtk. If you would rather not have to
+This version requires webkit2gtk. If you would rather not have to
 build webkit2gtk, you can still use the 12.04.1 version of gui-ufw:
 https://slackbuilds.org/repository/14.1/network/gui-ufw/
diff --git a/network/gui-ufw/gufw-open.diff b/network/gui-ufw/gufw-open.diff
new file mode 100644
index 0000000000..e972d8b921
--- /dev/null
+++ b/network/gui-ufw/gufw-open.diff
@@ -0,0 +1,10 @@
+--- a/bin/gufw
++++ b/bin/gufw
+@@ -1,3 +1,6 @@
+ #!/bin/bash
++if [ $(loginctl show-session $(loginctl|grep $(whoami) |awk '{print $1}') -p Type) = "Type=wayland" ]; then
++    xhost +si:localuser:root
++fi
+ c_user=$(whoami)
+ pkexec gufw-pkexec $c_user
+
diff --git a/network/gui-ufw/gui-ufw.SlackBuild b/network/gui-ufw/gui-ufw.SlackBuild
index 6c6b13d418..907e67fdf1 100644
--- a/network/gui-ufw/gui-ufw.SlackBuild
+++ b/network/gui-ufw/gui-ufw.SlackBuild
@@ -1,8 +1,9 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for gui-ufw
 
-# Copyright 2018, 2019 Skaendo <skaendo@linuxmail.org>
+# Copyright 2022-23 Jay Lanagan (j@lngn.net), Detroit, MI, USA
+# Previous script by Skaendo w/ bkw patches, this replaces it.
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -11,21 +12,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=gui-ufw
-VERSION=${VERSION:-19.10.0}
+VERSION=${VERSION:-24.04.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,11 +39,14 @@ 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=""
@@ -49,6 +56,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=""
@@ -59,8 +69,8 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-mkdir $PRGNAM-$VERSION
-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 . \
@@ -69,8 +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 {} \;
 
-# Point gufw-pkexec to the correct python3 location and version.
-sed -i "s|lib/python3.5|lib$LIBDIRSUFFIX/python3.7|g" bin/gufw-pkexec
+# path & opening app fixes from ubuntu
+patch -p1 < $CWD/gufw-open.diff
+patch -p1 < $CWD/path-fix.diff
 
 python3 setup.py install --prefix=/usr --root=$PKG
 
@@ -80,20 +91,32 @@ mv $PKG/usr/share/man $PKG/usr
 # Clean up some duplicates
 rm -rf $PKG/usr/share/doc
 
+# 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
+
 find $PKG -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 \
+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
+cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/network/gui-ufw/gui-ufw.info b/network/gui-ufw/gui-ufw.info
index b69cf4274b..4a03d79c95 100644
--- a/network/gui-ufw/gui-ufw.info
+++ b/network/gui-ufw/gui-ufw.info
@@ -1,10 +1,10 @@
 PRGNAM="gui-ufw"
-VERSION="19.10.0"
-HOMEPAGE="https://gufw.org/"
-DOWNLOAD="https://launchpad.net/gui-ufw/trunk/19.10/+download/gui-ufw-19.10.0.tar.gz"
-MD5SUM="46ba50d59dfa96e36d04ab2f21fc2d21"
+VERSION="24.04.0"
+HOMEPAGE="https://github.com/costales/gufw"
+DOWNLOAD="https://github.com/costales/gufw/releases/download/24.04/gui-ufw-24.04.0.tar.gz"
+MD5SUM="15cb73e5aac0c5e0d3d8107883de6570"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="python-distutils-extra pygobject3-python3 ufw webkit2gtk"
-MAINTAINER="Skaendo"
-EMAIL="skaendo@linuxmail.org"
+REQUIRES="python-distutils-extra webkit2gtk ufw"
+MAINTAINER="Jay Lanagan"
+EMAIL="j@lngn.net"
diff --git a/network/gui-ufw/path-fix.diff b/network/gui-ufw/path-fix.diff
new file mode 100644
index 0000000000..2ebfdb0c21
--- /dev/null
+++ b/network/gui-ufw/path-fix.diff
@@ -0,0 +1,16 @@
+--- a/bin/gufw-pkexec
++++ b/bin/gufw-pkexec
+@@ -1,2 +1,11 @@
+ #!/bin/bash
+-python3 /usr/share/gufw/gufw/gufw.py $1
++LOCATIONS=`ls -ld /usr/lib*/python*/site-packages/gufw/gufw.py | awk '{print $9}'` # from source
++LOCATIONS=( "${LOCATIONS[@]}" "/usr/share/gufw/gufw/gufw.py" )                    # deb package
++
++for ((i = 0; i < ${#LOCATIONS[@]}; i++))
++do
++    if [[ -e "${LOCATIONS[${i}]}" ]]; then
++        python3 ${LOCATIONS[${i}]} $1
++    fi
++done
++
+
diff --git a/network/gui-ufw/slack-desc b/network/gui-ufw/slack-desc
index 467139f203..35569e8c84 100644
--- a/network/gui-ufw/slack-desc
+++ b/network/gui-ufw/slack-desc
@@ -10,10 +10,10 @@ gui-ufw: gui-ufw (GUI for Uncomplicated Firewall)
 gui-ufw:
 gui-ufw: A very user-friendly and uncomplicated way to manage ufw.
 gui-ufw:
+gui-ufw: Homepage: https://gufw.org/
 gui-ufw:
 gui-ufw:
 gui-ufw:
 gui-ufw:
 gui-ufw:
-gui-ufw: Homepage: https://gufw.org/
 gui-ufw:
diff --git a/network/hakuneko/README b/network/hakuneko/README
new file mode 100644
index 0000000000..ea9a249bc1
--- /dev/null
+++ b/network/hakuneko/README
@@ -0,0 +1,14 @@
+Hakuneko is a cross platform downloader for Manga and Anime
+from various websites.Hakuneko was made to help users
+downloading media for circumstances that require offline usage.
+The philosophy is ad-hoc consumption, get it when you going to
+watch it. It is not meant to be a mass downloader to stock up
+thousands of chapters that are just collected and will probably
+never be read.
+
+Note:
+This build will self update with changes in the master branch.
+
+After uninstalling Hakuneko make sure to remove the following
+folders $HOME/.config/hakuneko-desktop  and
+$HOME/.cache/hakuneko-desktop
diff --git a/network/hakuneko/doinst.sh b/network/hakuneko/doinst.sh
new file mode 100644
index 0000000000..5b35a0a29e
--- /dev/null
+++ b/network/hakuneko/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 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 usr/share/icons/hicolor >/dev/null 2>&1
+  fi
+fi
diff --git a/network/hakuneko/hakuneko.SlackBuild b/network/hakuneko/hakuneko.SlackBuild
new file mode 100644
index 0000000000..a333d3a7e3
--- /dev/null
+++ b/network/hakuneko/hakuneko.SlackBuild
@@ -0,0 +1,132 @@
+#!/bin/bash
+
+# Slackware build script for hakuneko
+
+# 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=hakuneko
+VERSION=${VERSION:-8.3.4}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86)
+      DEBARCH=i386
+      ARCH=i586
+      LIBDIRSUFFIX=""
+      ;;
+    x86_64)
+      DEBARCH=amd64
+      ARCH=x86_64
+      LIBDIRSUFFIX="64"
+      ;;
+      # unsupported
+      *)
+      echo "ARCH $( uname -m ) is unsupported"
+      exit 1
+      ;;
+  esac
+else
+  case "$ARCH" in
+    i?86)
+      DEBARCH=i386
+      LIBDIRSUFFIX=""
+      ;;
+    x86_64)
+      DEBARCH=amd64
+      LIBDIRSUFFIX="64"
+      ;;
+      # unsupported
+      *)
+      echo "$ARCH 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}
+
+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
+mkdir -pv $PRGNAM-$VERSION
+cd $PRGNAM-$VERSION
+
+if  [ "$DEBARCH" = "i386" ]; then
+	echo "Building for the 32-bit architecture"
+	mv -v $CWD/hakuneko-desktop_8.3.4_linux_i386.deb $CWD/$PRGNAM-$VERSION.deb
+	ar -x $CWD/$PRGNAM-$VERSION.deb
+	tar xvf data.tar.xz -C $PKG
+	mv -v $PKG/usr/share/man  $PKG/usr/man
+elif [ "$DEBARCH" = "amd64" ]; then
+	echo "Building for the 64-bit architecture"
+	mv -v $CWD/hakuneko-desktop_8.3.4_linux_amd64.deb $CWD/$PRGNAM-$VERSION.deb
+	ar -x $CWD/$PRGNAM-$VERSION.deb
+	tar xvf data.tar.xz -C $PKG
+	mv -v $PKG/usr/lib $PKG/usr/lib${LIBDIRSUFFIX}
+	mv -v $PKG/usr/share/man $PKG/usr/man
+	rm -rvf $PKG/usr/share/applications/hakuneko-desktop.desktop
+	cp -a  $CWD/hakuneko.desktop $PKG/usr/share/applications/
+else
+	echo "This program is not supported"
+fi
+
+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 {} \;
+
+find $PKG -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/hakuneko-desktop/*  $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/network/hakuneko/hakuneko.desktop b/network/hakuneko/hakuneko.desktop
new file mode 100644
index 0000000000..d04c10ee61
--- /dev/null
+++ b/network/hakuneko/hakuneko.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=HakuNeko Desktop
+Comment=Downloader
+Exec=/usr/lib64/hakuneko-desktop/hakuneko
+Icon=hakuneko-desktop
+Terminal=false
+Type=Application
+Categories=Network;FileTransfer;
+GenericName=Manga Downloader
diff --git a/network/hakuneko/hakuneko.info b/network/hakuneko/hakuneko.info
new file mode 100644
index 0000000000..952c6ce2f5
--- /dev/null
+++ b/network/hakuneko/hakuneko.info
@@ -0,0 +1,10 @@
+PRGNAM="hakuneko"
+VERSION="8.3.4"
+HOMEPAGE="https://hakuneko.download"
+DOWNLOAD="https://github.com/manga-download/hakuneko/releases/download/nightly-20200705.1/hakuneko-desktop_8.3.4_linux_i386.deb"
+MD5SUM="bdeb7eb96f74606c74c1359a8145a023"
+DOWNLOAD_x86_64="https://github.com/manga-download/hakuneko/releases/download/nightly-20200705.1/hakuneko-desktop_8.3.4_linux_amd64.deb"
+MD5SUM_x86_64="c6e5affbef2828708d806e890befe7db"
+REQUIRES=""
+MAINTAINER="Vijay Marcel"
+EMAIL="vijaymarcel@outlook.com"
diff --git a/network/hakuneko/slack-desc b/network/hakuneko/slack-desc
new file mode 100644
index 0000000000..13fefc9555
--- /dev/null
+++ b/network/hakuneko/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+        |-----handy-ruler------------------------------------------------------|
+hakuneko: hakuneko (Manga and Anime Downloader)
+hakuneko:
+hakuneko: Hakuneko is a cross platform downloader for Manga and Anime
+hakuneko: from various websites.Hakuneko was made to help users
+hakuneko: downloading media for circumstances that require offline usage.
+hakuneko: The philosophy is ad-hoc consumption, get it when you going to
+hakuneko: watch it. It is not meant to be a mass downloader to stock up
+hakuneko: thousands of chapters that are just collected and will probably
+hakuneko: never be read.
+hakuneko:
+hakuneko: Homepage:https://hakuneko.download
diff --git a/network/hamachi/README b/network/hamachi/README
index cc32ec2016..60bf132bce 100644
--- a/network/hamachi/README
+++ b/network/hamachi/README
@@ -1,15 +1,17 @@
-LogMeIn Hamachi2 is a hosted VPN service that securely connects devices and
-networks, extending LAN-like network connectivity to mobile users,
-distributed teams and business applications. You can easily create secure
-virtual networks on demand, across public and private networks.
+LogMeIn Hamachi2 is a hosted VPN service that securely connects
+devices and networks, extending LAN-like network connectivity to
+mobile users, distributed teams and business applications. You can
+easily create secure virtual networks on demand, across public and
+private networks.
 
 Linux beta binary blob from https://secure.logmein.com/US/labs/
 
-This requires the "tun" driver to be built into the kernel or available as
-a module- not a problem for Slackware (indeed, most) kernels.
+This requires the "tun" driver to be built into the kernel or
+available as a module- not a problem for Slackware (indeed, most)
+kernels.
 
-Provided is a sample rc.d script, /etc/rc.d/rc.d/rc.hamachi, to start the
-Hamachi2 daemon. To run it on boot, make it executable with
+Provided is a sample rc.d script, /etc/rc.d/rc.d/rc.hamachi, to start
+the Hamachi2 daemon. To run it on boot, make it executable with
 
     chmod +x /etc/rc.d/rc.hamachi
 
@@ -19,12 +21,12 @@ and add the following to /etc/rc.d/rc.local:
       . /etc/rc.d/rc.hamachi start
     fi
 
-Hamachi2 writes its configuration information to /var/lib/logmein-hamachi.
-To modify the server configuration, add your parameters to
-/var/lib/logmein-hamachi/h2-engine-override.cfg and restart the daemon with
-/etc/rc.d/rc.hamachi restart. Parameters you can change (in fact, the
-daemon's current configuration) are listed in h2-engine.cfg in this
-directory.
+Hamachi2 writes its configuration information to
+/var/lib/logmein-hamachi.  To modify the server configuration, add
+your parameters to /var/lib/logmein-hamachi/h2-engine-override.cfg and
+restart the daemon with /etc/rc.d/rc.hamachi restart. Parameters you
+can change (in fact, the daemon's current configuration) are listed in
+h2-engine.cfg in this directory.
 
 Example /var/lib/logmein-hamachi/h2-engine-override.cfg:
 
@@ -35,10 +37,11 @@ Example /var/lib/logmein-hamachi/h2-engine-override.cfg:
     Sock.UdpAddr    192.168.1.33
     Sock.UdpPort    51232
 
-This config allows the user vike to use the hamachi command for controlling
-the vpn. It also disables UPnP for negotiation of the hamachi listen socket
-and forces it to the address and port listed. This is useful when you are
-willing to do a port forward yourself, because UPnP can be unreliable.
+This config allows the user vike to use the hamachi command for
+controlling the vpn. It also disables UPnP for negotiation of
+the hamachi listen socket and forces it to the address and port
+listed. This is useful when you are willing to do a port forward
+yourself, because UPnP can be unreliable.
 
 For more information run the hamachi command without parameters and see
 /usr/doc/hamachi-<version>/README.
diff --git a/network/hamachi/hamachi.SlackBuild b/network/hamachi/hamachi.SlackBuild
index b65be724e4..31604ae221 100644
--- a/network/hamachi/hamachi.SlackBuild
+++ b/network/hamachi/hamachi.SlackBuild
@@ -1,24 +1,34 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for hamachi
 
 # Written by Adam Swift vikepack@omnitude.net
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=hamachi
 SRCPKGNAM=logmein-$PRGNAM
 VERSION=${VERSION:-2.0.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}
@@ -61,5 +71,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/network/haproxy/README b/network/haproxy/README
index e9f613f484..c3e6a927b8 100644
--- a/network/haproxy/README
+++ b/network/haproxy/README
@@ -3,8 +3,9 @@ availability, load balancing, and proxying for TCP and HTTP-based
 applications. It is particularly suited for very high traffic web sites.
 
 Note that a default configuration file is no longer provided at
-/etc/haproxy/haproxy.cfg. See /usr/doc/haproxy-*/examples for some
-sample configuration files.
+/etc/haproxy/haproxy.cfg. See /usr/doc/haproxy-*/examples 
+for some sample configuration files. The directory also contains 
+example files for logging.
 
-lua53 is an optional dependency for HAProxy. Pass LUA=yes to this script to
-enable lua support.
+The script supports optional variables for Lua, PCRE and QUIC.
+See README.SLACKWARE for more information.
diff --git a/network/haproxy/README.SLACKWARE b/network/haproxy/README.SLACKWARE
new file mode 100644
index 0000000000..53e8a8fd21
--- /dev/null
+++ b/network/haproxy/README.SLACKWARE
@@ -0,0 +1,94 @@
+--------
+Compiling, optional dependencies and variables
+--------
+
+This SlackBuild script supports additional variables.
+
+1) Lua support
+
+Lua is an optional dependency. Pass LUA=yes to this script
+to enable Lua support.
+
+2) Custom Perl Compatible Regular Expressions
+
+Perl Compatible Regular Expressions version 2 without JIT
+support is enabled by default. You can change this by passing
+PCRE= to this script.
+
+Currently supported settings are listed in the Makefile.
+
+For example:
+ * Use PCRE=PCRE2_JIT to use libpcre2 with JIT support.
+ * Use PCRE=PCRE to use libpcre version 1.
+
+You can also use the variables as they're written in the
+Makefile, such as PCRE=USE_PCRE_JIT or PCRE=USE_PCRE=1.
+The script will parse them correctly.
+
+3) QUIC support (experimental)
+
+Starting with version 2.6.0, HAProxy supports HTTP/3 over QUIC.
+The QUIC support is currently experimental and requires QUICTLS.
+OpenSSL package shipped with Slackware 15.0 is not compatible
+with QUIC.
+
+Pass QUIC=yes to this script to enable HTTP/3 support.
+
+Check out these links for more information:
+* https://github.com/quictls/
+* https://www.haproxy.com/blog/announcing-haproxy-2-6/
+
+--------
+Logging
+--------
+
+If you want to enable logging, please first refer to HAProxy manual
+on how to enable logging and how to select which events to log.
+
+HAProxy log forwarding works fine with Slackware's sysklogd.
+
+There are example files located in /usr/doc/haproxy-*/examples
+The files are called syslog.example and logrotate.example.
+
+You might want to add something like this to your haproxy.cfg file:
+
+global
+   log /dev/log local0
+
+Note that rotating logs does not require restarting HAProxy.
+Instead, logrotate script should send a HUP signal to syslogger
+when rotating. Example script is included in syslog.example.
+Rotating has been tested with sysklogd (Slackware default) and
+syslog-ng.
+
+--------
+Automatic starting/stopping upon system start/shutdown
+--------
+
+To start HAProxy automatically when system is booted,
+add the following lines to /etc/rc.d/rc.local:
+
+   if [ -x /etc/rc.d/rc.haproxy ]; then
+       /etc/rc.d/rc.haproxy start
+   fi
+
+To stop HAProxy on system shutdown, add following lines
+to /etc/rc.d/rc.local_shutdown
+
+   if [ -x /etc/rc.d/rc.haproxy ]; then
+       /etc/rc.d/rc.haproxy stop
+   fi
+
+--------
+Privileges
+--------
+
+Like with the most rc scripts /etc/rc.d/rc.haproxy should be
+run as root. You can easily drop process privileges by specifying
+another user (and group) in the main configuration file.
+
+Add something like this to haproxy.cfg:
+
+global
+  user nobody
+  group nogroup
diff --git a/network/haproxy/haproxy.SlackBuild b/network/haproxy/haproxy.SlackBuild
index cfcb13e07b..6347d65637 100644
--- a/network/haproxy/haproxy.SlackBuild
+++ b/network/haproxy/haproxy.SlackBuild
@@ -1,10 +1,13 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for haproxy
 
 # Copyright 2018 T3slider <t3slider@gmail.com>
 # All rights reserved.
 #
+# Copyright 2024 Badchay <badchay@protonmail.com>
+# All rights reserved.
+#
 # Redistribution and use of this script, with or without modification, is
 # permitted provided that the following conditions are met:
 #
@@ -22,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=haproxy
-VERSION=${VERSION:-1.8.13}
+VERSION=${VERSION:-2.8.9}
 BUILD=${BUILD:-1}
 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}
@@ -56,10 +69,16 @@ fi
 
 # This should work with Slackware-provided kernels, but you may wish to
 # use 'generic' instead
-TARGET=${TARGET:-linux2628}
+TARGET=${TARGET:-linux-glibc}
 
-# Include lua support? (Requires lua53)
+# Include lua support? (Requires lua)
 LUA=${LUA:-no}
+# Perl Compatible Regular Expressions version 2 is enabled by default.
+# You might want to use libpcre1 and/or JIT-enabled version instead.
+PCRE=${PCRE:-PCRE2}
+# Include QUIC (HTTP/3) support?
+# This requires QUICTLS or wolfSSL.
+QUIC=${QUIC:-no}
 
 set -e
 
@@ -77,18 +96,36 @@ find -L . \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 LUAOPT=""
-if [ "$LUA" != "no" ]; then
+if [ "$LUA" == "yes" ]; then
     LUAOPT="USE_LUA=1"
+else
+    LUAOPT="USE_LUA="
+fi
+
+PCREOPT=""
+if [ "$PCRE" != "PCRE2" ]; then
+   PCREOPT=$(echo $PCRE | sed -e 's/USE_//' -e 's/=1//')
+else
+   PCREOPT="PCRE2"
+fi
+
+QUICOPT=""
+if [ "$QUIC" == "yes" ]; then
+    LUAOPT="USE_QUIC=1"
+else
+    LUAOPT="USE_QUIC="
 fi
 
 make \
     TARGET=$TARGET \
-    CFLAGS="$SLKCFLAGS" \
-    CXXFLAGS="$SLKCFLAGS" \
-    USE_PCRE=1 \
+    USE_$PCREOPT=1 \
+    $QUICOPT \
     USE_OPENSSL=1 \
+    USE_ENGINE=1 \
     USE_ZLIB=1 \
     USE_NS=1 \
+    USE_PROMEX=1 \
+    USE_SYSTEMD= \
     $LUAOPT \
     EXTRA=""
 make install \
@@ -106,8 +143,18 @@ for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; r
 
 install -D -m 0644 $CWD/rc.$PRGNAM $PKG/etc/rc.d/rc.$PRGNAM.new
 
-cp -a CHANGELOG CONTRIBUTING LICENSE MAINTAINERS README ROADMAP SUBVERS VERDATE VERSION examples \
+cp -a CONTRIBUTING LICENSE MAINTAINERS README BRANCHES SUBVERS VERDATE VERSION examples \
   $PKG/usr/doc/$PRGNAM-$VERSION
+
+# If there's a CHANGELOG, installing at least part of the recent history
+# is useful, but don't let it get totally out of control:
+if [ -r CHANGELOG ]; then
+  head -n 1000 CHANGELOG > $PKG/usr/doc/$PRGNAM-$VERSION/CHANGELOG
+  touch -r CHANGELOG $PKG/usr/doc/$PRGNAM-$VERSION/CHANGELOG
+fi
+
+cp $CWD/{syslog.example,logrotate.example} $PKG/usr/doc/$PRGNAM-$VERSION/examples/
+
 mkdir -p $PKG/etc/haproxy
 mv $PKG/usr/doc/$PRGNAM-$VERSION/examples/errorfiles $PKG/etc/haproxy/errors
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
@@ -117,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/network/haproxy/haproxy.info b/network/haproxy/haproxy.info
index b25e1d7e47..b48d7a471d 100644
--- a/network/haproxy/haproxy.info
+++ b/network/haproxy/haproxy.info
@@ -1,10 +1,10 @@
 PRGNAM="haproxy"
-VERSION="1.8.13"
+VERSION="2.8.9"
 HOMEPAGE="https://www.haproxy.org/"
-DOWNLOAD="https://www.haproxy.org/download/1.8/src/haproxy-1.8.13.tar.gz"
-MD5SUM="bf0b437bad78f5824d7e26ae0c81fee4"
+DOWNLOAD="https://www.haproxy.org/download/2.8/src/haproxy-2.8.9.tar.gz"
+MD5SUM="ed6a0a5171b83c6fa6850fa2ed3639be"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="T3slider"
-EMAIL="t3slider@gmail.com"
+MAINTAINER="Badchay"
+EMAIL="badchay@protonmail.com"
diff --git a/network/haproxy/logrotate.example b/network/haproxy/logrotate.example
new file mode 100644
index 0000000000..7bc93f8e33
--- /dev/null
+++ b/network/haproxy/logrotate.example
@@ -0,0 +1,9 @@
+/var/log/haproxy {
+    notifempty
+    weekly
+    missingok
+    rotate 4
+    postrotate
+         /bin/kill -HUP `cat /var/run/syslogd.pid 2>/dev/null` 2>/dev/null || true
+    endscript
+}
diff --git a/network/haproxy/rc.haproxy b/network/haproxy/rc.haproxy
index a95a407133..e19ddf8ca5 100644
--- a/network/haproxy/rc.haproxy
+++ b/network/haproxy/rc.haproxy
@@ -1,15 +1,30 @@
-#!/bin/sh
+#!/bin/bash
+#
+# Slackware initialization script for HAProxy.
+#
+# This script was made by T3slider.
+# Slight modifications by Badchay.
+#
+
 
 HAPROXY=/usr/sbin/haproxy
 CONFIG=/etc/haproxy/haproxy.cfg
 PIDFILE=/var/run/haproxy.pid
 
+if [[ ! -f $CONFIG && "$1" == "start" ]]; then
+   echo "No configuration file found. Cannot continue."
+   echo "The script looks for the configuration file placed in $CONFIG"
+   exit 1
+fi
+
 start() {
     if [ -r $PIDFILE ]; then
         echo 'HAProxy is already running!'
         return
+    else
+    	echo "Starting HAProxy..."
+        $HAPROXY -f $CONFIG -D -p $PIDFILE
     fi
-    $HAPROXY -f $CONFIG -D -p $PIDFILE
 }
 
 stop() {
diff --git a/network/haproxy/slack-desc b/network/haproxy/slack-desc
index 773ba0f472..1131d5b881 100644
--- a/network/haproxy/slack-desc
+++ b/network/haproxy/slack-desc
@@ -6,14 +6,14 @@
 # customary to leave one space after the ':' except on otherwise blank lines.
 
        |-----handy-ruler------------------------------------------------------|
-haproxy: haproxy (a high performance TCP/HTTP load balancer)
+haproxy: haproxy (The Reliable, High Performance TCP/HTTP Load Balancer)
 haproxy:
-haproxy: HAProxy is a free, very fast and reliable solution offering high
+haproxy: HAProxy is a free, very fast and reliable reverse-proxy offering high
 haproxy: availability, load balancing, and proxying for TCP and HTTP-based
-haproxy: applications. It is particularly suited for very high traffic web
-haproxy: sites.
-haproxy:
-haproxy: http://www.haproxy.org/
+haproxy: applications. It is particularly suited for very high traffic
+haproxy: web sites and powers a significant portion of the world's most
+haproxy: visited ones.
 haproxy:
 haproxy:
+haproxy: Check out more information on https://www.haproxy.org/
 haproxy:
diff --git a/network/haproxy/syslog.example b/network/haproxy/syslog.example
new file mode 100644
index 0000000000..8d062fac17
--- /dev/null
+++ b/network/haproxy/syslog.example
@@ -0,0 +1,20 @@
+# Note: If you enable local0 logging. You'll probably want to add
+# something like local0.none to your /etc/syslogd.conf
+#
+# Otherwise the logs will be sent to your /var/log/messages file
+# as well as the logfile specified below.
+#
+# An example would be to change the default line
+#
+# authpriv.none;cron.none;mail.none;news.none    -/var/log/messages
+# to
+# authpriv.none;cron.none;mail.none;news.none;local0.none -/var/log/messages
+# 
+# Move this file to /etc/syslog.d/ with .conf extension
+# so syslog will load it automatically.
+#
+# Also remember to restart sysklogd
+# sh /etc/rc.d/rc.syslog restart
+#
+
+local0.*                -/var/log/haproxy
diff --git a/network/haskell-network-multicast/README b/network/haskell-network-multicast/README
new file mode 100644
index 0000000000..32225afa20
--- /dev/null
+++ b/network/haskell-network-multicast/README
@@ -0,0 +1,5 @@
+The Network.Multicast module is for sending UDP datagrams over
+multicast (class D) addresses.
+
+Network.Multicast 0.2.0 is the last version compatible with
+Network < 2.7, that doesn't require an explicit install of Network.BSD.
diff --git a/network/haskell-network-multicast/doinst.sh b/network/haskell-network-multicast/doinst.sh
new file mode 100644
index 0000000000..3268c238bf
--- /dev/null
+++ b/network/haskell-network-multicast/doinst.sh
@@ -0,0 +1 @@
+chroot . /usr/bin/ghc-pkg recache
diff --git a/network/haskell-network-multicast/haskell-network-multicast.SlackBuild b/network/haskell-network-multicast/haskell-network-multicast.SlackBuild
new file mode 100644
index 0000000000..6737f142c0
--- /dev/null
+++ b/network/haskell-network-multicast/haskell-network-multicast.SlackBuild
@@ -0,0 +1,120 @@
+#!/bin/bash
+
+# Slackware build script for haskell-network-multicast
+
+# Copyright 2020 Jan-willem De Bleser, Pasadena, CA, 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=haskell-network-multicast
+VERSION=${VERSION:-0.3.2}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+SRCNAM="$( echo $PRGNAM | cut -d- -f2- )"
+
+GHC_VERSION=$(ghc --numeric-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"
+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" \
+CXXFLAGS="$SLKCFLAGS" \
+runghc Setup configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --libsubdir=ghc-${GHC_VERSION}/$SRCNAM-$VERSION \
+  --enable-shared \
+  --enable-library-profiling \
+  --docdir=/usr/doc/$PRGNAM-$VERSION
+
+runghc Setup build
+runghc Setup haddock
+runghc Setup copy --destdir=$PKG
+runghc Setup register --gen-pkg-config
+
+PKGCONFD=/usr/lib${LIBDIRSUFFIX}/ghc-${GHC_VERSION}/package.conf.d
+PKGID=$( grep -E "^id: " $SRCNAM-$VERSION.conf | cut -d" " -f2 )
+mkdir -p $PKG/$PKGCONFD
+mv $SRCNAM-$VERSION.conf $PKG/$PKGCONFD/$PKGID.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 \
+  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/network/haskell-network-multicast/haskell-network-multicast.info b/network/haskell-network-multicast/haskell-network-multicast.info
new file mode 100644
index 0000000000..048dc7c1f9
--- /dev/null
+++ b/network/haskell-network-multicast/haskell-network-multicast.info
@@ -0,0 +1,10 @@
+PRGNAM="haskell-network-multicast"
+VERSION="0.3.2"
+HOMEPAGE="https://hackage.haskell.org/package/network-multicast"
+DOWNLOAD="https://hackage.haskell.org/package/network-multicast-0.3.2/network-multicast-0.3.2.tar.gz"
+MD5SUM="4a11d42da0026bc4cceafd10fca0b9f8"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="haskell-network-bsd"
+MAINTAINER="Jan-willem De Bleser"
+EMAIL="jw@thescrapyard.org"
diff --git a/network/haskell-network-multicast/slack-desc b/network/haskell-network-multicast/slack-desc
new file mode 100644
index 0000000000..62385865f5
--- /dev/null
+++ b/network/haskell-network-multicast/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+                         |-----handy-ruler------------------------------------------------------|
+haskell-network-multicast: haskell-network-multicast (multicast module)
+haskell-network-multicast:
+haskell-network-multicast: The Network.Multicast module is for sending UDP datagrams over
+haskell-network-multicast: multicast (class D) addresses.
+haskell-network-multicast:
+haskell-network-multicast:
+haskell-network-multicast:
+haskell-network-multicast:
+haskell-network-multicast:
+haskell-network-multicast: https://hackage.haskell.org/package/network-multicast
+haskell-network-multicast:
diff --git a/network/havp/README b/network/havp/README
index 3b5160bab4..b07c07c49e 100644
--- a/network/havp/README
+++ b/network/havp/README
@@ -1,7 +1,8 @@
-HAVP (HTTP Antivirus Proxy) is a proxy with a ClamAV anti-virus scanner.
-The main aims are continuous, non-blocking downloads and smooth scanning
-of dynamic and password protected HTTP traffic. Havp antivirus proxy has
-a parent and transparent proxy mode. It can be used with squid or standalone. 
+HAVP (HTTP Antivirus Proxy) is a proxy with a ClamAV anti-virus
+scanner.  The main aims are continuous, non-blocking downloads and
+smooth scanning of dynamic and password protected HTTP traffic. Havp
+antivirus proxy has a parent and transparent proxy mode. It can be
+used with squid or standalone.
 
 This requires mandatory locks on the scanning find system unless you
 add --disable-locking to the configuration (enabled by default for
diff --git a/network/havp/havp.SlackBuild b/network/havp/havp.SlackBuild
index 8cc825cd1c..d4480368c0 100644
--- a/network/havp/havp.SlackBuild
+++ b/network/havp/havp.SlackBuild
@@ -1,29 +1,39 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for HAVP
 
 # Written by William Bowman <wilbowma@indiana.edu>
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=havp
-VERSION=${VERSION:-0.92a}
+VERSION=${VERSION:-0.93}
 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,8 @@ find -L . \
 patch -p1 < $CWD/patches/fixup_and_install_init_script.diff
 patch -p1 < $CWD/patches/use_clamav_group_by_default.diff
 patch -p1 < $CWD/patches/put_templates_in_usrshare.diff
-patch -p1 < $CWD/patches/use_vartmphavp_for_tempdir.diff
+
+patch -p0 < $CWD/patches/patch-havp_scanners_clamlibscanner_cpp
 
 CFLAGS="$SLKCFLAGS"
 ./configure \
@@ -110,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/network/havp/havp.info b/network/havp/havp.info
index f777e20752..88f3755561 100644
--- a/network/havp/havp.info
+++ b/network/havp/havp.info
@@ -1,8 +1,8 @@
 PRGNAM="havp"
-VERSION="0.92a"
+VERSION="0.93"
 HOMEPAGE="https://sourceforge.net/projects/havp/"
-DOWNLOAD="https://downloads.sourceforge.net/havp/havp-0.92a.tar.gz"
-MD5SUM="f9a37411116eceea579b9034c5fa8a69"
+DOWNLOAD="https://downloads.sourceforge.net/havp/havp-0.93.tar.gz"
+MD5SUM="0bfac9d9b12a3bdc33759691e67ccb7f"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="clamav"
diff --git a/network/havp/patches/patch-havp_scanners_clamlibscanner_cpp b/network/havp/patches/patch-havp_scanners_clamlibscanner_cpp
new file mode 100644
index 0000000000..fb6b1174c5
--- /dev/null
+++ b/network/havp/patches/patch-havp_scanners_clamlibscanner_cpp
@@ -0,0 +1,64 @@
+# clamav 1.0.0 mostly uses cl_error_t (aka unsigned int) for
+# returning error values, change type to match
+#
+# ...except cl_statchkdir, which returns cl_error_t type values
+# but is still an int, so bodge around that
+
+Index: havp/scanners/clamlibscanner.cpp
+--- havp/scanners/clamlibscanner.cpp.orig
++++ havp/scanners/clamlibscanner.cpp
+@@ -22,7 +22,7 @@ extern int LL;
+ bool ClamLibScanner::InitDatabase()
+ {
+     unsigned int sigs = 0;
+-    int ret;
++    cl_error_t ret;
+     if (LL>2) cl_debug();
+ 
+ #ifdef CL_INIT_DEFAULT
+@@ -118,9 +118,10 @@ bool ClamLibScanner::InitDatabase()
+ 
+ int ClamLibScanner::ReloadDatabase()
+ {
+-    int ret = cl_statchkdir(&dbstat);
++    cl_error_t ret;
++    int reti = cl_statchkdir(&dbstat);
+ 
+-    if ( ret == 1 )
++    if ( reti == 1 )
+     {
+         unsigned int sigs = 0;
+         struct cl_settings *settings = NULL;
+@@ -191,9 +192,9 @@ int ClamLibScanner::ReloadDatabase()
+ 
+         return 1;
+     }
+-    else if ( ret != 0 )
++    else if ( reti != 0 )
+     {
+-        LogFile::ErrorMessage("ClamAV: Error on database check: %s\n", cl_strerror(ret));
++        LogFile::ErrorMessage("ClamAV: Error on database check\n");
+     }
+ 
+     return 0;
+@@ -203,9 +204,9 @@ int ClamLibScanner::ReloadDatabase()
+ string ClamLibScanner::Scan( const char *FileName )
+ {
+ #ifdef CL_INIT_DEFAULT
+-    int ret = cl_scanfile(FileName, &virname, NULL, engine, &cl_options);
++    cl_error_t ret = cl_scanfile(FileName, &virname, NULL, engine, &cl_options);
+ #else
+-    int ret = cl_scanfile(FileName, &virname, NULL, engine, &limits, scanopts);
++    cl_error_t ret = cl_scanfile(FileName, &virname, NULL, engine, &limits, scanopts);
+ #endif
+ 
+     //Clean?
+@@ -240,7 +241,7 @@ string ClamLibScanner::Scan( const char *FileName )
+ void ClamLibScanner::FreeDatabase()
+ {
+ #ifdef CL_INIT_DEFAULT
+-    int ret = cl_engine_free(engine);
++    cl_error_t ret = cl_engine_free(engine);
+     if ( ret != CL_SUCCESS )
+     {
+         LogFile::ErrorMessage("ClamAV: cl_engine_free() failed: %s\n", cl_strerror(ret));
diff --git a/network/havp/patches/use_vartmphavp_for_tempdir.diff b/network/havp/patches/use_vartmphavp_for_tempdir.diff
deleted file mode 100644
index b114afdca1..0000000000
--- a/network/havp/patches/use_vartmphavp_for_tempdir.diff
+++ /dev/null
@@ -1,26 +0,0 @@
-Set the working dir (TEMPDIR) to /var/tmp/havp instead of /var/tmp
-
-diff -Nur havp-0.92a.orig/etc/havp/havp.config.in havp-0.92a/etc/havp/havp.config.in
---- havp-0.92a.orig/etc/havp/havp.config.in	2011-12-20 22:08:18.907739050 -0600
-+++ havp-0.92a/etc/havp/havp.config.in	2011-12-20 22:08:55.267259030 -0600
-@@ -120,7 +120,7 @@
- # Needs to be writable by HAVP user. Use ramdisk for best performance.
- #
- # Default:
--# TEMPDIR /var/tmp
-+# TEMPDIR /var/tmp/havp
- 
- #
- # HAVP reloads scanners virus database by receiving a signal
-diff -Nur havp-0.92a.orig/havp/params.cpp havp-0.92a/havp/params.cpp
---- havp-0.92a.orig/havp/params.cpp	2010-04-02 08:32:42.000000000 -0500
-+++ havp-0.92a/havp/params.cpp	2011-12-20 22:08:44.061406971 -0600
-@@ -70,7 +70,7 @@
-     SetConfig("WHITELIST",	WHITELISTFILE);
-     SetConfig("BLACKLIST",	BLACKLISTFILE);
-     SetConfig("TEMPLATEPATH",	TEMPLATEPATH);
--    SetConfig("TEMPDIR",	"/var/tmp");
-+    SetConfig("TEMPDIR",	"/var/tmp/havp");
-     SetConfig("SCANTEMPFILE",	"/var/tmp/havp/havp-XXXXXX");
-     SetConfig("PIDFILE",	PIDFILE);
-     SetConfig("TRANSPARENT",	"false");
diff --git a/network/heimdal/README b/network/heimdal/README
index 41e6e229b2..3031fa264f 100644
--- a/network/heimdal/README
+++ b/network/heimdal/README
@@ -8,5 +8,3 @@ Heimdal is a free implementation of Kerberos 5. The goals are to:
 * include the most important and useful application programs
   (rsh, telnet, popper, etc.)
 * include enough backwards compatibility with Kerberos V4
-
-This package conflicts with krb5.
diff --git a/network/heimdal/config/heimdal.sh b/network/heimdal/config/heimdal.sh
new file mode 100644
index 0000000000..fd3f0bdba4
--- /dev/null
+++ b/network/heimdal/config/heimdal.sh
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+export PATH=/usr/heimdal/bin:/usr/heimdal/sbin:$PATH
+export MANPATH=/usr/heimdal/man:$MANPATH
diff --git a/network/heimdal/config/rc.ipropd-master b/network/heimdal/config/rc.ipropd-master
index 744943b4c5..054048c440 100644
--- a/network/heimdal/config/rc.ipropd-master
+++ b/network/heimdal/config/rc.ipropd-master
@@ -3,9 +3,9 @@
 HOSTNAME=`hostname -f`
 
 ipropd_master_start() {
-  if [ -x /usr/libexec/ipropd-master ]; then
-    echo "Starting the ipropd-master service: /usr/libexec/ipropd-master --detach"
-    /usr/libexec/ipropd-master --detach --hostname=$HOSTNAME
+  if [ -x /usr/heimdal/libexec/ipropd-master ]; then
+    echo "Starting the ipropd-master service: /usr/heimdal/libexec/ipropd-master --detach"
+    /usr/heimdal/libexec/ipropd-master --detach --hostname=$HOSTNAME
   fi
 }
 
diff --git a/network/heimdal/config/rc.ipropd-slave b/network/heimdal/config/rc.ipropd-slave
index 6b1a8c7274..9364430e07 100644
--- a/network/heimdal/config/rc.ipropd-slave
+++ b/network/heimdal/config/rc.ipropd-slave
@@ -4,9 +4,9 @@ KEYTAB=/etc/iprop.keytab
 HOSTNAME=`hostname -f`
 
 ipropd_slave_start() {
-  if [ -x /usr/libexec/ipropd-slave ]; then
-    echo "Starting the ipropd-slave service: /usr/libexec/ipropd-slave --detach"
-    /usr/libexec/ipropd-slave --detach --keytab=$KEYTAB --hostname=$HOSTNAME
+  if [ -x /usr/heimdal/libexec/ipropd-slave ]; then
+    echo "Starting the ipropd-slave service: /usr/heimdal/libexec/ipropd-slave --detach"
+    /usr/heimdal/libexec/ipropd-slave --detach --keytab=$KEYTAB --hostname=$HOSTNAME
   fi
 }
 
diff --git a/network/heimdal/config/rc.kadmind b/network/heimdal/config/rc.kadmind
index 23b5447078..4487b492bc 100644
--- a/network/heimdal/config/rc.kadmind
+++ b/network/heimdal/config/rc.kadmind
@@ -1,9 +1,9 @@
 #!/bin/sh
 
 kadmind_start() {
-  if [ -x /usr/libexec/kadmind ]; then
-    echo "Starting the kadmind service: /usr/libexec/kadmind"
-    /usr/libexec/kadmind --detach
+  if [ -x /usr/heimdal/libexec/kadmind ]; then
+    echo "Starting the kadmind service: /usr/heimdal/libexec/kadmind"
+    /usr/heimdal/libexec/kadmind --detach
   fi
 }
 
diff --git a/network/heimdal/config/rc.kdc b/network/heimdal/config/rc.kdc
index 3233794801..09c9f37827 100644
--- a/network/heimdal/config/rc.kdc
+++ b/network/heimdal/config/rc.kdc
@@ -1,9 +1,9 @@
 #!/bin/sh
 
 kdc_start() {
-  if [ -x /usr/libexec/kdc ]; then
-    echo "Starting the kdc service: /usr/libexec/kdc --detach"
-    /usr/libexec/kdc --detach
+  if [ -x /usr/heimdal/libexec/kdc ]; then
+    echo "Starting the kdc service: /usr/heimdal/libexec/kdc --detach"
+    /usr/heimdal/libexec/kdc --detach
   fi
 }
 
diff --git a/network/heimdal/config/rc.kpasswdd b/network/heimdal/config/rc.kpasswdd
index f712ee8e45..793d3d2094 100644
--- a/network/heimdal/config/rc.kpasswdd
+++ b/network/heimdal/config/rc.kpasswdd
@@ -1,9 +1,9 @@
 #!/bin/sh
 
 kpasswdd_start() {
-  if [ -x /usr/libexec/kpasswdd ]; then
-    echo "Starting the kpasswdd service: /usr/libexec/kpasswdd"
-    /usr/libexec/kpasswdd --detach
+  if [ -x /usr/heimdal/libexec/kpasswdd ]; then
+    echo "Starting the kpasswdd service: /usr/heimdal/libexec/kpasswdd"
+    /usr/heimdal/libexec/kpasswdd --detach
   fi
 }
 
diff --git a/network/heimdal/doinst.sh b/network/heimdal/doinst.sh
index 3176f057e6..37eaf64c5d 100644
--- a/network/heimdal/doinst.sh
+++ b/network/heimdal/doinst.sh
@@ -23,10 +23,15 @@ preserve_perms() {
 }
 
 preserve_perms etc/rc.d/rc.kdc.new
-preserve_perms etc/rc.d/rc.kadmind.new
+preserve_perms etc/rc.d/rc.kadmind-heimdal.new
 preserve_perms etc/rc.d/rc.kpasswdd.new
 preserve_perms etc/rc.d/rc.ipropd-master.new
 preserve_perms etc/rc.d/rc.ipropd-slave.new
 config etc/krb5.conf.new
+config etc/profile.d/heimdal.sh.new
 config var/heimdal/kdc.conf.new
 config var/heimdal/kadmind.acl.new
+
+if [ ! "$(grep /usr/heimdal/lib@LIBDIRSUFFIX@ /etc/ld.so.conf)" ]; then
+  echo "/usr/heimdal/lib@LIBDIRSUFFIX@" >> /etc/ld.so.conf
+fi
diff --git a/network/heimdal/heimdal.SlackBuild b/network/heimdal/heimdal.SlackBuild
index bd245ba65d..1b4d389115 100644
--- a/network/heimdal/heimdal.SlackBuild
+++ b/network/heimdal/heimdal.SlackBuild
@@ -1,9 +1,9 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for KTH Heimdal Kerberos
 
-# Copyright 2010 Menno Duurma
-# Copyright 2011-2018 Thibaut Notteboom, Paris, FRANCE
+# Copyright 2010 Menno Duursma
+# Copyright 2011-2023 Thibaut Notteboom, Paris, FRANCE
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -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.
 
+# 20220322 bkw: Modified by SlackBuilds.org: fix 32-bit build.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=heimdal
-VERSION=${VERSION:-7.5.0}
+VERSION=${VERSION:-7.8.0}
 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}
@@ -50,6 +59,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=""
@@ -66,57 +78,69 @@ cd $PRGNAM-$VERSION
 chown -R root: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 {} \+
+
+# 20220322 bkw: disable 2 of the unit tests that won't work on 32-bit,
+# because they rely on pre-generated certificates whose expiration
+# dates are ~500 years in the future (meaning past 2038, meaning a
+# 32-bit time_t can't handle it). This has been a known issue upstream
+# since at least 2019: https://github.com/heimdal/heimdal/issues/533
+[ -z "$LIBDIRSUFFIX" ] && \
+  sed -i '/^[\t ]*test_c\(hain\|ms\)[\t ]/d' lib/hx509/Makefile.??
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
-LDFLAGS="-lpthread" \
 ./configure \
-  --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --prefix=/usr/heimdal \
+  --libdir=/usr/heimdal/lib${LIBDIRSUFFIX} \
   --sysconfdir=/etc \
   --localstatedir=/var \
   --infodir=/usr/info \
-  --mandir=/usr/man \
+  --mandir=/usr/heimdal/man \
   --docdir=/usr/doc/$PRGNAM-$VERSION \
   --with-openldap=/usr \
-  --with-readline=/usr \
+  --with-libedit=/usr \
   --with-sqlite3=/usr \
-  --with-berkeley-db-include=/usr/include/db48 \
+  --with-libintl=/usr \
   --with-x \
   --with-ipv6 \
   --without-hesiod \
   --enable-kcm \
   --enable-pthread-support \
+  --enable-pk-init \
   --disable-otp \
   --disable-static \
   --build=$ARCH-slackware-linux
 
 make
-make -j1 check
+#make -j1 check
 make install-strip DESTDIR=$PKG
 
 mkdir -p $PKG/etc/rc.d
 cat $CWD/config/krb5.conf > $PKG/etc/krb5.conf.new
 cat $CWD/config/rc.kdc > $PKG/etc/rc.d/rc.kdc.new
-cat $CWD/config/rc.kadmind > $PKG/etc/rc.d/rc.kadmind.new
+cat $CWD/config/rc.kadmind > $PKG/etc/rc.d/rc.kadmind-heimdal.new
 cat $CWD/config/rc.kpasswdd > $PKG/etc/rc.d/rc.kpasswdd.new
 cat $CWD/config/rc.ipropd-master > $PKG/etc/rc.d/rc.ipropd-master.new
 cat $CWD/config/rc.ipropd-slave > $PKG/etc/rc.d/rc.ipropd-slave.new
 
+mkdir -p $PKG/etc/profile.d
+cat $CWD/config/heimdal.sh > $PKG/etc/profile.d/heimdal.sh.new
+
 mkdir -p $PKG/var/heimdal
 cat $CWD/config/kdc.conf > $PKG/var/heimdal/kdc.conf.new
 cat $CWD/config/kadmind.acl > $PKG/var/heimdal/kadmind.acl.new
 
-rm -rf $PKG/usr/man/cat?
-find $PKG/usr/man -type f -exec gzip -9 -f {} \;
+rm -f $PKG/{,usr/}heimdal/lib/*.la
+
+rm -rf $PKG/usr/heimdal/man/cat?
+find $PKG/usr/heimdal/man -type f -exec gzip -9 -f {} \;
 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/*
-( cd $PKG/usr/info ; ln -s heimdal.info.gz heimdal )
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
@@ -126,7 +150,8 @@ cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
-cat $CWD/doinst.sh > $PKG/install/doinst.sh
+sed -e "s|@LIBDIRSUFFIX@|$LIBDIRSUFFIX|" \
+  $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/network/heimdal/heimdal.info b/network/heimdal/heimdal.info
index f32d0b43ad..4c0c46b21e 100644
--- a/network/heimdal/heimdal.info
+++ b/network/heimdal/heimdal.info
@@ -1,8 +1,8 @@
 PRGNAM="heimdal"
-VERSION="7.5.0"
+VERSION="7.8.0"
 HOMEPAGE="http://www.h5l.org"
-DOWNLOAD="https://github.com/heimdal/heimdal/releases/download/heimdal-7.5.0/heimdal-7.5.0.tar.gz"
-MD5SUM="558f13b9d352750ab770f8ee7111ff0e"
+DOWNLOAD="https://github.com/heimdal/heimdal/releases/download/heimdal-7.8.0/heimdal-7.8.0.tar.gz"
+MD5SUM="2389c0ad22f2cc2bbef7b27a090d27b5"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/network/heimdal/slack-desc b/network/heimdal/slack-desc
index 417279b350..07b754ca40 100644
--- a/network/heimdal/slack-desc
+++ b/network/heimdal/slack-desc
@@ -16,4 +16,4 @@ heimdal: (key distribution center) ``kerberized'' versions of programs such
 heimdal: as such as login and ftp/ftpd , telnet/telnetd and administration
 heimdal: utilities such as ``klist'' and ``kadmin''. krb and GSSAPI libs.
 heimdal:
-heimdal: This package conflicts with krb5.
+heimdal:
diff --git a/network/hiawatha/README b/network/hiawatha/README
index 6f6e655e59..094e670fb1 100644
--- a/network/hiawatha/README
+++ b/network/hiawatha/README
@@ -1,12 +1,12 @@
-Hiawatha (A secure and advanced Web server)
+Hiawatha (A secure and advanced webserver)
 
-Hiawatha is a Web server for Unix and has been built with security
-in mind. This resulted in a highly secure Web server, in both code
-and features.
+Hiawatha is a web server for Unix and has been built with security in
+mind. This resulted in a highly secure web server, in both code and
+features.
 
-Hiawatha supports many Web and HTTP features such as
-CGI/FASTCGI, HTTP authentication, virtual host support, request
-pipelining, keep alive connections, URL rewriting and many more.
+Hiawatha supports many web and HTTP features such as CGI/FASTCGI, HTTP
+authentication, virtual host support, request pipelining, keep alive
+connections, URL rewriting and many more.
 
 Notes:
 
@@ -21,9 +21,9 @@ Notes:
 
   * Hiawatha's daemon will listen on the network interface
     127.0.0.1:80, and it can write temporary files inside
-        /var/db/hiawatha
+    /var/db/hiawatha
 
-  * The Web root directory is /var/hiawatha with index.html being
+  * The web root directory is /var/hiawatha with index.html being
     the default start file.
 
 Hiawatha's documentation can be found at the following URL:
diff --git a/network/hiawatha/hiawatha.SlackBuild b/network/hiawatha/hiawatha.SlackBuild
index b4315d65df..6d6929996b 100644
--- a/network/hiawatha/hiawatha.SlackBuild
+++ b/network/hiawatha/hiawatha.SlackBuild
@@ -1,10 +1,9 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for hiawatha
 
-# Copyright 2018-2019 Donald Cooley South Haven, Indiana USA
-# Copyright (c) 2009-2012, Antonio Hernández Blas <hba.nihilismus@gmail.com>
-# Copyright (c) 2014,      Antonio Hernández Blas <hba.nihilismus@gmail.com>
+# Copyright 2018-2020 Donald Cooley South Haven, Indiana, USA
+# Copyright (c) 2009-2012, 2014 Antonio Hernández Bls
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -23,10 +22,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=hiawatha
-VERSION=${VERSION:-10.9}
+VERSION=${VERSION:-10.10}
 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}
@@ -87,11 +96,10 @@ cd build
     -DWORK_DIR=/var/db/$PRGNAM \
     -DCMAKE_BUILD_TYPE=Release \
     -DENABLE_CACHE=on \
-    -DENABLE_IPV6=on \
     -DENABLE_MONITOR=on \
     -DENABLE_RPROXY=on \
-    -DENABLE_TOMAHAWK=on \
     -DENABLE_TLS=on \
+    -DENABLE_TOMAHAWK=on \
     -DENABLE_TOOLKIT=on \
     -DENABLE_XSLT=on \
     ..
@@ -103,9 +111,6 @@ cd ..
 sed -i 's/^#ServerId/ServerId/' $PKG/etc/$PRGNAM/$PRGNAM.conf
 sed -i "s/www-data/$PRGNAM:$PRGNAM/" $PKG/etc/$PRGNAM/$PRGNAM.conf
 
-# Change PHP version from 7 to 5 to match version in Slackware*-14.2
-sed -i -r -e 's/PHP7/PHP5/g' -e 's/php7/php5/g' $PKG/etc/$PRGNAM/$PRGNAM.conf
-
 # Install init scipts
 mkdir -p $PKG/etc/rc.d/
 install -m 0644 $CWD/rc.$PRGNAM $PKG/etc/rc.d/rc.$PRGNAM
@@ -116,14 +121,16 @@ 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/doc/$PRGNAM-$VERSION/extra
+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
 
-cat extra/newroot > $PKG/usr/doc/$PRGNAM-$VERSION/extra/newroot
-
-mkdir -p $PKG/usr/share/$PRGNAM
-tar -caf $PKG/usr/share/$PRGNAM/letsencrypt.tar.gz extra/letsencrypt/*
+mkdir -p $PKG/usr/share/$PRGNAM/extra
+cat extra/newroot > $PKG/usr/share/$PRGNAM/extra/newroot
+tar -caf $PKG/usr/share/$PRGNAM/extra/letsencrypt.tar.gz extra/letsencrypt/*
+cp -a extra/{*.xml,index.html,*.in,tls*} \
+  	$PKG/usr/share/$PRGNAM/extra/
+cp -a extra/nghttp2.tgz $PKG/usr/share/$PRGNAM/extra/
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
@@ -142,4 +149,4 @@ do
 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/network/hiawatha/hiawatha.info b/network/hiawatha/hiawatha.info
index a88fc79c20..8016841a33 100644
--- a/network/hiawatha/hiawatha.info
+++ b/network/hiawatha/hiawatha.info
@@ -1,8 +1,8 @@
 PRGNAM="hiawatha"
-VERSION="10.9"
+VERSION="10.10"
 HOMEPAGE="https://www.hiawatha-webserver.org"
-DOWNLOAD="https://www.hiawatha-webserver.org/files/hiawatha-10.9.tar.gz"
-MD5SUM="83aa447f187c33968bee9dfac3011718"
+DOWNLOAD="https://www.hiawatha-webserver.org/files/hiawatha-10.10.tar.gz"
+MD5SUM="3bf2c12c7037ecc3dfdbec72e7a2f04f"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/network/hiawatha/slack-desc b/network/hiawatha/slack-desc
index 5a44668542..05db98aa46 100644
--- a/network/hiawatha/slack-desc
+++ b/network/hiawatha/slack-desc
@@ -6,14 +6,14 @@
 # customary to leave one space after the ':' except on otherwise blank lines.
 
         |-----handy-ruler------------------------------------------------------|
-hiawatha: hiawatha (A secure and advanced Web server)
+hiawatha: hiawatha (A secure and advanced web server)
 hiawatha:
-hiawatha: Hiawatha is a Web server for Unix and has been built with security
-hiawatha: in mind. This resulted in a highly secure Web server, in both code
-hiawatha: and features.
+hiawatha: Hiawatha is a web server for Unix and has been built with security in
+hiawatha: mind. This resulted in a highly secure web server, in both code and
+hiawatha: features.
 hiawatha:
-hiawatha: Hiawatha supports many web and HTTP features such as
-hiawatha: CGI/FastCGI, HTTP authentication, virtual host support, request
-hiawatha: pipelining, keep alive connections, URL rewriting and many more.
+hiawatha: Hiawatha supports many web and HTTP features such as CGI/FastCGI,
+hiawatha: HTTP authentication, virtual host support, request pipelining, keep
+hiawatha: alive connections, URL rewriting and many more.
 hiawatha:
 hiawatha: Homepage: https://www.hiawatha-webserver.org
diff --git a/network/hipchat/README b/network/hipchat/README
deleted file mode 100644
index 9c62cb30be..0000000000
--- a/network/hipchat/README
+++ /dev/null
@@ -1,7 +0,0 @@
-Hipchat is a private group messaging service with support for video
-chat, group screen sharing, and file sharing.
-
-This script repackages the Debian package provided by Atlassian.
-
-Note that only a 64 bit version is available. For an old 32 bit version
-of HipChat, see the hipchat2 SlackBuild.
diff --git a/network/hipchat/hipchat.SlackBuild b/network/hipchat/hipchat.SlackBuild
deleted file mode 100644
index bb7aa5056e..0000000000
--- a/network/hipchat/hipchat.SlackBuild
+++ /dev/null
@@ -1,80 +0,0 @@
-#!/bin/sh
-
-# Generated by Alien's SlackBuild Toolkit: http://slackware.com/~alien/AST
-# Copyright 2009, 2010, 2011, 2012, 2013  Eric Hameleers, Eindhoven, Netherlands
-# Slackware build script for hipchat
-# Written by Lionel Young <lionelyoung@gmail.com>
-# Based on http://slackbuilds.org/template.SlackBuild
-# Maintained by Ryan P.C. McQuen <ryanpcmcquen@member.fsf.org> 2014-2017
-
-# Alan Dingeldein | Canyon Lake, TX | kd5zex@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/>.
-
-PRGNAM=hipchat
-VERSION=${VERSION:-4.29.4.1662}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-SRCNAM=HipChat4
-
-if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-    i?86) export ARCH=i686 ;;
-    arm*) export ARCH=arm ;;
-       *) export ARCH=$( uname -m ) ;;
-  esac
-fi
-
-CWD=$(pwd)
-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/$SRCNAM-${VERSION}-Linux.deb data.tar.gz | tar xvz
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -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 symlinks in /usr/bin
-mkdir -p $PKG/usr/bin
-ln -s /opt/hipchat/bin/hipchat $PKG/usr/bin/hipchat
-
-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/network/hipchat/hipchat.info b/network/hipchat/hipchat.info
deleted file mode 100644
index 180571f5bf..0000000000
--- a/network/hipchat/hipchat.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="hipchat"
-VERSION="4.29.4.1662"
-HOMEPAGE="http://www.hipchat.com/#linux"
-DOWNLOAD="UNSUPPORTED"
-MD5SUM=""
-DOWNLOAD_x86_64="https://atlassian.artifactoryonline.com/atlassian/hipchat-apt-client/pool/HipChat4-4.29.4.1662-Linux.deb"
-MD5SUM_x86_64="5e6731ba4a47f5c7281c18d9baf09eaa"
-REQUIRES=""
-MAINTAINER="Alan Dingeldein"
-EMAIL="kd5zex@gmail.com"
diff --git a/network/hipchat/slack-desc b/network/hipchat/slack-desc
deleted file mode 100644
index 256dad5682..0000000000
--- a/network/hipchat/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------------------------------------------------------|
-hipchat: hipchat (private group messaging)
-hipchat:
-hipchat: HipChat is a private group messaging service with support for video
-hipchat: chat, group screen sharing, and file sharing.
-hipchat:
-hipchat: This script repackages the Debian package provided by Atlassian.
-hipchat:
-hipchat: Note that only a 64 bit version is available. For an old 32 bit
-hipchat: version of HipChat, see the hipchat2 SlackBuild.
-hipchat:
-hipchat:
diff --git a/network/hipchat2/README b/network/hipchat2/README
deleted file mode 100644
index 7fbf0e8b62..0000000000
--- a/network/hipchat2/README
+++ /dev/null
@@ -1,4 +0,0 @@
-Hipchat is a private group messaging service.
-
-This SlackBuild packages an old version of HipChat for 32-bit users.
-64-bit users should use the 'hipchat' SlackBuild instead.
diff --git a/network/hipchat2/hipchat2.SlackBuild b/network/hipchat2/hipchat2.SlackBuild
deleted file mode 100644
index b218763b71..0000000000
--- a/network/hipchat2/hipchat2.SlackBuild
+++ /dev/null
@@ -1,79 +0,0 @@
-#!/bin/sh
-
-# Generated by Alien's SlackBuild Toolkit: http://slackware.com/~alien/AST
-# Copyright 2009, 2010, 2011, 2012, 2013  Eric Hameleers, Eindhoven, Netherlands
-# Slackware build script for hipchat2
-# Written by Lionel Young <lionelyoung@gmail.com>
-# Based on http://slackbuilds.org/template.SlackBuild
-# Maintained by Ryan P.C. McQuen <ryanpcmcquen@member.fsf.org> 2014-2017
-
-# Alan Dingeldein | Canyon Lake, TX | kd5zex@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/>.
-
-PRGNAM=hipchat2
-VERSION=${VERSION:-2.2.1388}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-SRCNAM=hipchat
-
-if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-    i?86) export ARCH=i686 ;;
-    arm*) export ARCH=arm ;;
-       *) export 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
-
-tar xvf $CWD/$SRCNAM-$VERSION-$ARCH.pkg.tar.xz -C $PKG
-chown -R root:root $PKG
-
-# Create missing symlink for cert
-mkdir -p $PKG/etc/ssl/certs
-ln -s DigiCert_High_Assurance_EV_Root_CA.pem $PKG/etc/ssl/certs/81b9768f.0
-
-# Fix permissions on libraries
-find $PKG -name "*\.so*" -type f -exec chmod 0755 {} \;
-
-# Remove some cruft
-rm -f $PKG/.PKGINFO
-
-find $PKG -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
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/network/hipchat2/hipchat2.info b/network/hipchat2/hipchat2.info
deleted file mode 100644
index 212d709fef..0000000000
--- a/network/hipchat2/hipchat2.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="hipchat2"
-VERSION="2.2.1388"
-HOMEPAGE="http://www.hipchat.com/linux"
-DOWNLOAD="http://downloads.hipchat.com/linux/arch/i686/hipchat-2.2.1388-i686.pkg.tar.xz"
-MD5SUM="f7fdc4df78071ecc8900a6f7109facd8"
-DOWNLOAD_x86_64="http://downloads.hipchat.com/linux/arch/x86_64/hipchat-2.2.1388-x86_64.pkg.tar.xz"
-MD5SUM_x86_64="b3c605ed18425ea680903d33a00ed0da"
-REQUIRES=""
-MAINTAINER="Alan Dingeldein"
-EMAIL="kd5zex@gmail.com"
diff --git a/network/hipchat2/slack-desc b/network/hipchat2/slack-desc
deleted file mode 100644
index 7bb368c576..0000000000
--- a/network/hipchat2/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------------------------------------------------------|
-hipchat2: hipchat2 (old version of HipChat for 32 bit users)
-hipchat2:
-hipchat2: HipChat is a private group messaging service.
-hipchat2:
-hipchat2: This SlackBuild packages an old version of HipChat for 32-bit users.
-hipchat2: 64-bit users should use the 'hipchat' SlackBuild instead.
-hipchat2:
-hipchat2: Home: http://www.hipchat.com/linux
-hipchat2:
-hipchat2:
-hipchat2:
diff --git a/network/host-sflow/README b/network/host-sflow/README
index b233078ed6..a805696a06 100644
--- a/network/host-sflow/README
+++ b/network/host-sflow/README
@@ -1,3 +1,11 @@
-The Host sFlow agent exports physical and virtual server performance metrics
-using the sFlow protocol. The agent provides scalable, multi-vendor, multi-OS
-performance monitoring with minimal impact on the systems being monitored.
+The Host sFlow agent exports physical and virtual server performance
+metrics using the sFlow protocol. The agent provides scalable,
+multi-vendor, multi-OS performance monitoring with minimal impact on
+the systems being monitored.
+
+To start hsflowd at boot, add something like this to your
+/etc/rc.d/rc.local:
+
+if [ -x /etc/rc.d/rc.hsflowd ]; then
+  /etc/rc.d/rc.hsflowd start
+fi
diff --git a/network/host-sflow/doinst.sh b/network/host-sflow/doinst.sh
index 00c3dd9dfa..83420b7d7c 100644
--- a/network/host-sflow/doinst.sh
+++ b/network/host-sflow/doinst.sh
@@ -22,5 +22,5 @@ preserve_perms() {
   config $NEW
 }
 
-preserve_perms etc/init.d/hsflowd
+preserve_perms etc/rc.d/rc.hsflowd.new
 config etc/hsflowd.conf.new
diff --git a/network/host-sflow/host-sflow.SlackBuild b/network/host-sflow/host-sflow.SlackBuild
index 813b854621..7c017930ce 100644
--- a/network/host-sflow/host-sflow.SlackBuild
+++ b/network/host-sflow/host-sflow.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for HOST-SFLOW
 
@@ -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.
 
+# 20230620 bkw: modified by SlackBuilds.org, BUILD=2:
+# - Install init script in Slackware standard location, and make it
+#   a proper .new config file.
+# - Mention the init script in README.
+
 # 02/Apr/2018 * First version
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=host-sflow
 VERSION=${VERSION:-2.0.15}
-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}
@@ -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 \
+  -o -perm 511 \) -exec chmod 755 {} \+ -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 {} \+
 
 # Soft-link in tarball causes x bit to be set below; nuke it
 rm -f $PRGNAM-$VERSION/README
@@ -98,6 +110,8 @@ 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
 
 mv $PKG/etc/hsflowd.conf $PKG/etc/hsflowd.conf.new
+mv $PKG/etc/init.d $PKG/etc/rc.d
+mv $PKG/etc/rc.d/hsflowd $PKG/etc/rc.d/rc.hsflowd.new
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a LICENSE README $PKG/usr/doc/$PRGNAM-$VERSION
@@ -108,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/network/hostapd/README b/network/hostapd/README
index 24cfefe967..258a947ed8 100644
--- a/network/hostapd/README
+++ b/network/hostapd/README
@@ -1,7 +1,7 @@
 hostapd - IEEE 802.11 AP, IEEE 802.1X/WPA/WPA2/EAP/RADIUS Authenticator
 
-hostapd is a user space daemon for access point and authentication servers.
-It implements IEEE 802.11 access point management, IEEE 802.1X/WPA/WPA2/EAP
-Authenticators, RADIUS client, EAP server, and RADIUS authentication server.
-The current version supports Linux (Host AP, madwifi, Prism54 drivers) and
-FreeBSD (net80211).
+hostapd is a user space daemon for access point and authentication
+servers.  It implements IEEE 802.11 access point management, IEEE
+802.1X/WPA/WPA2/EAP Authenticators, RADIUS client, EAP server, and
+RADIUS authentication server.  The current version supports Linux (Host
+AP, madwifi, Prism54 drivers) and FreeBSD (net80211).
diff --git a/network/hostapd/hostapd.SlackBuild b/network/hostapd/hostapd.SlackBuild
index 6a519a3787..ace2dcf921 100644
--- a/network/hostapd/hostapd.SlackBuild
+++ b/network/hostapd/hostapd.SlackBuild
@@ -1,10 +1,10 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for hostapd
 
 # Copyright 2008-2013  Murat D. Kadirov <banderols@gmail.com>
 # Copyright 2014-2016  LukenShiro, Italy
-# Copyright 2018 Brenton Earl <brent@exitstatusone.com>
+# Copyright 2018-2020 Brenton Earl <brent@exitstatusone.com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -26,10 +26,13 @@
 
 # Fixed doinst.sh by Mario Preksavec <mario@slackware.hr>
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=hostapd
-VERSION=${VERSION:-2.6}
-BUILD=${BUILD:-3}
+VERSION=${VERSION:-2.10}
+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}
@@ -53,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=""
@@ -75,14 +85,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 {} \;
 
-(cd ../src/
-for i in $CWD/patches/*.patch; do
-  patch -p2 < "$i"
-done)
-
+# Edit the defconfig to enable additional features
 cat $CWD/hostapd.defconfig > .config
 
-CFLAGS+="$SLKCFLAGS" make
+export CFLAGS+="$SLKCFLAGS"
+make
 
 mkdir -p \
   $PKG/usr/sbin/ \
@@ -118,4 +125,4 @@ cat $CWD/doinst.sh $DOINST_TMP > $PKG/install/doinst.sh
 rm -f $DOINST_TMP
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/network/hostapd/hostapd.defconfig b/network/hostapd/hostapd.defconfig
index 2faf7eff4b..e1bfff1f83 100644
--- a/network/hostapd/hostapd.defconfig
+++ b/network/hostapd/hostapd.defconfig
@@ -13,15 +13,14 @@
 CONFIG_DRIVER_HOSTAP=y
 
 # Driver interface for wired authenticator
-#CONFIG_DRIVER_WIRED=y
-
-# Driver interface for madwifi driver
-#CONFIG_DRIVER_MADWIFI=y
-#CFLAGS += -I../../madwifi # change to the madwifi source directory
+CONFIG_DRIVER_WIRED=y
 
 # Driver interface for drivers using the nl80211 kernel interface
 CONFIG_DRIVER_NL80211=y
 
+# QCA vendor extensions to nl80211
+CONFIG_DRIVER_NL80211_QCA=y
+
 # driver_nl80211.c requires libnl. If you are compiling it yourself
 # you may need to point hostapd to your version of libnl.
 #
@@ -32,7 +31,7 @@ CONFIG_DRIVER_NL80211=y
 #CONFIG_LIBNL20=y
 
 # Use libnl 3.2 libraries (if this is selected, CONFIG_LIBNL20 is ignored)
-#CONFIG_LIBNL32=y
+CONFIG_LIBNL32=y
 
 
 # Driver interface for FreeBSD net80211 layer (e.g., Atheros driver)
@@ -43,7 +42,7 @@ CONFIG_DRIVER_NL80211=y
 #LIBS_c += -L/usr/local/lib
 
 # Driver interface for no driver (e.g., RADIUS server only)
-CONFIG_DRIVER_NONE=y
+#CONFIG_DRIVER_NONE=y
 
 # IEEE 802.11F/IAPP
 CONFIG_IAPP=y
@@ -51,15 +50,18 @@ CONFIG_IAPP=y
 # WPA2/IEEE 802.11i RSN pre-authentication
 CONFIG_RSN_PREAUTH=y
 
-# PeerKey handshake for Station to Station Link (IEEE 802.11e DLS)
-CONFIG_PEERKEY=y
-
 # IEEE 802.11w (management frame protection)
 CONFIG_IEEE80211W=y
 
+# Support Operating Channel Validation
+#CONFIG_OCV=y
+
 # Integrated EAP server
 CONFIG_EAP=y
 
+# EAP Re-authentication Protocol (ERP) in integrated EAP server
+CONFIG_ERP=y
+
 # EAP-MD5 for the integrated EAP server
 CONFIG_EAP_MD5=y
 
@@ -95,28 +97,35 @@ CONFIG_EAP_PAX=y
 CONFIG_EAP_PSK=y
 
 # EAP-pwd for the integrated EAP server (secure authentication with a password)
-#CONFIG_EAP_PWD=y
+CONFIG_EAP_PWD=y
 
 # EAP-SAKE for the integrated EAP server
-#CONFIG_EAP_SAKE=y
+CONFIG_EAP_SAKE=y
 
 # EAP-GPSK for the integrated EAP server
-#CONFIG_EAP_GPSK=y
+CONFIG_EAP_GPSK=y
 # Include support for optional SHA256 cipher suite in EAP-GPSK
-#CONFIG_EAP_GPSK_SHA256=y
+CONFIG_EAP_GPSK_SHA256=y
 
 # EAP-FAST for the integrated EAP server
-# Note: If OpenSSL is used as the TLS library, OpenSSL 1.0 or newer is needed
-# for EAP-FAST support. Older OpenSSL releases would need to be patched, e.g.,
-# with openssl-0.9.8x-tls-extensions.patch, to add the needed functions.
 #CONFIG_EAP_FAST=y
 
+# EAP-TEAP for the integrated EAP server
+# Note: The current EAP-TEAP implementation is experimental and should not be
+# enabled for production use. The IETF RFC 7170 that defines EAP-TEAP has number
+# of conflicting statements and missing details and the implementation has
+# vendor specific workarounds for those and as such, may not interoperate with
+# any other implementation. This should not be used for anything else than
+# experimentation and interoperability testing until those issues has been
+# resolved.
+#CONFIG_EAP_TEAP=y
+
 # Wi-Fi Protected Setup (WPS)
 CONFIG_WPS=y
 # Enable UPnP support for external WPS Registrars
 CONFIG_WPS_UPNP=y
 # Enable WPS support with NFC config method
-#CONFIG_WPS_NFC=y
+CONFIG_WPS_NFC=y
 
 # EAP-IKEv2
 #CONFIG_EAP_IKEV2=y
@@ -133,16 +142,16 @@ CONFIG_PKCS12=y
 
 # RADIUS authentication server. This provides access to the integrated EAP
 # server from external hosts using RADIUS.
-CONFIG_RADIUS_SERVER=y
+#CONFIG_RADIUS_SERVER=y
 
 # Build IPv6 support for RADIUS operations
 CONFIG_IPV6=y
 
 # IEEE Std 802.11r-2008 (Fast BSS Transition)
-CONFIG_IEEE80211R=y
+#CONFIG_IEEE80211R=y
 
 # Use the hostapd's IEEE 802.11 authentication (ACL), but without
-# the IEEE 802.11 Management capability (e.g., madwifi or FreeBSD/net80211)
+# the IEEE 802.11 Management capability (e.g., FreeBSD/net80211)
 #CONFIG_DRIVER_RADIUS_ACL=y
 
 # IEEE 802.11n (High Throughput) support
@@ -153,7 +162,13 @@ CONFIG_IEEE80211N=y
 #CONFIG_WNM=y
 
 # IEEE 802.11ac (Very High Throughput) support
-CONFIG_IEEE80211AC=y
+#CONFIG_IEEE80211AC=y
+
+# IEEE 802.11ax HE support
+# Note: This is experimental and work in progress. The definitions are still
+# subject to change and this should not be expected to interoperate with the
+# final IEEE 802.11ax version.
+#CONFIG_IEEE80211AX=y
 
 # Remove debugging code that is printing out debug messages to stdout.
 # This can be used to reduce the size of the hostapd considerably if debugging
@@ -164,6 +179,9 @@ CONFIG_IEEE80211AC=y
 # Disabled by default.
 #CONFIG_DEBUG_FILE=y
 
+# Send debug messages to syslog instead of stdout
+#CONFIG_DEBUG_SYSLOG=y
+
 # Add support for sending all debug messages (regardless of debug verbosity)
 # to the Linux kernel tracing facility. This helps debug the entire stack by
 # making it easy to record everything happening from the driver up into the
@@ -241,10 +259,25 @@ CONFIG_IEEE80211AC=y
 # requirements described above.
 #CONFIG_NO_RANDOM_POOL=y
 
+# Should we attempt to use the getrandom(2) call that provides more reliable
+# yet secure randomness source than /dev/random on Linux 3.17 and newer.
+# Requires glibc 2.25 to build, falls back to /dev/random if unavailable.
+#CONFIG_GETRANDOM=y
+
+# Should we use poll instead of select? Select is used by default.
+#CONFIG_ELOOP_POLL=y
+
+# Should we use epoll instead of select? Select is used by default.
+#CONFIG_ELOOP_EPOLL=y
+
+# Should we use kqueue instead of select? Select is used by default.
+#CONFIG_ELOOP_KQUEUE=y
+
 # Select TLS implementation
 # openssl = OpenSSL (default)
 # gnutls = GnuTLS
 # internal = Internal TLSv1 implementation (experimental)
+# linux = Linux kernel AF_ALG and internal TLSv1 implementation (experimental)
 # none = Empty template
 #CONFIG_TLS=openssl
 
@@ -257,6 +290,10 @@ CONFIG_IEEE80211AC=y
 # can be enabled to enable use of stronger crypto algorithms.
 #CONFIG_TLSV12=y
 
+# Select which ciphers to use by default with OpenSSL if the user does not
+# specify them.
+#CONFIG_TLS_DEFAULT_CIPHERS="DEFAULT:!EXP:!LOW"
+
 # If CONFIG_TLS=internal is used, additional library and include paths are
 # needed for LibTomMath. Alternatively, an integrated, minimal version of
 # LibTomMath can be used. See beginning of libtommath.c for details on benefits
@@ -284,6 +321,12 @@ CONFIG_IEEE80211AC=y
 # Enable SQLite database support in hlr_auc_gw, EAP-SIM DB, and eap_user_file
 #CONFIG_SQLITE=y
 
+# Enable Fast Session Transfer (FST)
+#CONFIG_FST=y
+
+# Enable CLI commands for FST testing
+#CONFIG_FST_TEST=y
+
 # Testing options
 # This can be used to enable some testing options (see also the example
 # configuration file) that are really useful only for testing clients that
@@ -314,4 +357,40 @@ CONFIG_IEEE80211AC=y
 # For more details refer to:
 # http://wireless.kernel.org/en/users/Documentation/acs
 #
-#CONFIG_ACS=y
+CONFIG_ACS=y
+
+# Multiband Operation support
+# These extentions facilitate efficient use of multiple frequency bands
+# available to the AP and the devices that may associate with it.
+#CONFIG_MBO=y
+
+# Client Taxonomy
+# Has the AP retain the Probe Request and (Re)Association Request frames from
+# a client, from which a signature can be produced which can identify the model
+# of client device like "Nexus 6P" or "iPhone 5s".
+#CONFIG_TAXONOMY=y
+
+# Fast Initial Link Setup (FILS) (IEEE 802.11ai)
+#CONFIG_FILS=y
+# FILS shared key authentication with PFS
+#CONFIG_FILS_SK_PFS=y
+
+# Include internal line edit mode in hostapd_cli. This can be used to provide
+# limited command line editing and history support.
+#CONFIG_WPA_CLI_EDIT=y
+
+# Opportunistic Wireless Encryption (OWE)
+# Experimental implementation of draft-harkins-owe-07.txt
+#CONFIG_OWE=y
+
+# Airtime policy support
+#CONFIG_AIRTIME_POLICY=y
+
+# Override default value for the wpa_disable_eapol_key_retries configuration
+# parameter. See that parameter in hostapd.conf for more details.
+#CFLAGS += -DDEFAULT_WPA_DISABLE_EAPOL_KEY_RETRIES=1
+
+# Additional Options
+CONFIG_MESH=y
+CONFIG_SAE=y
+CONFIG_WPS2=y
diff --git a/network/hostapd/hostapd.info b/network/hostapd/hostapd.info
index c7cf70d848..bd009fff35 100644
--- a/network/hostapd/hostapd.info
+++ b/network/hostapd/hostapd.info
@@ -1,8 +1,8 @@
 PRGNAM="hostapd"
-VERSION="2.6"
+VERSION="2.10"
 HOMEPAGE="https://w1.fi/hostapd/"
-DOWNLOAD="https://w1.fi/releases/hostapd-2.6.tar.gz"
-MD5SUM="eaa56dce9bd8f1d195eb62596eab34c7"
+DOWNLOAD="https://w1.fi/releases/hostapd-2.10.tar.gz"
+MD5SUM="0be43e9e09ab94a7ebf82de0d1c57761"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/network/hostapd/patches/rebased-v2.6-0001-WPA-Ignore-unauthenticated-encrypted-EAPOL-Key-data.patch b/network/hostapd/patches/rebased-v2.6-0001-WPA-Ignore-unauthenticated-encrypted-EAPOL-Key-data.patch
deleted file mode 100644
index a62b52c6b9..0000000000
--- a/network/hostapd/patches/rebased-v2.6-0001-WPA-Ignore-unauthenticated-encrypted-EAPOL-Key-data.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 3e34cfdff6b192fe337c6fb3f487f73e96582961 Mon Sep 17 00:00:00 2001
-From: Mathy Vanhoef <Mathy.Vanhoef@cs.kuleuven.be>
-Date: Sun, 15 Jul 2018 01:25:53 +0200
-Subject: [PATCH] WPA: Ignore unauthenticated encrypted EAPOL-Key data
-
-Ignore unauthenticated encrypted EAPOL-Key data in supplicant
-processing. When using WPA2, these are frames that have the Encrypted
-flag set, but not the MIC flag.
-
-When using WPA2, EAPOL-Key frames that had the Encrypted flag set but
-not the MIC flag, had their data field decrypted without first verifying
-the MIC. In case the data field was encrypted using RC4 (i.e., when
-negotiating TKIP as the pairwise cipher), this meant that
-unauthenticated but decrypted data would then be processed. An adversary
-could abuse this as a decryption oracle to recover sensitive information
-in the data field of EAPOL-Key messages (e.g., the group key).
-(CVE-2018-14526)
-
-Signed-off-by: Mathy Vanhoef <Mathy.Vanhoef@cs.kuleuven.be>
----
- src/rsn_supp/wpa.c | 11 +++++++++++
- 1 file changed, 11 insertions(+)
-
-diff -upr wpa_supplicant-2.6.orig/src/rsn_supp/wpa.c wpa_supplicant-2.6/src/rsn_supp/wpa.c
---- wpa_supplicant-2.6.orig/src/rsn_supp/wpa.c	2016-10-02 21:51:11.000000000 +0300
-+++ wpa_supplicant-2.6/src/rsn_supp/wpa.c	2018-08-08 16:55:11.506831029 +0300
-@@ -2016,6 +2016,17 @@ int wpa_sm_rx_eapol(struct wpa_sm *sm, c
- 
- 	if ((sm->proto == WPA_PROTO_RSN || sm->proto == WPA_PROTO_OSEN) &&
- 	    (key_info & WPA_KEY_INFO_ENCR_KEY_DATA)) {
-+		/*
-+		 * Only decrypt the Key Data field if the frame's authenticity
-+		 * was verified. When using AES-SIV (FILS), the MIC flag is not
-+		 * set, so this check should only be performed if mic_len != 0
-+		 * which is the case in this code branch.
-+		 */
-+		if (!(key_info & WPA_KEY_INFO_MIC)) {
-+			wpa_msg(sm->ctx->msg_ctx, MSG_WARNING,
-+				"WPA: Ignore EAPOL-Key with encrypted but unauthenticated data");
-+			goto out;
-+		}
- 		if (wpa_supplicant_decrypt_key_data(sm, key, ver, key_data,
- 						    &key_data_len))
- 			goto out;
diff --git a/network/hostapd/patches/rebased-v2.6-0001-hostapd-Avoid-key-reinstallation-in-FT-handshake.patch b/network/hostapd/patches/rebased-v2.6-0001-hostapd-Avoid-key-reinstallation-in-FT-handshake.patch
deleted file mode 100644
index 727684865d..0000000000
--- a/network/hostapd/patches/rebased-v2.6-0001-hostapd-Avoid-key-reinstallation-in-FT-handshake.patch
+++ /dev/null
@@ -1,174 +0,0 @@
-From cf4cab804c7afd5c45505528a8d16e46163243a2 Mon Sep 17 00:00:00 2001
-From: Mathy Vanhoef <Mathy.Vanhoef@cs.kuleuven.be>
-Date: Fri, 14 Jul 2017 15:15:35 +0200
-Subject: [PATCH 1/8] hostapd: Avoid key reinstallation in FT handshake
-
-Do not reinstall TK to the driver during Reassociation Response frame
-processing if the first attempt of setting the TK succeeded. This avoids
-issues related to clearing the TX/RX PN that could result in reusing
-same PN values for transmitted frames (e.g., due to CCM nonce reuse and
-also hitting replay protection on the receiver) and accepting replayed
-frames on RX side.
-
-This issue was introduced by the commit
-0e84c25434e6a1f283c7b4e62e483729085b78d2 ('FT: Fix PTK configuration in
-authenticator') which allowed wpa_ft_install_ptk() to be called multiple
-times with the same PTK. While the second configuration attempt is
-needed with some drivers, it must be done only if the first attempt
-failed.
-
-Signed-off-by: Mathy Vanhoef <Mathy.Vanhoef@cs.kuleuven.be>
----
- src/ap/ieee802_11.c  | 16 +++++++++++++---
- src/ap/wpa_auth.c    | 11 +++++++++++
- src/ap/wpa_auth.h    |  3 ++-
- src/ap/wpa_auth_ft.c | 10 ++++++++++
- src/ap/wpa_auth_i.h  |  1 +
- 5 files changed, 37 insertions(+), 4 deletions(-)
-
-diff --git a/src/ap/ieee802_11.c b/src/ap/ieee802_11.c
-index 4e04169..333035f 100644
---- a/src/ap/ieee802_11.c
-+++ b/src/ap/ieee802_11.c
-@@ -1841,6 +1841,7 @@ static int add_associated_sta(struct hostapd_data *hapd,
- {
- 	struct ieee80211_ht_capabilities ht_cap;
- 	struct ieee80211_vht_capabilities vht_cap;
-+	int set = 1;
- 
- 	/*
- 	 * Remove the STA entry to ensure the STA PS state gets cleared and
-@@ -1848,9 +1849,18 @@ static int add_associated_sta(struct hostapd_data *hapd,
- 	 * FT-over-the-DS, where a station re-associates back to the same AP but
- 	 * skips the authentication flow, or if working with a driver that
- 	 * does not support full AP client state.
-+	 *
-+	 * Skip this if the STA has already completed FT reassociation and the
-+	 * TK has been configured since the TX/RX PN must not be reset to 0 for
-+	 * the same key.
- 	 */
--	if (!sta->added_unassoc)
-+	if (!sta->added_unassoc &&
-+	    (!(sta->flags & WLAN_STA_AUTHORIZED) ||
-+	     !wpa_auth_sta_ft_tk_already_set(sta->wpa_sm))) {
- 		hostapd_drv_sta_remove(hapd, sta->addr);
-+		wpa_auth_sm_event(sta->wpa_sm, WPA_DRV_STA_REMOVED);
-+		set = 0;
-+	}
- 
- #ifdef CONFIG_IEEE80211N
- 	if (sta->flags & WLAN_STA_HT)
-@@ -1873,11 +1883,11 @@ static int add_associated_sta(struct hostapd_data *hapd,
- 			    sta->flags & WLAN_STA_VHT ? &vht_cap : NULL,
- 			    sta->flags | WLAN_STA_ASSOC, sta->qosinfo,
- 			    sta->vht_opmode, sta->p2p_ie ? 1 : 0,
--			    sta->added_unassoc)) {
-+			    set)) {
- 		hostapd_logger(hapd, sta->addr,
- 			       HOSTAPD_MODULE_IEEE80211, HOSTAPD_LEVEL_NOTICE,
- 			       "Could not %s STA to kernel driver",
--			       sta->added_unassoc ? "set" : "add");
-+			       set ? "set" : "add");
- 
- 		if (sta->added_unassoc) {
- 			hostapd_drv_sta_remove(hapd, sta->addr);
-diff --git a/src/ap/wpa_auth.c b/src/ap/wpa_auth.c
-index 3587086..707971d 100644
---- a/src/ap/wpa_auth.c
-+++ b/src/ap/wpa_auth.c
-@@ -1745,6 +1745,9 @@ int wpa_auth_sm_event(struct wpa_state_machine *sm, enum wpa_event event)
- #else /* CONFIG_IEEE80211R */
- 		break;
- #endif /* CONFIG_IEEE80211R */
-+	case WPA_DRV_STA_REMOVED:
-+		sm->tk_already_set = FALSE;
-+		return 0;
- 	}
- 
- #ifdef CONFIG_IEEE80211R
-@@ -3250,6 +3253,14 @@ int wpa_auth_sta_wpa_version(struct wpa_state_machine *sm)
- }
- 
- 
-+int wpa_auth_sta_ft_tk_already_set(struct wpa_state_machine *sm)
-+{
-+	if (!sm || !wpa_key_mgmt_ft(sm->wpa_key_mgmt))
-+		return 0;
-+	return sm->tk_already_set;
-+}
-+
-+
- int wpa_auth_sta_clear_pmksa(struct wpa_state_machine *sm,
- 			     struct rsn_pmksa_cache_entry *entry)
- {
-diff --git a/src/ap/wpa_auth.h b/src/ap/wpa_auth.h
-index 0de8d97..97461b0 100644
---- a/src/ap/wpa_auth.h
-+++ b/src/ap/wpa_auth.h
-@@ -267,7 +267,7 @@ void wpa_receive(struct wpa_authenticator *wpa_auth,
- 		 u8 *data, size_t data_len);
- enum wpa_event {
- 	WPA_AUTH, WPA_ASSOC, WPA_DISASSOC, WPA_DEAUTH, WPA_REAUTH,
--	WPA_REAUTH_EAPOL, WPA_ASSOC_FT
-+	WPA_REAUTH_EAPOL, WPA_ASSOC_FT, WPA_DRV_STA_REMOVED
- };
- void wpa_remove_ptk(struct wpa_state_machine *sm);
- int wpa_auth_sm_event(struct wpa_state_machine *sm, enum wpa_event event);
-@@ -280,6 +280,7 @@ int wpa_auth_pairwise_set(struct wpa_state_machine *sm);
- int wpa_auth_get_pairwise(struct wpa_state_machine *sm);
- int wpa_auth_sta_key_mgmt(struct wpa_state_machine *sm);
- int wpa_auth_sta_wpa_version(struct wpa_state_machine *sm);
-+int wpa_auth_sta_ft_tk_already_set(struct wpa_state_machine *sm);
- int wpa_auth_sta_clear_pmksa(struct wpa_state_machine *sm,
- 			     struct rsn_pmksa_cache_entry *entry);
- struct rsn_pmksa_cache_entry *
-diff --git a/src/ap/wpa_auth_ft.c b/src/ap/wpa_auth_ft.c
-index 42242a5..e63b99a 100644
---- a/src/ap/wpa_auth_ft.c
-+++ b/src/ap/wpa_auth_ft.c
-@@ -780,6 +780,14 @@ void wpa_ft_install_ptk(struct wpa_state_machine *sm)
- 		return;
- 	}
- 
-+	if (sm->tk_already_set) {
-+		/* Must avoid TK reconfiguration to prevent clearing of TX/RX
-+		 * PN in the driver */
-+		wpa_printf(MSG_DEBUG,
-+			   "FT: Do not re-install same PTK to the driver");
-+		return;
-+	}
-+
- 	/* FIX: add STA entry to kernel/driver here? The set_key will fail
- 	 * most likely without this.. At the moment, STA entry is added only
- 	 * after association has been completed. This function will be called
-@@ -792,6 +800,7 @@ void wpa_ft_install_ptk(struct wpa_state_machine *sm)
- 
- 	/* FIX: MLME-SetProtection.Request(TA, Tx_Rx) */
- 	sm->pairwise_set = TRUE;
-+	sm->tk_already_set = TRUE;
- }
- 
- 
-@@ -898,6 +907,7 @@ static int wpa_ft_process_auth_req(struct wpa_state_machine *sm,
- 
- 	sm->pairwise = pairwise;
- 	sm->PTK_valid = TRUE;
-+	sm->tk_already_set = FALSE;
- 	wpa_ft_install_ptk(sm);
- 
- 	buflen = 2 + sizeof(struct rsn_mdie) + 2 + sizeof(struct rsn_ftie) +
-diff --git a/src/ap/wpa_auth_i.h b/src/ap/wpa_auth_i.h
-index 72b7eb3..7fd8f05 100644
---- a/src/ap/wpa_auth_i.h
-+++ b/src/ap/wpa_auth_i.h
-@@ -65,6 +65,7 @@ struct wpa_state_machine {
- 	struct wpa_ptk PTK;
- 	Boolean PTK_valid;
- 	Boolean pairwise_set;
-+	Boolean tk_already_set;
- 	int keycount;
- 	Boolean Pair;
- 	struct wpa_key_replay_counter {
--- 
-2.7.4
-
diff --git a/network/hostapd/patches/rebased-v2.6-0002-Prevent-reinstallation-of-an-already-in-use-group-ke.patch b/network/hostapd/patches/rebased-v2.6-0002-Prevent-reinstallation-of-an-already-in-use-group-ke.patch
deleted file mode 100644
index 1802d664ad..0000000000
--- a/network/hostapd/patches/rebased-v2.6-0002-Prevent-reinstallation-of-an-already-in-use-group-ke.patch
+++ /dev/null
@@ -1,250 +0,0 @@
-From 927f891007c402fefd1ff384645b3f07597c3ede Mon Sep 17 00:00:00 2001
-From: Mathy Vanhoef <Mathy.Vanhoef@cs.kuleuven.be>
-Date: Wed, 12 Jul 2017 16:03:24 +0200
-Subject: [PATCH 2/8] Prevent reinstallation of an already in-use group key
-
-Track the current GTK and IGTK that is in use and when receiving a
-(possibly retransmitted) Group Message 1 or WNM-Sleep Mode Response, do
-not install the given key if it is already in use. This prevents an
-attacker from trying to trick the client into resetting or lowering the
-sequence counter associated to the group key.
-
-Signed-off-by: Mathy Vanhoef <Mathy.Vanhoef@cs.kuleuven.be>
----
- src/common/wpa_common.h |  11 +++++
- src/rsn_supp/wpa.c      | 116 ++++++++++++++++++++++++++++++------------------
- src/rsn_supp/wpa_i.h    |   4 ++
- 3 files changed, 87 insertions(+), 44 deletions(-)
-
-diff --git a/src/common/wpa_common.h b/src/common/wpa_common.h
-index af1d0f0..d200285 100644
---- a/src/common/wpa_common.h
-+++ b/src/common/wpa_common.h
-@@ -217,6 +217,17 @@ struct wpa_ptk {
- 	size_t tk_len;
- };
- 
-+struct wpa_gtk {
-+	u8 gtk[WPA_GTK_MAX_LEN];
-+	size_t gtk_len;
-+};
-+
-+#ifdef CONFIG_IEEE80211W
-+struct wpa_igtk {
-+	u8 igtk[WPA_IGTK_MAX_LEN];
-+	size_t igtk_len;
-+};
-+#endif /* CONFIG_IEEE80211W */
- 
- /* WPA IE version 1
-  * 00-50-f2:1 (OUI:OUI type)
-diff --git a/src/rsn_supp/wpa.c b/src/rsn_supp/wpa.c
-index 3c47879..95bd7be 100644
---- a/src/rsn_supp/wpa.c
-+++ b/src/rsn_supp/wpa.c
-@@ -714,6 +714,15 @@ static int wpa_supplicant_install_gtk(struct wpa_sm *sm,
- 	const u8 *_gtk = gd->gtk;
- 	u8 gtk_buf[32];
- 
-+	/* Detect possible key reinstallation */
-+	if (sm->gtk.gtk_len == (size_t) gd->gtk_len &&
-+	    os_memcmp(sm->gtk.gtk, gd->gtk, sm->gtk.gtk_len) == 0) {
-+		wpa_dbg(sm->ctx->msg_ctx, MSG_DEBUG,
-+			"WPA: Not reinstalling already in-use GTK to the driver (keyidx=%d tx=%d len=%d)",
-+			gd->keyidx, gd->tx, gd->gtk_len);
-+		return 0;
-+	}
-+
- 	wpa_hexdump_key(MSG_DEBUG, "WPA: Group Key", gd->gtk, gd->gtk_len);
- 	wpa_dbg(sm->ctx->msg_ctx, MSG_DEBUG,
- 		"WPA: Installing GTK to the driver (keyidx=%d tx=%d len=%d)",
-@@ -748,6 +757,9 @@ static int wpa_supplicant_install_gtk(struct wpa_sm *sm,
- 	}
- 	os_memset(gtk_buf, 0, sizeof(gtk_buf));
- 
-+	sm->gtk.gtk_len = gd->gtk_len;
-+	os_memcpy(sm->gtk.gtk, gd->gtk, sm->gtk.gtk_len);
-+
- 	return 0;
- }
- 
-@@ -854,6 +866,48 @@ static int wpa_supplicant_pairwise_gtk(struct wpa_sm *sm,
- }
- 
- 
-+#ifdef CONFIG_IEEE80211W
-+static int wpa_supplicant_install_igtk(struct wpa_sm *sm,
-+				       const struct wpa_igtk_kde *igtk)
-+{
-+	size_t len = wpa_cipher_key_len(sm->mgmt_group_cipher);
-+	u16 keyidx = WPA_GET_LE16(igtk->keyid);
-+
-+	/* Detect possible key reinstallation */
-+	if (sm->igtk.igtk_len == len &&
-+	    os_memcmp(sm->igtk.igtk, igtk->igtk, sm->igtk.igtk_len) == 0) {
-+		wpa_dbg(sm->ctx->msg_ctx, MSG_DEBUG,
-+			"WPA: Not reinstalling already in-use IGTK to the driver (keyidx=%d)",
-+			keyidx);
-+		return  0;
-+	}
-+
-+	wpa_dbg(sm->ctx->msg_ctx, MSG_DEBUG,
-+		"WPA: IGTK keyid %d pn %02x%02x%02x%02x%02x%02x",
-+		keyidx, MAC2STR(igtk->pn));
-+	wpa_hexdump_key(MSG_DEBUG, "WPA: IGTK", igtk->igtk, len);
-+	if (keyidx > 4095) {
-+		wpa_msg(sm->ctx->msg_ctx, MSG_WARNING,
-+			"WPA: Invalid IGTK KeyID %d", keyidx);
-+		return -1;
-+	}
-+	if (wpa_sm_set_key(sm, wpa_cipher_to_alg(sm->mgmt_group_cipher),
-+			   broadcast_ether_addr,
-+			   keyidx, 0, igtk->pn, sizeof(igtk->pn),
-+			   igtk->igtk, len) < 0) {
-+		wpa_msg(sm->ctx->msg_ctx, MSG_WARNING,
-+			"WPA: Failed to configure IGTK to the driver");
-+		return -1;
-+	}
-+
-+	sm->igtk.igtk_len = len;
-+	os_memcpy(sm->igtk.igtk, igtk->igtk, sm->igtk.igtk_len);
-+
-+	return 0;
-+}
-+#endif /* CONFIG_IEEE80211W */
-+
-+
- static int ieee80211w_set_keys(struct wpa_sm *sm,
- 			       struct wpa_eapol_ie_parse *ie)
- {
-@@ -864,30 +918,14 @@ static int ieee80211w_set_keys(struct wpa_sm *sm,
- 	if (ie->igtk) {
- 		size_t len;
- 		const struct wpa_igtk_kde *igtk;
--		u16 keyidx;
-+
- 		len = wpa_cipher_key_len(sm->mgmt_group_cipher);
- 		if (ie->igtk_len != WPA_IGTK_KDE_PREFIX_LEN + len)
- 			return -1;
-+
- 		igtk = (const struct wpa_igtk_kde *) ie->igtk;
--		keyidx = WPA_GET_LE16(igtk->keyid);
--		wpa_dbg(sm->ctx->msg_ctx, MSG_DEBUG, "WPA: IGTK keyid %d "
--			"pn %02x%02x%02x%02x%02x%02x",
--			keyidx, MAC2STR(igtk->pn));
--		wpa_hexdump_key(MSG_DEBUG, "WPA: IGTK",
--				igtk->igtk, len);
--		if (keyidx > 4095) {
--			wpa_msg(sm->ctx->msg_ctx, MSG_WARNING,
--				"WPA: Invalid IGTK KeyID %d", keyidx);
--			return -1;
--		}
--		if (wpa_sm_set_key(sm, wpa_cipher_to_alg(sm->mgmt_group_cipher),
--				   broadcast_ether_addr,
--				   keyidx, 0, igtk->pn, sizeof(igtk->pn),
--				   igtk->igtk, len) < 0) {
--			wpa_msg(sm->ctx->msg_ctx, MSG_WARNING,
--				"WPA: Failed to configure IGTK to the driver");
-+		if (wpa_supplicant_install_igtk(sm, igtk) < 0)
- 			return -1;
--		}
- 	}
- 
- 	return 0;
-@@ -2307,7 +2345,7 @@ void wpa_sm_deinit(struct wpa_sm *sm)
-  */
- void wpa_sm_notify_assoc(struct wpa_sm *sm, const u8 *bssid)
- {
--	int clear_ptk = 1;
-+	int clear_keys = 1;
- 
- 	if (sm == NULL)
- 		return;
-@@ -2333,11 +2371,11 @@ void wpa_sm_notify_assoc(struct wpa_sm *sm, const u8 *bssid)
- 		/* Prepare for the next transition */
- 		wpa_ft_prepare_auth_request(sm, NULL);
- 
--		clear_ptk = 0;
-+		clear_keys = 0;
- 	}
- #endif /* CONFIG_IEEE80211R */
- 
--	if (clear_ptk) {
-+	if (clear_keys) {
- 		/*
- 		 * IEEE 802.11, 8.4.10: Delete PTK SA on (re)association if
- 		 * this is not part of a Fast BSS Transition.
-@@ -2347,6 +2385,10 @@ void wpa_sm_notify_assoc(struct wpa_sm *sm, const u8 *bssid)
- 		os_memset(&sm->ptk, 0, sizeof(sm->ptk));
- 		sm->tptk_set = 0;
- 		os_memset(&sm->tptk, 0, sizeof(sm->tptk));
-+		os_memset(&sm->gtk, 0, sizeof(sm->gtk));
-+#ifdef CONFIG_IEEE80211W
-+		os_memset(&sm->igtk, 0, sizeof(sm->igtk));
-+#endif /* CONFIG_IEEE80211W */
- 	}
- 
- #ifdef CONFIG_TDLS
-@@ -2877,6 +2919,10 @@ void wpa_sm_drop_sa(struct wpa_sm *sm)
- 	os_memset(sm->pmk, 0, sizeof(sm->pmk));
- 	os_memset(&sm->ptk, 0, sizeof(sm->ptk));
- 	os_memset(&sm->tptk, 0, sizeof(sm->tptk));
-+	os_memset(&sm->gtk, 0, sizeof(sm->gtk));
-+#ifdef CONFIG_IEEE80211W
-+	os_memset(&sm->igtk, 0, sizeof(sm->igtk));
-+#endif /* CONFIG_IEEE80211W */
- #ifdef CONFIG_IEEE80211R
- 	os_memset(sm->xxkey, 0, sizeof(sm->xxkey));
- 	os_memset(sm->pmk_r0, 0, sizeof(sm->pmk_r0));
-@@ -2949,29 +2995,11 @@ int wpa_wnmsleep_install_key(struct wpa_sm *sm, u8 subelem_id, u8 *buf)
- 		os_memset(&gd, 0, sizeof(gd));
- #ifdef CONFIG_IEEE80211W
- 	} else if (subelem_id == WNM_SLEEP_SUBELEM_IGTK) {
--		struct wpa_igtk_kde igd;
--		u16 keyidx;
--
--		os_memset(&igd, 0, sizeof(igd));
--		keylen = wpa_cipher_key_len(sm->mgmt_group_cipher);
--		os_memcpy(igd.keyid, buf + 2, 2);
--		os_memcpy(igd.pn, buf + 4, 6);
--
--		keyidx = WPA_GET_LE16(igd.keyid);
--		os_memcpy(igd.igtk, buf + 10, keylen);
--
--		wpa_hexdump_key(MSG_DEBUG, "Install IGTK (WNM SLEEP)",
--				igd.igtk, keylen);
--		if (wpa_sm_set_key(sm, wpa_cipher_to_alg(sm->mgmt_group_cipher),
--				   broadcast_ether_addr,
--				   keyidx, 0, igd.pn, sizeof(igd.pn),
--				   igd.igtk, keylen) < 0) {
--			wpa_printf(MSG_DEBUG, "Failed to install the IGTK in "
--				   "WNM mode");
--			os_memset(&igd, 0, sizeof(igd));
-+		const struct wpa_igtk_kde *igtk;
-+
-+		igtk = (const struct wpa_igtk_kde *) (buf + 2);
-+		if (wpa_supplicant_install_igtk(sm, igtk) < 0)
- 			return -1;
--		}
--		os_memset(&igd, 0, sizeof(igd));
- #endif /* CONFIG_IEEE80211W */
- 	} else {
- 		wpa_printf(MSG_DEBUG, "Unknown element id");
-diff --git a/src/rsn_supp/wpa_i.h b/src/rsn_supp/wpa_i.h
-index f653ba6..afc9e37 100644
---- a/src/rsn_supp/wpa_i.h
-+++ b/src/rsn_supp/wpa_i.h
-@@ -31,6 +31,10 @@ struct wpa_sm {
- 	u8 rx_replay_counter[WPA_REPLAY_COUNTER_LEN];
- 	int rx_replay_counter_set;
- 	u8 request_counter[WPA_REPLAY_COUNTER_LEN];
-+	struct wpa_gtk gtk;
-+#ifdef CONFIG_IEEE80211W
-+	struct wpa_igtk igtk;
-+#endif /* CONFIG_IEEE80211W */
- 
- 	struct eapol_sm *eapol; /* EAPOL state machine from upper level code */
- 
--- 
-2.7.4
-
diff --git a/network/hostapd/patches/rebased-v2.6-0003-Extend-protection-of-GTK-IGTK-reinstallation-of-WNM-.patch b/network/hostapd/patches/rebased-v2.6-0003-Extend-protection-of-GTK-IGTK-reinstallation-of-WNM-.patch
deleted file mode 100644
index e2937b851a..0000000000
--- a/network/hostapd/patches/rebased-v2.6-0003-Extend-protection-of-GTK-IGTK-reinstallation-of-WNM-.patch
+++ /dev/null
@@ -1,184 +0,0 @@
-From 8280294e74846ea342389a0cd17215050fa5afe8 Mon Sep 17 00:00:00 2001
-From: Jouni Malinen <j@w1.fi>
-Date: Sun, 1 Oct 2017 12:12:24 +0300
-Subject: [PATCH 3/8] Extend protection of GTK/IGTK reinstallation of WNM-Sleep
- Mode cases
-
-This extends the protection to track last configured GTK/IGTK value
-separately from EAPOL-Key frames and WNM-Sleep Mode frames to cover a
-corner case where these two different mechanisms may get used when the
-GTK/IGTK has changed and tracking a single value is not sufficient to
-detect a possible key reconfiguration.
-
-Signed-off-by: Jouni Malinen <j@w1.fi>
----
- src/rsn_supp/wpa.c   | 53 +++++++++++++++++++++++++++++++++++++---------------
- src/rsn_supp/wpa_i.h |  2 ++
- 2 files changed, 40 insertions(+), 15 deletions(-)
-
-diff --git a/src/rsn_supp/wpa.c b/src/rsn_supp/wpa.c
-index 95bd7be..7a2c68d 100644
---- a/src/rsn_supp/wpa.c
-+++ b/src/rsn_supp/wpa.c
-@@ -709,14 +709,17 @@ struct wpa_gtk_data {
- 
- static int wpa_supplicant_install_gtk(struct wpa_sm *sm,
- 				      const struct wpa_gtk_data *gd,
--				      const u8 *key_rsc)
-+				      const u8 *key_rsc, int wnm_sleep)
- {
- 	const u8 *_gtk = gd->gtk;
- 	u8 gtk_buf[32];
- 
- 	/* Detect possible key reinstallation */
--	if (sm->gtk.gtk_len == (size_t) gd->gtk_len &&
--	    os_memcmp(sm->gtk.gtk, gd->gtk, sm->gtk.gtk_len) == 0) {
-+	if ((sm->gtk.gtk_len == (size_t) gd->gtk_len &&
-+	     os_memcmp(sm->gtk.gtk, gd->gtk, sm->gtk.gtk_len) == 0) ||
-+	    (sm->gtk_wnm_sleep.gtk_len == (size_t) gd->gtk_len &&
-+	     os_memcmp(sm->gtk_wnm_sleep.gtk, gd->gtk,
-+		       sm->gtk_wnm_sleep.gtk_len) == 0)) {
- 		wpa_dbg(sm->ctx->msg_ctx, MSG_DEBUG,
- 			"WPA: Not reinstalling already in-use GTK to the driver (keyidx=%d tx=%d len=%d)",
- 			gd->keyidx, gd->tx, gd->gtk_len);
-@@ -757,8 +760,14 @@ static int wpa_supplicant_install_gtk(struct wpa_sm *sm,
- 	}
- 	os_memset(gtk_buf, 0, sizeof(gtk_buf));
- 
--	sm->gtk.gtk_len = gd->gtk_len;
--	os_memcpy(sm->gtk.gtk, gd->gtk, sm->gtk.gtk_len);
-+	if (wnm_sleep) {
-+		sm->gtk_wnm_sleep.gtk_len = gd->gtk_len;
-+		os_memcpy(sm->gtk_wnm_sleep.gtk, gd->gtk,
-+			  sm->gtk_wnm_sleep.gtk_len);
-+	} else {
-+		sm->gtk.gtk_len = gd->gtk_len;
-+		os_memcpy(sm->gtk.gtk, gd->gtk, sm->gtk.gtk_len);
-+	}
- 
- 	return 0;
- }
-@@ -852,7 +861,7 @@ static int wpa_supplicant_pairwise_gtk(struct wpa_sm *sm,
- 	    (wpa_supplicant_check_group_cipher(sm, sm->group_cipher,
- 					       gtk_len, gtk_len,
- 					       &gd.key_rsc_len, &gd.alg) ||
--	     wpa_supplicant_install_gtk(sm, &gd, key_rsc))) {
-+	     wpa_supplicant_install_gtk(sm, &gd, key_rsc, 0))) {
- 		wpa_dbg(sm->ctx->msg_ctx, MSG_DEBUG,
- 			"RSN: Failed to install GTK");
- 		os_memset(&gd, 0, sizeof(gd));
-@@ -868,14 +877,18 @@ static int wpa_supplicant_pairwise_gtk(struct wpa_sm *sm,
- 
- #ifdef CONFIG_IEEE80211W
- static int wpa_supplicant_install_igtk(struct wpa_sm *sm,
--				       const struct wpa_igtk_kde *igtk)
-+				       const struct wpa_igtk_kde *igtk,
-+				       int wnm_sleep)
- {
- 	size_t len = wpa_cipher_key_len(sm->mgmt_group_cipher);
- 	u16 keyidx = WPA_GET_LE16(igtk->keyid);
- 
- 	/* Detect possible key reinstallation */
--	if (sm->igtk.igtk_len == len &&
--	    os_memcmp(sm->igtk.igtk, igtk->igtk, sm->igtk.igtk_len) == 0) {
-+	if ((sm->igtk.igtk_len == len &&
-+	     os_memcmp(sm->igtk.igtk, igtk->igtk, sm->igtk.igtk_len) == 0) ||
-+	    (sm->igtk_wnm_sleep.igtk_len == len &&
-+	     os_memcmp(sm->igtk_wnm_sleep.igtk, igtk->igtk,
-+		       sm->igtk_wnm_sleep.igtk_len) == 0)) {
- 		wpa_dbg(sm->ctx->msg_ctx, MSG_DEBUG,
- 			"WPA: Not reinstalling already in-use IGTK to the driver (keyidx=%d)",
- 			keyidx);
-@@ -900,8 +913,14 @@ static int wpa_supplicant_install_igtk(struct wpa_sm *sm,
- 		return -1;
- 	}
- 
--	sm->igtk.igtk_len = len;
--	os_memcpy(sm->igtk.igtk, igtk->igtk, sm->igtk.igtk_len);
-+	if (wnm_sleep) {
-+		sm->igtk_wnm_sleep.igtk_len = len;
-+		os_memcpy(sm->igtk_wnm_sleep.igtk, igtk->igtk,
-+			  sm->igtk_wnm_sleep.igtk_len);
-+	} else {
-+		sm->igtk.igtk_len = len;
-+		os_memcpy(sm->igtk.igtk, igtk->igtk, sm->igtk.igtk_len);
-+	}
- 
- 	return 0;
- }
-@@ -924,7 +943,7 @@ static int ieee80211w_set_keys(struct wpa_sm *sm,
- 			return -1;
- 
- 		igtk = (const struct wpa_igtk_kde *) ie->igtk;
--		if (wpa_supplicant_install_igtk(sm, igtk) < 0)
-+		if (wpa_supplicant_install_igtk(sm, igtk, 0) < 0)
- 			return -1;
- 	}
- 
-@@ -1574,7 +1593,7 @@ static void wpa_supplicant_process_1_of_2(struct wpa_sm *sm,
- 	if (wpa_supplicant_rsc_relaxation(sm, key->key_rsc))
- 		key_rsc = null_rsc;
- 
--	if (wpa_supplicant_install_gtk(sm, &gd, key_rsc) ||
-+	if (wpa_supplicant_install_gtk(sm, &gd, key_rsc, 0) ||
- 	    wpa_supplicant_send_2_of_2(sm, key, ver, key_info) < 0)
- 		goto failed;
- 	os_memset(&gd, 0, sizeof(gd));
-@@ -2386,8 +2405,10 @@ void wpa_sm_notify_assoc(struct wpa_sm *sm, const u8 *bssid)
- 		sm->tptk_set = 0;
- 		os_memset(&sm->tptk, 0, sizeof(sm->tptk));
- 		os_memset(&sm->gtk, 0, sizeof(sm->gtk));
-+		os_memset(&sm->gtk_wnm_sleep, 0, sizeof(sm->gtk_wnm_sleep));
- #ifdef CONFIG_IEEE80211W
- 		os_memset(&sm->igtk, 0, sizeof(sm->igtk));
-+		os_memset(&sm->igtk_wnm_sleep, 0, sizeof(sm->igtk_wnm_sleep));
- #endif /* CONFIG_IEEE80211W */
- 	}
- 
-@@ -2920,8 +2941,10 @@ void wpa_sm_drop_sa(struct wpa_sm *sm)
- 	os_memset(&sm->ptk, 0, sizeof(sm->ptk));
- 	os_memset(&sm->tptk, 0, sizeof(sm->tptk));
- 	os_memset(&sm->gtk, 0, sizeof(sm->gtk));
-+	os_memset(&sm->gtk_wnm_sleep, 0, sizeof(sm->gtk_wnm_sleep));
- #ifdef CONFIG_IEEE80211W
- 	os_memset(&sm->igtk, 0, sizeof(sm->igtk));
-+	os_memset(&sm->igtk_wnm_sleep, 0, sizeof(sm->igtk_wnm_sleep));
- #endif /* CONFIG_IEEE80211W */
- #ifdef CONFIG_IEEE80211R
- 	os_memset(sm->xxkey, 0, sizeof(sm->xxkey));
-@@ -2986,7 +3009,7 @@ int wpa_wnmsleep_install_key(struct wpa_sm *sm, u8 subelem_id, u8 *buf)
- 
- 		wpa_hexdump_key(MSG_DEBUG, "Install GTK (WNM SLEEP)",
- 				gd.gtk, gd.gtk_len);
--		if (wpa_supplicant_install_gtk(sm, &gd, key_rsc)) {
-+		if (wpa_supplicant_install_gtk(sm, &gd, key_rsc, 1)) {
- 			os_memset(&gd, 0, sizeof(gd));
- 			wpa_printf(MSG_DEBUG, "Failed to install the GTK in "
- 				   "WNM mode");
-@@ -2998,7 +3021,7 @@ int wpa_wnmsleep_install_key(struct wpa_sm *sm, u8 subelem_id, u8 *buf)
- 		const struct wpa_igtk_kde *igtk;
- 
- 		igtk = (const struct wpa_igtk_kde *) (buf + 2);
--		if (wpa_supplicant_install_igtk(sm, igtk) < 0)
-+		if (wpa_supplicant_install_igtk(sm, igtk, 1) < 0)
- 			return -1;
- #endif /* CONFIG_IEEE80211W */
- 	} else {
-diff --git a/src/rsn_supp/wpa_i.h b/src/rsn_supp/wpa_i.h
-index afc9e37..9a54631 100644
---- a/src/rsn_supp/wpa_i.h
-+++ b/src/rsn_supp/wpa_i.h
-@@ -32,8 +32,10 @@ struct wpa_sm {
- 	int rx_replay_counter_set;
- 	u8 request_counter[WPA_REPLAY_COUNTER_LEN];
- 	struct wpa_gtk gtk;
-+	struct wpa_gtk gtk_wnm_sleep;
- #ifdef CONFIG_IEEE80211W
- 	struct wpa_igtk igtk;
-+	struct wpa_igtk igtk_wnm_sleep;
- #endif /* CONFIG_IEEE80211W */
- 
- 	struct eapol_sm *eapol; /* EAPOL state machine from upper level code */
--- 
-2.7.4
-
diff --git a/network/hostapd/patches/rebased-v2.6-0004-Prevent-installation-of-an-all-zero-TK.patch b/network/hostapd/patches/rebased-v2.6-0004-Prevent-installation-of-an-all-zero-TK.patch
deleted file mode 100644
index 22ee217947..0000000000
--- a/network/hostapd/patches/rebased-v2.6-0004-Prevent-installation-of-an-all-zero-TK.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-From 8f82bc94e8697a9d47fa8774dfdaaede1084912c Mon Sep 17 00:00:00 2001
-From: Mathy Vanhoef <Mathy.Vanhoef@cs.kuleuven.be>
-Date: Fri, 29 Sep 2017 04:22:51 +0200
-Subject: [PATCH 4/8] Prevent installation of an all-zero TK
-
-Properly track whether a PTK has already been installed to the driver
-and the TK part cleared from memory. This prevents an attacker from
-trying to trick the client into installing an all-zero TK.
-
-This fixes the earlier fix in commit
-ad00d64e7d8827b3cebd665a0ceb08adabf15e1e ('Fix TK configuration to the
-driver in EAPOL-Key 3/4 retry case') which did not take into account
-possibility of an extra message 1/4 showing up between retries of
-message 3/4.
-
-Signed-off-by: Mathy Vanhoef <Mathy.Vanhoef@cs.kuleuven.be>
----
- src/common/wpa_common.h | 1 +
- src/rsn_supp/wpa.c      | 5 ++---
- src/rsn_supp/wpa_i.h    | 1 -
- 3 files changed, 3 insertions(+), 4 deletions(-)
-
-diff --git a/src/common/wpa_common.h b/src/common/wpa_common.h
-index d200285..1021ccb 100644
---- a/src/common/wpa_common.h
-+++ b/src/common/wpa_common.h
-@@ -215,6 +215,7 @@ struct wpa_ptk {
- 	size_t kck_len;
- 	size_t kek_len;
- 	size_t tk_len;
-+	int installed; /* 1 if key has already been installed to driver */
- };
- 
- struct wpa_gtk {
-diff --git a/src/rsn_supp/wpa.c b/src/rsn_supp/wpa.c
-index 7a2c68d..0550a41 100644
---- a/src/rsn_supp/wpa.c
-+++ b/src/rsn_supp/wpa.c
-@@ -510,7 +510,6 @@ static void wpa_supplicant_process_1_of_4(struct wpa_sm *sm,
- 		os_memset(buf, 0, sizeof(buf));
- 	}
- 	sm->tptk_set = 1;
--	sm->tk_to_set = 1;
- 
- 	kde = sm->assoc_wpa_ie;
- 	kde_len = sm->assoc_wpa_ie_len;
-@@ -615,7 +614,7 @@ static int wpa_supplicant_install_ptk(struct wpa_sm *sm,
- 	enum wpa_alg alg;
- 	const u8 *key_rsc;
- 
--	if (!sm->tk_to_set) {
-+	if (sm->ptk.installed) {
- 		wpa_dbg(sm->ctx->msg_ctx, MSG_DEBUG,
- 			"WPA: Do not re-install same PTK to the driver");
- 		return 0;
-@@ -659,7 +658,7 @@ static int wpa_supplicant_install_ptk(struct wpa_sm *sm,
- 
- 	/* TK is not needed anymore in supplicant */
- 	os_memset(sm->ptk.tk, 0, WPA_TK_MAX_LEN);
--	sm->tk_to_set = 0;
-+	sm->ptk.installed = 1;
- 
- 	if (sm->wpa_ptk_rekey) {
- 		eloop_cancel_timeout(wpa_sm_rekey_ptk, sm, NULL);
-diff --git a/src/rsn_supp/wpa_i.h b/src/rsn_supp/wpa_i.h
-index 9a54631..41f371f 100644
---- a/src/rsn_supp/wpa_i.h
-+++ b/src/rsn_supp/wpa_i.h
-@@ -24,7 +24,6 @@ struct wpa_sm {
- 	struct wpa_ptk ptk, tptk;
- 	int ptk_set, tptk_set;
- 	unsigned int msg_3_of_4_ok:1;
--	unsigned int tk_to_set:1;
- 	u8 snonce[WPA_NONCE_LEN];
- 	u8 anonce[WPA_NONCE_LEN]; /* ANonce from the last 1/4 msg */
- 	int renew_snonce;
--- 
-2.7.4
-
diff --git a/network/hostapd/patches/rebased-v2.6-0005-Fix-PTK-rekeying-to-generate-a-new-ANonce.patch b/network/hostapd/patches/rebased-v2.6-0005-Fix-PTK-rekeying-to-generate-a-new-ANonce.patch
deleted file mode 100644
index c19c4c7102..0000000000
--- a/network/hostapd/patches/rebased-v2.6-0005-Fix-PTK-rekeying-to-generate-a-new-ANonce.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From 12fac09b437a1dc8a0f253e265934a8aaf4d2f8b Mon Sep 17 00:00:00 2001
-From: Jouni Malinen <j@w1.fi>
-Date: Sun, 1 Oct 2017 12:32:57 +0300
-Subject: [PATCH 5/8] Fix PTK rekeying to generate a new ANonce
-
-The Authenticator state machine path for PTK rekeying ended up bypassing
-the AUTHENTICATION2 state where a new ANonce is generated when going
-directly to the PTKSTART state since there is no need to try to
-determine the PMK again in such a case. This is far from ideal since the
-new PTK would depend on a new nonce only from the supplicant.
-
-Fix this by generating a new ANonce when moving to the PTKSTART state
-for the purpose of starting new 4-way handshake to rekey PTK.
-
-Signed-off-by: Jouni Malinen <j@w1.fi>
----
- src/ap/wpa_auth.c | 24 +++++++++++++++++++++---
- 1 file changed, 21 insertions(+), 3 deletions(-)
-
-diff --git a/src/ap/wpa_auth.c b/src/ap/wpa_auth.c
-index 707971d..bf10cc1 100644
---- a/src/ap/wpa_auth.c
-+++ b/src/ap/wpa_auth.c
-@@ -1901,6 +1901,21 @@ SM_STATE(WPA_PTK, AUTHENTICATION2)
- }
- 
- 
-+static int wpa_auth_sm_ptk_update(struct wpa_state_machine *sm)
-+{
-+	if (random_get_bytes(sm->ANonce, WPA_NONCE_LEN)) {
-+		wpa_printf(MSG_ERROR,
-+			   "WPA: Failed to get random data for ANonce");
-+		sm->Disconnect = TRUE;
-+		return -1;
-+	}
-+	wpa_hexdump(MSG_DEBUG, "WPA: Assign new ANonce", sm->ANonce,
-+		    WPA_NONCE_LEN);
-+	sm->TimeoutCtr = 0;
-+	return 0;
-+}
-+
-+
- SM_STATE(WPA_PTK, INITPMK)
- {
- 	u8 msk[2 * PMK_LEN];
-@@ -2458,9 +2473,12 @@ SM_STEP(WPA_PTK)
- 		SM_ENTER(WPA_PTK, AUTHENTICATION);
- 	else if (sm->ReAuthenticationRequest)
- 		SM_ENTER(WPA_PTK, AUTHENTICATION2);
--	else if (sm->PTKRequest)
--		SM_ENTER(WPA_PTK, PTKSTART);
--	else switch (sm->wpa_ptk_state) {
-+	else if (sm->PTKRequest) {
-+		if (wpa_auth_sm_ptk_update(sm) < 0)
-+			SM_ENTER(WPA_PTK, DISCONNECTED);
-+		else
-+			SM_ENTER(WPA_PTK, PTKSTART);
-+	} else switch (sm->wpa_ptk_state) {
- 	case WPA_PTK_INITIALIZE:
- 		break;
- 	case WPA_PTK_DISCONNECT:
--- 
-2.7.4
-
diff --git a/network/hostapd/patches/rebased-v2.6-0006-TDLS-Reject-TPK-TK-reconfiguration.patch b/network/hostapd/patches/rebased-v2.6-0006-TDLS-Reject-TPK-TK-reconfiguration.patch
deleted file mode 100644
index e1bd5a5726..0000000000
--- a/network/hostapd/patches/rebased-v2.6-0006-TDLS-Reject-TPK-TK-reconfiguration.patch
+++ /dev/null
@@ -1,132 +0,0 @@
-From 6c4bed4f47d1960ec04981a9d50e5076aea5223d Mon Sep 17 00:00:00 2001
-From: Jouni Malinen <j@w1.fi>
-Date: Fri, 22 Sep 2017 11:03:15 +0300
-Subject: [PATCH 6/8] TDLS: Reject TPK-TK reconfiguration
-
-Do not try to reconfigure the same TPK-TK to the driver after it has
-been successfully configured. This is an explicit check to avoid issues
-related to resetting the TX/RX packet number. There was already a check
-for this for TPK M2 (retries of that message are ignored completely), so
-that behavior does not get modified.
-
-For TPK M3, the TPK-TK could have been reconfigured, but that was
-followed by immediate teardown of the link due to an issue in updating
-the STA entry. Furthermore, for TDLS with any real security (i.e.,
-ignoring open/WEP), the TPK message exchange is protected on the AP path
-and simple replay attacks are not feasible.
-
-As an additional corner case, make sure the local nonce gets updated if
-the peer uses a very unlikely "random nonce" of all zeros.
-
-Signed-off-by: Jouni Malinen <j@w1.fi>
----
- src/rsn_supp/tdls.c | 38 ++++++++++++++++++++++++++++++++++++--
- 1 file changed, 36 insertions(+), 2 deletions(-)
-
-diff --git a/src/rsn_supp/tdls.c b/src/rsn_supp/tdls.c
-index e424168..9eb9738 100644
---- a/src/rsn_supp/tdls.c
-+++ b/src/rsn_supp/tdls.c
-@@ -112,6 +112,7 @@ struct wpa_tdls_peer {
- 		u8 tk[16]; /* TPK-TK; assuming only CCMP will be used */
- 	} tpk;
- 	int tpk_set;
-+	int tk_set; /* TPK-TK configured to the driver */
- 	int tpk_success;
- 	int tpk_in_progress;
- 
-@@ -192,6 +193,20 @@ static int wpa_tdls_set_key(struct wpa_sm *sm, struct wpa_tdls_peer *peer)
- 	u8 rsc[6];
- 	enum wpa_alg alg;
- 
-+	if (peer->tk_set) {
-+		/*
-+		 * This same TPK-TK has already been configured to the driver
-+		 * and this new configuration attempt (likely due to an
-+		 * unexpected retransmitted frame) would result in clearing
-+		 * the TX/RX sequence number which can break security, so must
-+		 * not allow that to happen.
-+		 */
-+		wpa_printf(MSG_INFO, "TDLS: TPK-TK for the peer " MACSTR
-+			   " has already been configured to the driver - do not reconfigure",
-+			   MAC2STR(peer->addr));
-+		return -1;
-+	}
-+
- 	os_memset(rsc, 0, 6);
- 
- 	switch (peer->cipher) {
-@@ -209,12 +224,15 @@ static int wpa_tdls_set_key(struct wpa_sm *sm, struct wpa_tdls_peer *peer)
- 		return -1;
- 	}
- 
-+	wpa_printf(MSG_DEBUG, "TDLS: Configure pairwise key for peer " MACSTR,
-+		   MAC2STR(peer->addr));
- 	if (wpa_sm_set_key(sm, alg, peer->addr, -1, 1,
- 			   rsc, sizeof(rsc), peer->tpk.tk, key_len) < 0) {
- 		wpa_printf(MSG_WARNING, "TDLS: Failed to set TPK to the "
- 			   "driver");
- 		return -1;
- 	}
-+	peer->tk_set = 1;
- 	return 0;
- }
- 
-@@ -696,7 +714,7 @@ static void wpa_tdls_peer_clear(struct wpa_sm *sm, struct wpa_tdls_peer *peer)
- 	peer->cipher = 0;
- 	peer->qos_info = 0;
- 	peer->wmm_capable = 0;
--	peer->tpk_set = peer->tpk_success = 0;
-+	peer->tk_set = peer->tpk_set = peer->tpk_success = 0;
- 	peer->chan_switch_enabled = 0;
- 	os_memset(&peer->tpk, 0, sizeof(peer->tpk));
- 	os_memset(peer->inonce, 0, WPA_NONCE_LEN);
-@@ -1159,6 +1177,7 @@ skip_rsnie:
- 		wpa_tdls_peer_free(sm, peer);
- 		return -1;
- 	}
-+	peer->tk_set = 0; /* A new nonce results in a new TK */
- 	wpa_hexdump(MSG_DEBUG, "TDLS: Initiator Nonce for TPK handshake",
- 		    peer->inonce, WPA_NONCE_LEN);
- 	os_memcpy(ftie->Snonce, peer->inonce, WPA_NONCE_LEN);
-@@ -1751,6 +1770,19 @@ static int wpa_tdls_addset_peer(struct wpa_sm *sm, struct wpa_tdls_peer *peer,
- }
- 
- 
-+static int tdls_nonce_set(const u8 *nonce)
-+{
-+	int i;
-+
-+	for (i = 0; i < WPA_NONCE_LEN; i++) {
-+		if (nonce[i])
-+			return 1;
-+	}
-+
-+	return 0;
-+}
-+
-+
- static int wpa_tdls_process_tpk_m1(struct wpa_sm *sm, const u8 *src_addr,
- 				   const u8 *buf, size_t len)
- {
-@@ -2004,7 +2036,8 @@ skip_rsn:
- 	peer->rsnie_i_len = kde.rsn_ie_len;
- 	peer->cipher = cipher;
- 
--	if (os_memcmp(peer->inonce, ftie->Snonce, WPA_NONCE_LEN) != 0) {
-+	if (os_memcmp(peer->inonce, ftie->Snonce, WPA_NONCE_LEN) != 0 ||
-+	    !tdls_nonce_set(peer->inonce)) {
- 		/*
- 		 * There is no point in updating the RNonce for every obtained
- 		 * TPK M1 frame (e.g., retransmission due to timeout) with the
-@@ -2020,6 +2053,7 @@ skip_rsn:
- 				"TDLS: Failed to get random data for responder nonce");
- 			goto error;
- 		}
-+		peer->tk_set = 0; /* A new nonce results in a new TK */
- 	}
- 
- #if 0
--- 
-2.7.4
-
diff --git a/network/hostapd/patches/rebased-v2.6-0008-FT-Do-not-allow-multiple-Reassociation-Response-fram.patch b/network/hostapd/patches/rebased-v2.6-0008-FT-Do-not-allow-multiple-Reassociation-Response-fram.patch
deleted file mode 100644
index b9678f6815..0000000000
--- a/network/hostapd/patches/rebased-v2.6-0008-FT-Do-not-allow-multiple-Reassociation-Response-fram.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-From b372ab0b7daea719749194dc554b26e6367603f2 Mon Sep 17 00:00:00 2001
-From: Jouni Malinen <j@w1.fi>
-Date: Fri, 22 Sep 2017 12:06:37 +0300
-Subject: [PATCH 8/8] FT: Do not allow multiple Reassociation Response frames
-
-The driver is expected to not report a second association event without
-the station having explicitly request a new association. As such, this
-case should not be reachable. However, since reconfiguring the same
-pairwise or group keys to the driver could result in nonce reuse issues,
-be extra careful here and do an additional state check to avoid this
-even if the local driver ends up somehow accepting an unexpected
-Reassociation Response frame.
-
-Signed-off-by: Jouni Malinen <j@w1.fi>
----
- src/rsn_supp/wpa.c    | 3 +++
- src/rsn_supp/wpa_ft.c | 8 ++++++++
- src/rsn_supp/wpa_i.h  | 1 +
- 3 files changed, 12 insertions(+)
-
-diff --git a/src/rsn_supp/wpa.c b/src/rsn_supp/wpa.c
-index 0550a41..2a53c6f 100644
---- a/src/rsn_supp/wpa.c
-+++ b/src/rsn_supp/wpa.c
-@@ -2440,6 +2440,9 @@ void wpa_sm_notify_disassoc(struct wpa_sm *sm)
- #ifdef CONFIG_TDLS
- 	wpa_tdls_disassoc(sm);
- #endif /* CONFIG_TDLS */
-+#ifdef CONFIG_IEEE80211R
-+	sm->ft_reassoc_completed = 0;
-+#endif /* CONFIG_IEEE80211R */
- 
- 	/* Keys are not needed in the WPA state machine anymore */
- 	wpa_sm_drop_sa(sm);
-diff --git a/src/rsn_supp/wpa_ft.c b/src/rsn_supp/wpa_ft.c
-index 205793e..d45bb45 100644
---- a/src/rsn_supp/wpa_ft.c
-+++ b/src/rsn_supp/wpa_ft.c
-@@ -153,6 +153,7 @@ static u8 * wpa_ft_gen_req_ies(struct wpa_sm *sm, size_t *len,
- 	u16 capab;
- 
- 	sm->ft_completed = 0;
-+	sm->ft_reassoc_completed = 0;
- 
- 	buf_len = 2 + sizeof(struct rsn_mdie) + 2 + sizeof(struct rsn_ftie) +
- 		2 + sm->r0kh_id_len + ric_ies_len + 100;
-@@ -681,6 +682,11 @@ int wpa_ft_validate_reassoc_resp(struct wpa_sm *sm, const u8 *ies,
- 		return -1;
- 	}
- 
-+	if (sm->ft_reassoc_completed) {
-+		wpa_printf(MSG_DEBUG, "FT: Reassociation has already been completed for this FT protocol instance - ignore unexpected retransmission");
-+		return 0;
-+	}
-+
- 	if (wpa_ft_parse_ies(ies, ies_len, &parse) < 0) {
- 		wpa_printf(MSG_DEBUG, "FT: Failed to parse IEs");
- 		return -1;
-@@ -781,6 +787,8 @@ int wpa_ft_validate_reassoc_resp(struct wpa_sm *sm, const u8 *ies,
- 		return -1;
- 	}
- 
-+	sm->ft_reassoc_completed = 1;
-+
- 	if (wpa_ft_process_gtk_subelem(sm, parse.gtk, parse.gtk_len) < 0)
- 		return -1;
- 
-diff --git a/src/rsn_supp/wpa_i.h b/src/rsn_supp/wpa_i.h
-index 41f371f..56f88dc 100644
---- a/src/rsn_supp/wpa_i.h
-+++ b/src/rsn_supp/wpa_i.h
-@@ -128,6 +128,7 @@ struct wpa_sm {
- 	size_t r0kh_id_len;
- 	u8 r1kh_id[FT_R1KH_ID_LEN];
- 	int ft_completed;
-+	int ft_reassoc_completed;
- 	int over_the_ds_in_progress;
- 	u8 target_ap[ETH_ALEN]; /* over-the-DS target AP */
- 	int set_ptk_after_assoc;
--- 
-2.7.4
-
diff --git a/network/hostsblock/README b/network/hostsblock/README
index d52b818eb4..939bf42066 100644
--- a/network/hostsblock/README
+++ b/network/hostsblock/README
@@ -1,15 +1,16 @@
-Hostsblock is a bash script for Linux designed to take advantage of the
-/etc/hosts file to provide system-wide blocking of internet advertisements,
-malicious domains, trackers, and other undesirable content. To do so, it
-downloads a configurable set of blocklists and processes and their entries into
-a singular file.
+Hostsblock is a bash script for Linux designed to take advantage
+of the /etc/hosts file to provide system-wide blocking of internet
+advertisements, malicious domains, trackers, and other undesirable
+content. To do so, it downloads a configurable set of blocklists and
+processes and their entries into a singular file.
 
-The SlackBuild assumes that dnsmasq is not available so it will configure
-hostsblock to overwrite the current /etc/hosts file. The install script will
-backup the current /etc/hosts file to /etc/hostsblock/hosts.head if it does
-not already exist.
+The SlackBuild assumes that dnsmasq is not available so it
+will configure hostsblock to overwrite the current /etc/hosts
+file. The install script will backup the current /etc/hosts file to
+/etc/hostsblock/hosts.head if it does not already exist.
 
-After uninstalling hostsblock, you should copy hosts.head back to /etc/hosts.
+After uninstalling hostsblock, you should copy hosts.head back to
+/etc/hosts.
 
 To have hostsblock automatically update /etc/hosts once a week, run:
   ln -sf /usr/sbin/hostsblock /etc/cron.weekly/hostsblock
diff --git a/network/hostsblock/hostsblock.SlackBuild b/network/hostsblock/hostsblock.SlackBuild
index df6ff55748..56dac55752 100644
--- a/network/hostsblock/hostsblock.SlackBuild
+++ b/network/hostsblock/hostsblock.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # SlackBuild script for hostsblock
 
@@ -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=hostsblock
 VERSION=${VERSION:-0.12.3}
 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}
@@ -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/network/hping3/README b/network/hping3/README
index acfffada38..8ccccb064e 100644
--- a/network/hping3/README
+++ b/network/hping3/README
@@ -1,12 +1,12 @@
-hping is a command-line oriented TCP/IP packet assembler/analyzer. The interface
-is inspired to the ping(8) unix command, but hping isn't only able to send ICMP
-echo requests. It supports TCP, UDP, ICMP and RAW-IP protocols, has a traceroute
-mode, the ability to send files between a covered channel, and many other
-features.
+hping is a command-line oriented TCP/IP packet assembler/analyzer. The
+interface is inspired to the ping(8) unix command, but hping isn't
+only able to send ICMP echo requests. It supports TCP, UDP, ICMP and
+RAW-IP protocols, has a traceroute mode, the ability to send files
+between a covered channel, and many other features.
 
-While hping was mainly used as a security tool in the past, it can be used in
-many ways by people that don't care about security to test networks and hosts. A
-subset of the stuff you can do using hping:
+While hping was mainly used as a security tool in the past, it can
+be used in many ways by people that don't care about security to test
+networks and hosts. A subset of the stuff you can do using hping:
  * Firewall testing
  * Advanced port scanning
  * Network testing, using different protocols, TOS, fragmentation
diff --git a/network/hping3/hping3.SlackBuild b/network/hping3/hping3.SlackBuild
index 10f08e77c6..52cbfebd28 100644
--- a/network/hping3/hping3.SlackBuild
+++ b/network/hping3/hping3.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for hping3 TCP/IP packet assembler/analyzer
 
@@ -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=hping3
 VERSION=${VERSION:-20051105}
 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}
@@ -88,7 +98,7 @@ MANPATH=/usr/man ./configure \
 # From Arch Linux - Adds DESTDIR to Makefile
 patch -p1 --verbose < $CWD/patches/Makefile.patch
 
-make CCOPT="$SLKCFLAGS -DUSE_TCL"
+make CCOPT="$SLKCFLAGS -DUSE_TCL -fcommon"
 make install DESTDIR=$PKG
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
@@ -105,4 +115,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/network/httpie/README b/network/httpie/README
index eb39809b52..8b41f65b1d 100644
--- a/network/httpie/README
+++ b/network/httpie/README
@@ -1,7 +1,8 @@
 HTTPie: a CLI, cURL-like tool for humans.
 
-HTTPie is a command line HTTP client. Its goal is to make CLI interaction
-with web services as human-friendly as possible. It provides a
-simple http command that allows for sending arbitrary HTTP requests using a
-simple and natural syntax, and displays colorized responses. HTTPie can be used
-for testing, debugging, and generally interacting with HTTP servers.
+HTTPie is a command line HTTP client. Its goal is to make CLI
+interaction with web services as human-friendly as possible. It
+provides a simple http command that allows for sending arbitrary HTTP
+requests using a simple and natural syntax, and displays colorized
+responses. HTTPie can be used for testing, debugging, and generally
+interacting with HTTP servers.
diff --git a/network/httpie/httpie.SlackBuild b/network/httpie/httpie.SlackBuild
index 0e7e938d08..5b6c73bef1 100644
--- a/network/httpie/httpie.SlackBuild
+++ b/network/httpie/httpie.SlackBuild
@@ -1,8 +1,10 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for httpie
 
-# Copyright 2014-2018  Dimitris Zlatanidis  Orestiada, Greece
+# Copyright 2024       Dimitris Zlatanidis  Orestiada, Greece
+# Copyright 2014-2019  Dimitris Zlatanidis  Orestiada, Greece
+# Copyright 2023-2024  Juan M. Lasca        <juanmlasca@gmail.com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,65 +24,59 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=httpie
-VERSION=${VERSION:-1.0.2}
-BUILD=${BUILD:-1}
+VERSION=${VERSION:-3.2.2}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+ARCH=noarch
+
+# Thanks to Alan Alberghini for pointing this out
+SRCNAME=cli
 
-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
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-cd $PRGNAM-$VERSION
+rm -rf $SRCNAME-$VERSION
+tar xvf $CWD/$SRCNAME-$VERSION.tar.gz
+cd $SRCNAME-$VERSION
 chown -R root:root .
 find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -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 {} \;
+
+python3 setup.py install --root=$PKG
 
-python setup.py install --root=$PKG
+mv $PKG/usr/share/man $PKG/usr/man
+rmdir $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
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a LICENSE PKG-INFO README.rst $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+   AUTHORS.md LICENSE SECURITY.md CHANGELOG.md \
+   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}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/network/httpie/httpie.info b/network/httpie/httpie.info
index 0deca67978..9be33bd6b4 100644
--- a/network/httpie/httpie.info
+++ b/network/httpie/httpie.info
@@ -1,10 +1,10 @@
 PRGNAM="httpie"
-VERSION="1.0.2"
-HOMEPAGE="https://httpie.org/"
-DOWNLOAD="https://files.pythonhosted.org/packages/09/8d/581ef7bd9a09dc30b621638a4fa805a2073bbfb45fa06ed37f998f172419/httpie-1.0.2.tar.gz"
-MD5SUM="ffce3b97430014d049ceb5988bffff1d"
+VERSION="3.2.2"
+HOMEPAGE="https://httpie.io"
+DOWNLOAD="https://github.com/httpie/cli/archive/3.2.2/cli-3.2.2.tar.gz"
+MD5SUM="fd08e0001da0781a2f7038ea38ac8d08"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="python-requests Pygments"
+REQUIRES="python3-multidict python3-rich python3-defusedxml PySocks requests-toolbelt"
 MAINTAINER="Dimitris Zlatanidis"
-EMAIL="d.zlatanidis@gmail.com"
+EMAIL="dslackw@gmail.com"
diff --git a/network/httping/httping.SlackBuild b/network/httping/httping.SlackBuild
index 8ae0016fd5..83bb444a46 100644
--- a/network/httping/httping.SlackBuild
+++ b/network/httping/httping.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for httping
 
@@ -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=httping
 VERSION=${VERSION:-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"
@@ -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/network/httptunnel/httptunnel.SlackBuild b/network/httptunnel/httptunnel.SlackBuild
index d6131bc49e..840afb6f9e 100644
--- a/network/httptunnel/httptunnel.SlackBuild
+++ b/network/httptunnel/httptunnel.SlackBuild
@@ -1,29 +1,39 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for <httptunnel>
 
 # Written by (sombriks) (sombriks  at gmail dot  com)
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=httptunnel
 VERSION=${VERSION:-3.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}
 
-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"
@@ -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/network/httrack/httrack.SlackBuild b/network/httrack/httrack.SlackBuild
index d5976ddd12..93c53952bc 100644
--- a/network/httrack/httrack.SlackBuild
+++ b/network/httrack/httrack.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for httrack
 # Copyright 2013 klaatu member.fsf.org
@@ -8,26 +8,36 @@
 # notice and this notice are preserved.  This file is offered as-is,
 # without any warranty.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=httrack
-VERSION=${VERSION:-3.47.21}
-BUILD=${BUILD:-1}
+VERSION=${VERSION:-3.49.2}
+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"
@@ -77,9 +87,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/network/httrack/httrack.info b/network/httrack/httrack.info
index 597ebcc033..07b38b7399 100644
--- a/network/httrack/httrack.info
+++ b/network/httrack/httrack.info
@@ -1,8 +1,8 @@
 PRGNAM="httrack"
-VERSION="3.47.21"
+VERSION="3.49.2"
 HOMEPAGE="http://www.httrack.com"
-DOWNLOAD="http://mirror.httrack.com/historical/httrack-3.47.21.tar.gz"
-MD5SUM="2296de7b3b0be24758d4bbea8c0ebb20"
+DOWNLOAD="http://mirror.httrack.com/historical/httrack-3.49.2.tar.gz"
+MD5SUM="1fd1ab9953432f0474a66b67a71d6381"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/network/hydra/README b/network/hydra/README
index cb062e4de5..33ab88bb80 100644
--- a/network/hydra/README
+++ b/network/hydra/README
@@ -6,10 +6,11 @@ to give researchers and security consultants a way to demonstrate
 how easy it would be to gain unauthorized access to a remote system.
            THIS TOOL IS FOR LEGAL PURPOSES ONLY!
 
-postgresql is an optional dependency, as is sap, but sap is not available
-at SBo.
+postgresql is an optional dependency, as is sap, but sap is not
+available at SBo.
 
-This SlackBuild includes an option to omit the GTK-based frontend xhydra.
+This SlackBuild includes an option to omit the GTK-based frontend
+xhydra.
 To omit xhydra, just pass XHYDRA=0 to the script:
     XHYDRA=0 sh hydra.SlackBuild
 
diff --git a/network/hydra/hydra.SlackBuild b/network/hydra/hydra.SlackBuild
index c2052738a0..9808bbb91c 100644
--- a/network/hydra/hydra.SlackBuild
+++ b/network/hydra/hydra.SlackBuild
@@ -1,12 +1,15 @@
-#!/bin/sh
+#!/bin/bash
 # Slackware build script for Hydra
 # Written by Larry Hajali <larryhaja[at]gmail[dot]com>
 # Updated by Kent Fritz <fritz.kent@gmail.com>
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=hydra
-VERSION=${VERSION:-8.8}
+VERSION=${VERSION:-9.4}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -16,7 +19,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,9 +68,8 @@ else
     MAKE_OPTS="XHYDRA_SUPPORT="
 fi
 
-echo CONFIG_OPTS is $CONFIG_OPTS
 ./configure $CONFIG_OPTS --prefix=$PKG/usr
-make OPTS="-I. $SLKCFLAGS" $MAKE_OPTS
+make OPTS="-I. $SLKCFLAGS -fcommon" $MAKE_OPTS
 mkdir -p $PKG/usr/etc
 make install
 
@@ -103,4 +109,4 @@ if [ "$XHYDRA" = "1" ]; 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/network/hydra/hydra.info b/network/hydra/hydra.info
index 4f6013d571..6ce60c725c 100644
--- a/network/hydra/hydra.info
+++ b/network/hydra/hydra.info
@@ -1,8 +1,8 @@
 PRGNAM="hydra"
-VERSION="8.8"
+VERSION="9.4"
 HOMEPAGE="https://github.com/vanhauser-thc/thc-hydra"
-DOWNLOAD="https://github.com/vanhauser-thc/thc-hydra/archive/v8.8/thc-hydra-8.8.tar.gz"
-MD5SUM="56c5a4f478bc46d3e6fc54cc5caa9c4a"
+DOWNLOAD="https://github.com/vanhauser-thc/thc-hydra/archive/v9.4/thc-hydra-9.4.tar.gz"
+MD5SUM="5486ece8f48c80fee8a5e9f6a295f4c0"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/network/hylafax+/README b/network/hylafax+/README
index 347202297b..3203b17bce 100644
--- a/network/hylafax+/README
+++ b/network/hylafax+/README
@@ -6,4 +6,4 @@ an outbound job from any other machine on the network.
 
 HylaFAX+ is a more feature rich fork of the HylaFAX project.
 
-See /usr/doc/hylafax-7.0.0/README.SLACKWARE for configuration hints.
+See /usr/doc/hylafax-7.0.2/README.SLACKWARE for configuration hints.
diff --git a/network/hylafax+/hylafax+.SlackBuild b/network/hylafax+/hylafax+.SlackBuild
index e35b925fbe..18465f759a 100644
--- a/network/hylafax+/hylafax+.SlackBuild
+++ b/network/hylafax+/hylafax+.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for hylafax+
 
-# Copyright 2013-2019 Chris Walker Kempner, TX
+# Copyright 2013-2020 Chris Walker Kempner, TX
 # 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=hylafax+
 SRCNAM=hylafax
-VERSION=${VERSION:-7.0.0}
+VERSION=${VERSION:-7.0.5}
 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}
@@ -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/network/hylafax+/hylafax+.info b/network/hylafax+/hylafax+.info
index 5647f3f419..fd7edd7862 100644
--- a/network/hylafax+/hylafax+.info
+++ b/network/hylafax+/hylafax+.info
@@ -1,8 +1,8 @@
 PRGNAM="hylafax+"
-VERSION="7.0.0"
+VERSION="7.0.5"
 HOMEPAGE="http://hylafax.sourceforge.net"
-DOWNLOAD="https://iweb.dl.sourceforge.net/project/hylafax/hylafax/hylafax-7.0.0.tar.gz"
-MD5SUM="5e779c2099a80d886c38ad536d131706"
+DOWNLOAD="http://prdownloads.sourceforge.net/hylafax/hylafax-7.0.5.tar.gz"
+MD5SUM="ac8450d7aa8e5d6dd726e4d601702d69"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/network/hylafax/README b/network/hylafax/README
deleted file mode 100644
index ab92701ff5..0000000000
--- a/network/hylafax/README
+++ /dev/null
@@ -1,7 +0,0 @@
-HylaFAX is an enterprise-class system for sending and receiving
-facsimiles as well as for sending alpha-numeric pages.The software
-is designed around a client-server architecture. Fax modems may
-reside on a single machine on a network and clients can submit
-an outbound job from any other machine on the network.
-
-See /usr/doc/hylafax-6.0.2/README.SLACKWARE for configuration hints.
diff --git a/network/hylafax/README.SLACKWARE b/network/hylafax/README.SLACKWARE
deleted file mode 100644
index 10f1904c54..0000000000
--- a/network/hylafax/README.SLACKWARE
+++ /dev/null
@@ -1,27 +0,0 @@
-/usr/doc/hylafax-@VERSION@/README.SLACKWARE
-
-If you need to start hylafax at boot, add this to /etc/rc.d/rc.local:
-
-  # Starting the HylaFAX hfaxd and faxq Daemons at Boot.
-    if [ -x /etc/rc.d/rc.hylafax ]; then
-      /etc/rc.d/rc.hylafax start
-    fi
-
-Edit /etc/inittab and add a line similar to:
-  m0:2345:respawn:/usr/libexec/hylafax/sbin/faxgetty ttyS0
-where 'm0' is unique in inittab and 'ttyS0' matches the device
-name(s) used at the outset of the faxaddmodem script. 
-
-With root permissions, execute '/usr/sbin/faxsetup'.
-When finished, faxsetup will automatically run faxaddmodem for you. 
-Generally, you can follow all of the defaults except those for FaxMaster, 
-the local fax number(s), TSI, and any modem-specific information in 
-faxaddmodem.
-
-It would be wise to run faxcron and faxqclean regularly from cron so that 
-the queue directories do not clutter up and fill the storage device.  Many 
-installations run faxqclean every hour and faxcron every day.  Insert 
-something like this into your uucp or root crontab file:
-  0 * * * * /usr/sbin/faxqclean
-  0 0 * * * /usr/sbin/faxcron | mail -s "HylaFAX Usage Report" faxmaster
-
diff --git a/network/hylafax/config.local.in b/network/hylafax/config.local.in
deleted file mode 100644
index 20412e22fe..0000000000
--- a/network/hylafax/config.local.in
+++ /dev/null
@@ -1,255 +0,0 @@
-# $Id: config.site,v 1.24 2009/04/23 12:45:30 aidan Exp $
-#
-# HylaFAX Facsimile Software
-#
-# Copyright (c) 1990-1996 Sam Leffler
-# Copyright (c) 1991-1996 Silicon Graphics, Inc.
-# HylaFAX is a trademark of Silicon Graphics, Inc.
-# 
-# Permission to use, copy, modify, distribute, and sell this software and 
-# its documentation for any purpose is hereby granted without fee, provided
-# that (i) the above copyright notices and this permission notice appear in
-# all copies of the software and related documentation, and (ii) the names of
-# Sam Leffler and Silicon Graphics may not be used in any advertising or
-# publicity relating to the software without the specific, prior written
-# permission of Sam Leffler and Silicon Graphics.
-# 
-# THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND, 
-# EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY 
-# WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.  
-# 
-# IN NO EVENT SHALL SAM LEFFLER OR SILICON GRAPHICS BE LIABLE FOR
-# ANY SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND,
-# OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
-# WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF 
-# LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE 
-# OF THIS SOFTWARE.
-#
-
-#
-# This file holds site-specific configuration parameters.
-#
-# Nothing is defined in here by default, the definitions
-# commented out below serve as documentation for what you
-# can set in this file or a config.local file.
-#
-# Note that you do not need to set anything here unless you
-# want to override the auto-configuration behaviour and/or
-# interactive prompting done by the configure script.
-#
-
-#
-# Package controls.
-#
-#DSO="auto"			# configure DSO support (auto|IRIX|no)
-#GETTY="auto"			# type of getty support (auto|BSD|SysV)
-#PS="auto"			# PostScript support to use (auto|gs|dps|imp)
-#SGI2FAX="auto"			# configure SGI image support (auto|yes|no)
-#DPS="no"			# install SGI DPS-based RIP (yes|no)
-GS="no" 			# install Ghostscript RIP (yes|no)
-#IMP="no"			# install SGI Impressario 2.1 support (yes|no)
-#REGEX="yes"			# use distributed regular expression package
-#UTMP="utmpx"			# type of utmp+wtmp handling (auto|utmp|utmpx)
-#NLS="auto"			# enable NLS support (auto|yes|no)
-
-#
-# Directory parameters.
-#
-DIR_BIN="/usr/bin"		        # directory for client apps
-DIR_LIB="/usr/lib@LIBDIRSUFFIX@"        # directory for libfaxserver, libfaxutil
-DIR_LIBDATA="/usr/lib@LIBDIRSUFFIX@/hylafax"		# directory for client data
-DIR_LIBEXEC="/usr/libexec/hylafax"	# directory for libraries&hidden apps
-DIR_LOCALE='/usr/share/locale'
-DIR_MAN="/usr/man"		        # directory for manual pages
-DIR_SPOOL="/var/spool/hylafax"		# directory for spooling area
-DIR_SBIN="/usr/sbin"		        # directory for system apps
-#DIR_LOCKS="/usr/spool/locks"		# directory for UUCP lock files
-#FONTMAP="/usr/share/ghostscript/3.33"	# directorys containing Fontmap files
-#PATH_AFM="/usr/lib@LIBDIRSUFFIX@/DPS/AFM"		# directorys for AFM files
-
-#
-# Miscellaneous parameters.
-#
-#DEFVRES="196"				# default vertical res for outbound fax
-#FILLORDER="MS2LSB"			# bit order of cpu (MSB2LSB/LSB2MSB)
-FAXGID="uucp"				# group ID for fax user
-FAXUID="uucp"				# user ID for fax user
-PAGESIZE="North American Letter"	# default page size
-SYSGID="root"				# group ID for system installs
-SYSUID="root"				# user ID for system installs
-#LOCKS="ascii"				# default UUCP lockfile scheme
-#
-#PATH_GETTY="/etc/getty"		# pathname of suitable getty program
-#PATH_VGETTY="/bin/vgetty"		# pathname of voice getty program
-#PATH_EGETTY="/bin/egetty"		# pathname of external getty program
-#PATH_SENDMAIL="/usr/lib@LIBDIRSUFFIX@/sendmail"	# pathname of suitable sendmail program
-PATH_GSRIP="/usr/bin/gs"		# pathname of Ghostscript-based RIP
-#PATH_DPSRIP="/var/spool/hylafax/bin/ps2fax.exe" # pathname of DPS-based RIP
-#PATH_IMPRIP="/usr/lib@LIBDIRSUFFIX@/print/psrip"	# pathname of Impressario 2.1 RIP
-#MANSCHEME="sysv-source-cat-strip"	# manual page installation scheme
-SYSVINIT="auto"		                # install SysV-style init support (auto|yes|no)
-DIR_SYSVINIT="/etc/rc.d"                # location of SysV-style init script
-DIR_SYSVINITSTART="/etc/rc.d"	        # location of SysV-style start script
-DIR_SYSVINITSTOP="/etc/rc.d"	        # location of SysV-style stop script
-NAME_SYSVINITSTART="rc.hylafax"	        # name of SysV-style start script
-NAME_SYSVINITSTOP="rc.hylafax"	        # name of SysV-style stop script
-FAXQ_SERVER=yes		                # init script starts faxq
-HFAXD_SERVER=yes		        # init script starts hfaxd
-HFAXD_SNPP_SERVER=no		        # don't start paging protocol
-
-# SVR4 packaging stuff
-#PKG_ARCH=				# ARCH variable in pkginfo file
-#PKG_EMAIL=someone@somehost.somedomain	# EMAIL variable in pkginfo file
-#PKG_VENDOR="Your Name Here"		# VENDOR variable in pkginfo file
-#
-
-#
-# Parameters used when building the software.
-#
-# Note that configure has several ENVOPTS built into it that are
-# set according to the target.  This is done to help naive folks.
-#
-# Beware of changing the INSTALL definition; you *must* have an
-# install script that emulates the Silicon Graphics install program!
-#
-#AR="/bin/ar"				# pathname of suitable ar program
-#AROPTS="rc"				# options to ar for creating archive
-#CC="gcc"				# name/pathname of C compiler
-#CXX="gcc"				# name/pathname of C++ compiler
-#CXXFILE="-x c++"			# options for proper C++ processing
-#ENVOPTS="-Aa"				# options for getting ANSI C
-#GCOPTS="-g"				# options to pass C compiler
-#GCXXOPTS="-g"				# options to pass C++ compiler
-#GENDIST="/sbin/gendist"		# pathname of SGI inst generator program
-#INSTALL='${SHELL} ${PORT}/install.sh'	# SGI install program/emulator
-#LIBMALLOC="auto"			# yes|no|auto configure -lmalloc use
-#LIBPORT='${PORT}/libport.a'		# library with emulation code
-#LIBSUN="auto"				# yes|no|auto configure -lsun use
-#LLDOPTS=""				# extra link line options
-#MACHDEPLIBS=""				# extra libraries for linking
-#OPTIMIZER="-O"				# optimizer flags
-#PORTFUNCS=""				# non-standard functions to emulate
-#PROTOTYPES="-prototypes"		# C compiler options for checking function prototypes
-#RANLIB=":"				# pathname of suitable ranlib program
-#SHDLIBC="-lc_s"			# shared C library, if not standard
-#SIGHANDLERTYPES='(void(*)(int,...))'	# types to check for signal handler
-#STRIP="/bin/strip"			# strip program used by install.sh
-
-#
-# The source for the TIFF library is not required
-# to build this software, but the library is required
-# to link against.  If libtiff is installed in a
-# non-standard location then setup LIBTIFF accordingly.
-#
-LIBTIFF="-L/usr/lib@LIBDIRSUFFIX@ -ltiff"	# linkage convention for libtiff
-TIFFINC="-I/usr/include"		# place to find tiffio.h
-TIFFBIN="/usr/bin"		# where TIFF tools live
-
-#
-# The source for the ZLIB library is not required
-# to build this software, but the library is required
-# to link against.  If ZLIB is installed in a 
-# non-standard location then setup LIBZ accordingly.
-#
-LIBZ="-L/usr/lib@LIBDIRSUFFIX@ -lz"		# linkage convention for libz
-ZLIBINC="-I/usr/include"	# place to find zlib.h
-
-#
-# The source for the POSIX regular expression package
-# is not required to build this software, but the package
-# is required to link against.  If the copy of the software
-# that is included in this distribution is not to be used
-# then set REGEX=no and supply the following definitions.
-#
-#LIBREGEX=""				# linkage convention for regex package
-#REGEXINC="-I/usr/include"		# place to find regex.h
-
-#
-# NLS (gettext) library support is used by default if it's found
-# xgettext is not required to build this software, but if you try
-# and rebuild the message template catalogs, you will need it.  Some
-# platforms may need extra options to link for libintl as well.
-#
-INTLINC="-I/usr/include"
-#LIBINTL=""				# configure will try LIBINTL="-lintl"
-#XGETTEXT="xgettext --foreign-user -ctranslator --no-wrap --sort-by-file --omit-header --strict --indent --force-po"
-#MSGMERGE="msgmerge --no-wrap --sort-by-file"
-#MSGFMT=msgfmt
-#MSGCAT=msgcat
-
-#
-# Parameters to control various workarounds for system bugs.
-#
-# These parameters are normally set in configure based on
-# the target system.  If they are set here, then they will
-# override anything done by configure.
-#
-#CONFIG_OPENFIFO="O_RDONLY"		# mode to open FIFOs in server proc's
-#CONFIG_FIFOBUG="yes"			# enable workaround for FIFO select bug
-#CONFIG_TIOCMBISBYREF="yes"		# pass arg by reference to ioctl
-#CONFIG_WINSZHACK="no"			# include extra files for TIOCWINSZ use
-#CONFIG_ABORTBUG="no"			# enable workaround for abort problems
-#CONFIG_NOREOPEN="yes"			# reopen tty device after toggling DTR
-#CONFIG_NOSTDINDUP="yes"		# do not redirect stdout to stdin in ondelay
-#CONFIG_BADEXECVPROTO="no"		# system has incorrect execv func decl
-#CONFIG_BADEXECVEPROTO="no"		# system has incorrect execve func decl
-#CONFIG_BADGETOPTPROTO="no"		# system has incorrect getopt func decl
-#CONFIG_SOCKARGLENTYPE="unsigned long"	# call-by-ref arg type for socket funcs
-#CONFIG_BADSELECTPROTO="no"		# system has way old select func decl
-#CONFIG_MAXGID="5999"			# maximum permissable GID
-#CONFIG_OSFCNH="auto"			# control inclusion of <osfcn.h>
-
-#
-# Dynamic Shared Object (DSO) support.
-#
-# Beware that adding new support for DSOs may require some
-# modifications to the */Makefile.dso files.
-#
-#DSOSUF="so"				# DSO filename suffix
-#DSODELAY="-delay_load"			# DSO option for delayed loading
-#DSOOPTS="-shared -rdata_shared"	# options for building DSOs
-
-#
-# Makefile construction parameters.
-#
-# These should not normally be set; configure will
-# deduce the appropriate syntax to use for includes.
-#
-#MAKECXXOVERRIDE="=.C"			# make override stuff for SunPRO C++
-#MAKEDEPINCLUDE="include"		# make include for dependency files
-#MAKEDSOINCLUDE="#"			# make include for DSO support
-#MAKEINCLUDE=".include"			# make include syntax
-#MAKELQUOTE="<"				# make include syntax
-#MAKERQUOTE=">"				# make include syntax
-#SETMAKE='MAKE	= ${MAKE}'		# define if make does not setup $MAKE
-#MKDEPCOPTS=""				# C compiler opts to supply w/ -M
-#MKDEPCXXOPTS=""			# C++ compiler opts to supply w/ -M
-
-#
-# General system stuff used by the distribution.
-#
-# Beware of setting these as configure selects several programs
-# based on whether or not they are capable of processing scripts
-# included in the distribution (e.g AWK and SCRIPT_SH, SED).
-#
-#AWK="/bin/awk"				# pathname of suitable awk program
-#CAT="/bin/cat"				# pathname of suitable cat program
-#CHGRP="/etc/chgrp"			# pathname of suitable chgrp program
-#CHMOD="/etc/chmod"			# pathname of suitable chmod program
-#CHOWN="/etc/chown"			# pathname of suitable chown program
-#CMP="/bin/cmp"				# pathname of suitable cmp program
-#COL="/bin/col"				# pathname of suitable col program
-#CP="/bin/cp"				# pathname of suitable cp program
-#ECHO="/bin/echo"			# pathname of suitable echo program
-#GREP="/bin/grep"			# pathname of suitable grep program
-#LN="/bin/ln"				# pathname of suitable ln program
-#LN_S="-s"				# option to ${LN} to create symlink
-#MAN="/usr/bin/man"			# pathname of suitable man program
-MKDIR="/bin/mkdir -p"			# pathname of suitable mkdir program
-#MKFIFO="/bin/mkfifo"			# pathname of suitable mkfifo program
-#MV="/bin/mv"				# pathname of suitable mv program
-#MV_F="-f"				# option to ${MV} to force operation
-#RMCMD="/bin/rm"			# pathname of suitable rm program
-#SED="/bin/sed"				# pathname of suitable sed program
-#SCRIPT_SH="/bin/sh"			# pathname of suitable shell
-#SORT="/bin/sort"			# pathname of suitable sort program
diff --git a/network/hylafax/doinst.sh b/network/hylafax/doinst.sh
deleted file mode 100644
index 33d3c9deca..0000000000
--- a/network/hylafax/doinst.sh
+++ /dev/null
@@ -1,37 +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.hylafax.new:
-if [ -e etc/rc.d/rc.hylafax ]; then
-  cp -a etc/rc.d/rc.hylafax etc/rc.d/rc.hylafax.new.incoming
-  cat etc/rc.d/rc.hylafax.new > etc/rc.d/rc.hylafax.new.incoming
-  mv etc/rc.d/rc.hylafax.new.incoming etc/rc.d/rc.hylafax.new
-else
-  # Install executable otherwise - irrelevant unless user starts in rc.local
-  chmod 0755 etc/rc.d/rc.hylafax.new
-fi
-
-config etc/rc.d/rc.hylafax.new
-config var/spool/hylafax/etc/dialrules.new
-config var/spool/hylafax/etc/dialrules.europe.new
-config var/spool/hylafax/etc/dialrules.sf-ba.new
-config var/spool/hylafax/etc/dpsprinter.ps.new
-config var/spool/hylafax/etc/hosts.hfaxd.new
-
-# We warn about needed configuration to the /etc/inittab file.
-printf "\nThe following line will need be added to your /etc/inittab:
-please check if it is the correct tty device for the modem,
-and if not, change it to the correct one.
-  m0:23:respawn:/usr/libexec/hylafax/faxgetty ttyS0\n\n"
-# Hylafax faxgetty activation
-
diff --git a/network/hylafax/hylafax.SlackBuild b/network/hylafax/hylafax.SlackBuild
deleted file mode 100644
index f2663427e6..0000000000
--- a/network/hylafax/hylafax.SlackBuild
+++ /dev/null
@@ -1,126 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for hylafax
-
-# Copyright 2007-2010  David Somero (dsomero@hotmail.com) Athens,TN 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.
-
-# 2007.08.07
-# Alan Hicks <alan@lizella.net>
-# General script clean-up and minor improvements
-
-PRGNAM=hylafax
-VERSION=${VERSION:-6.0.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
-cd $PRGNAM-$VERSION
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 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 {} \;
-
-# Copy our source for the correct configuration
-sed "s|@LIBDIRSUFFIX@|${LIBDIRSUFFIX}|g" \
-  < $CWD/config.local.in \
-  > $TMP/$PRGNAM-$VERSION/config.local
-
-# strip missing header to prevent failure with GCC 4.5.
-sed -i -e 's|libc\.h ||' configure
-sed -i -e "s|-fpic|-fPIC|g" configure
-
-CFLAGS="${SLKCFLAGS}" \
-CXXFLAGS="${SLKCFLAGS}" \
-./configure \
-  --target=$ARCH-slackware-linux \
-  --nointeractive \
-  --disable-pam \
-  --with-optmizer=${CFLAGS}
-
-make
-mkdir -p $PKG/etc/rc.d
-make 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
-
-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/rc.d/hylafax $PKG/etc/rc.d/rc.hylafax.new
-( cd $PKG/var/spool/hylafax/etc
-  mv dialrules dialrules.new
-  mv dialrules.europe dialrules.europe.new
-  mv dialrules.sf-ba dialrules.sf-ba.new
-  mv dpsprinter.ps dpsprinter.ps.new
-  mv hosts.hfaxd hosts.hfaxd.new
-)
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
-  INSTALL COPYRIGHT CONTRIBUTORS README TODO VERSION doc/* \
-    $PKG/usr/doc/$PRGNAM-$VERSION
-sed "s%@VERSION@%$VERSION%g" $CWD/README.SLACKWARE > \
-  $PKG/usr/doc/$PRGNAM-$VERSION/README.SLACKWARE
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-chmod -R a-w $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/network/hylafax/hylafax.info b/network/hylafax/hylafax.info
deleted file mode 100644
index 9734af6486..0000000000
--- a/network/hylafax/hylafax.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="hylafax"
-VERSION="6.0.6"
-HOMEPAGE="http://www.hylafax.org"
-DOWNLOAD="ftp://ftp.hylafax.org/source/hylafax-6.0.6.tar.gz"
-MD5SUM="d063d45049c8fcbabefe09d662313067"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="David Somero"
-EMAIL="dsomero@hotmail.com"
diff --git a/network/hylafax/slack-desc b/network/hylafax/slack-desc
deleted file mode 100644
index 718ce285f5..0000000000
--- a/network/hylafax/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------------------------------------------------------|
-hylafax: hylafax (enterprise-class fax system)
-hylafax:
-hylafax: HylaFAX+
-hylafax: Making the Premier Open-Source Fax Management System Even Better
-hylafax: HylaFAX is an enterprise-class system for sending and receiving
-hylafax: facsimiles as well as for sending alpha-numeric pages.
-hylafax:
-hylafax: If you expect to send more than a few facsimiles a day,
-hylafax: then HylaFAX is the fax package for you!
-hylafax:
-hylafax:
diff --git a/network/i2pd/README b/network/i2pd/README
new file mode 100644
index 0000000000..512eb79c93
--- /dev/null
+++ b/network/i2pd/README
@@ -0,0 +1,13 @@
+i2pd (I2P Daemon) is a full-featured C++ implementation of I2P client.
+
+I2P (Invisible Internet Protocol) is a universal anonymous network
+layer.  All communications over I2P are anonymous and end-to-end
+encrypted, participants don't reveal their real IP addresses.
+
+I2P client is a software used for building and using anonymous I2P
+networks.  Such networks are commonly used for anonymous peer-to-peer
+applications (filesharing, cryptocurrencies) and anonymous client-server
+applications (websites, instant messengers, chat-servers).
+
+I2P allows people from all around the world to communicate and share
+information without restrictions.
diff --git a/network/i2pd/i2pd.SlackBuild b/network/i2pd/i2pd.SlackBuild
new file mode 100644
index 0000000000..3b3307f009
--- /dev/null
+++ b/network/i2pd/i2pd.SlackBuild
@@ -0,0 +1,112 @@
+#!/bin/bash
+
+# Slackbuild for i2pd
+
+# Written by shelldweller <shelldweller@beauxbead.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=i2pd
+VERSION=${VERSION:-2.48.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
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
+ -exec chmod 755 {} \; -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 build
+sed -i \
+  "s,LIBRARY DESTINATION lib,LIBRARY DESTINATION lib${LIBDIRSUFFIX}," \
+   CMakeLists.txt
+  cmake \
+    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DWITH_STATIC=OFF \
+    -DBUILD_SHARED_LIBS=ON \
+    -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 contrib/certificates/ contrib/tunnels.d/ \
+  contrib/i2pd.conf contrib/tunnels.conf contrib/subscriptions.txt \
+  $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+find $PKG/usr/doc -name "Makefile" -delete
+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
diff --git a/network/i2pd/i2pd.info b/network/i2pd/i2pd.info
new file mode 100644
index 0000000000..197490feb6
--- /dev/null
+++ b/network/i2pd/i2pd.info
@@ -0,0 +1,10 @@
+PRGNAM="i2pd"
+VERSION="2.48.0"
+HOMEPAGE="http://i2pd.website/"
+DOWNLOAD="https://github.com/PurpleI2P/i2pd/archive/2.48.0/i2pd-2.48.0.tar.gz"
+MD5SUM="392dfcedbd2492ab3a62e49e595e2a5c"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Markus Reichelt"
+EMAIL="slackbuilds@mareichelt.de"
diff --git a/network/i2pd/slack-desc b/network/i2pd/slack-desc
new file mode 100644
index 0000000000..7f7d653ce4
--- /dev/null
+++ b/network/i2pd/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+    |-----handy-ruler------------------------------------------------------|
+i2pd: i2pd (I2P Daemon)
+i2pd:
+i2pd: A full-featured C++ implementation of an I2P client.
+i2pd:
+i2pd: An I2P client is software used for building and using anonymous I2P
+i2pd: networks. Such networks are commonly used for anonymous peer-to-peer
+i2pd: applications (filesharing, cryptocurrencies) and anonymous client-
+i2pd: server applications (websites, instant messengers, chat-servers).
+i2pd:
+i2pd: I2P allows people from all around the world to communicate and share
+i2pd: information without restrictions.
diff --git a/network/icbm/README b/network/icbm/README
new file mode 100644
index 0000000000..6b4150be75
--- /dev/null
+++ b/network/icbm/README
@@ -0,0 +1,15 @@
+icbm (extensible threaded ICB client in Perl)
+
+ICB (Internet CB) is a teleconferencing system that allows Internet
+users to participate in realtime online discussions (similar to IRC).
+
+ICBM is a threaded ICB client written in Perl5 which supports a
+superset of the functionality of CICB (the ICB C Client, the de facto
+standard ICB client). This allows ICBM to be readily extended to
+support many features that CICB does not, and to gracefully do a
+number of things that CICB does poorly if at all.
+
+Note: in some terminals (e.g. urxvt), when icbm exits, it will
+leave the terminal in a state where the backspace key prints "^?"
+rather than backspacing. You can fix this with "stty erase ^?".
+Other terminals (e.g. xterm) don't have this problem.
diff --git a/network/icbm/doinst.sh b/network/icbm/doinst.sh
new file mode 100644
index 0000000000..0730667f7b
--- /dev/null
+++ b/network/icbm/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 usr/share/icb/icbserverdb.new
diff --git a/network/icbm/icbm.SlackBuild b/network/icbm/icbm.SlackBuild
new file mode 100644
index 0000000000..a5635b0034
--- /dev/null
+++ b/network/icbm/icbm.SlackBuild
@@ -0,0 +1,78 @@
+#!/bin/bash
+
+# Slackware build script for icbm
+
+# Written by B. Watson (urchlay@slackware.uk)
+
+# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
+
+# Note to self: tarballs with versioned filenames do exist, but the
+# link on the homepage is always icbm-current.tar.gz (presumably a
+# symlink). To check for updated versions, look at the the top of:
+# https://co.ordinate.org/icbm/Changelog
+
+# The crypto modules are actually optional: icbm will run without
+# them, with encryption disabled. I've made them required here, to
+# keep things simpler for me (and easier for users, too). If you
+# really object to this, just don't install them (you still need
+# perl-Curses, though).
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=icbm
+VERSION=${VERSION:-1.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
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+# tarball perms suck, leave this as-is:
+chmod 644 *
+
+SHAREDIR=$PKG/usr/share/icb
+BINDIR=$PKG/usr/bin
+MANDIR=$PKG/usr/man/man1
+
+# There's no Makefile or install script, follow the directions
+# in INSTALL.
+# Note that icbserverdb is different from the one that ships
+# with cicb (some of the same servers listed, but the cicb one
+# has an extra 'server admin' field).
+mkdir -p $SHAREDIR/Net $BINDIR $MANDIR
+cp -a primes $SHAREDIR
+cp -a icbserverdb $SHAREDIR/icbserverdb.new
+cp -a ICB.pm $SHAREDIR/Net
+install -m0755 icbm $BINDIR
+gzip -9c < icbm.1 > $MANDIR/icbm.1.gz
+
+# BUGS is 0 bytes in 1.6.0. README.ICBM is actually troff, it's the
+# man page for an older version.
+PKGDOC=$PKG/usr/doc/$PRGNAM-$VERSION
+mkdir -p $PKGDOC
+cp -a Changelog README.ENCRYPTION TODO gpl.txt sample_* colors $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/network/icbm/icbm.info b/network/icbm/icbm.info
new file mode 100644
index 0000000000..adc0656dc2
--- /dev/null
+++ b/network/icbm/icbm.info
@@ -0,0 +1,10 @@
+PRGNAM="icbm"
+VERSION="1.6.0"
+HOMEPAGE="https://co.ordinate.org/icbm/"
+DOWNLOAD="https://co.ordinate.org/icbm/icbm-1.6.0.tar.gz"
+MD5SUM="102801deeef49b8289153eedfbf046bc"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="perl-Curses perl-Crypt-Blowfish perl-Crypt-CBC perl-digest-sha1 perl-Math-BigInt-GMP perl-crypt-dh-gmp"
+MAINTAINER="B. Watson"
+EMAIL="urchlay@slackware.uk"
diff --git a/network/icbm/slack-desc b/network/icbm/slack-desc
new file mode 100644
index 0000000000..210f04b79a
--- /dev/null
+++ b/network/icbm/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+    |-----handy-ruler------------------------------------------------------|
+icbm: icbm (extensible threaded ICB client in Perl)
+icbm:
+icbm: ICB (Internet CB) is a teleconferencing system that allows Internet
+icbm: users to participate in realtime online discussions (similar to IRC).
+icbm:
+icbm: ICBM is a threaded ICB client written in Perl5 which supports a
+icbm: superset of the functionality of CICB (the ICB C Client, the de facto
+icbm: standard ICB client). This allows ICBM to be readily extended to
+icbm: support many features that CICB does not, and to gracefully do a
+icbm: number of things that CICB does poorly if at all.
+icbm:
diff --git a/network/icecat/icecat.SlackBuild b/network/icecat/icecat.SlackBuild
index ea94287ad8..c9f396ae52 100644
--- a/network/icecat/icecat.SlackBuild
+++ b/network/icecat/icecat.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for icecat
 # Written by David Negroni <dnegroni.italy@gmail.com>
@@ -24,37 +24,45 @@
 # with this program (most likely, a file named COPYING).  If not, see
 # <http://www.gnu.org/licenses/>.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM="icecat"
-VERSION=${VERSION:-60.3.0}
+VERSION=${VERSION:-60.7.0}
 RELEASEVER="$VERSION"
 RELEASEVERMAJ=$(echo $RELEASEVER | cut -f 1 -d .)
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
+    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}
 
-if [ "$ARCH" = "i586" ]; then
-  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
+if [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
 else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
+  echo "$ARCH not supported."
+  exit 1
 fi
 
 set -e
@@ -108,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/network/icecat/icecat.info b/network/icecat/icecat.info
index 082c1ce3a0..023563790d 100644
--- a/network/icecat/icecat.info
+++ b/network/icecat/icecat.info
@@ -1,10 +1,10 @@
 PRGNAM="icecat"
-VERSION="60.3.0"
+VERSION="60.7.0"
 HOMEPAGE="http://www.gnu.org/software/gnuzilla/"
-DOWNLOAD="https://ftp.gnu.org/gnu/gnuzilla/60.3.0/icecat-60.3.0.en-US.gnulinux-i686.tar.bz2"
-MD5SUM="53c5055ab130b0c2c5b8335558ae648c"
-DOWNLOAD_x86_64="https://ftp.gnu.org/gnu/gnuzilla/60.3.0/icecat-60.3.0.en-US.gnulinux-x86_64.tar.bz2"
-MD5SUM_x86_64="2f26b0c54f14fbc2437eb50c7289b4a2"
+DOWNLOAD="https://ftp.gnu.org/gnu/gnuzilla/60.7.0/icecat-60.7.0.en-US.gnulinux-i686.tar.bz2"
+MD5SUM="7d274e1d3db42886caf96b3389209230"
+DOWNLOAD_x86_64="https://ftp.gnu.org/gnu/gnuzilla/60.7.0/icecat-60.7.0.en-US.gnulinux-x86_64.tar.bz2"
+MD5SUM_x86_64="4ae5415871df868d651f12f478f479de"
 REQUIRES=""
 MAINTAINER="melikamp"
 EMAIL="melikamp@melikamp.net"
diff --git a/network/icinga2/README b/network/icinga2/README
index 7725296835..68c9656f65 100644
--- a/network/icinga2/README
+++ b/network/icinga2/README
@@ -1,9 +1,10 @@
 icinga2 (Network resource monitoring system)
 
-Icinga 2 is an open source monitoring system which checks the availability of
-your network resources, notifies users of outages, and generates performance
-data for reporting.  Scalable and extensible, Icinga 2 can monitor large,
-complex environments across multiple locations.
+Icinga 2 is an open source monitoring system which checks the
+availability of your network resources, notifies users of outages, and
+generates performance data for reporting. Scalable and extensible,
+Icinga 2 can monitor large, complex environments across multiple
+locations.
 
 MySQL presence on the build system will be auto detected, disable with:
 
diff --git a/network/icinga2/icinga2.SlackBuild b/network/icinga2/icinga2.SlackBuild
index 269b98fd10..60f0020967 100644
--- a/network/icinga2/icinga2.SlackBuild
+++ b/network/icinga2/icinga2.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for icinga2
 
-# 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,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=icinga2
-VERSION=${VERSION:-2.4.0}
+VERSION=${VERSION:-2.13.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"
@@ -151,7 +161,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.md $CWD/README.SLACKWARE $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS CHANGELOG.md CONTRIBUTING.md COPYING NEWS README.md RELEASE.md $CWD/README.SLACKWARE $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
@@ -159,4 +169,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/network/icinga2/icinga2.info b/network/icinga2/icinga2.info
index cf3794b5fa..917fb00c12 100644
--- a/network/icinga2/icinga2.info
+++ b/network/icinga2/icinga2.info
@@ -1,8 +1,8 @@
 PRGNAM="icinga2"
-VERSION="2.4.0"
-HOMEPAGE="https://www.icinga.org/"
-DOWNLOAD="https://github.com/Icinga/icinga2/archive/v2.4.0.tar.gz"
-MD5SUM="fba998d5da10f95c512ac3e41616c264"
+VERSION="2.13.3"
+HOMEPAGE="https://www.icinga.com/"
+DOWNLOAD="https://github.com/Icinga/icinga2/archive/v2.13.3/icinga2-2.13.3.tar.gz"
+MD5SUM="e39b6c9046947993bf6e215b8842f7e1"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="yajl"
diff --git a/network/icinga2/slack-desc b/network/icinga2/slack-desc
index 1d78b8bc78..5bab099781 100644
--- a/network/icinga2/slack-desc
+++ b/network/icinga2/slack-desc
@@ -14,6 +14,6 @@ icinga2: and generates performance data for reporting.
 icinga2: Scalable and extensible, Icinga 2 can monitor large, complex
 icinga2: environments across multiple locations.
 icinga2:
-icinga2: Homepage: http://www.icinga.org/
+icinga2: Homepage: https://www.icinga.com/
 icinga2:
 icinga2:
diff --git a/network/icyque/README b/network/icyque/README
new file mode 100644
index 0000000000..a7322c76d4
--- /dev/null
+++ b/network/icyque/README
@@ -0,0 +1,8 @@
+icyque IICQ WIM protocol for libpurple)
+
+If you're switching to IcyQue from the built-in ICQ plugin, you'll
+need to restart Pidgin and then edit your existing account (or create a
+new account) with the "ICQ (WIM)" protocol.
+
+If you only have a phone number, then enter that with a + at the
+beginning and leave the password field blank.
diff --git a/network/icyque/icyque.SlackBuild b/network/icyque/icyque.SlackBuild
new file mode 100644
index 0000000000..e793215c65
--- /dev/null
+++ b/network/icyque/icyque.SlackBuild
@@ -0,0 +1,100 @@
+#!/bin/bash
+
+# Slackware build script for icyque
+
+# Copyright 2020, SlackBuilds.org, David Melik, Spokane, 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=icyque
+VERSION=${VERSION:-20220630_78b90a4}
+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
+
+GITVER="$( echo $VERSION | cut -d_ -f2 )"
+
+# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
+# the name of the created package would be, and then exit. This information
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; 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-$GITVER*
+tar xvf $CWD/$PRGNAM-$GITVER*.tar.gz
+cd $PRGNAM-$GITVER*
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -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 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 \
+  $PKG/usr/doc/$PRGNAM-$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/network/icyque/icyque.info b/network/icyque/icyque.info
new file mode 100644
index 0000000000..6c8e288100
--- /dev/null
+++ b/network/icyque/icyque.info
@@ -0,0 +1,10 @@
+PRGNAM="icyque"
+VERSION="20220630_78b90a4"
+HOMEPAGE="https://github.com/EionRobb/icyque/"
+DOWNLOAD="https://github.com/EionRobb/icyque/archive/78b90a46196d5b6ef5b1727d8139a5fdeea690bb/icyque-78b90a46196d5b6ef5b1727d8139a5fdeea690bb.tar.gz"
+MD5SUM="28af58da4e0a1fc35ab7ac1c6948c8a1"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="David Melik"
+EMAIL="dchmelik@gmail.com"
diff --git a/network/icyque/slack-desc b/network/icyque/slack-desc
new file mode 100644
index 0000000000..d0937aee71
--- /dev/null
+++ b/network/icyque/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+      |-----handy-ruler------------------------------------------------------|
+icyque: icyque (ICQ WIM protocol for libpurple)
+icyque:
+icyque: If you're switching to IcyQue from the built-in ICQ plugin, you'll
+icyque: need to restart Pidgin and then edit your existing account (or create
+icyque: a new account) with the "ICQ (WIM)" protocol.
+icyque:
+icyque: If you only have a phone number, then enter that with a + at the
+icyque: beginning and leave the password field blank.
+icyque:
+icyque: https://github.com/EionRobb/icyque/
+icyque:
diff --git a/network/identicurse/README b/network/identicurse/README
index 924d1ef0c8..1bfc0f4cf8 100644
--- a/network/identicurse/README
+++ b/network/identicurse/README
@@ -1,2 +1,3 @@
-IdentiCurse is a simple but powerful Identi.ca client with a curses-based
-UI, currently developed by @reality and @psquid (see http://identi.ca).
+IdentiCurse is a simple but powerful Identi.ca client with a
+curses-based UI, currently developed by @reality and @psquid (see
+http://identi.ca).
diff --git a/network/identicurse/identicurse.SlackBuild b/network/identicurse/identicurse.SlackBuild
index e814824f72..add011c075 100644
--- a/network/identicurse/identicurse.SlackBuild
+++ b/network/identicurse/identicurse.SlackBuild
@@ -1,32 +1,42 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for identicurse
 
 # Written by Andrew Conway <nalumc[at]gmail[dot]com>
 # Based on dateutil slackbuild by Larry Hajali <larryhaja[at]gmail[dot]com>
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=identicurse
 VERSION=${VERSION:-0.9}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 #VERSIONMIN=3a
 #SRCVERSION=$(echo $VERSION | cut -f1-2 -d.)
 
 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
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   LIBDIRSUFFIX=""
@@ -77,4 +87,4 @@ mv $PKG/usr/identicurse/config.json $PKG/usr/identicurse/README \
 rmdir $PKG/usr/identicurse
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/network/ifplugd/README b/network/ifplugd/README
new file mode 100644
index 0000000000..a5e13017c4
--- /dev/null
+++ b/network/ifplugd/README
@@ -0,0 +1,22 @@
+ifplugd is a Linux daemon that can monitor network interfaces
+for a change in state (i.e. up or down) then trigger custom
+actions or scripts based on the change.
+
+This could be useful in a number of situations.
+For example where the network is configured manually
+(no NetworkManager etc), and you wish to reconfigure your
+network settings when an ethernet cable is connected 
+and then deconfigure those same settings when the cable is
+disconnected.
+
+To change which interfaces are monitored by default, and
+the general start up options, edit "/etc/ifplugd/ifplugd.conf".
+Actions can be added/changed by editing "/etc/ifplugd/ifplugd.action".
+
+To make ifplugd auto start on boot.
+First run "chmod 644 /etc/rc.d/rc.ifplugd"
+Then add the following to the end of your "/etc/rc.local" file:
+
+if [ -x /etc/rc.d/rc.ifplugd ]; then
+   sh /etc/rc.d/rc.ifplugd start || /bin/true
+fi
diff --git a/network/ifplugd/doinst.sh b/network/ifplugd/doinst.sh
new file mode 100644
index 0000000000..ff6f992fef
--- /dev/null
+++ b/network/ifplugd/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.ifplugd.new
+config etc/ifplugd/ifplugd.conf.new
+config etc/ifplugd/ifplugd.action.new
diff --git a/network/ifplugd/ifplugd-0.28-interface.patch b/network/ifplugd/ifplugd-0.28-interface.patch
new file mode 100644
index 0000000000..9c2de464bb
--- /dev/null
+++ b/network/ifplugd/ifplugd-0.28-interface.patch
@@ -0,0 +1,13 @@
+--- src/interface.c	2004/12/19 00:08:01	114
++++ src/interface.c	2006/03/07 13:15:11	133
+@@ -22,9 +22,9 @@
+ #include <config.h>
+ #endif
+ 
++#include <sys/types.h>
+ #include <linux/sockios.h>
+ #include <linux/if_ether.h>
+-#include <sys/types.h>
+ #include <sys/socket.h>
+ #include <sys/ioctl.h>
+ #include <linux/if.h>
diff --git a/network/ifplugd/ifplugd-action-slackware.patch b/network/ifplugd/ifplugd-action-slackware.patch
new file mode 100644
index 0000000000..80aeecf803
--- /dev/null
+++ b/network/ifplugd/ifplugd-action-slackware.patch
@@ -0,0 +1,18 @@
+--- conf/ifplugd.action	2022-10-21 04:32:02.560985145 +1100
++++ conf/ifplugd.action	2022-10-21 04:37:32.173998517 +1100
+@@ -24,7 +24,13 @@
+ 	exit 1
+ fi
+ 
+-[ "$2" = "up" ] && exec /sbin/ifup $1
+-[ "$2" = "down" ] && exec /sbin/ifdown $1
++# Place custom actions/commands/scripts below. The interface is passed
++# through "$1", and the state of interface is passed via "$2".
++# i.e.  if [ "$1" = "eth0" ] && [ "$2" = "down" ]; then
++
++# This script originally used ifup and ifdown which Slackware does
++# not include by default.  i.e. -
++#[ "$2" = "up" ] && exec /sbin/ifup $1
++#[ "$2" = "down" ] && exec /sbin/ifdown $1
+ 
+ exit 1
diff --git a/network/ifplugd/ifplugd-fix-return-value.patch b/network/ifplugd/ifplugd-fix-return-value.patch
new file mode 100644
index 0000000000..1b7d04af63
--- /dev/null
+++ b/network/ifplugd/ifplugd-fix-return-value.patch
@@ -0,0 +1,12 @@
+diff -Nur ifplugd-0.28.orig/src/ifplugd.c ifplugd-0.28/src/ifplugd.c
+--- ifplugd-0.28.orig/src/ifplugd.c	2005-06-04 21:21:51.000000000 +0200
++++ ifplugd-0.28/src/ifplugd.c	2012-08-29 21:51:53.137644163 +0200
+@@ -447,7 +447,7 @@
+             goto finish;
+ 
+     if (send_retval && daemonize && wait_on_fork) {
+-        char c = status == IFSTATUS_UP ? 2 : (status == IFSTATUS_DOWN ? 3 : 1);
++        char c = status == IFSTATUS_UP ? 1 : (status == IFSTATUS_DOWN ? 2 : 3);
+         daemon_retval_send(c);
+         send_retval = 0;
+     }
diff --git a/network/ifplugd/ifplugd.SlackBuild b/network/ifplugd/ifplugd.SlackBuild
new file mode 100644
index 0000000000..fc26b7f7fb
--- /dev/null
+++ b/network/ifplugd/ifplugd.SlackBuild
@@ -0,0 +1,126 @@
+#!/bin/bash
+
+# Slackware build script for ifplugd
+
+# Copyright 2022 Anj Duvnjak
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=ifplugd
+VERSION=${VERSION:-0.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"
+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 {} \;
+
+# Process patches - credits to Arch Linux for the first two
+patch -p1 < $CWD/ifplugd-fix-return-value.patch
+patch -p0 < $CWD/ifplugd-0.28-interface.patch
+patch -p0 < $CWD/ifplugd-action-slackware.patch
+
+CFLAGS="$SLKCFLAGS -fcommon" \
+CXXFLAGS="$SLKCFLAGS -fcommon" \
+./configure \
+  --prefix=/usr \
+  --sbindir=/usr/bin \
+  --mandir=/usr/man \
+  --infodir=/usr/info \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --disable-static \
+  --with-initdir=/etc/rc.d \
+  --disable-xmltoman \
+  --disable-subversion \
+  --disable-lynx \
+  --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 \
+  LICENSE README doc/SUPPORTED_DRIVERS \
+  $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mv $PKG/etc/ifplugd/ifplugd.action $PKG/etc/ifplugd/ifplugd.action.new
+mv $PKG/etc/ifplugd/ifplugd.conf $PKG/etc/ifplugd/ifplugd.conf.new
+mv $PKG/etc/rc.d/ifplugd $PKG/etc/rc.d/rc.ifplugd.new
+
+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/network/ifplugd/ifplugd.info b/network/ifplugd/ifplugd.info
new file mode 100644
index 0000000000..be4aeb31df
--- /dev/null
+++ b/network/ifplugd/ifplugd.info
@@ -0,0 +1,10 @@
+PRGNAM="ifplugd"
+VERSION="0.28"
+HOMEPAGE="http://0pointer.de/lennart/projects/ifplugd"
+DOWNLOAD="http://0pointer.de/lennart/projects/ifplugd/ifplugd-0.28.tar.gz"
+MD5SUM="df6f4bab52f46ffd6eb1f5912d4ccee3"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="libdaemon"
+MAINTAINER="Anj Duvnjak"
+EMAIL="alvind11@hotmail.com"
diff --git a/network/ifplugd/slack-desc b/network/ifplugd/slack-desc
new file mode 100644
index 0000000000..51d1cb91b3
--- /dev/null
+++ b/network/ifplugd/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+       |-----handy-ruler------------------------------------------------------|
+ifplugd: ifplugd (daemon to reconfig network iface upon connect/disconnect)
+ifplugd:
+ifplugd: ifplugd is a Linux daemon which will automatically configure your
+ifplugd: ethernet device when a cable is plugged in and automatically
+ifplugd: unconfigure it if the cable is pulled. This is useful on laptops
+ifplugd: with onboard network adapters, since it will only configure the
+ifplugd: interface when a cable is really connected.
+ifplugd:
+ifplugd: ifplugd can interface with your distributions native network
+ifplugd: configuration utilities.
+ifplugd:
diff --git a/network/ifstatus/README b/network/ifstatus/README
deleted file mode 100644
index 9dead8790d..0000000000
--- a/network/ifstatus/README
+++ /dev/null
@@ -1,10 +0,0 @@
-IFStatus was developed for Linux users that are usually in console mode.  
-It is a simple, easy to use program for displaying commonly needed / wanted 
-statistcs in real time about ingoing and outgoing traffic of multiple network 
-interfaces that is usually hard to find, with a simple and effecient view.  
-
-The configuration file for IFStatus is automatically created in
-~/.ifstatus/ifstatus.cfg
-
-Please read http://ifstatus.sourceforge.net/graphic/informations.html
-for information on various configuration options.
diff --git a/network/ifstatus/ifstatus.SlackBuild b/network/ifstatus/ifstatus.SlackBuild
deleted file mode 100644
index 135ee6b9e8..0000000000
--- a/network/ifstatus/ifstatus.SlackBuild
+++ /dev/null
@@ -1,91 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for cgdb
-
-# Copyright 2009-2010  Sean Donner (sean.donner@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=ifstatus
-VERSION=${VERSION:-1.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}
-
-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
-
-# 'v' needed due to poor tarball naming
-tar xvf $CWD/$PRGNAM-v$VERSION.tar.gz
-
-cd $PRGNAM
-chown root:root . -R
-
-# This will not compile on gcc 4.3 or 4.4 without patch,
-# as all .cc files are missing '#include <cstdlib>'
-patch -p1 < $CWD/ifstatus.patch
-
-make \
-  CFLAGS="$SLKCFLAGS" \
-  CXXFLAGS="$SLKCFLAGS"
-
-# We can't use the 'install' target in the Makefile as it
-# hardcodes the destination directory to /usr/local/bin
-install -D -m 0755 ./ifstatus $PKG/usr/bin/ifstatus
-strip --strip-unneeded $PKG/usr/bin/ifstatus
-
-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/network/ifstatus/ifstatus.info b/network/ifstatus/ifstatus.info
deleted file mode 100644
index f4021d55cc..0000000000
--- a/network/ifstatus/ifstatus.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="ifstatus"
-VERSION="1.1.0"
-HOMEPAGE="http://ifstatus.sourceforge.net"
-DOWNLOAD="http://ifstatus.sourceforge.net/download/ifstatus-v1.1.0.tar.gz"
-MD5SUM="f4d413f880754fd6677290160f8bc5d7"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Sean Donner"
-EMAIL="sean.donner@gmail.com"
diff --git a/network/ifstatus/ifstatus.patch b/network/ifstatus/ifstatus.patch
deleted file mode 100644
index 75bc3befd5..0000000000
--- a/network/ifstatus/ifstatus.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-Patch by Robert Scheck <robert@fedoraproject.org> for ifstatus >= 1.1.0,
-which adds a few missing #include lines to not violate the C++ standards
-and to build successfully with G++ version 4.3 and 4.4.
-
---- ifstatus/IFStatus.cc		2006-01-17 00:18:46.000000000 +0100
-+++ ifstatus/IFStatus.cc.gcc44		2009-04-14 00:42:04.000000000 +0200
-@@ -22,6 +22,7 @@
-  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-  */
- 
-+#include <cstdlib>
- #include "Main.h"
- #include "IFStatus.h"
- #include "Graph.h"
---- ifstatus/GraphDecorator.cc		2006-01-17 01:00:59.000000000 +0100
-+++ ifstatus/GraphDecorator.cc.gcc44	2009-04-14 00:41:38.000000000 +0200
-@@ -21,7 +21,8 @@
-  *  along with this program; if not, write to the Free Software
-  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-  */
-- 
-+
-+#include <cstdlib> 
- #include "GraphDecorator.h"
- #include "Config.h"
- 
---- ifstatus/Interface.cc		2006-01-17 02:48:27.000000000 +0100
-+++ ifstatus/Interface.cc.gcc44		2009-04-14 00:42:23.000000000 +0200
-@@ -22,6 +22,7 @@
-  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-  */
- 
-+#include <cstdlib>
- #include "Interface.h"
- #include "Config.h"
- 
---- ifstatus/Config.cc			2005-02-26 12:54:51.000000000 +0100
-+++ ifstatus/Config.cc.gcc44		2009-04-14 00:40:13.000000000 +0200
-@@ -22,6 +22,7 @@
-  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-  */
- 
-+#include <cstdlib>
- #include "Main.h"
- #include "Config.h"
- #include "Util.h"
---- ifstatus/Email.cc			2005-02-26 12:54:51.000000000 +0100
-+++ ifstatus/Email.cc.gcc44		2009-04-14 00:40:44.000000000 +0200
-@@ -22,6 +22,7 @@
-  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-  */
- 
-+#include <cstdlib>
- #include "Email.h"
- #include "Config.h"
- 
---- ifstatus/Interfaces.cc		2006-01-16 23:45:33.000000000 +0100
-+++ ifstatus/Interfaces.cc.gcc44	2009-04-14 00:42:45.000000000 +0200
-@@ -22,6 +22,7 @@
-  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-  */
- 
-+#include <cstdlib>
- #include "Interfaces.h"
- #include "Config.h"
- #include "Util.h"
diff --git a/network/ifstatus/slack-desc b/network/ifstatus/slack-desc
deleted file mode 100644
index a0f087dfc8..0000000000
--- a/network/ifstatus/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------------------------------------------------------|
-ifstatus: ifstatus (A curses network traffic monitor)
-ifstatus:
-ifstatus: IFStatus was developed for Linux users that are usually in console
-ifstatus: mode.  It is a simple, easy to use program for displaying commonly
-ifstatus: needed / wanted statistcs in real time about ingoing and outgoing
-ifstatus: traffic of multiple network interfaces that is usually hard to find,
-ifstatus: with a simple and effecient view.
-ifstatus:
-ifstatus:
-ifstatus:
-ifstatus:
diff --git a/network/igmpproxy/igmpproxy.SlackBuild b/network/igmpproxy/igmpproxy.SlackBuild
index 5ce8489dbe..fa90120c69 100644
--- a/network/igmpproxy/igmpproxy.SlackBuild
+++ b/network/igmpproxy/igmpproxy.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for igmpproxy
 
@@ -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=igmpproxy
 VERSION=${VERSION:-0.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}
@@ -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/network/igmpproxy/slack-desc b/network/igmpproxy/slack-desc
index 0e588ca912..8d4e741d41 100644
--- a/network/igmpproxy/slack-desc
+++ b/network/igmpproxy/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------------------------------------------------------|
 igmpproxy: igmpproxy (IGMP multicast routing daemon)
 igmpproxy:
 igmpproxy: A simple multicast router that only uses the IGMP protocol.
diff --git a/network/ii/ii.SlackBuild b/network/ii/ii.SlackBuild
index 9253398b67..f9052a920e 100644
--- a/network/ii/ii.SlackBuild
+++ b/network/ii/ii.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for ii
 
@@ -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=ii
 VERSION=${VERSION:-1.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}
@@ -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/network/ike/README b/network/ike/README
deleted file mode 100644
index 837e9bd481..0000000000
--- a/network/ike/README
+++ /dev/null
@@ -1,10 +0,0 @@
-The Shrew Soft VPN Client for Linux and BSD (ike) is an IPsec Client for 
-FreeBSD, NetBSD and many Linux based operating systems. 
-
-This version is distributed under an OSI approved open source license and
-is hosted in a public subversion repository. 
-
-It supports most of the features available in the Windows VPN Client version
-with the exception of those which are not cross platform compatible.
-
-
diff --git a/network/ike/doinst.sh b/network/ike/doinst.sh
deleted file mode 100644
index e4e6459838..0000000000
--- a/network/ike/doinst.sh
+++ /dev/null
@@ -1,8 +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
-
diff --git a/network/ike/ike.SlackBuild b/network/ike/ike.SlackBuild
deleted file mode 100644
index 8108b14205..0000000000
--- a/network/ike/ike.SlackBuild
+++ /dev/null
@@ -1,100 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for ike
-
-# Copyright 2016 Vitor Borrego, Corroios, 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.
-
-PRGNAM=ike
-VERSION=${VERSION:-2.2.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
-tar xvzf $CWD/$PRGNAM-$VERSION-release.tgz
-cd $TMP/$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 {} \;
-
-cmake \
-    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
-    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DETCDIR=/etc \
-    -DMANDIR=/usr/man \
-    -DQTGUI=YES \
-    -DNATT=YES \
-    -DLIBDIR=/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
-
-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 CONTRIB.TXT LICENSE.TXT README.TXT TODO.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/network/ike/ike.info b/network/ike/ike.info
deleted file mode 100644
index 6508693e35..0000000000
--- a/network/ike/ike.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="ike"
-VERSION="2.2.1"
-HOMEPAGE="https://www.shrew.net/home"
-DOWNLOAD="https://www.shrew.net/download/ike/ike-2.2.1-release.tgz"
-MD5SUM="3dac18a2da5809ccb38c50cd4a455897"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="libedit"
-MAINTAINER="Vitor Borrego"
-EMAIL="vitor@bitarus.allowed.org"
diff --git a/network/ike/slack-desc b/network/ike/slack-desc
deleted file mode 100644
index c06e90260d..0000000000
--- a/network/ike/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------------------------------------------------------|
-ike: ike (Shrew Soft VPN Client for Linux and BSD)
-ike:
-ike: ike is an IPSec Client for FreeBSD, NetBSD and many Linux based
-ike: operating systems.
-ike:
-ike: Homepage: https://www.shrew.net/software
-ike:
-ike:
-ike:
-ike:
-ike:
diff --git a/network/imapfilter/imapfilter.SlackBuild b/network/imapfilter/imapfilter.SlackBuild
index 5dc87eeafa..dc4aff74d6 100644
--- a/network/imapfilter/imapfilter.SlackBuild
+++ b/network/imapfilter/imapfilter.SlackBuild
@@ -1,9 +1,10 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for imapfilter
 
 # Copyright 2010 Šime Ramov
-# Copyright 2016-2018 Andrew Clemons, Wellington, New Zealand
+# Copyright 2016-2019,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
@@ -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=imapfilter
-VERSION=${VERSION:-2.6.12}
+VERSION=${VERSION:-2.8.2}
 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}
@@ -91,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/network/imapfilter/imapfilter.info b/network/imapfilter/imapfilter.info
index 8ebe620851..881a0d1801 100644
--- a/network/imapfilter/imapfilter.info
+++ b/network/imapfilter/imapfilter.info
@@ -1,8 +1,8 @@
 PRGNAM="imapfilter"
-VERSION="2.6.12"
+VERSION="2.8.2"
 HOMEPAGE="https://github.com/lefcha/imapfilter"
-DOWNLOAD="https://github.com/lefcha/imapfilter/archive/v2.6.12/imapfilter-2.6.12.tar.gz"
-MD5SUM="5a39752f0c2347415a8d5804ea3ce80e"
+DOWNLOAD="https://github.com/lefcha/imapfilter/archive/v2.8.2/imapfilter-2.8.2.tar.gz"
+MD5SUM="16c9f950978369687b6d6d00289678e8"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="lua"
diff --git a/network/imapproxy/README b/network/imapproxy/README
deleted file mode 100644
index 4d8b46b164..0000000000
--- a/network/imapproxy/README
+++ /dev/null
@@ -1,12 +0,0 @@
-imapproxy (SquirrelMail's IMAP Proxy server)
-
-SquirrelMail's IMAP Proxy is a caching IMAP proxy server intended
-for use with webmail clients that cannot maintain persistent
-connections to an IMAP server.
-
-IMAP Proxy simply sits between your webmail server and your IMAP
-server. It accepts connections from your webmail server for each
-client login, then proxies that connection to your real IMAP server.
-When your webmail client disconnects, IMAP Proxy will leave the
-connection open to the IMAP server such that when your webmail client
-reconnects, the existing connection may be re-used.
diff --git a/network/imapproxy/doinst.sh b/network/imapproxy/doinst.sh
deleted file mode 100644
index 82b58a530c..0000000000
--- a/network/imapproxy/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/imapproxy.conf.new
-preserve_perms etc/rc.d/rc.imapproxy.new
diff --git a/network/imapproxy/imapproxy.SlackBuild b/network/imapproxy/imapproxy.SlackBuild
deleted file mode 100644
index 04ee52efd1..0000000000
--- a/network/imapproxy/imapproxy.SlackBuild
+++ /dev/null
@@ -1,113 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for imapproxy
-
-# Copyright (c) 2014-2016 Thomas Szteliga <ts@websafe.pl>, Opole, PL
-#
-# 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.
-
-PRGNAM=imapproxy
-VERSION=${VERSION:-1.2.7}
-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 squirrelmail-imap_proxy-$VERSION
-tar xvf $CWD/squirrelmail-imap_proxy-$VERSION.tar.gz
-cd squirrelmail-imap_proxy-$VERSION
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -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
-
-install -m 0755 -d $PKG/etc
-install -m 0755 -d $PKG/etc/init.d
-install -m 0755 -d $PKG/usr/sbin
-make prefix=$PKG/usr rpm_prefix=$PKG rpm-install
-
-sed -i \
-  -e 's#/usr/local/sbin#/usr/sbin#g' \
-  -e 's#\t\$PROXY_BIN#\t\$PROXY_BIN \&#g' \
-  $PKG/etc/init.d/imapproxy
-mv $PKG/etc/init.d $PKG/etc/rc.d
-mv $PKG/etc/rc.d/imapproxy $PKG/etc/rc.d/rc.imapproxy.new
-mv $PKG/etc/imapproxy.conf $PKG/etc/imapproxy.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 \
-  ChangeLog \
-  README \
-  README.known_issues \
-  README.ssl \
-  $PKG/usr/doc/$PRGNAM-$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/network/imapproxy/imapproxy.info b/network/imapproxy/imapproxy.info
deleted file mode 100644
index 589084f064..0000000000
--- a/network/imapproxy/imapproxy.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="imapproxy"
-VERSION="1.2.7"
-HOMEPAGE="http://www.imapproxy.org/"
-DOWNLOAD="http://downloads.sourceforge.net/project/squirrelmail/imap_proxy/1.2.7/squirrelmail-imap_proxy-1.2.7.tar.gz"
-MD5SUM="02fb038a13efaf991917f87862c714fb"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Thomas Szteliga"
-EMAIL="ts@websafe.pl"
diff --git a/network/imapproxy/slack-desc b/network/imapproxy/slack-desc
deleted file mode 100644
index 1c70395971..0000000000
--- a/network/imapproxy/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------------------------------------------------------|
-imapproxy: imapproxy (SquirrelMail's IMAP Proxy server)
-imapproxy:
-imapproxy: SquirrelMail's IMAP Proxy is a caching IMAP proxy server intended
-imapproxy: for use with webmail clients that cannot maintain persistent
-imapproxy: connections to an IMAP server.
-imapproxy: IMAP Proxy simply sits between your webmail server and your IMAP
-imapproxy: server. It accepts connections from your webmail server for each
-imapproxy: client login, then proxies that connection to your real IMAP server.
-imapproxy: When your webmail client disconnects, IMAP Proxy will leave the
-imapproxy: connection open to the IMAP server such that when your webmail client
-imapproxy: reconnects, the existing connection may be re-used.
diff --git a/network/inadyn/README b/network/inadyn/README
index 784a241d57..bba485c197 100644
--- a/network/inadyn/README
+++ b/network/inadyn/README
@@ -1,5 +1,6 @@
-In-a-dyn is a small and simple Dynamic DNS, DDNS, client with HTTPS support.
-It is commonly available in many GNU/Linux distributions, used in off-the-shelf
-routers and Internet gateways to automate the task of keeping your DNS record
-up to date with any IP address changes from your ISP. It can also be used in
-installations with redundant (backup) connections to the Internet.
+In-a-dyn is a small and simple Dynamic DNS, DDNS, client with HTTPS
+support. It is commonly available in many GNU/Linux distributions,
+used in off-the-shelf routers and Internet gateways to automate the
+task of keeping your DNS record up to date with any IP address changes
+from your ISP. It can also be used in installations with redundant
+(backup) connections to the Internet.
diff --git a/network/inadyn/doinst.sh b/network/inadyn/doinst.sh
index 93170dac0d..9f785b0fb1 100644
--- a/network/inadyn/doinst.sh
+++ b/network/inadyn/doinst.sh
@@ -1,5 +1,3 @@
-#!/bin/sh
-
 config() {
   NEW="$1"
   OLD="$(dirname $NEW)/$(basename $NEW .new)"
@@ -24,4 +22,3 @@ preserve_perms() {
 }
 
 preserve_perms etc/rc.d/rc.inadyn.new
-
diff --git a/network/inadyn/inadyn.SlackBuild b/network/inadyn/inadyn.SlackBuild
index 4f8f57afb5..7ae1e3d629 100644
--- a/network/inadyn/inadyn.SlackBuild
+++ b/network/inadyn/inadyn.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for inadyn
 
@@ -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=inadyn
-VERSION=${VERSION:-2.3.1}
+VERSION=${VERSION:-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}
@@ -54,13 +64,13 @@ else
   LIBDIRSUFFIX=""
 fi
 
-set -e # Exit on most errors
+set -e
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvJf $CWD/$PRGNAM-$VERSION.tar.xz
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
@@ -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 \
@@ -89,9 +100,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
 
+mkdir -p $PKG/etc/rc.d
+cat $CWD/rc.inadyn > $PKG/etc/rc.d/rc.inadyn.new
+
+mkdir -p $PKG/var/cache/$PRGNAM
+
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
-  AUTHORS CONTRIBUTING.md \
+  AUTHORS CONTRIBUTING.md debian/ \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
@@ -99,8 +115,5 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
-mkdir -p $PKG/etc/rc.d
-cat $CWD/rc.inadyn > $PKG/etc/rc.d/rc.inadyn.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/network/inadyn/inadyn.info b/network/inadyn/inadyn.info
index 91ad52fd8e..df3d372e1d 100644
--- a/network/inadyn/inadyn.info
+++ b/network/inadyn/inadyn.info
@@ -1,10 +1,10 @@
 PRGNAM="inadyn"
-VERSION="2.3.1"
+VERSION="2.5"
 HOMEPAGE="http://troglobit.com/projects/inadyn"
-DOWNLOAD="ftp://ftp.troglobit.com/inadyn/inadyn-2.3.1.tar.xz"
-MD5SUM="6a36f62bba5c9774bff25bf2be871bbb"
+DOWNLOAD="https://github.com/troglobit/inadyn/archive/v2.5/inadyn-2.5.tar.gz"
+MD5SUM="e06354b6a617c1eeca1e97c01f224bbb"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-MAINTAINER="Kenneth Chan"
-EMAIL="kenneth.t.chan@gmail.com"
 REQUIRES="confuse"
+MAINTAINER="kchan"
+EMAIL="kenneth.t.chan@gmail.com"
diff --git a/network/inadyn/rc.inadyn b/network/inadyn/rc.inadyn
index 381ac1b904..96d5768136 100644
--- a/network/inadyn/rc.inadyn
+++ b/network/inadyn/rc.inadyn
@@ -12,22 +12,23 @@ if [ ! -f /etc/inadyn.conf ]; then
 fi
 
 PIDFILE=/var/run/inadyn.pid
+SCRIPTNAME=$0
 
 case "$1" in
   start)
 	echo -n "Starting inadyn: /usr/sbin/inadyn"
-	/usr/sbin/inadyn
+	/usr/sbin/inadyn --pidfile $PIDFILE
 	echo    
 	;;
   stop)
 	echo -n "Stopping inadyn... "
 	kill $( ps ax | grep inadyn | grep Ss | awk '{print $1}' )
-	#kill -9 $( cat $PIDFILE 2> /dev/null )
+	rm -f $PIDFILE
 	echo
 	;;
   restart)
-	$0 stop
-	$0 start
+	$SCRIPTNAME stop
+	$SCRIPTNAME start
 	;;
   status)
         pids=$( ps ax | grep inadyn | grep Ss | awk '{print $1}' )
diff --git a/network/inadyn/slack-desc b/network/inadyn/slack-desc
index b504c62aa2..10d8a64f3b 100644
--- a/network/inadyn/slack-desc
+++ b/network/inadyn/slack-desc
@@ -8,11 +8,11 @@
       |-----handy-ruler------------------------------------------------------|
 inadyn: inadyn (A Small and Simple DDNS Client)
 inadyn:
-inadyn: In-a-dyn is a small and simple Dynamic DNS, DDNS, client with HTTPS 
-inadyn: support. It is commonly available in many GNU/Linux distributions, 
-inadyn: used in off-the-shelf routers and Internet gateways to automate the 
-inadyn: task of keeping your DNS record up to date with any IP address 
-inadyn: changes from your ISP. It can also be used in installations with 
+inadyn: In-a-dyn is a small and simple Dynamic DNS, DDNS, client with HTTPS
+inadyn: support. It is commonly available in many GNU/Linux distributions,
+inadyn: used in off-the-shelf routers and Internet gateways to automate the
+inadyn: task of keeping your DNS record up to date with any IP address
+inadyn: changes from your ISP. It can also be used in installations with
 inadyn: redundant (backup) connections to the Internet.
 inadyn:
 inadyn: Homepage: http://troglobit.com/projects/inadyn
diff --git a/network/insync/README b/network/insync/README
index 4a17d12478..06e57bd801 100644
--- a/network/insync/README
+++ b/network/insync/README
@@ -1,3 +1,6 @@
 Insync extends (Google) Drive's web functionality to your desktop
 by integrating tightly with Windows, Mac and Linux so you can get
 work done.
+
+WARNING: If your are upgrading from version 1.x to this version 3.x,
+be aware of those moving steps: https://tinyurl.com/y4jqzehj
diff --git a/network/insync/insync.SlackBuild b/network/insync/insync.SlackBuild
index b54b3d3e72..095a34145f 100644
--- a/network/insync/insync.SlackBuild
+++ b/network/insync/insync.SlackBuild
@@ -1,8 +1,9 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for "insync".
 
 # Copyright 2013-2016 Marcel Saegebarth <marc@mos6581.de>
+# Copyright 2019,2020 Pedro R.M. Júnior <pedrormjunior@gmail.com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -25,11 +26,14 @@
 # Adapted from Willy Sudiarto Raharjo <willysr@slackware-id.org> "insync-kde"
 # https://github.com/willysr/SlackHacks/tree/master/SlackBuilds/insync-kde
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=insync
-DEBNAM=wheezy
-VERSION=${VERSION:-1.3.12.36116}
+DEBNAM=xenial
+VERSION=${VERSION:-3.3.9.40955}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -53,7 +57,14 @@ else
   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}
@@ -75,7 +86,7 @@ chmod 0755 $PKG
 
 if [ "$ARCH" = "x86_64" ]; then
   mv $PKG/usr/lib $PKG/usr/lib${LIBDIRSUFFIX}
-  sed -i 's/lib/lib64/' $PKG/usr/bin/{insync,insync-headless}
+  sed -i 's/lib/lib64/' $PKG/usr/bin/insync
 fi
 
 mv $PKG/usr/share/man $PKG/usr/
@@ -88,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/network/insync/insync.info b/network/insync/insync.info
index ccb099cbfe..ebe16baec7 100644
--- a/network/insync/insync.info
+++ b/network/insync/insync.info
@@ -1,10 +1,10 @@
 PRGNAM="insync"
-VERSION="1.3.12.36116"
+VERSION="3.3.9.40955"
 HOMEPAGE="https://www.insynchq.com/"
-DOWNLOAD="http://s.insynchq.com/builds/insync_1.3.12.36116-wheezy_i386.deb"
-MD5SUM="4001dcaaba0c798bc414a79a8cd8e1db"
-DOWNLOAD_x86_64="http://s.insynchq.com/builds/insync_1.3.12.36116-wheezy_amd64.deb"
-MD5SUM_x86_64="eda34fa865bf7ea4bc16eb83881200ad"
+DOWNLOAD="UNSUPPORTED"
+MD5SUM=""
+DOWNLOAD_x86_64="https://d2t3ff60b2tol4.cloudfront.net/builds/insync_3.3.9.40955-xenial_amd64.deb"
+MD5SUM_x86_64="fd8ea3caaea11d4583e3a3f53876ac95"
 REQUIRES=""
-MAINTAINER="Marcel Saegebarth"
-EMAIL="marc@mos6581.de"
+MAINTAINER="Pedro R.M. Júnior"
+EMAIL="pedrormjunior@gmail.com"
diff --git a/network/insync/slack-desc b/network/insync/slack-desc
index e4c1a4ca01..6fca38aaa6 100644
--- a/network/insync/slack-desc
+++ b/network/insync/slack-desc
@@ -14,6 +14,6 @@ insync: work done.
 insync:
 insync: Homepage: http://www.insynchq.com/
 insync:
-insync:
-insync:
+insync: WARNING: If your are upgrading from version 1.x to this version 3.x,
+insync: be aware of those moving steps: https://tinyurl.com/y4jqzehj
 insync:
diff --git a/network/iodine/README b/network/iodine/README
index 8f0bfc9659..80d5859947 100644
--- a/network/iodine/README
+++ b/network/iodine/README
@@ -1,5 +1,5 @@
 iodine (DNS tunnel)
 
-iodine lets you tunnel IPv4 data through a DNS server. This can be usable in
-different situations where internet access is firewalled, but DNS queries
-are allowed.
+iodine lets you tunnel IPv4 data through a DNS server. This can be
+usable in different situations where internet access is firewalled,
+but DNS queries are allowed.
diff --git a/network/iodine/iodine.SlackBuild b/network/iodine/iodine.SlackBuild
index fef460289a..21d79ba2de 100644
--- a/network/iodine/iodine.SlackBuild
+++ b/network/iodine/iodine.SlackBuild
@@ -1,32 +1,42 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for iodine
 
 # Written by David Miller dave@frop.net
 # This script is released into the public domain
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=iodine
 VERSION=${VERSION:-0.6.0_rc1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 SRCVERSION=$(echo $VERSION |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
 
-CWD=$(pwd)
+# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
+# the name of the created package would be, and then exit. This information
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; 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 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/network/ip2location-c/README b/network/ip2location-c/README
index 7c045d09a3..3ebc96d6e6 100644
--- a/network/ip2location-c/README
+++ b/network/ip2location-c/README
@@ -1,10 +1,12 @@
-IP2Location C library enables the user to find the country, region,
-city, coordinates, zip code, time zone, ISP, domain name, connection
-type, area code, weather, MCC, MNC, mobile brand name, elevation and
-usage type that any IP address or hostname originates from. It has
-been optimized for speed and memory utilization. Developers can use
-the API to query all IP2Location binary databases for IPv4 and
-IPv6 address.
+IP2Location C Library
+
+IP2Location is a C library that enables the user to find the country,
+region, city, latitude, longitude, zip code, time zone, ISP, domain
+name, connection type, area code, weather, mobile network, elevation,
+usage type by IP address or hostname originates from. The library
+reads the geo location information from IP2Location BIN data file.
+
+IPv4 and IPv6 addresses are supported.
 
 It contains the IP-COUNTRY BIN databases (IPv4 and IPv6) which
 consists of IP address blocks as keys and countries as
diff --git a/network/ip2location-c/ip2location-c.SlackBuild b/network/ip2location-c/ip2location-c.SlackBuild
index 18e39d9891..93fe2af9a6 100644
--- a/network/ip2location-c/ip2location-c.SlackBuild
+++ b/network/ip2location-c/ip2location-c.SlackBuild
@@ -1,10 +1,10 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for ip2location-c
 
 # Ryan P.C. McQuen | Everett, WA | ryanpcmcquen@member.fsf.org
 # Copyright 2012, 2013  Chris Abela, Malta
-# Copyright 2018  Jason Graham, MD <jgraha8@gmail.com>
+# Copyright 2018, 2022  Jason Graham, USA <jgraham@compukix.net>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,11 +24,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=ip2location-c
 SRCNAM=IP2Location-C-Library
-VERSION=${VERSION:-8.0.7}
+VERSION=${VERSION:-8.6.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -38,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}
@@ -73,7 +80,6 @@ find -L . \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 # The README is missing and is needed by autoconf
-cat README.md > README
 autoreconf -vif
 
 CFLAGS="$SLKCFLAGS" \
@@ -97,12 +103,17 @@ if [ "$DB" = "yes" ]; then
   ( cd data && perl ip-country.pl && make install DESTDIR=$PKG )
 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
 
+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 Developers_Guide.txt INSTALL LICENSE.TXT NEWS README.md \
+   AUTHORS COPYING ChangeLog Developers_Guide.txt LICENSE.TXT NEWS README README.md \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
@@ -110,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/network/ip2location-c/ip2location-c.info b/network/ip2location-c/ip2location-c.info
index 132b2d1b7f..15237a5c78 100644
--- a/network/ip2location-c/ip2location-c.info
+++ b/network/ip2location-c/ip2location-c.info
@@ -1,10 +1,10 @@
 PRGNAM="ip2location-c"
-VERSION="8.0.7"
+VERSION="8.6.1"
 HOMEPAGE="http://www.ip2location.com/developers/c"
-DOWNLOAD="https://github.com/chrislim2888/IP2Location-C-Library/archive/8.0.7/IP2Location-C-Library-8.0.7.tar.gz"
-MD5SUM="8c33ffe6d66baba942dffa8bf75ea45b"
+DOWNLOAD="https://github.com/chrislim2888/IP2Location-C-Library/archive/8.6.1/IP2Location-C-Library-8.6.1.tar.gz"
+MD5SUM="d66cc49ecbe636a2a28aa7aee9725f25"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
 MAINTAINER="Jason Graham"
-EMAIL="jgraha8@gmail.com"
+EMAIL="jgraham@compukix.net"
diff --git a/network/ip2location-c/slack-desc b/network/ip2location-c/slack-desc
index 00302d16ce..f556c49110 100644
--- a/network/ip2location-c/slack-desc
+++ b/network/ip2location-c/slack-desc
@@ -8,12 +8,12 @@
              |-----handy-ruler------------------------------------------------------|
 ip2location-c: ip2location-c (Geolocate IP library)
 ip2location-c:
-ip2location-c: IP2Location C library enables the user to find the country, region,
-ip2location-c: city, coordinates, zip code, time zone, ISP, domain name, connection
-ip2location-c: type, area code, weather, MCC, MNC, mobile brand name, elevation and
-ip2location-c: usage type that any IP address or hostname originates from. It has
-ip2location-c: been optimized for speed and memory utilization. Developers can use
-ip2location-c: the API to query all IP2Location binary databases for IPv4 and
-ip2location-c: IPv6 address.
+ip2location-c: IP2Location is a C library that enables the user to find the country,
+ip2location-c: region, city, latitude, longitude, zip code, time zone, ISP, domain
+ip2location-c: name, connection type, area code, weather, mobile network, elevation,
+ip2location-c: usage type by IP address or hostname originates from. The library
+ip2location-c: reads the geo location information from IP2Location BIN data file.
+ip2location-c:
+ip2location-c: IPv4 and IPv6 addresses are supported.
 ip2location-c:
 ip2location-c: Homepage: http://www.ip2location.com/c.aspx
diff --git a/network/ipcalc/README b/network/ipcalc/README
index 93860e8cac..54cea5ec5d 100644
--- a/network/ipcalc/README
+++ b/network/ipcalc/README
@@ -1,4 +1,5 @@
-ipcalc takes an IP address and netmask and calculates the resulting broadcast,
-network, Cisco wildcard mask, and host range. By giving a second netmask, you 
-can design sub- and supernetworks. It is also intended to be a teaching tool 
-and presents the results as easy-to-understand binary values.
+ipcalc takes an IP address and netmask and calculates the resulting
+broadcast, network, Cisco wildcard mask, and host range. By giving
+a second netmask, you can design sub- and supernetworks. It is
+also intended to be a teaching tool and presents the results as
+easy-to-understand binary values.
diff --git a/network/ipcalc/ipcalc.SlackBuild b/network/ipcalc/ipcalc.SlackBuild
index b7fd6185c5..d5c2cd48c0 100644
--- a/network/ipcalc/ipcalc.SlackBuild
+++ b/network/ipcalc/ipcalc.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for ipcalc
 
@@ -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=ipcalc
 VERSION=${VERSION:-0.41}
 ARCH=noarch
 BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 CGIBINDIR=${CGIBINDIR:-/var/www/cgi-bin}
 
-CWD=$(pwd)
+# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
+# the name of the created package would be, and then exit. This information
+# could be useful to other scripts.
+if [ ! -z "${PRINT_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/network/iperf/README b/network/iperf/README
index 4b25290df1..e44db66759 100644
--- a/network/iperf/README
+++ b/network/iperf/README
@@ -1,6 +1,7 @@
 Iperf is a tool to measure IP bandwidth using UDP or TCP. It allows
 for tuning various parameters, and reports bandwidth, delay jitter,
 and packet loss. It supports IPv6 and multicast. Iperf was developed
-by NLANR/DAST as a modern alternative for measuring maximum TCP and UDP
-bandwidth performance. Iperf allows the tuning of various parameters and
-UDP characteristics. Iperf reports bandwidth, delay jitter, datagram loss.
+by NLANR/DAST as a modern alternative for measuring maximum TCP
+and UDP bandwidth performance. Iperf allows the tuning of various
+parameters and UDP characteristics. Iperf reports bandwidth, delay
+jitter, datagram loss.
diff --git a/network/iperf/iperf.SlackBuild b/network/iperf/iperf.SlackBuild
index f8c40ab1e8..cf8ae665a4 100644
--- a/network/iperf/iperf.SlackBuild
+++ b/network/iperf/iperf.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # nullboy 11/14/2008
 # fossfun 10/19/2010 Updated for new version
@@ -7,26 +7,36 @@
 # and
 # http://www.slackwiki.org/Writing_A_SlackBuild_Script
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=iperf
-VERSION=${VERSION:-2.0.5}
+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=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"
@@ -49,10 +59,15 @@ 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 {} \;
+
+# Thanks fedora for these
+for i in $CWD/patches/* ; do patch -p1 < $i ; done
+
+autoreconf -fi
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
@@ -68,13 +83,11 @@ CXXFLAGS="$SLKCFLAGS" \
 make
 make 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
 
-( 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 AUTHORS ChangeLog COPYING INSTALL README doc/index.html $PKG/usr/doc/$PRGNAM-$VERSION
@@ -84,5 +97,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/network/iperf/iperf.info b/network/iperf/iperf.info
index fbb6e24fa4..730b096a3b 100644
--- a/network/iperf/iperf.info
+++ b/network/iperf/iperf.info
@@ -1,8 +1,8 @@
 PRGNAM="iperf"
-VERSION="2.0.5"
+VERSION="2.0.8"
 HOMEPAGE="https://sourceforge.net/projects/iperf/"
-DOWNLOAD="https://downloads.sourceforge.net/iperf/iperf-2.0.5.tar.gz"
-MD5SUM="44b5536b67719f4250faed632a3cd016"
+DOWNLOAD="https://downloads.sourceforge.net/iperf2/iperf-2.0.8.tar.gz"
+MD5SUM="e5887f799d8dc64a974c6c2f2e5cc339"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/network/iperf/patches/0_iperf-2.0.8-debuginfo.patch b/network/iperf/patches/0_iperf-2.0.8-debuginfo.patch
new file mode 100644
index 0000000000..2a3ad246ee
--- /dev/null
+++ b/network/iperf/patches/0_iperf-2.0.8-debuginfo.patch
@@ -0,0 +1,17 @@
+diff -NarpU5 iperf-2.0.8/configure.ac iperf-2.0.8.debuginfo/configure.ac
+--- iperf-2.0.8/configure.ac	2015-04-02 16:51:48.000000000 -0400
++++ iperf-2.0.8.debuginfo/configure.ac	2015-04-10 10:11:33.287445003 -0400
+@@ -42,13 +42,11 @@ AC_ARG_ENABLE(kalman, AC_HELP_STRING([--
+ dnl ===================================================================
+ dnl Checks for programs
+ dnl ===================================================================
+ 
+ AC_PROG_CXX
+-CXXFLAGS=`echo " $CXXFLAGS " | sed -e "s/ -g / /"` # do not want it implicitly
+ AC_PROG_CC
+-CFLAGS=`echo " $CFLAGS " | sed -e "s/ -g / /"` # do not want it implicitly
+ AC_ISC_POSIX
+ AC_PROG_INSTALL
+ AC_PROG_MAKE_SET
+ AC_PROG_RANLIB
+ AC_LANG(C)
diff --git a/network/iperf/patches/1_iperf-2.0.8-bindfail.patch b/network/iperf/patches/1_iperf-2.0.8-bindfail.patch
new file mode 100644
index 0000000000..b18b2cffed
--- /dev/null
+++ b/network/iperf/patches/1_iperf-2.0.8-bindfail.patch
@@ -0,0 +1,42 @@
+diff -NarpU5 iperf-2.0.8/src/Client.cpp iperf-2.0.8.bindfail/src/Client.cpp
+--- iperf-2.0.8/src/Client.cpp	2015-04-02 16:51:48.000000000 -0400
++++ iperf-2.0.8.bindfail/src/Client.cpp	2015-04-10 10:05:38.279936555 -0400
+@@ -701,20 +701,20 @@ void Client::Connect( ) {
+                   AF_INET
+ #endif
+                   : AF_INET);
+ 
+     mSettings->mSock = socket( domain, type, 0 );
+-    WARN_errno( mSettings->mSock == INVALID_SOCKET, "socket" );
++    FAIL_errno( mSettings->mSock == INVALID_SOCKET, "socket", mSettings );
+ 
+     SetSocketOptions( mSettings );
+ 
+     SockAddr_localAddr( mSettings );
+     if ( mSettings->mLocalhost != NULL ) {
+         // bind socket to local address
+         rc = bind( mSettings->mSock, (sockaddr*) &mSettings->local, 
+                    SockAddr_get_sizeof_sockaddr( &mSettings->local ) );
+-        WARN_errno( rc == SOCKET_ERROR, "bind" );
++        FAIL_errno( rc == SOCKET_ERROR, "bind", mSettings );
+     }
+     // connect socket
+     rc = connect( mSettings->mSock, (sockaddr*) &mSettings->peer, 
+                   SockAddr_get_sizeof_sockaddr( &mSettings->peer ));
+     FAIL_errno( rc == SOCKET_ERROR, "connect", mSettings );
+diff -NarpU5 iperf-2.0.8/src/Listener.cpp iperf-2.0.8.bindfail/src/Listener.cpp
+--- iperf-2.0.8/src/Listener.cpp	2015-04-02 16:51:48.000000000 -0400
++++ iperf-2.0.8.bindfail/src/Listener.cpp	2015-04-10 10:06:23.279699885 -0400
+@@ -342,11 +342,11 @@ void Listener::Listen( ) {
+         WARN_errno( rc == SOCKET_ERROR, "WSAJoinLeaf (aka bind)" );
+     } else
+ #endif
+     {
+         rc = bind( mSettings->mSock, (sockaddr*) &mSettings->local, mSettings->size_local );
+-        WARN_errno( rc == SOCKET_ERROR, "bind" );
++        FAIL_errno( rc == SOCKET_ERROR, "bind", mSettings );
+     }
+     // listen for connections (TCP only).
+     // default backlog traditionally 5
+     if ( !isUDP( mSettings ) ) {
+         rc = listen( mSettings->mSock, 5 );
diff --git a/network/iperf/patches/2_iperf-2.0.8-math.patch b/network/iperf/patches/2_iperf-2.0.8-math.patch
new file mode 100644
index 0000000000..1a943f5f2c
--- /dev/null
+++ b/network/iperf/patches/2_iperf-2.0.8-math.patch
@@ -0,0 +1,75 @@
+diff -NarU5 a/include/headers.h b/include/headers.h
+--- a/include/headers.h	2015-04-02 16:51:48.000000000 -0400
++++ b/include/headers.h	2016-03-16 14:52:14.386853750 -0400
+@@ -80,11 +80,10 @@
+ #include <assert.h>
+ #include <ctype.h>
+ #include <errno.h>
+ #include <string.h>
+ #include <time.h>
+-#include <math.h>
+ #include <float.h>
+ #include <sys/types.h>
+ 
+ #ifdef WIN32
+ 
+diff -NarU5 a/src/Client.cpp b/src/Client.cpp
+--- a/src/Client.cpp	2015-04-02 16:51:48.000000000 -0400
++++ b/src/Client.cpp	2016-03-16 14:52:14.387853701 -0400
+@@ -50,10 +50,11 @@
+  * A client thread initiates a connect to the server and handles
+  * sending and receiving data, then closes the socket.
+  * ------------------------------------------------------------------- */
+ 
+ #include <time.h>
++#include <cmath>
+ #include "headers.h"
+ #include "Client.hpp"
+ #include "Thread.h"
+ #include "SocketAddr.h"
+ #include "PerfSocket.hpp"
+diff -NarU5 a/src/ReportDefault.c b/src/ReportDefault.c
+--- a/src/ReportDefault.c	2015-04-02 16:51:49.000000000 -0400
++++ b/src/ReportDefault.c	2016-03-16 14:52:14.387853701 -0400
+@@ -47,10 +47,11 @@
+  * ReportDefault.c
+  * by Kevin Gibbs <kgibbs@nlanr.net>
+  *
+  * ________________________________________________________________ */
+ 
++#include <math.h>
+ #include "headers.h"
+ #include "Settings.hpp"
+ #include "util.h"
+ #include "Reporter.h"
+ #include "report_default.h"
+diff -NarU5 a/src/Reporter.c b/src/Reporter.c
+--- a/src/Reporter.c	2015-04-02 16:51:49.000000000 -0400
++++ b/src/Reporter.c	2016-03-16 14:52:14.388853652 -0400
+@@ -47,10 +47,11 @@
+  * Reporter.c
+  * by Kevin Gibbs <kgibbs@nlanr.net>
+  *
+  * ________________________________________________________________ */
+ 
++#include <math.h>
+ #include "headers.h"
+ #include "Settings.hpp"
+ #include "util.h"
+ #include "Reporter.h"
+ #include "Thread.h"
+diff -NarU5 a/src/Server.cpp b/src/Server.cpp
+--- a/src/Server.cpp	2015-04-02 16:51:49.000000000 -0400
++++ b/src/Server.cpp	2016-03-16 14:52:14.388853652 -0400
+@@ -52,10 +52,11 @@
+  * Handles sending and receiving data, and then closes socket.
+  * Changes to this version : The server can be run as a daemon
+  * ------------------------------------------------------------------- */
+ 
+ #define HEADERS()
++#include <cmath>
+ #include "headers.h"
+ #include "Server.hpp"
+ #include "List.h"
+ #include "Extractor.h"
+ #include "Reporter.h"
diff --git a/network/iperf3/iperf3.SlackBuild b/network/iperf3/iperf3.SlackBuild
index 29ef140380..c1d2d993d9 100644
--- a/network/iperf3/iperf3.SlackBuild
+++ b/network/iperf3/iperf3.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for iPerf3
 
@@ -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=iperf3
 SRCNAM=iperf
-VERSION=${VERSION:-3.1.3}
+VERSION=${VERSION:-3.16}
 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}
@@ -92,12 +99,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 -a INSTALL LICENSE README.md RELEASE_NOTES contrib $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a INSTALL LICENSE README.md RELNOTES.md contrib $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/network/iperf3/iperf3.info b/network/iperf3/iperf3.info
index b8739102ca..28b4422268 100644
--- a/network/iperf3/iperf3.info
+++ b/network/iperf3/iperf3.info
@@ -1,8 +1,8 @@
 PRGNAM="iperf3"
-VERSION="3.1.3"
-HOMEPAGE="https://iperf.fr"
-DOWNLOAD="https://github.com/esnet/iperf/archive/3.1.3/iperf-3.1.3.tar.gz"
-MD5SUM="7d9e550129d1ba68d4f49ea9dd412ada"
+VERSION="3.16"
+HOMEPAGE="https://github.com/esnet/iperf"
+DOWNLOAD="https://github.com/esnet/iperf/archive/3.16/iperf-3.16.tar.gz"
+MD5SUM="f084f221e829c5b9abee96c8f819de97"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/network/ipfs-pack/ipfs-pack.SlackBuild b/network/ipfs-pack/ipfs-pack.SlackBuild
index 17e1979e20..27fa55758d 100644
--- a/network/ipfs-pack/ipfs-pack.SlackBuild
+++ b/network/ipfs-pack/ipfs-pack.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for ipfs-pack
 
@@ -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=ipfs-pack
 VERSION=${VERSION:-0.6.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -41,7 +44,14 @@ case $ARCH in
   *) IPFSARCH=$ARCH ;;
 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}
@@ -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/network/ipscan/README b/network/ipscan/README
deleted file mode 100644
index 2be6fec762..0000000000
--- a/network/ipscan/README
+++ /dev/null
@@ -1,26 +0,0 @@
-ipscan (fast and friendly network scanner)
-
-Angry IP Scanner (or simply ipscan) is an open-source and
-cross-platform network scanner designed to be fast and simple to use.
-It scans IP addresses and ports as well as has many other features.
-
-It is widely used by network administrators and just curious users
-around the world including large and small enterprises, banks, and
-government agencies.
-
-It runs on Linux, Windows, and Mac OS X, possibly supporting other
-platforms as well.
-
-Angry IP scanner simply pings each IP address to check if it's alive,
-then optionally it is resolving its hostname, determines the MAC
-address, scans ports, etc. The amount of gathered data about each host
-can be extended with plugins.
-
-It also has additional features, like NetBIOS information (computer
-name, workgroup name, and currently logged in Windows user), favorite
-IP address ranges, web server detection, customizable openers, etc.
-
-Scanning results can be saved to CSV, TXT, XML or IP-Port list files.
-With help of plugins, Angry IP Scanner can gather any information
-about scanned IPs. Anybody who can write Java code is able to write
-plugins and extend functionality of Angry IP Scanner.
diff --git a/network/ipscan/copyright b/network/ipscan/copyright
deleted file mode 100644
index 38cd386048..0000000000
--- a/network/ipscan/copyright
+++ /dev/null
@@ -1,22 +0,0 @@
-Angry IP Scanner is copyright 2004-2011 Anton Keks and others.
-Development is hosted on http://ipscan.sourceforge.net
-
-License: GPLv2+
-
-    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 St, Fifth Floor, Boston, MA 02110-1301, USA.
-
-See /usr/share/common-licenses/GPL-2, or
-<http://www.gnu.org/copyleft/gpl.txt> for the terms of the latest version
-of the GNU General Public License.
diff --git a/network/ipscan/ipscan b/network/ipscan/ipscan
deleted file mode 100644
index 51f6ca2f53..0000000000
--- a/network/ipscan/ipscan
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-java -jar /usr/share/ipscan/ipscan*.jar "$@"
diff --git a/network/ipscan/ipscan.SlackBuild b/network/ipscan/ipscan.SlackBuild
deleted file mode 100644
index c69fa38ddd..0000000000
--- a/network/ipscan/ipscan.SlackBuild
+++ /dev/null
@@ -1,98 +0,0 @@
-#!/bin/sh
-#
-# Slackware build script for ipscan.
-#
-# Copyright 2015-2019  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=ipscan
-VERSION=${VERSION:-3.5.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
-
-SRCNAM="ipscan-linux"
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-rm -rf $TMP/$PRGNAM-$VERSION
-cd $TMP
-mkdir $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 {} \;
-
-install -Dm755 $CWD/$PRGNAM $PKG/usr/bin/$PRGNAM
-install -Dm644 $CWD/ipscan.desktop $PKG/usr/share/applications/ipscan.desktop
-install -Dm644 $CWD/ipscan.png $PKG/usr/share/pixmaps/ipscan.png
-
-install -d $PKG/usr/share/$PRGNAM
-
-if [ "$ARCH" = "i586" ]; then
-   cp $CWD/$SRCNAM-$VERSION.jar $PKG/usr/share/$PRGNAM
-elif [ "$ARCH" = "x86_64" ]; then
-   cp $CWD/$SRCNAM$LIBDIRSUFFIX-$VERSION.jar $PKG/usr/share/$PRGNAM
-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
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp $CWD/copyright $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 -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/network/ipscan/ipscan.desktop b/network/ipscan/ipscan.desktop
deleted file mode 100644
index 6f51d5bf3d..0000000000
--- a/network/ipscan/ipscan.desktop
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Name=Angry IP Scanner
-GenericName=Fast and friendly network scanner
-Exec=/usr/bin/ipscan
-Terminal=false
-Type=Application
-Icon=ipscan
-Categories=Network;
-StartupWMClass=Angry IP Scanner
-StartupNotify=true
diff --git a/network/ipscan/ipscan.info b/network/ipscan/ipscan.info
deleted file mode 100644
index fe538244ad..0000000000
--- a/network/ipscan/ipscan.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="ipscan"
-VERSION="3.5.5"
-HOMEPAGE="https://github.com/angryziber/ipscan/"
-DOWNLOAD="https://github.com/angryziber/ipscan/releases/download/3.5.5/ipscan-linux-3.5.5.jar"
-MD5SUM="05c0ee671f9de20b338e40a9d0a8199d"
-DOWNLOAD_x86_64="https://github.com/angryziber/ipscan/releases/download/3.5.5/ipscan-linux64-3.5.5.jar"
-MD5SUM_x86_64="c5b3e5c7df43145f44086254c9c8d50d"
-REQUIRES="jdk"
-MAINTAINER="Edinaldo P. Silva"
-EMAIL="edps.mundognu@gmail.com"
diff --git a/network/ipscan/ipscan.png b/network/ipscan/ipscan.png
deleted file mode 100644
index ec9059f9e1..0000000000
--- a/network/ipscan/ipscan.png
+++ /dev/null
diff --git a/network/ipscan/slack-desc b/network/ipscan/slack-desc
deleted file mode 100644
index ee6abe086f..0000000000
--- a/network/ipscan/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------------------------------------------------------|
-ipscan: ipscan (fast and friendly network scanner)
-ipscan:
-ipscan: Angry IP Scanner (or simply ipscan) is an open-source and
-ipscan: cross-platform network scanner designed to be fast and simple to use.
-ipscan: It scans IP addresses and ports as well as has many other features.
-ipscan:
-ipscan: Home page: https://github.com/angryziber/ipscan/
-ipscan:
-ipscan:
-ipscan:
-ipscan:
diff --git a/network/iptv-analyzer/README b/network/iptv-analyzer/README
deleted file mode 100644
index 4388448340..0000000000
--- a/network/iptv-analyzer/README
+++ /dev/null
@@ -1,8 +0,0 @@
-The IPTV-Analyzer is a continuous/real-time tool for analyzing the contents
-of MPEG2 Transport Stream (TS) packets, which is commonly used for IPTV
-multicast signals.
-
-The main purpose is continuous quality measurement, with a focus on detecting
-MPEG2 TS/CC packet drops.
-
-It scales to hundreds of IPTV channels, even on small ATOM based CPUs.
diff --git a/network/iptv-analyzer/doinst.sh b/network/iptv-analyzer/doinst.sh
deleted file mode 100644
index a4258c7da6..0000000000
--- a/network/iptv-analyzer/doinst.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-if [ -x sbin/depmod ]; then
-  chroot . /sbin/depmod -a @@KERNEL@@ >/dev/null 2>&1
-fi
diff --git a/network/iptv-analyzer/iptv-analyzer.SlackBuild b/network/iptv-analyzer/iptv-analyzer.SlackBuild
deleted file mode 100644
index faf516d683..0000000000
--- a/network/iptv-analyzer/iptv-analyzer.SlackBuild
+++ /dev/null
@@ -1,143 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for iptv-analyzer
-
-# Copyright 2013, 2015, 2016, 2017  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=iptv-analyzer
-VERSION=${VERSION:-0.9.4}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-SRCNAM=IPTV-Analyzer
-KERNEL=${KERNEL:-$( uname -r )}
-
-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 {} \;
-
-patch -p1 <$CWD/patches/e5d7c0b90cfe3218d67b56e122140456206f6a65.patch
-patch -p1 <$CWD/patches/kernel-4.4.diff
-patch -p1 <$CWD/patches/Makefile.am.diff
-patch -p1 <$CWD/patches/Makefile.in.diff
-
-./autogen.sh
-
-mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/xtables
-
-env -u ARCH \
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
-  --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --sysconfdir=/etc \
-  --localstatedir=/var \
-  --mandir=/usr/man \
-  --docdir=/usr/doc/$PRGNAM-$VERSION \
-  --datarootdir=/usr \
-  --with-xtlibdir=$PKG/usr/lib${LIBDIRSUFFIX}/xtables \
-  --with-kbuild=/lib/modules/$KERNEL/build \
-  --build=$ARCH-slackware-linux
-
-env -u ARCH make
-env -u ARCH make install DESTDIR=$PKG \
-             INSTALLDIRS=vendor \
-             INST_ETC=$PKG/etc/$PRGNAM \
-             INSTALL_MOD_PATH=$PKG
-
-# Module installer was too leaky
-mkdir -p $PKG/lib/modules/$KERNEL/extra
-cp -a iptables-module/{compat_xtables,xt_mpeg2ts}.ko \
-  $PKG/lib/modules/$KERNEL/extra
-
-# Manpages are a bit stubborn
-mv $PKG/usr/share/man $PKG/usr
-
-# Fonts are elsewhere
-sed -i 's#usr/share/fonts/truetype/freefont#usr/share/fonts/TTF#' \
-  webfrontend/www/{graphs.inc.php,staging/pie01.php}
-
-find $PKG -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 perllocal.pod and other special files that don't need to be installed
-find $PKG -name perllocal.pod -o -name ".packlist" -o -name "*.bs" | xargs rm -f || true
-
-# Remove empty directories
-find $PKG -depth -type d -empty -delete || true
-
-# Remove git cruft
-find $PKG -type f -name .gitignore -delete
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a COPYING ChangeLog INSTALL README.wiki TODO database doc/* \
-  collector/bin/generate-test-snmptrap.pl webfrontend $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a snmp/mibs $PKG/usr/doc/$PRGNAM-$VERSION/snmp-mibs
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-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-${VERSION}_${KERNEL//-/_}-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/network/iptv-analyzer/iptv-analyzer.info b/network/iptv-analyzer/iptv-analyzer.info
deleted file mode 100644
index 3b55c729fe..0000000000
--- a/network/iptv-analyzer/iptv-analyzer.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="iptv-analyzer"
-VERSION="0.9.4"
-HOMEPAGE="https://github.com/netoptimizer/IPTV-Analyzer/"
-DOWNLOAD="https://github.com/netoptimizer/IPTV-Analyzer/archive/v0.9.4/IPTV-Analyzer-0.9.4.tar.gz"
-MD5SUM="b1c307eb8c0afe846d53b901386b3453"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="perl-Config-File perl-Data-Compare perl-Log-Dispatch perl-Log-Log4perl perl-Net-SNMP perl-Proc-Daemon perl-Proc-PID-File"
-MAINTAINER="Mario Preksavec"
-EMAIL="mario at slackware dot hr"
diff --git a/network/iptv-analyzer/patches/Makefile.am.diff b/network/iptv-analyzer/patches/Makefile.am.diff
deleted file mode 100644
index 8e03aab10e..0000000000
--- a/network/iptv-analyzer/patches/Makefile.am.diff
+++ /dev/null
@@ -1,13 +0,0 @@
---- IPTV-Analyzer-0.9.4/Makefile.am.orig	2015-03-04 10:41:03.000000000 +0100
-+++ IPTV-Analyzer-0.9.4/Makefile.am	2017-11-05 00:20:05.903209784 +0100
-@@ -21,8 +21,8 @@
- #xtables-addons.8: FORCE
- #	${MAKE} -f Makefile.mans all;
- 
--install-exec-hook:
--	depmod -a || :;
-+#install-exec-hook:
-+#	depmod -a || :;
- 
- #config.status: Makefile.iptrules.in
- 
diff --git a/network/iptv-analyzer/patches/Makefile.in.diff b/network/iptv-analyzer/patches/Makefile.in.diff
deleted file mode 100644
index f0c93e492d..0000000000
--- a/network/iptv-analyzer/patches/Makefile.in.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- IPTV-Analyzer-0.9.4/iptables-module/Makefile.in.orig	2015-03-04 10:41:03.000000000 +0100
-+++ IPTV-Analyzer-0.9.4/iptables-module/Makefile.in	2017-11-05 03:37:21.671512778 +0100
-@@ -115,7 +115,7 @@
- 	    exit 2; \
- 	fi
- 
--install: lib_install modules_install
-+install: lib_install modules
- 
- 
- clean:
diff --git a/network/iptv-analyzer/patches/e5d7c0b90cfe3218d67b56e122140456206f6a65.patch b/network/iptv-analyzer/patches/e5d7c0b90cfe3218d67b56e122140456206f6a65.patch
deleted file mode 100644
index 4a84020a1e..0000000000
--- a/network/iptv-analyzer/patches/e5d7c0b90cfe3218d67b56e122140456206f6a65.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From e5d7c0b90cfe3218d67b56e122140456206f6a65 Mon Sep 17 00:00:00 2001
-From: Hoai-Thu Vuong <thuvh87@gmail.com>
-Date: Tue, 12 Jan 2016 17:30:45 +0700
-Subject: [PATCH] using echo and tag php in code
-
----
- webfrontend/www/design.inc.php | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/webfrontend/www/design.inc.php b/webfrontend/www/design.inc.php
-index 174e04a..9fcd7b0 100644
---- a/webfrontend/www/design.inc.php
-+++ b/webfrontend/www/design.inc.php
-@@ -29,12 +29,12 @@ function doHeader($title="", $options=FALSE) {
-       <meta name="description" content="tvprobe webfrontend" />
-       <meta name="publisher"   content="ComX Networks A/S" />
- 
--      <link rel="stylesheet" type="text/css" href="<?=$incdir?>css/motorola.css">
-+      <link rel="stylesheet" type="text/css" href="<?php echo $incdir; ?>css/motorola.css">
- <?php
-        if ($include_javascript == TRUE) {
- ?>
-       <script
--	 src="<?=$incdir?>functions.js" type="text/javascript" language='javascript'>
-+	 src="<?php echo $incdir; ?>functions.js" type="text/javascript" language='javascript'>
-       </script>
- <?php
-        }
-@@ -44,10 +44,10 @@ function doHeader($title="", $options=FALSE) {
- ?>
-       <!--Epoch's styles-->
-       <link rel="stylesheet" type="text/css"
--	    href="<?=$incdir?>js/epoch_v202_en/epoch_styles.css" />
-+	    href="<?php echo $incdir; ?>js/epoch_v202_en/epoch_styles.css" />
- 
-       <!--Epoch's Code-->
--      <script type="text/javascript" src="<?=$incdir?>js/epoch_v202_en/epoch_classes.js">
-+      <script type="text/javascript" src="<?php echo $incdir; ?>js/epoch_v202_en/epoch_classes.js">
-       </script>
- 
-       <script type="text/javascript">
diff --git a/network/iptv-analyzer/patches/kernel-4.4.diff b/network/iptv-analyzer/patches/kernel-4.4.diff
deleted file mode 100644
index 471305bd4f..0000000000
--- a/network/iptv-analyzer/patches/kernel-4.4.diff
+++ /dev/null
@@ -1,81 +0,0 @@
-diff --git a/iptables-module/compat_xtables.c b/iptables-module/compat_xtables.c
-index c5b67a4..40f83c8 100644
---- a/iptables-module/compat_xtables.c
-+++ b/iptables-module/compat_xtables.c
-@@ -464,6 +464,7 @@ struct xt_match *xtnu_request_find_match(unsigned int af, const char *name,
- }
- EXPORT_SYMBOL_GPL(xtnu_request_find_match);
-
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 4, 0)
- int xtnu_ip_route_me_harder(struct sk_buff **pskb, unsigned int addr_type)
- {
- #if LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 17)
-@@ -476,6 +477,7 @@ int xtnu_ip_route_me_harder(struct sk_buff **pskb, unsigned int addr_type)
- #endif
- }
- EXPORT_SYMBOL_GPL(xtnu_ip_route_me_harder);
-+#endif
-
- int xtnu_skb_make_writable(struct sk_buff **pskb, unsigned int len)
- {
-diff --git a/iptables-module/compat_xtnu.h b/iptables-module/compat_xtnu.h
-index 02b6575..253e3df 100644
---- a/iptables-module/compat_xtnu.h
-+++ b/iptables-module/compat_xtnu.h
-@@ -143,7 +143,9 @@ static inline __wsum csum_unfold(__sum16 n)
- #endif
-
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 4, 0)
- extern int xtnu_ip_local_out(struct sk_buff *);
- extern int xtnu_ip_route_me_harder(struct sk_buff **, unsigned int);
-+#endif
- extern int xtnu_skb_make_writable(struct sk_buff **, unsigned int);
- extern int xtnu_register_match(struct xtnu_match *);
- extern int xtnu_ip_route_output_key(void *, struct rtable **, struct flowi *);
-diff --git a/iptables-module/xt_mpeg2ts.c b/iptables-module/xt_mpeg2ts.c
-index 91ae4a0..87cfb17 100644
---- a/iptables-module/xt_mpeg2ts.c
-+++ b/iptables-module/xt_mpeg2ts.c
-@@ -99,7 +99,7 @@ static const struct file_operations dl_file_ops;
- #endif
- 
- static int debug  = -1;
--static int msg_level;
-+static int msg_level = MPEG2TS_MSG_DEFAULT;
- module_param(debug, int, 0);
- module_param(msg_level, int, 0664);
- MODULE_PARM_DESC(debug, "Set low N bits of message level");
-@@ -1299,14 +1299,12 @@ static void mpeg2ts_seq_stop(struct seq_file *s, void *v)
- static int mpeg2ts_seq_show_real(struct mpeg2ts_stream *stream,
- 				 struct seq_file *s, unsigned int bucket)
- {
--	int res;
--
- 	if (!atomic_inc_not_zero(&stream->use)) {
- 		/* If "use" is zero, then we about to be free'd */
- 		return 0;
- 	}
- 
--	res = seq_printf(s, "bucket:%d dst:%pI4 src:%pI4 dport:%u sport:%u "
-+	seq_printf(s, "bucket:%d dst:%pI4 src:%pI4 dport:%u sport:%u "
- 			    "pids:%d skips:%llu discontinuity:%llu "
- 			    "payload_bytes:%llu packets:%llu\n",
- 			 bucket,
-@@ -1323,7 +1321,7 @@ static int mpeg2ts_seq_show_real(struct mpeg2ts_stream *stream,
- 
- 	atomic_dec(&stream->use);
- 
--	return res;
-+	return seq_has_overflowed(s);
- }
- 
- static int mpeg2ts_seq_show(struct seq_file *s, void *v)
-@@ -1434,7 +1432,7 @@ static int __init mpeg2ts_mt_init(void)
- 	 */
- 	INIT_LIST_HEAD(&conn_htables);
- 
--	msg_level = netif_msg_init(debug, MPEG2TS_MSG_DEFAULT);
-+	msg_level = netif_msg_init(debug, msg_level);
- 	msg_info(DRV, "Loading: %s", version);
- 	msg_dbg(DRV, "Message level (msg_level): 0x%X", msg_level);
- 
diff --git a/network/iptv-analyzer/slack-desc b/network/iptv-analyzer/slack-desc
deleted file mode 100644
index 6c7511834e..0000000000
--- a/network/iptv-analyzer/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------------------------------------------------------|
-iptv-analyzer: iptv-analyzer (IPTV MPEG2 Transport Stream Analyzer)
-iptv-analyzer:
-iptv-analyzer: The IPTV-Analyzer is a continuous/real-time tool for analyzing the
-iptv-analyzer: contents of MPEG2 Transport Stream (TS) packets, which is commonly
-iptv-analyzer: used for IPTV multicast signals. The main purpose is continuous
-iptv-analyzer: quality measurement, with a focus on detecting MPEG2 TS/CC packet
-iptv-analyzer: drops.
-iptv-analyzer:
-iptv-analyzer: Homepage: https://github.com/netoptimizer/IPTV-Analyzer/
-iptv-analyzer:
-iptv-analyzer:
diff --git a/network/ipv6calc/README b/network/ipv6calc/README
index 66599f47b4..8b5209d498 100644
--- a/network/ipv6calc/README
+++ b/network/ipv6calc/README
@@ -10,13 +10,13 @@ external databases. The following build options may be used to include
 support for these:
 
   IP2LOCATION=yes  Enable IP2Location support (requires ip2location-c)
-  GEOIP=yes        Enable GeoIP support (requires GeoIP)
+  GEOIP2=yes       Enable GeoIP2 support (requires libmaxminddb)
   EXTERNAL=yes     Enable external db support
 
 where each build option is passed to the slackbuild. Example of
 enabling the IP2Location and GeoIP external database:
 
-  IP2LOCATION=yes GEOIP=yes ./ipv6calc.SlackBuild
+  IP2LOCATION=yes GEOIP2=yes ./ipv6calc.SlackBuild
 
 The ipv6calc Apache module can be built by passing MOD_IPV6CALC=yes to
 the slackbuild as:
diff --git a/network/ipv6calc/ipv6calc.SlackBuild b/network/ipv6calc/ipv6calc.SlackBuild
index a9ea0bf1d5..e4aa1a91fe 100644
--- a/network/ipv6calc/ipv6calc.SlackBuild
+++ b/network/ipv6calc/ipv6calc.SlackBuild
@@ -1,10 +1,10 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for ipv6calc
 
 # Copyright 2012, 2013  Chris Abela, Malta
 # Copyright 2014  Ryan P.C. McQuen, WA, ryanpcmcquen@member.fsf.org
-# Copyright 2018  Jason Graham, MD <jgraha8@gmail.com>
+# Copyright 2018-2019, 2023  Jason Graham, MD <jgraham@compukix.net>
 # 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=ipv6calc
-VERSION=${VERSION:-1.0.0}
+VERSION=${VERSION:-4.1.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}
@@ -71,17 +81,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 {} \;
 
-unset ENABLE_IP2LOCATION
-unset ENABLE_GEOIP
-unset ENABLE_EXTERNAL
-unset ENABLE_MOD_IPV6CALC
+ENABLE_IP2LOCATION="--disable-ip2location"
+ENABLE_GEOIP2="--disable-geoip2"
+ENABLE_EXTERNAL="--disable-external"
+ENABLE_MOD_IPV6CALC="--disable-mod_ipv6calc"
 
 if [ "$IP2LOCATION" = "yes" ]; then
     ENABLE_IP2LOCATION="--enable-ip2location  --with-ip2location-db=/usr/share/IP2Loc"
 fi
 
-if [ "$GEOIP" = "yes" ]; then
-    ENABLE_GEOIP="--enable-geoip --with-geoip-db=/usr/share/GeoIP"
+if [ "$GEOIP2" = "yes" ]; then
+    ENABLE_GEOIP2="--enable-mmdb --with-geoip-db=/usr/share/GeoIP"
 fi
 
 if [ "$EXTERNAL" = "yes" ]; then
@@ -102,7 +112,9 @@ CXXFLAGS="$SLKCFLAGS" \
   --mandir=/usr/man \
   --docdir=/usr/doc/$PRGNAM-$VERSION \
   --build=$ARCH-slackware-linux \
-  $ENABLE_IP2LOCATION $ENABLE_GEOIP $ENABLE_EXTERNAL $ENABLE_MOD_IPV6CALC
+  --disable-dbip \
+  --disable-dbip2 \
+  $ENABLE_IP2LOCATION $ENABLE_GEOIP2 $ENABLE_EXTERNAL $ENABLE_MOD_IPV6CALC
 
 make
 make install DESTDIR=$PKG
@@ -115,7 +127,9 @@ 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 \
-   CHANGES COPYING CREDITS ChangeLog LICENSE README TODO USAGE VERSION \
+   CHANGES COPYING CREDITS ChangeLog INSTALLING LICENSE README README.DBIP \
+   README.DBIP2 README.External README.GeoIP README.GeoIP2 README.IP2Location \
+   README.MaxMindDB TODO USAGE VERSION \
    doc/ipv6calc.html \
    $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
@@ -125,6 +139,9 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 if [ "$MOD_IPV6CALC" = "yes" ]; then
+    mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/mod_ipv6calc
+    cp -a \
+       mod_ipv6calc/README.mod_ipv6calc $PKG/usr/doc/$PRGNAM-$VERSION/mod_ipv6calc
     # Move the ipv6calc.conf to the proper location
     mkdir -p $PKG/etc/httpd
     mv $PKG/etc/{httpd.d,httpd/extra}
@@ -136,4 +153,4 @@ if [ "$MOD_IPV6CALC" = "yes" ]; 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/network/ipv6calc/ipv6calc.info b/network/ipv6calc/ipv6calc.info
index 576e679891..14c8a2f9bd 100644
--- a/network/ipv6calc/ipv6calc.info
+++ b/network/ipv6calc/ipv6calc.info
@@ -1,10 +1,10 @@
 PRGNAM="ipv6calc"
-VERSION="1.0.0"
+VERSION="4.1.0"
 HOMEPAGE="http://www.deepspace6.net/projects/ipv6calc.html"
-DOWNLOAD="ftp://ftp.deepspace6.net/pub/ds6/sources/ipv6calc/ipv6calc-1.0.0.tar.gz"
-MD5SUM="6eed2e5b8ca07330e044d809ade3b565"
+DOWNLOAD="https://github.com/pbiering/ipv6calc/archive/4.1.0/ipv6calc-4.1.0.tar.gz"
+MD5SUM="4891e8f53606c78c77a8185fe1b02fde"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
 MAINTAINER="Jason Graham"
-EMAIL="jgraha8@gmail.com"
+EMAIL="jgraham@compukix.net"
diff --git a/network/ipvsadm/ipvsadm-1.25-popt.patch b/network/ipvsadm/ipvsadm-1.25-popt.patch
deleted file mode 100644
index 2826002843..0000000000
--- a/network/ipvsadm/ipvsadm-1.25-popt.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -Naupr ipvsadm-1.25.orig/Makefile ipvsadm-1.25/Makefile
---- ipvsadm-1.25.orig/Makefile	2008-09-23 18:14:46.000000000 +0200
-+++ ipvsadm-1.25/Makefile	2008-12-22 20:03:53.793372130 +0100
-@@ -62,14 +62,7 @@ RPMBUILD = $(shell				\
- 	fi )
- 
- ifeq (,$(FORCE_GETOPT))
--LIB_SEARCH = /lib /usr/lib /usr/local/lib
--POPT_LIB = $(shell for i in $(LIB_SEARCH); do \
--  if [ -f $$i/libpopt.a ]; then \
--    if nm $$i/libpopt.a | fgrep -q poptGetContext; then \
--	echo "-lpopt"; \
--    fi; \
--  fi; \
--done)
-+POPT_LIB = "-lpopt"
- endif
- 
- ifneq (,$(POPT_LIB))
diff --git a/network/ipvsadm/ipvsadm.SlackBuild b/network/ipvsadm/ipvsadm.SlackBuild
index 6dfcb5dbd4..8c8485d44a 100644
--- a/network/ipvsadm/ipvsadm.SlackBuild
+++ b/network/ipvsadm/ipvsadm.SlackBuild
@@ -1,30 +1,40 @@
-#!/bin/sh
+#!/bin/bash
 
-# Slackware build script for source-highlight
-# Written by luoyi (luoyi.ly@gmail.com)
+# Slackware build script for ipvsadm
+# 2010 - Written by luoyi (luoyi.ly@gmail.com)
+# 2010-2016 - Modified by the slackbuilds.org project
+# 2020 - Modified by Marek Wodzinski <majek@w7i.pl>
 
-# Modified by the slackbuilds.org project
+cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=ipvsadm
-VERSION=${VERSION:-1.25}
+VERSION=${VERSION:-1.31}
 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"
@@ -43,7 +53,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 . \
@@ -52,9 +62,6 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-# fix not detecting popt by default
-patch -p1 -i $CWD/ipvsadm-1.25-popt.patch
-
 # use SLKCFLAGS
 sed -i "s/-Wall/-Wall $SLKCFLAGS/" Makefile
 sed -i "s/-Wall/-Wall $SLKCFLAGS/" libipvs/Makefile
@@ -72,10 +79,16 @@ find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
 )
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+  MAINTAINERS README \
+  $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
+mv $PKG/etc/rc.d/init.d/ipvsadm $PKG/etc/rc.d/rc.ipvsadm
+rmdir $PKG/etc/rc.d/init.d
+
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/network/ipvsadm/ipvsadm.info b/network/ipvsadm/ipvsadm.info
index 33eb491f3d..13e862d990 100644
--- a/network/ipvsadm/ipvsadm.info
+++ b/network/ipvsadm/ipvsadm.info
@@ -1,10 +1,10 @@
 PRGNAM="ipvsadm"
-VERSION="1.25"
+VERSION="1.31"
 HOMEPAGE="http://www.linuxvirtualserver.org/"
-DOWNLOAD="http://www.linuxvirtualserver.org/software/kernel-2.6/ipvsadm-1.25.tar.gz"
-MD5SUM="772a053f5fe888cd25784c5f55d31fc3"
+DOWNLOAD="https://mirrors.edge.kernel.org/pub/linux/utils/kernel/ipvsadm/ipvsadm-1.31.tar.xz"
+MD5SUM="f6d1707c5baf684b58fd33682d67871f"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="luoyi"
-EMAIL="luoyi.ly@gmail.com"
+MAINTAINER="Marek Wodzinski"
+EMAIL="majek@w7i.pl"
diff --git a/network/ipxnet/README b/network/ipxnet/README
index 1b7786bbf5..9479ebe331 100644
--- a/network/ipxnet/README
+++ b/network/ipxnet/README
@@ -3,9 +3,9 @@ ipxnet (tunnel IPX over TCP/IP)
 Host a standalone IPX network over tcp for old DOS games running in
 dosbox.
 
-For more information, see "https://www.dosbox.com/wiki/connectivity". Note
-that the "Start IPX server" step is unnecessary when using this build
-of ipxnet.
+For more information, see "https://www.dosbox.com/wiki/connectivity".
+Note that the "Start IPX server" step is unnecessary when using this
+build of ipxnet.
 
 There are two use cases for ipxnet, with two separate executables:
 
@@ -13,11 +13,13 @@ There are two use cases for ipxnet, with two separate executables:
   this, there's no need for an init script. The executable for users is
   called "ipxnet". It logs to standard output only, and doesn't detach
   from the terminal. The officially assigned UDP port number can't be
-  used, as it's port 213 and normal users can't bind to ports below 1024.
+  used, as it's port 213 and normal users can't bind to ports below
+  1024.
 
 - Persistent daemon, that starts at boot and runs until shutdown. The
   executable for this is "ipxnet-system", but you don't normally run it
-  directly. Instead, there's an init script. To make ipxnet start at boot:
+  directly. Instead, there's an init script. To make ipxnet start at
+  boot:
 
   # chmod 755 /etc/rc.d/rc.ipxnet
 
@@ -40,8 +42,9 @@ in the SlackBuild's environment. It's a bad idea to run this as root,
 since it hasn't been audited for security. If you're really paranoid,
 you probably will want to create a dedicated ipxnet user and group.
 
-ipxnet-system also has the cap_net_bind_service capability set, meaning
-it must be installed on a filesystem that supports capabilities (this
-includes but is not limited to ext2/3/4 and reiserfs v3). This is required
-for it to run as "nobody" yet be able to bind to low-numbered ports,
-and is a much safer alternative to running it as root.
+ipxnet-system also has the cap_net_bind_service capability set,
+meaning it must be installed on a filesystem that supports
+capabilities (this includes but is not limited to ext2/3/4 and
+reiserfs v3). This is required for it to run as "nobody" yet be able
+to bind to low-numbered ports, and is a much safer alternative to
+running it as root.
diff --git a/network/ipxnet/doinst.sh b/network/ipxnet/doinst.sh
index 5af0d51745..a767f83f1c 100644
--- a/network/ipxnet/doinst.sh
+++ b/network/ipxnet/doinst.sh
@@ -29,4 +29,4 @@ touch var/log/ipxnet.log
 chown @IPXUSER@:@IPXGROUP@ var/log/ipxnet.log
 
 # 14.2 uses tar-1.15 for makepkg, can't handle capabilities, so:
-[ -e /sbin/setcap] && /sbin/setcap cap_net_bind_service=epi usr/sbin/ipxnet-system
+[ -e /sbin/setcap ] && /sbin/setcap cap_net_bind_service=epi usr/sbin/ipxnet-system
diff --git a/network/ipxnet/git2tarxz.sh b/network/ipxnet/git2tarxz.sh
index 43de757147..b727ef3c88 100644
--- a/network/ipxnet/git2tarxz.sh
+++ b/network/ipxnet/git2tarxz.sh
@@ -35,7 +35,7 @@ Archive created: $PRGNAM-$VERSION.tar.xz
 Update $PRGNAM.info with:
 
 VERSION="$VERSION"
-DOWNLOAD="http://urchlay.naptime.net/~urchlay/src/$PRGNAM-$VERSION.tar.xz"
+DOWNLOAD="https://slackware.uk/~urchlay/src/$PRGNAM-$VERSION.tar.xz"
 MD5SUM="$( md5sum $PRGNAM-$VERSION.tar.xz | cut -d' ' -f1 )"
 
 Don't forget to upload the new source!
diff --git a/network/ipxnet/ipxnet.SlackBuild b/network/ipxnet/ipxnet.SlackBuild
index c6d4810cff..f2b9ba8d63 100644
--- a/network/ipxnet/ipxnet.SlackBuild
+++ b/network/ipxnet/ipxnet.SlackBuild
@@ -1,19 +1,27 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for ipxnet
 
-# 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.
 
+# 20220411 bkw: BUILD=3
+# - put README_SBo.txt in actual doc dir (not $PKG/install!).
+
+# 20210911 bkw: fix missing space before ] in doinst.sh. Grr.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 # We install the binary setuid nobody/nogroup by default.
 IPXUSER="${IPXUSER:-nobody}"
 IPXGROUP="${IPXGROUP:-nogroup}"
 
 PRGNAM=ipxnet
 VERSION=${VERSION:-20120808.0dce97e}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-3}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -23,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}
@@ -80,6 +92,8 @@ mkdir -p $PKG/var/log
 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
+# Our README includes init script instructions, include it.
+cat $CWD/README > $PKG/usr/doc/$PRGNAM-$VERSION/README_SBo.txt
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
@@ -87,8 +101,5 @@ sed -e "s,@IPXUSER@,$IPXUSER,g"   \
     -e "s,@IPXGROUP@,$IPXGROUP,g" \
     $CWD/doinst.sh > $PKG/install/doinst.sh
 
-# Our README includes init script instructions, include it.
-cat $CWD/README > $PKG/install/README_SBo.txt
-
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/network/ipxnet/ipxnet.info b/network/ipxnet/ipxnet.info
index c17a1eaea5..42eb0f7108 100644
--- a/network/ipxnet/ipxnet.info
+++ b/network/ipxnet/ipxnet.info
@@ -1,10 +1,10 @@
 PRGNAM="ipxnet"
 VERSION="20120808.0dce97e"
 HOMEPAGE="https://github.com/intangir/ipxnet"
-DOWNLOAD="http://urchlay.naptime.net/~urchlay/src/ipxnet-20120808.0dce97e.tar.xz"
+DOWNLOAD="https://slackware.uk/~urchlay/src/ipxnet-20120808.0dce97e.tar.xz"
 MD5SUM="a6bebe9513240e145285e4526ea3114c"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
 MAINTAINER="B. Watson"
-EMAIL="yalhcru@gmail.com"
+EMAIL="urchlay@slackware.uk"
diff --git a/network/ipxnet/rc.ipxnet b/network/ipxnet/rc.ipxnet
index 22733ce0e8..30e5239887 100644
--- a/network/ipxnet/rc.ipxnet
+++ b/network/ipxnet/rc.ipxnet
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# "Simple" init script for SBo ipxnet, by B. Watson <yalhcru@gmail.com>. If
+# "Simple" init script for SBo ipxnet, by B. Watson <urchlay@slackware.uk>. If
 # you need something fancier (multiple instances of ipxnet), feel free
 # to implement it here and send me the updated script. I'll add it to
 # the SBo build.
diff --git a/network/ipxnet/rc.ipxnet.conf b/network/ipxnet/rc.ipxnet.conf
index bc9bfa34a0..7fae5ba482 100644
--- a/network/ipxnet/rc.ipxnet.conf
+++ b/network/ipxnet/rc.ipxnet.conf
@@ -1,4 +1,4 @@
-# Config file for SBo ipxnet startup script, by B. Watson <yalhcru@gmail.com>.
+# Config file for SBo ipxnet startup script, by B. Watson <urchlay@slackware.uk>.
 
 # ipxnet-system binary runs setuid nobody by default, but has the
 # cap_net_bind_service capability set. This gives the ipxnet-system
diff --git a/network/irc.c/README b/network/irc.c/README
new file mode 100644
index 0000000000..9996813f77
--- /dev/null
+++ b/network/irc.c/README
@@ -0,0 +1,5 @@
+irc.c (minimalist curses IRC client)
+
+The irc.c client is, as its name implies, a single C file which
+implements a usable IRC client. The display mechanism uses any
+standard curses library.
diff --git a/network/irc.c/git2tarxz.sh b/network/irc.c/git2tarxz.sh
new file mode 100644
index 0000000000..878fcc5a88
--- /dev/null
+++ b/network/irc.c/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=irc.c
+CLONE_URL=git://c9x.me/irc.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/network/irc.c/irc.c.1 b/network/irc.c/irc.c.1
new file mode 100644
index 0000000000..94e7f8c416
--- /dev/null
+++ b/network/irc.c/irc.c.1
@@ -0,0 +1,159 @@
+.\" 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 "IRC.C" 1 "2022-01-03" "20210302_490f194" "SlackBuilds.org"
+.SH NAME
+irc.c \- minimalist curses IRC client
+.\" RST source for irc.c(1) man page. Convert with:
+.
+.\" rst2man.py irc.c.rst > irc.c.1
+.
+.\" rst2man.py comes from the SBo development/docutils package.
+.
+.SH SYNOPSIS
+.sp
+irc.c [\fI\-n NICK\fP] [\fI\-u USER\fP] [\fI\-s SERVER\fP] [\fI\-p PORT\fP] [\fI\-l LOGFILE\fP] [\fI\-t\fP] [\fI\-h\fP]
+.SH DESCRIPTION
+.sp
+\fBirc.c\fP is a simple IRC client. Features:
+.INDENT 0.0
+.INDENT 3.5
+.INDENT 0.0
+.IP \(bu 2
+infinite scrollback
+.IP \(bu 2
+automatic reconnection
+.IP \(bu 2
+utf8 support (inputting is still to do)
+.IP \(bu 2
+line editing (emacs like keybindings)
+.IP \(bu 2
+activity markers
+.IP \(bu 2
+logging
+.IP \(bu 2
+terminal resizes (inside an xterm)
+.UNINDENT
+.UNINDENT
+.UNINDENT
+.sp
+The user interface uses multiple windows. The first window is always
+the server window, and each channel or private message conversation
+gets its own window. Press \fB^N\fP and \fB^P\fP for next/previous window.
+.sp
+There is no config file. Options are set on the command line and/or
+in the environment.
+.SH OPTIONS
+.INDENT 0.0
+.TP
+.BI \-n \ NICK
+Sets the nickname (default: \fBIRCNICK\fP from environment; if not set, the
+username from \fB\-u\fP or \fBUSER\fP).
+.TP
+.BI \-u \ USER
+Sets the username (default: \fBUSER\fP from environment, or \fIanonymous\fP if not set).
+.TP
+.BI \-s \ SERVER
+Server to connect to (default: irc.oftc.net).
+.TP
+.BI \-p \ PORT
+Port to connect to (default: 6667).
+.TP
+.BI \-l \ FILE
+File to log recieved data (default: none). If the file already
+exists, new data is appended to it.
+.TP
+.B  \-t
+Use a secured connection. For most IRC servers, you\(aqll also have to set
+\fB\-p 6697\fP (or whatever port the server uses for secure connections).
+.TP
+.B  \-h
+Display help.
+.UNINDENT
+.SH COMMANDS
+.sp
+IRC commands are \fInot\fP prefixed with a slash, in this client.
+.INDENT 0.0
+.TP
+.B \fBj\fP \fIchannel\fP
+Join a channel and create a new window for it.
+.TP
+.B \fBl\fP
+Leave (part) the currently displayed channel and close its window.
+.TP
+.B \fBm\fP \fInick\fP \fImessage\fP
+Send a private message. This creates a new window for the conversation.
+.TP
+.B \fBr\fP \fItext\fP
+Send raw \fItext\fP to the server (like \fB/QUOTE\fP in other clients).
+.TP
+.B \fBq\fP
+Quit. There is no way to send a quit message.
+.UNINDENT
+.SH KEYSTROKES
+.INDENT 0.0
+.TP
+.B \fB^N\fP
+Next window.
+.TP
+.B \fB^P\fP
+Previous window.
+.TP
+.B \fBPageUp\fP
+Scroll up.
+.TP
+.B \fBPageDown\fP
+Scroll down.
+.UNINDENT
+.sp
+Emacs\-style editing keys are also supported (\fB^U\fP, \fB^W\fP, etc).
+.SH ENVIRONMENT
+.INDENT 0.0
+.TP
+.B \fBUSER\fP
+The default IRC username (override with \fB\-u\fP). This is unlike other
+IRC clients, which use \fBIRCUSER\fP\&.
+.TP
+.B \fBIRCNICK\fP
+The default IRC nickname. Override with \fB\-n\fP\&.
+.TP
+.B \fBIRCPASS\fP
+Password used to authenticate to the IRC server, if set.
+.UNINDENT
+.SH COPYRIGHT
+.sp
+The author has placed \fBirc.c\fP in the public domain.
+.sp
+This man page written for the SlackBuilds.org project
+by B. Watson, and is licensed under the WTFPL.
+.SH SEE ALSO
+.sp
+The irc.c homepage: \fI\%https://c9x.me/irc/\fP
+.\" Generated by docutils manpage writer.
+.
diff --git a/network/irc.c/irc.c.SlackBuild b/network/irc.c/irc.c.SlackBuild
new file mode 100644
index 0000000000..9ddfa64138
--- /dev/null
+++ b/network/irc.c/irc.c.SlackBuild
@@ -0,0 +1,86 @@
+#!/bin/bash
+
+# Slackware build script for irc.c
+
+# 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=irc.c
+VERSION=${VERSION:-20210302_490f194}
+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 {} \+
+
+# set default server. if unspecified, use libera, because that's where
+# our #slackbuilds channel lives. man page is written by SlackBuild
+# author.
+cp $CWD/$PRGNAM.1 .
+sed -i "s,irc\\.oftc\\.net,${SERVER:-irc.libera.chat}," \
+    $PRGNAM README $PRGNAM.1
+
+# make the backspace key work, regardless of whether it sends ASCII
+# BS or DEL.
+sed -i "/CTRL('h')/a\\\\tcase 127:" $PRGNAM
+
+sed -i "s|-Os|$SLKCFLAGS|" Makefile
+
+make
+mkdir -p $PKG/usr/bin $PKG/usr/man/man1
+install -s -m0755 irc $PKG/usr/bin/$PRGNAM
+gzip -9c < $PRGNAM.1 > $PKG/usr/man/man1/$PRGNAM.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
diff --git a/network/irc.c/irc.c.info b/network/irc.c/irc.c.info
new file mode 100644
index 0000000000..d4dc56ce33
--- /dev/null
+++ b/network/irc.c/irc.c.info
@@ -0,0 +1,10 @@
+PRGNAM="irc.c"
+VERSION="20210302_490f194"
+HOMEPAGE="https://c9x.me/irc/"
+DOWNLOAD="https://slackware.uk/~urchlay/src/irc.c-20210302_490f194.tar.xz"
+MD5SUM="ff34e47e6167424a9a075eecbe21be0a"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="B. Watson"
+EMAIL="urchlay@slackware.uk"
diff --git a/network/irc.c/irc.c.rst b/network/irc.c/irc.c.rst
new file mode 100644
index 0000000000..c4f7508010
--- /dev/null
+++ b/network/irc.c/irc.c.rst
@@ -0,0 +1,134 @@
+.. RST source for irc.c(1) man page. Convert with:
+..   rst2man.py irc.c.rst > irc.c.1
+.. rst2man.py comes from the SBo development/docutils package.
+
+.. |version| replace:: 20210302_490f194
+.. |date| date::
+
+=====
+irc.c
+=====
+
+----------------------------
+minimalist curses IRC client
+----------------------------
+
+:Manual section: 1
+:Manual group: SlackBuilds.org
+:Date: |date|
+:Version: |version|
+
+SYNOPSIS
+========
+
+irc.c [*-n NICK*] [*-u USER*] [*-s SERVER*] [*-p PORT*] [*-l LOGFILE*] [*-t*] [*-h*]
+
+DESCRIPTION
+===========
+
+**irc.c** is a simple IRC client. Features:
+
+  * infinite scrollback
+  * automatic reconnection
+  * utf8 support (inputting is still to do)
+  * line editing (emacs like keybindings)
+  * activity markers
+  * logging
+  * terminal resizes (inside an xterm)
+
+The user interface uses multiple windows. The first window is always
+the server window, and each channel or private message conversation
+gets its own window. Press **^N** and **^P** for next/previous window.
+
+There is no config file. Options are set on the command line and/or
+in the environment.
+
+OPTIONS
+=======
+
+-n NICK
+  Sets the nickname (default: **IRCNICK** from environment; if not set, the
+  username from **-u** or **USER**).
+
+-u USER
+  Sets the username (default: **USER** from environment, or *anonymous* if not set).
+
+-s SERVER
+  Server to connect to (default: irc.oftc.net).
+
+-p PORT
+  Port to connect to (default: 6667).
+
+-l FILE
+  File to log recieved data (default: none). If the file already
+  exists, new data is appended to it.
+
+-t
+  Use a secured connection. For most IRC servers, you'll also have to set
+  **-p 6697** (or whatever port the server uses for secure connections).
+
+-h
+  Display help.
+
+COMMANDS
+========
+
+IRC commands are *not* prefixed with a slash, in this client.
+
+**j** *channel*
+  Join a channel and create a new window for it.
+
+**l**
+  Leave (part) the currently displayed channel and close its window.
+
+**m** *nick* *message*
+  Send a private message. This creates a new window for the conversation.
+
+**r** *text*
+  Send raw *text* to the server (like **/QUOTE** in other clients).
+
+**q**
+  Quit. There is no way to send a quit message.
+
+KEYSTROKES
+==========
+
+**^N**
+  Next window.
+
+**^P**
+  Previous window.
+
+**PageUp**
+  Scroll up.
+
+**PageDown**
+  Scroll down.
+
+Emacs-style editing keys are also supported (**^U**, **^W**, etc).
+
+ENVIRONMENT
+===========
+
+**USER**
+  The default IRC username (override with **-u**). This is unlike other
+  IRC clients, which use **IRCUSER**.
+
+**IRCNICK**
+  The default IRC nickname. Override with **-n**.
+
+**IRCPASS**
+  Password used to authenticate to the IRC server, if set.
+
+COPYRIGHT
+=========
+
+The author has placed **irc.c** in the public domain.
+
+This man page written for the SlackBuilds.org project
+by B. Watson, and is licensed under the WTFPL.
+
+SEE ALSO
+========
+
+The irc.c homepage: https://c9x.me/irc/
diff --git a/network/irc.c/slack-desc b/network/irc.c/slack-desc
new file mode 100644
index 0000000000..8a04cada9a
--- /dev/null
+++ b/network/irc.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------------------------------------------------------|
+irc.c: irc.c (minimalist curses IRC client)
+irc.c:
+irc.c: The irc.c client is, as its name implies, a single C file which
+irc.c: implements a usable IRC client. The display mechanism uses any
+irc.c: standard curses library.
+irc.c:
+irc.c:
+irc.c:
+irc.c:
+irc.c:
+irc.c:
diff --git a/network/irc2dc/README b/network/irc2dc/README
new file mode 100644
index 0000000000..afc922f9de
--- /dev/null
+++ b/network/irc2dc/README
@@ -0,0 +1,3 @@
+IRC to DC++ chat bridge. This software provides a chat bridge between
+Internet Relay Chat chat rooms and Direct Connect hubs using the
+NMDC protocol.
diff --git a/network/irc2dc/irc2dc.SlackBuild b/network/irc2dc/irc2dc.SlackBuild
new file mode 100644
index 0000000000..43872f7007
--- /dev/null
+++ b/network/irc2dc/irc2dc.SlackBuild
@@ -0,0 +1,118 @@
+#!/bin/bash
+
+# Slackware build script for irc2dc
+
+# Copyright SPN Team 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=irc2dc
+VERSION=${VERSION:-20121129}
+COMMIT=7fad67a4ddc1f93231d467ac3ef62605e69d3e93
+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 {} \;
+
+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 \
+  AUTHORS CONTRIBUTORS COPYING 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
diff --git a/network/irc2dc/irc2dc.info b/network/irc2dc/irc2dc.info
new file mode 100644
index 0000000000..bc3fa04db4
--- /dev/null
+++ b/network/irc2dc/irc2dc.info
@@ -0,0 +1,10 @@
+PRGNAM="irc2dc"
+VERSION="20121129"
+HOMEPAGE="https://github.com/macro1/irc2dc"
+DOWNLOAD="https://github.com/macro1/irc2dc/archive/7fad67a4ddc1f93231d467ac3ef62605e69d3e93/irc2dc-7fad67a4ddc1f93231d467ac3ef62605e69d3e93.tar.gz"
+MD5SUM="74da2ba842baa2a111fa59611eaf87cd"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="SPN Team"
+EMAIL="pwmn-master@hotmail.com"
diff --git a/network/irc2dc/slack-desc b/network/irc2dc/slack-desc
new file mode 100644
index 0000000000..3498bb13bd
--- /dev/null
+++ b/network/irc2dc/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+      |-----handy-ruler------------------------------------------------------|
+irc2dc: irc2dc (IRC to DC++ chat bridge)
+irc2dc:
+irc2dc: This software provides a chat bridge between Internet Relay Chat
+irc2dc: chat rooms and Direct Connect hubs using the NMDC protocol.
+irc2dc:
+irc2dc:
+irc2dc:
+irc2dc:
+irc2dc:
+irc2dc:
+irc2dc: https://github.com/macro1/irc2dc
diff --git a/network/ircII/NOTES_TO_SELF b/network/ircII/NOTES_TO_SELF
new file mode 100644
index 0000000000..13128c3b0e
--- /dev/null
+++ b/network/ircII/NOTES_TO_SELF
@@ -0,0 +1,44 @@
+Notes to self:
+
+wserv and ircio are executed correctly (in the new libexec/ircII dir),
+tested them with the following results:
+
+wserv seems to work fine, in the brief bit of testing I did
+with it (/window create and related commands).
+
+ircio (the -S option) doesn't work with libera.chat: with SSL
+it fails to connect at all, and without SSL it connects but the
+server closes the connection before (or during?) sending the
+MOTD. I thought it might be due to the 4K buffer size in ircio,
+but the MOTD on libera is a lot shorter than that.
+
+I haven't tried other IRC nets with -S, because I don't actually think
+anyone cares about it (other ircII forked clients like BitchX and Epic
+never even included it).
+
+--
+
+The help and support scripts are installed in /usr/share/irc. I
+thought about changing this to /usr/share/ircII, but don't really see
+the point.
+
+--
+
+Compiling with -Wall, we get:
+
+/tmp/SBo/ircii/source/hook.c:292:40: warning: ‘%3.3u’ directive
+output may be truncated writing between 3 and 10 bytes into a region
+of size 4 [-Wformat-truncation=]
+
+On further investigation, it's a bogus warning: yes, 3.3%u could
+produce up to 10 digits... but before line 292, there's code that
+rejects any number above 999. This means sprintf will write 3 bytes of
+digits followed by the terminating \0.
+
+--
+
+We compile with ncurses, not termcap... but the code in term.c uses
+termcap functions. These are actually provided by ncurses doing
+termcap emulation. See curs_termcap(3x). In practice this works fine,
+and lets us use terminals like rxvt-unicode, for which terminfo
+entries exist but are too new to be included in crusty old termcap.
diff --git a/network/ircII/README b/network/ircII/README
new file mode 100644
index 0000000000..f2d2f4add4
--- /dev/null
+++ b/network/ircII/README
@@ -0,0 +1,25 @@
+ircII (IRC Client, Second Edition)
+
+ircII is a full screen, curses-based interface to Internet Relay
+Chat. It gives full access to all of the normal IRC functions, plus a
+variety of additional options.
+
+ircII is the oldest IRC client still maintained.
+
+ircII has extensive built-in help, accessed by the /help command. If
+you'd rather read the help in a browser, it's also available as:
+
+file:///usr/doc/ircII-20210616_2/html/index.html
+
+By default, this SlackBuild sets the default IRC server to
+"SSLIRC/chat.freenode.org:6697". This only applies with ircII is
+run without a server argument on the command line. You can change
+the default server by setting the DEFSRV environment variable to the
+host:port (with optional SSLIRC/ prefix for a secure connection), or
+compile without a default server with DEFSRV=none.
+
+Optionally, ircII can be compiled with 'paranoid mode'. This stops
+ircII from including the ircII version or realname/username in CTCP
+VERSION and FINGER responses. It also stops ircII from responding to
+channel-wide CTCP requests entirely. To do this, export PARANOID=yes
+in the script's environment.
diff --git a/network/ircII/ircII.SlackBuild b/network/ircII/ircII.SlackBuild
new file mode 100644
index 0000000000..ffc8dd1e1a
--- /dev/null
+++ b/network/ircII/ircII.SlackBuild
@@ -0,0 +1,187 @@
+#!/bin/bash
+
+# Slackware build script for ircII
+
+# Written by B. Watson (urchlay@slackware.uk)
+
+# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
+
+# I don't know why nobody's already done a SlackBuild for this.
+# Normally I prefer all-lowercase package names, but this just looks
+# *wrong* as "ircii".
+
+# 20210913 bkw:
+# - update for v20210616. The datestamp comes from the output of
+#   "ircII -v" (not the ChangeLog).
+# - change DEFSRV to irc.libera.chat, now that freenode is a wasteland.
+# - use a private libexec/ircII dir instead of binaries in /usr/libexec.
+#   done because some other ircII-based client might conflict someday.
+# - generate and include HTML docs.
+# - add NOTES_TO_SELF to avoid cluttering up the script with comments.
+# - correct and expand Debian's man pages.
+# - add support for 'paranoid mode'.
+# - have slack-desc show default server and paranoid mode.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=ircII
+VERSION=${VERSION:-20210616_2}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+SRCNAM=${PRGNAM,,}
+SRCVER=${VERSION%_*}
+
+# We're applying Debian's patches against a slightly older version.
+DEBSRCVER=20210328
+DEBVER=${VERSION#*_}
+
+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
+
+PARANOID="${PARANOID:-no}"
+case "$PARANOID" in
+  y*|Y*|t*|T*|1) para_opt="--with-paranoid" ;;
+  *)             para_opt="--without-paranoid" ;;
+esac
+echo "=== PARANOID='$PARANOID', para_opt='$para_opt'"
+
+DEFSRV="${DEFSRV:-SSLIRC/irc.libera.chat:6697}"
+case "$DEFSRV" in
+  none|NONE) ;;
+  *:*) srvopt="--with-default-server=$DEFSRV" ;;
+  *) echo "$0: invalid DEFSRV, use host:port, SSLIRC/host:port, or 'none'" 1>&2
+     exit 1 ;;
+esac
+
+echo "=== DEFSRV='$DEFSRV', srvopt='$srvopt'"
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $SRCNAM
+tar xvf $CWD/$SRCNAM-$SRCVER.tar.bz2
+cd $SRCNAM
+tar xvf $CWD/${SRCNAM}_$DEBSRCVER-$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 most of Debian's patches, except:
+# - the absolute-path patch would move the nonexistent
+#   /usr/share/irc/ircII.{motd,servers} to /etc/irc/{motd,servers}.
+#   Since we don't ship either file, and their paths are settable in
+#   ~/.ircrc anyway, I see no use for this patch.
+# - the Add-ioption patch is meant to fix some compile warnings that we
+#   don't actually get. Plus, it won't apply cleanly.
+rm -f debian/patches/0004-absolute-path* \
+      debian/patches/0003-Add-ioption*
+
+for i in $( cat debian/patches/series ); do
+  [ -e debian/patches/$i ] && patch -p1 < debian/patches/$i
+done
+
+# fix warnings caused by missing includes.
+sed -i -e '1i#include <curses.h>' \
+       -e '1i#include <term.h>' \
+       source/term.c
+
+# do not compile with termcap. there's no --disable-termcap or similar,
+# have to do surgery.
+sed -i -e '/AC_CHECK_LIB(termcap/s,termcap,ncurses,g' \
+       -e 's,termcap\.h ,,' \
+       configure.in
+
+# my own typo/grammar/etc fixes. minor nitpicks, maybe.
+patch -p1 < $CWD/manpage.diff
+
+autoreconf -ifv
+
+# is there a disadvantage to enabling emacs meta keys?
+# 20210913 bkw: force --with-openssl, rather than letting it
+# autodetect. this is so we can find out right away if Slackware's
+# openssl gets upgraded to something ircII doesn't yet support.
+CFLAGS="$SLKCFLAGS -Wall -Wl,-s" \
+./configure \
+  $srvopt \
+  $para_opt \
+  --with-emacs-meta-keys \
+  --with-openssl \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --libexecdir=/usr/libexec/$PRGNAM \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --mandir=/usr/man \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --build=$ARCH-slackware-linux
+
+make
+
+# make install doesn't create this dir, and doesn't respect DESTDIR
+# for the man dir.
+mkdir -p $PKG/usr/man/man1
+make install DESTDIR=$PKG mandir=$PKG/usr/man/man1
+
+# package called ircII, so let's have an ircII executable.
+ln -s $(basename $(realpath $PKG/usr/bin/irc)) $PKG/usr/bin/$PRGNAM
+
+rm -f $PKG/usr/man/man1/irc.1
+gzip -9 $PKG/usr/man/man1/*.1
+ln -s ircII.1.gz $PKG/usr/man/man1/irc.1.gz
+
+# Debian includes some extra man pages. I've expanded them a bit and
+# fixed some typos.
+for i in $CWD/man/*.1; do
+  sed "s,@VERSION@,$VERSION,g" < $i | \
+    gzip -9c > $PKG/usr/man/man1/$( basename $i ).gz
+done
+
+# HTML docs (generated from /help text). Sure, why not?
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/html
+perl doc/help2html.pl $PKG/usr/share/irc/help $PKG/usr/doc/$PRGNAM-$VERSION/html
+
+rm -f doc/*.1 doc/*.spec* doc/*.orig doc/*.pl
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a ChangeLog NEWS README doc/* contrib $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+sed -e "s,@para_opt@,$para_opt," \
+    -e "s,@srvopt@,$srvopt," \
+    < $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/network/ircII/ircII.info b/network/ircII/ircII.info
new file mode 100644
index 0000000000..10744e2162
--- /dev/null
+++ b/network/ircII/ircII.info
@@ -0,0 +1,12 @@
+PRGNAM="ircII"
+VERSION="20210616_2"
+HOMEPAGE="http://www.eterna.com.au/ircii/"
+DOWNLOAD="https://slackware.uk/~urchlay/src/ircii-20210616.tar.bz2 \
+          https://deb.debian.org/debian/pool/main/i/ircii/ircii_20210328-2.debian.tar.xz"
+MD5SUM="521ede3dd468100373a9783841bc7a81 \
+        335e7e22d6a1c106f874586a81c7ea3d"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="B. Watson"
+EMAIL="urchlay@slackware.uk"
diff --git a/network/ircII/man/ircflush.1 b/network/ircII/man/ircflush.1
new file mode 100644
index 0000000000..35562f3ff5
--- /dev/null
+++ b/network/ircII/man/ircflush.1
@@ -0,0 +1,30 @@
+.TH ircflush 1 "September 2021" "ircII @VERSION@" "SlackBuilds.org"
+.SH NAME
+ircflush \- a little program that tricks another program into line buffering its output
+.SH SYNOPSIS
+.B ircflush
+.RB [ program ]
+.RB [ arguments to program
+.SH DESCRIPTION
+What's the deal here?  Well, it's like this.  First we find an open
+tty/pty pair.  Then we fork three processes.  The first reads from stdin
+and sends the info to the master device.  The next process reads from the
+master device and sends stuff to stdout.  The last processes is the rest
+of the command line arguments exec'd.  By doing all this, the exec'd
+process is fooled into flushing each line of output as it occurs.
+.P
+This program is intended as a 'helper' for ircII scripts.
+.SH OPTIONS
+.TP
+.B [ program ]
+.TP
+.B [ arguments to program]
+.TP
+.RE
+.SH AUTHOR
+.EX
+Michael Sandrof
+.EE
+.SH SEE ALSO
+.BR ircII (1),
+.BR irc (1)
diff --git a/network/ircII/man/ircio.1 b/network/ircII/man/ircio.1
new file mode 100644
index 0000000000..76dfa2cae5
--- /dev/null
+++ b/network/ircII/man/ircio.1
@@ -0,0 +1,39 @@
+.TH ircio 1 "September 2021" "ircII @VERSION@" "SlackBuilds.org"
+.SH NAME
+ircio \- A quaint little program to make irc life PING free
+.SH DESCRIPTION
+This little program connects to the server (given as arg 1) on
+the given port (given as arg 2).  It then accepts input from stdin and
+sends it to that server. Likewise, it reads stuff sent from the server and
+sends it to stdout.  Simple?  Yes, it is.  But wait!  There's more!  It
+also intercepts server PINGs and automatically responds to them.   This
+frees up the process that starts ircio (such as IRCII) to pause without
+fear of being pooted off the net.
+.P
+.B ircio
+is not intended to be run by itself. It's started by ircII's -S command\-line
+option.
+.P
+.SH BUGS
+.B ircio
+doesn't work at all with SSL\-enabled IRC connections. It also
+doesn't work properly with the
+.B libera.chat
+network even without SSL: you can connect, but you'll get disconnected
+before the MOTD is sent.
+.P
+There are better ways to solve the problem
+.B ircio
+solves, such as
+.BR screen (1),
+.BR tmux (1),
+or just multiple X terminals. There's no need to suspend
+.B ircII
+in such environments.
+.SH AUTHOR
+.EX
+Michael Sandrof
+.EE
+.SH SEE ALSO
+.BR ircII (1),
+.BR ircflush (1)
diff --git a/network/ircII/man/wserv.1 b/network/ircII/man/wserv.1
new file mode 100644
index 0000000000..1c547ab128
--- /dev/null
+++ b/network/ircII/man/wserv.1
@@ -0,0 +1,30 @@
+.TH wserv 1 "September 2021" "ircII @VERSION@" "SlackBuilds.org"
+.SH NAME
+wserv \- little program that acts as a pipe between a screen or xterm window to the calling ircII process
+.SH SYNOPSIS
+.B wserv
+.RB [ /path/to/socket ]
+.RB [ /path/to/control ]
+.SH DESCRIPTION
+Works by opening up the unix domain socket that ircII binds
+before calling wserv, and which ircII also deletes after the
+connection has been made.
+.P
+.B wserv
+is not useful by itself. It gets run as needed by ircII when the
+.B /window create
+command is executed.
+.P
+.SH OPTIONS
+.TP
+.B [ /path/to/socket ]
+.TP
+.B [ /path/to/control ]
+.SH AUTHOR
+.EX
+Michael Sandrof
+.EE
+.SH SEE ALSO
+.BR ircII (1),
+.BR ircio (1),
+.B /help window create
diff --git a/network/ircII/manpage.diff b/network/ircII/manpage.diff
new file mode 100644
index 0000000000..4ad650926a
--- /dev/null
+++ b/network/ircII/manpage.diff
@@ -0,0 +1,38 @@
+diff -Naur ircii/doc/ircII.1 ircii.patched/doc/ircII.1
+--- ircii/doc/ircII.1	2021-06-18 14:20:02.000000000 -0400
++++ ircii.patched/doc/ircII.1	2021-09-13 23:51:35.255955020 -0400
+@@ -332,17 +332,17 @@
+ .Nm
+ scripts, that can then be loaded with
+ .Ic /load
+-.It Pa .../share/irc/
++.It Pa /usr/share/irc/
+ directory containing message-of-the-day, master initialization, help files, and
+ .Nm
+ scripts
+-.It Pa .../share/irc/script/global
++.It Pa /usr/share/irc/script/global
+ file loaded at the start of every
+ .Nm
+ session.
+-.It Pa PREFIX/share/irc/ircII.servers
++.It Pa /usr/share/irc/ircII.servers
+ The initial list of servers if none are provided on the command line.
+-.It Pa PREFIX/share/irc/ircII.motd
++.It Pa /usr/share/irc/ircII.motd
+ Message of the day.
+ This file is displayed only once each time it is changed.
+ .El
+@@ -399,9 +399,9 @@
+ .Ic /HELP \&?
+ command as this prints a listing of all available help files.
+ .Pp
+-Access to HTML version of the help files is availble from
+-.Lk http://eterna.com.au/ircii/help/ .
+-Note that these are generated from the builtin help files and
++Access to HTML versions of the help files is available from
++.Lk http://eterna.com.au/ircii/help/
++; note that these are generated from the builtin help files and
+ may have formatting issues.
+ .Sh SIGNALS
+ .Nm
diff --git a/network/ircII/slack-desc b/network/ircII/slack-desc
new file mode 100644
index 0000000000..9783ec6e2b
--- /dev/null
+++ b/network/ircII/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+     |-----handy-ruler------------------------------------------------------|
+ircII: ircII (IRC Client, Second Edition)
+ircII:
+ircII: ircII is a full screen, curses-based interface to Internet Relay
+ircII: Chat. It gives full access to all of the normal IRC functions, plus a
+ircII: variety of additional options.
+ircII:
+ircII: ircII is the oldest IRC client still maintained.
+ircII:
+ircII: Build options:
+ircII: @para_opt@
+ircII: @srvopt@
diff --git a/network/ircd-hybrid/README b/network/ircd-hybrid/README
index 48668a59a7..3734b6a099 100644
--- a/network/ircd-hybrid/README
+++ b/network/ircd-hybrid/README
@@ -1,13 +1,13 @@
 ircd-hybrid (A lightweight, high-performance IRC daemon)
 
-ircd is the server (daemon) program for the Internet Relay Chat Program. The
-ircd is a server in that its function is to "serve" the client program irc
-and other compatible programs with messages and commands. All commands and
-user messages are passed directly to the ircd for processing and relaying to
-other IRC servers.
+ircd is the server (daemon) program for the Internet Relay Chat
+Program. The ircd is a server in that its function is to "serve" the
+client program irc and other compatible programs with messages and
+commands. All commands and user messages are passed directly to the
+ircd for processing and relaying to other IRC servers.
 
-This is ircd-hybrid, the highly modified (and hopefully improved) variant of
-the original ircd program by Jarkko Oikarinen.
+This is ircd-hybrid, the highly modified (and hopefully improved)
+variant of the original ircd program by Jarkko Oikarinen.
 
 Groupname and Username
 
diff --git a/network/ircd-hybrid/doinst.sh b/network/ircd-hybrid/doinst.sh
index 98a9f66cdb..4185f70561 100644
--- a/network/ircd-hybrid/doinst.sh
+++ b/network/ircd-hybrid/doinst.sh
@@ -22,5 +22,4 @@ preserve_perms() {
   config $NEW
 }
 
-config etc/ircd/ircd.conf.new
 preserve_perms etc/rc.d/rc.ircd.new
diff --git a/network/ircd-hybrid/ircd-hybrid.SlackBuild b/network/ircd-hybrid/ircd-hybrid.SlackBuild
index cb3489ffe6..33bf9bf445 100644
--- a/network/ircd-hybrid/ircd-hybrid.SlackBuild
+++ b/network/ircd-hybrid/ircd-hybrid.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for ircd-hybrid
 
-# Copyright 2018  Ebben Aries <e@dscp.org>
+# Copyright 2018-2022  Ebben Aries <slackbuilds@dscp.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=ircd-hybrid
 BINNAM=ircd
-VERSION=${VERSION:-8.2.26}
+VERSION=${VERSION:-8.2.43}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -47,7 +50,14 @@ elif ! getent passwd $BINNAM; 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}
@@ -90,7 +100,7 @@ CXXFLAGS="$SLKCFLAGS" \
   --localstatedir=/var \
   --mandir=/usr/man \
   --docdir=/usr/doc/$PRGNAM-$VERSION \
-  --enable-openssl \
+  --with-tls=gnutls \
   --build=$ARCH-slackware-linux
 
 make
@@ -109,10 +119,6 @@ mkdir -p $PKG/var/log/ircd
 chown ircd:ircd $PKG/var/log/ircd
 chmod 0755 $PKG/var/log/ircd
 
-mkdir -p $PKG/var/run/ircd
-chown ircd:ircd $PKG/var/run/ircd
-chmod 0750 $PKG/var/run/ircd
-
 mkdir -p $PKG/var/lib/ircd
 chown ircd:ircd $PKG/var/lib/ircd
 chmod 0750 $PKG/var/lib/ircd
@@ -121,7 +127,7 @@ mkdir -p $PKG/etc/rc.d
 cat $CWD/rc.ircd.new > $PKG/etc/rc.d/rc.ircd.new
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS COPYING INSTALL NEWS README \
+cp -a AUTHORS.md COPYING.md INSTALL.md NEWS.md README.md \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
@@ -130,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/network/ircd-hybrid/ircd-hybrid.info b/network/ircd-hybrid/ircd-hybrid.info
index aa664624aa..aecb5942fc 100644
--- a/network/ircd-hybrid/ircd-hybrid.info
+++ b/network/ircd-hybrid/ircd-hybrid.info
@@ -1,10 +1,10 @@
 PRGNAM="ircd-hybrid"
-VERSION="8.2.26"
+VERSION="8.2.43"
 HOMEPAGE="http://www.ircd-hybrid.org/"
-DOWNLOAD="https://github.com/ircd-hybrid/ircd-hybrid/archive/8.2.26/ircd-hybrid-8.2.26.tar.gz"
-MD5SUM="286ec595fa258cfd39bb95d54e98e79a"
+DOWNLOAD="https://github.com/ircd-hybrid/ircd-hybrid/archive/8.2.43/ircd-hybrid-8.2.43.tar.gz"
+MD5SUM="00bb3ec521f59b8ec44aba09d05f04c8"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
 MAINTAINER="Ebben Aries"
-EMAIL="e@dscp.org"
+EMAIL="slackbuilds@dscp.org"
diff --git a/network/ircd-hybrid/rc.ircd.new b/network/ircd-hybrid/rc.ircd.new
index 9011ea8533..448e269a39 100644
--- a/network/ircd-hybrid/rc.ircd.new
+++ b/network/ircd-hybrid/rc.ircd.new
@@ -21,7 +21,10 @@ ircd_start() {
   fi
 
   echo "Starting IRC daemon ..."
-  sudo -u $NAME $DAEMON $DAEMON_ARGS
+  mkdir -p $(dirname $PIDFILE)
+  chown ircd:ircd $(dirname $PIDFILE)
+  chmod 0750 $(dirname $PIDFILE)
+  setpriv --reset-env --reuid $NAME $DAEMON $DAEMON_ARGS
 }
 
 ircd_stop() {
diff --git a/network/irssi-icb/README b/network/irssi-icb/README
new file mode 100644
index 0000000000..66d656a937
--- /dev/null
+++ b/network/irssi-icb/README
@@ -0,0 +1,9 @@
+irssi-icb (irssi plugin for ICB)
+
+ICB (International CB) is a teleconferencing system that allows
+Internet users to participate in realtime online discussions (similar
+to IRC). irssi-icb is a plugin for the irssi IRC client that allows it
+to chat on the ICB network.
+
+See /usr/doc/irssi-icb-*/README for directions on how to load the
+module into irssi and connect to an ICB server.
diff --git a/network/irssi-icb/git2tarxz.sh b/network/irssi-icb/git2tarxz.sh
new file mode 100644
index 0000000000..9f44fbdefc
--- /dev/null
+++ b/network/irssi-icb/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.
+
+# 20230919 bkw: contains irssi-icb specific code, don't use as a template.
+
+PRGNAM=irssi-icb
+CLONE_URL=https://github.com/landryb/irssi-icb
+
+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 )
+
+UPSTREAM_VER="$( grep "^AC_INIT" configure.ac | cut -d'[' -f3 |cut -d']' -f1 )"
+
+VERSION=$UPSTREAM_VER+${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/network/irssi-icb/irssi-icb.SlackBuild b/network/irssi-icb/irssi-icb.SlackBuild
new file mode 100644
index 0000000000..f945be5298
--- /dev/null
+++ b/network/irssi-icb/irssi-icb.SlackBuild
@@ -0,0 +1,99 @@
+#!/bin/bash
+
+# Slackware build script for irssi-icb
+
+# Written by B. Watson (urchlay@slackware.uk)
+
+# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
+
+# There's 3 forks of this on github (or, one original and two forks):
+# https://github.com/mglocker/irssi-icb - updated 2016
+# https://github.com/jperkin/irssi-icb - updated 2012
+# https://github.com/landryb/irssi-icb - updated 2022
+# The landryb fork is the only one that will work with irssi-1.4.x,
+# so that's what this build packages.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=irssi-icb
+VERSION=${VERSION:-0.17+20220616_4fd6aff}
+IRSSIVER=${IRSSIVER:-1.4.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
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
+cd $PRGNAM-$VERSION
+tar xvf $CWD/irssi-$IRSSIVER.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 {} +
+
+sh autorun.sh
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --with-irssi=$(pwd)/irssi-$IRSSIVER \
+  --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
+
+# sed stuff below removes the compile/install instructions from README,
+# so all that's left is config instructions.
+PKGDOC=$PKG/usr/doc/$PRGNAM-$VERSION
+mkdir -p $PKGDOC
+cp -a AUTHORS COPYING $PKGDOC
+sed -n '/^load in/,$p' 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/network/irssi-icb/irssi-icb.info b/network/irssi-icb/irssi-icb.info
new file mode 100644
index 0000000000..f8d5ebacad
--- /dev/null
+++ b/network/irssi-icb/irssi-icb.info
@@ -0,0 +1,12 @@
+PRGNAM="irssi-icb"
+VERSION="0.17+20220616_4fd6aff"
+HOMEPAGE="https://github.com/landryb/irssi-icb"
+DOWNLOAD="https://slackware.uk/~urchlay/src/irssi-icb-0.17+20220616_4fd6aff.tar.xz \
+          https://github.com/irssi/irssi/releases/download/1.4.4/irssi-1.4.4.tar.xz"
+MD5SUM="9da79e53c48f606831e5ebc2fee7434a \
+        c1787858ede8d875be5e2ddb8c2bc95e"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="B. Watson"
+EMAIL="urchlay@slackware.uk"
diff --git a/network/irssi-icb/slack-desc b/network/irssi-icb/slack-desc
new file mode 100644
index 0000000000..0223c6fe6a
--- /dev/null
+++ b/network/irssi-icb/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+         |-----handy-ruler------------------------------------------------------|
+irssi-icb: irssi-icb (irssi plugin for ICB)
+irssi-icb:
+irssi-icb: ICB (International CB) is a teleconferencing system that allows
+irssi-icb: Internet users to participate in realtime online discussions (similar
+irssi-icb: to IRC). irssi-icb is a plugin for the irssi IRC client that allows it
+irssi-icb: to chat on the ICB network.
+irssi-icb:
+irssi-icb:
+irssi-icb:
+irssi-icb:
+irssi-icb:
diff --git a/network/irssi-python/README b/network/irssi-python/README
index 221c1f7730..efe5a65fb2 100644
--- a/network/irssi-python/README
+++ b/network/irssi-python/README
@@ -1,28 +1,39 @@
-irssi-python (Python 2.x scripting support for irssi)
+irssi-python (Python 3 scripting support for irssi)
 
 irssi-python embeds Python into an Irssi module, providing most of the
 functionality of the Perl wrapper to Python scripts using a similar
 interface.
 
-After the package is installed, you can test it from within irssi
-by running "/load python". If this works OK, you can configure irssi
-to always load the module with a command like:
+After the package is installed, you can test it from within irssi by
+running "/load python". If this works OK, you can configure irssi to
+always load the module with a command like:
 
 $ echo 'load python' >> ~/.irssi/startup
 
+Example python scripts can be found in /usr/share/irssi/scripts/*.py
+
+Note that previous versions of irssi-python used Python 2. If you've
+written any scripts, they may have to be modified for Python 3.
+
 Beware of upgrades: if Slackware's irssi or python packages are ever
 upgraded, you'll almost certainly have to rebuild & reinstall this.
-Symptoms may include irssi ABI version mismatch errors or segfaults.
+Symptoms may include irssi ABI version mismatch errors, undefined
+symbols, or segfaults.
 
 If you get a warning about an irssi version mismatch when building
-irssi-python, first update your irssi package to the latest one in
-patches/:
+irssi-python, first update your irssi package to the latest one for
+your Slackware version:
 
 # slackpkg update
 # slackpkg upgrade irssi
 
-If you still get the warning, set the environment variable IRSSI_VER
-to the correct irssi version. You'll also have to have the irssi source
-tarball in the SlackBuild directory. It should be available from:
+If you still get the warning, set the environment variable VERSION.
+The first part of VERSION (before the last _) should not change, but
+the part after the last _ is the irssi version. Example:
+
+# VERSION="20230512_9ab753d_1.4.5" sh irssi-python.SlackBuild
+
+You'll also have to have the irssi .tar.xz source tarball in the
+SlackBuild directory. It should be available from:
 
-http://ftp.slackware.com/pub/slackware/slackware-14.2/patches/source/irssi/
+https://github.com/irssi/irssi/releases/
diff --git a/network/irssi-python/irssi-python.SlackBuild b/network/irssi-python/irssi-python.SlackBuild
index 890a129025..3c92b9519c 100644
--- a/network/irssi-python/irssi-python.SlackBuild
+++ b/network/irssi-python/irssi-python.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for irssi-python
 
-# 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,15 +11,44 @@
 # tarball. Unfortunately, the release tarball is un-buildable because it's
 # missing various files. Also it's missing the entire doc/ directory.
 
+# VERSION is the irssi-python version, an underscore, and the irssi
+# version we're building it for.
+# Unfortunately we have to pick an irssi version to be the default,
+# because the DOWNLOAD links are static (can't have $VERSION or such in
+# them). This build will have to be updated any time Pat does an irssi
+# version update.
+
+# 20230707 bkw: update for 20230512_9ab753d_1.4.4 (latest git that
+# works with python-3.9; later commits break it). needed because
+# Slackware 15.0's patches/ has irssi-1.4.4, which is too new for the
+# irssi-python-test4 release. Source tarball made with:
+# sh git2tarxz.sh 9ab753db9a
+
+# 20211208 bkw: update for vtest4_1.2.3.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=irssi-python
-VERSION=${VERSION:-test4}
+VERSION=${VERSION:-20230512_9ab753d_1.4.4}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
-# Unfortunately we have to pick an irssi version to be the default,
-# because the DOWNLOAD links are static (can't have $VERSION or such in
-# them). 1.0.7 is the latest in patches/ at the time of this writing.
-IRSSI_VER="${IRSSI_VER:-1.0.7}"
+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
+
+PYIRSSI_VER="$( echo $VERSION | cut -d_ -f1,2 )"
+IRSSI_VER="$(   echo $VERSION | cut -d_ -f3 )"
 
 # Alert the user (but don't stop the build) if $IRSSI_VER doesn't match
 # the installed version of irssi.
@@ -34,15 +63,6 @@ EOF
   sleep 5
 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}
@@ -69,7 +89,7 @@ cd $TMP
 rm -rf $PRGNAM
 mkdir -p $PRGNAM
 cd $PRGNAM
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+tar xvf $CWD/$PRGNAM-$PYIRSSI_VER.tar.xz
 tar xvf $CWD/irssi-$IRSSI_VER.tar.xz
 chown -R root:root .
 find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
@@ -94,10 +114,17 @@ find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
 ##   --build=$ARCH-slackware-linux
 ## cd $TMP/$PRGNAM
 
-cd $PRGNAM-$VERSION
+cd $PRGNAM-$PYIRSSI_VER
 
 autoreconf -ivf -I.
 
+# configure script expects to read this info via pkg-config, but our
+# irssi-1.pc file doesn't have the variables for it. not sure why not,
+# but this is what it would have read anyway.
+sed -i -e "/IRSSI_SIGNALSFILE/s,=.*,=/usr/doc/irssi-$IRSSI_VER/signals.txt," \
+       -e "/IRSSI_MODULEDIR/s,=.*,=/usr/lib$LIBDIRSUFFIX/irssi/modules," \
+       configure
+
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
@@ -110,17 +137,21 @@ CXXFLAGS="$SLKCFLAGS" \
   --docdir=/usr/doc/$PRGNAM-$VERSION \
   --build=$ARCH-slackware-linux
 
-make -C src constants
 make
 make install-strip DESTDIR=$PKG
 
+rm -f $PKG/usr/lib*/irssi/modules/*.la
+
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a AUTHORS COPYING ChangeLog NEWS README TODO classes.txt docs/*html \
       $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
+# 20211208 bkw: it might be redundant to include the irssi version
+# in the slack-desc, since it's now in the actual version number, but
+# belt and suspenders...
 mkdir -p $PKG/install
 sed "s/@IRSSI_VER@/$IRSSI_VER/" $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/network/irssi-python/irssi-python.info b/network/irssi-python/irssi-python.info
index fea8699379..3e0c36ec28 100644
--- a/network/irssi-python/irssi-python.info
+++ b/network/irssi-python/irssi-python.info
@@ -1,12 +1,12 @@
 PRGNAM="irssi-python"
-VERSION="test4"
+VERSION="20230512_9ab753d_1.4.4"
 HOMEPAGE="https://github.com/irssi-import/irssi-python"
-DOWNLOAD="https://github.com/irssi-import/irssi-python/archive/test4/irssi-python-test4.tar.gz \
-          http://ftp.slackware.com/pub/slackware/slackware-14.2/patches/source/irssi/irssi-1.0.7.tar.xz"
-MD5SUM="efd8c4b284cb2b2b3313e9109cbb324a \
-        6ebf07a03b58f7af1296cd8fdbb3619f"
+DOWNLOAD="https://slackware.uk/~urchlay/src/irssi-python-20230512_9ab753d.tar.xz \
+          https://github.com/irssi/irssi/releases/download/1.4.4/irssi-1.4.4.tar.xz"
+MD5SUM="8b28b4911eeb7aec97a05292e612e513 \
+        c1787858ede8d875be5e2ddb8c2bc95e"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
 MAINTAINER="B. Watson"
-EMAIL="yalhcru@gmail.com"
+EMAIL="urchlay@slackware.uk"
diff --git a/network/irssi-python/slack-desc b/network/irssi-python/slack-desc
index a3607849ee..22f7a43ef1 100644
--- a/network/irssi-python/slack-desc
+++ b/network/irssi-python/slack-desc
@@ -6,7 +6,7 @@
 # customary to leave one space after the ':' except on otherwise blank lines.
 
             |-----handy-ruler------------------------------------------------------|
-irssi-python: irssi-python (Python2 scripting support for irssi)
+irssi-python: irssi-python (Python3 scripting support for irssi)
 irssi-python:
 irssi-python: irssi-python embeds Python into an Irssi module, providing most
 irssi-python: of the functionality of the Perl wrapper to Python scripts using a
diff --git a/network/irssi_otr/README b/network/irssi_otr/README
index 62aee9b553..eddc6003a3 100644
--- a/network/irssi_otr/README
+++ b/network/irssi_otr/README
@@ -2,9 +2,5 @@ irssi_otr (OTR plugin for irssi)
 
 Off-the-Record Messaging (OTR) plugin for the irssi IRC client
 
-To use OTR within irssi, install this package, then "/load libotr"
-and "/otr help" for usage instructions. Also see the README in
-/usr/doc/irssi_otr-$VERSION.
-
-irssi_otr formerly had support for xchat, but it was removed by
-upstream. Be aware of this when upgrading.
+To use OTR within irssi: install this package, then "/load otr".
+See "/otr help" for usage instructions.
diff --git a/network/irssi_otr/irssi_otr.SlackBuild b/network/irssi_otr/irssi_otr.SlackBuild
index 2036562201..8be16f289b 100644
--- a/network/irssi_otr/irssi_otr.SlackBuild
+++ b/network/irssi_otr/irssi_otr.SlackBuild
@@ -1,11 +1,18 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for irssi_otr
 
-# 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.
 
+# 20210914 bkw: updated for v1.2.3. There is no longer a separate
+# irssi-otr source: it's now included in the irssi source. However,
+# Slackware's irssi package doesn't include it because Slackware
+# doesn't include libotr.
+
+# 20230711 bkw: updated for 1.4.4 (to stay in step with patches/).
+
 # 20170302 bkw: use long-format github URL
 
 # 20170121 bkw:
@@ -26,10 +33,13 @@
 # - upstream switched from cmake to autoconf, rewrite most of script.
 # - xchat support was dropped by upstream, so remove all references.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=irssi_otr
-VERSION=${VERSION:-1.0.2}
+VERSION=${VERSION:-1.4.4}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -39,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}
@@ -58,7 +72,7 @@ else
   LIBDIRSUFFIX=""
 fi
 
-TARNAM=$( echo $PRGNAM | sed 's/_/-/g' )
+TARNAM=irssi
 
 set -e
 
@@ -66,39 +80,42 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $TARNAM-$VERSION
-tar xvf $CWD/$TARNAM-$VERSION.tar.gz
+tar xvf $CWD/$TARNAM-$VERSION.tar.?z
 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 {} \;
-
-./bootstrap
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
 
+# This bit's modified from PV's irssi.SlackBuild.
 CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
 ./configure \
-  --with-irssi-module-dir=/usr/lib$LIBDIRSUFFIX/irssi/modules \
+  --with-otr=yes \
   --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --sysconfdir=/etc \
-  --localstatedir=/var \
   --mandir=/usr/man \
-  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --sysconfdir=/etc \
+  --docdir=/usr/doc/irssi-$VERSION \
+  --enable-true-color \
+  --with-textui \
+  --with-perl-lib=vendor \
+  --with-proxy \
   --build=$ARCH-slackware-linux
 
-make V=1
+# Don't have to build all of irssi, just our one module.
+cd src/otr
+make
 make install-strip DESTDIR=$PKG
 
-# AUTHORS is a 0-byte placeholder.
+# Don't need the static lib nor .la
+rm -f $PKG/usr/lib$LIBDIRSUFFIX/irssi/modules/*a
+
+# Include our own README
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a ChangeLog LICENSE README* $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:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/network/irssi_otr/irssi_otr.info b/network/irssi_otr/irssi_otr.info
index f7e86366b1..cd01ff1389 100644
--- a/network/irssi_otr/irssi_otr.info
+++ b/network/irssi_otr/irssi_otr.info
@@ -1,10 +1,10 @@
 PRGNAM="irssi_otr"
-VERSION="1.0.2"
-HOMEPAGE="https://github.com/cryptodotis/irssi-otr"
-DOWNLOAD="https://github.com/cryptodotis/irssi-otr/archive/v1.0.2/irssi-otr-1.0.2.tar.gz"
-MD5SUM="5f217dade49593f8505fecc5a5d322d2"
+VERSION="1.4.4"
+HOMEPAGE="https://irssi.org/modules/"
+DOWNLOAD="https://github.com/irssi/irssi/releases/download/1.4.4/irssi-1.4.4.tar.xz"
+MD5SUM="c1787858ede8d875be5e2ddb8c2bc95e"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="libotr"
 MAINTAINER="B. Watson"
-EMAIL="yalhcru@gmail.com"
+EMAIL="urchlay@slackware.uk"
diff --git a/network/isync/README b/network/isync/README
index 2dbe7ee081..69adcd6f7b 100644
--- a/network/isync/README
+++ b/network/isync/README
@@ -1,11 +1,11 @@
-isync is a command line application which synchronizes mailboxes; currently
-Maildir and IMAP4 mailboxes are supported. New messages, message deletions
-and flag changes can be propagated both ways. isync is suitable for use in
-IMAP-disconnected mode.
+isync is a command line application which synchronizes mailboxes;
+currently Maildir and IMAP4 mailboxes are supported. New messages,
+message deletions and flag changes can be propagated both ways. isync
+is suitable for use in IMAP-disconnected mode.
 
 Synchronization is based on unique message identifiers (UIDs), so
 no identification conflicts can occur (as opposed to some other mail
-synchronizers).  Synchronization state is kept in one local text file per
-mailbox pair; multiple replicas of a mailbox can be maintained.
+synchronizers). Synchronization state is kept in one local text file
+per mailbox pair; multiple replicas of a mailbox can be maintained.
 
 See README.SLACKWARE for setup information after installation.
diff --git a/network/isync/README.SLACKWARE b/network/isync/README.SLACKWARE
index 4fcc0a630e..fd78538da7 100644
--- a/network/isync/README.SLACKWARE
+++ b/network/isync/README.SLACKWARE
@@ -4,24 +4,24 @@ After installation, create $HOME/.mbsyncrc.  This file contains information
 about your email stores and channels.  An example configuration, between
 a remote IMAP server and a local Maildir:
 
-        MaildirStore local
-        Path ~/Maildir/
+	MaildirStore local
+	Path ~/Maildir/
 
-        IMAPAccount My-IMAP-server
-        Host mail.myisp.foo
-        Port 143
-        User myuser
-        #Pass mypass -- if not supplied, mbsync will prompt at runtime
+	IMAPAccount My-IMAP-server
+	Host mail.myisp.foo
+	Port 143
+	User myuser
+	#Pass mypass -- if not supplied, mbsync will prompt at runtime
 
-        IMAPStore My-IMAP-store
-        Account My-IMAP-Server
+	IMAPStore My-IMAP-store
+	Account My-IMAP-Server
 
-        Channel My-Channel
-        Master :My-IMAP-store:
-        Slave :local:
-        Patterns % !Trash # Synchronize all at this level except Trash
-        Sync All
-        Create Both
-        Expunge Both
+	Channel My-Channel
+	Master :My-IMAP-store:
+	Slave :local:
+	Patterns % !Trash # Synchronize all at this level except Trash
+	Sync All
+	Create Both
+	Expunge Both
 
 See mbsync(1) for additional explanation and options.
diff --git a/network/isync/isync.SlackBuild b/network/isync/isync.SlackBuild
index 0ee56baa2e..063c2f4db5 100644
--- a/network/isync/isync.SlackBuild
+++ b/network/isync/isync.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for isync
 
@@ -28,10 +28,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=isync
-VERSION=${VERSION:-1.3.0}
+VERSION=${VERSION:-1.4.4}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -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}
@@ -60,7 +70,7 @@ else
   LIBDIRSUFFIX=""
 fi
 
-set -e
+set -e 
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
@@ -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/network/isync/isync.info b/network/isync/isync.info
index b7fbbc45ab..4f105baa0d 100644
--- a/network/isync/isync.info
+++ b/network/isync/isync.info
@@ -1,8 +1,8 @@
 PRGNAM="isync"
-VERSION="1.3.0"
+VERSION="1.4.4"
 HOMEPAGE="http://isync.sourceforge.net"
-DOWNLOAD="http://downloads.sourceforge.net/isync/isync-1.3.0.tar.gz"
-MD5SUM="f64e8723ebbb081bc15510586bfa1f8f"
+DOWNLOAD="http://downloads.sourceforge.net/isync/isync-1.4.4.tar.gz"
+MD5SUM="29acced5c6f0c87e631b0ff641f8f942"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/network/jabberd2/README b/network/jabberd2/README
index 20318f1015..ef03a9bb05 100644
--- a/network/jabberd2/README
+++ b/network/jabberd2/README
@@ -1,6 +1,7 @@
 jabberd 2.x project is the next generation of the jabberd project. It
 has been rewritten from the ground up to be scalable, architecturally
-sound and to support the latest protocol extensions coming out of the XSF.
+sound and to support the latest protocol extensions coming out of
+the XSF.
 
 Please note: jabberd 2.x is not a newer version of jabberd 1.x but a
 completely different project.
diff --git a/network/jabberd2/jabberd2.SlackBuild b/network/jabberd2/jabberd2.SlackBuild
index 642107b5e7..524025d773 100644
--- a/network/jabberd2/jabberd2.SlackBuild
+++ b/network/jabberd2/jabberd2.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for jabberd2
 
@@ -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=jabberd2
-VERSION=${VERSION:-2.2.17}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-2.7.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}
@@ -45,8 +55,8 @@ JABBERGRP=${JABBERGRP:-jabber}
 JABBERUID=${JABBERUID:-275}
 JABBERGID=${JABBERGID:-275}
 
-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"
@@ -117,7 +127,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/tools
 cp -a \
   AUTHORS COPYING ChangeLog INSTALL NEWS README README.config README.protocol \
-  README.win32 TODO UPGRADE \
+  README.win32 TODO \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
   tools/bdb2mysql.rb tools/bdbdump.pl tools/db-jd14-2-jd2.sql \
@@ -131,11 +141,8 @@ cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/etc/rc.d \
          $PKG/var/lib/jabberd2/{db,fs,stats} \
-         $PKG/var/log/jabberd2 \
-         $PKG/var/run/jabberd2
-chown -R $JABBERUSR.$JABBERGRP $PKG/var/lib/jabberd2 \
-                               $PKG/var/log/jabberd2 \
-                               $PKG/var/run/jabberd2
+         $PKG/var/log/jabberd2
+chown -R $JABBERUSR:$JABBERGRP $PKG/var/lib/jabberd2 $PKG/var/log/jabberd2 
 install -o root -g root -m 644 $CWD/rc.jabberd2 $PKG/etc/rc.d/rc.jabberd2.new
 sed -i -e "s/%JABBERUSR%/$JABBERUSR/g" $PKG/etc/rc.d/rc.jabberd2.new
 
@@ -144,7 +151,7 @@ rm -r $PKG/usr/etc \
       $PKG/etc/jabberd2/templates/*.dist
 
 find $PKG/etc/jabberd2 -type f -exec mv {} {}.new \;
-find $PKG/etc/jabberd2 -type f -exec chown root.$JABBERGRP {} \; -exec chmod 640 {} \;
+find $PKG/etc/jabberd2 -type f -exec chown root:$JABBERGRP {} \; -exec chmod 640 {} \;
 sed -i -e "s#var/jabberd/pid#var/run/jabberd2#g" $PKG/etc/jabberd2/c2s.xml.new
 sed -i -e "s#var/jabberd/log#var/log/jabberd2#g" $PKG/etc/jabberd2/c2s.xml.new
 sed -i -e "s#var/jabberd/stats#var/lib/jabberd2/stats#g" $PKG/etc/jabberd2/c2s.xml.new
@@ -163,4 +170,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/network/jabberd2/jabberd2.info b/network/jabberd2/jabberd2.info
index 8958329f97..61e70d9fe0 100644
--- a/network/jabberd2/jabberd2.info
+++ b/network/jabberd2/jabberd2.info
@@ -1,8 +1,8 @@
 PRGNAM="jabberd2"
-VERSION="2.2.17"
+VERSION="2.7.0"
 HOMEPAGE="http://www.jabberd2.org"
-DOWNLOAD="https://github.com/downloads/jabberd2/jabberd2/jabberd-2.2.17.tar.xz"
-MD5SUM="8b7d654deaa6566e58ab6630112f9b10"
+DOWNLOAD="https://github.com/jabberd2/jabberd2/releases/download/jabberd-2.7.0/jabberd-2.7.0.tar.xz"
+MD5SUM="39b4b5286a1ad91ff84c3588fa26efa8"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="udns libgsasl"
diff --git a/network/jabberd2/rc.jabberd2 b/network/jabberd2/rc.jabberd2
index ca328a6df3..c5e8a70f54 100644
--- a/network/jabberd2/rc.jabberd2
+++ b/network/jabberd2/rc.jabberd2
@@ -1,6 +1,8 @@
 #!/bin/sh
 
 jabberd2_start() {
+  mkdir -p /var/run/jabberd2
+  chown %JABBERUSR% /var/run/jabberd2
   su - %JABBERUSR% -c '/usr/bin/jabberd &'
 }
 
diff --git a/network/jboss-as/README b/network/jboss-as/README
index 4d0ab1453a..55d23e3063 100644
--- a/network/jboss-as/README
+++ b/network/jboss-as/README
@@ -1,11 +1,11 @@
-JBoss is a free, open source, Java EE certified platform for developing and
-deploying enterprise Java applications, Web applications, and Portals,
-JBoss Application Server provides the full range of Java EE 6 features as
-well as extended enterprise services including clustering, caching, and
-persistence.
+JBoss is a free, open source, Java EE certified platform
+for developing and deploying enterprise Java applications, Web
+applications, and Portals, JBoss Application Server provides the full
+range of Java EE 6 features as well as extended enterprise services
+including clustering, caching, and persistence.
 
-JBoss-AS requires a "jboss" user and group; create these before running the
-SlackBuild script. Examples:
+JBoss-AS requires a "jboss" user and group; create these before
+running the SlackBuild script. Examples:
 
 # groupadd -g 254 -r jboss
 # useradd -u 254 -M -r -s /bin/bash -d /usr/share/jboss-as \
diff --git a/network/jboss-as/jboss-as.SlackBuild b/network/jboss-as/jboss-as.SlackBuild
index 5158711ed4..933f3d02c3 100644
--- a/network/jboss-as/jboss-as.SlackBuild
+++ b/network/jboss-as/jboss-as.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Copyright 2011 Giorgio Peron, Campodarsego, PD, Italy  giorgio.peron@gmail.com
 # All rights reserved.
@@ -21,14 +21,24 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=jboss-as
 VERSION=${VERSION:-7.0.1.Final}
 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}
@@ -147,4 +157,4 @@ for cf in $( find etc/$PRGNAM/ -type f ); do
   echo "config $cf.new" >> install/doinst.sh
 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/network/jboss-as/jboss-as.info b/network/jboss-as/jboss-as.info
index 29a596e120..1151ad7e8c 100644
--- a/network/jboss-as/jboss-as.info
+++ b/network/jboss-as/jboss-as.info
@@ -5,6 +5,6 @@ DOWNLOAD="http://download.jboss.org/jbossas/7.0/jboss-as-7.0.1.Final/jboss-as-7.
 MD5SUM="0f25ab4e936de94780dba1e3a6d2da60"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="jdk"
+REQUIRES="zulu-openjdk8"
 MAINTAINER="Giorgio Peron"
 EMAIL="giorgio.peron@gmail.com"
diff --git a/network/jetty/jetty.SlackBuild b/network/jetty/jetty.SlackBuild
index 9433633980..7ab621a3d4 100644
--- a/network/jetty/jetty.SlackBuild
+++ b/network/jetty/jetty.SlackBuild
@@ -1,14 +1,24 @@
-#!/bin/sh
+#!/bin/bash
 #
 # Slackware build script for openfire
 # Written by Mário Antunes (mariolpantunes@gmail.com)
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=jetty
 VERSION=${VERSION:-9.2.3.v20140905}
 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}
@@ -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/network/jetty/jetty.info b/network/jetty/jetty.info
index 426f360da5..5348702ad7 100644
--- a/network/jetty/jetty.info
+++ b/network/jetty/jetty.info
@@ -5,6 +5,6 @@ DOWNLOAD="http://repo1.maven.org/maven2/org/eclipse/jetty/jetty-distribution/9.2
 MD5SUM="ab0822beb826a5db91de46d1d281afb7"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="jdk"
+REQUIRES="zulu-openjdk8"
 MAINTAINER="Mário Antunes"
 EMAIL="mariolpantunes@gmail.com"
diff --git a/network/jigdo/fix_man_page_build.diff b/network/jigdo/fix_man_page_build.diff
new file mode 100644
index 0000000000..2a23ee8cff
--- /dev/null
+++ b/network/jigdo/fix_man_page_build.diff
@@ -0,0 +1,29 @@
+diff -Naur jigdo-0.8.1/doc/Makefile.in jigdo-0.8.1.patched/doc/Makefile.in
+--- jigdo-0.8.1/doc/Makefile.in	2021-10-31 14:09:53.000000000 -0400
++++ jigdo-0.8.1.patched/doc/Makefile.in	2022-03-01 12:34:10.348574996 -0500
+@@ -15,12 +15,9 @@
+ .SUFFIXES: .1 .sgml .html
+ 
+ .sgml.1:
+-		mkdir -p tmp && cp "$<" tmp \
+-		    && cd tmp && $(DOCBOOK2MAN) "`echo $< | sed 's%.*/%%'`"
+-		sed -e 's/   */ /g' <"`ls tmp/*.1`" >"$@"
+-		rm -rf tmp
+-#		sed -e 's%\\%\\\\%g;' <"$<" | tr -s '[:space:]' ' ' \
+-#		    | $(DOCBOOKTOMAN) - >"$@"
++		$(DOCBOOK2MAN) $<
++		mv $(subst .1,.en.1,$@) $@
++
+ .sgml.html:
+ 		rm -f "$@"
+ 		$(DOCBOOK2HTML) "$<" --nochunks
+@@ -32,8 +29,7 @@
+ .PHONY:		all clean distclean mostlyclean maintainer-clean \
+ 		dep depend doc check
+ all:		jigdo-file.1 jigdo-file.html jigdo-lite.1 jigdo-lite.html \
+-		jigdo-mirror.1 jigdo-mirror.html \
+-		debian-jigdo-mini-howto.html
++		jigdo-mirror.1 jigdo-mirror.html
+ doc mostlyclean dep depend check: ;
+ 
+ clean:		Makefile
diff --git a/network/jigdo/jigdo.SlackBuild b/network/jigdo/jigdo.SlackBuild
index 67e467dde2..c5939333f0 100644
--- a/network/jigdo/jigdo.SlackBuild
+++ b/network/jigdo/jigdo.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for jigdo
 # Copyright Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy, 2012
@@ -21,26 +21,37 @@
 #  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.
+# - update for v0.8.1, which was released in 2021. the old version
+#   was from 2009...
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=jigdo
-VERSION=${VERSION:-0.7.3}
+VERSION=${VERSION:-0.8.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"
@@ -53,7 +64,6 @@ else
   LIBDIRSUFFIX=""
 fi
 
-DOCS="README THANKS changelog doc/TechDetails.txt doc/Hacking.txt"
 
 set -e 
 
@@ -61,17 +71,24 @@ 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 {} \;
-
-# apply some patches from debian
-zcat $CWD/jigdo_0.7.3-3.diff.gz | patch -p1
+ -exec chmod 644 {} \+
+
+# 20220301 bkw: doc/Makefile.in has some confusing looking stuff that
+# didn't work properly. It would work with some version of docbook2man
+# (one that doesn't print "Working on <file>" on stdout, and does
+# print whatever the sed stuff was expecting to see). There's a much
+# cleaner way to do it, using make's $(subst) macro. Also, don't try
+# to build debian-jigdo-mini-howto.html because it's for some other
+# version of docbook2man. I took the built HTML file from a Debian
+# package and made it a separate download.
+patch -p1 < $CWD/fix_man_page_build.diff
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
@@ -84,20 +101,23 @@ CXXFLAGS="$SLKCFLAGS" \
 
 make
 make install DESTDIR=$PKG
+strip $PKG/usr/bin/$PRGNAM-file
 
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+# 20220301 bkw: man pages get installed +x, sigh.
+chmod 644 $PKG/usr/man/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
+PKGDOC=$PKG/usr/doc/$PRGNAM-$VERSION
+DOCS="COPYING README THANKS changelog doc/TechDetails.txt doc/Hacking.txt"
+HOWTO="debian-jigdo-mini-howto.html"
 
-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
-mv $PKG/usr/share/$PRGNAM/COPYING $PKG/usr/doc/$PRGNAM-$VERSION
+mkdir -p $PKGDOC
+cp -a $DOCS $PKGDOC
+zcat $CWD/$HOWTO.gz > $PKGDOC/$HOWTO
+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/network/jigdo/jigdo.info b/network/jigdo/jigdo.info
index 6e7167895b..c5236d8e67 100644
--- a/network/jigdo/jigdo.info
+++ b/network/jigdo/jigdo.info
@@ -1,8 +1,10 @@
 PRGNAM="jigdo"
-VERSION="0.7.3"
-HOMEPAGE="http://atterer.org/jigdo/"
-DOWNLOAD="http://atterer.org/sites/atterer/files/2009-08/jigdo/jigdo-0.7.3.tar.bz2"
-MD5SUM="bbc1d9ac750bb34e0748f0b57157cc72"
+VERSION="0.8.1"
+HOMEPAGE="https://www.einval.com/~steve/software/jigdo/"
+DOWNLOAD="https://www.einval.com/~steve/software/jigdo/download/jigdo-0.8.1.tar.xz \
+          https://slackware.uk/~urchlay/src/debian-jigdo-mini-howto.html.gz"
+MD5SUM="de08a463f3b2c52089bfd582fed3cdff \
+        bfd371e320fa9b48bb86383e3b66341d"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/network/jigdo/jigdo_0.7.3-3.diff.gz b/network/jigdo/jigdo_0.7.3-3.diff.gz
deleted file mode 100644
index 43a8349d7d..0000000000
--- a/network/jigdo/jigdo_0.7.3-3.diff.gz
+++ /dev/null
diff --git a/network/jitsi-meet-desktop/README b/network/jitsi-meet-desktop/README
new file mode 100644
index 0000000000..0233a9b22b
--- /dev/null
+++ b/network/jitsi-meet-desktop/README
@@ -0,0 +1,10 @@
+Jitsi Meet is the Secure, Simple and Scalable Video Conferences that
+you use as a standalone app or embed in your web application.
+This is the Jitsi Meet desktop application, powered by Electron.
+
+This SlackBuild repackages the upstream AppImage. The AppImage is only
+available for 64-bit systems.
+
+This is not to be confused with Jitsi Desktop (packaged as jitsi at
+SlackBuilds.org), the legacy desktop application that works with
+xmpp and sip servers for chat and video calls.
diff --git a/network/quassel-qt5/doinst.sh b/network/jitsi-meet-desktop/doinst.sh
index 65c7e2eeb9..65c7e2eeb9 100644
--- a/network/quassel-qt5/doinst.sh
+++ b/network/jitsi-meet-desktop/doinst.sh
diff --git a/network/jitsi-meet-desktop/jitsi-meet-desktop.SlackBuild b/network/jitsi-meet-desktop/jitsi-meet-desktop.SlackBuild
new file mode 100644
index 0000000000..2c5424a40d
--- /dev/null
+++ b/network/jitsi-meet-desktop/jitsi-meet-desktop.SlackBuild
@@ -0,0 +1,105 @@
+#!/bin/bash
+
+# Slackware build script for jitsi-meet-desktop
+
+# 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=jitsi-meet-desktop
+VERSION=${VERSION:-2024.3.0}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+if [ -z "$ARCH" ]; then
+  ARCH=$(uname -m)
+fi
+
+case "$ARCH" in
+  # do nothing and pass through
+  x86_64) ;;
+  *)
+    echo "$ARCH is not supported for $PRGNAM-$VERSION"
+    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
+
+# Extract AppImage at the new jitsi-meet-desktop folder
+rm -rf jitsi-meet-desktop
+mkdir jitsi-meet-desktop
+cp $CWD/jitsi-meet-$ARCH.AppImage jitsi-meet-desktop
+cd jitsi-meet-desktop
+chmod u+x jitsi-meet-$ARCH.AppImage
+./jitsi-meet-$ARCH.AppImage --appimage-extract
+rm jitsi-meet-$ARCH.AppImage    # Once AppImage is extracted, remove it from /tmp/SBo/jitsi-meet-desktop
+
+find squashfs-root/locales/ -type d -exec chmod 755 {} +
+find squashfs-root/resources/ -type d -exec chmod 755 {} +
+
+install -d $PKG/opt/$PRGNAM
+cp -r squashfs-root/* $PKG/opt/$PRGNAM
+
+# remove broken or unused files and directories
+rm -r $PKG/opt/$PRGNAM/usr/
+rm $PKG/opt/$PRGNAM/AppRun
+rm $PKG/opt/$PRGNAM/jitsi-meet.desktop
+rm $PKG/opt/$PRGNAM/jitsi-meet.png
+
+find squashfs-root/usr/share/icons/ -type d -exec chmod 755 {} +
+
+install -d $PKG/usr/share/icons
+cp -r squashfs-root/usr/share/icons/hicolor $PKG/usr/share/icons/hicolor
+
+install -d $PKG/usr/bin
+ln -s ../../opt/$PRGNAM/jitsi-meet $PKG/usr/bin/$PRGNAM
+
+# Install custom desktop file
+install -Dm644 "$CWD/$PRGNAM.desktop" $PKG/usr/share/applications/$PRGNAM.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 squashfs-root/LICENSE.electron.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/network/jitsi-meet-desktop/jitsi-meet-desktop.desktop b/network/jitsi-meet-desktop/jitsi-meet-desktop.desktop
new file mode 100644
index 0000000000..68bae15591
--- /dev/null
+++ b/network/jitsi-meet-desktop/jitsi-meet-desktop.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=Jitsi Meet
+Comment=Jitsi Meet Desktop App
+Exec=jitsi-meet-desktop
+Terminal=false
+Type=Application
+Icon=jitsi-meet-desktop
+StartupWMClass=Jitsi Meet
+Categories=VideoConference;AudioVideo;Audio;Video;Network;
diff --git a/network/jitsi-meet-desktop/jitsi-meet-desktop.info b/network/jitsi-meet-desktop/jitsi-meet-desktop.info
new file mode 100644
index 0000000000..690983e6aa
--- /dev/null
+++ b/network/jitsi-meet-desktop/jitsi-meet-desktop.info
@@ -0,0 +1,10 @@
+PRGNAM="jitsi-meet-desktop"
+VERSION="2024.3.0"
+HOMEPAGE="https://jitsi.org/"
+DOWNLOAD="UNSUPPORTED"
+MD5SUM=""
+DOWNLOAD_x86_64="https://github.com/jitsi/jitsi-meet-electron/releases/download/v2024.3.0/jitsi-meet-x86_64.AppImage"
+MD5SUM_x86_64="bd3a9721e63982c85ce524dbb15e412c"
+REQUIRES=""
+MAINTAINER="Eugene Wissner"
+EMAIL="belka@caraus.de"
diff --git a/network/jitsi-meet-desktop/slack-desc b/network/jitsi-meet-desktop/slack-desc
new file mode 100644
index 0000000000..58ff485eee
--- /dev/null
+++ b/network/jitsi-meet-desktop/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+                  |-----handy-ruler------------------------------------------------------|
+jitsi-meet-desktop: jitsi-meet-desktop (Jitsi Meet Desktop Application)
+jitsi-meet-desktop:
+jitsi-meet-desktop: Jitsi Meet is the Secure, Simple and Scalable Video Conferences that
+jitsi-meet-desktop: you use as a standalone app or embed in your web application.
+jitsi-meet-desktop: This is the Jitsi Meet desktop application, powered by Electron.
+jitsi-meet-desktop:
+jitsi-meet-desktop:
+jitsi-meet-desktop:
+jitsi-meet-desktop:
+jitsi-meet-desktop:
+jitsi-meet-desktop:
diff --git a/network/jitsi/README b/network/jitsi/README
index e3aa474390..8c43d06294 100644
--- a/network/jitsi/README
+++ b/network/jitsi/README
@@ -1,5 +1,5 @@
 jitsi (SIP Communicator)
 
-Jitsi (formerly SIP Communicator) is an audio/video and chat communicator
-that supports protocols such as SIP, XMPP/Jabber, AIM/ICQ, Windows Live,
-Yahoo! and many other useful features.
+Jitsi (formerly SIP Communicator) is an audio/video and chat
+communicator that supports protocols such as SIP, XMPP/Jabber,
+AIM/ICQ, Windows Live, Yahoo! and many other useful features.
diff --git a/network/jitsi/jitsi.SlackBuild b/network/jitsi/jitsi.SlackBuild
index dea951b97a..07d9712e16 100644
--- a/network/jitsi/jitsi.SlackBuild
+++ b/network/jitsi/jitsi.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for jitsi
 
@@ -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=jitsi
-VERSION=${VERSION:-2.8}
+VERSION=${VERSION:-5633}
 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,8 +70,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-unzip $CWD/$PRGNAM-src-$VERSION.5426.zip
-mv $PRGNAM $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
@@ -70,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 {} \;
 
-sed -i "s/0.build.by.SVN/5426/g" src/net/java/sip/communicator/impl/version/NightlyBuildID.java
-
 ant rebuild
 
 mkdir -p $PKG/usr/bin
@@ -86,9 +93,9 @@ mkdir -p $PKG/usr/share/jitsi/lib/native
 cp resources/install/resources/splash.gif $PKG/usr/share/jitsi
 cp lib/{felix.client.run.properties,felix.jar,jitsi-defaults.properties,logging.properties} $PKG/usr/share/jitsi/lib
 if [ "$ARCH" = "x86_64" ]; then
-	cp -a lib/native/linux-64/*.so $PKG/usr/share/jitsi/lib/native
+  cp -a lib/native/linux-64/*.so $PKG/usr/share/jitsi/lib/native
 else
-	cp -a lib/native/linux/*.so $PKG/usr/share/jitsi/lib/native
+  cp -a lib/native/linux/*.so $PKG/usr/share/jitsi/lib/native
 fi
 cp lib/bundle/{commons-logging.jar,log4j.jar} $PKG/usr/share/jitsi/lib/bundle
 
@@ -113,7 +120,6 @@ 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 LICENSE README.md $PKG/usr/doc/$PRGNAM-$VERSION
-sed 's#_PACKAGE_NAME_#jitsi#' resources/install/debian/changelog.tmpl | sed 's#_VERSION_#2.8.5426-1#' | sed 's#_DATE_#Thu, 19 Mar 2015 02:20:44 -0400#' > $PKG/usr/doc/$PRGNAM-$VERSION/changelog
 cp resources/install/debian/copyright $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
@@ -122,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/network/jitsi/jitsi.info b/network/jitsi/jitsi.info
index 8d2c254e97..53cb3d1141 100644
--- a/network/jitsi/jitsi.info
+++ b/network/jitsi/jitsi.info
@@ -1,10 +1,10 @@
 PRGNAM="jitsi"
-VERSION="2.8"
+VERSION="5633"
 HOMEPAGE="https://jitsi.org/"
-DOWNLOAD="https://download.jitsi.org/jitsi/src/jitsi-src-2.8.5426.zip"
-MD5SUM="db86aa3c754e54e774257c09e7c474d2"
+DOWNLOAD="https://github.com/jitsi/jitsi/archive/5633/jitsi-5633.tar.gz"
+MD5SUM="0844dc46176c7940cdeac075559d38e6"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="openjdk7"
+REQUIRES="apache-ant zulu-openjdk8"
 MAINTAINER="Furry Monster"
 EMAIL="furrymonster at gmx dot com"
diff --git a/network/js185/README b/network/js185/README
new file mode 100644
index 0000000000..a6123488a8
--- /dev/null
+++ b/network/js185/README
@@ -0,0 +1,7 @@
+js185 (SpiderMonkey - Mozilla's JavaScript Engine)
+
+SpiderMonkey is Mozilla's JavaScript engine written in C/C++.  It is
+used in various Mozilla products (including Firefox) and is available
+under MPL/GPL/LGPL tri-license.
+
+This legacy version is an optional dependency for elinks.
diff --git a/network/js185/js185-destdir.patch b/network/js185/js185-destdir.patch
new file mode 100644
index 0000000000..87b7b53b30
--- /dev/null
+++ b/network/js185/js185-destdir.patch
@@ -0,0 +1,15 @@
+#https://bugzilla.mozilla.org/show_bug.cgi?id=628723
+
+--- Makefile.in.old	2011-04-10 04:21:19.918608008 -0700
++++ Makefile.in	2011-04-10 04:21:58.088607992 -0700
+@@ -888,8 +888,8 @@
+ ifeq (,$(HOST_BIN_SUFFIX))
+ 	mv -f $(SHLIB_ANY_VER) $(SHLIB_EXACT_VER)
+ 	@[ ! -h $(SHLIB_ABI_VER) ] || rm -f $(SHLIB_ABI_VER)
+-	ln -s $(SHLIB_EXACT_VER) $(SHLIB_ABI_VER)
+-	ln -s $(SHLIB_ABI_VER) $(SHLIB_ANY_VER)
++	ln -s $(notdir $(SHLIB_EXACT_VER)) $(SHLIB_ABI_VER)
++	ln -s $(notdir $(SHLIB_ABI_VER)) $(SHLIB_ANY_VER)
+ endif
+ endif
+ ifneq (,$(IMPORT_LIBRARY))
diff --git a/network/js185/js185.SlackBuild b/network/js185/js185.SlackBuild
new file mode 100644
index 0000000000..171ab475ae
--- /dev/null
+++ b/network/js185/js185.SlackBuild
@@ -0,0 +1,122 @@
+#!/bin/bash
+
+# Slackware build script for SpiderMonkey
+
+# Maintained for 15.0 by D Woodfall (2022)
+#
+# Copyright 2011  Robby Workman, Northport, Alabama, 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=js185
+VERSION=${VERSION:-1.0.0}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+TARNAME=js
+TARVERS=1.8.5
+
+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
+cd $TMP
+rm -rf $TARNAME-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
+cd $TARNAME-$TARVERS
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -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 js/src
+
+patch -p0 < $CWD/js185-destdir.patch
+
+CXXFLAGS="$SLKCFLAGS -std=gnu++03" \
+CFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --mandir=/usr/man \
+  --build=$ARCH-slackware-linux \
+  --enable-optimize="-O2" \
+  --enable-threadsafe \
+  --with-system-nspr \
+  --with-nspr-prefix=/usr
+
+make
+make install DESTDIR=$PKG
+
+# Oops, Makefile missed this:
+cp -a shell/js $PKG/usr/bin
+
+# No need for this:
+rm -f $PKG/usr/lib${LIBDIRSUFFIX}/*.a
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp ../../README README.html $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+find $PKG -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
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/network/js185/js185.info b/network/js185/js185.info
new file mode 100644
index 0000000000..dd1069a1c6
--- /dev/null
+++ b/network/js185/js185.info
@@ -0,0 +1,10 @@
+PRGNAM="js185"
+VERSION="1.0.0"
+HOMEPAGE="http://www.mozilla.org/js/spidermonkey"
+DOWNLOAD="https://mirrors.slackware.com/slackware/slackware64-14.2/source/l/js185/js185-1.0.0.tar.xz"
+MD5SUM="d8e6e5aabf5cfbfb305282de62a441b6"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="D Woodfall"
+EMAIL="dave@slackbuilds.org"
diff --git a/network/js185/slack-desc b/network/js185/slack-desc
new file mode 100644
index 0000000000..1223f7ed1d
--- /dev/null
+++ b/network/js185/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+     |-----handy-ruler------------------------------------------------------|
+js185: js185 (SpiderMonkey - Mozilla's JavaScript Engine)
+js185:
+js185: SpiderMonkey is Mozilla's JavaScript engine written in C/C++.
+js185: It is used in various Mozilla products (including Firefox) and is
+js185: available under MPL/GPL/LGPL tri-license.
+js185:
+js185: This legacy version is an optional dependency for elinks.
+js185:
+js185: Homepage: http://www.mozilla.org/js/spidermonkey
+js185:
+js185:
diff --git a/network/kadu/README b/network/kadu/README
deleted file mode 100644
index 0515db2274..0000000000
--- a/network/kadu/README
+++ /dev/null
@@ -1 +0,0 @@
-Kadu is an IM client for the Gadu-Gadu protocol.
diff --git a/network/kadu/doinst.sh b/network/kadu/doinst.sh
deleted file mode 100644
index d6430a30c5..0000000000
--- a/network/kadu/doinst.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-if [ -x /usr/bin/update-desktop-database ]; then
-  /usr/bin/update-desktop-database -q usr/share/applications &> /dev/null
-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/network/kadu/kadu.SlackBuild b/network/kadu/kadu.SlackBuild
deleted file mode 100644
index b24650c777..0000000000
--- a/network/kadu/kadu.SlackBuild
+++ /dev/null
@@ -1,99 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for kadu
-
-# Written by marco slociu@wp.pl
-
-PRGNAM=kadu
-VERSION=${VERSION:-0.12.3}
-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
-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 {} \;
-
-patch -p1 < $CWD/kadu.patch
-
-mkdir -p build
-cd build
-cmake .. \
-  -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
-  -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
-  -DCMAKE_INSTALL_PREFIX=/usr \
-  -DMAN_INSTALL_DIR=/usr/man \
-  -DSYSCONF_INSTALL_DIR=/etc \
-  -DLIB_SUFFIX=${LIBDIRSUFFIX} \
-  -DCMAKE_VERBOSE_MAKEFILE:BOOL="TRUE" \
-  -DNETWORK_IMPLEMENTATION="Qt" \
-  -DCMAKE_BUILD_TYPE="Release" \
-  -DSIG_HANDLING_ENABLED:BOOL="TRUE" \
-  -DINSTALL_SDK:BOOL="TRUE" \
-  -DBUILD_DESCRIPTION="Slackware"
-
-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 all license files
-find "$PKG" -name '[lL][iI][cC][eE][nN][sS][eE].txt' -delete
-
-# Move cmake files in the proper place
-mv $PKG/usr/share/cmake \
-  $PKG/usr/share/cmake-$(cmake --version | head -1 | cut -d\  -f3 | cut -d. -f1-2)
-
-# Move this away too...
-mv $PKG/usr/sdk $PKG/usr/share/$PRGNAM/
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
-  AUTHORS COPYING ChangeLog INSTALL README THANKS VERSION \
-  $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/network/kadu/kadu.info b/network/kadu/kadu.info
deleted file mode 100644
index e166581cf9..0000000000
--- a/network/kadu/kadu.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="kadu"
-VERSION="0.12.3"
-HOMEPAGE="http://www.kadu.net"
-DOWNLOAD="http://downloads.sourceforge.net/kadu/kadu-0.12.3.tar.bz2"
-MD5SUM="c5d6f0bd384cd96090819ea018eb8ad8"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="libgadu libmpdclient"
-MAINTAINER="M Slodkiewicz"
-EMAIL="slociu@wp.pl"
diff --git a/network/kadu/kadu.patch b/network/kadu/kadu.patch
deleted file mode 100644
index d47d9fa0ae..0000000000
--- a/network/kadu/kadu.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- kadu-0.12.3/plugins/jabber_protocol/3rdparty/CMakeLists.txt.orig	2013-11-17 07:23:54.186097640 +0700
-+++ kadu-0.12.3/plugins/jabber_protocol/3rdparty/CMakeLists.txt	2013-11-17 07:24:32.686563005 +0700
-@@ -26,7 +26,7 @@
- 					get_filename_component (_basename ${_current_MOC} NAME_WE)
- 					set (_header ${_abs_FILE})
- 					set (_moc ${_abs_PATH}/${_current_MOC})
--					QT4_CREATE_MOC_COMMAND (${_header} ${_moc} "${_moc_INCS}" "")
-+					QT4_CREATE_MOC_COMMAND (${_header} ${_moc} "${_moc_INCS}" "" "${moc_target}")
- 					MACRO_ADD_FILE_DEPENDENCIES (${_abs_FILE} ${_moc})
- 				endforeach (_current_MOC_INC)
- 			endif (_match)
diff --git a/network/kadu/slack-desc b/network/kadu/slack-desc
deleted file mode 100644
index 6fcdf80bc8..0000000000
--- a/network/kadu/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------------------------------------------------------|
-kadu: kadu (Gadu-Gadu IM client)
-kadu:
-kadu: Kadu is an instant messaging client for the Gadu-Gadu protocol.
-kadu:
-kadu:
-kadu:
-kadu:
-kadu:
-kadu:
-kadu:
-kadu:
diff --git a/network/kasp_updater/kasp_updater.SlackBuild b/network/kasp_updater/kasp_updater.SlackBuild
index 35921e6f2a..bde5d0d763 100644
--- a/network/kasp_updater/kasp_updater.SlackBuild
+++ b/network/kasp_updater/kasp_updater.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for kasp_updater
 
@@ -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=kasp_updater
 TARNAME=updater
 VERSION=${VERSION:-2.0.1.2015.1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 BUILD=${BUILD:-1}
 
 if [ -z "$ARCH" ]; then
@@ -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 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/network/kcm_ufw/README b/network/kcm_ufw/README
deleted file mode 100644
index f68f005129..0000000000
--- a/network/kcm_ufw/README
+++ /dev/null
@@ -1,11 +0,0 @@
-This is a KDE control center module to configure and control the Uncomplicated
-Firewall. The following features are supported:
-
-1. Enable/disable firewall
-2. Configure firewall default settings
-3. Add, edit, and remove rules
-4. Re-order rules via drag'n'drop
-5. Creation, and basic manipulation, of firewall profiles
-6. Import/export of firewall profiles
-7. Setting of some IP tables modules
-
diff --git a/network/kcm_ufw/doinst.sh b/network/kcm_ufw/doinst.sh
deleted file mode 100644
index 5fb28930db..0000000000
--- a/network/kcm_ufw/doinst.sh
+++ /dev/null
@@ -1,3 +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/network/kcm_ufw/kcm_ufw.SlackBuild b/network/kcm_ufw/kcm_ufw.SlackBuild
deleted file mode 100644
index ed14f1daa9..0000000000
--- a/network/kcm_ufw/kcm_ufw.SlackBuild
+++ /dev/null
@@ -1,102 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for kcm_ufw
-
-# Copyright 2014  Iskren Hadzhinedev  Rousse BG
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
-#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
-#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (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_ufw
-VERSION=${VERSION:-0.4.3}
-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 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 ..
-
-# Move a misplaced config file
-mv $PKG/etc/kde/dbus-1 $PKG/etc/dbus-1
-rm -r $PKG/etc/kde
-
-find $PKG -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 README COPYING $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-mv $PKG/usr/share/doc/HTML $PKG/usr/doc/HTML
-rm -r $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:-tgz}
diff --git a/network/kcm_ufw/kcm_ufw.info b/network/kcm_ufw/kcm_ufw.info
deleted file mode 100644
index 68c899ace4..0000000000
--- a/network/kcm_ufw/kcm_ufw.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="kcm_ufw"
-VERSION="0.4.3"
-HOMEPAGE="http://kde-apps.org/content/show.php/UFW+KControl+Module?content=137789"
-DOWNLOAD="http://ponce.cc/slackware/sources/repo/kcm_ufw-0.4.3.tar.bz2"
-MD5SUM="97de867481948e3f54d76ca3678ffd2e"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="ufw"
-MAINTAINER="Iskren Hadzhinedev"
-EMAIL="i.hadzhinedev@gmail.com"
diff --git a/network/kcm_ufw/slack-desc b/network/kcm_ufw/slack-desc
deleted file mode 100644
index 6bc0e1dc6a..0000000000
--- a/network/kcm_ufw/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_ufw: kcm_ufw (KDE Control Module for UFW)
-kcm_ufw:
-kcm_ufw: This is a KDE control center module to configure and control the
-kcm_ufw: Uncomplicated Firewall
-kcm_ufw:
-kcm_ufw:
-kcm_ufw:
-kcm_ufw:
-kcm_ufw:
-kcm_ufw:
-kcm_ufw:
diff --git a/network/kdrive/README b/network/kdrive/README
new file mode 100644
index 0000000000..250d5e8432
--- /dev/null
+++ b/network/kdrive/README
@@ -0,0 +1,6 @@
+kDrive allows you to collaborate, store and share your data securely
+from your internet browser, mobile, tablet or computer.
+
+It is the official AppImage application from Infomaniak.
+
+You just need fuse to run it.
diff --git a/network/rekonq/doinst.sh b/network/kdrive/doinst.sh
index 65c7e2eeb9..65c7e2eeb9 100644
--- a/network/rekonq/doinst.sh
+++ b/network/kdrive/doinst.sh
diff --git a/network/kdrive/kDrive.desktop b/network/kdrive/kDrive.desktop
new file mode 100644
index 0000000000..a6f1df8fcb
--- /dev/null
+++ b/network/kdrive/kDrive.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Name=kDrive
+Comment=Infomaniak Drive desktop synchronization client
+Comment[fr]=Client de synchronisation de bureau Infomaniak Drive
+Exec=kDrive
+Icon=kDrive
+Type=Application
+Categories=Network;FileTransfer;
+Keywords=Infomaniak Drive;syncing;file;sharing;
+MimeType=application/vnd.kDrive;
diff --git a/network/kdrive/kDrive.png b/network/kdrive/kDrive.png
new file mode 100644
index 0000000000..7d9f1c803a
--- /dev/null
+++ b/network/kdrive/kDrive.png
diff --git a/network/kdrive/kdrive.SlackBuild b/network/kdrive/kdrive.SlackBuild
new file mode 100644
index 0000000000..3ec0511354
--- /dev/null
+++ b/network/kdrive/kdrive.SlackBuild
@@ -0,0 +1,84 @@
+#!/bin/bash
+
+# Slackware build script for kDrive
+
+# Copyright 2023 Frederic Galusik Bordeaux, 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.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=kdrive
+VERSION=${VERSION:-3.3.7.20221109}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    x86_64) ARCH=x86_64 ;;
+    *) echo "Package for $(uname -m) architecture is not available." ; exit 1 ;;
+  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
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+mkdir -p $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 {} \;
+
+# install
+install -Dm 755 $CWD/kDrive-$VERSION.AppImage $PKG/usr/bin/kDrive
+
+# Desktop shortcut
+install -Dm 644 -o root -g root $CWD/kDrive.desktop $PKG/usr/share/applications/kDrive.desktop 
+install -Dm 644 -o root -g root $CWD/kDrive.png $PKG/usr/share/icons/hicolor/512x512/apps/kDrive.png
+
+# Copy program documentation & SlackBuild script in the documentation directory
+install -Dm 644 -o root -g root $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
+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/network/kdrive/kdrive.info b/network/kdrive/kdrive.info
new file mode 100644
index 0000000000..450028c05d
--- /dev/null
+++ b/network/kdrive/kdrive.info
@@ -0,0 +1,10 @@
+PRGNAM="kdrive"
+VERSION="3.3.7.20221109"
+HOMEPAGE="https://kdrive.infomaniak.com"
+DOWNLOAD="https://download.storage.infomaniak.com/drive/desktopclient/kDrive-3.3.7.20221109.AppImage"
+MD5SUM="a00112049de074ad9d79b37dbdf7c560"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Frederic Galusik"
+EMAIL="f@galusik.fr"
diff --git a/network/kdrive/slack-desc b/network/kdrive/slack-desc
new file mode 100644
index 0000000000..48a667ed2b
--- /dev/null
+++ b/network/kdrive/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+      |-----handy-ruler------------------------------------------------------|
+kdrive: kdrive (Infomaniak Drive desktop synchronization client)
+kdrive:
+kdrive: Infomaniak kDrive desktop synchronization client
+kdrive: (pre-compiled version).
+kdrive:
+kdrive: kDrive allows you to collaborate, store and share your data
+kdrive: securely from your internet browser, mobile, tablet or computer.
+kdrive:
+kdrive:
+kdrive:
+kdrive:
diff --git a/network/kea/doinst.sh b/network/kea/doinst.sh
index 52f28b475f..40c8fbc08a 100644
--- a/network/kea/doinst.sh
+++ b/network/kea/doinst.sh
@@ -23,5 +23,8 @@ preserve_perms() {
 }
 
 preserve_perms etc/rc.d/rc.kea.new
-config etc/kea/kea.conf.new
+config etc/kea/kea-ctrl-agent.conf.new
+config etc/kea/kea-dhcp-ddns.conf.new
+config etc/kea/kea-dhcp4.conf.new
+config etc/kea/kea-dhcp6.conf.new
 config etc/kea/keactrl.conf.new
diff --git a/network/kea/kea.SlackBuild b/network/kea/kea.SlackBuild
index 3d70891b8e..d9de37586f 100644
--- a/network/kea/kea.SlackBuild
+++ b/network/kea/kea.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for kea
 
-# Copyright 2016-2017 Thibaut Notteboom, Paris, FRANCE
+# Copyright 2016-2023 Thibaut Notteboom, Paris, 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=kea
-VERSION=${VERSION:-1.2.0}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-2.5.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}
@@ -49,6 +56,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=""
@@ -72,7 +82,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 {} \;
 
-CPPFLAGS="-std=gnu++11" \
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
@@ -90,15 +99,20 @@ CXXFLAGS="$SLKCFLAGS" \
   --disable-static \
   --build=$ARCH-slackware-linux
 
-make
+make -j7
 make install DESTDIR=$PKG
 
-mv $PKG/etc/kea/kea.conf $PKG/etc/kea/kea.conf.new
-mv $PKG/etc/kea/keactrl.conf $PKG/etc/kea/keactrl.conf.new
-
 mkdir -p $PKG/etc/rc.d
 cat $CWD/rc.kea > $PKG/etc/rc.d/rc.kea.new
 
+mkdir -p $PKG/etc/kea
+
+# Change configuration files to .new
+find $PKG/etc/kea/ -name *.conf | while read cfg ; do mv $cfg $cfg.new ; done
+
+rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la
+rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/kea/hooks/*.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
 
@@ -112,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/network/kea/kea.info b/network/kea/kea.info
index c70b7d4c1a..0949478dd9 100644
--- a/network/kea/kea.info
+++ b/network/kea/kea.info
@@ -1,8 +1,8 @@
 PRGNAM="kea"
-VERSION="1.2.0"
+VERSION="2.5.3"
 HOMEPAGE="http://kea.isc.org/"
-DOWNLOAD="http://ftp.isc.org/isc/kea/1.2.0/kea-1.2.0.tar.gz"
-MD5SUM="7e3f2b23052105c82991663261259c5b"
+DOWNLOAD="http://ftp.isc.org/isc/kea/2.5.3/kea-2.5.3.tar.gz"
+MD5SUM="3cd3fca641f542c5c908615c332404bf"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="log4cplus"
diff --git a/network/kea/rc.kea b/network/kea/rc.kea
index 2d57a1089b..b7214d2cf7 100644
--- a/network/kea/rc.kea
+++ b/network/kea/rc.kea
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 case "$1" in
 'start')
diff --git a/network/keepalived/doinst.sh b/network/keepalived/doinst.sh
index 7062d561a6..4c107ecd23 100644
--- a/network/keepalived/doinst.sh
+++ b/network/keepalived/doinst.sh
@@ -17,7 +17,7 @@ if [ -e etc/rc.d/rc.keepalived ]; then
   mv etc/rc.d/rc.keepalived.new.incoming etc/rc.d/rc.keepalived.new
 fi
 
-config etc/keepalived/keepalived.new
+config etc/default/keepalived.new
 config etc/keepalived/keepalived.conf.new
 config etc/rc.d/rc.keepalived.new
 
diff --git a/network/keepalived/keepalived.SlackBuild b/network/keepalived/keepalived.SlackBuild
index ba30febaa0..60f0426e58 100644
--- a/network/keepalived/keepalived.SlackBuild
+++ b/network/keepalived/keepalived.SlackBuild
@@ -1,8 +1,9 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for keepalived
 
 # Copyright 2010,2011 Nilton Moura, Rio de Janeiro, RJ, Brasil
+# Copyright 2020 Marek Wodzinski <majek@w7i.pl>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,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=keepalived
-VERSION=${VERSION:-1.2.19}
+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"
@@ -90,15 +101,19 @@ 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 \
-  AUTHOR ChangeLog CONTRIBUTORS COPYING INSTALL README TODO VERSION \
+  AUTHOR ChangeLog CONTRIBUTORS COPYING INSTALL README README.md TODO doc/NOTE_vrrp_vmac.txt \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-cp -a $PKG/etc/rc.d/init.d/keepalived $PKG/usr/doc/$PRGNAM-$VERSION/init.keepalived
 
-mv $PKG/etc/sysconfig/keepalived $PKG/etc/keepalived/keepalived.new
-mv $PKG/etc/keepalived/keepalived.conf $PKG/etc/keepalived/keepalived.conf.new
-install -m755 $CWD/rc.$PRGNAM $PKG/etc/rc.d/rc.$PRGNAM.new
-rm $PKG/etc/rc.d/init.d/keepalived
+mkdir -p $PKG/usr/share/snmp/mibs
+cp -a \
+  doc/KEEPALIVED-MIB.txt doc/VRRP-MIB.txt doc/VRRPv3-MIB.txt \
+  $PKG/usr/share/snmp/mibs
+
+mkdir -p $PKG/etc/default
+mv $PKG/etc/sysconfig/keepalived $PKG/etc/default/keepalived.new
+mv $PKG/etc/keepalived/keepalived.conf.sample $PKG/etc/keepalived/keepalived.conf.new
+install -m755 -D $CWD/rc.$PRGNAM $PKG/etc/rc.d/rc.$PRGNAM.new
 rmdir $PKG/etc/sysconfig
 
 mkdir -p $PKG/install
@@ -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/network/keepalived/keepalived.info b/network/keepalived/keepalived.info
index 46b10d9d4d..5c3c527b13 100644
--- a/network/keepalived/keepalived.info
+++ b/network/keepalived/keepalived.info
@@ -1,10 +1,10 @@
 PRGNAM="keepalived"
-VERSION="1.2.19"
-HOMEPAGE="http://www.keepalived.org/"
-DOWNLOAD="http://www.keepalived.org/software/keepalived-1.2.19.tar.gz"
-MD5SUM="5c98b06639dd50a6bff76901b53febb6"
+VERSION="2.2.8"
+HOMEPAGE="https://www.keepalived.org/"
+DOWNLOAD="https://www.keepalived.org/software/keepalived-2.2.8.tar.gz"
+MD5SUM="8c26f75a8767e5341d82696e1e717115"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Nilton Moura"
-EMAIL="nmoura@nmoura.eti.br"
+MAINTAINER="Marek Wodzinski"
+EMAIL="majek@w7i.pl"
diff --git a/network/keepalived/rc.keepalived b/network/keepalived/rc.keepalived
index 8e214e651a..fc063fa1fe 100644
--- a/network/keepalived/rc.keepalived
+++ b/network/keepalived/rc.keepalived
@@ -3,48 +3,31 @@
 # Startup script for the Keepalived daemon
 #
 # This is the modified version from the original for the
-# Slackware. The only thing that differs from the original
-# is the path of the Source configuration file. Before was
-# /etc/sysconfig and now is /etc/keepalived, and the header
-# for the update-rc.d of Debian was removed.
-# 
-# The original file was copied to
-# /usr/doc/keepalived-1.2.2/init.keepalived
+# Slackware.
 #
-# This version was modified by Nilton Moura, the author of
-# the SlackBuild Script for keepalived.
-
-# Source function library
-. /etc/rc.d/init.d/functions
+# This version was modified in 2010 by Nilton Moura,
+# the original author of the SlackBuild Script for keepalived.
+#
+# Sript simplified, removed dependency of optional sysvinit-functions
+# package and moved daemon options to /etc/default
+# in 2020 by Marek Wodzinski <majek@w7i.pl>
 
 # Source configuration file (we set KEEPALIVED_OPTIONS there)
-. /etc/keepalived/keepalived
-
-RETVAL=0
-
-prog="keepalived"
+. /etc/default/keepalived
 
 start() {
-    echo -n $"Starting $prog: "
-    daemon keepalived ${KEEPALIVED_OPTIONS}
-    RETVAL=$?
-    echo
-    [ $RETVAL -eq 0 ] && touch /var/lock/subsys/$prog
+    echo "Starting keepalived"
+    /usr/sbin/keepalived ${KEEPALIVED_OPTIONS}
 }
 
 stop() {
-    echo -n $"Stopping $prog: "
-    killproc keepalived
-    RETVAL=$?
-    echo
-    [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/$prog
+    echo "Stopping keepalived "
+    pkill -TERM keepalived 1>/dev/null 2>/dev/null
 }
 
 reload() {
-    echo -n $"Reloading $prog: "
-    killproc keepalived -1
-    RETVAL=$?
-    echo
+    echo "Reloading keepalived"
+    pkill -1  keepalived
 }
 
 # See how we were called.
@@ -62,18 +45,7 @@ case "$1" in
         stop
         start
         ;;
-    condrestart)
-        if [ -f /var/lock/subsys/$prog ]; then
-            stop
-            start
-        fi
-        ;;
-    status)
-        status keepalived
-        ;;
     *)
-        echo "Usage: $0 {start|stop|reload|restart|condrestart|status}"
+        echo "Usage: $0 {start|stop|reload|restart}"
         exit 1
 esac
-
-exit $RETVAL
diff --git a/network/kfilebox/README b/network/kfilebox/README
deleted file mode 100644
index efed42915b..0000000000
--- a/network/kfilebox/README
+++ /dev/null
@@ -1,6 +0,0 @@
-KFilebox (previously called KDropbox) is an unofficial KDE Dropbox 
-client developed in QT.  It offers almost the same features as the
-official Dropbox Linux application, but it works on KDE.
-
-If dropbox (the daemon) is not present, it can download it on the 
-first run if connected to the net.
diff --git a/network/kfilebox/doinst.sh b/network/kfilebox/doinst.sh
deleted file mode 100644
index 84ec0d4677..0000000000
--- a/network/kfilebox/doinst.sh
+++ /dev/null
@@ -1,16 +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
-
-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 -f usr/share/icons/oxygen >/dev/null 2>&1
-  fi
-fi
-
diff --git a/network/kfilebox/kfilebox.SlackBuild b/network/kfilebox/kfilebox.SlackBuild
deleted file mode 100644
index 867347559f..0000000000
--- a/network/kfilebox/kfilebox.SlackBuild
+++ /dev/null
@@ -1,93 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for kfilebox
-
-# Copyright (c) 2011 Alan Alberghini <414N@slacky.it>
-# 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.
-
-PRGNAM=kfilebox
-VERSION=${VERSION:-0.4.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"
-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 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
-
-qmake
-sed -i "s|-O2|${SLKCFLAGS}|" Makefile
-sed -i "s|-strip\ .*||" Makefile
-
-make
-make install INSTALL_ROOT=$PKG
-
-# Install a proper icon
-install -m 0644 -D $CWD/$PRGNAM.png $PKG/usr/share/pixmaps/$PRGNAM.png
-sed -i "s|/$PRGNAM/|/pixmaps/|" $PKG/usr/share/*/$PRGNAM.desktop
-rm -fr $PKG/usr/share/$PRGNAM
-
-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 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/network/kfilebox/kfilebox.info b/network/kfilebox/kfilebox.info
deleted file mode 100644
index dc763a2ff5..0000000000
--- a/network/kfilebox/kfilebox.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="kfilebox"
-VERSION="0.4.9"
-HOMEPAGE="http://kdropbox.deuteros.es/"
-DOWNLOAD="http://ponce.cc/slackware/sources/repo/kfilebox_0.4.9.tar.gz"
-MD5SUM="fdec6cd4c37a4c9d06325f89d3ed2ee1"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="dropbox"
-MAINTAINER="Alan Alberghini"
-EMAIL="414N@slacky.it"
diff --git a/network/kfilebox/kfilebox.png b/network/kfilebox/kfilebox.png
deleted file mode 100644
index 0f66f62f50..0000000000
--- a/network/kfilebox/kfilebox.png
+++ /dev/null
diff --git a/network/kfilebox/slack-desc b/network/kfilebox/slack-desc
deleted file mode 100644
index fde631773b..0000000000
--- a/network/kfilebox/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------------------------------------------------------|
-kfilebox: kfilebox (KDE Dropbox client)
-kfilebox:
-kfilebox: KFilebox (previously called KDropbox) is an unofficial KDE Dropbox
-kfilebox: client developed in QT.  It offers almost the same features as the
-kfilebox: official Dropbox Linux application, but it works on KDE.
-kfilebox:
-kfilebox: Homepage: http://kdropbox.deuteros.es/
-kfilebox:
-kfilebox:
-kfilebox:
-kfilebox:
diff --git a/network/kirc/README b/network/kirc/README
new file mode 100644
index 0000000000..385e39d23a
--- /dev/null
+++ b/network/kirc/README
@@ -0,0 +1,3 @@
+kirc (tiny IRC client)
+
+kirc is "KISS for IRC", a tiny IRC client written in POSIX C99.
diff --git a/network/kirc/kirc.SlackBuild b/network/kirc/kirc.SlackBuild
new file mode 100644
index 0000000000..1fcc027a58
--- /dev/null
+++ b/network/kirc/kirc.SlackBuild
@@ -0,0 +1,82 @@
+#!/bin/bash
+
+# Slackware build script for kirc
+
+# Written by B. Watson (urchlay@slackware.uk)
+
+# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
+
+# 20230711 bkw: update for v0.3.2.
+# 20230103 bkw: update for v0.3.1, fix PKGTYPE, strip binary.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=kirc
+VERSION=${VERSION:-0.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.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 {} \+
+
+# fix the man page header.
+sed -i "/^\\.TH/s, Linux .*, $PRGNAM-$VERSION SlackBuilds.org," $PRGNAM.1
+
+# 20230711 bkw: 0.3.2 has a derp in the Makefile that breaks 'make install'.
+sed -i '/^all:/s,clean,,' Makefile
+
+make CFLAGS="$SLKCFLAGS"
+strip $PRGNAM
+make install DESTDIR=$PKG PREFIX=/usr MANDIR=/usr/man
+gzip -9 $PKG/usr/man/man?/*.?
+
+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
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/network/kirc/kirc.info b/network/kirc/kirc.info
new file mode 100644
index 0000000000..aa1a7fb26b
--- /dev/null
+++ b/network/kirc/kirc.info
@@ -0,0 +1,10 @@
+PRGNAM="kirc"
+VERSION="0.3.2"
+HOMEPAGE="https://github.com/mcpcpc/kirc"
+DOWNLOAD="https://github.com/mcpcpc/kirc/archive/0.3.2/kirc-0.3.2.tar.gz"
+MD5SUM="09eb7e9e261f18e1d7823d689d0f04a9"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="B. Watson"
+EMAIL="urchlay@slackware.uk"
diff --git a/network/kirc/slack-desc b/network/kirc/slack-desc
new file mode 100644
index 0000000000..6b955db8bb
--- /dev/null
+++ b/network/kirc/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+    |-----handy-ruler------------------------------------------------------|
+kirc: kirc (tiny IRC client)
+kirc:
+kirc: kirc is "KISS for IRC", a tiny IRC client written in POSIX C99.
+kirc:
+kirc:
+kirc:
+kirc:
+kirc:
+kirc:
+kirc:
+kirc:
diff --git a/network/kismet/kismet.SlackBuild b/network/kismet/kismet.SlackBuild
index 447db15f77..31c32c7fa4 100644
--- a/network/kismet/kismet.SlackBuild
+++ b/network/kismet/kismet.SlackBuild
@@ -1,10 +1,11 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for kismet
 
 # Copyright 2007 Robby Workman <rworkman@slackbuilds.org>
 # Copyright 2010 Antonio Hernández Blas <hba.nihilismus@gmail.com>
 # Copyright 2013-2017 Audrius Kažukauskas <audrius@neutrino.lt>
+# Copyright 2022 pyllyukko
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,12 +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=kismet
-VERSION=${VERSION:-2016_07_R1}
-BUILD=${BUILD:-1}
+VERSION=${VERSION:-2023.07.R1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
-
-SRCVERSION=$(echo $VERSION | tr _ -)
+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}
@@ -51,7 +60,7 @@ elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
+  SLKCFLAGS="-O2 -fPIC -fPIE -pie -Wl,-z,relro,-z,now -fstack-protector-all --param=ssp-buffer-size=4 -D_FORTIFY_SOURCE=2"
   LIBDIRSUFFIX="64"
 else
   SLKCFLAGS="-O2"
@@ -73,11 +82,10 @@ set -eu
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$VERSION
+rm -rf $PRGNAM-${VERSION//./-}
 
-tar xvf $CWD/$PRGNAM-$SRCVERSION.tar.xz
-mv $PRGNAM-$SRCVERSION $PRGNAM-$VERSION
-cd $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-${VERSION//./-}.tar.xz
+cd $PRGNAM-${VERSION//./-}
 
 chown -R root:root .
 find -L . \
@@ -106,11 +114,8 @@ make plugins-install MANGRP=root 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 CHANGELOG README RELEASENOTES.txt $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a LICENSE README.OLD README.SSL README.md $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
@@ -124,4 +129,4 @@ for file in $(find $PKG/etc -type f) ; do
 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/network/kismet/kismet.info b/network/kismet/kismet.info
index 2d0c322ada..93aae74af6 100644
--- a/network/kismet/kismet.info
+++ b/network/kismet/kismet.info
@@ -1,10 +1,10 @@
 PRGNAM="kismet"
-VERSION="2016_07_R1"
+VERSION="2023.07.R1"
 HOMEPAGE="https://kismetwireless.net/"
-DOWNLOAD="https://kismetwireless.net/code/kismet-2016-07-R1.tar.xz"
-MD5SUM="7fa6e86c5078a0e7d91fc9bf954c5107"
+DOWNLOAD="https://www.kismetwireless.net/code/kismet-2023-07-R1.tar.xz"
+MD5SUM="d6c82b241de1be72d2dcb5e0102d8c99"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Audrius Kažukauskas"
-EMAIL="audrius@neutrino.lt"
+REQUIRES="libwebsockets protobuf-c"
+MAINTAINER="pyllyukko"
+EMAIL="pyllyukko@maimed.org"
diff --git a/network/kivy-garden/README b/network/kivy-garden/README
index 423779d7a7..44164d85a8 100644
--- a/network/kivy-garden/README
+++ b/network/kivy-garden/README
@@ -1,2 +1,2 @@
-Kivy garden installation script, split into its own package for convenient use
-in buildozer.
+Kivy garden installation script, split into its own package for
+convenient use in buildozer.
diff --git a/network/kivy-garden/kivy-garden.SlackBuild b/network/kivy-garden/kivy-garden.SlackBuild
index ee7b08feb1..12181a1edd 100644
--- a/network/kivy-garden/kivy-garden.SlackBuild
+++ b/network/kivy-garden/kivy-garden.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for kivy-garden
 
-# Copyright 2017  Dimitris Zlatanidis  Orestiada, Greece
+# Copyright 2017-2022  Dimitris Zlatanidis  Orestiada, Greece
 # 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=kivy-garden
 SRCNAM=$( echo $PRGNAM | cut -c6-11)
-VERSION=${VERSION:-0.1.4}
+VERSION=${VERSION:-0.1.5}
 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}
@@ -61,7 +71,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $SRCNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
 cd $SRCNAM-$VERSION
 chown -R root:root .
 find -L . \
@@ -73,9 +83,9 @@ find -L . \
 # Remove unused
 sed -i "s/, 'bin\/garden.bat'//" setup.py
 # Update message for Slackware users
-sed -i -e "23d" -e "s/require requests/require python-requests/" bin/$SRCNAM
+sed -i "23d" bin/$SRCNAM
 
-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
@@ -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/network/kivy-garden/kivy-garden.info b/network/kivy-garden/kivy-garden.info
index a906c423d1..5873c2cdc9 100644
--- a/network/kivy-garden/kivy-garden.info
+++ b/network/kivy-garden/kivy-garden.info
@@ -1,10 +1,10 @@
 PRGNAM="kivy-garden"
-VERSION="0.1.4"
+VERSION="0.1.5"
 HOMEPAGE="https://github.com/kivy-garden/garden"
-DOWNLOAD="https://pypi.python.org/packages/7d/68/decaee596ff8168a39432eb3949fc7c0be952ebb9467806823bffc165d48/kivy-garden-0.1.4.tar.gz"
-MD5SUM="069b94c5a05e5b018ee7e7c2f10630db"
+DOWNLOAD="https://github.com/kivy-garden/garden/archive/v0.1.5/garden-0.1.5.tar.gz"
+MD5SUM="6c16edba32e897d65193b61638b96222"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="python-requests"
+REQUIRES=""
 MAINTAINER="Dimitris Zlatanidis"
 EMAIL="d.zlatanidis@gmail.com"
diff --git a/network/kmess/README b/network/kmess/README
deleted file mode 100644
index f04f2e181b..0000000000
--- a/network/kmess/README
+++ /dev/null
@@ -1,5 +0,0 @@
-KMess is an alternative Live Messenger chat client for Linux.
-It allows Linux users to chat with friends who use Live Messenger in 
-Windows or Mac OS.  The strength of KMess is it's integration with the 
-KDE desktop environment, it focus on Messenger-specific features, and 
-an easy-to-use interface.
diff --git a/network/kmess/giflib-5.0.patch b/network/kmess/giflib-5.0.patch
deleted file mode 100644
index cc568fdf8a..0000000000
--- a/network/kmess/giflib-5.0.patch
+++ /dev/null
@@ -1,95 +0,0 @@
---- contrib/isf-qt/src/isfqt.cpp.orig	2014-06-11 13:10:43.137321400 +0000
-+++ contrib/isf-qt/src/isfqt.cpp	2014-06-11 13:12:23.123474616 +0000
-@@ -249,7 +249,7 @@
-     qWarning() << "Couldn't initialize GIF library!";
-   }
- 
--  DGifCloseFile( gifImage );
-+  DGifCloseFile( gifImage, NULL );
-   gifData.close();
- */
- 
-@@ -484,12 +484,13 @@
-   int             width     = isfImage.width();
-   int             numColors = 0;
-   bool            gifError  = true;
-+  int             gifErrCode;
- 
-   // Convert the image to GIF using libgif
- 
-   // Open the gif file
-   gifData.open( QIODevice::WriteOnly );
--  gifImage = EGifOpen( (void*)&gifData, GifWriteToByteArray );
-+  gifImage = EGifOpen( (void*)&gifData, GifWriteToByteArray, &gifErrCode );
-   if( gifImage == 0 )
-   {
-     qWarning() << "Couldn't initialize gif library!";
-@@ -503,7 +504,7 @@
-     numColors = 256;
-   }
- 
--  cmap = MakeMapObject( numColors, NULL );
-+  cmap = GifMakeMapObject( numColors, NULL );
-   if( cmap == 0 && isfImage.numColors() > 1 )
-   {
-     qWarning() << "Couldn't create map object for gif conversion (colors:" << isfImage.numColors() << ")!";
-@@ -576,7 +577,7 @@
-   else
-   {
-     // Write the extension
--    if( EGifPutExtensionFirst( gifImage, COMMENT_EXT_FUNC_CODE, MAX_GIF_BYTE, isfData.left( MAX_GIF_BYTE ).data() ) == GIF_ERROR )
-+    if( EGifPutExtensionLeader( gifImage, COMMENT_EXT_FUNC_CODE) == GIF_ERROR )
-     {
-       qWarning() << "EGifPutExtensionFirst failed!";
-       goto writeError;
-@@ -590,9 +591,9 @@
-     // Write all the full data blocks
-     while( length >= MAX_GIF_BYTE )
-     {
--      if( EGifPutExtensionNext( gifImage, 0, MAX_GIF_BYTE, isfData.mid( pos, MAX_GIF_BYTE ).data() ) == GIF_ERROR )
-+      if( EGifPutExtensionBlock( gifImage, MAX_GIF_BYTE, isfData.mid( pos, MAX_GIF_BYTE ).data() ) == GIF_ERROR )
-       {
--        qWarning() << "EGifPutExtensionNext failed!";
-+        qWarning() << "EGifPutExtensionBlock failed!";
-         goto writeError;
-       }
- 
-@@ -603,17 +604,17 @@
-     // Write the last block
-     if( length > 0 )
-     {
--      if( EGifPutExtensionLast( gifImage, 0, length, isfData.mid( pos, MAX_GIF_BYTE ).data() ) == GIF_ERROR )
-+      if( EGifPutExtensionTrailer( gifImage ) == GIF_ERROR )
-       {
--        qWarning() << "EGifPutExtensionLast (n) failed!";
-+        qWarning() << "EGifPutExtensionTrailer (n) failed!";
-         goto writeError;
-       }
-     }
-     else
-     {
--      if( EGifPutExtensionLast( gifImage, 0, 0, 0 ) == GIF_ERROR )
-+      if( EGifPutExtensionTrailer( gifImage ) == GIF_ERROR )
-       {
--        qWarning() << "EGifPutExtensionLast (0) failed!";
-+        qWarning() << "EGifPutExtensionTrailer (0) failed!";
-         goto writeError;
-       }
-     }
-@@ -623,13 +624,13 @@
- 
- writeError:
-   // Clean up the GIF converter etc
--  EGifCloseFile( gifImage );
--  FreeMapObject( cmap );
-+  EGifCloseFile( gifImage, NULL );
-+  GifFreeMapObject( cmap );
-   gifData.close();
- 
-   if( gifError )
-   {
--    qWarning() << "GIF error code:" << GifLastError();
-+    qWarning() << "GIF error code:" << GifErrorString(gifErrCode);
-   }
-   else
-   {
diff --git a/network/kmess/kmess.SlackBuild b/network/kmess/kmess.SlackBuild
deleted file mode 100644
index 27c6a9e73b..0000000000
--- a/network/kmess/kmess.SlackBuild
+++ /dev/null
@@ -1,100 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for kmess
-
-# Copyright 2008-2009  Tarantino Antonino <metrofox9@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=kmess
-VERSION=${VERSION:-2.0.6.2}
-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
-
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -fr $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 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
-
-# Fix for building with new giflib (thanks to Arch)
-patch -p1 contrib/isf-qt/src/isfqt.cpp < $CWD/giflib-5.0.patch
-
-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 ..
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
-  AUTHORS COPYING ChangeLog FEATURES INSTALL NEWS README TODO \
-  $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-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/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/network/kmess/kmess.info b/network/kmess/kmess.info
deleted file mode 100644
index 51a7e19d01..0000000000
--- a/network/kmess/kmess.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="kmess"
-VERSION="2.0.6.2"
-HOMEPAGE="http://kmess.org/"
-DOWNLOAD="http://downloads.sourceforge.net/kmess/kmess-2.0.6.2.tar.bz2"
-MD5SUM="a2e57911713308bef81b9347135cc5dd"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Tarantino Antonino"
-EMAIL="metrofox9@gmail.com"
diff --git a/network/kmess/slack-desc b/network/kmess/slack-desc
deleted file mode 100644
index 7bced9d9c3..0000000000
--- a/network/kmess/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------------------------------------------------------|
-kmess: kmess (MSN Messenger client)
-kmess:
-kmess: KMess is a MSN Messenger client for Linux. It enables Linux users
-kmess: to chat with friends online who are using MSN Messenger in Windows
-kmess: or Mac OS. The strength of KMess is it's integration with the KDE
-kmess: desktop environment, focus on MSN Messenger specific features and
-kmess: an easy-to-use interface.
-kmess:
-kmess:
-kmess:
-kmess:
diff --git a/network/knemo/README b/network/knemo/README
deleted file mode 100644
index 9f9867762e..0000000000
--- a/network/knemo/README
+++ /dev/null
@@ -1,8 +0,0 @@
-kNemo (KDE Network Monitor) offers a network monitor similar to the one
-found in Windows.  It displays for every network interface an icon in
-the systray.  Tooltips and an info dialog provide further information
-about the interface.  Passive popups inform about interface changes.
-A traffic plotter is also integrated.
-
-knemo polls the network interface status every second using the ifconfig,
-route, and iwconfig.
diff --git a/network/knemo/doinst.sh b/network/knemo/doinst.sh
deleted file mode 100644
index 4a25de5e6f..0000000000
--- a/network/knemo/doinst.sh
+++ /dev/null
@@ -1,10 +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/network/knemo/knemo.SlackBuild b/network/knemo/knemo.SlackBuild
deleted file mode 100644
index a8e7b2cfc6..0000000000
--- a/network/knemo/knemo.SlackBuild
+++ /dev/null
@@ -1,85 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for: knemo
-# Written by: Michiel van Wessem (BP{k}) <michiel@slackbuilds.org>
-# Modified by the SlackBuilds.org project
-# Update by: Andre Barboza <bmg.andre@gmail.com>
-
-set -e
-
-PRGNAM=knemo
-VERSION=${VERSION:-0.7.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}
-
-DOCFILES="AUTHORS COPYING ChangeLog INSTALL README"
-
-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 $TMP/$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
-  cmake \
-    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
-    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON \
-    ..
-
-  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 $DOCFILES $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 644 {} \;
-
-mkdir $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/network/knemo/knemo.info b/network/knemo/knemo.info
deleted file mode 100644
index 8e1fc3d12b..0000000000
--- a/network/knemo/knemo.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="knemo"
-VERSION="0.7.7"
-HOMEPAGE="https://www.kde.org/applications/internet/knemo/"
-DOWNLOAD="https://github.com/KDE/knemo/archive/v0.7.7/knemo-0.7.7.tar.gz"
-MD5SUM="e9967dc4ecbb0c25c9a6e18f96e4679c"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Andre Barboza"
-EMAIL="bmg.andre@gmail.com"
diff --git a/network/knemo/slack-desc b/network/knemo/slack-desc
deleted file mode 100644
index 31a69bf079..0000000000
--- a/network/knemo/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------------------------------------------------------|
-knemo: knemo (KDE Network Monitor)
-knemo:
-knemo: KNemo offers a network monitor similar to the one found in Windows. It
-knemo: displays for every network interface an icon in the systray. Tooltips
-knemo: and an info dialog provide further information about the interface.
-knemo: Passive popups inform about interface changes. A traffic plotter is
-knemo: also integrated.
-knemo:
-knemo: knemo polls the network interface status every second using the
-knemo: ifconfig, route and iwconfig too
-knemo:
diff --git a/network/knock/README b/network/knock/README
index 1af140baea..c439f9ced4 100644
--- a/network/knock/README
+++ b/network/knock/README
@@ -1,10 +1,9 @@
-Knockd and knock are a port-knock server and client, respectively. Knockd 
-listens to all traffic on an ethernet (or PPP) interface, looking for 
-special "knock" sequences of port-hits. A client makes these port-hits 
-by sending a TCP (or UDP) packet to a port on the server. This port 
-need not be open -- since knockd listens at the link-layer level, it 
-sees all traffic even if it's destined for a closed port. When the 
-server detects a specific sequence of port-hits, it runs a command 
-defined in its configuration file. This can be used to open up holes in 
-a firewall for quick access.
-
+Knockd and knock are a port-knock server and client,
+respectively. Knockd listens to all traffic on an ethernet (or PPP)
+interface, looking for special "knock" sequences of port-hits. A
+client makes these port-hits by sending a TCP (or UDP) packet to a
+port on the server. This port need not be open -- since knockd listens
+at the link-layer level, it sees all traffic even if it's destined
+for a closed port. When the server detects a specific sequence of
+port-hits, it runs a command defined in its configuration file. This
+can be used to open up holes in a firewall for quick access.
diff --git a/network/knock/knock.SlackBuild b/network/knock/knock.SlackBuild
index eeb481a019..aa49efa71e 100644
--- a/network/knock/knock.SlackBuild
+++ b/network/knock/knock.SlackBuild
@@ -1,29 +1,39 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for knock(d)
 
 # Written by Joey Trungale joey@trungale.net
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=knock
-VERSION=${VERSION:-0.5}
+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"
@@ -46,10 +56,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 {} \;
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -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" \
@@ -63,16 +73,14 @@ CXXFLAGS="$SLKCFLAGS" \
 make
 make 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
 
-( 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 COPYING README ChangeLog TODO $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a COPYING README.md ChangeLog TODO $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 cat $PKG/etc/knockd.conf > $PKG/usr/doc/$PRGNAM-$VERSION/knockd.conf
 mv $PKG/etc/knockd.conf $PKG/etc/knockd.conf.new
@@ -85,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/network/knock/knock.info b/network/knock/knock.info
index 8274f4fce1..6845299aa4 100644
--- a/network/knock/knock.info
+++ b/network/knock/knock.info
@@ -1,8 +1,8 @@
 PRGNAM="knock"
-VERSION="0.5"
+VERSION="0.7"
 HOMEPAGE="http://www.zeroflux.org"
-DOWNLOAD="http://www.zeroflux.org/proj/knock/files/knock-0.5.tar.gz"
-MD5SUM="ca09d61458974cff90a700aba6120891"
+DOWNLOAD="http://www.zeroflux.org/proj/knock/files/knock-0.7.tar.gz"
+MD5SUM="cb6373fd4ccb42eeca3ff406b7fdb8a7"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/network/kobby/README b/network/kobby/README
deleted file mode 100644
index 147678d93d..0000000000
--- a/network/kobby/README
+++ /dev/null
@@ -1,4 +0,0 @@
-kobby is a collaborative editor for KDE similar to gobby.
-
-Note: the "inifinoted" daemon, required for collaborative sessions, is
-included with the libinfinity Slackbuild.
diff --git a/network/kobby/doinst.sh b/network/kobby/doinst.sh
deleted file mode 100644
index 4e8ba7071d..0000000000
--- a/network/kobby/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/network/kobby/kobby.SlackBuild b/network/kobby/kobby.SlackBuild
deleted file mode 100644
index 944183e428..0000000000
--- a/network/kobby/kobby.SlackBuild
+++ /dev/null
@@ -1,82 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for kobby, GooseYArd@gmail.com
-
-PRGNAM=kobby
-VERSION=${VERSION:-20110501_2f61f86}
-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.?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 {} \;
-
-# Fix for glib>=2.31
-sed -i "s|/gerror||" kobby/editor/documentbuilder.cpp kobby/editor/connection.h
-
-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 | 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 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/network/kobby/kobby.info b/network/kobby/kobby.info
deleted file mode 100644
index f53f5dae2a..0000000000
--- a/network/kobby/kobby.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="kobby"
-VERSION="20110501_2f61f86"
-HOMEPAGE="https://sites.google.com/site/kobbyeditor/"
-DOWNLOAD="http://ponce.cc/slackware/sources/repo/kobby-20110501_2f61f86.tar.xz"
-MD5SUM="303e67266a9426b59cef945698b3b9ea"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="libqinfinity"
-MAINTAINER="Andy Bailey"
-EMAIL="GooseYArd@gmail.com"
diff --git a/network/kobby/slack-desc b/network/kobby/slack-desc
deleted file mode 100644
index c6e6d6446d..0000000000
--- a/network/kobby/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------------------------------------------------------|
-kobby: kobby (collaborative editor)
-kobby:
-kobby: kobby is a collaborative editor for KDE similar to gobby.
-kobby:
-kobby: Homepage: https://sites.google.com/site/kobbyeditor/
-kobby:
-kobby:
-kobby:
-kobby:
-kobby:
-kobby:
diff --git a/network/konversation/README b/network/konversation/README
deleted file mode 100644
index bdf71648f9..0000000000
--- a/network/konversation/README
+++ /dev/null
@@ -1,7 +0,0 @@
-Konversation is an Internet Relay Chat (IRC) client for KDE.
-
-Konversation features include:
-* integration of Konsole (using the KPart technology)
-* interaction with KAddressBook   * themable nicklist icons
-* OSD (On Screen Display)         * IPv6 support 
-* multiserver support             * [Secure Sockets Layer|SSL]]
diff --git a/network/konversation/doinst.sh b/network/konversation/doinst.sh
deleted file mode 100644
index 4a25de5e6f..0000000000
--- a/network/konversation/doinst.sh
+++ /dev/null
@@ -1,10 +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/network/konversation/konversation.SlackBuild b/network/konversation/konversation.SlackBuild
deleted file mode 100644
index 3300a2b817..0000000000
--- a/network/konversation/konversation.SlackBuild
+++ /dev/null
@@ -1,103 +0,0 @@
-#!/bin/sh
-
-# SlackBuild script for konversation
-
-# Copyright 2007-2014  Michiel van Wessem, Leicester, United Kingdom
-# 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=konversation
-VERSION=${VERSION:-1.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}
-
-SRC_VERSION=$(echo $VERSION | tr _ -)
-
-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-$SRC_VERSION
-tar xvf $CWD/$PRGNAM-$SRC_VERSION.tar.xz
-cd $PRGNAM-$SRC_VERSION
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 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} \
-    -DMAN_INSTALL_DIR=/usr/man \
-    -DCMAKE_BUILD_TYPE=Release ..
-
-  make VERBOSE=1
-  make install VERBOSE=1 DESTDIR=$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
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS COPYING* ChangeLog INSTALL README TODO \
-  $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
-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/network/konversation/konversation.info b/network/konversation/konversation.info
deleted file mode 100644
index 7c1aba386c..0000000000
--- a/network/konversation/konversation.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="konversation"
-VERSION="1.5"
-HOMEPAGE="https://konversation.kde.org"
-DOWNLOAD="https://download.kde.org/stable/konversation/1.5/src/konversation-1.5.tar.xz"
-MD5SUM="c65c97012854f334d87b3a8df32b38f1"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Michiel van Wessem"
-EMAIL="michiel@slackbuilds.org"
diff --git a/network/konversation/slack-desc b/network/konversation/slack-desc
deleted file mode 100644
index a353822169..0000000000
--- a/network/konversation/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------------------------------------------------------|
-konversation: konversation (KDE IRC client)
-konversation:
-konversation: Konversation is a user-friendly and highly configurable
-konversation: Internet Relay Chat client for KDE.
-konversation:
-konversation: Konversation has support for standard IRC features, SSL server
-konversation: support, bookmarking support, multiple identities for different
-konversation: servers, theme support, and much more.
-konversation:
-konversation: Homepage: http://konversation.kde.org/
-konversation:
diff --git a/network/krb5/EXPORT b/network/krb5/EXPORT
deleted file mode 100644
index d868a9e27e..0000000000
--- a/network/krb5/EXPORT
+++ /dev/null
@@ -1,13 +0,0 @@
-EXPORT LAW WARNINGS:
-
-    * Export of this software from the United States of America may be
-subject to the Export Administration Regulations of the United States
-Department of Commerce, currently (October 2003) codified as Title 15
-CFR Parts 730-774.
-    * You are responsible for complying with all applicable export
-regulations, including obtaining an export license if required.
-    * You may not download this software if you are located in, or are
-a citizen or national of, any country for which the US government
-prohibits the export of encryption source code, currently (October
-2003) Cuba, Iran, Iraq, Libya, North Korea, Sudan, or Syria. (15 CFR
-Sections 734(b)(3), 740.13(e)(4)) 
diff --git a/network/krb5/README b/network/krb5/README
deleted file mode 100644
index 2058088316..0000000000
--- a/network/krb5/README
+++ /dev/null
@@ -1,10 +0,0 @@
-Kerberos is a network authentication protocol. It is designed to
-provide strong authentication for client/server applications by using
-secret-key cryptography. A free implementation of this protocol is
-available from the Massachusetts Institute of Technology. Kerberos is
-available in many commercial products as well.
-
-Note:
-We provide 2 RC scripts that you can use for your own usage:
-- rc.kadmind: Kerberos KADM5 administration server init script
-- rc.krb5kdc: Kerberos V5 KDC init script
diff --git a/network/krb5/README.krb5 b/network/krb5/README.krb5
deleted file mode 100644
index 72c522b6a7..0000000000
--- a/network/krb5/README.krb5
+++ /dev/null
@@ -1,52 +0,0 @@
-Kerberos is a network authentication protocol. It is designed to
-provide strong authentication for client/server applications by using
-secret-key cryptography. A free implementation of this protocol is
-available from the Massachusetts Institute of Technology. Kerberos is
-available in many commercial products as well.
-
-The Internet is an insecure place. Many of the protocols used in the
-Internet do not provide any security. Tools to "sniff" passwords off
-of the network are in common use by malicious hackers. Thus,
-applications which send an unencrypted password over the network are
-extremely vulnerable. Worse yet, other client/server applications rely
-on the client program to be "honest" about the identity of the user
-who is using it. Other applications rely on the client to restrict its
-activities to those which it is allowed to do, with no other
-enforcement by the server.
-
-Some sites attempt to use firewalls to solve their network security
-problems. Unfortunately, firewalls assume that "the bad guys" are on
-the outside, which is often a very bad assumption. Most of the really
-damaging incidents of computer crime are carried out by insiders.
-Firewalls also have a significant disadvantage in that they restrict
-how your users can use the Internet. (After all, firewalls are simply
-a less extreme example of the dictum that there is nothing more secure
-then a computer which is not connected to the network --- and powered
-off!) In many places, these restrictions are simply unrealistic and
-unacceptable.
-
-Kerberos was created by MIT as a solution to these network security
-problems. The Kerberos protocol uses strong cryptography so that a
-client can prove its identity to a server (and vice versa) across an
-insecure network connection. After a client and server has used
-Kerberos to prove their identity, they can also encrypt all of their
-communications to assure privacy and data integrity as they go about
-their business.
-
-Kerberos is freely available from MIT, under copyright permissions
-very similar those used for the BSD operating system and the X Window
-System. MIT provides Kerberos in source form so that anyone who wishes
-to use it may look over the code for themselves and assure themselves
-that the code is trustworthy. In addition, for those who prefer to
-rely on a professionally supported product, Kerberos is available as a
-product from many different vendors.
-
-In summary, Kerberos is a solution to your network security problems.
-It provides the tools of authentication and strong cryptography over
-the network to help you secure your information systems across your
-entire enterprise. We hope you find Kerberos as useful as it has been
-to us. At MIT, Kerberos has been invaluable to our
-Information/Technology architecture.
-
-Additional information is available from the MIT Kerberos website:
-http://web.mit.edu/kerberos/
diff --git a/network/krb5/doinst.sh b/network/krb5/doinst.sh
deleted file mode 100644
index db0a05b7e2..0000000000
--- a/network/krb5/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/rc.d/rc.krb5kdc.new
-preserve_perms etc/rc.d/rc.kadmind.new
diff --git a/network/krb5/krb5.SlackBuild b/network/krb5/krb5.SlackBuild
deleted file mode 100644
index 2b36a56c7f..0000000000
--- a/network/krb5/krb5.SlackBuild
+++ /dev/null
@@ -1,110 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for krb5
-
-# Copyright (c) 2009, Tom Canich, State College, Pennsylvania, USA
-# Copyright 2015-2019 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=krb5
-VERSION=${VERSION:-1.17}
-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
-
-sed -i "/KRB5ROOT=/s/\/local//" src/util/ac_check_krb5.m4
-
-cd src
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-CPPFLAGS+=" -I/usr/include/et" \
-./configure \
-  --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --sysconfdir=/etc \
-  --localstatedir=/var \
-  --mandir=/usr/man \
-  --enable-dns-for-realm \
-  --with-ldap \
-  --with-system-et \
-  --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
-
-# Add init scripts
-mkdir -p $PKG/etc/rc.d
-cat $CWD/rc.krb5kdc > $PKG/etc/rc.d/rc.krb5kdc.new
-cat $CWD/rc.kadmind > $PKG/etc/rc.d/rc.kadmind.new
-
-rm -rf $PKG/usr/man/cat{1,5,8}
-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 $CWD/README $CWD/README.krb5 $CWD/EXPORT $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-chown -R root:root $PKG/usr/doc
-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/network/krb5/krb5.info b/network/krb5/krb5.info
deleted file mode 100644
index d522a28c5d..0000000000
--- a/network/krb5/krb5.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="krb5"
-VERSION="1.17"
-HOMEPAGE="http://web.mit.edu/kerberos/"
-DOWNLOAD="http://web.mit.edu/kerberos/dist/krb5/1.17/krb5-1.17.tar.gz"
-MD5SUM="3b729d89eb441150e146780c4138481b"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Willy Sudiarto Raharjo"
-EMAIL="willysr@slackbuilds.org"
diff --git a/network/krb5/rc.kadmind b/network/krb5/rc.kadmind
deleted file mode 100644
index 5a5633f1ee..0000000000
--- a/network/krb5/rc.kadmind
+++ /dev/null
@@ -1,54 +0,0 @@
-#!/bin/sh
-#
-# Kerberos KADM5 administration server init script
-#
-# Copyright (C) 2017 Jason Graham <jgraha8@gmail.com>
-#
-
-# Start kadmind:
-kadmind_start() {
-    CMDLINE="/usr/sbin/kadmind"
-    echo -n "Starting kadmind:  $CMDLINE"
-    $CMDLINE
-    echo
-}
-
-# Stop kadmind:
-kadmind_stop() {
-    echo "Stopping kadmind..."
-    killall -e -q kadmind
-}
-
-# Restart kadmind:
-kadmind_restart() {
-    kadmind_stop
-    sleep 1
-    kadmind_start
-}
-
-# Check if kadmind is running
-kadmind_status() {
-    if [ ! -z "$(ps -e -o command | grep -E -w [/]usr/sbin/kadmind)" ]; then
-	echo "kadmind is running."
-    else 
-	echo "kadmind is stopped."
-	exit 1
-    fi
-}
-
-case "$1" in
-    'start')
-	kadmind_start
-	;;
-    'stop')
-	kadmind_stop
-	;;
-    'restart')
-	kadmind_restart
-	;;
-    'status')
-	kadmind_status
-	;;
-    *)
-	echo "usage $0 start|stop|restart|status"
-esac
diff --git a/network/krb5/rc.krb5kdc b/network/krb5/rc.krb5kdc
deleted file mode 100644
index 6829e12ab5..0000000000
--- a/network/krb5/rc.krb5kdc
+++ /dev/null
@@ -1,54 +0,0 @@
-#!/bin/sh
-#
-# Kerberos V5 KDC init script
-#
-# Copyright (C) 2017 Jason Graham <jgraha8@gmail.com>
-#
-
-# Start krb5kdc:
-krb5kdc_start() {
-    CMDLINE="/usr/sbin/krb5kdc"
-    echo -n "Starting krb5kdc:  $CMDLINE"
-    $CMDLINE
-    echo
-}
-
-# Stop krb5kdc:
-krb5kdc_stop() {
-    echo "Stopping krb5kdc..."
-    killall -e -q krb5kdc
-}
-
-# Restart krb5kdc:
-krb5kdc_restart() {
-    krb5kdc_stop
-    sleep 1
-    krb5kdc_start
-}
-
-# Check if krb5kdc is running
-krb5kdc_status() {
-    if [ ! -z "$(ps -e -o command | grep -E -w [/]usr/sbin/krb5kdc)" ]; then
-	echo "krb5kdc is running."
-    else
-	echo "krb5kdc is stopped."
-	exit 1
-    fi
-}
-
-case "$1" in
-    'start')
-	krb5kdc_start
-	;;
-    'stop')
-	krb5kdc_stop
-	;;
-    'restart')
-	krb5kdc_restart
-	;;
-    'status')
-	krb5kdc_status
-	;;
-    *)
-	echo "usage $0 start|stop|restart|status"
-esac
diff --git a/network/krb5/slack-desc b/network/krb5/slack-desc
deleted file mode 100644
index 6b5ce3e43e..0000000000
--- a/network/krb5/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------------------------------------------------------|
-krb5: krb5 (network authentication protocol)
-krb5:
-krb5: Kerberos is a network authentication protocol. It is designed to
-krb5: provide strong authentication for client/server applications by using
-krb5: secret-key cryptography. A free implementation of this protocol is
-krb5: available from the Massachusetts Institute of Technology. Kerberos is
-krb5: available in many commercial products as well.
-krb5:
-krb5: Homepage: http://web.mit.edu/kerberos/
-krb5:
-krb5:
diff --git a/network/kstart/kstart.SlackBuild b/network/kstart/kstart.SlackBuild
index cfc31434c2..7836d652b4 100644
--- a/network/kstart/kstart.SlackBuild
+++ b/network/kstart/kstart.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for kstart
 
-# Copyright 2019 Thibaut Notteboom, Paris, FRANCE
+# Copyright 2019-2022 Thibaut Notteboom, Paris, 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=kstart
-VERSION=${VERSION:-4.2}
+VERSION=${VERSION:-4.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}
@@ -87,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 -a LICENSE NEWS README TODO $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a LICENSE NEWS README 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/network/kstart/kstart.info b/network/kstart/kstart.info
index 4046723a73..a5db550242 100644
--- a/network/kstart/kstart.info
+++ b/network/kstart/kstart.info
@@ -1,10 +1,10 @@
 PRGNAM="kstart"
-VERSION="4.2"
+VERSION="4.3"
 HOMEPAGE="http://www.eyrie.org/~eagle/software/kstart/"
-DOWNLOAD="http://archives.eyrie.org/software/kerberos/kstart-4.2.tar.gz"
-MD5SUM="3386a891f462e90108f77f520895d9e7"
+DOWNLOAD="http://archives.eyrie.org/software/kerberos/kstart-4.3.tar.gz"
+MD5SUM="029a57f503099263bf67688343cebf89"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="krb5"
+REQUIRES=""
 MAINTAINER="Thibaut Notteboom"
 EMAIL="thibaut.notteboom@gmail.com"
diff --git a/network/kubectl/README b/network/kubectl/README
new file mode 100644
index 0000000000..d5226f1078
--- /dev/null
+++ b/network/kubectl/README
@@ -0,0 +1,2 @@
+Kubectl is a command line interface for running commands against
+Kubernetes clusters.
diff --git a/network/kubectl/kubectl.SlackBuild b/network/kubectl/kubectl.SlackBuild
new file mode 100644
index 0000000000..be5873b911
--- /dev/null
+++ b/network/kubectl/kubectl.SlackBuild
@@ -0,0 +1,96 @@
+#!/bin/bash
+
+# Slackware build script for kubectl
+
+# Copyright 2019-2022  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=kubectl
+VERSION=${VERSION:-1.23.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
+mkdir $PRGNAM-$VERSION
+cp $CWD/$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 {} \;
+
+mkdir -p $PKG/usr/bin
+install -D -m755 $PRGNAM $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
+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/network/kubectl/kubectl.info b/network/kubectl/kubectl.info
new file mode 100644
index 0000000000..80aa1d0e5e
--- /dev/null
+++ b/network/kubectl/kubectl.info
@@ -0,0 +1,10 @@
+PRGNAM="kubectl"
+VERSION="1.23.0"
+HOMEPAGE="https://kubernetes.io/"
+DOWNLOAD="UNSUPPORTED"
+MD5SUM=""
+DOWNLOAD_x86_64="https://storage.googleapis.com/kubernetes-release/release/v1.23.0/bin/linux/amd64/kubectl"
+MD5SUM_x86_64="a60e14348d808ea0b11acdc2b1b026b5"
+REQUIRES=""
+MAINTAINER="Dimitris Zlatanidis"
+EMAIL="d.zlatanidis@gmail.com"
diff --git a/network/kubectl/slack-desc b/network/kubectl/slack-desc
new file mode 100644
index 0000000000..3caff3f8d2
--- /dev/null
+++ b/network/kubectl/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+       |-----handy-ruler------------------------------------------------------|
+kubectl: kubectl (Kubectl is a command line interface)
+kubectl:
+kubectl: Kubectl is a command line interface for running commands against
+kubectl: Kubernetes clusters.
+kubectl:
+kubectl: Homepage: https://kubernetes.io/
+kubectl:
+kubectl:
+kubectl:
+kubectl:
+kubectl:
diff --git a/network/kvirc/README b/network/kvirc/README
index 98976bcd7f..7c4a9d8534 100644
--- a/network/kvirc/README
+++ b/network/kvirc/README
@@ -1,9 +1,10 @@
-KVIrc is the K-Visual IRC Client. It's a free portable Internet Relay
-Chat client based on the excellent Qt GUI toolkit. KVIrc is being written
-by Szymon Stefanek and The KVIrc Development Team with the contribution
-of many IRC addicted developers around the world.  It has a full GUI
-based configuration, floatable windows, built-in help browser, addons and
-themes support (configurable from GUI or scripting), transparency support,
-dran'n'drop toolbar editing, activity notifier as well as proxy support,
-SSL and IPv6 sockets support, a modular arch which loads modules only when
-necessary and a huge API for writing extensions
+KVIrc is the K-Visual IRC Client. It's a free portable Internet
+Relay Chat client based on the excellent Qt GUI toolkit. KVIrc is
+being written by Szymon Stefanek and The KVIrc Development Team with
+the contribution of many IRC addicted developers around the world.
+It has a full GUI based configuration, floatable windows, built-in
+help browser, addons and themes support (configurable from GUI
+or scripting), transparency support, dran'n'drop toolbar editing,
+activity notifier as well as proxy support, SSL and IPv6 sockets
+support, a modular arch which loads modules only when necessary and a
+huge API for writing extensions
diff --git a/network/kvirc/kvirc.SlackBuild b/network/kvirc/kvirc.SlackBuild
index 651e5b51d8..75118ba885 100644
--- a/network/kvirc/kvirc.SlackBuild
+++ b/network/kvirc/kvirc.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for KVIrc
 
@@ -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: fix build on 15.0.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=kvirc
-VERSION=${VERSION:-20180605_8db6192}
+SRCNAM=KVIrc
+VERSION=${VERSION:-5.0.0}
 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}
@@ -60,19 +70,22 @@ 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
+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 \
+  -o -perm 511 \) -exec chmod 755 {} \+ -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 {} \+
 
 # use our *FLAGS
 sed -i "s|\"-O3|\"$SLKCFLAGS|" CMakeLists.txt
 
+# 20220301 bkw: older qt5 didn't need this, but Slackware 15.0's does:
+sed -i '1i#include <QPainterPath>' src/modules/iograph/libkviiograph.cpp
+
 mkdir build
 cd build
   cmake \
@@ -86,14 +99,10 @@ cd build
     -DWANT_STRIP=ON \
     ..
   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
-
 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 RELEASES doc/*LICENSE* $PKG/usr/doc/$PRGNAM-$VERSION
@@ -104,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/network/kvirc/kvirc.info b/network/kvirc/kvirc.info
index ad9abe5f13..bea15a011e 100644
--- a/network/kvirc/kvirc.info
+++ b/network/kvirc/kvirc.info
@@ -1,10 +1,10 @@
 PRGNAM="kvirc"
-VERSION="20180605_8db6192"
+VERSION="5.0.0"
 HOMEPAGE="http://kvirc.net"
-DOWNLOAD="http://ponce.cc/slackware/sources/repo/kvirc-20180605_8db6192.tar.xz"
-MD5SUM="0e68590319cd733d81bc5e8c13007b5e"
+DOWNLOAD="ftp://ftp.kvirc.net/pub/kvirc/5.0.0/source/KVIrc-5.0.0.tar.bz2"
+MD5SUM="9d53099647b1e793943269d7a194d4b2"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="qt5-webkit"
+REQUIRES=""
 MAINTAINER="Matteo Bernardini"
 EMAIL="ponce@slackbuilds.org"
diff --git a/network/kwakd/kwakd.SlackBuild b/network/kwakd/kwakd.SlackBuild
index 65e5a4a28e..bfbc94a0e7 100644
--- a/network/kwakd/kwakd.SlackBuild
+++ b/network/kwakd/kwakd.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for kwakd
 
@@ -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=kwakd
 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}
 
-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,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/network/lagrange/README b/network/lagrange/README
new file mode 100644
index 0000000000..6eabc8dff1
--- /dev/null
+++ b/network/lagrange/README
@@ -0,0 +1,4 @@
+Lagrange is a desktop GUI client for browsing Geminispace. It offers
+modern conveniences familiar from web browsers, such as smooth
+scrolling, inline image viewing, multiple tabs, visual themes,
+Unicode fonts, bookmarks, history, and page outlines.
diff --git a/network/riot-web/doinst.sh b/network/lagrange/doinst.sh
index 65c7e2eeb9..65c7e2eeb9 100644
--- a/network/riot-web/doinst.sh
+++ b/network/lagrange/doinst.sh
diff --git a/network/lagrange/lagrange.SlackBuild b/network/lagrange/lagrange.SlackBuild
new file mode 100644
index 0000000000..0b154462c8
--- /dev/null
+++ b/network/lagrange/lagrange.SlackBuild
@@ -0,0 +1,130 @@
+#!/bin/bash
+
+# Slackware build script for lagrange
+
+# Copyright 2022 Frederic Galusik, Bordeaux, 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.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=lagrange
+VERSION=${VERSION:-1.15.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"
+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_INSTALL_PREFIX=/usr \
+    -DENABLE_KERNING=OFF \
+    -DCMAKE_BUILD_TYPE=Release ..
+  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
+
+# Move man page to the right place
+mkdir -p $PKG/usr/man
+cp -a $PKG/usr/share/man/* $PKG/usr/man/
+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
+
+# move stuffs to the right places
+# see build/install_manifest.txt
+mkdir -p $PKG/usr/share/applications
+cp -a build/fi.skyjake.Lagrange.desktop $PKG/usr/share/applications/
+mkdir -p $PKG/usr/share/icons/hicolor/256x256/apps/
+cp -a res/lagrange-256.png $PKG/usr/share/icons/hicolor/256x256/apps/fi.skyjake.Lagrange.png
+mkdir -p $PKG/usr/share/metainfo/
+cp -a res/fi.skyjake.Lagrange.appdata.xml $PKG/usr/share/metainfo/
+mkdir -p $PKG/usr/share/lagrange/
+cp -a build/resources.lgr $PKG/usr/share/lagrange/
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+  AUTHORS.md 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/network/lagrange/lagrange.info b/network/lagrange/lagrange.info
new file mode 100644
index 0000000000..45ead71a4f
--- /dev/null
+++ b/network/lagrange/lagrange.info
@@ -0,0 +1,10 @@
+PRGNAM="lagrange"
+VERSION="1.15.6"
+HOMEPAGE="https://gmi.skyjake.fi/lagrange/"
+DOWNLOAD="https://git.skyjake.fi/skyjake/lagrange/releases/download/v1.15.6/lagrange-1.15.6.tar.gz"
+MD5SUM="6bf6dd7e5c7e7483ee26ec64fe6619fb"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Frederic Galusik"
+EMAIL="f@galusik.fr"
diff --git a/network/lagrange/slack-desc b/network/lagrange/slack-desc
new file mode 100644
index 0000000000..881668c252
--- /dev/null
+++ b/network/lagrange/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+        |-----handy-ruler------------------------------------------------------|
+lagrange: lagrange (desktop GUI client for browsing Geminispace)
+lagrange:
+lagrange: Lagrange is a desktop GUI client for browsing Geminispace. It offers
+lagrange: modern conveniences familiar from web browsers, such as smooth
+lagrange: scrolling, inline image viewing, multiple tabs, visual themes,
+lagrange: Unicode fonts, bookmarks, history, and page outlines.
+lagrange:
+lagrange: Like Gemini, Lagrange has been designed with minimalism in mind. It
+lagrange: depends on a small number of essential libraries. It is written in C
+lagrange: and uses SDL for hardware-accelerated graphics. OpenSSL is used for
+lagrange: secure communications.
diff --git a/network/ldapvi/ldapvi.SlackBuild b/network/ldapvi/ldapvi.SlackBuild
index 4c30fee73d..355cefd95c 100644
--- a/network/ldapvi/ldapvi.SlackBuild
+++ b/network/ldapvi/ldapvi.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for ldapvi
 
@@ -30,26 +30,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=ldapvi
 VERSION=${VERSION:-1.7}
 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 [ "$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"
@@ -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/network/leafnode/README b/network/leafnode/README
index 004977ddaa..31af7b91fe 100644
--- a/network/leafnode/README
+++ b/network/leafnode/README
@@ -1,7 +1,7 @@
-Leafnode 2 is an NNTP proxy server intended for small sites, where 
-there are few users and little disk space, but where a large number of 
-groups is desired. It can also be used to give a regular newsreader 
-off-line functionality. 
+Leafnode 2 is an NNTP proxy server intended for small sites, where
+there are few users and little disk space, but where a large number
+of groups is desired. It can also be used to give a regular newsreader
+off-line functionality.
 
 There is some work to do to install this program effectively, all
 of which is clearly set out in the README file contained in the
@@ -9,7 +9,8 @@ documents. It is strongly advised that you read this file thoroughly
 before installing Leafnode 2. In summary you will need to:
 
 1. Ensure $NNTPSERVER or /etc/nntpserver points to 'localhost'.
-2. Set /etc/inetd.conf so leafnode is executed for incoming NNTP connections.
+2. Set /etc/inetd.conf so leafnode is executed for incoming NNTP
+   connections.
 3. Set /etc/hosts.deny and /etc/hosts.allow to protect the server.
 4. Create /etc/leafnode/config and adjust settings as required. 
 5. Set cronjobs for fetchnews and texpire. 
diff --git a/network/leafnode/leafnode.SlackBuild b/network/leafnode/leafnode.SlackBuild
index 797c4ff0fc..6c779979c3 100644
--- a/network/leafnode/leafnode.SlackBuild
+++ b/network/leafnode/leafnode.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for Leafnode 2
 
@@ -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=leafnode
 VERSION=${VERSION:-2.0.0.alpha20140727b}
 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"
@@ -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/network/leechcraft/README b/network/leechcraft/README
deleted file mode 100644
index 22782597c3..0000000000
--- a/network/leechcraft/README
+++ /dev/null
@@ -1,26 +0,0 @@
-LeechCraft is a full-featured modular "Internet client" application,
-currently including plugins for a web browser, news feed reader,
-BitTorrent client, FTP client, and many more. Plugins are easily added
-and integrated with each other with no effort.
-
-Currently it includes following plugins:
-* Aggregator, news feed reader   * BitTorrent, the BitTorrent client
-* Chatter, the IRC client   * CSTP, simple HTTP implementation
-* DBusManager, D-Bus for the LeechCraft  * DeadLyrics, LyricWiki.org API
-* HistoryHolder, downloads history   * LCFTP, FTP implementation client
-* LMP, simple media player with streaming support
-* NetworkMonitor, which monitors for HTTP requests
-* Poshuku, the web browser   * Poshuku CleanWeb, AdBlock+-compatible ad blocker
-* Poshuku FileScheme, support for the file:// browsing
-* Poshuku FUA, which allows to set fake user agents per domain
-* SeekThru, client for OpenSearch-aware web sites
-
-The following variables default to ON, but you can disable building any of
-them by passing NAME_OF_VARIABLE=OFF to the build script:
-  ENABLE_SUMMARY ENABLE_TORRENT ENABLE_AGGREGATOR ENABLE_POSHUKU ENABLE_HTTP
-  ENABLE_FTP ENABLE_LMP ENABLE_DBUSMANAGER ENABLE_DEADLYRICS ENABLE_SEEKTHRU
-  ENABLE_NETWORKMONITOR ENABLE_HISTORYHOLDER ENABLE_CHATTER ENABLE_YASD
-  ENABLE_DCMINATOR ENABLE_NEWLIFE ENABLE_ANHERO ENABLE_VGRABBER
-As an example, you can do this:  ENABLE_LMP=OFF ./leechcraft.SlackBuild
-
-An optional dependency is libtorrent-rasterbar.
diff --git a/network/leechcraft/doinst.sh b/network/leechcraft/doinst.sh
deleted file mode 100644
index f3f8604d5a..0000000000
--- a/network/leechcraft/doinst.sh
+++ /dev/null
@@ -1,22 +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
-
-if [ -e usr/share/icons/Pevzi/icon-theme.cache ]; then
-  if [ -x /usr/bin/gtk-update-icon-cache ]; then
-    /usr/bin/gtk-update-icon-cache -f usr/share/icons/Pevzi >/dev/null 2>&1
-  fi
-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 -f usr/share/icons/oxygen >/dev/null 2>&1
-  fi
-fi
-
diff --git a/network/leechcraft/leechcraft.SlackBuild b/network/leechcraft/leechcraft.SlackBuild
deleted file mode 100644
index 80b2acc607..0000000000
--- a/network/leechcraft/leechcraft.SlackBuild
+++ /dev/null
@@ -1,111 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for LeechCraft
-
-# Copyright 2009 rexim
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (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=leechcraft
-VERSION=${VERSION:-0.3.65}
-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=""
-  EXTRA_CMAKE_FLAGS=""
-elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-  LIBDIRSUFFIX=""
-  EXTRA_CMAKE_FLAGS=""
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
-  EXTRA_CMAKE_FLAGS="-DRESPECTLIB64=True"
-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 {} \;
-
-mkdir -p build
-cd build
-cmake \
-      -DCMAKE_CXX_FLAGS="$SLKCFLAGS" \
-      -DCMAKE_C_FLAGS="$SLKCFLAGS" \
-      -DCMAKE_INSTALL_PREFIX="/usr" \
-      -DLIB_SUFFIX="$LIBDIRSUFFIX" \
-      -DENABLE_SUMMARY="${ENABLE_SUMMARY:-ON}" \
-      -DENABLE_TORRENT="${ENABLE_TORRENT:-ON}" \
-      -DENABLE_AGGREGATOR="${ENABLE_AGGREGATOR:-ON}" \
-      -DENABLE_POSHUKU="${ENABLE_POSHUKU:-ON}" \
-      -DENABLE_HTTP="${ENABLE_HTTP:-ON}" \
-      -DENABLE_FTP="${ENABLE_FTP:-ON}" \
-      -DENABLE_LMP="${ENABLE_LMP:-ON}" \
-      -DENABLE_DBUSMANAGER="${ENABLE_DBUSMANAGER:-ON}" \
-      -DENABLE_DEADLYRICS="${ENABLE_DEADLYRICS:-ON}" \
-      -DENABLE_SEEKTHRU="${ENABLE_SEEKTHRU:-ON}" \
-      -DENABLE_NETWORKMONITOR="${ENABLE_NETWORKMONITOR:-ON}" \
-      -DENABLE_HISTORYHOLDER="${ENABLE_HISTORYHOLDER:-ON}" \
-      -DENABLE_CHATTER="${ENABLE_CHATTER:-ON}" \
-      -DENABLE_YASD="${ENABLE_YASD:-ON}" \
-      -DENABLE_DCMINATOR="${ENABLE_DCMINATOR:-ON}" \
-      -DENABLE_NEWLIFE="${ENABLE_NEWLIFE:-ON}" \
-      -DENABLE_ANHERO="${ENABLE_ANHERO:-ON}" \
-      -DENABLE_VGRABBER="${ENABLE_VGRABBER:-ON}" \
-      $EXTRA_CMAKE_FLAGS \
-      ../src/
-
-make
-make install DESTDIR=$PKG
-
-# Move the manual pages to the correct place
-mv $PKG/usr/share/man $PKG/usr
-
-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/network/leechcraft/leechcraft.info b/network/leechcraft/leechcraft.info
deleted file mode 100644
index 946c9060bd..0000000000
--- a/network/leechcraft/leechcraft.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="leechcraft"
-VERSION="0.3.65"
-HOMEPAGE="https://leechcraft.org/"
-DOWNLOAD="https://downloads.sourceforge.net/leechcraft/leechcraft-0.3.65.tar.bz2"
-MD5SUM="f410eae27731aa80b8921701477b15e7"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="rexim"
-EMAIL="reximkut@gmail.com"
diff --git a/network/leechcraft/slack-desc b/network/leechcraft/slack-desc
deleted file mode 100644
index eddd124950..0000000000
--- a/network/leechcraft/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------------------------------------------------------|
-leechcraft: leechcraft (modular internet client application)
-leechcraft:
-leechcraft: LeechCraft is a full-featured modular "Internet client" application,
-leechcraft: currently including plugins for a web browser, news feed reader,
-leechcraft: BitTorrent client, FTP client and many more. Plugins are easily added
-leechcraft: and integrated with each other with no effort.
-leechcraft:
-leechcraft: Homepage: http://leechcraft.org/
-leechcraft:
-leechcraft:
-leechcraft:
diff --git a/network/libcapi20/README b/network/libcapi20/README
deleted file mode 100644
index 7d4ccdd748..0000000000
--- a/network/libcapi20/README
+++ /dev/null
@@ -1,3 +0,0 @@
-Modular libcapi20 by Jan-Michael Brummer
-
-libcapi20 features autodetection of connected CAPI devices.
diff --git a/network/libcapi20/libcapi20.SlackBuild b/network/libcapi20/libcapi20.SlackBuild
deleted file mode 100644
index 88b1298293..0000000000
--- a/network/libcapi20/libcapi20.SlackBuild
+++ /dev/null
@@ -1,92 +0,0 @@
-#!/bin/sh
-#
-# Slackware build script for libcapi20
-#
-# Copyright 2013 Marek Srejma (sam_web@yahoo.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=libcapi20
-VERSION=${VERSION:-3.0.7}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-EXDIR=${EXDIR:-capi20}
-
-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 -eu
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $EXDIR
-tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
-cd $EXDIR
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -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" \
-CFLAGS="$SLKCFLAGS" \
-./configure \
-  --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --disable-static \
-  --build=$ARCH-slackware-linux
-
-make
-make install DESTDIR=$PKG
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a README COPYING COPYING.LIB $PKG/usr/doc/$PRGNAM-$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/network/libcapi20/libcapi20.info b/network/libcapi20/libcapi20.info
deleted file mode 100644
index 734a181501..0000000000
--- a/network/libcapi20/libcapi20.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="libcapi20"
-VERSION="3.0.7"
-HOMEPAGE="http://tabos.org/"
-DOWNLOAD="https://sourceforge.net/projects/slackbuildsdirectlinks/files/libcapi20/libcapi20-3.0.7.tar.bz2"
-MD5SUM="0074d8ecdf96b474a7dada1e8f12bb9f"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="slacksam"
-EMAIL="sam_web@yahoo.de"
diff --git a/network/libcapi20/slack-desc b/network/libcapi20/slack-desc
deleted file mode 100644
index 7a4ca407c8..0000000000
--- a/network/libcapi20/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------------------------------------------------------|
-libcapi20: libcapi20 (CAPI support libraries)
-libcapi20:
-libcapi20: libcapi20 features autodetection of connected CAPI devices.
-libcapi20:
-libcapi20: http://tabos.org/
-libcapi20:
-libcapi20:
-libcapi20:
-libcapi20:
-libcapi20:
-libcapi20:
diff --git a/network/libdnet/libdnet.SlackBuild b/network/libdnet/libdnet.SlackBuild
index 0e452ea50f..44b079510f 100644
--- a/network/libdnet/libdnet.SlackBuild
+++ b/network/libdnet/libdnet.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for libdnet.
 
@@ -23,27 +23,37 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=libdnet
 VERSION=${VERSION:-1.11}
-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}
 DOCS="LICENSE README THANKS"
 
-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,8 +104,10 @@ 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
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/network/libident/libident.SlackBuild b/network/libident/libident.SlackBuild
index 0e99b00ac7..4e1d99ea3b 100644
--- a/network/libident/libident.SlackBuild
+++ b/network/libident/libident.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for libident
 
-# Copyright 2017  Robby Workman, Tuscaloosa, Alabama, USA
+# Copyright 2017-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=libident
 VERSION=${VERSION:-0.32}
-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}
@@ -98,8 +108,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/network/libiscsi/libiscsi.SlackBuild b/network/libiscsi/libiscsi.SlackBuild
index 6eeebf5a36..b2346c036c 100644
--- a/network/libiscsi/libiscsi.SlackBuild
+++ b/network/libiscsi/libiscsi.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for libiscsi
 
@@ -23,14 +23,20 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #
+# 2021-02-19:
+#   updated to 1.19.0
+#
 # 2019-04-07:
 #   initial release
 #
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=libiscsi
-VERSION=${VERSION:-1.18.0}
-BUILD=${BUILD:-1}
+VERSION=${VERSION:-1.19.0}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -40,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}
@@ -70,9 +80,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 {} \+
+
+./autogen.sh
+
+SLKCFLAGS+=" -fcommon"
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
@@ -84,6 +98,9 @@ CXXFLAGS="$SLKCFLAGS" \
   --mandir=/usr/man \
   --docdir=/usr/doc/$PRGNAM-$VERSION \
   --disable-static \
+  --disable-tests \
+  --disable-test-tool \
+  --disable-werror \
   --build=$ARCH-slackware-linux
 
 make
@@ -92,8 +109,7 @@ 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*/*
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
@@ -105,8 +121,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/network/libiscsi/libiscsi.info b/network/libiscsi/libiscsi.info
index 870e32c21c..201ebd21f7 100644
--- a/network/libiscsi/libiscsi.info
+++ b/network/libiscsi/libiscsi.info
@@ -1,8 +1,8 @@
 PRGNAM="libiscsi"
-VERSION="1.18.0"
+VERSION="1.19.0"
 HOMEPAGE="https://github.com/sahlberg/libiscsi"
-DOWNLOAD="https://sites.google.com/site/libiscsitarballs/libiscsitarballs/libiscsi-1.18.0.tar.gz"
-MD5SUM="eff8b0a9a116624d41edc4104054f77d"
+DOWNLOAD="https://github.com/sahlberg/libiscsi/archive/1.19.0/libiscsi-1.19.0.tar.gz"
+MD5SUM="fe0c0c7b677f3b6fbe535e758838ccf2"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/network/libmaxminddb/README b/network/libmaxminddb/README
index d18fdd2c2e..d97ec52327 100644
--- a/network/libmaxminddb/README
+++ b/network/libmaxminddb/README
@@ -1,9 +1,10 @@
-The libmaxminddb library provides a C library for reading MaxMind DB files,
-including the GeoIP2 databases from MaxMind. This is a custom binary format
-designed to facilitate fast lookups of IP addresses while allowing for great
-flexibility in the type of data associated with an address.
+The libmaxminddb library provides a C library for reading MaxMind DB
+files, including the GeoIP2 databases from MaxMind. This is a custom
+binary format designed to facilitate fast lookups of IP addresses
+while allowing for great flexibility in the type of data associated
+with an address.
 
 The MaxMind DB format is an open format.
 The spec is available at http://maxmind.github.io/MaxMind-DB/.
-This spec is licensed under the Creative Commons Attribution-ShareAlike 3.0
-Unported License.
+This spec is licensed under the Creative Commons Attribution-ShareAlike
+3.0 Unported License.
diff --git a/network/libmaxminddb/libmaxminddb.SlackBuild b/network/libmaxminddb/libmaxminddb.SlackBuild
index a6dfdbedd9..48e4837c31 100644
--- a/network/libmaxminddb/libmaxminddb.SlackBuild
+++ b/network/libmaxminddb/libmaxminddb.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for libmaxminddb
 
@@ -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=libmaxminddb
-VERSION=${VERSION:-1.0.2}
-BUILD=${BUILD:-1}
+VERSION=${VERSION:-1.4.2}
+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 @@ 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
 
+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/network/libmaxminddb/libmaxminddb.info b/network/libmaxminddb/libmaxminddb.info
index 86f8881111..5413d8f186 100644
--- a/network/libmaxminddb/libmaxminddb.info
+++ b/network/libmaxminddb/libmaxminddb.info
@@ -1,8 +1,8 @@
 PRGNAM="libmaxminddb"
-VERSION="1.0.2"
+VERSION="1.4.2"
 HOMEPAGE="https://dev.maxmind.com/geoip/geoip2/web-services/"
-DOWNLOAD="https://github.com/maxmind/libmaxminddb/releases/download/1.0.2/libmaxminddb-1.0.2.tar.gz"
-MD5SUM="2b6985305c0bbf74d08431e333c03ffb"
+DOWNLOAD="https://github.com/maxmind/libmaxminddb/releases/download/1.4.2/libmaxminddb-1.4.2.tar.gz"
+MD5SUM="ca92781b655e0cea2efbe37a07ddb2bb"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/network/libnatpmp/README b/network/libnatpmp/README
index ff8458a220..f00f5b1c4d 100644
--- a/network/libnatpmp/README
+++ b/network/libnatpmp/README
@@ -1,5 +1,6 @@
-NAT-PMP is the direct concurrent to the UPnP IGD specification. It is providing
-a way to do NAT traversal.  libnatpmp is an attempt to make a portable and
-fully compliant implementation of the protocol for the client side. It is
-based on non blocking sockets and all calls of the API are asynchronous. It
-is therefore very easy to integrate the NAT-PMP code to any event driven code.
+NAT-PMP is the direct concurrent to the UPnP IGD specification. It
+is providing a way to do NAT traversal. libnatpmp is an attempt to
+make a portable and fully compliant implementation of the protocol for
+the client side. It is based on non blocking sockets and all calls of
+the API are asynchronous. It is therefore very easy to integrate the
+NAT-PMP code to any event driven code.
diff --git a/network/libnatpmp/libnatpmp.SlackBuild b/network/libnatpmp/libnatpmp.SlackBuild
index 8fcf8435d9..12603f71a8 100644
--- a/network/libnatpmp/libnatpmp.SlackBuild
+++ b/network/libnatpmp/libnatpmp.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for libnatpmp
 
@@ -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=libnatpmp
 VERSION=${VERSION:-20150609}
 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/network/libnfsidmap/README b/network/libnfsidmap/README
deleted file mode 100644
index 44ed36d6e0..0000000000
--- a/network/libnfsidmap/README
+++ /dev/null
@@ -1,2 +0,0 @@
-libnfsidmap provides functions to map between NFSv4 names (which are of the
-form user@domain) and local uid's and gid's.
diff --git a/network/libnfsidmap/doinst.sh b/network/libnfsidmap/doinst.sh
deleted file mode 100644
index 6e902b74af..0000000000
--- a/network/libnfsidmap/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/idmapd.conf.new
diff --git a/network/libnfsidmap/libnfsidmap.SlackBuild b/network/libnfsidmap/libnfsidmap.SlackBuild
deleted file mode 100644
index 05907b709a..0000000000
--- a/network/libnfsidmap/libnfsidmap.SlackBuild
+++ /dev/null
@@ -1,105 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for libnfsidmap
-
-# 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=libnfsidmap
-VERSION=${VERSION:-0.27}
-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} \
-  --with-pluginpath=/usr/lib${LIBDIRSUFFIX}/libnfsidmap \
-  --sysconfdir=/etc \
-  --localstatedir=/var \
-  --mandir=/usr/man \
-  --docdir=/usr/doc/$PRGNAM-$VERSION \
-  --build=$ARCH-slackware-linux
-
-make
-make install DESTDIR=$PKG
-install -D -m 0644 idmapd.conf $PKG/etc/idmapd.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 \
-  AUTHORS BUILDING_FROM_CVS 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/network/libnfsidmap/libnfsidmap.info b/network/libnfsidmap/libnfsidmap.info
deleted file mode 100644
index 5355a0f78d..0000000000
--- a/network/libnfsidmap/libnfsidmap.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="libnfsidmap"
-VERSION="0.27"
-HOMEPAGE="http://www.citi.umich.edu/projects/nfsv4/linux/"
-DOWNLOAD="https://fedorapeople.org/~steved/libnfsidmap/0.27/libnfsidmap-0.27.tar.gz"
-MD5SUM="ad8ec32ba88cf03076e8129776905530"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="pyllyukko"
-EMAIL="pyllyukko@maimed.org"
diff --git a/network/libnfsidmap/slack-desc b/network/libnfsidmap/slack-desc
deleted file mode 100644
index dd7adc6802..0000000000
--- a/network/libnfsidmap/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------------------------------------------------------|
-libnfsidmap: libnfsidmap (NFS idmapping library)
-libnfsidmap:
-libnfsidmap: libnfsidmap provides functions to map between NFSv4 names (which are
-libnfsidmap: of the form user@domain) and local uid's and gid's.
-libnfsidmap:
-libnfsidmap:
-libnfsidmap:
-libnfsidmap:
-libnfsidmap:
-libnfsidmap: Homepage: http://www.citi.umich.edu/projects/nfsv4/linux/
-libnfsidmap:
diff --git a/network/librespeed-cli/README b/network/librespeed-cli/README
new file mode 100644
index 0000000000..d851665ecc
--- /dev/null
+++ b/network/librespeed-cli/README
@@ -0,0 +1,17 @@
+Speedtest CLI brings the trusted technology and global server network
+behind Speedtest to the command line. Built for software developers,
+system administrators and computer enthusiasts alike, Speedtest CLI is
+the first official Linux-native Speedtest application backed by Ookla®.
+
+With Speedtest CLI, you can easily:
+
+* Measure internet connection performance metrics like download, upload,
+  latency and packet loss natively without relying on a web browser
+* Test the internet connection of your Linux desktop, a remote server or
+  even lower-powered devices such as the Raspberry Pi with the
+  Speedtest Server Network
+* Set up automated scripts to collect connection performance data,
+  including trends over time
+* Use Speedtest in your programs by wrapping it in the programming
+  language of your choice
+* View test results via CSV, JSONL or JSON
diff --git a/network/librespeed-cli/librespeed-cli.SlackBuild b/network/librespeed-cli/librespeed-cli.SlackBuild
new file mode 100644
index 0000000000..ca1000b2d6
--- /dev/null
+++ b/network/librespeed-cli/librespeed-cli.SlackBuild
@@ -0,0 +1,87 @@
+#!/bin/bash
+
+# Slackware build script for librespeed-cli
+
+# Copyright 2024 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=librespeed-cli
+VERSION=${VERSION:-1.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 [ -n "${PRINT_PACKAGE_NAME}" ]; 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
+  PKG_ARCH=i386
+elif [ "$ARCH" = "i686" ]; then
+  PKG_ARCH=i386
+elif [ "$ARCH" = "x86_64" ]; then
+  PKG_ARCH=amd64
+else
+  echo "$ARCH is not supported."
+  exit 1
+fi
+
+set -e
+
+rm -rf "$PKG"
+mkdir -p "$TMP" "$PKG" "$OUTPUT"
+cd "$TMP"
+rm -rf "$PRGNAM-$VERSION"
+mkdir -p "$PRGNAM-$VERSION"
+tar xvf "$CWD/${PRGNAM}_${VERSION}_linux_${PKG_ARCH}.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/$SRCNAM"
+install "$PRGNAM" "$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/network/librespeed-cli/librespeed-cli.info b/network/librespeed-cli/librespeed-cli.info
new file mode 100644
index 0000000000..bc2e56a501
--- /dev/null
+++ b/network/librespeed-cli/librespeed-cli.info
@@ -0,0 +1,10 @@
+PRGNAM="librespeed-cli"
+VERSION="1.0.10"
+HOMEPAGE="https://github.com/librespeed/speedtest-cli"
+DOWNLOAD="UNSUPPORTED"
+MD5SUM=""
+DOWNLOAD_x86_64="https://github.com/librespeed/speedtest-cli/releases/download/v1.0.10/librespeed-cli_1.0.10_linux_amd64.tar.gz"
+MD5SUM_x86_64="6f4daf4bd1235f24862304e55af40b8c"
+REQUIRES=""
+MAINTAINER="Ivan Kovmir"
+EMAIL="i@kovmir.eu"
diff --git a/network/librespeed-cli/slack-desc b/network/librespeed-cli/slack-desc
new file mode 100644
index 0000000000..aa6096d070
--- /dev/null
+++ b/network/librespeed-cli/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+              |-----handy-ruler------------------------------------------------------|
+librespeed-cli: librespeed-cli (LibreSpeed CLI)
+librespeed-cli:
+librespeed-cli: Command line program to test internet connection speed.
+librespeed-cli:
+librespeed-cli:
+librespeed-cli:
+librespeed-cli:
+librespeed-cli:
+librespeed-cli:
+librespeed-cli:
+librespeed-cli: Homepage: https://github.com/librespeed/speedtest-cli
diff --git a/network/libressl/README b/network/libressl/README
new file mode 100644
index 0000000000..e2ef33ecf2
--- /dev/null
+++ b/network/libressl/README
@@ -0,0 +1,75 @@
+LibreSSL is a fork of OpenSSL 1.0.1g developed by the OpenBSD project.
+Our goal is to modernize the codebase, improve security, and apply best
+practice development processes from OpenBSD.
+
+The binaries are installed as libressl-openssl, libressl-ocspcheck, and
+libressl-nc.
+
+************************************************************************
+NOTE! This contains libtls so the standalone libtls package should be
+removed before building and installing libressl.
+************************************************************************
+
+Compatibility with OpenSSL:
+
+LibreSSL is API compatible with OpenSSL 1.0.1, but does not yet include
+all new APIs from OpenSSL 1.0.2 and later. LibreSSL also includes APIs
+not yet present in OpenSSL. The current common API subset is OpenSSL
+1.0.1.
+
+LibreSSL is not ABI compatible with any release of OpenSSL, or
+necessarily earlier releases of LibreSSL. You will need to relink your
+programs to LibreSSL in order to use it, just as in moving between major
+versions of OpenSSL.  LibreSSL's installed library version numbers are
+incremented to account for ABI and API changes.
+
+Compatibility with other operating systems:
+
+While primarily developed on and taking advantage of APIs available on
+OpenBSD, the LibreSSL portable project attempts to provide working
+alternatives for other operating systems, and assists with improving
+OS-native implementations where possible.
+
+At the time of this writing, LibreSSL is known to build and work on:
+
+* Linux (kernel 3.17 or later recommended)
+* FreeBSD (tested with 9.2 and later)
+* NetBSD (7.0 or later recommended)
+* HP-UX (11i)
+* Solaris (11 and later preferred)
+* Mac OS X (tested with 10.8 and later)
+* AIX (5.3 and later)
+
+LibreSSL also supports the following Windows environments:
+* Microsoft Windows (Windows 7 / Windows Server 2008r2 or later, x86 and
+  x64)
+* Wine (32-bit and 64-bit)
+* Mingw-w64, Cygwin, and Visual Studio
+
+Please report bugs either to the public libressl@openbsd.org mailing
+list, or to the github
+
+Severe vulnerabilities or bugs requiring coordination with OpenSSL can
+be sent to the core team at libressl-security@openbsd.org.
+
+OPTIONS:
+
+By default a minimal set of man pages are installed:
+
+/usr/man/man1/libressl-nc
+/usr/man/man1/libressl-openssl
+/usr/man/man8/libressl-ocspcheck
+
+To install them all, use:
+
+MANPAGES=yes ./libressl.SlackBuild
+
+========================================================================
+
+MAINTAINER NOTES
+
+NOTE: PKG_CONFIG_PATH will likely need setting in your build scripts:
+
+PKG_CONFIG_PATH=/usr/lib$LIBDIRSUFFIX/libressl/pkgconfig:$PKG_CONFIG_PATH
+
+========================================================================
diff --git a/network/libressl/libressl.SlackBuild b/network/libressl/libressl.SlackBuild
new file mode 100644
index 0000000000..4572cfb570
--- /dev/null
+++ b/network/libressl/libressl.SlackBuild
@@ -0,0 +1,108 @@
+#!/bin/bash
+
+# slackbuild script for libressl
+# By D Woodfall <dave@slackbuilds.org>
+# Licensed under the WTFPL (http://www.wtfpl.net)
+#
+# 2023-04-18 12:11:51 +0100 Thanks to Naglfar: --with-openssldir=/etc/$PRGNAM
+# 2023-05-10 12:04:05 +0100 Remove ld.so.conf stuff.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=libressl
+VERSION=${VERSION:-3.7.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 . -perm /111 -a \! -perm 755 -a -exec chmod 755 {} + \
+ -o \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} +
+
+# Don't install man page symlinks
+sed -i '/ln -sf.*\.3"$/d' man/Makefile.in
+
+if [ "${MANPAGES:-no}" = no ]; then
+  sed -i '/man\/Makefile/d' configure.ac
+  autoreconf -f
+  sed -i "s, man , ,g; s, install-man , ,g" Makefile.in
+fi
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --enable-nc \
+  --disable-tests \
+  --disable-static \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX}/$PRGNAM \
+  --includedir=/usr/include/$PRGNAM \
+  --with-openssldir=/etc/$PRGNAM \
+  --program-prefix "$PRGNAM-" \
+  --mandir=/usr/man \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --build=$ARCH-slackware-linux
+
+make
+make install DESTDIR=$PKG
+
+rm -f $PKG/usr/lib${LIBDIRSUFFIX}/$PRGNAM/*.la
+
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+
+find $PKG -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 ChangeLog README.md \
+  $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
+cat $CWD/$PRGNAM-$VERSION-relnotes.txt > \
+  $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM-$VERSION-relnotes.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/network/libressl/libressl.info b/network/libressl/libressl.info
new file mode 100644
index 0000000000..ca19db9fe0
--- /dev/null
+++ b/network/libressl/libressl.info
@@ -0,0 +1,12 @@
+PRGNAM="libressl"
+VERSION="3.7.1"
+HOMEPAGE="https://www.libressl.org"
+DOWNLOAD="https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-3.7.1.tar.gz \
+          https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-3.7.1-relnotes.txt"
+MD5SUM="133f11e478f46528414245dccb6355f2 \
+        0b1e4784b5c3b2672c9e7432e11d1fa3"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="D Woodfall"
+EMAIL="dave@slackbuilds.org"
diff --git a/network/libressl/slack-desc b/network/libressl/slack-desc
new file mode 100644
index 0000000000..0e240ea20a
--- /dev/null
+++ b/network/libressl/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+        |-----handy-ruler------------------------------------------------------|
+libressl: libressl (OpenSSL fork by OpenBSD)
+libressl:
+libressl: LibreSSL is a fork of OpenSSL 1.0.1g developed by the OpenBSD
+libressl: project.  Our goal is to modernize the codebase, improve security,
+libressl: and apply best practice development processes from OpenBSD.
+libressl:
+libressl: https://www.libressl.org
+libressl:
+libressl:
+libressl:
+libressl:
diff --git a/network/librewolf/README b/network/librewolf/README
new file mode 100644
index 0000000000..76c78d15f1
--- /dev/null
+++ b/network/librewolf/README
@@ -0,0 +1,12 @@
+This project is a custom and independent version of Firefox, with the
+primary goals of privacy, security and user freedom.
+
+LibreWolf is designed to increase protection against tracking and
+fingerprinting techniques, while also including a few security
+improvements. This is achieved through our privacy and security oriented
+settings and patches. LibreWolf also aims to remove all the telemetry,
+data collection and annoyances, as well as disabling anti-freedom
+features like DRM.
+------------------------------------------------------------------------
+This SlackBuild downloads and installs the official AppImage under
+'/opt'.
diff --git a/network/DarTui/doinst.sh b/network/librewolf/doinst.sh
index 5fb28930db..5fb28930db 100644
--- a/network/DarTui/doinst.sh
+++ b/network/librewolf/doinst.sh
diff --git a/network/librewolf/librewolf.SlackBuild b/network/librewolf/librewolf.SlackBuild
new file mode 100644
index 0000000000..9ecbfbcf62
--- /dev/null
+++ b/network/librewolf/librewolf.SlackBuild
@@ -0,0 +1,78 @@
+#!/bin/bash
+
+# Slackware build script for librewolf
+
+# Copyright 2022-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=librewolf
+VERSION=${VERSION:-123.0.1}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+ARCH="${ARCH:-$(uname -m)}"
+if [ "$ARCH" != "x86_64" ]; then
+	echo "$ARCH is not supported for $PRGNAM-$VERSION."
+	exit 1;
+fi
+
+if [ -n "${PRINT_PACKAGE_NAME}" ]; then
+	echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+	exit 0
+fi
+
+TMP="${TMP:-/tmp/SBo}"
+PKG="$TMP/package-$PRGNAM"
+OUTPUT="${OUTPUT:-/tmp}"
+
+APPIMGNAM="LibreWolf.$ARCH.AppImage"
+NAMVER="$PRGNAM-$VERSION"
+
+set -e
+
+rm -rf "$PKG"
+mkdir -p "$TMP" "$PKG" "$OUTPUT"
+mkdir -p "$PKG/install"
+mkdir -p "$PKG/usr/doc/$NAMVER"
+mkdir -p "$PKG/usr/share/applications"
+mkdir -p "$PKG/usr/bin"
+mkdir -p "$PKG/opt"
+chmod 0755 "$CWD/$APPIMGNAM"
+cd "$PKG/opt"
+"$CWD/$APPIMGNAM" --appimage-extract
+mv squashfs-root "$NAMVER"
+
+# Remove empty file.
+rm -f "$PKG/opt/$NAMVER/removed-files"
+
+# Executable and *.desktop file.
+ln -s "../../opt/$NAMVER/AppRun" "$PKG/usr/bin/$PRGNAM"
+ln -s "../../../opt/$NAMVER/io.gitlab.LibreWolf.desktop" "$PKG/usr/share/applications/$PRGNAM.desktop"
+
+cp "$CWD/$PRGNAM.SlackBuild" "$PKG/usr/doc/$NAMVER/$PRGNAM.SlackBuild"
+cp "$CWD/README" "$PKG/usr/doc/$NAMVER/README"
+cp "$CWD/slack-desc" "$PKG/install/slack-desc"
+cp "$CWD/doinst.sh" "$PKG/install/doinst.sh"
+
+cd "$PKG"
+/sbin/makepkg -l y -c n "$OUTPUT/$NAMVER-$ARCH-$BUILD$TAG.$PKGTYPE"
diff --git a/network/librewolf/librewolf.info b/network/librewolf/librewolf.info
new file mode 100644
index 0000000000..ed987fd7f2
--- /dev/null
+++ b/network/librewolf/librewolf.info
@@ -0,0 +1,10 @@
+PRGNAM="librewolf"
+VERSION="123.0.1"
+HOMEPAGE="https://librewolf.net/"
+DOWNLOAD="UNSUPPORTED"
+MD5SUM=""
+DOWNLOAD_x86_64="https://gitlab.com/api/v4/projects/24386000/packages/generic/librewolf/123.0.1-1/LibreWolf.x86_64.AppImage"
+MD5SUM_x86_64="cefd3c978a0311b43eb393d83d5a3577"
+REQUIRES=""
+MAINTAINER="Ivan Kovmir"
+EMAIL="i@kovmir.eu"
diff --git a/network/librewolf/slack-desc b/network/librewolf/slack-desc
new file mode 100644
index 0000000000..f6c5fd0cae
--- /dev/null
+++ b/network/librewolf/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.  Line
+# up the first '|' above the ':' following the base package name, and the '|' on
+# the right side marks the last column you can put a 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------------------------------------------------------|
+librewolf: librewolf (Private Web Browser)
+librewolf:
+librewolf: This project is a custom and independent version of Firefox, with the
+librewolf: LibreWolf: primary goals of privacy, security and user freedom.
+librewolf:
+librewolf:
+librewolf:
+librewolf:
+librewolf:
+librewolf: https://librewolf.net/
+librewolf:
diff --git a/network/libteam/README b/network/libteam/README
new file mode 100644
index 0000000000..a577a1e415
--- /dev/null
+++ b/network/libteam/README
@@ -0,0 +1,7 @@
+libteam - Library for controlling team network device
+
+The purpose of the Team softdev Linux driver is to provide a mechanism
+to team multiple NICs (ports) into one logical one (teamdev) at L2
+layer. The process is called "channel bonding", "Ethernet bonding",
+"channel teaming", "link aggregation", etc. This is already implemented
+in the Linux kernel by the bonding driver.
diff --git a/network/libteam/libteam.SlackBuild b/network/libteam/libteam.SlackBuild
new file mode 100644
index 0000000000..c8557c1968
--- /dev/null
+++ b/network/libteam/libteam.SlackBuild
@@ -0,0 +1,112 @@
+#!/bin/bash
+
+# Slackware build script for libteam
+
+# Copyright 2021 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=libteam
+VERSION=${VERSION:-1.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}
+
+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" \
+./autogen.sh
+
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --mandir=/usr/man \
+  --enable-static=no \
+  --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 HOWTO.BASICS 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/network/libteam/libteam.info b/network/libteam/libteam.info
new file mode 100644
index 0000000000..0eee2dac7f
--- /dev/null
+++ b/network/libteam/libteam.info
@@ -0,0 +1,10 @@
+PRGNAM="libteam"
+VERSION="1.32"
+HOMEPAGE="http://libteam.org/"
+DOWNLOAD="https://github.com/jpirko/libteam/archive/v1.32/libteam-1.32.tar.gz"
+MD5SUM="89eea1af705886acbbc7f0685a2638df"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="libdaemon"
+MAINTAINER="Ebben Aries"
+EMAIL="slackbuilds@dscp.org"
diff --git a/network/libteam/slack-desc b/network/libteam/slack-desc
new file mode 100644
index 0000000000..b199f7944b
--- /dev/null
+++ b/network/libteam/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+       |-----handy-ruler------------------------------------------------------|
+libteam: libteam (Library for controlling team network device)
+libteam:
+libteam: The purpose of the Team softdev Linux driver is to provide a
+libteam: mechanism to team multiple NICs (ports) into one logical one (teamdev)
+libteam: at L2 layer. The process is called "channel bonding", "Ethernet
+libteam: bonding", "channel teaming", "link aggregation", etc. This is already
+libteam: implemented in the Linux kernel by the bonding driver.
+libteam:
+libteam:
+libteam: Homepage: http://libteam.org/
+libteam:
diff --git a/network/libtls/README b/network/libtls/README
new file mode 100644
index 0000000000..960ec647d0
--- /dev/null
+++ b/network/libtls/README
@@ -0,0 +1,12 @@
+The tls family of functions establishes a secure communications channel
+using the TLS socket protocol. Both clients and servers are supported.
+
+A TLS connection object is created by tls_client(3) or tls_server(3) and
+configured with tls_configure(3).
+
+This also includes a TLS-enabled version of netcat (libressl-nc).
+
+************************************************************************
+NOTE! The libressl package already contains libtls.
+It's recommended to uninstall this before installing libressl.
+************************************************************************
diff --git a/network/libtls/libtls.SlackBuild b/network/libtls/libtls.SlackBuild
new file mode 100644
index 0000000000..a36c2f04d4
--- /dev/null
+++ b/network/libtls/libtls.SlackBuild
@@ -0,0 +1,110 @@
+#!/bin/bash
+
+# slackbuild script for libtls by D Woodfall
+#
+# WTFPL licence 2023
+
+# BUILD 2: Thanks to Naglfar:
+#
+#    --with-openssldir=/etc/libressl \
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=libtls
+SRCNAM=libressl
+VERSION=${VERSION:-3.7.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
+chown -R root:root .
+find . -perm /111 -a \! -perm 755 -a -exec chmod 755 {} + \
+ -o \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} +
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --enable-libtls-only \
+  --enable-nc \
+  --disable-tests \
+  --disable-static \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc/libressl \
+  --with-openssldir=/etc/libressl \
+  --program-prefix "libressl-" \
+  --mandir=/usr/man \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --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
+
+gzip -9 $PKG/usr/man/man1/libressl-nc.1
+
+mkdir -p $PKG/usr/man/man3
+
+for page in \
+  tls_client.3 tls_config_ocsp_require_stapling.3 \
+  tls_config_set_protocols.3 tls_config_set_session_id.3 tls_config_verify.3 \
+  tls_conn_version.3 tls_connect.3 tls_init.3 tls_load_file.3 \
+  tls_ocsp_process_response.3 tls_read.3; do
+  gzip -9c man/$page > $PKG/usr/man/man3/$page.gz
+done
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+  COPYING ChangeLog README.md \
+  $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/network/libtls/libtls.info b/network/libtls/libtls.info
new file mode 100644
index 0000000000..63e80c1de2
--- /dev/null
+++ b/network/libtls/libtls.info
@@ -0,0 +1,10 @@
+PRGNAM="libtls"
+VERSION="3.7.1"
+HOMEPAGE="https://www.libressl.org"
+DOWNLOAD="https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-3.7.1.tar.gz"
+MD5SUM="133f11e478f46528414245dccb6355f2"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="D Woodfall"
+EMAIL="dave@slackbuilds.org"
diff --git a/network/libtls/slack-desc b/network/libtls/slack-desc
new file mode 100644
index 0000000000..df5dc9b3b8
--- /dev/null
+++ b/network/libtls/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+      |-----handy-ruler------------------------------------------------------|
+libtls: libtls (a new TLS library by OpenBSD, part of libreSSL)
+libtls:
+libtls: The tls family of functions establishes a secure communications
+libtls: channel using the TLS socket protocol. Both clients and servers are
+libtls: supported.
+libtls:
+libtls: This also includes a TLS-enabled version of netcat (nc-tls).
+libtls:
+libtls: https://www.libtls.org
+libtls:
+libtls:
diff --git a/network/libvarlink/README b/network/libvarlink/README
new file mode 100644
index 0000000000..3311772b05
--- /dev/null
+++ b/network/libvarlink/README
@@ -0,0 +1,12 @@
+Varlink is an interface description format and protocol that aims to
+make services accessible to both humans and machines in the simplest
+feasible way.
+
+A varlink interface combines the classic UNIX command line options,
+STDIN/OUT/ERROR text formats, man pages, service metadata and provides
+the equivalent over a single file descriptor, a.k.a. “FD3”.
+
+Varlink is plain-text, type-safe, discoverable, self-documenting,
+remotable, testable, easy to debug. Varlink is accessible from any
+programming environment. See the Ideals page for more. And everybody
+likes Screenshots.
diff --git a/network/libvarlink/libvarlink.SlackBuild b/network/libvarlink/libvarlink.SlackBuild
new file mode 100644
index 0000000000..9153b3d44c
--- /dev/null
+++ b/network/libvarlink/libvarlink.SlackBuild
@@ -0,0 +1,116 @@
+#!/bin/bash
+
+# Slackware build script for libvarlink
+
+# 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=libvarlink
+VERSION=${VERSION:-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 [ ! -z "${PRINT_PACKAGE_NAME}" ]; 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 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
+
+
+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/network/libvarlink/libvarlink.info b/network/libvarlink/libvarlink.info
new file mode 100644
index 0000000000..e089879958
--- /dev/null
+++ b/network/libvarlink/libvarlink.info
@@ -0,0 +1,10 @@
+PRGNAM="libvarlink"
+VERSION="23"
+HOMEPAGE="https://github.com/varlink/libvarlink/"
+DOWNLOAD="https://github.com/varlink/libvarlink/archive/refs/tags/23/libvarlink-23.tar.gz"
+MD5SUM="f5fb14310ba55a67c1927cef41e759ad"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Lockywolf"
+EMAIL="for_sbo.libvarlink_2023-07-12@lockywolf.net"
diff --git a/network/libvarlink/slack-desc b/network/libvarlink/slack-desc
new file mode 100644
index 0000000000..3b4cc52c09
--- /dev/null
+++ b/network/libvarlink/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+          |-----handy-ruler------------------------------------------------------|
+libvarlink: libvarlink (C implementation of the Varlink protocol and cmd tool)
+libvarlink:
+libvarlink: Varlink is an interface description format and protocol that aims to
+libvarlink: make services accessible to both humans and machines in the simplest
+libvarlink: feasible way.
+libvarlink:
+libvarlink:
+libvarlink:
+libvarlink:
+libvarlink:
+libvarlink:
diff --git a/network/licq/README b/network/licq/README
deleted file mode 100644
index a887fc2b43..0000000000
--- a/network/licq/README
+++ /dev/null
@@ -1,11 +0,0 @@
-Licq is an instant messaging client for *nix Systems. It is a full
-featured ICQ client, although Jabber support has been added recently
-as well. It features a plugin structure that allows for different
-front ends, protocols and more.
-
-By default the qt4-gui, console, auto-reply and aosd plugins are
-built. This requires libaosd as well as cdk and can be overridden by
-setting the PLUGINS environment variable to a space seperated list of
-auto-reply, forwarder, osd, rms, aosd, console, jabber, msn, qt4-gui.
-
-Optional dependencies are libxosd for the osd and gloox for jabber.
diff --git a/network/licq/doinst.sh b/network/licq/doinst.sh
deleted file mode 100644
index 5fb28930db..0000000000
--- a/network/licq/doinst.sh
+++ /dev/null
@@ -1,3 +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/network/licq/licq.SlackBuild b/network/licq/licq.SlackBuild
deleted file mode 100644
index b3acf64cf6..0000000000
--- a/network/licq/licq.SlackBuild
+++ /dev/null
@@ -1,119 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for licq
-# Written by Michael Filz <the_emmel@gmx.net>
-
-# Ryan P.C. McQuen | Everett, 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=licq
-VERSION=${VERSION:-1.8.2}
-BUILD=${BUILD:-2}
-TAG=${TAG:-_SBo}
-PLUGINS=${PLUGINS:-"aosd auto-reply forwarder icq jabber msn \
-                    osd qt4-gui rms"}
-
-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 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 VERBOSE=1
-make install DESTDIR=$PKG
-
-cd ../plugins
-
-for PLUG in $PLUGINS
-do
-	cd $PLUG
-	mkdir -p build
-	cd build
-	  cmake \
-	    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
-	    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS -I$PKG/usr/include" \
-	    -DCMAKE_INSTALL_PREFIX=/usr \
-	    -DCMAKE_BUILD_TYPE=Release \
-	    -DCMAKE_MODULE_PATH=$PKG/usr/share/licq/cmake \
-	    ..
-	  make VERBOSE=1
-	  make install DESTDIR=$PKG
-	cd ../..
-done
-
-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 -ar INSTALL LICENSE 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
-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/network/licq/licq.info b/network/licq/licq.info
deleted file mode 100644
index 7c5063268a..0000000000
--- a/network/licq/licq.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="licq"
-VERSION="1.8.2"
-HOMEPAGE="http://www.licq.org"
-DOWNLOAD="http://downloads.sourceforge.net/licq/licq-1.8.2.tar.bz2"
-MD5SUM="46af2bc95865ee61a103d27812fe6e6a"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="cdk gloox libaosd xosd"
-MAINTAINER="orphaned - no maintainer"
-EMAIL="nobody@nowhere"
diff --git a/network/licq/slack-desc b/network/licq/slack-desc
deleted file mode 100644
index 6e4f073cda..0000000000
--- a/network/licq/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------------------------------------------------------|
-licq: licq (ICQ instant messenger)
-licq:
-licq: Licq is an instant messaging client for *nix Systems. It is a full
-licq: featured ICQ client, although Jabber support has been added recently
-licq: as well. It features a plugin structure that allows for different
-licq: front ends, protocols and more.
-licq:
-licq:
-licq:
-licq: For more information see the Licq home page at
-licq: http://www.licq.org
diff --git a/network/liferea/liferea.SlackBuild b/network/liferea/liferea.SlackBuild
index 29e1bbc9bb..bb97d03143 100644
--- a/network/liferea/liferea.SlackBuild
+++ b/network/liferea/liferea.SlackBuild
@@ -1,9 +1,9 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for Liferea
 
 # Copyright 2009-2015  Erik W. Hanson, Minneapolis, MN, USA
-# Copyright 2018 Andrzej Telszewski, Szczecin
+# Copyright 2019 Andrzej Telszewski, Szczecin
 # 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=liferea
-VERSION=${VERSION:-1.12.6b}
-BUILD=${BUILD:-1}
+VERSION=${VERSION:-1.12.7}
+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,6 +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 {} \;
 
+# https://github.com/lwindolf/liferea/issues/767
+export WEBKIT_DISABLE_COMPOSITING_MODE=1
+
 CFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
@@ -99,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/network/liferea/liferea.info b/network/liferea/liferea.info
index 8c89bec527..e00d50f01c 100644
--- a/network/liferea/liferea.info
+++ b/network/liferea/liferea.info
@@ -1,10 +1,10 @@
 PRGNAM="liferea"
-VERSION="1.12.6b"
+VERSION="1.12.7"
 HOMEPAGE="https://lzone.de/liferea/"
-DOWNLOAD="https://github.com/lwindolf/liferea/releases/download/v1.12.6/liferea-1.12.6b.tar.bz2"
-MD5SUM="4880b2a1af9a7e79dbdc9a5db7d69ae9"
+DOWNLOAD="https://github.com/lwindolf/liferea/releases/download/v1.12.7/liferea-1.12.7.tar.bz2"
+MD5SUM="e693e92018539910464fab9791f63e01"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="json-glib libpeas webkit2gtk pygobject3-python3"
+REQUIRES="libpeas webkit2gtk"
 MAINTAINER="Andrzej Telszewski"
 EMAIL="atelszewski@gmail.com"
diff --git a/network/light-firefox/README b/network/light-firefox/README
deleted file mode 100644
index 42f0184cde..0000000000
--- a/network/light-firefox/README
+++ /dev/null
@@ -1,3 +0,0 @@
-A light browser based on Mozilla source code. Many components are slimmed down.
-So it can start faster and use less memory. By default, Light can run along with
-firefox. Both x86 and x64 builds are available.
diff --git a/network/light-firefox/doinst.sh b/network/light-firefox/doinst.sh
deleted file mode 100644
index 5fb28930db..0000000000
--- a/network/light-firefox/doinst.sh
+++ /dev/null
@@ -1,3 +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/network/light-firefox/light-firefox.SlackBuild b/network/light-firefox/light-firefox.SlackBuild
deleted file mode 100644
index c6b85ac630..0000000000
--- a/network/light-firefox/light-firefox.SlackBuild
+++ /dev/null
@@ -1,114 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for light-firefox
-
-# Copyright 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=light-firefox
-SRCNAM=$(printf $PRGNAM | cut -c1-5)
-VERSION=${VERSION:-48.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
-
-SRCARCH="linux-i686"
-if [ "$ARCH" = "x86_64" ]; then
-  SRCARCH=linux-$ARCH
-fi
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-$VERSION
-mkdir $PRGNAM-$VERSION && cd $PRGNAM-$VERSION
-rpm2cpio $CWD/$SRCNAM-$VERSION.$SRCARCH.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 {} \;
-
-# Install data
-mkdir -p $PKG/opt/$PRGNAM-$VERSION
-cp -rf * $PKG/opt/$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
-
-# Create soft link for launcher
-mkdir -p $PKG/usr/bin
-(
- cd $PKG/usr/bin
- ln -sf /opt/$PRGNAM-$VERSION/usr/local/lib/light/light-bin $PRGNAM
-)
-
-# Fix .desktop file
-sed -i -e "s/Name=Light/Name=Light Firefox/" -e "s/Exec=light/Exec=$PRGNAM/" -e \
-    "s/Icon=light/Icon=$PRGNAM/" usr/local/share/applications/mozilla-$SRCNAM.desktop
-
-# Install .desktop file
-mkdir -p $PKG/usr/share/applications
-cat usr/local/share/applications/mozilla-$SRCNAM.desktop > \
-    $PKG/usr/share/applications/$PRGNAM.desktop
-
-# Install .desktop icon
-mkdir -p $PKG/usr/share/pixmaps
-install -D -m0644 usr/local/share/icons/hicolor/48x48/apps/$SRCNAM.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/network/light-firefox/light-firefox.info b/network/light-firefox/light-firefox.info
deleted file mode 100644
index a6e691aa7f..0000000000
--- a/network/light-firefox/light-firefox.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="light-firefox"
-VERSION="48.0"
-HOMEPAGE="https://sourceforge.net/projects/lightfirefox/"
-DOWNLOAD="https://sourceforge.net/projects/lightfirefox/files/48/201607300954_gcc232/light-48.0.linux-i686.rpm"
-MD5SUM="a7bb40fbe7787c90a09e3f18de43e8ec"
-DOWNLOAD_x86_64="http://downloads.sourceforge.net/project/lightfirefox/48/201607300931_gcc2/light-48.0.linux-x86_64.rpm"
-MD5SUM_x86_64="c14047d4a173b699b6ed865e6ce38eb9"
-REQUIRES=""
-MAINTAINER="Dimitris Zlatanidis"
-EMAIL="d.zlatanidis@gmail.com"
diff --git a/network/light-firefox/slack-desc b/network/light-firefox/slack-desc
deleted file mode 100644
index 8953a5ea77..0000000000
--- a/network/light-firefox/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------------------------------------------------------|
-light-firefox: light-firefox (A light browser based on Mozilla)
-light-firefox:
-light-firefox: A light browser based on Mozilla source code. Many components are
-light-firefox: slimmed down. So it can start faster and use less memory. By default,
-light-firefox: Light can run along with firefox. Both x86 and x64 builds are
-light-firefox: available.
-light-firefox:
-light-firefox: Homepage: https://sourceforge.net/projects/lightfirefox/
-light-firefox:
-light-firefox:
-light-firefox:
diff --git a/network/lighttpd/conf/lighttpd.conf b/network/lighttpd/conf/lighttpd.conf
index bc88c5bd85..e54b720aa8 100644
--- a/network/lighttpd/conf/lighttpd.conf
+++ b/network/lighttpd/conf/lighttpd.conf
@@ -11,11 +11,11 @@
 ## Some Variable definition which will make chrooting easier.
 ##
 ## if you add a variable here. Add the corresponding variable in the
-## chroot example aswell.
+## chroot example as well.
 ##
 var.log_root    = "/var/log/lighttpd"
 var.server_root = "/srv/www"
-var.state_dir   = "/var/run/lighttpd"
+var.state_dir   = "/run/lighttpd"
 var.home_dir    = "/var/lib/lighttpd"
 var.conf_dir    = "/etc/lighttpd"
 
@@ -24,7 +24,7 @@ var.conf_dir    = "/etc/lighttpd"
 ## 
 ## This requires root permissions during startup.
 ##
-## If you run Chrooted set the the variables to directories relative to
+## If you run chroot'ed, set the variables to directories relative to
 ## the chroot dir.
 ##
 ## example chroot configuration:
@@ -53,10 +53,10 @@ var.conf_dir    = "/etc/lighttpd"
 var.vhosts_dir  = server_root + "/vhosts"
 
 ##
-## Cache for mod_compress
+## Cache for mod_deflate
 ##
 ## used in:
-## conf.d/compress.conf
+## conf.d/deflate.conf
 ##
 var.cache_dir   = "/var/cache/lighttpd"
 
@@ -75,7 +75,7 @@ var.socket_dir  = home_dir + "/sockets"
 #######################################################################
 ##
 ## Load the modules.
-include "modules.conf"
+include conf_dir + "/modules.conf"
 
 ##
 #######################################################################
@@ -88,15 +88,9 @@ include "modules.conf"
 server.port = 80
 
 ##
-## Use IPv6?
-##
-# https://redmine.lighttpd.net/projects/lighttpd/wiki/Server_use-ipv6Details
-server.use-ipv6 = "disable"
-
-##
 ## bind to a specific IP
+## (default: "*" for all local IPv4 interfaces)
 ##
-# https://redmine.lighttpd.net/projects/lighttpd/wiki/Server_bindDetails
 #server.bind = "localhost"
 
 ##
@@ -106,6 +100,12 @@ server.use-ipv6 = "disable"
 server.username  = "@USER@"
 server.groupname = "@GROUP@"
 
+##
+## Enable lighttpd to serve requests on sockets received from systemd
+## https://www.freedesktop.org/software/systemd/man/systemd.socket.html
+##
+#server.systemd-socket-activation = "enable"
+
 ## 
 ## enable core files.
 ##
@@ -114,7 +114,7 @@ server.groupname = "@GROUP@"
 ##
 ## Document root
 ##
-server.document-root = server_root + "/htdocs-lighttpd"
+server.document-root = server_root + "/htdocs"
 
 ##
 ## The value for the "Server:" response field.
@@ -151,13 +151,13 @@ server.errorlog             = log_root + "/error.log"
 ##
 ## Access log config
 ## 
-include "conf.d/access_log.conf"
+include conf_dir + "/conf.d/access_log.conf"
 
 ##
 ## The debug options are moved into their own file.
 ## see conf.d/debug.conf for various options for request debugging.
 ##
-include "conf.d/debug.conf"
+include conf_dir + "/conf.d/debug.conf"
 
 ##
 #######################################################################
@@ -168,29 +168,26 @@ include "conf.d/debug.conf"
 ## --------------------
 ##
 ## corresponding documentation:
-## http://www.lighttpd.net/documentation/performance.html
+## https://wiki.lighttpd.net/Docs_Performance
 ##
 ## set the event-handler (read the performance section in the manual)
 ##
-## possible options on linux are:
+## The recommended server.event-handler is chosen by default for each OS.
 ##
-## select
-## poll
-## linux-sysepoll
+## epoll  (recommended on Linux)
+## kqueue (recommended on *BSD and MacOS X)
+## solaris-eventports (recommended on Solaris)
+## poll   (recommended if none of above are available)
+## select (*not* recommended)
 ##
-## linux-sysepoll is recommended on kernel 2.6.
-##
-server.event-handler = "linux-sysepoll"
+#server.event-handler = "linux-sysepoll"
 
 ##
 ## The basic network interface for all platforms at the syscalls read()
 ## and write(). Every modern OS provides its own syscall to help network
 ## servers transfer files as fast as possible 
 ##
-## sendfile       - is recommended for small files.
-## writev         - is recommended for sending many large files
-##
-server.network-backend = "sendfile"
+#server.network-backend = "sendfile"
 
 ##
 ## As lighttpd is a single-threaded server, its main resource limit is
@@ -204,9 +201,12 @@ server.network-backend = "sendfile"
 ## server.username/server.groupname.
 ##
 ## By default lighttpd would not change the operation system default.
-## But setting it to 2048 is a better default for busy servers.
+## But setting it to 16384 is a better default for busy servers.
+##
+## With SELinux enabled, this is denied by default and needs to be allowed
+## by running the following once: setsebool -P httpd_setrlimit on
 ##
-server.max-fds = 2048
+server.max-fds = 16384
 
 ##
 ## listen-backlog is the size of the listen() backlog queue requested when
@@ -243,17 +243,17 @@ server.max-fds = 2048
 ## lighttpd can utilize FAM/Gamin to cache stat call.
 ##
 ## possible values are:
-## disable, simple or fam.
+## disable, simple, inotify, kqueue, or fam.
 ##
-server.stat-cache-engine = "simple"
+#server.stat-cache-engine = "simple"
 
 ##
 ## Fine tuning for the request handling
 ##
-## max-connections == max-fds/2 (maybe /3)
-## means the other file handles are used for fastcgi/files
+## max-connections == max-fds/3)
+## (other file handles are used for fastcgi/files)
 ##
-server.max-connections = 1024
+#server.max-connections = 1024
 
 ##
 ## How many seconds to keep a keep-alive connection open,
@@ -341,10 +341,11 @@ url.access-deny             = ( "~", ".inc" )
 ##
 ## disable range requests for pdf files
 ## workaround for a bug in the Acrobat Reader plugin.
+## (ancient; should no longer be needed)
 ##
-$HTTP["url"] =~ "\.pdf$" {
-  server.range-requests = "disable"
-}
+#$HTTP["url"] =~ "\.pdf$" {
+#  server.range-requests = "disable"
+#}
 
 ##
 ## url handling modules (rewrite, redirect)
@@ -382,22 +383,22 @@ static-file.exclude-extensions = ( ".php", ".pl", ".fcgi", ".scgi" )
 ## Format: <errorfile-prefix><status-code>.html
 ## -> ..../status-404.html for 'File not found'
 ##
-#server.errorfile-prefix    = "/srv/www/htdocs/errors/status-"
+#server.errorfile-prefix    = server_root + "/htdocs/errors/status-"
 
 ##
 ## mimetype mapping
 ##
-include "conf.d/mime.conf"
+include conf_dir + "/conf.d/mime.conf"
 
 ##
 ## directory listing configuration
 ##
-include "conf.d/dirlisting.conf"
+include conf_dir + "/conf.d/dirlisting.conf"
 
 ##
 ## Should lighttpd follow symlinks?
-## 
-server.follow-symlink = "enable"
+## default: "enable"
+#server.follow-symlink = "enable"
 
 ##
 ## force all filenames to be lowercase?
@@ -406,80 +407,44 @@ server.follow-symlink = "enable"
 
 ##
 ## defaults to /var/tmp as we assume it is a local harddisk
-##
-server.upload-dirs = ( "/var/tmp" )
+## default: "/var/tmp"
+#server.upload-dirs = ( "/var/tmp" )
 
 ##
 #######################################################################
 
-
 #######################################################################
 ##
 ##  SSL Support
 ## ------------- 
 ##
+## https://wiki.lighttpd.net/Docs_SSL
+#
 ## To enable SSL for the whole server you have to provide a valid
 ## certificate and have to enable the SSL engine.::
 ##
-##   ssl.engine = "enable"
-##   ssl.pemfile = "/path/to/server.pem"
-##
-## The HTTPS protocol does not allow you to use name-based virtual
-## hosting with SSL. If you want to run multiple SSL servers with
-## one lighttpd instance you must use IP-based virtual hosting: ::
-##
-## Mitigate CVE-2009-3555 by disabling client triggered renegotation
-## This is enabled by default.
-##
-## IMPORTANT: this setting can only be used in the global scope.
-## It does *not* work inside conditionals
-##
-#   ssl.disable-client-renegotiation = "enable"
-##
-##   $SERVER["socket"] == "10.0.0.1:443" {
-##     ssl.engine                  = "enable"
-##     ssl.pemfile                 = "/etc/ssl/private/www.example.com.pem"
-##     #
-##     # (Following SSL/TLS Deployment Best Practices 1.3 / 17 September 2013 from:
-##     # https://www.ssllabs.com/projects/best-practices/index.html)
-##     # - BEAST is considered mitigaed on client side now, and new weaknesses have been found in RC4,
-##     #   so it is strongly advised to disable RC4 ciphers (HIGH doesn't include RC4)
-##     # - It is recommended to disable 3DES too (although disabling RC4 and 3DES breaks IE6+8 on Windows XP,
-##     #   so you might want to support 3DES for now - just remove the '!3DES' parts below).
-##     # - The examples below prefer ciphersuites with "Forward Secrecy" (and ECDHE over DHE (alias EDH)), remove '+kEDH +kRSA'
-##     #   if you don't want that.
-##     # - SRP and PSK are not supported anyway, excluding those ('!kSRP !kPSK') just keeps the list smaller (easier to review)
-##     # Check your cipher list with: openssl ciphers -v '...' (use single quotes as your shell won't like ! in double quotes)
-##     #
-##     # If you know you have RSA keys (standard), you can use:
-##     ssl.cipher-list             = "aRSA+HIGH !3DES +kEDH +kRSA !kSRP !kPSK"
-##     # The more generic version (without the restriction to RSA keys) is
-##     # ssl.cipher-list           = "HIGH !aNULL !3DES +kEDH +kRSA !kSRP !kPSK"
-##     #
-##     # Make the server prefer the order of the server side cipher suite instead of the client suite.
-##     # This option is enabled by default, but only used if ssl.cipher-list is set.
-##     #
-##     # ssl.honor-cipher-order = "enable"
-##     #
-##     server.name                 = "www.example.com"
-##
-##     server.document-root        = "/srv/www/vhosts/example.com/www/"
-##   }
-##
-
-## If you have a .crt and a .key file, cat them together into a
-## single PEM file:
-## $ cat /etc/ssl/private/lighttpd.key /etc/ssl/certs/lighttpd.crt \
-##   > /etc/ssl/private/lighttpd.pem
+##   server.modules += ( "mod_openssl" )
 ##
-#ssl.pemfile = "/etc/ssl/private/lighttpd.pem"
-
+##   ssl.privkey = "/path/to/privkey.pem"
+##   ssl.pemfile = "/path/to/fullchain.pem"
+##   # ssl.pemfile should contain the sorted certificate chain, including
+##   # intermediate certificates, as provided by the certificate issuer.
+##   # If both privkey and cert are in same file, specify only ssl.pemfile.
 ##
-## optionally pass the CA certificate here.
+##   # Check your cipher list with: openssl ciphers -v '...'
+##   # (use single quotes with: openssl ciphers -v '...'
+##   #  as your shell won't like ! in double quotes)
+##   #ssl.cipher-list            = "HIGH"   # default
 ##
+##   # (recommended to accept only TLSv1.2 and TLSv1.3)
+##   #ssl.openssl.ssl-conf-cmd = ("MinProtocol" => "TLSv1.2")  # default
 ##
-#ssl.ca-file = ""
-
+##   $SERVER["socket"] == "*:443" {
+##     ssl.engine  = "enable"
+##   }
+##   $SERVER["socket"] == "[::]:443" {
+##     ssl.engine  = "enable"
+##   }
 ##
 #######################################################################
 
@@ -487,7 +452,7 @@ server.upload-dirs = ( "/var/tmp" )
 ##
 ## custom includes like vhosts.
 ##
-#include "conf.d/config.conf"
-#include_shell "cat /etc/lighttpd/vhosts.d/*.conf"
+#include conf_dir + "/conf.d/config.conf"
+#include conf_dir + "/vhosts.d/*.conf"
 ##
 #######################################################################
diff --git a/network/lighttpd/conf/rc.lighttpd b/network/lighttpd/conf/rc.lighttpd
index d2357dfc1a..d8db582c6f 100644
--- a/network/lighttpd/conf/rc.lighttpd
+++ b/network/lighttpd/conf/rc.lighttpd
@@ -21,7 +21,7 @@
 #
 
 LIGHTTPD=/usr/sbin/lighttpd
-PIDFILE=/var/run/lighttpd/lighttpd.pid
+PIDFILE=/run/lighttpd/lighttpd.pid
 LIGHTTPD_OPTIONS="-f /etc/lighttpd/lighttpd.conf"
 
 is_pidof() {
diff --git a/network/lighttpd/lighttpd.SlackBuild b/network/lighttpd/lighttpd.SlackBuild
index 2896415dfc..6f11dbac3e 100644
--- a/network/lighttpd/lighttpd.SlackBuild
+++ b/network/lighttpd/lighttpd.SlackBuild
@@ -1,9 +1,9 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for lighttpd
 
 # Copyright (c) 2007 Daniel de Kok <moc.mikciat@leinad>
-# Copyright 2016-2019 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
@@ -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=lighttpd
-VERSION=${VERSION:-1.4.54}
+VERSION=${VERSION:-1.4.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}
@@ -91,6 +101,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 {} \;
 
+./autogen.sh
+
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
@@ -152,4 +164,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/network/lighttpd/lighttpd.info b/network/lighttpd/lighttpd.info
index b720dc87b4..e66a015e97 100644
--- a/network/lighttpd/lighttpd.info
+++ b/network/lighttpd/lighttpd.info
@@ -1,8 +1,8 @@
 PRGNAM="lighttpd"
-VERSION="1.4.54"
+VERSION="1.4.76"
 HOMEPAGE="http://www.lighttpd.net/"
-DOWNLOAD="http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-1.4.54.tar.xz"
-MD5SUM="7abc776243c811e9872f73ab38b7f8b5"
+DOWNLOAD="http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-1.4.76.tar.xz"
+MD5SUM="f9018cda389b1aa6dae4c5f962c20825"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/network/lighttpd2/README b/network/lighttpd2/README
deleted file mode 100644
index 436ac72ecd..0000000000
--- a/network/lighttpd2/README
+++ /dev/null
@@ -1,30 +0,0 @@
-lighttpd2 is a fast, secure, and flexible webserver. It is optimized
-for high-performance environments, and provides an extensive feature 
-set, including FastCGI, CGI, Auth, output compression, and URL
-rewriting support.
-
-This version currently is a work in progress: it's not ready for
-production: only for interested people.
-
-
-Optional Dependencies
-
-libunwind is an optional dependency (for backtraces on assert
-failures): after having it installed, build this passing the script
-the UNWIND=yes flag.
-
-
-Groupname and Username
-
-You must have the 'lighttpd' group and user to run this script,
-for example:
-
-  groupadd -g 208 lighttpd
-  useradd -u 208 -g lighttpd -d /var/www lighttpd
-
-
-Configuration
-
-Be sure to see README.SLACKWARE (in this directory, and also installed
-with the package documentation) for configuration and setup
-information.
diff --git a/network/lighttpd2/README.SLACKWARE b/network/lighttpd2/README.SLACKWARE
deleted file mode 100644
index 710dbaadc4..0000000000
--- a/network/lighttpd2/README.SLACKWARE
+++ /dev/null
@@ -1,53 +0,0 @@
-README.SLACKWARE For lighttpd2
-
-lighttpd2 can be started and stopped through the initialization
-script that is provided:
-
-  /etc/rc.d/rc.lighttpd2 start
-  /etc/rc.d/rc.lighttpd2 stop
-
-If you would like to start lighttpd automatically when the system
-is booted, add the following lines to /etc/rc.d/rc.local:
-
-  if [ -x /etc/rc.d/rc.lighttpd2 ]; then
-    /etc/rc.d/rc.lighttpd2 start
-  fi
-
-Conversely, add the following lines to /etc/rc.d/rc.local_shutdown
-to stop lighttpd on system shutdown.
-
-  if [ -x /etc/rc.d/rc.lighttpd2 ]; then
-    /etc/rc.d/rc.lighttpd2 stop
-  fi
-
-* PHP users:  
-
-This slackbuild is already preconfigured (but is disabled by default)
-for an use with php in /etc/lighttpd2/lighttpd.conf and uses php-fpm
-already in Slackware.
-
-You have to make two changes to /etc/php-fpm.conf, namely
-
-  user = lighttpd
-  listen = /var/run/lighttpd2/php-fpm.sock
-  listen.owner = lighttpd
-  listen.mode = 0660
-
-Then make /etc/rc.d/rc.php-fpm executable and start it (for an
-automatic start/stop, do as for the rc.lighttpd2 script).
-
-Enable php uncommenting the last line of /etc/lighttpd2/lighttpd.conf
-(you might want to have a look at the "index" directive too).
-
-The php.ini used will be /etc/php.ini: you can also override options
-set in this file adding them at the end of /etc/php-fpm.conf
-(you will find some examples there).
-
-Note: Slackware's default php package is meant to work with httpd
-(apache), so its session folder has permissions root:apache.
-It works fine with lighttpd assumed the addition of the user lighttpd
-run as to the "apache" group. If you have choosen the user "lighttpd"
-
-  gpasswd -a lighttpd apache
-
-Otherwise, php won't be able to use $_SESSION.
diff --git a/network/lighttpd2/conf/angel.conf b/network/lighttpd2/conf/angel.conf
deleted file mode 100644
index d02e674fe5..0000000000
--- a/network/lighttpd2/conf/angel.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-user "lighttpd";
-group "lighttpd";
-
-max_open_files 16384;
-
-copy_env ( "PATH" );
diff --git a/network/lighttpd2/conf/lighttpd.conf b/network/lighttpd2/conf/lighttpd.conf
deleted file mode 100644
index 1a62342940..0000000000
--- a/network/lighttpd2/conf/lighttpd.conf
+++ /dev/null
@@ -1,95 +0,0 @@
-# Sample /etc/lighttpd2/lighttpd.conf file
-# Assembled and commented by Matteo Bernardini <ponce@slackbuilds.org>
-
-# Default modules here should cover most needs: if you want to cut
-# down some, consider that mod_access and mod_accesslog are mandatory.
-# http://redmine.lighttpd.net/projects/lighttpd2/wiki/Modules
-setup {
-	module_load ( "mod_fastcgi", "mod_status", "mod_access", "mod_accesslog", "mod_dirlist", "mod_deflate", "mod_redirect", "mod_rewrite", "mod_vhost", "mod_lua" );
-#		mod_access,
-#		mod_accesslog,
-#		mod_auth,
-#		mod_balance,
-#		mod_cache_disk_etag,
-#		mod_debug,
-#		mod_deflate,
-#		mod_dirlist,
-#		mod_expire,
-#		mod_fastcgi,
-#		mod_flv,
-#		mod_fortune,
-#		mod_limit,
-#		mod_lua,
-#		mod_memcached,
-#		mod_openssl,
-#		mod_progress,
-#		mod_proxy,
-#		mod_redirect,
-#		mod_rewrite,
-#		mod_scgi,
-#		mod_status,
-#		mod_userdir,
-#		mod_vhost,
-
-	lua.plugin "/etc/lighttpd2/php-fpm.lua";
-
-	listen "0.0.0.0:80";
-	listen "[::]:80";
-
-	log ["debug" => "", "*" => "/var/log/lighttpd2/error.log"];
-	accesslog "/var/log/lighttpd2/access.log";
-	accesslog.format "%h %V %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"";
-
-	static.exclude_extensions ( ".php", ".pl", ".fcgi", "~", ".inc" );
-}
-
-# http://redmine.lighttpd.net/projects/lighttpd2/wiki/Conditions
-
-# Run php through php-fpm: be sure to read README.SLACKWARE
-# http://redmine.lighttpd.net/projects/lighttpd2/wiki/Howto_PHP
-php = {
-	phpfpm { fastcgi "unix:/var/run/lighttpd2/php-fpm.sock"; };
-};
-
-if req.path == "/status" { status.info; }
-
-include "/etc/lighttpd2/mimetypes.conf";
-
-docroot "/var/www/htdocs-lighttpd";
-
-# If you install phpmyadmin from the SBo script, it should go there.
-# Uncomment below, after having installed.
-#alias ( "/phpmyadmin" => "/var/www/htdocs/phpmyadmin" );
-
-# Directory listings are enabled by default only for an eventual
-# "pub" folder in the docroot: change as needed.
-# http://redmine.lighttpd.net/projects/lighttpd2/wiki/Mod_dirlist
-if req.path =~ "^/pub/" {
-	dirlist;
-}
-
-# Directory index files: this commented below can be useful if you
-# enable php.
-#index ( "index.php", "index.html" );
-index ( "index.html" );
-
-# If you want to use urls like http://example.com/index.php/some/path
-# (using your php files like directories), you need this (ex. wordpress)
-#pathinfo;
-
-# Some useful rules to avoid access to sensitive files from remote.
-# This example still applies to wordpress
-#if req.remoteip != "127.0.0.1" {
-#	if req.path =~ "^/wp-includes/" { access.deny; }
-#}
-
-# Deny access to some file-extensions
-# ~    is for backupfiles from vi, emacs, joe, ...
-# .inc is often used for code includes which should in general not be
-#      part of the document-root
-if phys.path =$ "~" or phys.path =$ ".inc" {
-	if phys.is_file { access.deny; }
-}
-
-# Uncomment this to enable php
-#php;
diff --git a/network/lighttpd2/conf/lighttpd2.logrotate b/network/lighttpd2/conf/lighttpd2.logrotate
deleted file mode 100644
index a85c1efc23..0000000000
--- a/network/lighttpd2/conf/lighttpd2.logrotate
+++ /dev/null
@@ -1,32 +0,0 @@
-/var/log/lighttpd2/access.log /var/log/lighttpd2/error.log {
-	daily
-	missingok
-	copytruncate
-	rotate 30
-	create 0644 @LIGHTTPD_USER@ root
-	compress
-	notifempty
-	su lighttpd root
-        sharedscripts
-	postrotate
-	if [ -x /etc/rc.d/rc.lighttpd2 -a -f /var/run/lighttpd2/lighttpd2.pid ]; then
-		/etc/rc.d/rc.lighttpd2 restart
-	fi
-	endscript
-}
-
-/var/log/lighttpd2/lighttpd2.log {
-	daily
-	missingok
-	copytruncate
-	rotate 30
-	create 0644 root root
-	compress
-	notifempty
-        sharedscripts
-	postrotate
-	if [ -x /etc/rc.d/rc.lighttpd2 -a -f /var/run/lighttpd2/lighttpd2.pid ]; then
-		/etc/rc.d/rc.lighttpd2 restart
-	fi
-	endscript
-}
diff --git a/network/lighttpd2/conf/php-fpm.lua b/network/lighttpd2/conf/php-fpm.lua
deleted file mode 100644
index f26bb9d796..0000000000
--- a/network/lighttpd2/conf/php-fpm.lua
+++ /dev/null
@@ -1,10 +0,0 @@
-local function phpfpm(act)
-	return action.when(physical.path:suffix(".php"),
-		action.when(physical.is_file:is(), act),
-		action.when(request.path:eq("/fpm-status"), act)
-	)
-end
-
-actions = {
-	["phpfpm"] = phpfpm,
-}
diff --git a/network/lighttpd2/conf/rc.lighttpd2 b/network/lighttpd2/conf/rc.lighttpd2
deleted file mode 100644
index 635092e071..0000000000
--- a/network/lighttpd2/conf/rc.lighttpd2
+++ /dev/null
@@ -1,70 +0,0 @@
-#!/bin/sh
-# Copyright (c) 2007, Daniel de Kok <moc.mikciat@leinad>
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
-#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
-#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (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 for lighttpd2 by Matteo Bernardini <ponce@slackbuilds.org>
-
-LIGHTTPD=/usr/sbin/lighttpd2
-LIGHTTPD_OPTIONS="-c /etc/lighttpd2/angel.conf"
-PIDOF_WORKER=$(pidof lighttpd2-worker)
-PIDOF=$(pidof lighttpd2)
-
-lighttpd_start() {
-  echo "Starting lighttpd2: $LIGHTTPD"
-  if [ "$PIDOF" ]; then
-    echo "Already running!"
-    return
-  fi
-  $LIGHTTPD $LIGHTTPD_OPTIONS >> /var/log/lighttpd2/lighttpd2.log 2>&1 &
-  sleep 2
-  echo $(pidof lighttpd2) > /var/run/lighttpd2/lighttpd2.pid
-}
-
-lighttpd_stop() {
-  echo "Stopping lighttpd2: $LIGHTTPD"
-  if [ "$PIDOF" ]; then
-    kill $PIDOF
-    sleep 2
-    rm /var/run/lighttpd2/lighttpd2.pid
-  else
-    echo "Not running!"
-  fi
-}
-
-lighttpd_restart() {
-  lighttpd_stop
-  PIDOF=
-  sleep 2
-  lighttpd_start
-}
-
-case "$1" in
-'start')
-  lighttpd_start
-  ;;
-'stop')
-  lighttpd_stop
-  ;;
-restart)
-  lighttpd_restart
-  ;;
-*)
-  echo "usage $0 start|stop|restart"
-esac
diff --git a/network/lighttpd2/doinst.sh b/network/lighttpd2/doinst.sh
deleted file mode 100644
index a2bfef2076..0000000000
--- a/network/lighttpd2/doinst.sh
+++ /dev/null
@@ -1,37 +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
-}
-
-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/lighttpd2/lighttpd.conf.new
-config etc/lighttpd2/angel.conf.new
-config etc/lighttpd2/mimetypes.conf.new
-config etc/lighttpd2/php-fpm.lua.new
-config etc/logrotate.d/lighttpd2.new
-preserve_perms etc/rc.d/rc.lighttpd2.new
-
-# Create dummy logfiles, but throw them away if some are already here:
-for i in access error ; do
-  if [ -e var/log/lighttpd2/$i.log ]; then
-    rm -f var/log/lighttpd2/$i.log.new
-  else
-    mv var/log/lighttpd2/$i.log.new \
-      var/log/lighttpd2/$i.log
-  fi
-done
diff --git a/network/lighttpd2/lighttpd2.SlackBuild b/network/lighttpd2/lighttpd2.SlackBuild
deleted file mode 100644
index 263b4e8d25..0000000000
--- a/network/lighttpd2/lighttpd2.SlackBuild
+++ /dev/null
@@ -1,153 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for lighttpd2
-
-# Copyright (c) 2007 Daniel de Kok <moc.mikciat@leinad>
-# Copyright (c) 2012-2018 Matteo Bernardini <ponce@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.
-#
-# Twisted for lighttpd2 by Matteo Bernardini <ponce@slackbuilds.org>
-
-PRGNAM=lighttpd2
-VERSION=${VERSION:-20180908_bda1a90}
-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}
-
-## lighttpd user & group *MUST* exist before package creation
-# See http://slackbuilds.org/uid_gid.txt for current recomendations.
-LIGHTTPD_USER=${LIGHTTPD_USER:-lighttpd}
-LIGHTTPD_GROUP=${LIGHTTPD_GROUP:-lighttpd}
-
-bailout() {
-  printf "         The $LIGHTTPD_GROUP group and/or $LIGHTTPD_USER user account
-         does not exist.  You should create it/them with the following:
-           groupadd -g 208 $LIGHTTPD_GROUP
-           useradd -u 208 -g $LIGHTTPD_GROUP -d /var/www $LIGHTTPD_USER\n"
-  exit 1
-}
-
-if ! grep -q ^$LIGHTTPD_GROUP: /etc/group 2>/dev/null ; then
-  bailout
-elif ! grep -q ^$LIGHTTPD_USER: /etc/passwd 2>/dev/null ; then
-  bailout
-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
-
-UNWIND=${UNWIND:-"no"}
-if [ "$UNWIND" = "yes" ]; then unwind="--with-libunwind"; else unwind=""; 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 {} \;
-
-sh autogen.sh
-
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
-  --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX}/$PRGNAM \
-  --sysconfdir=/etc \
-  --localstatedir=/var \
-  --mandir=/usr/man \
-  --with-lua \
-  --with-sni \
-  --with-zlib \
-  --with-bzip2 \
-  --with-gnutls \
-  --with-openssl \
-  $unwind \
-  --build=$ARCH-slackware-linux
-
-make
-make install-strip DESTDIR=$PKG
-
-mkdir -p $PKG/var/cache/$PRGNAM $PKG/var/log/$PRGNAM $PKG/var/run/$PRGNAM
-chmod 0770 $PKG/var/cache/$PRGNAM $PKG/var/log/$PRGNAM $PKG/var/run/$PRGNAM
-( cd $PKG/var/log/$PRGNAM ; touch access.log.new error.log.new )
-chown -R $LIGHTTPD_USER:$LIGHTTPD_GROUP $PKG/var/cache/$PRGNAM $PKG/var/run/$PRGNAM
-chown -R $LIGHTTPD_USER:root $PKG/var/log/$PRGNAM
-
-install -D -m 0755 $CWD/conf/rc.$PRGNAM $PKG/etc/rc.d/rc.$PRGNAM.new
-install -D -m 0644 $CWD/conf/lighttpd.conf $PKG/etc/$PRGNAM/lighttpd.conf.new
-install -m 0644 $CWD/conf/angel.conf $PKG/etc/$PRGNAM/angel.conf.new
-install -m 0644 contrib/mimetypes.conf $PKG/etc/$PRGNAM/mimetypes.conf.new
-install -m 0644 $CWD/conf/php-fpm.lua $PKG/etc/$PRGNAM/php-fpm.lua.new
-install -D -m 0644 contrib/default.html $PKG/var/www/htdocs-lighttpd/index.html
-install -D -m 0644 $CWD/conf/$PRGNAM.logrotate $PKG/etc/logrotate.d/$PRGNAM.new
-mkdir -p $PKG/etc/logrotate.d
-sed "s|@LIGHTTPD_USER@|$LIGHTTPD_USER|" \
-  $CWD/conf/$PRGNAM.logrotate > $PKG/etc/logrotate.d/$PRGNAM.new
-
-sed -i \
-  -e "s|user \"lighttpd|user \"$LIGHTTPD_USER|" \
-  -e "s|group \"lighttpd|group \"$LIGHTTPD_GROUP|" \
-  $PKG/etc/$PRGNAM/angel.conf.new
-
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a COPYING doc/* $CWD/README.SLACKWARE $PKG/usr/doc/$PRGNAM-$VERSION
-rm -f $PKG/usr/doc/$PRGNAM-$VERSION/Makefile*
-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/network/lighttpd2/lighttpd2.info b/network/lighttpd2/lighttpd2.info
deleted file mode 100644
index c987f098b8..0000000000
--- a/network/lighttpd2/lighttpd2.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="lighttpd2"
-VERSION="20180908_bda1a90"
-HOMEPAGE="http://www.lighttpd.net"
-DOWNLOAD="http://ponce.cc/slackware/sources/repo/lighttpd2-20180908_bda1a90.tar.xz"
-MD5SUM="6c9dd8adc0ae1cf0f61dc9792a474cf3"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="libev lua ragel"
-MAINTAINER="Matteo Bernardini"
-EMAIL="ponce@slackbuilds.org"
diff --git a/network/lighttpd2/slack-desc b/network/lighttpd2/slack-desc
deleted file mode 100644
index 3c111f99f7..0000000000
--- a/network/lighttpd2/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------------------------------------------------------|
-lighttpd2: lighttpd2 (Light, fast, and secure webserver)
-lighttpd2:
-lighttpd2: lighttpd2 is a fast, secure, and flexible webserver. It is optimized
-lighttpd2: for high-performance environments, and provides an extensive feature
-lighttpd2: set, including FastCGI, CGI, Auth, output compression, and URL
-lighttpd2: rewriting support.
-lighttpd2:
-lighttpd2: Homepage: http://www.lighttpd.net/
-lighttpd2:
-lighttpd2:
-lighttpd2:
diff --git a/network/limnoria/README b/network/limnoria/README
index f6a4328c23..ca3b5c5e01 100644
--- a/network/limnoria/README
+++ b/network/limnoria/README
@@ -7,11 +7,3 @@ builtin plugins providing around 400 actual commands.
 
 Limnoria is the project which continues development of Supybot since
 2010.
-
-To build the python3 version:
-
-PYTHON3=yes ./limnoria.SlackBuild
-
-Optional dependency:
-
-python3
diff --git a/network/limnoria/limnoria.SlackBuild b/network/limnoria/limnoria.SlackBuild
index 68f860865f..e2545f2367 100644
--- a/network/limnoria/limnoria.SlackBuild
+++ b/network/limnoria/limnoria.SlackBuild
@@ -1,7 +1,7 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for limnoria
-# Copyright 2013 David Woodfall <dave@dawoodfall.net>
+# Copyright 2013 David Woodfall <dave@slackbuilds.org>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -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=limnoria
 SRCNAM=Limnoria-master
-VERSION=${VERSION:-2019_02_23}
+VERSION=${VERSION:-2023_02_11}
 SRCVERSION=${VERSION//_/-}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -36,32 +39,25 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
+# the name of the created package would be, and then exit. This information
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; 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-$SRCVERSION
-tar xvf $CWD/master-$SRCVERSION.tar.?z
+tar xvf $CWD/$SRCNAM-$SRCVERSION.tar.?z
 cd $SRCNAM-$SRCVERSION
 chown -R root:root .
 find -L . \
@@ -70,12 +66,7 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-[ "$PYTHON3" = "yes" ] && PYVERS=3
-
-python$PYVERS 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
+python3 setup.py install --root=$PKG
 
 mv $PKG/usr/share/man $PKG/usr
 
@@ -92,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/network/limnoria/limnoria.info b/network/limnoria/limnoria.info
index 0aebefca3a..cd4bac48a4 100644
--- a/network/limnoria/limnoria.info
+++ b/network/limnoria/limnoria.info
@@ -1,10 +1,10 @@
 PRGNAM="limnoria"
-VERSION="2019_02_23"
+VERSION="2023_02_11"
 HOMEPAGE="https://github.com/ProgVal/Limnoria"
-DOWNLOAD="https://github.com/ProgVal/Limnoria/archive/master-2019-02-23.tar.gz"
-MD5SUM="8632b454f0132ed6c527189e799d9f4e"
+DOWNLOAD="https://github.com/ProgVal/Limnoria/archive/master-2023-02-11/Limnoria-master-2023-02-11.tar.gz"
+MD5SUM="1bad4d31cf1e3d5a91a83e06b9f6bdd7"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="python3"
-MAINTAINER="Dave Woodfall"
-EMAIL="dave@tty1.uk"
+REQUIRES=""
+MAINTAINER="D Woodfall"
+EMAIL="dave@slackbuilds.org"
diff --git a/network/linksys-tftp/README b/network/linksys-tftp/README
new file mode 100644
index 0000000000..3a11f65459
--- /dev/null
+++ b/network/linksys-tftp/README
@@ -0,0 +1,19 @@
+Linksys-tftp is a BSD tftp client for the non-standard tftp
+authentication process used by some Linksys routers.
+
+These routers include the BEFW11, WRT54G and WRT54GL
+
+They all need a password for the tftp firmware file transfer to work.
+
+For example to upgrade a Linksys WRT54G router at 192.168.1.1 with
+tomato firmware, WRT54G_WRT54GL.bin, where the password is admin
+
+#linksys-tftp 192.168.1.1
+linksys-tftp>verbose
+linksys-tftp>binary
+linksys-tftp>blocksize 512
+linksys-tftp>rexmt 1
+linksys-tftp>timeout 120
+linksys-tftp>trace
+linksys-tftp>put WRT54G_WRT54GL.bin admin
+linksys-tftp>quit
diff --git a/network/linksys-tftp/linksys-tftp-1.2.1-r1-Makefile.patch b/network/linksys-tftp/linksys-tftp-1.2.1-r1-Makefile.patch
new file mode 100644
index 0000000000..b374e808ec
--- /dev/null
+++ b/network/linksys-tftp/linksys-tftp-1.2.1-r1-Makefile.patch
@@ -0,0 +1,28 @@
+Fix LDFLAGS (bug http://bugs.gentoo.org/336956 ) and
+CFLAGS (bug http://bugs.gentoo.org/240894 ) by
+Michael Weber <xmw@gentoo.org>
+
+--- linksys-tftp-1.2.1/Makefile
++++ linksys-tftp-1.2.1/Makefile
+@@ -19,18 +19,18 @@
+ # We override /usr/include/arpa/tftp.h with our own because
+ # we want tu_block to be unsigned short, not short as on most platforms
+ #
+-CFLAGS=	-I. -O2 -Dsin=sin_x
++CFLAGS +=	-I. -Dsin=sin_x
+ #DEBUG
+ # CFLAGS=	-I. -Wall -ggdb -Dsin=sin_x
+ SRCS=	main.c tftp.c tftpsubs.c
+ OBJS=	main.o tftp.o tftpsubs.o
+ DOBJS=	tftpsubs.o
+-CC=	gcc
++CC?=	gcc
+ 
+ all: linksys-tftp
+ 
+ linksys-tftp: ${OBJS}
+-	${CC} -o $@ ${CFLAGS} ${OBJS} 
++	${CC} -o $@ ${CFLAGS} ${OBJS} ${LDFLAGS}
+ 
+ clean:
+ 	rm -f ${OBJS} ${DOBJS} *core linksys-tftp
diff --git a/network/linksys-tftp/linksys-tftp-1.2.1-r1-clang.patch b/network/linksys-tftp/linksys-tftp-1.2.1-r1-clang.patch
new file mode 100644
index 0000000000..94ccee0c9e
--- /dev/null
+++ b/network/linksys-tftp/linksys-tftp-1.2.1-r1-clang.patch
@@ -0,0 +1,196 @@
+--- a/main.c
++++ b/main.c
+@@ -159,7 +159,7 @@ setpeer(argc, argv)
+ 
+ 	if (!argv[1]) {
+ 		printf("usage: %s host-name [port] (Default port is 69/udp)\n", argv[0]);
+-		return;
++		return 0;
+ 	}
+ 	host = gethostbyname(argv[1]);
+ 	if (host) {
+@@ -172,7 +172,7 @@ setpeer(argc, argv)
+ 		if (sin.sin_addr.s_addr == -1) {
+ 			connected = 0;
+ 			printf("%s: unknown host\n", argv[1]);
+-			return;
++			return 0;
+ 		}
+ 		strcpy(hostname, argv[1]);
+ 	}
+@@ -182,7 +182,7 @@ setpeer(argc, argv)
+ 		if (port < 0) {
+ 			printf("%s: bad port number\n", argv[2]);
+ 			connected = 0;
+-			return;
++			return 0;
+ 		}
+ 		port = htons(port);
+ 	}
+@@ -209,7 +209,7 @@ modecmd(argc, argv)
+ 
+ 	if (argc < 2) {
+ 		printf("Using %s mode to transfer files.\n", mode);
+-		return;
++		return 0;
+ 	}
+ 	if (argc == 2) {
+ 		for (p = modes; p->m_name; p++)
+@@ -217,7 +217,7 @@ modecmd(argc, argv)
+ 				break;
+ 		if (p->m_name) {
+ 			setmode(p->m_mode);
+-			return;
++			return 0;
+ 		}
+ 		printf("%s: unknown mode\n", argv[1]);
+ 		/* drop through and print usage message */
+@@ -231,7 +231,7 @@ modecmd(argc, argv)
+ 			sep = " | ";
+ 	}
+ 	printf(" ]\n");
+-	return;
++	return 0;
+ }
+ 
+ setbinary(argc, argv)
+@@ -265,31 +265,32 @@ put(argc, argv)
+ 
+ 	if (argc < 3) {
+ 		putusage(argv[0]);
+-		return;
++		return 0;
+ 	}
+ 	linkpass = argv[2];
+ 	if (!connected) {
+ 		fprintf(stderr,"No target machine specified.\n");
+-		return;
++		return 0;
+ 	}
+ 		cp = argv[1];
+ 		fd = open(cp, O_RDONLY);
+ 		if (fd < 0) {
+ 			fprintf(stderr, "tftp: "); perror(cp);
+-			return;
++			return 0;
+ 		}
+ 		if (verbose)
+ 			printf("putting %s to %s:%s [%s] AUTH %s\n",
+ 				cp, hostname, cp, mode, linkpass);
+ 		sin.sin_port = port;
+ 		sendfile(fd, cp, mode, linkpass);
+-		return;
++		return 0;
+ }
+ 
+ putusage(s)
+ 	char *s;
+ {
+ 	printf("usage: %s file [linksys pass] (you must be connected)\n", s);
++	return 0;
+ }
+ 
+ /*
+@@ -304,18 +305,18 @@ get(argc, argv)
+ 
+ 	if (argc < 3) {
+ 		getusage(argv[0]);
+-		return;
++		return 0;
+ 	}
+ 	linkpass = argv[2];
+ 	if (!connected) {
+ 		fprintf(stderr,"No target machine specified.\n");
+-		return;
++		return 0;
+ 	}
+ 		cp = argv[1];
+ 		fd = creat(cp, 0644);
+ 		if (fd < 0) {
+ 			fprintf(stderr, "tftp: "); perror(cp);
+-			return;
++			return 0;
+ 		}
+ 		if (verbose)
+ 			printf("getting from %s:%s to %s [%s] AUTH %s\n",
+@@ -323,7 +324,7 @@ get(argc, argv)
+ 		sin.sin_port = port;
+ 		recvfile(fd, cp, mode, linkpass);
+ 		
+-		return;
++		return 0;
+ }
+ 
+ getusage(s)
+@@ -349,7 +350,7 @@ setrexmt(argc, argv)
+ 	}
+ 	if (argc != 2) {
+ 		printf("usage: %s value\n", argv[0]);
+-		return;
++		return 0;
+ 	}
+ 	t = atoi(argv[1]);
+ 	if (t < 0)
+@@ -375,7 +376,7 @@ settimeout(argc, argv)
+ 	}
+ 	if (argc != 2) {
+ 		printf("usage: %s value\n", argv[0]);
+-		return;
++		return 0;
+ 	}
+ 	t = atoi(argv[1]);
+ 	if (t < 0)
+@@ -450,7 +451,7 @@ getcmd(name)
+ 	longest = 0;
+ 	nmatches = 0;
+ 	found = 0;
+-	if(!name) return;
++	if(!name) return 0;
+ 	for (c = cmdtab; p = c->name; c++) {
+ 		for (q = name; *q == *p++; q++)
+ 			if (*q == 0)		/* exact match? */
+@@ -513,7 +514,7 @@ help(argc, argv)
+ 		printf("Commands may be abbreviated.  Commands are:\n\n");
+ 		for (c = cmdtab; c->name; c++)
+ 			printf("%-*s\t%s\n", HELPINDENT, c->name, c->help);
+-		return;
++		return 0;
+ 	}
+ 	while (--argc > 0) {
+ 		register char *arg;
+@@ -557,7 +558,7 @@ setblocksize(argc, argv)
+ 	}
+ 	if (argc != 2) {
+ 		printf("usage: %s value\n", argv[0]);
+-		return;
++		return 0;
+ 	}
+ 	t = atoi(argv[1]);
+ 	if (t < 8 || t > 1432)
+@@ -570,5 +571,5 @@ banner() {
+ 	printf("Mike Lynn\tabaddon [at] 802.11ninja.net\n");
+ 	printf("Linksys TFTP Client for *BSD/Linux\tThe Firmware gets sexier\n");
+ 	printf("Modified Berkeley TFTP client Release: %s\n\n",svers);
+-	return;
++	return 0;
+ }
+--- a/tftpsubs.c
++++ b/tftpsubs.c
+@@ -116,7 +116,7 @@ read_ahead(file, convert)
+ 
+ 	b = &bfs[nextone];              /* look at "next" buffer */
+ 	if (b->counter != BF_FREE)      /* nop if not free */
+-		return;
++		return 0;
+ 	nextone = !nextone;             /* "incr" next buffer ptr */
+ 
+ 	dp = (struct tftphdr *)b->buf;
+@@ -131,7 +131,7 @@ read_ahead(file, convert)
+ 				b->counter += i;
+ 		} while (i != 0 && !(i < 0 && errno != EINTR) &&
+ 			 b->counter < segsize);
+-		return;
++		return 0;
+ 	}
+ 
+ 	p = dp->th_data;
diff --git a/network/linksys-tftp/linksys-tftp-1.2.1-r1-fno-common.patch b/network/linksys-tftp/linksys-tftp-1.2.1-r1-fno-common.patch
new file mode 100644
index 0000000000..a639776198
--- /dev/null
+++ b/network/linksys-tftp/linksys-tftp-1.2.1-r1-fno-common.patch
@@ -0,0 +1,11 @@
+--- a/tftp.c
++++ b/tftp.c
+@@ -50,7 +50,7 @@ extern	int	segsize;
+ #define PKTSIZE    (1432+4) /* SEGSIZE+4 */
+ char    ackbuf[PKTSIZE];
+ int	timeout;
+-jmp_buf	toplevel;
++extern jmp_buf	toplevel;
+ jmp_buf	timeoutbuf;
+ 
+ #ifndef OACK
diff --git a/network/linksys-tftp/linksys-tftp-1.2.1-r1-header.patch b/network/linksys-tftp/linksys-tftp-1.2.1-r1-header.patch
new file mode 100644
index 0000000000..9944f3c059
--- /dev/null
+++ b/network/linksys-tftp/linksys-tftp-1.2.1-r1-header.patch
@@ -0,0 +1,52 @@
+--- linksys-tftp-1.2.1/main.c
++++ linksys-tftp-1.2.1/main.c
+@@ -40,6 +40,10 @@
+ #include <setjmp.h>
+ #include <ctype.h>
+ #include <netdb.h>
++#include <stdlib.h>
++#include <string.h>
++#include <unistd.h>
++#include <sys/sendfile.h>
+ 
+ #define	TIMEOUT		5		/* secs between rexmt's */
+ 
+@@ -110,7 +112,7 @@
+ char	*index();
+ char	*rindex();
+ 
+-main(argc, argv)
++int main(argc, argv)
+ 	char *argv[];
+ {
+ 	struct sockaddr_in sin;
+--- a/tftp.c
++++ b/tftp.c
+@@ -36,8 +36,8 @@
+ #include <stdio.h>
+ #include <errno.h>
+ #include <setjmp.h>
+-
+-extern	int errno;
++#include <string.h>
++#include <unistd.h>
+ 
+ extern  struct sockaddr_in sin;         /* filled in by main */
+ extern  int     f;                      /* the opened socket */
+@@ -69,16 +69,6 @@ void timer(int sig)
+ 	longjmp(timeoutbuf, 1);
+ }
+ 
+-strnlen(s, n)
+-	char *s;
+-	int n;
+-{
+-	int i = 0;
+-
+-	while (n-- > 0 && *s++) i++;
+-	return(i);
+-}
+-
+ /*
+  * Parse an OACK package and set blocksize accordingly
+  */
diff --git a/network/linksys-tftp/linksys-tftp.SlackBuild b/network/linksys-tftp/linksys-tftp.SlackBuild
new file mode 100644
index 0000000000..cf4cebc851
--- /dev/null
+++ b/network/linksys-tftp/linksys-tftp.SlackBuild
@@ -0,0 +1,91 @@
+#!/bin/bash
+
+# Slackware build script for linksys-tftp
+
+# Copyright 2019 Richard Narron, California
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+# 20231030 bkw: modified by SlackBuilds.org, BUILD=4:
+# - fix README.Slackware permission.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=linksys-tftp
+VERSION=${VERSION:-1.2.1}
+BUILD=${BUILD:-4}
+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.*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 {} +
+
+# patches thanks to Gentoo
+(echo " " && cat $CWD/linksys-tftp-1.2.1-r1-Makefile.patch)   | patch -b -p1
+(echo " " && cat $CWD/linksys-tftp-1.2.1-r1-clang.patch)      | patch -b -p1
+(echo " " && cat $CWD/linksys-tftp-1.2.1-r1-fno-common.patch) | patch -b -p1
+(echo " " && cat $CWD/linksys-tftp-1.2.1-r1-header.patch)     | patch -b -p1
+
+CFLAGS="$SLKCFLAGS -fcommon" \
+  make
+
+install -D -m755 -t $PKG/usr/bin/ linksys-tftp
+
+find $PKG -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/README >  $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
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/network/linksys-tftp/linksys-tftp.info b/network/linksys-tftp/linksys-tftp.info
new file mode 100644
index 0000000000..7de9c49369
--- /dev/null
+++ b/network/linksys-tftp/linksys-tftp.info
@@ -0,0 +1,10 @@
+PRGNAM="linksys-tftp"
+VERSION="1.2.1"
+HOMEPAGE="https://www.redsand.net/solutions/linksys_tftp.html"
+DOWNLOAD="https://distfiles.gentoo.org/distfiles/82/linksys-tftp-1.2.1.tar.bz2"
+MD5SUM="e201eab05d2344b32f8fdf96462c27a4"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Richard Narron"
+EMAIL="richard@aaazen.com"
diff --git a/network/linksys-tftp/slack-desc b/network/linksys-tftp/slack-desc
new file mode 100644
index 0000000000..52b24ab204
--- /dev/null
+++ b/network/linksys-tftp/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+            |-----handy-ruler------------------------------------------------------|
+linksys-tftp: linksys-tftp (tftp client for Linksys routers requiring a password)
+linksys-tftp:
+linksys-tftp: This is a BSD tftp client for Linksys routers that need a password
+linksys-tftp: for tftp firmware installation such as the BEFW11, WRT54G and WRT54GL
+linksys-tftp:
+linksys-tftp:
+linksys-tftp:
+linksys-tftp:
+linksys-tftp:
+linksys-tftp:
+linksys-tftp:
diff --git a/network/linphone/README b/network/linphone/README
index 04cd544df2..8f47312d14 100644
--- a/network/linphone/README
+++ b/network/linphone/README
@@ -6,13 +6,13 @@ with most SIP clients and gateways. It uses various audio and
 video codecs such as Opus, Speex, GSM, G711, ilbc, Theora, H263-1998,
 MPEG4, VP8 and snow.
 
-Video support is enabled by default, but can be disabled and thus negating
-the need for ffmpeg. To disable support for video just pass VIDEO=no
-to the script.
+Video support is enabled by default, but can be disabled and thus
+negating the need for ffmpeg. To disable support for video just pass
+VIDEO=no to the script.
 
-UPNP support is enabled by default, but can be disabled and thus negating
-the need for libupnp. To disable support for UPNP just pass UPNP=no to
-the script.
+UPNP support is enabled by default, but can be disabled and thus
+negating the need for libupnp. To disable support for UPNP just pass
+UPNP=no to the script.
 
 Truespeech is disabled by default, but can be enabled.
 To enable support for Truespeech just pass TRUESPEECH=yes to the script.
diff --git a/network/linphone/linphone.SlackBuild b/network/linphone/linphone.SlackBuild
index 07eab0096e..f950205123 100644
--- a/network/linphone/linphone.SlackBuild
+++ b/network/linphone/linphone.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for linphone
 # Was written by adev and modified by Eugene Wissner
@@ -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=linphone
 VERSION=${VERSION:-3.12.0}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 MOD1NAME=ortp
 MOD1VERSION=1.0.2
@@ -47,7 +50,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
+# the name of the created package would be, and then exit. This information
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -152,9 +162,11 @@ chown -R root:root $PKG/usr/doc/$PRGNAM-$VERSION
 chmod 0644 $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/network/linphone/linphone.info b/network/linphone/linphone.info
index bb143a439c..57eafbe7e9 100644
--- a/network/linphone/linphone.info
+++ b/network/linphone/linphone.info
@@ -1,14 +1,14 @@
 PRGNAM="linphone"
 VERSION="3.12.0"
 HOMEPAGE="https://www.linphone.org/"
-DOWNLOAD="https://www.linphone.org/releases/sources/linphone/linphone-3.12.0.tar.gz \
-          https://www.linphone.org/releases/sources/ortp/ortp-1.0.2.tar.gz \
-          https://www.linphone.org/releases/sources/mediastreamer/mediastreamer-2.16.1.tar.gz"
+DOWNLOAD="https://download.linphone.org/releases/old/sources/linphone/linphone-3.12.0.tar.gz \
+          https://download.linphone.org/releases/old/sources/ortp/ortp-1.0.2.tar.gz \
+          https://download.linphone.org/releases/old/sources/mediastreamer/mediastreamer-2.16.1.tar.gz"
 MD5SUM="8292dbaa0a5d0a448dcbbee125e947e4 \
         82629e99befa578341e0bdc225924135 \
         15b8b129a922180855d04d58cdd08d43"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="belle-sip bzrtp ffmpeg libsrtp libupnp-legacy speex"
+REQUIRES="belle-sip bzrtp libsrtp libupnp-legacy"
 MAINTAINER="Euan Thoms"
 EMAIL="euan at potensol dot com"
diff --git a/network/linssid/README b/network/linssid/README
index fbf21e859d..cd385d481f 100644
--- a/network/linssid/README
+++ b/network/linssid/README
@@ -1,4 +1,2 @@
-LinSSID is a graphical wireless scanner for Linux.
-It is graphically and functionally similar to Inssider (Microsoft Windows)
-
-The qwt package required for LinSSID must have been built with Qt5 support.
+LinSSID is a graphical wireless scanner for Linux. It is graphically
+and functionally similar to Inssider (Microsoft Windows)
diff --git a/network/linssid/linssid.SlackBuild b/network/linssid/linssid.SlackBuild
index 88c98e4212..f87b702a07 100644
--- a/network/linssid/linssid.SlackBuild
+++ b/network/linssid/linssid.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for linssid
 
@@ -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=linssid
 VERSION=${VERSION:-3.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}
@@ -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/network/linssid/linssid.info b/network/linssid/linssid.info
index 0671f83139..3b87875817 100644
--- a/network/linssid/linssid.info
+++ b/network/linssid/linssid.info
@@ -5,6 +5,6 @@ DOWNLOAD="https://sourceforge.net/projects/linssid/files/LinSSID_3.6/linssid_3.6
 MD5SUM="3a5363ca193fa45312381c9532b86152"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="qt5 qwt"
+REQUIRES="qwt"
 MAINTAINER="Christoph Willing"
 EMAIL="chris.willing@linux.com"
diff --git a/network/linuxdcpp/README b/network/linuxdcpp/README
deleted file mode 100644
index 3801c90513..0000000000
--- a/network/linuxdcpp/README
+++ /dev/null
@@ -1,2 +0,0 @@
-linuxdcpp is an Unix/Linux port of the DC++ client.
-It's a client for direct connect P2P networks.
diff --git a/network/linuxdcpp/doinst.sh b/network/linuxdcpp/doinst.sh
deleted file mode 100644
index a692890106..0000000000
--- a/network/linuxdcpp/doinst.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-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/network/linuxdcpp/linuxdcpp.SlackBuild b/network/linuxdcpp/linuxdcpp.SlackBuild
deleted file mode 100644
index e83b5a345b..0000000000
--- a/network/linuxdcpp/linuxdcpp.SlackBuild
+++ /dev/null
@@ -1,94 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for linuxdcpp
-#
-# Copyright 2007  Niklas "Nille" Åkerström
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (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=linuxdcpp
-VERSION=${VERSION:-1.1.0}
-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"
-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.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 -fpermissive" \
-scons \
-  PREFIX=/usr \
-  FAKE_ROOT=$PKG \
-  debug=no \
-  release=no \
-  profile=no
-
-scons install
-
-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/share/applications
-cat $CWD/linuxdcpp.desktop > $PKG/usr/share/applications/linuxdcpp.desktop
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-mv  $PKG/usr/share/doc/$PRGNAM/* $PKG/usr/doc/$PRGNAM-$VERSION
-rm -rf $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:-tgz}
diff --git a/network/linuxdcpp/linuxdcpp.desktop b/network/linuxdcpp/linuxdcpp.desktop
deleted file mode 100644
index 732e10d7c0..0000000000
--- a/network/linuxdcpp/linuxdcpp.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Name=Linux DC++
-Comment=DC++ Linux client
-Exec=linuxdcpp
-Icon=linuxdcpp
-Terminal=false
-Type=Application
-Categories=Network;
-GenericName=P2P client
-GenericName[sv]=P2P klient
-Comment[sv]=DC++ Linux klient
diff --git a/network/linuxdcpp/linuxdcpp.info b/network/linuxdcpp/linuxdcpp.info
deleted file mode 100644
index 2361c28c20..0000000000
--- a/network/linuxdcpp/linuxdcpp.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="linuxdcpp"
-VERSION="1.1.0"
-HOMEPAGE="https://launchpad.net/linuxdcpp"
-DOWNLOAD="http://launchpad.net/linuxdcpp/1.1/1.1.0/+download/linuxdcpp-1.1.0.tar.bz2"
-MD5SUM="037de708bdb1e5dd7ac6c359b0e2c1a0"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Niklas 'Nille' Åkerström"
-EMAIL="nille.kungen[AT]gmail.com"
diff --git a/network/linuxdcpp/slack-desc b/network/linuxdcpp/slack-desc
deleted file mode 100644
index ca6ce14764..0000000000
--- a/network/linuxdcpp/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------------------------------------------------------|
-linuxdcpp: linuxdcpp (linux dc plus plus)
-linuxdcpp:
-linuxdcpp: linuxdcpp is an Unix/Linux port of the DC++ client.
-linuxdcpp: It's a client for direct connect P2P networks.
-linuxdcpp:
-linuxdcpp: Homepage: http://linuxdcpp.berlios.de
-linuxdcpp:
-linuxdcpp:
-linuxdcpp:
-linuxdcpp:
-linuxdcpp:
diff --git a/network/livestreamer-curses/README b/network/livestreamer-curses/README
deleted file mode 100644
index 0d08b2a1f8..0000000000
--- a/network/livestreamer-curses/README
+++ /dev/null
@@ -1,3 +0,0 @@
-Livestreamer-curses is a limited front-end to Chrippa's Livestreamer
-for UNIX systems. With it you can manage a list of your favorite streams
-and play them.
diff --git a/network/livestreamer-curses/doinst.sh b/network/livestreamer-curses/doinst.sh
deleted file mode 100644
index 5fb28930db..0000000000
--- a/network/livestreamer-curses/doinst.sh
+++ /dev/null
@@ -1,3 +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/network/livestreamer-curses/livestreamer-curses.SlackBuild b/network/livestreamer-curses/livestreamer-curses.SlackBuild
deleted file mode 100644
index cd30b55217..0000000000
--- a/network/livestreamer-curses/livestreamer-curses.SlackBuild
+++ /dev/null
@@ -1,86 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for livestreamer-curses
-
-# 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=livestreamer-curses
-VERSION=${VERSION:-1.5.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 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/usr/doc/$PRGNAM-$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/network/livestreamer-curses/livestreamer-curses.info b/network/livestreamer-curses/livestreamer-curses.info
deleted file mode 100644
index 68f21d5a94..0000000000
--- a/network/livestreamer-curses/livestreamer-curses.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="livestreamer-curses"
-VERSION="1.5.2"
-HOMEPAGE="https://github.com/gapato/livestreamer-curses"
-DOWNLOAD="https://pypi.python.org/packages/source/l/livestreamer-curses/livestreamer-curses-1.5.2.tar.gz"
-MD5SUM="ea07058f327a3acdc62dc4301a4a6b85"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="livestreamer"
-MAINTAINER="Dimitris Zlatanidis"
-EMAIL="d.zlatanidis@gmail.com"
diff --git a/network/livestreamer-curses/slack-desc b/network/livestreamer-curses/slack-desc
deleted file mode 100644
index 375b4dd301..0000000000
--- a/network/livestreamer-curses/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------------------------------------------------------|
-livestreamer-curses: livestreamer-curses (curses frontend to livestreamer)
-livestreamer-curses:
-livestreamer-curses: Livestreamer-curses is a limited front-end to Chrippa's Livestreamer
-livestreamer-curses: for UNIX systems. With it you can manage a list of your favorite
-livestreamer-curses: streams and play them.
-livestreamer-curses:
-livestreamer-curses: Homepage: https://github.com/gapato/livestreamer-curses
-livestreamer-curses:
-livestreamer-curses:
-livestreamer-curses:
-livestreamer-curses:
diff --git a/network/livestreamer/README b/network/livestreamer/README
deleted file mode 100644
index 97954e7cbd..0000000000
--- a/network/livestreamer/README
+++ /dev/null
@@ -1,18 +0,0 @@
-Livestreamer is a Command Line Interface that pipes video streams from
-various services into a video player, such as VLC. The main purpose of
-Livestreamer is to allow the user to avoid buggy and CPU heavy flash plugins
-but still be able to enjoy various streamed content.
-
-There is also an API available for developers who want access to the video
-stream data.
-
-Optional dependencies:
-
-For RTMP based plugins:
-    RTMPDump
-
-For decrypting encrypted HLS streams:
-    PyCrypto
-
-For full UStream.tv support:
-    python-librtmp
diff --git a/network/livestreamer/doinst.sh b/network/livestreamer/doinst.sh
deleted file mode 100644
index 5fb28930db..0000000000
--- a/network/livestreamer/doinst.sh
+++ /dev/null
@@ -1,3 +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/network/livestreamer/livestreamer.SlackBuild b/network/livestreamer/livestreamer.SlackBuild
deleted file mode 100644
index e9345ba5c4..0000000000
--- a/network/livestreamer/livestreamer.SlackBuild
+++ /dev/null
@@ -1,86 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for livestreamer
-
-# 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=livestreamer
-VERSION=${VERSION:-1.12.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 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 *.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:-tgz}
diff --git a/network/livestreamer/livestreamer.info b/network/livestreamer/livestreamer.info
deleted file mode 100644
index 7feeb03323..0000000000
--- a/network/livestreamer/livestreamer.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="livestreamer"
-VERSION="1.12.2"
-HOMEPAGE="http://livestreamer.tanuki.se/"
-DOWNLOAD="https://pypi.python.org/packages/source/l/livestreamer/livestreamer-1.12.2.tar.gz"
-MD5SUM="63fb477bb3e28b7fe26b3cbba6f7937c"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="python-requests singledispatch futures"
-MAINTAINER="Dimitris Zlatanidis"
-EMAIL="d.zlatanidis@gmail.com"
diff --git a/network/livestreamer/slack-desc b/network/livestreamer/slack-desc
deleted file mode 100644
index fd97eb3e09..0000000000
--- a/network/livestreamer/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------------------------------------------------------|
-livestreamer: livestreamer (Stream Extrator)
-livestreamer:
-livestreamer: Livestreamer is CLI program that extracts streams from various
-livestreamer: services and pipes them into a video player of choice.
-livestreamer:
-livestreamer: Homepage: http://livestreamer.tanuki.se/
-livestreamer:
-livestreamer:
-livestreamer:
-livestreamer:
-livestreamer:
diff --git a/network/lizardfs/README b/network/lizardfs/README
index 6b6c8d0b12..cf6c3367f3 100644
--- a/network/lizardfs/README
+++ b/network/lizardfs/README
@@ -1,55 +1,57 @@
-LizardFS is a highly scalable, fault-tolerant, POSIX-compatible, FUSE-based,
-high performance distributed filesystem, licensed under GNU General Public
-License version 3.
-
-LizardFS is an implementation of GoogleFS, and a fork of the earlier project,
-MooseFS.  LizardFS supports writable snapshots (instant copies), undeleting
-files, automatic data rebalancing, self-healing, data tiering, periodic data
-patrols and many more.
-
-LizardFS system consists of a master server, one or more metadata logging
-servers (meta loggers), and many chunk servers, that store the data on their
-locally-attached drives.  Both meta loggers and chunk servers can be added and
-removed without restarting the master server.
-
-Filesystem metadata is stored on the master server (and constantly replicated
-to meta loggers), whereas filesystem data is divided into chunks and spread as
-files over chunk servers, according to pre-defined 'goals', which can be set
-on file-, directory-, or filesystem level.  A goal can be an n-way mirroring
-goal, n+1 xor-ed goal (each chunk divided into n parts and xor-ed to calculate
-one part of redundancy), or more sophisticated, erasure code based n+k
-redundancy, where n parts of each chunk are backed by k parts of redundancy
-data.
-
-A set of administrative commands exists to support querying and setting
-redundancy goals and trash preservation time.  LizardFS is admin-friendly since
-any missing chunks can be provided from any sort of backup to any running
-chunk server.
-
-This package contains all binaries needed to run LizardFS system: mfsmaster,
-mfsmetalogger, mfschunkserver, as well as lizardfs-cgiserver (web-based
-monitoring console).
-
-You need an "mfs" user and group prior to building lizardfs.  Something like
-this will suffice for most systems:
+LizardFS is a highly scalable, fault-tolerant, POSIX-compatible,
+FUSE-based, high performance distributed filesystem, licensed under
+GNU General Public License version 3.
+
+LizardFS is an implementation of GoogleFS, and a fork of the earlier
+project, MooseFS. LizardFS supports writable snapshots (instant
+copies), undeleting files, automatic data rebalancing, self-healing,
+data tiering, periodic data patrols and many more.
+
+LizardFS system consists of a master server, one or more metadata
+logging servers (meta loggers), and many chunk servers, that store the
+data on their locally-attached drives.  Both meta loggers and chunk
+servers can be added and removed without restarting the master server.
+
+Filesystem metadata is stored on the master server (and constantly
+replicated to meta loggers), whereas filesystem data is divided
+into chunks and spread as files over chunk servers, according
+to pre-defined 'goals', which can be set on file-, directory-, or
+filesystem level. A goal can be an n-way mirroring goal, n+1 xor-ed
+goal (each chunk divided into n parts and xor-ed to calculate one
+part of redundancy), or more sophisticated, erasure code based n+k
+redundancy, where n parts of each chunk are backed by k parts of
+redundancy data.
+
+A set of administrative commands exists to support querying and
+setting redundancy goals and trash preservation time.  LizardFS is
+admin-friendly since any missing chunks can be provided from any sort
+of backup to any running chunk server.
+
+This package contains all binaries needed to run LizardFS
+system: mfsmaster, mfsmetalogger, mfschunkserver, as well as
+lizardfs-cgiserver (web-based monitoring console).
+
+You need an "mfs" user and group prior to building lizardfs.
+Something like this will suffice for most systems:
   groupadd -g 353 mfs
   useradd -u 353 -g 353 -d /var/lib/mfs mfs
-Feel free to use a different uid and gid if desired, but 353 is recommended to
-avoid conflicts with other stuff from SlackBuilds.org.
+Feel free to use a different uid and gid if desired, but 353 is
+recommended to avoid conflicts with other stuff from SlackBuilds.org.
 
-It is also advisable to make name 'mfsmaster' pointing at your Master server
-across your network.  It is not strictly required, but it will make things much
-easier.  If you are unable to configure your DNS server, adding this line to
-/etc/hosts on each master, metalogger, chunkserver, and client machines will
-do:
+It is also advisable to make name 'mfsmaster' pointing at your Master
+server across your network. It is not strictly required, but it will
+make things much easier. If you are unable to configure your DNS
+server, adding this line to /etc/hosts on each master, metalogger,
+chunkserver, and client machines will do:
 
 a.b.c.d    mfsmaster    mfsmaster.my-domain.ext
 
 where a.b.c.d is an IP address of your master server.
 
-Then on each node add '/etc/rc.d/rc.lizardfs start' to /etc/rc.d/rc.local (or
-wherever you find appropriate), and use '/etc/rc.d/rc.lizardfs setup' to
-configure which services should run on the server.  Since most installations
-consists mostly of chunkservers, rc.lizardfs-chunkserver is marked executable
-by default (but will not run until rc.lizardfs-chunkserver or rc.lizardfs is
+Then on each node add '/etc/rc.d/rc.lizardfs start' to
+/etc/rc.d/rc.local (or wherever you find appropriate), and use
+'/etc/rc.d/rc.lizardfs setup' to configure which services should
+run on the server. Since most installations consists mostly of
+chunkservers, rc.lizardfs-chunkserver is marked executable by default
+(but will not run until rc.lizardfs-chunkserver or rc.lizardfs is
 added to rc.local, so no need to worry).
diff --git a/network/lizardfs/lizardfs.SlackBuild b/network/lizardfs/lizardfs.SlackBuild
index 2360f179ea..692eeba8ba 100644
--- a/network/lizardfs/lizardfs.SlackBuild
+++ b/network/lizardfs/lizardfs.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for LizardFS
 
@@ -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=lizardfs
 VERSION=${VERSION:-3.12.0}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 LIZARDFS_UID=${LIZARDFS_UID:-353}
 LIZARDFS_GID=${LIZARDFS_GID:-353}
@@ -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}
@@ -92,8 +102,8 @@ find -L . \
 mkdir -p build
 cd build
   cmake \
-    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
-    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS -fcommon" \
+    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS -fcommon" \
     -DCMAKE_INSTALL_PREFIX=/ \
     -DENABLE_DEBIAN_PATHS=YES \
     -DENABLE_TESTS=NO \
@@ -150,4 +160,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/network/lldpd/lldpd.SlackBuild b/network/lldpd/lldpd.SlackBuild
index 6d76bd5ad1..c9a6433acf 100644
--- a/network/lldpd/lldpd.SlackBuild
+++ b/network/lldpd/lldpd.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for lldpd
 
-# Copyright 2017-2019 Thibaut Notteboom, Paris, FRANCE
+# Copyright 2017-2023 Thibaut Notteboom, Paris, 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=lldpd
-VERSION=${VERSION:-1.0.4}
-BUILD=${BUILD:-1}
+VERSION=${VERSION:-1.0.17}
+BUILD=${BUILD:-2}
 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}
@@ -49,6 +56,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=""
@@ -102,6 +112,8 @@ make install-strip DESTDIR=$PKG
 mkdir -p $PKG/etc/rc.d
 cat $CWD/rc.lldpd > $PKG/etc/rc.d/rc.lldpd.new
 
+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
 
@@ -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/network/lldpd/lldpd.info b/network/lldpd/lldpd.info
index b93d5c753d..7cab963fa6 100644
--- a/network/lldpd/lldpd.info
+++ b/network/lldpd/lldpd.info
@@ -1,8 +1,8 @@
 PRGNAM="lldpd"
-VERSION="1.0.4"
+VERSION="1.0.17"
 HOMEPAGE="https://vincentbernat.github.io/lldpd/"
-DOWNLOAD="https://media.luffy.cx/files/lldpd/lldpd-1.0.4.tar.gz"
-MD5SUM="33e8d58623f99184e4e709cbbfe45db3"
+DOWNLOAD="https://media.luffy.cx/files/lldpd/lldpd-1.0.17.tar.gz"
+MD5SUM="047ab026dbc4b22b7ef37991e7e2afaa"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/network/lldpd/rc.lldpd b/network/lldpd/rc.lldpd
index 023173b6c1..40d75680da 100644
--- a/network/lldpd/rc.lldpd
+++ b/network/lldpd/rc.lldpd
@@ -10,7 +10,7 @@ lldpd_stop() {
   killall lldpd
 }
 
-restart() {
+lldpd_restart() {
   lldpd_stop
   sleep 1
   lldpd_start
diff --git a/network/llhttp/README b/network/llhttp/README
new file mode 100644
index 0000000000..919dceec36
--- /dev/null
+++ b/network/llhttp/README
@@ -0,0 +1 @@
+This is a parser for HTTP messages written in C
diff --git a/network/llhttp/llhttp.SlackBuild b/network/llhttp/llhttp.SlackBuild
new file mode 100644
index 0000000000..6f514f1dfa
--- /dev/null
+++ b/network/llhttp/llhttp.SlackBuild
@@ -0,0 +1,105 @@
+#!/bin/bash
+
+# Slackware build script for llhttp
+
+# Copyright 2022-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=llhttp
+VERSION=${VERSION:-9.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 llhttp-release-v$VERSION
+tar xvf $CWD/llhttp-release-v$VERSION.tar.gz
+cd llhttp-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 \
+ \( -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 \
+    -DBUILD_SHARED_LIBS=ON \
+    -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 *.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/network/llhttp/llhttp.info b/network/llhttp/llhttp.info
new file mode 100644
index 0000000000..5f45b17894
--- /dev/null
+++ b/network/llhttp/llhttp.info
@@ -0,0 +1,10 @@
+PRGNAM="llhttp"
+VERSION="9.2.1"
+HOMEPAGE="https://github.com/nodejs/llhttp"
+DOWNLOAD="https://github.com/nodejs/llhttp/archive/release/v9.2.1/llhttp-release-v9.2.1.tar.gz"
+MD5SUM="355ecc90e622035e3e1693a96a0c233b"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Willy Sudiarto Raharjo"
+EMAIL="willysr@slackbuilds.org"
diff --git a/network/llhttp/slack-desc b/network/llhttp/slack-desc
new file mode 100644
index 0000000000..09038297cc
--- /dev/null
+++ b/network/llhttp/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+      |-----handy-ruler------------------------------------------------------|
+llhttp: llhttp (Port of http_parser to llparse)
+llhttp:
+llhttp: This is a parser for HTTP messages written in C
+llhttp:
+llhttp:
+llhttp:
+llhttp: Project URL: https://github.com/nodejs/llhttp
+llhttp:
+llhttp:
+llhttp:
+llhttp:
diff --git a/network/lorawan-stack-cli/README b/network/lorawan-stack-cli/README
new file mode 100644
index 0000000000..7025d7f73c
--- /dev/null
+++ b/network/lorawan-stack-cli/README
@@ -0,0 +1,5 @@
+Command line interface for the TheThingsNetwork V3 and TheThingsStack V3
+
+Auto-completion is NOT working. You can test with:
+`source /usr/share/bash-completion/completions/ttn-lw-cli`
+Added in the hope that in future will work.
diff --git a/network/lorawan-stack-cli/lorawan-stack-cli.SlackBuild b/network/lorawan-stack-cli/lorawan-stack-cli.SlackBuild
new file mode 100644
index 0000000000..fcb178f674
--- /dev/null
+++ b/network/lorawan-stack-cli/lorawan-stack-cli.SlackBuild
@@ -0,0 +1,96 @@
+#!/bin/bash
+# Slackware build script for <lorawan-stack-cli>
+#
+# 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=lorawan-stack-cli
+VERSION=${VERSION:-3.26.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
+
+TMP=${TMP:-/tmp/SBo}
+
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SRCNAME="${PRGNAM}_${VERSION}_linux_386"
+elif [ "$ARCH" = "x86_64" ]; then
+  SRCNAME="${PRGNAM}_${VERSION}_linux_amd64"
+elif [ "$ARCH" = "arm64" ]; then
+  SRCNAME="${PRGNAM}_${VERSION}_linux_arm64"
+elif [ "$ARCH" = "armv7" ]; then
+  SRCNAME="${PRGNAM}_${VERSION}_linux_armv7"
+elif [ "$ARCH" = "armv6" ]; then
+  SRCNAME="${PRGNAM}_${VERSION}_linux_armv6"
+else
+	echo "Error: suitables ARCH are i586, x86_64, arm64, armv7, armv6"
+	exit 1
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$SRCNAME.tar.gz
+mv $SRCNAME $PRGNAM-$VERSION # lorawan-stack-cli_X.Y.Z_linux_ARCH to lorawan-stack-cli-X.Y.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 -p $PKG/usr/bin
+cp $TMP/$PRGNAM-$VERSION/ttn-lw-cli $PKG/usr/bin/
+
+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/usr/share/bash-completion/completions/
+cp $TMP/$PRGNAM-$VERSION/config/completion/bash/ttn-lw-cli $PKG/usr/share/bash-completion/completions/
+
+mkdir -p $PKG/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/network/lorawan-stack-cli/lorawan-stack-cli.info b/network/lorawan-stack-cli/lorawan-stack-cli.info
new file mode 100644
index 0000000000..7bb128615e
--- /dev/null
+++ b/network/lorawan-stack-cli/lorawan-stack-cli.info
@@ -0,0 +1,10 @@
+PRGNAM="lorawan-stack-cli"
+VERSION="3.26.2"
+HOMEPAGE="https://www.thethingsnetwork.org"
+DOWNLOAD="https://github.com/TheThingsNetwork/lorawan-stack/releases/download/v3.26.2/lorawan-stack-cli_3.26.2_linux_386.tar.gz"
+MD5SUM="e2a2776d85c185fb491480dc4db37a26"
+DOWNLOAD_x86_64="https://github.com/TheThingsNetwork/lorawan-stack/releases/download/v3.26.2/lorawan-stack-cli_3.26.2_linux_amd64.tar.gz"
+MD5SUM_x86_64="eceb05e21599546935e70cc4909d99f2"
+REQUIRES=""
+MAINTAINER="Michales Michaloudes"
+EMAIL="korgie@gmail.com"
diff --git a/network/lorawan-stack-cli/slack-desc b/network/lorawan-stack-cli/slack-desc
new file mode 100644
index 0000000000..7ffce622f1
--- /dev/null
+++ b/network/lorawan-stack-cli/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+                 |-----handy-ruler------------------------------------------------------|
+lorawan-stack-cli: lorawan-stack-cli (cli for the TTN V3 / TTS)
+lorawan-stack-cli:
+lorawan-stack-cli: Command line interface for the TheThingsNetwork and TheThingsStack.
+lorawan-stack-cli:
+lorawan-stack-cli:
+lorawan-stack-cli:
+lorawan-stack-cli:
+lorawan-stack-cli:
+lorawan-stack-cli:
+lorawan-stack-cli:
+lorawan-stack-cli:
diff --git a/network/luakit/gtk.patch b/network/luakit/gtk.patch
new file mode 100644
index 0000000000..3bed22b74b
--- /dev/null
+++ b/network/luakit/gtk.patch
@@ -0,0 +1,15 @@
+diff -rupN a/clib/unique.c b/clib/unique.c
+--- a/clib/unique.c	2024-01-30 20:31:08.000000000 +0100
++++ b/clib/unique.c	2024-01-31 08:22:48.919908308 +0100
+@@ -78,11 +78,7 @@ luaH_unique_new(lua_State *L)
+ 
+     GError *error = NULL;
+     if (!globalconf.application) {
+-#if GTK_CHECK_VERSION(2,74,0)
+-        globalconf.application = gtk_application_new(name, G_APPLICATION_DEFAULT_FLAGS);
+-#else
+         globalconf.application = gtk_application_new(name, G_APPLICATION_FLAGS_NONE);
+-#endif
+     }
+ 
+     g_application_register(G_APPLICATION(globalconf.application), NULL, &error);
diff --git a/network/luakit/luakit.SlackBuild b/network/luakit/luakit.SlackBuild
index 7a0981a59b..e36c76ab38 100644
--- a/network/luakit/luakit.SlackBuild
+++ b/network/luakit/luakit.SlackBuild
@@ -1,9 +1,9 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for luakit
 
 # Copyright 2013, Andrew Tkalia <anddt@yandex.ru>, Ukraine, Kyiv
-# Update 2018-06-30 by Marek Srejma <sam_web@yahoo.de>
+# Updates 2018-2024 by Marek Šrejma <marek@modweb.de>, 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=luakit
-VERSION=${VERSION:-2.0}
+VERSION=${VERSION:-2.3.6}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 LUAJIT=${LUAJIT:-0} # 0 or 1
 CC=${CC:-cc} # cc, gcc or clang
 
@@ -38,17 +41,24 @@ 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 egrep -qo "^i[2-6]86$" <<<"$ARCH"; then
+if [ "$ARCH" = "i586" ] || [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=$ARCH -mtune=i686"
-elif [ "$ARCH" = "x86_64" ]; then
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ] || [ "$ARCH" = "aarch64" ]; then
   SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
 else
   SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
 fi
 
 set -e
@@ -56,9 +66,9 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-debian-$VERSION
-tar xvf $CWD/$PRGNAM-debian-$VERSION.tar.gz
-cd $PRGNAM-debian-$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 \
@@ -66,25 +76,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 {} \;
 
+sed -e 's#(PREFIX)/lib/luakit#(LIBDIR)#g' -i Makefile
+sed -e "/^Exec=/ s/lua/env Malloc=1 lua/" -i extras/luakit.desktop
+patch -p1 < $CWD/gtk.patch
+
 _CFLAGS=`grep CFLAGS config.mk | sed -e "s/CFLAGS\s*+=//g" | tr "\n" " "`
-make \
+make install \
+  CFLAGS="$_CFLAGS $SLKCFLAGS" \
   PREFIX=/usr \
+  LIBDIR=/usr/lib$LIBDIRSUFFIX/$PRGNAM \
   MANPREFIX=/usr/man \
   DOCDIR=/usr/doc/$PRGNAM-$VERSION \
   DEVELOPMENT_PATHS=0 \
-  CFLAGS="$_CFLAGS $SLKCFLAGS" \
   LUA_BIN_NAME=lua \
   LUA_PKG_NAME=lua \
   USE_LUAJIT=$LUAJIT \
-  CC=$CC
-
-make install \
-  DESTDIR=$PKG \
-  PREFIX=/usr \
-  MANPREFIX=$PKG/usr/man \
-  DOCDIR=$PKG/usr/doc/$PRGNAM-$VERSION \
-  LUA_BIN_NAME=lua \
-  LUA_PKG_NAME=lua
+  CC=$CC \
+  VERSION=$VERSION \
+  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
@@ -93,9 +102,8 @@ 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.md \
-  CONTRIBUTING.md COPYING.GPLv3 \
-  README.md $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS CHANGELOG.md CONTRIBUTING.md COPYING.GPLv3 README.md MIGRATE.md \
+  $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
@@ -103,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/network/luakit/luakit.info b/network/luakit/luakit.info
index 2b0eabac90..8624e731de 100644
--- a/network/luakit/luakit.info
+++ b/network/luakit/luakit.info
@@ -1,10 +1,10 @@
 PRGNAM="luakit"
-VERSION="2.0"
+VERSION="2.3.6"
 HOMEPAGE="https://github.com/luakit/luakit"
-DOWNLOAD="https://github.com/luakit/luakit/archive/debian/2.0/luakit-debian-2.0.tar.gz"
-MD5SUM="2f5ab83a7835db482220b2279351e23c"
+DOWNLOAD="https://github.com/luakit/luakit/releases/download/2.3.6/luakit-2.3.6.tar.gz"
+MD5SUM="f9e623c23ce560fdfd14d9ccb9ef71e6"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="webkit2gtk lua-filesystem"
-MAINTAINER="Marek Srejma"
-EMAIL="sam_web@yahoo.de"
+REQUIRES="webkit2gtk4.1 lua-filesystem"
+MAINTAINER="Marek Šrejma"
+EMAIL="marek@modweb.de"
diff --git a/network/lurch/lurch.SlackBuild b/network/lurch/lurch.SlackBuild
index 342ceb99f6..38d63c172c 100644
--- a/network/lurch/lurch.SlackBuild
+++ b/network/lurch/lurch.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for lurch
 
-# Copyright 2017 - 2019  Johannes Schoepfer, Germany
+# Copyright 2017-2023  Johannes Schoepfer, Germany
 # 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=lurch
-VERSION=${VERSION:-0.6.8}
+VERSION=${VERSION:-0.7.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,23 +38,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
@@ -65,11 +68,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" make -j1
+CFLAGS="$SLKCFLAGS" make
 make install DESTDIR=$PKG
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
@@ -83,4 +86,4 @@ mkdir $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/network/lurch/lurch.info b/network/lurch/lurch.info
index f6fdbb3742..3633a45331 100644
--- a/network/lurch/lurch.info
+++ b/network/lurch/lurch.info
@@ -1,8 +1,8 @@
 PRGNAM="lurch"
-VERSION="0.6.8"
+VERSION="0.7.0"
 HOMEPAGE="https://github.com/gkdr/lurch"
-DOWNLOAD="https://github.com/gkdr/lurch/releases/download/v0.6.8/lurch-0.6.8-src.tar.gz"
-MD5SUM="8744e8f5fbc32de10add88b41e3e0a46"
+DOWNLOAD="https://github.com/gkdr/lurch/releases/download/v0.7.0/lurch-0.7.0-src.tar.gz"
+MD5SUM="2aaac68870c0ed376c5a6a54cd45e121"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="mxml"
diff --git a/network/lxi-tools/README b/network/lxi-tools/README
index e3b0dedfd9..98a68a8bc1 100644
--- a/network/lxi-tools/README
+++ b/network/lxi-tools/README
@@ -1,10 +1,10 @@
-lxi-tools is a collection of open source software tools that enables control
-of LXI compatible instruments such as modern oscilloscopes, power supplies,
-spectrum analyzers etc.
+lxi-tools is a collection of open source software tools that enables
+control of LXI compatible instruments such as modern oscilloscopes,
+power supplies, spectrum analyzers etc.
 
-All features are consolidated in the 'lxi' application which provides a simple
-commandline interface to discover LXI instruments, send SCPI commands, and
-capture screenshots from supported LXI instruments.
+All features are consolidated in the 'lxi' application which provides
+a simple commandline interface to discover LXI instruments, send SCPI
+commands, and capture screenshots from supported LXI instruments.
 
 The lxi-tools package now features an optional GUI that requires the qt5
-package.  Enable it with: GUI=yes ./lxi-tools.SlackBuild
+package. Enable it with: GUI=yes ./lxi-tools.SlackBuild
diff --git a/network/lxi-tools/lxi-gui.desktop b/network/lxi-tools/lxi-gui.desktop
index fb17ad31d9..c5e75f843f 100644
--- a/network/lxi-tools/lxi-gui.desktop
+++ b/network/lxi-tools/lxi-gui.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-Version=1.18
+Version=1.0
 Name=LXI-GUI
 Comment=LAN eXtensions for Instrumentation GUI
 Exec=lxi-gui
diff --git a/network/lxi-tools/lxi-tools.SlackBuild b/network/lxi-tools/lxi-tools.SlackBuild
index 95161d0ac3..fa97b855b7 100644
--- a/network/lxi-tools/lxi-tools.SlackBuild
+++ b/network/lxi-tools/lxi-tools.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for lxi-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=lxi-tools
 VERSION=${VERSION:-1.21}
 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}
@@ -116,4 +126,4 @@ if [ x"${GUI}" = "xyes" ]; 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/network/macchanger/README b/network/macchanger/README
index 404318fe12..72b3a2b9cc 100644
--- a/network/macchanger/README
+++ b/network/macchanger/README
@@ -1,10 +1,10 @@
-GNU MAC Changer is a utility for viewing and manipulating 
-the MAC address of network interfaces
+GNU MAC Changer is a utility for viewing and manipulating
+MAC addresses of network interfaces.
 
 Features:
--Set specific MAC address of a network interface
--Set the MAC randomly
--Set a MAC of another vendor
--Set another MAC of the same vendor
--Set a MAC of the same kind (eg: wireless card)
--Display a vendor MAC list (today, 6800 items) to choose from
+ - set specific MAC address of a network interface
+ - set the MAC randomly
+ - set a MAC of another vendor
+ - set another MAC of the same vendor
+ - set a MAC of the same kind (eg: wireless card)
+ - display a vendor MAC list to choose from
diff --git a/network/macchanger/macchanger.SlackBuild b/network/macchanger/macchanger.SlackBuild
index 1cb5f3bea5..64407bbe34 100644
--- a/network/macchanger/macchanger.SlackBuild
+++ b/network/macchanger/macchanger.SlackBuild
@@ -1,17 +1,35 @@
-#!/bin/sh
+#!/bin/bash
 
-###################################################################
 # Slackware build script for macchanger
+
+# Copyright 2007, 2010 Kevin Myers <jwblack AT cox DOT net>
+# Copyright 2020 Dominik Drobek <dominik.drobek (at) o2.pl>
+# All rights reserved.
 #
-# Written by Kevin Myers jwblack AT cox DOT net 09-02-2007
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
 #
-###################################################################
-
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=macchanger
-VERSION=${VERSION:-1.5.0}
+VERSION=${VERSION:-1.7.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -21,13 +39,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="AUTHORS COPYING INSTALL NEWS README ChangeLog"
-
 if [ "$ARCH" = "i586" ]; then
   SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
@@ -42,47 +65,51 @@ else
   LIBDIRSUFFIX=""
 fi
 
+set -e
+
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
-cd $TMP || exit 1
+cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar -xzvf $CWD/$PRGNAM-$VERSION.tar.gz || exit 1
-cd $PRGNAM-$VERSION || exit 1
+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 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --infodir=/usr/info \
   --mandir=/usr/man \
-  --build=$ARCH-slackware-linux \
-  || exit 1
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --build=$ARCH-slackware-linux
 
-make || exit 1
-make install DESTDIR=$PKG || exit 1
+make
+make 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
 
-( 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
 
 rm -f $PKG/usr/info/dir
 gzip -9 $PKG/usr/info/*.info*
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS COPYING NEWS 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/network/macchanger/macchanger.info b/network/macchanger/macchanger.info
index fcc02d0362..133c385776 100644
--- a/network/macchanger/macchanger.info
+++ b/network/macchanger/macchanger.info
@@ -1,10 +1,10 @@
 PRGNAM="macchanger"
-VERSION="1.5.0"
+VERSION="1.7.0"
 HOMEPAGE="https://github.com/alobbs/macchanger"
-DOWNLOAD="ftp://ftp.gnu.org/gnu/macchanger/macchanger-1.5.0.tar.gz"
-MD5SUM="79b7cdaeca3d8ebafa764c4b0dd03ab7"
+DOWNLOAD="https://github.com/alobbs/macchanger/releases/download/1.7.0/macchanger-1.7.0.tar.gz"
+MD5SUM="ca56f16142914337391dac91603eb332"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Kevin Myers"
-EMAIL="jwblack@cox.net"
+MAINTAINER="Dominik Drobek"
+EMAIL="dominik.drobek (at) o2.pl"
diff --git a/network/macchanger/slack-desc b/network/macchanger/slack-desc
index 8a0a2cb30e..55a95fa54c 100644
--- a/network/macchanger/slack-desc
+++ b/network/macchanger/slack-desc
@@ -6,10 +6,10 @@
 # customary to leave one space after the ':' except on otherwise blank lines.
 
           |-----handy-ruler------------------------------------------------------|
-macchanger: macchanger (utility for viewing/manipulating the MAC address)
+macchanger: macchanger (utility for viewing and manipulating MAC addresses)
 macchanger:
-macchanger: This is a GNU/Linux Utility for viewing/manipulating the MAC
-macchanger: address of network interfaces.
+macchanger: This is a GNU/Linux utility for viewing and manipulating MAC
+macchanger: addresses of network interfaces.
 macchanger:
 macchanger: Homepage: https://github.com/alobbs/macchanger
 macchanger:
diff --git a/network/maildrop/README b/network/maildrop/README
index db9f84ade7..36009fc52a 100644
--- a/network/maildrop/README
+++ b/network/maildrop/README
@@ -1,11 +1,7 @@
 maildrop (mail delivery agent with filtering abilities)
 
-maildrop is the mail filter/mail delivery agent that's used by the
-Courier Mail Server.  This is a standalone build of the maildrop mail
-filter that can be used with other mail servers.
-
-maildrop is a replacement for your local mail delivery agent. maildrop
-reads a mail message from standard input, then delivers the message to
-your mailbox. maildrop knows how to deliver mail to mbox-style
-mailboxes and maildirs.  "maildir" is a mailbox format used by the
-Courier mail server and Qmail.
+maildrop is the mail filter/mail delivery agent that's used
+by the Courier Mail Server. This is a standalone build of
+the maildrop mail filter that can be used with other mail
+servers. If desired it can be used as a 'drop in' replacement
+for Procmail.
diff --git a/network/maildrop/maildrop.SlackBuild b/network/maildrop/maildrop.SlackBuild
index 2033f71711..d1eb460382 100644
--- a/network/maildrop/maildrop.SlackBuild
+++ b/network/maildrop/maildrop.SlackBuild
@@ -1,28 +1,56 @@
-#!/bin/sh
-
+#!/bin/bash
+# ----------------------------------------------------------------------
 # Slackware build script for maildrop
-# Written by Šime Ramov <s@ramov.com>
+#
+# Copyright 2010 - 2019 Šime Ramov <s@ramov.com>
+# Copyright 2019 - 2023 Andrew Strong, Blue Mountains, Australia.
+#
+#   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.
+# ----------------------------------------------------------------------
+
+cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=maildrop
-VERSION=${VERSION:-2.4.3}
+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 [ ! -z "${PRINT_PACKAGE_NAME}" ]; 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"
@@ -43,40 +71,51 @@ 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 {} \;
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -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} \
   --mandir=/usr/man \
   --datadir=/usr/doc/$PRGNAM-$VERSION \
+  --disable-static \
+  --enable-dovecotauth \
   --build=$ARCH-slackware-linux
 
 make
-make install-strip DESTDIR=$PKG
+make install DESTDIR=$PKG
+
+rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la
 
-# Remove empty directories
-find $PKG -depth -type d -empty -delete
+find $PKG -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
 
-mv $PKG/usr/doc/$PRGNAM-$VERSION/maildrop/html $PKG/usr/doc/$PRGNAM-$VERSION/
+mkdir -pv $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
-  AUTHORS COPYING COPYING.GPL ChangeLog INSTALL NEWS README UPGRADE \
+  AUTHORS COPYING* ChangeLog INSTALL README README.dovecotauth UPGRADE \
   $PKG/usr/doc/$PRGNAM-$VERSION
+
+# The HTML docs are simply copies of the man pages, so are removed from
+# generated package. If you really want the HTML version of the man pages
+# simply uncomment the line below:
+# mv $PKG/usr/share/doc/$PRGNAM/html $PKG/usr/doc/$PRGNAM-$VERSION
+rm -rf $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/network/maildrop/maildrop.info b/network/maildrop/maildrop.info
index 7f558c7612..6ea3f1380d 100644
--- a/network/maildrop/maildrop.info
+++ b/network/maildrop/maildrop.info
@@ -1,10 +1,10 @@
 PRGNAM="maildrop"
-VERSION="2.4.3"
+VERSION="3.1.1"
 HOMEPAGE="http://www.courier-mta.org/maildrop/"
-DOWNLOAD="http://ponce.cc/slackware/sources/repo/maildrop-2.4.3.tar.bz2"
-MD5SUM="15b7528ba5e7ab76e676596af6bcd1c9"
+DOWNLOAD="https://download.sourceforge.net/courier/maildrop-3.1.1.tar.bz2"
+MD5SUM="a88ab3f29b5f20ad7cc80a6b94392cc8"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Šime Ramov"
-EMAIL="s@ramov.com"
+REQUIRES="courier-unicode"
+MAINTAINER="Andrew Strong"
+EMAIL="andrew.david.strong@gmail.com"
diff --git a/network/maildrop/slack-desc b/network/maildrop/slack-desc
index 1674bce5b0..9e2320b9ac 100644
--- a/network/maildrop/slack-desc
+++ b/network/maildrop/slack-desc
@@ -11,9 +11,9 @@ maildrop:
 maildrop: maildrop is the mail filter/mail delivery agent that's used by the
 maildrop: Courier Mail Server. This is a standalone build of the maildrop mail
 maildrop: filter that can be used with other mail servers.
+maildrop: If desired it can be used as a 'drop in' replacement for Procmail.
+maildrop:
+maildrop:
+maildrop: http://www.courier-mta.org/maildrop/
 maildrop:
-maildrop: maildrop is a replacement for your local mail delivery agent.
-maildrop: maildrop reads a mail message from standard input, then delivers the
-maildrop: message to your mailbox. maildrop knows how to deliver mail to
-maildrop: mbox-style mailboxes, and maildirs.
 maildrop:
diff --git a/network/mailman/README b/network/mailman/README
index afa42d05f3..61d3495489 100644
--- a/network/mailman/README
+++ b/network/mailman/README
@@ -3,8 +3,9 @@ Mailman (the GNU Mailing List Manager)
 Unlike other SlackBuilds which have a /usr installation prefix, this
 script will install Mailman to /opt/mailman instatead. This is done
 to simplify the build process since Mailman 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.
+into many non-standard directories in the prefix directory. Therefore,
+it is installed as a self-contained and easily-removable location
+in /opt.
 
 It may be that you wish to keep Mailman's lists database in /var/mailman
 instead of /opt/mailman/var/mailman, in which case you should adjust the
@@ -15,8 +16,10 @@ VAR_PREFIX variable at runtime. For example:
 This SlackBuild assumes the webserver group name to be "apache", 
 which should work just fine for you if you have the Slackware 
 httpd package installed.
-If you wish to use a diffent webserver then set the group name accordingly
-by passing is to the script via the CGI_GID variable at runtime. Eg:
+
+If you wish to use a diffent webserver then set the group name
+accordingly by passing is to the script via the CGI_GID variable at
+runtime. Eg:
 
   CGI_GID="lighttpd" ./mailman.SlackBuild
 
diff --git a/network/mailman/mailman.SlackBuild b/network/mailman/mailman.SlackBuild
index 289d99cf1a..742d605766 100644
--- a/network/mailman/mailman.SlackBuild
+++ b/network/mailman/mailman.SlackBuild
@@ -1,12 +1,15 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for mailman
 # Written by Eugene Suter (easuter@gmail.com)
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=mailman
-VERSION=${VERSION:-2.1.23}
-BUILD=${BUILD:-1}
+VERSION=${VERSION:-2.1.39}
+BUILD=${BUILD:-4}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 # This might not matter depending on your smtp server, but it may need
 # to be changed to e.g. postfix's gid if you use postfix
@@ -27,7 +30,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
+# the name of the created package would be, and then exit. This information
+# could be useful to other scripts.
+if [ ! -z "${PRINT_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 @@ mkdir -p $PKG
 install -d $PKG/$PREFIX -g mailman -o root -m 2775
 install -d $PKG/$VAR_PREFIX -g mailman -o root -m 2775
 
-set -e 
+set -e
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
@@ -107,16 +117,16 @@ chmod 0755 $PKG/etc/rc.d/rc.mailman.new
 
 mv $PKG/opt/mailman/Mailman/mm_cfg.py $PKG/opt/mailman/Mailman/mm_cfg.py.new
 
-mkdir -p $PKG/$PREFIX/doc/$PRGNAM-$VERSION
-mkdir -p $PKG/usr/doc
+mkdir -p $PKG/$PREFIX/doc/
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a ACKNOWLEDGMENTS BUGS FAQ NEWS README* STYLEGUIDE.txt TODO \
-  $PKG/$PREFIX/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/$PREFIX/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-( cd $PKG/usr/doc ; ln -s $PREFIX/doc/$PRGNAM-$VERSION )
+  $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+( cd $PKG/$PREFIX/doc ; ln -s /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/network/mailman/mailman.info b/network/mailman/mailman.info
index c76863d4e5..596df193fd 100644
--- a/network/mailman/mailman.info
+++ b/network/mailman/mailman.info
@@ -1,10 +1,10 @@
 PRGNAM="mailman"
-VERSION="2.1.23"
-HOMEPAGE="http://www.gnu.org/software/mailman/index.html"
-DOWNLOAD="http://ftp.gnu.org/gnu/mailman/mailman-2.1.23.tgz"
-MD5SUM="ceb2d8427e29f4e69b2505423ffeb60b"
+VERSION="2.1.39"
+HOMEPAGE="https://www.gnu.org/software/mailman/"
+DOWNLOAD="http://ftp.gnu.org/gnu/mailman/mailman-2.1.39.tgz"
+MD5SUM="6edf92c119da01ed42665530dfaa2c92"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="dnspython"
-MAINTAINER="Steven King"
-EMAIL="kingrst@gmail.com"
+REQUIRES="python2-dnspython"
+MAINTAINER="Yth - Arnaud"
+EMAIL="yth@ythogtha.org"
diff --git a/network/mailman/rc.mailman b/network/mailman/rc.mailman
index 21840941e3..5a9319a8ad 100644
--- a/network/mailman/rc.mailman
+++ b/network/mailman/rc.mailman
@@ -32,7 +32,7 @@
 # config: /opt/mailman/Mailman/mm_cfg.py
 # pidfile: /opt/mailman/var/mailman/data/master-qrunner.pid
 
-PYTHON=/usr/bin/python
+PYTHON=/usr/bin/python3
 MAILMANHOME=/opt/mailman/var/mailman
 MAILMANCTL=/opt/mailman/bin/mailmanctl
 
diff --git a/network/mailspring/README b/network/mailspring/README
new file mode 100644
index 0000000000..1a4975dd51
--- /dev/null
+++ b/network/mailspring/README
@@ -0,0 +1,9 @@
+Mailspring (A beautiful, fast and maintained fork of Nylas Mail)
+
+Mailspring is a new version of Nylas Mail maintained by one of the
+original authors. It's faster, leaner, and shipping today! It replaces
+the JavaScript sync code in Nylas Mail with a new C++ sync engine based
+on Mailcore2. It uses roughly half the RAM and CPU of Nylas Mail and
+idles with almost zero "CPU Wakes", which translates to great battery
+life. It also has an entirely revamped composer and other great new
+features.
diff --git a/network/mailspring/doinst.sh b/network/mailspring/doinst.sh
new file mode 100644
index 0000000000..726ffe403b
--- /dev/null
+++ b/network/mailspring/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 -f usr/share/icons/hicolor >/dev/null 2>&1
+  fi
+fi
diff --git a/network/mailspring/mailspring.SlackBuild b/network/mailspring/mailspring.SlackBuild
new file mode 100644
index 0000000000..e50fd580a0
--- /dev/null
+++ b/network/mailspring/mailspring.SlackBuild
@@ -0,0 +1,100 @@
+#!/bin/bash
+
+# Slackware build script for mailspring
+#
+# Copyright 2020 Muhammad Mahendra Subrata Depok, Indonesia
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=mailspring
+VERSION=${VERSION:-1.13.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
+  echo "This package is currently only available for 64bit."
+  exit 1
+elif [ "$ARCH" = "x86_64" ]; then
+  DEBARCH="amd64"
+else
+  echo "Package for $(uname -m) architecture is not available."
+  exit 1
+fi
+
+set -eu
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $PKG
+ar p $CWD/${PRGNAM}-${VERSION}-${DEBARCH}.deb data.tar.xz | tar -Jxv
+
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -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 some ELF binaries'/libraries' permissions
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | while read -r ELF_FILE; do
+    if [ ! -x "$ELF_FILE" ]; then
+      chmod +x "$ELF_FILE"
+    fi
+  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
+mv $PKG/usr/share/doc/${PRGNAM}/copyright $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+# Don't need these:
+rm -rf $PKG/usr/share/doc $PKG/usr/share/lintian
+
+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/network/mailspring/mailspring.info b/network/mailspring/mailspring.info
new file mode 100644
index 0000000000..e667dfd940
--- /dev/null
+++ b/network/mailspring/mailspring.info
@@ -0,0 +1,10 @@
+PRGNAM="mailspring"
+VERSION="1.13.2"
+HOMEPAGE="https://getmailspring.com/"
+DOWNLOAD="UNSUPPORTED"
+MD5SUM=""
+DOWNLOAD_x86_64="https://github.com/Foundry376/Mailspring/releases/download/1.13.2/mailspring-1.13.2-amd64.deb"
+MD5SUM_x86_64="64686f30e7e16ed33a96d8ec3901bdaf"
+REQUIRES=""
+MAINTAINER="Muhammad Mahendra Subrata"
+EMAIL="mumahendras3@gmail.com"
diff --git a/network/mailspring/slack-desc b/network/mailspring/slack-desc
new file mode 100644
index 0000000000..c5017d9e33
--- /dev/null
+++ b/network/mailspring/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+          |-----handy-ruler------------------------------------------------------|
+mailspring: mailspring (a beautiful, fast and maintained fork of Nylas Mail)
+mailspring:
+mailspring: Mailspring is a new version of Nylas Mail maintained by one of the
+mailspring: original authors. It's faster, leaner, and shipping today! It replaces
+mailspring: the JavaScript sync code in Nylas Mail with a new C++ sync engine
+mailspring: based on Mailcore2. It uses roughly half the RAM and CPU of Nylas Mail
+mailspring: and idles with almost zero "CPU Wakes", which translates to great
+mailspring: battery life. It also has an entirely revamped composer and other
+mailspring: great new features.
+mailspring:
+mailspring: Homepage: https://getmailspring.com/
diff --git a/network/malheur/README b/network/malheur/README
index 62cd14299b..02695ec907 100644
--- a/network/malheur/README
+++ b/network/malheur/README
@@ -1,10 +1,11 @@
 malheur (automatic analysis of malware behaviour)
 
 Malheur is a tool for the automatic analysis of malware behavior
-(program behavior recorded from malicious software in a sandbox environment).
+(program behavior recorded from malicious software in a sandbox
+environment).
 
-It has been designed to support the regular analysis of malicious software and
-the development of detection and defense measures.
+It has been designed to support the regular analysis of malicious
+software and the development of detection and defense measures.
 
 Malheur allows for identifying novel classes of malware with similar
 behavior and assigning unknown malware to discovered classes.
diff --git a/network/malheur/malheur.SlackBuild b/network/malheur/malheur.SlackBuild
index 7f8bdde0f2..925d457936 100644
--- a/network/malheur/malheur.SlackBuild
+++ b/network/malheur/malheur.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for malheur
 
@@ -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=malheur
 VERSION=${VERSION:-0.5.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"
@@ -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/network/malheur/malheur.info b/network/malheur/malheur.info
index eb60c74988..57397f4182 100644
--- a/network/malheur/malheur.info
+++ b/network/malheur/malheur.info
@@ -1,7 +1,7 @@
 PRGNAM="malheur"
 VERSION="0.5.4"
 HOMEPAGE="http://www.mlsec.org/malheur/"
-DOWNLOAD="http://www.mlsec.org/malheur/files/malheur-0.5.4.tar.gz"
+DOWNLOAD="https://slackware.uk/~urchlay/src/malheur-0.5.4.tar.gz"
 MD5SUM="4fb8acff52cb5fd2c5922bc2cfc9b2ca"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/network/masscan/README b/network/masscan/README
index aaef5aa0bd..c0c821ff55 100644
--- a/network/masscan/README
+++ b/network/masscan/README
@@ -1,4 +1,4 @@
 MASSCAN: Mass IP port scanner
 
-Masscan provides simple, fast TCP port scanning.  It's usage is similar to 
-nmap, but much faster.
+Masscan provides simple, fast TCP port scanning. Its usage is
+similar to nmap, but much faster.
diff --git a/network/masscan/masscan.SlackBuild b/network/masscan/masscan.SlackBuild
index 2f2f6040af..3d7d7236ce 100644
--- a/network/masscan/masscan.SlackBuild
+++ b/network/masscan/masscan.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for masscan
 
@@ -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=masscan
-VERSION=${VERSION:-1.0.5}
+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,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
+# the name of the created package would be, and then exit. This information
+# could be useful to other scripts.
+if [ ! -z "${PRINT_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/$VERSION.tar.gz
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
@@ -69,10 +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 {} \;
 
-# gcc-5 fixes thanks to Arch Linux
-sed -i "s|#elif defined(__GNUC__) && (__GNUC__ == 4)|#elif defined(__GNUC__)|" src/string_s.h
-sed -i -r "s|(CFLAGS )=|\1+=|g" Makefile
-
 make
 make install DESTDIR=$PKG
 install -pDm644 doc/masscan.8 $PKG/usr/man/man8/masscan.8
@@ -91,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/network/masscan/masscan.info b/network/masscan/masscan.info
index a92dde099f..1c2638624e 100644
--- a/network/masscan/masscan.info
+++ b/network/masscan/masscan.info
@@ -1,8 +1,8 @@
 PRGNAM="masscan"
-VERSION="1.0.5"
+VERSION="1.3.2"
 HOMEPAGE="https://github.com/robertdavidgraham/masscan"
-DOWNLOAD="https://github.com/robertdavidgraham/masscan/archive/1.0.5.tar.gz"
-MD5SUM="708e02d58bf21bb7c55ea880df0317f5"
+DOWNLOAD="https://github.com/robertdavidgraham/masscan/archive/1.3.2/masscan-1.3.2.tar.gz"
+MD5SUM="468dc7d2f756625a491f33fdb5fbdfd3"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/network/mattermost-desktop/doinst.sh b/network/mattermost-desktop/doinst.sh
index 5fb28930db..65c7e2eeb9 100644
--- a/network/mattermost-desktop/doinst.sh
+++ b/network/mattermost-desktop/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/network/mattermost-desktop/mattermost-desktop.SlackBuild b/network/mattermost-desktop/mattermost-desktop.SlackBuild
index d18903c886..f782312b6e 100644
--- a/network/mattermost-desktop/mattermost-desktop.SlackBuild
+++ b/network/mattermost-desktop/mattermost-desktop.SlackBuild
@@ -1,8 +1,10 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for mattermost-desktop
 
-# Copyright 2018, 2019 Dominik Drobek <dominik.drobek (at) o2.pl>
+# Copyright 2022 David O'Shaughnessy <dev@osh.id.au>
+# Copyright 2018-2020 Dominik Drobek <dominik.drobek (at) o2.pl>
+#
 # 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=mattermost-desktop
-VERSION=${VERSION:-4.2.1}
-BUILD=${BUILD:-1}
+VERSION=${VERSION:-5.1.1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,11 +40,6 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
 if [ "$ARCH" = "x86_64" ]; then
     SRCARCH="x64"
     PKGARCH="$ARCH"
@@ -51,6 +51,18 @@ else
     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-$PKGARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
 set -e
 
 rm -rf $PKG
@@ -67,14 +79,13 @@ find -L . \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 mkdir -p $PKG/opt/$PRGNAM
-cp -a locales/ resources/ *.bin *.dat *.pak *.so $PRGNAM $PKG/opt/$PRGNAM
-
-mkdir -p $PKG/usr/share/{applications,pixmaps}
-install -m 644 $CWD/$PRGNAM.desktop $PKG/usr/share/applications
-install -m 644 icon.svg $PKG/usr/share/pixmaps/$PRGNAM.svg
+cp -a $TMP/$PRGNAM-$VERSION-linux-$SRCARCH/* $PKG/opt/$PRGNAM
 
 mkdir -p $PKG/usr/bin
-ln -sf ../../opt/$PRGNAM/$PRGNAM $PKG/usr/bin/$PRGNAM
+( cd $PKG/usr/bin; ln -sf ../../opt/$PRGNAM/$PRGNAM $PRGNAM )
+
+install -D -m 644 $CWD/$PRGNAM.desktop $PKG/usr/share/applications/$PRGNAM.desktop
+install -D -m 644 app_icon.png $PKG/usr/share/icons/hicolor/scalable/apps/$PRGNAM.png
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
@@ -82,6 +93,9 @@ cp -a \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
 # fix 755 permissions on resource files and documentation:
 find -L $PKG/opt/$PRGNAM \
   \( -name "*.asar" -o -name "*.bin" -o -name "*.dat" -o -name "*.pak" \) \
@@ -95,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-$PKGARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$PKGARCH-$BUILD$TAG.$PKGTYPE
diff --git a/network/mattermost-desktop/mattermost-desktop.info b/network/mattermost-desktop/mattermost-desktop.info
index 21e55eff02..ee4be2d9eb 100644
--- a/network/mattermost-desktop/mattermost-desktop.info
+++ b/network/mattermost-desktop/mattermost-desktop.info
@@ -1,10 +1,10 @@
 PRGNAM="mattermost-desktop"
-VERSION="4.2.1"
+VERSION="5.1.1"
 HOMEPAGE="https://mattermost.com"
-DOWNLOAD="https://releases.mattermost.com/desktop/4.2.1/mattermost-desktop-4.2.1-linux-ia32.tar.gz"
-MD5SUM="91b64b3e090f462bdfa59301f8128db7"
-DOWNLOAD_x86_64="https://releases.mattermost.com/desktop/4.2.1/mattermost-desktop-4.2.1-linux-x64.tar.gz"
-MD5SUM_x86_64="5b385f9c7debc156b5c73217a3b54fad"
+DOWNLOAD="https://releases.mattermost.com/desktop/5.1.1/mattermost-desktop-5.1.1-linux-ia32.tar.gz"
+MD5SUM="50fc86fbcd609a62e9a356baa00ec358"
+DOWNLOAD_x86_64="https://releases.mattermost.com/desktop/5.1.1/mattermost-desktop-5.1.1-linux-x64.tar.gz"
+MD5SUM_x86_64="aa773fd645be59d55afe5765d2eaa6db"
 REQUIRES=""
-MAINTAINER="Dominik Drobek"
-EMAIL="dominik.drobek (at) o2.pl"
+MAINTAINER="David O'Shaughnessy"
+EMAIL="dev@osh.id.au"
diff --git a/network/mdk3/mdk3.SlackBuild b/network/mdk3/mdk3.SlackBuild
index 7a72c1369c..c7d73cf5e3 100644
--- a/network/mdk3/mdk3.SlackBuild
+++ b/network/mdk3/mdk3.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for mdk3
 
@@ -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=mdk3
 SRCNAM=mdk3-master
 VERSION=${VERSION:-v6_1bf2bd3}
 COMMIT=${COMMIT:-1bf2bd31b79560aa99fc42123f70f36a03154b9e}
 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}
@@ -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/network/mdk4/README b/network/mdk4/README
new file mode 100644
index 0000000000..bde5292e71
--- /dev/null
+++ b/network/mdk4/README
@@ -0,0 +1,8 @@
+MDK is a proof-of-concept tool to exploit common IEEE 802.11 protocol
+weaknesses.
+
+MDK4 is a new version of MDK3.
+
+MDK4 is a Wi-Fi testing tool from E7mer, ASPj of k2wrlz, it uses the
+osdep library from the aircrack-ng project to inject frames on several
+operating systems.
diff --git a/network/mdk4/mdk4.SlackBuild b/network/mdk4/mdk4.SlackBuild
new file mode 100644
index 0000000000..f3e3c5b046
--- /dev/null
+++ b/network/mdk4/mdk4.SlackBuild
@@ -0,0 +1,90 @@
+#!/bin/bash
+
+# Slackware build script for MDK4
+
+# 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=mdk4
+VERSION=${VERSION:-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}
+
+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 \
+  -e 's/^\(PREFIX\s\+=\s\+\).\+$/\1\/usr/' \
+  -e 's/^\(MANDIR\s\+=\s\+\$(PREFIX)\/\).\+$/\1man/' \
+  -e 's/^\(\s\+\(install\|gzip\)\b.\+\/man8\/mdk4\)\.2$/\1.8/' \
+  Makefile
+sed -i \
+  -e 's/^\(\s\+install\b.\+\s\+\)\(\$(SBINDIR).\+\)$/\1$(DESTDIR)\2/' \
+  -e 's/^\(\s\+\)\(mkdir\s\+-p\s\+\/usr\/local\/src\/mdk4\|cp\s\+-r\s\+pocs\s\+\/usr\/local\/src\/mdk4\)$/\1#\2/' \
+  src/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
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+  AUTHORS CHANGELOG COPYING 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/network/mdk4/mdk4.info b/network/mdk4/mdk4.info
new file mode 100644
index 0000000000..86a0a0728c
--- /dev/null
+++ b/network/mdk4/mdk4.info
@@ -0,0 +1,10 @@
+PRGNAM="mdk4"
+VERSION="4.2"
+HOMEPAGE="https://github.com/aircrack-ng/mdk4"
+DOWNLOAD="https://github.com/aircrack-ng/mdk4/archive/refs/tags/4.2/mdk4-4.2.tar.gz"
+MD5SUM="9f5307f29cbde23da235e0c1f49c9bf5"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="pyllyukko"
+EMAIL="pyllyukko@maimed.org"
diff --git a/network/mdk4/slack-desc b/network/mdk4/slack-desc
new file mode 100644
index 0000000000..ed5b7770b9
--- /dev/null
+++ b/network/mdk4/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+    |-----handy-ruler------------------------------------------------------|
+mdk4: mdk4 (Wi-Fi testing tool)
+mdk4:
+mdk4: MDK is a proof-of-concept tool to exploit common IEEE 802.11 protocol
+mdk4: weaknesses.
+mdk4:
+mdk4: MDK4 is a new version of MDK3.
+mdk4:
+mdk4:
+mdk4:
+mdk4: Homepage: https://github.com/aircrack-ng/mdk4
+mdk4:
diff --git a/network/megatools/README b/network/megatools/README
index c7107d916f..2d625d0ade 100644
--- a/network/megatools/README
+++ b/network/megatools/README
@@ -1,9 +1,11 @@
-Megatools is a collection of programs for accessing Mega service from a command
-line of your desktop or server.
+Megatools is a collection of programs for accessing Mega service from
+a command line of your desktop or server.
 
-Megatools allow you to copy individual files as well as entire directory trees
-to and from the cloud. You can also perform streaming downloads for example to
-preview videos and audio files, without needing to download the entire file.
+Megatools allow you to copy individual files as well as entire
+directory trees to and from the cloud. You can also perform streaming
+downloads for example to preview videos and audio files, without
+needing to download the entire file.
 
-Megatools are robust and optimized for fast operation - as fast as Mega servers
-allow. Memory requirements and CPU utilization are kept at minimum.
+Megatools are robust and optimized for fast operation - as fast as
+Mega servers allow. Memory requirements and CPU utilization are kept
+at minimum.
diff --git a/network/megatools/megatools.SlackBuild b/network/megatools/megatools.SlackBuild
index a8ecc2bac3..445f614e84 100644
--- a/network/megatools/megatools.SlackBuild
+++ b/network/megatools/megatools.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for megatools
 
-# Copyright 2014-2018 Benjamin Trigona-Harany <slackbuilds@jaxartes.net>
+# Copyright 2014-2020 Benjamin Trigona-Harany <slackbuilds@jaxartes.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=megatools
-VERSION=${VERSION:-1.10.2}
+VERSION=${VERSION:-1.10.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}
@@ -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/network/megatools/megatools.info b/network/megatools/megatools.info
index 9482d6a966..29028d7511 100644
--- a/network/megatools/megatools.info
+++ b/network/megatools/megatools.info
@@ -1,8 +1,8 @@
 PRGNAM="megatools"
-VERSION="1.10.2"
+VERSION="1.10.3"
 HOMEPAGE="https://megatools.megous.com/"
-DOWNLOAD="https://megatools.megous.com/builds/megatools-1.10.2.tar.gz"
-MD5SUM="b9c7e18b4daf48867d7c669a674744b0"
+DOWNLOAD="https://megatools.megous.com/builds/megatools-1.10.3.tar.gz"
+MD5SUM="e5f85f5f5d4fe844a6090a2816eabcae"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/network/memcached-init/memcached-init.SlackBuild b/network/memcached-init/memcached-init.SlackBuild
index 5309bce0db..36002149fc 100644
--- a/network/memcached-init/memcached-init.SlackBuild
+++ b/network/memcached-init/memcached-init.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for "memcached-init".
 
@@ -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=memcached-init
 DESTNAM=memcached
 VERSION=${VERSION:-1.0.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
 
-CWD=$(pwd)
 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/network/memcached/README b/network/memcached/README
index c2470754ec..45f7bbaae5 100644
--- a/network/memcached/README
+++ b/network/memcached/README
@@ -1,3 +1,3 @@
-memcached is a high-performance, distributed memory object caching system,
-generic in nature, but intended for use in speeding up dynamic web
-applications by alleviating database load.
+memcached is a high-performance, distributed memory object caching
+system, generic in nature, but intended for use in speeding up dynamic
+web applications by alleviating database load.
diff --git a/network/memcached/memcached.SlackBuild b/network/memcached/memcached.SlackBuild
index 404909ad39..bc6a680fcf 100644
--- a/network/memcached/memcached.SlackBuild
+++ b/network/memcached/memcached.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for memcached
 # Home Page: http://memcached.org/
@@ -28,10 +28,13 @@
 # Originally written by Conrado Ruch Jr  conradojr@gmail.com
 # Added rc startup script contributed by Miguel De Anda
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM="memcached"
-VERSION=${VERSION:-1.4.37}
+VERSION=${VERSION:-1.6.9}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -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}
@@ -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/network/memcached/memcached.info b/network/memcached/memcached.info
index 3be16c1c65..76d908aabf 100644
--- a/network/memcached/memcached.info
+++ b/network/memcached/memcached.info
@@ -1,8 +1,8 @@
 PRGNAM="memcached"
-VERSION="1.4.37"
+VERSION="1.6.9"
 HOMEPAGE="http://memcached.org/"
-DOWNLOAD="http://www.memcached.org/files/memcached-1.4.37.tar.gz"
-MD5SUM="5080f9e984486380f628a743dcadf1dc"
+DOWNLOAD="http://www.memcached.org/files/memcached-1.6.9.tar.gz"
+MD5SUM="ee802a316d7d622aaaec22382ca65004"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/network/metasploit/metasploit.SlackBuild b/network/metasploit/metasploit.SlackBuild
index 5146da7cd9..54eea6ee79 100644
--- a/network/metasploit/metasploit.SlackBuild
+++ b/network/metasploit/metasploit.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for Metasploit Framework
 
@@ -26,20 +26,30 @@
 # If you want to build a different version from the one defined in the VERSION
 # variable just try to launch the script redefining this.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=metasploit
 VERSION=${VERSION:-4.7.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}
@@ -69,7 +79,7 @@ elif ! grep ^postgres: /etc/passwd 2>&1 > /dev/null; then
   exit 1
 fi
 
-if [ "$ARCH" = "i486" ]; then
+if [ "$ARCH" = "i586" ]; then
   INSTALLERARCH=""
 elif [ "$ARCH" = "i686" ]; then
   INSTALLERARCH=""
@@ -152,4 +162,4 @@ ln -s apps/pro/msf3 $PKG/$INSTDIR/msf3
 # Do NOT chown -R root:root or it will bork the shipped PostgreSQL
 # installation: the bitrock installer should have taken care of permissions
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/network/metasploit/metasploit.info b/network/metasploit/metasploit.info
index e7eac77a3e..ff80e873c2 100644
--- a/network/metasploit/metasploit.info
+++ b/network/metasploit/metasploit.info
@@ -6,5 +6,5 @@ MD5SUM="9d4abba0e05bb972ba805e6e0e63cea0"
 DOWNLOAD_x86_64="http://downloads.metasploit.com/data/releases/archive/metasploit-4.7.0-linux-x64-installer.run"
 MD5SUM_x86_64="b36d8c7282f91e8bcb0138f2feb702cf"
 REQUIRES=""
-MAINTAINER="Andrea Villa"
-EMAIL="andreakarimodm@gmail.com"
+MAINTAINER="Dionysis Ntreou"
+EMAIL="yakizarns1@gmail.com"
diff --git a/network/mew/mew.SlackBuild b/network/mew/mew.SlackBuild
index 685d260734..98d6ad4a3f 100644
--- a/network/mew/mew.SlackBuild
+++ b/network/mew/mew.SlackBuild
@@ -1,13 +1,16 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for Mew
 
 # Maintained by vvoody <vvoodywang@gmail.com>
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=mew
 VERSION=${VERSION:-6.7}
 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}
@@ -94,4 +104,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 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/network/microsoft-edge/README b/network/microsoft-edge/README
new file mode 100644
index 0000000000..4643e8a054
--- /dev/null
+++ b/network/microsoft-edge/README
@@ -0,0 +1,7 @@
+Microsoft Edge is a proprietary, cross-platform web browser
+created by Microsoft. It was first released in 2015 as part
+of Windows 10 and Xbox One and later ported to other
+platforms as a fork of Google's Chromium open-source
+project: Android and iOS, macOS, older Windows versions
+(Windows 7, Windows Server 2008 R2 and later), and most
+recently Linux.
diff --git a/network/ipscan/doinst.sh b/network/microsoft-edge/doinst.sh
index aea0f894eb..aea0f894eb 100644
--- a/network/ipscan/doinst.sh
+++ b/network/microsoft-edge/doinst.sh
diff --git a/network/microsoft-edge/microsoft-edge.SlackBuild b/network/microsoft-edge/microsoft-edge.SlackBuild
new file mode 100644
index 0000000000..74965061bd
--- /dev/null
+++ b/network/microsoft-edge/microsoft-edge.SlackBuild
@@ -0,0 +1,111 @@
+#!/bin/bash
+#
+# Slackware build script for microsoft-edge.
+#
+# Copyright 2023 Andrew Payne <phalange@komputermatrix.com>
+# 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=microsoft-edge
+BRANCH=stable
+VERSION=${VERSION:-117.0.2045.55}
+BUILD=${BUILD:-1}
+DEBBUILD=${DEBBUILD:-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-$BRANCH_$VERSION_$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "x86_64" ]; then
+  BIT="amd64"
+else
+  echo "$ARCH is not supported."
+  exit 1
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-${VERSION}
+mkdir -p $PRGNAM-${VERSION}
+ar x $CWD/$PRGNAM-$BRANCH"_"${VERSION}-${DEBBUILD}_${BIT}.deb --output $PRGNAM-$VERSION
+cd $PRGNAM-$VERSION
+
+rm {control.tar.xz,debian-binary,_gpgorigin}
+
+xz -d data.tar.xz
+tar --extract -f data.tar
+
+# remove what won't work
+rm -rf etc
+rm -rf usr/share/gnome-control-center
+rm -rf usr/share/menu
+rm -rf usr/bin
+
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -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,usr/share,opt}
+  cp -a opt/ $PKG/
+  ln -s /opt/microsoft/msedge/$PRGNAM $PKG/usr/bin/$PRGNAM-$BRANCH
+  cp -a usr/share/man $PKG/usr/
+  cp -a usr/share/{appdata,applications} $PKG/usr/share/
+
+# move icon into place
+mkdir -p $PKG/usr/share/pixmaps
+cp -a opt/microsoft/msedge/product_logo_32.xpm \
+   $PKG/usr/share/pixmaps/microsoft-edge.xpm
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+cp -a usr/share/doc/microsoft-edge-stable/* $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/network/microsoft-edge/microsoft-edge.info b/network/microsoft-edge/microsoft-edge.info
new file mode 100644
index 0000000000..d62cdcdd45
--- /dev/null
+++ b/network/microsoft-edge/microsoft-edge.info
@@ -0,0 +1,10 @@
+PRGNAM="microsoft-edge"
+VERSION="117.0.2045.55"
+HOMEPAGE="https://www.microsoft.com/edge"
+DOWNLOAD="UNSUPPORTED"
+MD5SUM=""
+DOWNLOAD_x86_64="https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edge-stable/microsoft-edge-stable_117.0.2045.55-1_amd64.deb"
+MD5SUM_x86_64="79326169c59d70280515bc8fd8448fa9"
+REQUIRES=""
+MAINTAINER="Andrew Payne"
+EMAIL="phalange@komputermatrix.com"
diff --git a/network/microsoft-edge/slack-desc b/network/microsoft-edge/slack-desc
new file mode 100644
index 0000000000..0413d92cad
--- /dev/null
+++ b/network/microsoft-edge/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+              |-----handy-ruler------------------------------------------------------|
+microsoft-edge: microsoft-edge (web browser)
+microsoft-edge:
+microsoft-edge: Microsoft Edge is a proprietary, cross-platform web browser created
+microsoft-edge: by Microsoft.
+microsoft-edge:
+microsoft-edge: Home page: https://www.microsoft.com/en-us/edge
+microsoft-edge:
+microsoft-edge:
+microsoft-edge:
+microsoft-edge:
+microsoft-edge:
diff --git a/network/midori/README b/network/midori/README
deleted file mode 100644
index 16ec7ed18a..0000000000
--- a/network/midori/README
+++ /dev/null
@@ -1,20 +0,0 @@
-Midori is a lightweight, webkit-based web browser.
-
-Features:
-    * Full integration with GTK+2
-    * Fast rendering with WebKit
-    * Tabs, windows and session management
-    * Flexibly configurable Web Search.
-    * User scripts and user styles support.
-    * Straightforward bookmark management.
-    * Customizable and extensible interface.
-    * Extensions such as Adblock, form history, mouse gestures
-      or cookie management.
-
-GTK3 support is disabled by default but can be enabled
-by passing GTK3=yes to the script, e.g.
-
-  GTK3=yes ./midori.SlackBuild
-
-If enabled then webkitgtk3 and libunique3 (instead of webkitgtk
-and libunique) are required.
diff --git a/network/midori/doinst.sh b/network/midori/doinst.sh
deleted file mode 100644
index 8505e6eaff..0000000000
--- a/network/midori/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/xdg/midori/search.new
-config etc/xdg/midori/extensions/adblock/config.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/network/midori/midori.SlackBuild b/network/midori/midori.SlackBuild
deleted file mode 100644
index 99efa991c7..0000000000
--- a/network/midori/midori.SlackBuild
+++ /dev/null
@@ -1,120 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for midori.
-
-# Copyright 2008 Andrew Brouwers <abrouwers@gmail.com>
-# Copyright 2009-2011 Pierre Cazenave <pwcazenave {at} gmail [dot] com>
-# Copyright 2012-2013 Roberto Neri, Palermo, Italy
-# Copyright 2013-2016 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.
-
-PRGNAM=midori
-VERSION=${VERSION:-0.5.11}
-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" = "s390" ]; then
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
-else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-fi
-
-# GTK3 support is disabled by default but can be enabled
-# by passing GTK3=yes to the script
-if [ "${GTK3:-no}" = "yes" ]; then
-  ENABLE_GTK3="ON"
-else
-  ENABLE_GTK3="OFF"
-fi
-
-set -eu
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/${PRGNAM}_${VERSION}_all_.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 -p build
-cd build
-  cmake \
-    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DCMAKE_INSTALL_FULL_SYSCONFDIR=/etc \
-    -DCMAKE_INSTALL_FULL_LIBDIR=/usr/lib$LIBDIRSUFFIX \
-    -DCMAKE_INSTALL_DOCDIR=/usr/doc/$PRGNAM-$VERSION \
-    -DDATADIR=/usr/share/$PRGNAM \
-    -DUSE_ZEITGEIST=OFF \
-    -DUSE_GTK3="$ENABLE_GTK3" \
-    -DHALF_BRO_INCOM_WEBKIT2=ON \
-    -DCMAKE_BUILD_TYPE=Release ..
-  make
-  make install DESTDIR=$PKG
-cd ..
-
-# Don't clobber existing configs
-mv $PKG/etc/xdg/midori/search $PKG/etc/xdg/midori/search.new
-mv $PKG/etc/xdg/midori/extensions/adblock/config $PKG/etc/xdg/midori/extensions/adblock/config.new
-
-# The other docs have been taken care by make install
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a HACKING TODO TRANSLATE \
-  $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-ln -s $PRGNAM-$VERSION $PKG/usr/doc/$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/network/midori/midori.info b/network/midori/midori.info
deleted file mode 100644
index a2abab3152..0000000000
--- a/network/midori/midori.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="midori"
-VERSION="0.5.11"
-HOMEPAGE="http://midori-browser.org/"
-DOWNLOAD="http://ponce.cc/slackware/sources/repo/midori_0.5.11_all_.tar.bz2"
-MD5SUM="fcc03ef759fce4fe9f2446d9da4a065e"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="vala webkit2gtk"
-MAINTAINER="Matteo Bernardini"
-EMAIL="ponce@slackbuilds.org"
diff --git a/network/midori/slack-desc b/network/midori/slack-desc
deleted file mode 100644
index bddbb483ce..0000000000
--- a/network/midori/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------------------------------------------------------|
-midori: midori (simple web-browser)
-midori:
-midori: midori is a simple web-browser, based on the webkit framework.
-midori:
-midori:
-midori:
-midori: Homepage: http://midori-browser.org/
-midori:
-midori:
-midori:
-midori:
diff --git a/network/milter-greylist/milter-greylist.SlackBuild b/network/milter-greylist/milter-greylist.SlackBuild
index a440fe5877..d490a5956b 100644
--- a/network/milter-greylist/milter-greylist.SlackBuild
+++ b/network/milter-greylist/milter-greylist.SlackBuild
@@ -1,7 +1,7 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for milter-greylist
-# Copyright 2014 David Woodfall <dave@dawoodfall.net>
+# Copyright 2014 David Woodfall <dave@slackbuilds.org>
 # 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=milter-greylist
 VERSION=${VERSION:-4.6.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}
@@ -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/network/milter-greylist/milter-greylist.info b/network/milter-greylist/milter-greylist.info
index 825943d46d..c28533bf1d 100644
--- a/network/milter-greylist/milter-greylist.info
+++ b/network/milter-greylist/milter-greylist.info
@@ -6,5 +6,5 @@ MD5SUM="8872008db2fc6b93dd9ab8576383fec2"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Dave Woodfall"
-EMAIL="dave@tty1.uk"
+MAINTAINER="D Woodfall"
+EMAIL="dave@slackbuilds.org"
diff --git a/network/milter-greylist/rc.milter-greylist.new b/network/milter-greylist/rc.milter-greylist.new
index 5f4ce88cb4..8a7c5a74dd 100644
--- a/network/milter-greylist/rc.milter-greylist.new
+++ b/network/milter-greylist/rc.milter-greylist.new
@@ -2,7 +2,7 @@
 #
 # Slackware init script for milter-greylist
 
-# Copyright 2018 Dave Woodfall <dave@tty1.uk>
+# Copyright 2018 Dave Woodfall <dave@slackbuilds.org>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
diff --git a/network/miniupnpd/miniupnpd.SlackBuild b/network/miniupnpd/miniupnpd.SlackBuild
index 648a3fc3aa..611f5696cd 100644
--- a/network/miniupnpd/miniupnpd.SlackBuild
+++ b/network/miniupnpd/miniupnpd.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for miniupnpd
 
@@ -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=miniupnpd
-VERSION=${VERSION:-2.1}
+VERSION=${VERSION:-2.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}
@@ -71,14 +81,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 {} \;
 
-patch -p1 < "$CWD/slackware-version.patch"
-
-make -f Makefile.linux config.h
+CFLAGS="$SLKCFLAGS" \
+PREFIX=/usr \
+./configure \
+  --ipv6
 
-make -f Makefile.linux \
-  CFLAGS="$SLKCFLAGS"
+CFLAGS="$SLKCFLAGS" \
+make
+PREFIX=/usr \
 
-make -f Makefile.linux install \
+make install \
   MANINSTALLDIR=/usr/man/man8 \
   DESTDIR=$PKG
 
@@ -119,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/network/miniupnpd/miniupnpd.info b/network/miniupnpd/miniupnpd.info
index 0a0edb38fa..c36c956244 100644
--- a/network/miniupnpd/miniupnpd.info
+++ b/network/miniupnpd/miniupnpd.info
@@ -1,8 +1,8 @@
 PRGNAM="miniupnpd"
-VERSION="2.1"
+VERSION="2.3.0"
 HOMEPAGE="http://miniupnp.free.fr/"
-DOWNLOAD="http://miniupnp.free.fr/files/miniupnpd-2.1.tar.gz"
-MD5SUM="91d0524bba6a839c05c22c9484ed9d0f"
+DOWNLOAD="http://miniupnp.free.fr/files/miniupnpd-2.3.0.tar.gz"
+MD5SUM="053a196ac7ba59e275e249d4173d6890"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/network/miniupnpd/slackware-version.patch b/network/miniupnpd/slackware-version.patch
deleted file mode 100644
index 79bd2bdec6..0000000000
--- a/network/miniupnpd/slackware-version.patch
+++ /dev/null
@@ -1,60 +0,0 @@
---- a/genconfig.sh	2018-05-05 10:09:05.942853150 +0200
-+++ b/genconfig.sh	2018-05-05 10:26:38.668441749 +0200
-@@ -274,28 +274,35 @@
- 			OS_VERSION=`grep ^base_version /etc/product | awk '{ print $3 }'`
- 			OS_URL=https://www.clearos.com/
- 		fi
--		# use lsb_release (Linux Standard Base) when available
--		LSB_RELEASE=`which lsb_release`
--		if [ 0 -eq $? ]; then
--			OS_NAME=`${LSB_RELEASE} -i -s`
--			OS_VERSION=`${LSB_RELEASE} -r -s`
--			case $OS_NAME in
--				Debian)
--					OS_URL=http://www.debian.org/
--					OS_VERSION=`${LSB_RELEASE} -c -s`
--					;;
--				Ubuntu)
--					OS_URL=http://www.ubuntu.com/
--					OS_VERSION=`${LSB_RELEASE} -c -s`
--					;;
--				Gentoo)
--					OS_URL=http://www.gentoo.org/
--					;;
--				arch)
--					OS_URL=http://www.archlinux.org/
--					OS_VERSION=`uname -r`
--					;;
--			esac
-+		# Slackware specific
-+		if [ -f /etc/os-release ]; then
-+			OS_NAME=$(cat /etc/os-release | grep ^NAME= | cut -d= -f 2 | sed -e 's/^"//' -e 's/"$//')
-+			OS_VERSION=$(cat /etc/os-release | grep ^VERSION= | cut -d= -f 2 | sed -e 's/^"//' -e 's/"$//')
-+			OS_URL=$(cat /etc/os-release | grep ^HOME_URL= | cut -d= -f 2 | sed -e 's/^"//' -e 's/"$//')
-+		else
-+		# otherwise use lsb_release (Linux Standard Base) when available
-+			LSB_RELEASE=`which lsb_release`
-+			if [ 0 -eq $? ]; then
-+				OS_NAME=`${LSB_RELEASE} -i -s`
-+				OS_VERSION=`${LSB_RELEASE} -r -s`
-+				case $OS_NAME in
-+					Debian)
-+						OS_URL=http://www.debian.org/
-+						OS_VERSION=`${LSB_RELEASE} -c -s`
-+						;;
-+					Ubuntu)
-+						OS_URL=http://www.ubuntu.com/
-+						OS_VERSION=`${LSB_RELEASE} -c -s`
-+						;;
-+					Gentoo)
-+						OS_URL=http://www.gentoo.org/
-+						;;
-+					arch)
-+						OS_URL=http://www.archlinux.org/
-+						OS_VERSION=`uname -r`
-+						;;
-+				esac
-+			fi
- 		fi
- 		echo "#define USE_IFACEWATCHER 1" >> ${CONFIGFILE}
- 		FW=netfilter
diff --git a/network/miredo/README b/network/miredo/README
deleted file mode 100644
index 8839ea4e8e..0000000000
--- a/network/miredo/README
+++ /dev/null
@@ -1,27 +0,0 @@
-miredo (teredo IPv6 tunneling)
-
-Miredo is an opensource Teredo IPv6 tunneling software for Linux
-and BSD operating systems. It includes functional implementations
-of all components of the Teredo specification (client, relay and
-server). It is meant to provide IPv6 connectivity even from
-behind NAT devices.
-
-This script requires a 'miredo' user/group to exist before running.
-The recommended UID/GID is 255. You can create these like so:
-
-  groupadd -g 255 miredo
-  useradd -u 255 -g 255 -c "Teredo IPv6 Tunneling" -d /dev/null -s /bin/false miredo
-
-Alternatively, you can fall back to default 'nobody' user by passing
-NOBODY=yes to the script. However, this is less safe.
-
-The following can be used to start/stop miredo automatically:
-/etc/rc.d/rc.local
-  if [ -x /etc/rc.d/rc.miredo ]; then
-    /etc/rc.d/rc.miredo start
-  fi
-
-/etc/rc.d/rc.local_shutdown
-  if [ -x /etc/rc.d/rc.miredo ]; then
-    /etc/rc.d/rc.miredo stop
-  fi
diff --git a/network/miredo/doinst.sh b/network/miredo/doinst.sh
deleted file mode 100644
index e8b05b9a7a..0000000000
--- a/network/miredo/doinst.sh
+++ /dev/null
@@ -1,24 +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
-}
-
-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.miredo.new
-config etc/miredo/miredo.conf.new
-
diff --git a/network/miredo/miredo.SlackBuild b/network/miredo/miredo.SlackBuild
deleted file mode 100644
index 1681952e13..0000000000
--- a/network/miredo/miredo.SlackBuild
+++ /dev/null
@@ -1,112 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for Miredo
-
-# Copyright 2011-2013  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=miredo
-VERSION=${VERSION:-1.2.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
-
-if [ "${NOBODY:-no}" = "no" ]; then
-  if ! grep -q "^$PRGNAM:" /etc/passwd || ! grep -q "^$PRGNAM:" /etc/group; then
-    cat << EOF
-You must have a $PRGNAM user and $PRGNAM group to run this script.
-Something like this should suffice for most systems:
-  # groupadd -g 255 miredo
-  # useradd -u 255 -g 255 -c "Teredo IPv6 Tunneling" -d /dev/null -s /bin/false miredo
-EOF
-    exit 1
-  fi
-  enable_user="--enable-$PRGNAM-user"
-else
-  enable_user=""
-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 .
-
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
-  --prefix=/usr \
-  --sysconfdir=/etc \
-  --localstatedir=/var \
-  --mandir=/usr/man \
-  --docdir=/usr/doc/$PRGNAM-$VERSION \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --build=$ARCH-slackware-linux \
-  $enable_user
-
-make V=1
-make install-strip DESTDIR=$PKG
-
-install -D -m 0644 $CWD/rc.$PRGNAM $PKG/etc/rc.d/rc.$PRGNAM.new
-( cd $PKG/etc/$PRGNAM ; mv $PRGNAM.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
-
-cp -a ABOUT-NLS AUTHORS COPYING ChangeLog 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
-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/network/miredo/miredo.info b/network/miredo/miredo.info
deleted file mode 100644
index 4eae27a363..0000000000
--- a/network/miredo/miredo.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="miredo"
-VERSION="1.2.6"
-HOMEPAGE="http://www.remlab.net/miredo"
-DOWNLOAD="http://www.remlab.net/files/miredo/miredo-1.2.6.tar.xz"
-MD5SUM="5bcdbaced54f40b6cb1e9c9a8dbac411"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="orphaned - no maintainer"
-EMAIL="nobody@nowhere.com"
diff --git a/network/miredo/rc.miredo b/network/miredo/rc.miredo
deleted file mode 100644
index 0ba5d706ef..0000000000
--- a/network/miredo/rc.miredo
+++ /dev/null
@@ -1,88 +0,0 @@
-#!/bin/sh
-#
-# Miredo - Teredo IPv6 tunnelling
-#
-# Init script for miredo client.
-#
-# Written by Fridrich von Stauffenberg <cancellor2@gmail.com>
-# Based on tor's init script by Marco Bonetti <sid77@slackware.it>
-
-PIDFILE=/var/run/miredo.pid
-DAEMON=/usr/sbin/miredo
-
-miredo_start() {
-  echo "Starting Miredo: $DAEMON"
-  $DAEMON
-}
-
-miredo_stop() {
-  echo -n "Stopping Miredo... "
-  PID=$(cat $PIDFILE 2>/dev/null)
-  if [ -z "$PID" ]; then
-    echo "not running."
-    exit 0
-  fi
-  if kill -15 $PID; then
-    echo "stopped."
-  else
-    sleep 1
-    if kill -9 $PID; then
-      echo "killed."
-    else
-      echo "error!"
-      exit 1
-    fi
-  fi
-}
-
-miredo_reload() {
-  echo -n "Reloading Miredo... "
-  PID=$(cat $PIDFILE 2>/dev/null)
-  if [ -z "$PID" ]; then
-    echo "not running."
-    exit 0
-  fi
-  if kill -1 $PID; then
-    echo "reloaded."
-  else
-    echo "error!"
-    exit 1
-  fi
-}
-
-miredo_status() {
-  PID=$(cat $PIDFILE 2>/dev/null)
-  if [ -z "$PID" ]; then
-    echo "Not running."
-    exit 1
-  elif kill -0 $PID; then
-    echo "Running with PID $PID."
-    exit 0
-  else
-    echo "PID file $PIDFILE present, but PID $PID is not running."
-    exit 1
-  fi
-}
-
-case "$1" in
-  start)
-    miredo_start
-  ;;
-  stop)
-    miredo_stop
-  ;;
-  restart)
-    miredo_stop
-    sleep 1
-    miredo_start
-  ;;
-  reload)
-    miredo_reload
-  ;;
-  status)
-    miredo_status
-  ;;
-  *)
-    echo "Usage: $0 (start|stop|restart|reload|status)"
-  ;;
-esac
diff --git a/network/miredo/slack-desc b/network/miredo/slack-desc
deleted file mode 100644
index 18c378ee2d..0000000000
--- a/network/miredo/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------------------------------------------------------|
-miredo: miredo (teredo IPv6 tunneling)
-miredo:
-miredo: Miredo is an opensource Teredo IPv6 tunneling software for Linux
-miredo: and BSD operating systems. It includes functional implementations
-miredo: of all components of the Teredo specification (client, relay and
-miredo: server). It is meant to provide IPv6 connectivity even from
-miredo: behind NAT devices.
-miredo:
-miredo: Homepage: http://www.remlab.net/miredo
-miredo:
-miredo:
diff --git a/network/mitmproxy-bin/README b/network/mitmproxy-bin/README
new file mode 100644
index 0000000000..8c9d21a1b9
--- /dev/null
+++ b/network/mitmproxy-bin/README
@@ -0,0 +1,15 @@
+mitmproxy-bin (free and open source interactive HTTPS proxy)
+
+mitmproxy-bin is your swiss-army knife for debugging, testing, privacy
+measurements, and penetration testing. It can be used to intercept,
+inspect, modify and replay web traffic such as HTTP/1, HTTP/2,
+WebSockets, or any other SSL/TLS-protected protocols. You can prettify
+and decode a variety of message types ranging from HTML to Protobuf,
+intercept specific messages on-the-fly, modify them before they reach
+their destination, and replay them to a client or server later on.
+
+This is just a repack of the prebuilt binaries from the mitmproxy
+site, with some documentation added. Since upstream only releases
+x86_64 binaries, this will *not* work on 32-bit x86 (or ARM, etc)
+Slackware... although you can build an x86_64 package on a 32-bit host
+and install it on a 64-bit one, if you like.
diff --git a/network/mitmproxy-bin/mitmproxy-bin.SlackBuild b/network/mitmproxy-bin/mitmproxy-bin.SlackBuild
new file mode 100644
index 0000000000..d34ff53ce2
--- /dev/null
+++ b/network/mitmproxy-bin/mitmproxy-bin.SlackBuild
@@ -0,0 +1,104 @@
+#!/bin/bash
+
+# Slackware build script for mitmproxy-bin
+
+# Written by B. Watson (urchlay@slackware.uk)
+
+# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
+
+# I was gonna package this up from source, but it just has too many
+# dependencies, many of which aren't on SBo already. I'd have to add
+# at least 15 or 20 python modules, and I just won't. The official
+# binary release is "frozen" executables with no external Python
+# dependencies (just shared libs that are part of Slackware already).
+
+# This is mostly just a binary repack of the official build. Which
+# is only for x86_64 Linux (sorry, 32-bit users).
+
+# I named this with the -bin suffix so that someday someone (other
+# than me!) can do a proper build-from-source mitmproxy SlackBuild,
+# with tons of dependencies in REQUIRES...
+
+# There's *nothing* in the Linux tarball besides the executables, so
+# I've also included some docs from the source tarball, but not the
+# complete API docs (again, to avoid a long dependency chain of the
+# stuff needed to build them). Use https://docs.mitmproxy.org/stable/
+# for that.
+
+# 20230103 bkw: update for v9.0.1, fix PKGTYPE, update man page.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=mitmproxy-bin
+SRCNAM=mitmproxy
+VERSION=${VERSION:-9.0.1}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+# Binary repack, only supports:
+ARCH=x86_64
+
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+# If the user's trying to build this on a non-x86_64 box, it's
+# almost certainly a mistake on the user's part... but maybe not,
+# for smart users. So warn and pause, but allow it to happen.
+M="$(uname -m)"
+if [ "$M" != "x86_64" ]; then
+  W="* WARNING: cross-building x86_64 package on $M host. *"
+  H="$( echo "$W" | sed 's,.,*,g' )"
+  echo -e "$H\\n$W\\n$H\\n"
+  cat <<EOF
+You're about to build a 64-bit (x86_64) package, which will work fine
+if you install it on an x86_64 Slackware64 system... but not on *this*
+system, because it's $M, not x86_64.
+
+Press Enter or wait 5 seconds to continue. Or, press ^C to abort.
+EOF
+  read -p "> " -t 5
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $SRCNAM-$VERSION
+mkdir -p $SRCNAM-$VERSION
+cd $SRCNAM-$VERSION
+tar xvf $CWD/$SRCNAM-$VERSION-linux.tar.gz
+tar xvf $CWD/$SRCNAM-$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 {} \+
+
+# Already stripped.
+mkdir -p $PKG/usr/bin
+install -m0755 $SRCNAM mitmdump mitmweb $PKG/usr/bin
+
+# Stub man page. Just stuff copied from the README and a pointer to the
+# actual docs on the web.
+mkdir -p $PKG/usr/man/man1
+gzip -9c < $CWD/$SRCNAM.1 > $PKG/usr/man/man1/$SRCNAM.1.gz
+ln -s $SRCNAM.1.gz $PKG/usr/man/man1/mitmdump.1.gz
+ln -s $SRCNAM.1.gz $PKG/usr/man/man1/mitmweb.1.gz
+
+# Include README, etc from source tarball.
+cd $SRCNAM-$VERSION
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a *.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/network/mitmproxy-bin/mitmproxy-bin.info b/network/mitmproxy-bin/mitmproxy-bin.info
new file mode 100644
index 0000000000..dfbc38e4e8
--- /dev/null
+++ b/network/mitmproxy-bin/mitmproxy-bin.info
@@ -0,0 +1,12 @@
+PRGNAM="mitmproxy-bin"
+VERSION="9.0.1"
+HOMEPAGE="https://mitmproxy.org/"
+DOWNLOAD="UNSUPPORTED"
+MD5SUM=""
+DOWNLOAD_x86_64="https://snapshots.mitmproxy.org/9.0.1/mitmproxy-9.0.1-linux.tar.gz \
+                 https://github.com/mitmproxy/mitmproxy/archive/9.0.1/mitmproxy-9.0.1.tar.gz"
+MD5SUM_x86_64="30da921ebfb0b4a5020e4eee82e4b0d6 \
+               7cd164f90c348ca05f23606971f88e2b"
+REQUIRES=""
+MAINTAINER="B. Watson"
+EMAIL="urchlay@slackware.uk"
diff --git a/network/mitmproxy-bin/mitmproxy.1 b/network/mitmproxy-bin/mitmproxy.1
new file mode 100644
index 0000000000..1d13eaa47a
--- /dev/null
+++ b/network/mitmproxy-bin/mitmproxy.1
@@ -0,0 +1,70 @@
+.\" 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 "MITMPROXY" 1 "2023-01-03" "9.0.1" "SlackBuilds.org"
+.SH NAME
+mitmproxy \- man-in-the-middle SSL/TLS intercepting proxy
+.\" RST source for mitmproxy(1) man page. Convert with:
+.
+.\" rst2man.py mitmproxy.rst > mitmproxy.1
+.
+.\" rst2man.py comes from the SBo development/docutils package.
+.
+.SH DESCRIPTION
+.sp
+This man page just provides links to the actual documentation.
+.sp
+\fBmitmproxy\fP is an interactive, SSL/TLS\-capable intercepting proxy with a console
+(curses\-style) interface for HTTP/1, HTTP/2, and WebSockets.
+.sp
+\fBmitmdump\fP is the command\-line version of \fBmitmproxy\fP\&. Think \fBtcpdump\fP for HTTP(S).
+.sp
+\fBmitmweb\fP is a web\-based interface for \fBmitmproxy\fP\&.
+.sp
+These commands have lots of options; each one can be run with
+\fB\-\-help\fP for a full list.
+.sp
+Full documentation is available at: \fI\%https://docs.mitmproxy.org/stable/\fP
+.sp
+Quite a few example scripts for \fBmitmproxy\fP are installed in
+/usr/doc/mitmproxy\-9.0.1/examples/
+.SH COPYRIGHT
+.sp
+See the file /usr/doc/mitmproxy\-9.0.1/LICENSE for license information.
+.SH AUTHORS
+.sp
+\fBmitmproxy\fP was written by Aldo Cortesi.
+.sp
+This man page written for the SlackBuilds.org project
+by B. Watson, and is licensed under the WTFPL.
+.SH SEE ALSO
+.sp
+The mitmproxy homepage: \fI\%http://www.mitmproxy.org/\fP
+.\" Generated by docutils manpage writer.
+.
diff --git a/network/mitmproxy-bin/mitmproxy.rst b/network/mitmproxy-bin/mitmproxy.rst
new file mode 100644
index 0000000000..caa6760876
--- /dev/null
+++ b/network/mitmproxy-bin/mitmproxy.rst
@@ -0,0 +1,57 @@
+.. RST source for mitmproxy(1) man page. Convert with:
+..   rst2man.py mitmproxy.rst > mitmproxy.1
+.. rst2man.py comes from the SBo development/docutils package.
+
+.. |version| replace:: 9.0.1
+.. |date| date::
+
+=========
+mitmproxy
+=========
+
+--------------------------------------------
+man-in-the-middle SSL/TLS intercepting proxy
+--------------------------------------------
+
+:Manual section: 1
+:Manual group: SlackBuilds.org
+:Date: |date|
+:Version: |version|
+
+DESCRIPTION
+===========
+
+This man page just provides links to the actual documentation.
+
+**mitmproxy** is an interactive, SSL/TLS-capable intercepting proxy with a console
+(curses-style) interface for HTTP/1, HTTP/2, and WebSockets.
+
+**mitmdump** is the command-line version of **mitmproxy**. Think **tcpdump** for HTTP(S).
+
+**mitmweb** is a web-based interface for **mitmproxy**.
+
+These commands have lots of options; each one can be run with
+**--help** for a full list.
+
+Full documentation is available at: https://docs.mitmproxy.org/stable/
+
+Quite a few example scripts for **mitmproxy** are installed in
+/usr/doc/mitmproxy-|version|/examples/
+
+COPYRIGHT
+=========
+
+See the file /usr/doc/mitmproxy-|version|/LICENSE for license information.
+
+AUTHORS
+=======
+
+**mitmproxy** was written by Aldo Cortesi.
+
+This man page written for the SlackBuilds.org project
+by B. Watson, and is licensed under the WTFPL.
+
+SEE ALSO
+========
+
+The mitmproxy homepage: http://www.mitmproxy.org/
diff --git a/network/mitmproxy-bin/slack-desc b/network/mitmproxy-bin/slack-desc
new file mode 100644
index 0000000000..c6bc48fc15
--- /dev/null
+++ b/network/mitmproxy-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------------------------------------------------------|
+mitmproxy-bin: mitmproxy-bin (free and open source interactive HTTPS proxy)
+mitmproxy-bin:
+mitmproxy-bin: mitmproxy is your swiss-army knife for debugging, testing, privacy
+mitmproxy-bin: measurements, and penetration testing. It can be used to intercept,
+mitmproxy-bin: inspect, modify and replay web traffic such as HTTP/1, HTTP/2,
+mitmproxy-bin: WebSockets, or any other SSL/TLS-protected protocols. You can prettify
+mitmproxy-bin: and decode a variety of message types ranging from HTML to Protobuf,
+mitmproxy-bin: intercept specific messages on-the-fly, modify them before they reach
+mitmproxy-bin: their destination, and replay them to a client or server later on.
+mitmproxy-bin:
+mitmproxy-bin:
diff --git a/network/mk-livestatus/mk-livestatus.SlackBuild b/network/mk-livestatus/mk-livestatus.SlackBuild
index a3bec6780d..cb2f0a6d10 100644
--- a/network/mk-livestatus/mk-livestatus.SlackBuild
+++ b/network/mk-livestatus/mk-livestatus.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for mk-livestatus
 
@@ -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=mk-livestatus
 VERSION=${VERSION:-1.2.4p5}
-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"
@@ -69,7 +79,7 @@ find -L . \
  \( -perm 666 -o -perm 664 -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 \
@@ -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/network/mk-livestatus/mk-livestatus.info b/network/mk-livestatus/mk-livestatus.info
index 2c6ca23203..81428d6266 100644
--- a/network/mk-livestatus/mk-livestatus.info
+++ b/network/mk-livestatus/mk-livestatus.info
@@ -1,7 +1,7 @@
 PRGNAM="mk-livestatus"
 VERSION="1.2.4p5"
 HOMEPAGE="https://mathias-kettner.de/checkmk_livestatus.html"
-DOWNLOAD="https://mathias-kettner.de/download/mk-livestatus-1.2.4p5.tar.gz"
+DOWNLOAD="https://slackware.uk/sbosrcarch/by-name/network/mk-livestatus/mk-livestatus-1.2.4p5.tar.gz"
 MD5SUM="654a56d1464bad18d2f35f3cbb792a0e"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/network/mkvserver_mk2/doinst.sh b/network/mkvserver_mk2/doinst.sh
deleted file mode 100644
index aea0f894eb..0000000000
--- a/network/mkvserver_mk2/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/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/network/mkvserver_mk2/mkvserver_mk2.SlackBuild b/network/mkvserver_mk2/mkvserver_mk2.SlackBuild
index d039faca4a..94522fd921 100644
--- a/network/mkvserver_mk2/mkvserver_mk2.SlackBuild
+++ b/network/mkvserver_mk2/mkvserver_mk2.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for mkvserver_mk2
 
@@ -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.
 
+# Modified by slackbuilds.org
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=mkvserver_mk2
-SRCNAM=a6f18126bd5a35b77f47e2fc32ffc221d0937aeb
-VERSION=${VERSION:-1.0}
+VERSION=${VERSION:-20201203_c62abc3}
+COMMIT=${COMMIT:-c62abc30f4cca6147ddc732570b30fcb4bee30ec}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -36,22 +41,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 -std=c++11"
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686 -mtune=i686 -std=c++11"
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC -std=c++11"
+  SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
 else
-  SLKCFLAGS="-O2 -std=c++11"
+  SLKCFLAGS="-O2"
   LIBDIRSUFFIX=""
 fi
 
@@ -60,10 +72,10 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$SRCNAM.tar.gz
-mv $PRGNAM-$SRCNAM $PRGNAM-$VERSION
-cd $PRGNAM-$VERSION
+rm -rf $PRGNAM-$COMMIT
+tar xvf $CWD/$PRGNAM-$COMMIT.tar.gz
+#mv $PRGNAM-$COMMIT $PRGNAM-$VERSION
+cd $PRGNAM-$COMMIT
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -71,20 +83,19 @@ 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 VERBOSE=1
-  mkdir -p $PKG/usr/bin/
-  install -m755 server $PKG/usr/bin/mkvserver_mk2
+# Use slackware CFLAGS
+sed -i "s,\$(LAV_CFLAGS),$SLKCFLAGS &,g" Makefile
 
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+export PKG_CONFIG_PATH="/usr/lib$LIBDIRSUFFIX/ffmpeg4/pkgconfig:$PKG_CONFIG_PATH"
+make VERBOSE=1
+install --strip -D -m0755 server $PKG/usr/bin/mkvserver
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a Readme.md $PKG/usr/doc/$PRGNAM-$VERSION
+cp 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/network/mkvserver_mk2/mkvserver_mk2.info b/network/mkvserver_mk2/mkvserver_mk2.info
index 7b90539939..ddd001c6b2 100644
--- a/network/mkvserver_mk2/mkvserver_mk2.info
+++ b/network/mkvserver_mk2/mkvserver_mk2.info
@@ -1,8 +1,8 @@
 PRGNAM="mkvserver_mk2"
-VERSION="1.0"
+VERSION="20201203_c62abc3"
 HOMEPAGE="https://github.com/klaxa/mkvserver_mk2"
-DOWNLOAD="https://github.com/klaxa/mkvserver_mk2/archive/a6f18126bd5a35b77f47e2fc32ffc221d0937aeb/mkvserver_mk2-a6f18126bd5a35b77f47e2fc32ffc221d0937aeb.tar.gz"
-MD5SUM="87e513b3b0e85a18471bdffaf972661b"
+DOWNLOAD="https://github.com/klaxa/mkvserver_mk2/archive/c62abc30f4cca6147ddc732570b30fcb4bee30ec/mkvserver_mk2-c62abc30f4cca6147ddc732570b30fcb4bee30ec.tar.gz"
+MD5SUM="f49feb40138a9c47bb4ccea3a695499d"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/network/mkvserver_mk2/slack-desc b/network/mkvserver_mk2/slack-desc
index 21af6d26fe..471c6200ff 100644
--- a/network/mkvserver_mk2/slack-desc
+++ b/network/mkvserver_mk2/slack-desc
@@ -8,12 +8,12 @@
              |-----handy-ruler------------------------------------------------------|
 mkvserver_mk2: mkvserver_mk2 (Matroska Server Mk2)
 mkvserver_mk2:
-mkvserver_mk2: Matroska Server Mk2 project is the result of years of thinking, try-
-mkvserver_mk2: ing and finally succeeding.
-mkvserver_mk2: 
-mkvserver_mk2: This software makes it possible to stream (almost) anything remuxed
-mkvserver_mk2: as matroska live in real-time over http to multiple clients.
+mkvserver_mk2: Stream (almost) anything remuxed as matroska live in real-time over
+mkvserver_mk2: http to multiple clients.
+mkvserver_mk2:
+mkvserver_mk2: https://github.com/klaxa/mkvserver_mk2
+mkvserver_mk2:
+mkvserver_mk2:
+mkvserver_mk2:
 mkvserver_mk2:
-mkvserver_mk2: This is probably also one of the first real world usages of FFmpeg's
-mkvserver_mk2: http server component (which I wrote as part of GSoC 2015).
 mkvserver_mk2:
diff --git a/network/mldonkey/README b/network/mldonkey/README
deleted file mode 100644
index e780093e1e..0000000000
--- a/network/mldonkey/README
+++ /dev/null
@@ -1,12 +0,0 @@
-MLDonkey is an open source, free software multi-network peer-to-peer app.
-
-By default, this SlackBuild will build MLdonkey without a GUI. Without a
-GUI, you can control mldonkey by connecting to localhost:4080 with your
-web browser.
-
-If you want to build MLDonkey's GUI, you'll have to enable it with the
-GUIOPT variable like this: GUIOPT=yes ./mldonkey.SlackBuild
-
-Be sure not to have ocaml and lablgtk already installed when compiling
-this as build may break (mldonkey seems to need its own versions of the
-above dependencies).
diff --git a/network/mldonkey/doinst.sh b/network/mldonkey/doinst.sh
deleted file mode 100644
index 4e8ba7071d..0000000000
--- a/network/mldonkey/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/network/mldonkey/mldonkey.SlackBuild b/network/mldonkey/mldonkey.SlackBuild
deleted file mode 100644
index 5845ea64a1..0000000000
--- a/network/mldonkey/mldonkey.SlackBuild
+++ /dev/null
@@ -1,128 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for mldonkey
-
-# This script is originally written by Antonio Hernández Blas and is
-# currently maintained by Grissiom.
-
-# Copyright (c) 2008, Antonio Hernández Blas <hba.nihilismus@gmail.com>
-# Copyright (c) 2009, Grissiom <chaos.proton@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:
-# 1.- Redistributions of source code must retain the above copyright
-#     notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY
-# EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-# DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
-# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (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=mldonkey
-VERSION=${VERSION:-3.1.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}
-GUIOPT=${GUIOPT:-no}
-
-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.?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 {} \;
-
-# This avoids downloading tarballs when the SlackBuild is running
-mkdir -p patches
-ln -s $CWD/ocaml-3.12.0.tar.gz   patches/
-ln -s $CWD/lablgtk-2.14.2.tar.gz patches/
-
-# OCaml 3.10/3.11 don't work with gtk1, so ingnore the gtk1 choses and let
-# configure to choose a proper lib.
-if [ "$GUIOPT" = 'yes' ]; then
-  GUIOPT='--enable-gui=newgui2'
-else
-  GUIOPT='--disable-gui'
-fi
-
-# Change the O6 to something saner
-sed -i "s/O6/O2/" config/Makefile.in
-
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
-  --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --sysconfdir=/etc \
-  --localstatedir=/var \
-  --docdir=/usr/doc/$PRGNAM-$VERSION \
-  --enable-batch \
-  --build=$ARCH-slackware-linux \
-  $GUIOPT
-
-make -j1
-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
-
-if [ "$GUIOPT" = 'yes' ]; then
-    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
-fi
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
-  distrib/*.txt docs 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
-[ "$GUIOPT" = "yes" ] && 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}
diff --git a/network/mldonkey/mldonkey.desktop b/network/mldonkey/mldonkey.desktop
deleted file mode 100644
index d44d9e3495..0000000000
--- a/network/mldonkey/mldonkey.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Name=MLDonkey GUI
-GenericName=MLDonkey GUI
-Comment=The MLDonkey GUI
-Exec=mldonkey_gui
-Icon=mldonkey
-Terminal=false
-Type=Application
-Categories=Network;
diff --git a/network/mldonkey/mldonkey.info b/network/mldonkey/mldonkey.info
deleted file mode 100644
index f2de7a097c..0000000000
--- a/network/mldonkey/mldonkey.info
+++ /dev/null
@@ -1,14 +0,0 @@
-PRGNAM="mldonkey"
-VERSION="3.1.5"
-HOMEPAGE="http://mldonkey.sourceforge.net"
-DOWNLOAD="http://downloads.sourceforge.net/mldonkey/mldonkey-3.1.5.tar.bz2 \
-          http://caml.inria.fr/pub/distrib/ocaml-3.12/ocaml-3.12.0.tar.gz \
-          http://www.math.nagoya-u.ac.jp/~garrigue/soft/olabl/dist/lablgtk-2.14.2.tar.gz"
-MD5SUM="eca07c8ce88702dd437c72db531162d9 \
-        3ba7cc65123c3579f14e7c726d3ee782 \
-        bad77680a72dab8b915cae99d1ec9b1f"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Grissiom"
-EMAIL="chaos.proton@gmail.com"
diff --git a/network/mldonkey/mldonkey.png b/network/mldonkey/mldonkey.png
deleted file mode 100644
index ee67b482b8..0000000000
--- a/network/mldonkey/mldonkey.png
+++ /dev/null
diff --git a/network/mldonkey/slack-desc b/network/mldonkey/slack-desc
deleted file mode 100644
index e73db43655..0000000000
--- a/network/mldonkey/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------------------------------------------------------|
-mldonkey: mldonkey (A multi-platform multi-network peer-to-peer client)
-mldonkey:
-mldonkey: MLDonkey is an open source, free software multi-network
-mldonkey: peer-to-peer application.
-mldonkey:
-mldonkey: Homepage: http://mldonkey.sourceforge.net
-mldonkey:
-mldonkey:
-mldonkey:
-mldonkey:
-mldonkey:
diff --git a/network/mod_auth_gssapi/README b/network/mod_auth_gssapi/README
index 0753ac8a3f..c1d0f30968 100644
--- a/network/mod_auth_gssapi/README
+++ b/network/mod_auth_gssapi/README
@@ -6,3 +6,6 @@ mechanism used.
 
 You will need to add the following line to /etc/httpd/httpd.conf:
   Include /etc/httpd/extra/mod_auth_gssapi.conf
+
+gss-ntlmssp is an optional dependency (autodetected) for NTLMSSP
+support.
diff --git a/network/mod_auth_gssapi/mod_auth_gssapi.SlackBuild b/network/mod_auth_gssapi/mod_auth_gssapi.SlackBuild
index 8f5278cc66..4837600a23 100644
--- a/network/mod_auth_gssapi/mod_auth_gssapi.SlackBuild
+++ b/network/mod_auth_gssapi/mod_auth_gssapi.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for mod_auth_gssapi
 
-# Copyright 2019 Thibaut Notteboom, Paris, FRANCE
+# Copyright 2019-2023 Thibaut Notteboom, Paris, 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=mod_auth_gssapi
-VERSION=${VERSION:-1.6.1}
-BUILD=${BUILD:-1}
+VERSION=${VERSION:-1.6.5}
+BUILD=${BUILD:-3}
 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}
@@ -49,6 +56,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,9 +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 {} \;
 
+autoreconf -fi
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
-LEXLIB="" \
 ./configure \
   --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
@@ -87,6 +97,8 @@ mkdir -p $PKG/etc/httpd/extra
 sed "s%@baselibdir@%lib${LIBDIRSUFFIX}%" $CWD/mod_auth_gssapi.conf > \
     $PKG/etc/httpd/extra/mod_auth_gssapi.conf.new
 
+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
 
@@ -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/network/mod_auth_gssapi/mod_auth_gssapi.info b/network/mod_auth_gssapi/mod_auth_gssapi.info
index 91dbfd5c8e..eda56fb4a9 100644
--- a/network/mod_auth_gssapi/mod_auth_gssapi.info
+++ b/network/mod_auth_gssapi/mod_auth_gssapi.info
@@ -1,10 +1,10 @@
 PRGNAM="mod_auth_gssapi"
-VERSION="1.6.1"
-HOMEPAGE="https://github.com/modauthgssapi/mod_auth_gssapi"
-DOWNLOAD="https://github.com/modauthgssapi/mod_auth_gssapi/releases/download/v1.6.1/mod_auth_gssapi-1.6.1.tar.gz"
-MD5SUM="a8d03852287fac4dbef9b50dc15b71de"
+VERSION="1.6.5"
+HOMEPAGE="https://github.com/gssapi/mod_auth_gssapi"
+DOWNLOAD="https://github.com/gssapi/mod_auth_gssapi/archive/v1.6.5/mod_auth_gssapi-1.6.5.tar.gz"
+MD5SUM="c900f0207b9b8039fef7d9a22f31b335"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="krb5"
+REQUIRES=""
 MAINTAINER="Thibaut Notteboom"
 EMAIL="thibaut.notteboom@gmail.com"
diff --git a/network/mod_auth_kerb/README b/network/mod_auth_kerb/README
index 9c2df762ad..4be7a5ca39 100644
--- a/network/mod_auth_kerb/README
+++ b/network/mod_auth_kerb/README
@@ -1,11 +1,12 @@
 Mod_auth_kerb is an Apache module designed to provide Kerberos
 authentication to the Apache web server. The module also supports
 the Negotiate authentication method, which performs full Kerberos
-authentication based on ticket exchanges, and does not require
-users to insert their passwords to the browser.
+authentication based on ticket exchanges, and does not require users
+to insert their passwords to the browser.
 
 You will need to add the following line to /etc/httpd/httpd.conf:
   Include /etc/httpd/extra/mod_auth_kerb.conf
 
-Mod_auth_kerb can be further configured through the Apache configuration file;
-see the README in the package's documentation directory for details.
+Mod_auth_kerb can be further configured through the Apache
+configuration file; see the README in the package's documentation
+directory for details.
diff --git a/network/mod_auth_kerb/mod_auth_kerb.SlackBuild b/network/mod_auth_kerb/mod_auth_kerb.SlackBuild
index 83f98bc9b0..f038adcdd9 100644
--- a/network/mod_auth_kerb/mod_auth_kerb.SlackBuild
+++ b/network/mod_auth_kerb/mod_auth_kerb.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for mod_auth_kerb
 
@@ -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.
 
+# 20220330 bkw: Modified by SlackBuilds.org, BUILD=2:
+# - fix download URL.
+# - i486 => i586.
+# - do not install INSTALL instructions in doc dir.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=mod_auth_kerb
 VERSION=${VERSION:-5.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"
@@ -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 {} \+
 
 # Fix compilation with httpd-2.4
 patch -p0 < $CWD/mod_auth_kerb.c.patch
@@ -83,17 +95,16 @@ CXXFLAGS="$SLKCFLAGS" \
 make
 
 mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/httpd/modules
-install -m 755 src/.libs/mod_auth_kerb.so $PKG/usr/lib${LIBDIRSUFFIX}/httpd/modules/mod_auth_kerb.so
+install -s -m 755 \
+  src/.libs/mod_auth_kerb.so \
+  $PKG/usr/lib${LIBDIRSUFFIX}/httpd/modules/mod_auth_kerb.so
 
 mkdir -p $PKG/etc/httpd/extra
 sed "s%@baselibdir@%lib${LIBDIRSUFFIX}%" $CWD/mod_auth_kerb.conf > \
     $PKG/etc/httpd/extra/mod_auth_kerb.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 ChangeLog INSTALL LICENSE README $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a ChangeLog LICENSE README $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
@@ -101,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/network/mod_auth_kerb/mod_auth_kerb.info b/network/mod_auth_kerb/mod_auth_kerb.info
index c9ad5f8e47..8ea903a2df 100644
--- a/network/mod_auth_kerb/mod_auth_kerb.info
+++ b/network/mod_auth_kerb/mod_auth_kerb.info
@@ -1,10 +1,10 @@
 PRGNAM="mod_auth_kerb"
 VERSION="5.4"
 HOMEPAGE="http://modauthkerb.sourceforge.net/"
-DOWNLOAD="http://fossies.org/unix/www/apache_httpd_modules/mod_auth_kerb-5.4.tar.gz"
+DOWNLOAD="http://attic-distfiles.pld-linux.org/distfiles/by-md5/6/4/642b81763ad3ca81dba359cb952da5e3/mod_auth_kerb-5.4.tar.gz"
 MD5SUM="642b81763ad3ca81dba359cb952da5e3"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="krb5"
+REQUIRES=""
 MAINTAINER="Thibaut Notteboom"
 EMAIL="tib@tibux.org"
diff --git a/network/mod_bw/mod_bw.SlackBuild b/network/mod_bw/mod_bw.SlackBuild
index 74ec5e446f..d6a4bd0071 100644
--- a/network/mod_bw/mod_bw.SlackBuild
+++ b/network/mod_bw/mod_bw.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for mod_bw
 
@@ -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=mod_bw
 VERSION=${VERSION:-0.92}
 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}
@@ -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/network/mod_chroot/README b/network/mod_chroot/README
index 80654c156d..dba3cb39f7 100644
--- a/network/mod_chroot/README
+++ b/network/mod_chroot/README
@@ -1,14 +1,16 @@
-mod_chroot allows you to run Apache in a chroot jail with no additional files.
-This makes running Apache in a chroot environment easy.
+mod_chroot allows you to run Apache in a chroot jail with no
+additional files.  This makes running Apache in a chroot environment
+easy.
 
-The chroot() system call is performed at the end of startup procedure - when
-all libraries are loaded and log files open. No need for a special directory
-hierarchy (containing /dev, /lib, /etc...), unless an external handler, such
-as suEXEC or suPHP, is being used, or system()-like functions are in use.
+The chroot() system call is performed at the end of startup procedure
+- when all libraries are loaded and log files open. No need for
+a special directory hierarchy (containing /dev, /lib, /etc...),
+unless an external handler, such as suEXEC or suPHP, is being used,
+or system()-like functions are in use.
 
-This package pre-creates /var/chroot/httpd with just enough subdirs to enable
-the stock Slackware config to run.  You'll need to add the following line to
-your /etc/httpd/httpd.conf file:
+This package pre-creates /var/chroot/httpd with just enough subdirs
+to enable the stock Slackware config to run. You'll need to add the
+following line to your /etc/httpd/httpd.conf file:
   Include /etc/httpd/extra/mod_chroot.conf
 
 You'll also need to add the following lines to your /etc/fstab file:
diff --git a/network/mod_chroot/mod_chroot.SlackBuild b/network/mod_chroot/mod_chroot.SlackBuild
index df095c3861..b788b7addd 100644
--- a/network/mod_chroot/mod_chroot.SlackBuild
+++ b/network/mod_chroot/mod_chroot.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for mod_chroot
 # Written by Menno E. Duursma <druiloor@zonnet.nl>
@@ -7,26 +7,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=mod_chroot
 VERSION=${VERSION:-0.5}
 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"
@@ -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/network/mod_dnssd/mod_dnssd.SlackBuild b/network/mod_dnssd/mod_dnssd.SlackBuild
index 36268dc0fc..d1a878f2ae 100644
--- a/network/mod_dnssd/mod_dnssd.SlackBuild
+++ b/network/mod_dnssd/mod_dnssd.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for mod_dnssd
 
-# Copyright 2013  Robby Workman, Northport, Alabama, USA
+# Copyright 2013-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=mod_dnssd
 VERSION=${VERSION:-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"
@@ -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/network/mod_evasive/README b/network/mod_evasive/README
index deac6b184a..8cf21dc138 100644
--- a/network/mod_evasive/README
+++ b/network/mod_evasive/README
@@ -1,22 +1,25 @@
-mod_evasive maneuvers module for Apache to provide evasive action in the event
-of an HTTP DoS or DDoS attack or brute force attack. It is also designed
-to be a detection and network management tool, and can be easily configured
-to talk to ipchains, firewalls, routers, and etcetera. mod_evasive presently
-reports abuses via email and syslog facilities.
+mod_evasive maneuvers module for Apache to provide evasive action in
+the event of an HTTP DoS or DDoS attack or brute force attack. It is
+also designed to be a detection and network management tool, and can
+be easily configured to talk to ipchains, firewalls, routers, and
+etcetera. mod_evasive presently reports abuses via email and syslog
+facilities.
 
 Detection is performed by creating an internal dynamic hash table of IP
 Addresses and URIs, and denying any single IP address from any of the
 following:
-    * Requesting the same page more than a few times per second
-    * Making more than 50 concurrent requests on the same child per second
-    * Making any requests while temporarily blacklisted (on a blocking list)
+ * Requesting the same page more than a few times per second
+ * Making more than 50 concurrent requests on the same child per second
+ * Making any requests while temporarily blacklisted (on a block list)
 
-You'll need to add the following line to your /etc/httpd/httpd.conf file:
+Add the following line to your /etc/httpd/httpd.conf file:
   Include /etc/httpd/extra/mod_evasive.conf
 
 To test enter the following command:
   perl /usr/doc/mod_evasive-$VERSION/test.pl | more
-which should output some HTTP/1.1 200 OK lines; then HTTP/1.1 403 Forbidden
 
-mod_evasive is fully tweakable through the Apache configuration file, see
-the README file in the package's documentation directory.
+which should output some "HTTP/1.1 200 OK" lines; then "HTTP/1.1 403
+Forbidden".
+
+mod_evasive is fully tweakable through the Apache configuration file,
+see the README file in the package's documentation directory.
diff --git a/network/mod_evasive/mod_evasive.SlackBuild b/network/mod_evasive/mod_evasive.SlackBuild
index f04ad2afc3..d0352adef7 100644
--- a/network/mod_evasive/mod_evasive.SlackBuild
+++ b/network/mod_evasive/mod_evasive.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for mod_evasive (an Apache DoS protection module)
 
@@ -8,10 +8,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=mod_evasive
 VERSION=${VERSION:-1.10.1}
 BUILD=${BUILD:-3}
 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}
@@ -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/network/mod_evasive/mod_evasive.info b/network/mod_evasive/mod_evasive.info
index 86e2dc9ea1..48e2246a15 100644
--- a/network/mod_evasive/mod_evasive.info
+++ b/network/mod_evasive/mod_evasive.info
@@ -1,7 +1,7 @@
 PRGNAM="mod_evasive"
 VERSION="1.10.1"
 HOMEPAGE="https://github.com/shivaas/mod_evasive"
-DOWNLOAD="http://www.zdziarski.com/blog/wp-content/uploads/2010/02/mod_evasive_1.10.1.tar.gz"
+DOWNLOAD="https://src.fedoraproject.org/repo/pkgs/mod_evasive/mod_evasive_1.10.1.tar.gz/784fca4a124f25ccff5b48c7a69a65e5/mod_evasive_1.10.1.tar.gz"
 MD5SUM="784fca4a124f25ccff5b48c7a69a65e5"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/network/mod_fcgid/mod_fcgid.SlackBuild b/network/mod_fcgid/mod_fcgid.SlackBuild
index 260b02ac0c..366bac4909 100644
--- a/network/mod_fcgid/mod_fcgid.SlackBuild
+++ b/network/mod_fcgid/mod_fcgid.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for "mod_fcgid".
 
@@ -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=mod_fcgid
 VERSION=${VERSION:-2.3.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}
 
-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/network/mod_geoip2/README b/network/mod_geoip2/README
index 9ed2462b05..0acbe63ead 100644
--- a/network/mod_geoip2/README
+++ b/network/mod_geoip2/README
@@ -1,10 +1,11 @@
 mod_geoip2 is an Apache 2.x module for finding the country and city
-that a web request originated from.  It uses the GeoIP library and
-database to perform the lookup.  It is free software, licensed under
+that a web request originated from. It uses the GeoIP library and
+database to perform the lookup. It is free software, licensed under
 the Apache license. 
 
 You will need to add the following line to /etc/httpd/httpd.conf:
   Include /etc/httpd/extra/mod_geoip.conf
 
-mod_geoip2 can be further configured through the Apache configuration file;
-see the README in the package's documentation directory for details.
+mod_geoip2 can be further configured through the Apache configuration
+file; see the README in the package's documentation directory for
+details.
diff --git a/network/mod_geoip2/mod_geoip2.SlackBuild b/network/mod_geoip2/mod_geoip2.SlackBuild
index cee70f262f..63bf3c237c 100644
--- a/network/mod_geoip2/mod_geoip2.SlackBuild
+++ b/network/mod_geoip2/mod_geoip2.SlackBuild
@@ -1,29 +1,41 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for mod_geoip2 (an Apache2 module for GeoIP)
 # Written by Zordrak (slackbuilds@tpa.me.uk)
 # Template written by Menno E. Duursma
 
+# 20220330 bkw: Modified by SlackBuilds.org, BUILD=2:
+# - i486 => i586.
+# - fix download URL.
+# - remove useless INSTALL from doc dir.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=mod_geoip2
 VERSION=${VERSION:-1.2.7}
-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"
@@ -36,7 +48,7 @@ else
   LIBDIRSUFFIX=""
 fi
 
-set -e # exit on most errors
+set -e
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
@@ -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 {} \+
 
 # http://pkgs.fedoraproject.org/cgit/mod_geoip.git/tree/mod_geoip-httpd24.patch
 patch -p0 < $CWD/mod_geoip-httpd24.patch
@@ -71,7 +83,7 @@ find $PKG -type f | 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 Changes INSTALL README README.php $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a Changes README README.php $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 {} \;
 
@@ -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/network/mod_geoip2/mod_geoip2.info b/network/mod_geoip2/mod_geoip2.info
index c12db5a5ba..9dbd9e10da 100644
--- a/network/mod_geoip2/mod_geoip2.info
+++ b/network/mod_geoip2/mod_geoip2.info
@@ -1,7 +1,7 @@
 PRGNAM="mod_geoip2"
 VERSION="1.2.7"
 HOMEPAGE="http://www.maxmind.com/app/mod_geoip"
-DOWNLOAD="http://geolite.maxmind.com/download/geoip/api/mod_geoip2/mod_geoip2_1.2.7.tar.gz"
+DOWNLOAD="http://attic-distfiles.pld-linux.org/distfiles/by-md5/7/6/76514ad0e8adb8cd8231c5e3646d03fd/mod_geoip2_1.2.7.tar.gz"
 MD5SUM="76514ad0e8adb8cd8231c5e3646d03fd"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/network/mod_ruid2/README b/network/mod_ruid2/README
index ba1533a35e..58213efbc7 100644
--- a/network/mod_ruid2/README
+++ b/network/mod_ruid2/README
@@ -1,9 +1,10 @@
-mod_ruid2 is a suexec module for apache which takes advantage of POSIX.1e
-capabilities to increase performance.
+mod_ruid2 is a suexec module for apache which takes advantage of
+POSIX.1e capabilities to increase performance.
 
-You'll need to add the following line to your /etc/httpd/httpd.conf file:
+You'll need to add the following line to your /etc/httpd/httpd.conf
+file:
 
   Include /etc/httpd/extra/mod_ruid2.conf
 
-Also, make sure you edit and understand mod_ruid2 configuration completly
-before using it.
+Also, make sure you edit and understand mod_ruid2 configuration
+completly before using it.
diff --git a/network/mod_ruid2/mod_ruid2.SlackBuild b/network/mod_ruid2/mod_ruid2.SlackBuild
index af9df3ff7b..a246767768 100644
--- a/network/mod_ruid2/mod_ruid2.SlackBuild
+++ b/network/mod_ruid2/mod_ruid2.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for mod_ruid2
 
@@ -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=mod_ruid2
 VERSION=${VERSION:-0.9.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"
@@ -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/network/mod_wsgi-metrics/mod_wsgi-metrics.SlackBuild b/network/mod_wsgi-metrics/mod_wsgi-metrics.SlackBuild
index 572205580b..51efbccf60 100644
--- a/network/mod_wsgi-metrics/mod_wsgi-metrics.SlackBuild
+++ b/network/mod_wsgi-metrics/mod_wsgi-metrics.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for mod_wsgi-metrics
 #
@@ -25,26 +25,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=mod_wsgi-metrics
 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=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,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/network/mod_wsgi-metrics/mod_wsgi-metrics.info b/network/mod_wsgi-metrics/mod_wsgi-metrics.info
index b15fce5236..69d45fda7b 100644
--- a/network/mod_wsgi-metrics/mod_wsgi-metrics.info
+++ b/network/mod_wsgi-metrics/mod_wsgi-metrics.info
@@ -5,6 +5,6 @@ DOWNLOAD="https://pypi.python.org/packages/source/m/mod_wsgi-metrics/mod_wsgi-me
 MD5SUM="be59d86c0e398614478b9e8b2feffcf2"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="psutil"
+REQUIRES="python2-psutil"
 MAINTAINER="Adis Nezirović"
 EMAIL="adis_at_linux.org.ba"
diff --git a/network/mod_wsgi/README b/network/mod_wsgi/README
index e2df1bbde7..d439795bb7 100644
--- a/network/mod_wsgi/README
+++ b/network/mod_wsgi/README
@@ -1,13 +1,14 @@
 mod_wsgi is a simple to use Apache module which can host any Python
 application which supports the Python WSGI interface. The module
-would be suitable for use in hosting high performance production
-web sites as well as your average personal sites running on commodity
-web hosting services.
+would be suitable for use in hosting high performance production web
+sites as well as your average personal sites running on commodity web
+hosting services.
 
 All major Python web frameworks/applications support mod_wsgi,
 including Django, Flask, Pyramid, TurboGears, ...
 
-You'll need to add the following line to your /etc/httpd/httpd.conf file:
+You'll need to add the following line to your /etc/httpd/httpd.conf
+file:
   Include /etc/httpd/extra/mod_wsgi.conf
 
 From version 4.2, mod_wsgi ships with additional helper program for
diff --git a/network/mod_wsgi/mod_wsgi.SlackBuild b/network/mod_wsgi/mod_wsgi.SlackBuild
index 3bc36b4cfa..a6d5fab13e 100644
--- a/network/mod_wsgi/mod_wsgi.SlackBuild
+++ b/network/mod_wsgi/mod_wsgi.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for mod_wsgi
 #
@@ -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=mod_wsgi
 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 the variable PRINT_PACKAGE_NAME is set, then this script will report what
+# the name of the created package would be, and then exit. This information
+# could be useful to other scripts.
+if [ ! -z "${PRINT_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 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/network/mod_wsgi/mod_wsgi.info b/network/mod_wsgi/mod_wsgi.info
index 764760eb90..fa46ce633b 100644
--- a/network/mod_wsgi/mod_wsgi.info
+++ b/network/mod_wsgi/mod_wsgi.info
@@ -1,7 +1,7 @@
 PRGNAM="mod_wsgi"
 VERSION="4.4.6"
 HOMEPAGE="http://www.modwsgi.org"
-DOWNLOAD="https://github.com/GrahamDumpleton/mod_wsgi/archive/4.4.6.tar.gz"
+DOWNLOAD="https://github.com/GrahamDumpleton/mod_wsgi/archive/4.4.6/mod_wsgi-4.4.6.tar.gz"
 MD5SUM="bab68899e92a6ee328a02954a0818022"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/network/modemu2k/README b/network/modemu2k/README
index 2fbff52103..7ed435da03 100644
--- a/network/modemu2k/README
+++ b/network/modemu2k/README
@@ -1,6 +1,6 @@
 modemu2k adds telnet capability to a comm program. It can redirect
 telnet I/O to a pty so that a comm program can handle the pty as a tty
 with a real modem, and allows you to use a comm program's scripting
-and file transfer features over telnet.
+and file transfer features over telnet. Now supports IPv6 connections.
 
 modemu2k is a fork of modemu, originally developed by Toru Egashira
diff --git a/network/modemu2k/README.Slackware b/network/modemu2k/README.Slackware
index 081916023c..2cb0c8695f 100644
--- a/network/modemu2k/README.Slackware
+++ b/network/modemu2k/README.Slackware
@@ -1,50 +1,53 @@
+# modemu2k v0.1.0
+
 modemu2k is a fork of modemu, originally developed by Toru Egashira
 
-(Travis Build status
-<https://travis-ci.org/theimpossibleastronaut/modemu2k>)
+(Build status
+<https://github.com/theimpossibleastronaut/modemu2k/actions/workflows/c-cpp.yml>)
 
 
-What is modemu2k?
----------------
+## What is modemu2k?
 
 modemu2k adds telnet capability to a comm program. It can redirect
 telnet I/O to a pty so that a comm program can handle the pty as a tty
 with a real modem, and allows you to use a comm program's scripting
-and file transfer features over telnet.
+and file transfer features over telnet. Now supports IPv6 connections.
+
+Maintainer: Andy Alt <andy400-dev [at] yahoo [dot] com>
 
-Maintainer: Andy Alt <andy400-dev@yahoo.com>
 License: GNU GPL 3
-Home page: <https://github.com/theimpossibleastronaut/modemu2k>
 
-Other contact/chat room: <https://gitter.im/modemu2k/Lobby>
+Home page: <http://theimpossibleastronaut.com/modemu2k/>
 
+[Issues and bug reporting](https://github.com/theimpossibleastronaut/modemu2k/issues)
 
-For Translators
------------
 
-We use Transifex to translate the output messages. To start translating
-modemu2k, create an account in Transifex and ask to join a translation
-team (or create a new one) at
-https://www.transifex.com/na-309/modemu2k/
+Dependencies
+------------
+
+  * gettext (optional, for translations)
+  * flex
 
 
 Compilation
 -----------
 
-./configure
-    Use ./configure --help to see extra options
+    meson builddir
+    cd builddir
 
-make
+Use `meson configure` to see extra options
 
-`make install` is optional. The binary can be run from the src/
-directory. (installation is required to use the translations.)
+    ninja
 
-Making SOCKSified or Termified Modemu2k may require changes to
-src/Makefile.am.
 
+`ninja install` is optional. The binary can be run from the build
+directory; however, installation is required to use the translations,
+and to create and install a script (m2k-minicom) that can invoke
+minicom (see below).
+
+
+## Sample Usage
 
-Sample Usage
-------------
 
 Note: while in the program if backspace doesn't work, use CTRL+H.
 
@@ -57,7 +60,7 @@ Note: while in the program if backspace doesn't work, use CTRL+H.
   modemu2k reads from standard input and writes to standard output.
   Input
 
-  > atd"localhost
+  > atd"localhost [port]
 
   (prompt ">" is not shown) You will see your host's login prompt
   (if a server is running). When you disconnect, you will get "NO
@@ -75,15 +78,34 @@ Note: while in the program if backspace doesn't work, use CTRL+H.
 
       modemu2k -e "AT%B0=1%B1=1&W" -c "minicom -l -tansi -con -p %s"
 
-  From within the comm program, if you have a server running, you can enter
+  From within the comm program, if you have a server running, to
+  connect you can enter:
 
       atd"localhost
 
-  to connect. You could also connect to a BBS. Here's a list of
-  telnet-enabled bulletin board systems: <http://www.synchro.net/sbbslist.html>
+  You could also connect to a BBS. For some telnet addresses, see:
+
+  * The Rusty Mailbox (telnet to [trmb.ca](https://trmb.ca/), port 2030)
+  * [Synchronet BBS List](https://www.synchro.net/sbbslist.html)
 
   To quit modemu2k, just quit the comm program.
 
+  A script to invoke minicom as mentioned above will be installed to
+  your bin directory when `make install` is run.
+
+## Escaping to command mode and returning
+
+To escape to command mode, use '+++'. Use ATO to return to online mode.
+
+
+## Hanging up a call/closing a connection
+
+If you are connected to a server where gracefully logging out isn't
+possible, to "hang up" or close the connection you can escape to command
+mode and enter 'ATH`.
+
+## Extra Notes
+
 (*) Almost all file xfer protocols require 8bit through connection,
 which means Modemu2k must be in the binary transmission mode.  See %B
 command description in the man page.
@@ -92,3 +114,15 @@ More details are in the QuickStart guide
 <https://github.com/theimpossibleastronaut/modemu2k/blob/master/QuickStart>
 
 A man page is also available.
+
+
+# Downloads
+
+* Release page<https://github.com/theimpossibleastronaut/modemu2k/releases>
+
+[![Packaging status](https://repology.org/badge/vertical-allrepos/modemu2k.svg)](https://repology.org/project/modemu2k/versions)
+
+## Translate
+
+See <https://github.com/theimpossibleastronaut/modemu2k/blob/master/TRANSLATE.md>
+
diff --git a/network/modemu2k/modemu2k.SlackBuild b/network/modemu2k/modemu2k.SlackBuild
index b9245949a2..9af62e5531 100644
--- a/network/modemu2k/modemu2k.SlackBuild
+++ b/network/modemu2k/modemu2k.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 #
 # Slackware build script for modemu2k
 #
-# Copyright 2018 / Andy Alt / United States
+# Copyright 2022 / Andy Alt / United States                                                                                         [81/1847]
 # 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=modemu2k
-VERSION=${VERSION:-0.0.3}
+VERSION=${VERSION:-0.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}
@@ -46,7 +56,7 @@ if [ "$ARCH" = "i586" ]; then
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
   LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
+elif [ "$ARCH" = "x86_64" ]; then                                                                                                        [27/1847]
   SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
 else
@@ -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,17 +79,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 {} \;
 
-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
+mkdir build
+cd build
+  CFLAGS="$SLKCFLAGS" \
+  CXXFLAGS="$SLKCFLAGS" \
+  meson .. \
+    --buildtype=release \
+    -Dstrip=true \
+    --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
@@ -90,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/network/modemu2k/modemu2k.info b/network/modemu2k/modemu2k.info
index 4326c60833..6822643041 100644
--- a/network/modemu2k/modemu2k.info
+++ b/network/modemu2k/modemu2k.info
@@ -1,10 +1,10 @@
 PRGNAM="modemu2k"
-VERSION="0.0.3"
+VERSION="0.1.0"
 HOMEPAGE="https://github.com/theimpossibleastronaut/modemu2k"
-DOWNLOAD="https://github.com/theimpossibleastronaut/modemu2k/releases/download/v0.0.3/modemu2k-0.0.3.tar.gz"
-MD5SUM="d5b2e4426eeab337e74ec014a32ddc29"
+DOWNLOAD="https://github.com/theimpossibleastronaut/modemu2k/releases/download/v0.1.0/modemu2k-0.1.0.tar.xz"
+MD5SUM="8a84feee7aa5e69e5b1aa548b36d0672"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
 MAINTAINER="Andy Alt"
-EMAIL="andy400-dev@yahoo.com"
+EMAIL="arch_stanton5995@protonmail.com"
diff --git a/network/modemu2k/slack-desc b/network/modemu2k/slack-desc
index e1e3dfbfb1..6fc2b31145 100644
--- a/network/modemu2k/slack-desc
+++ b/network/modemu2k/slack-desc
@@ -11,9 +11,9 @@ modemu2k:
 modemu2k: modemu2k adds telnet capability to a comm program. It can redirect
 modemu2k: telnet I/O to a pty so that a comm program can handle the pty as a
 modemu2k: tty with a real modem, and allows you to use a comm program's
-modemu2k: scripting and file transfer features over telnet.
+modemu2k: scripting and file transfer features over telnet. Now supports IPv6
+modemu2k: connections.
 modemu2k:
 modemu2k: modemu2k is a fork of modemu, originally developed by Toru Egashira.
 modemu2k:
-modemu2k:
 modemu2k: Homepage: https://github.com/theimpossibleastronaut/modemu2k
diff --git a/network/modsecurity-apache/modsecurity-apache.SlackBuild b/network/modsecurity-apache/modsecurity-apache.SlackBuild
index 6901cf8379..90bdcc47e7 100644
--- a/network/modsecurity-apache/modsecurity-apache.SlackBuild
+++ b/network/modsecurity-apache/modsecurity-apache.SlackBuild
@@ -1,32 +1,42 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for ModSecurity
 
 # Written by pyllyukko
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=modsecurity-apache
 SRCNAM=modsecurity
-VERSION=${VERSION:-2.9.3}
+VERSION=${VERSION:-2.9.7}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
-CRS_VERSION="3.1.0"
+CRS_VERSION="3.2.0"
 
 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"
@@ -39,25 +49,6 @@ else
   LIBDIRSUFFIX=""
 fi
 
-# The package can be verified with Breno Silva Pinto's PGP key (0x6980F8B0)
-# If we have GPG installed, we try to verify the signature.
-if [ -x "/usr/bin/gpg" -a -x "/usr/bin/gpgv" ]
-then
-  set +e
-  # This will check if we have the correct key in our keyring.
-  # For the trustedkeys.gpg, see "man 1 gpgv".
-  /usr/bin/gpg --keyring trustedkeys.gpg --no-default-keyring --list-keys 0xE4BCD2EA82E67A45 &>/dev/null
-  GPG_RET=${?}
-  # 2 means we don't have his key, 0 means we do.
-  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}/${SRCNAM}-${VERSION}.tar.gz.asc" ]
-  then
-    /usr/bin/gpgv "${CWD}/${SRCNAM}-${VERSION}.tar.gz.asc" "${CWD}/${SRCNAM}-${VERSION}.tar.gz"
-  fi
-fi
-
 set -e
 
 rm -rf $PKG
@@ -108,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/network/modsecurity-apache/modsecurity-apache.info b/network/modsecurity-apache/modsecurity-apache.info
index 5500d5738f..a70b04bcf8 100644
--- a/network/modsecurity-apache/modsecurity-apache.info
+++ b/network/modsecurity-apache/modsecurity-apache.info
@@ -1,12 +1,10 @@
 PRGNAM="modsecurity-apache"
-VERSION="2.9.3"
+VERSION="2.9.7"
 HOMEPAGE="https://www.modsecurity.org/"
-DOWNLOAD="https://www.modsecurity.org/tarball/2.9.3/modsecurity-2.9.3.tar.gz \
-          https://github.com/SpiderLabs/ModSecurity/releases/download/v2.9.3/modsecurity-2.9.3.tar.gz.asc \
-          https://github.com/SpiderLabs/owasp-modsecurity-crs/archive/v3.1.0/owasp-modsecurity-crs-3.1.0.tar.gz"
-MD5SUM="215a96d679a5b0fadcf13b5d09b35422 \
-        b1005b1ad337951c876d729264a13f0d \
-        4e0a0fbaf077b50364c934083c4cb905"
+DOWNLOAD="https://github.com/SpiderLabs/ModSecurity/releases/download/v2.9.7/modsecurity-2.9.7.tar.gz \
+          https://github.com/SpiderLabs/owasp-modsecurity-crs/archive/v3.2.0/owasp-modsecurity-crs-3.2.0.tar.gz"
+MD5SUM="f2ccb0d6b3ba59a5677accb5569abbbd \
+        9dd31ff7e74bd797d2013b93c02df304"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/network/monkey/README b/network/monkey/README
index 6902348b4f..2b142b7a94 100644
--- a/network/monkey/README
+++ b/network/monkey/README
@@ -1,7 +1,8 @@
-Monkey is a lightweight and powerful web server and development ostack for
-GNU/Linux.
- 
-It has been designed to be very scalable with low memory and CPU consumption,
-the perfect solution for embedded devices. Made for ARM, x86 and x64. 
+Monkey is a lightweight and powerful web server and development stack
+for Linux & OSX.
+
+It has been designed to be very scalable with low memory and CPU
+consumption, the perfect solution for embedded devices. Made for ARM,
+x86 and x64.
 
 By default, monkey will use the "apache" user and group accounts.
diff --git a/network/monkey/config_values_fix.patch b/network/monkey/config_values_fix.patch
deleted file mode 100644
index 58b17da6d8..0000000000
--- a/network/monkey/config_values_fix.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-diff -ruN monkey-1.5.6/configure monkey-1.5.6.new/configure
---- monkey-1.5.6/configure	2015-03-03 00:52:16.000000000 +0300
-+++ monkey-1.5.6.new/configure	2015-03-13 11:51:55.984045498 +0300
-@@ -903,17 +903,17 @@
- 
- create_banana_script()
- {
--	cat > bin/banana << EOF
-+	cat > bin/rc.monkey << EOF
- #!/bin/sh
- #
--# Monkey HTTP Daemon - Banana Script
-+# Monkey HTTP Daemon - rc.monkey Script
- # -----------------------------------
- # This script allow you to control monkey. Written by Eduardo Silva
- # ----------------------------
- # Date		: 2002/09/01.
- # ----------------------------
- #
--# Use: ./banana OPTION
-+# Use: ./rc.monkey OPTION
- #
- # Options available to banana:
- #
-@@ -1000,16 +1000,16 @@
- 			exit 0
- 			;;
- 		*)
--			echo "Use : banana [start|stop|restart|status|help]"
-+			echo "Use : \$0 [start|stop|restart|status|help]"
- 			exit 1
- 		;;
- 	esac
- done
--echo "Use : banana [start|stop|restart|status|help]"
-+echo "Use : \$0 [start|stop|restart|status|help]"
- 
- exit 0
- EOF
--	chmod 755 bin/banana
-+	chmod 755 bin/rc.monkey
- }
- 
- #---------------------------#
-diff -ruN monkey-1.5.6/lang/en/mconf monkey-1.5.6.new/lang/en/mconf
---- monkey-1.5.6/lang/en/mconf	2015-03-03 00:52:16.000000000 +0300
-+++ monkey-1.5.6.new/lang/en/mconf	2015-03-13 11:52:36.464045763 +0300
-@@ -66,7 +66,7 @@
-     # For security reasons, sometimes people want to hide the version of his
-     # own webserver to clients (values on/off).
- 
--    HideVersion off
-+    HideVersion on
- 
- 
-     # Resume:
-@@ -124,7 +124,7 @@
-     # --------
-     # Allow request to symbolic link files.
- 
--    SymLink Off
-+    SymLink On
- 
-     # TransportLayer:
-     # ---------------
-diff -ruN monkey-1.5.6/plugins/cgi/conf/cgi.conf monkey-1.5.6.new/plugins/cgi/conf/cgi.conf
---- monkey-1.5.6/plugins/cgi/conf/cgi.conf	2015-03-03 00:52:16.000000000 +0300
-+++ monkey-1.5.6.new/plugins/cgi/conf/cgi.conf	2015-03-13 11:41:34.654041430 +0300
-@@ -19,4 +19,4 @@
-     Match /cgi-bin/.*\.cgi
- 
-     # Execute PHP scripts through php-cgi interpreter:
--    Match /.*\.php /usr/bin/php-cgi application/x-httpd-php
-+    #Match /.*\.php /usr/bin/php-cgi application/x-httpd-php
diff --git a/network/monkey/doinst.sh b/network/monkey/doinst.sh
index d0a8d815f0..6c9210dab5 100644
--- a/network/monkey/doinst.sh
+++ b/network/monkey/doinst.sh
@@ -27,13 +27,10 @@ config etc/logrotate.d/monkey.new
 config etc/monkey/monkey.conf.new
 config etc/monkey/plugins.load.new
 config etc/monkey/sites/default.new
-config etc/monkey/plugins/auth/monkey.users.new
-config etc/monkey/plugins/cgi/cgi.conf.new
 config etc/monkey/plugins/cheetah/cheetah.conf.new
 config etc/monkey/plugins/dirlisting/dirhtml.conf.new
 config etc/monkey/plugins/fastcgi/fastcgi.conf.new
 config etc/monkey/plugins/logger/logger.conf.new
 config etc/monkey/plugins/mandril/mandril.conf.new
-config var/www/monkey/404.html.new
 config var/www/monkey/favicon.ico.new
 config var/www/monkey/index.html.new
diff --git a/network/monkey/monkey.SlackBuild b/network/monkey/monkey.SlackBuild
index efbb0094e0..6be5b1299d 100644
--- a/network/monkey/monkey.SlackBuild
+++ b/network/monkey/monkey.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for monkey http server.
 
@@ -28,26 +28,36 @@
 # Francisco Ambrozio <sbo@franciscoambrozio.com>
 # and libev script by Šime Ramov <s@ramov.com>
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=monkey
-VERSION=${VERSION:-1.5.6}
-BUILD=${BUILD:-1}
+VERSION=${VERSION:-1.6.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}
 
-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,24 +85,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 {} \;
 
-patch -p1 --verbose -i $CWD/config_values_fix.patch
-
-CFLAGS="$SLKCFLAGS" \
+CFLAGS="$SLKCFLAGS -fcommon" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --libdir=/usr/lib${LIBDIRSUFFIX}/monkey \
   --mandir=/usr/man \
   --sysconfdir=/etc/monkey \
-  --datadir=/var/www/monkey \
+  --webroot=/var/www/monkey \
   --logdir=/var/log/monkey \
-  --pidfile=/var/run/monkey/monkey.pid \
+  --pidfile=monkey/monkey.pid \
   --malloc-libc \
-  --bindir=/usr/sbin \
-  --plugdir=/usr/lib${LIBDIRSUFFIX}/monkey \
+  --sbindir=/usr/sbin \
   --default-port=80 \
-  --default-user=apache \
-  --safe-free
+  --default-user=apache
 
 make
 make install DESTDIR=$PKG
@@ -103,44 +109,34 @@ 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
 
-# out of the box logging is disabled (and looks like this part in configure script is broken),
+# out of the box logging is disabled,
 # enable it to audit http server's life
-sed -i 's/# Load \/usr\/lib\/monkey\/monkey\-logger\.so/Load \/usr\/lib\/monkey\/monkey\-logger\.so/g' $PKG/etc/monkey/plugins.load
+sed -i "s|# Load /usr/lib${LIBDIRSUFFIX}/monkey/monkey-logger.so|Load /usr/lib${LIBDIRSUFFIX}/monkey/monkey-logger.so|g" $PKG/etc/monkey/plugins.load
 
 # make log dir
 mkdir -p $PKG/var/log/monkey
 
-# make run dir
-mkdir -p $PKG/var/run/monkey
-
-# move init script to it's dir
+# move init script to its dir
 mkdir -p $PKG/etc/rc.d
-mv $PKG/usr/sbin/rc.monkey $PKG/etc/rc.d/rc.monkey.new
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a README LICENSE NOTICE ChangeLog CONTRIBUTING.md $PKG/usr/doc/$PRGNAM-$VERSION
-install -m 644 $CWD/$PRGNAM.SlackBuild $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+install -Dpm 0644 monkey.init $PKG/etc/rc.d/rc.monkey.new
 
-mkdir -p $PKG/etc/logrotate.d
-install -m 644 $CWD/monkey.logrotate $PKG/etc/logrotate.d/monkey.new
+install -Dpm 0644 $CWD/$PRGNAM.SlackBuild $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+cp -a README.md LICENSE NOTICE ChangeLog CONTRIBUTING.md $PKG/usr/doc/$PRGNAM-$VERSION
+install -Dpm 0644 $CWD/monkey.logrotate $PKG/etc/logrotate.d/monkey.new
 
 mv $PKG/etc/monkey/monkey.conf $PKG/etc/monkey/monkey.conf.new
 mv $PKG/etc/monkey/plugins.load $PKG/etc/monkey/plugins.load.new
 mv $PKG/etc/monkey/sites/default $PKG/etc/monkey/sites/default.new
-mv $PKG/etc/monkey/plugins/auth/monkey.users $PKG/etc/monkey/plugins/auth/monkey.users.new
-mv $PKG/etc/monkey/plugins/cgi/cgi.conf $PKG/etc/monkey/plugins/cgi/cgi.conf.new
 mv $PKG/etc/monkey/plugins/cheetah/cheetah.conf $PKG/etc/monkey/plugins/cheetah/cheetah.conf.new
 mv $PKG/etc/monkey/plugins/dirlisting/dirhtml.conf $PKG/etc/monkey/plugins/dirlisting/dirhtml.conf.new
 mv $PKG/etc/monkey/plugins/fastcgi/fastcgi.conf $PKG/etc/monkey/plugins/fastcgi/fastcgi.conf.new
 mv $PKG/etc/monkey/plugins/logger/logger.conf $PKG/etc/monkey/plugins/logger/logger.conf.new
 mv $PKG/etc/monkey/plugins/mandril/mandril.conf $PKG/etc/monkey/plugins/mandril/mandril.conf.new
-mv $PKG/var/www/monkey/404.html $PKG/var/www/monkey/404.html.new
 mv $PKG/var/www/monkey/favicon.ico $PKG/var/www/monkey/favicon.ico.new
 mv $PKG/var/www/monkey/index.html $PKG/var/www/monkey/index.html.new
 
-mkdir -p $PKG/install
-install -m 644 $CWD/slack-desc $PKG/install/slack-desc
-install -m 644 $CWD/doinst.sh $PKG/install/doinst.sh
+install -Dpm 0644 $CWD/slack-desc $PKG/install/slack-desc
+install -Dpm 0644 $CWD/doinst.sh $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/network/monkey/monkey.info b/network/monkey/monkey.info
index 517862ec2f..079b2763c6 100644
--- a/network/monkey/monkey.info
+++ b/network/monkey/monkey.info
@@ -1,8 +1,8 @@
 PRGNAM="monkey"
-VERSION="1.5.6"
+VERSION="1.6.9"
 HOMEPAGE="http://monkey-project.com/"
-DOWNLOAD="http://monkey-project.com/releases/1.5/monkey-1.5.6.tar.gz"
-MD5SUM="9699e4c9ea6ce6b989907c252ae80254"
+DOWNLOAD="http://monkey-project.com/releases/1.6/monkey-1.6.9.tar.gz"
+MD5SUM="c401734985a936ee07dbff5eca7d176a"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/network/monkey/monkey.logrotate b/network/monkey/monkey.logrotate
index 77e606aa75..438f310fae 100644
--- a/network/monkey/monkey.logrotate
+++ b/network/monkey/monkey.logrotate
@@ -1,17 +1,7 @@
 /var/log/monkey/*.log {
-  su apache apache
   rotate 10
   notifempty
   compress
   delaycompress
-  sharedscripts
-  postrotate
-#    kill -HUP `cat /var/run/monkey/monkey.pid.*`
-# Handling of SIGHUP is not implemented yet, but they promise make it like apache httpd
-     PATH=/usr/sbin:/sbin:/usr/bin:/bin
-     pgrep -u apache -x monkey 1>/dev/null 2>/dev/null
-     if [ $? != '0' ]; then
-         /etc/rc.d/rc.monkey restart
-     fi
-  endscript
+  copytruncate
 }
diff --git a/network/mosaic-ck/README b/network/mosaic-ck/README
index 4db1b18e3d..c46a7a52ea 100644
--- a/network/mosaic-ck/README
+++ b/network/mosaic-ck/README
@@ -1,8 +1,8 @@
 mosaic-ck (Cameron Kaiser's fork of NCSA Mosaic)
 
 Mosaic is widely considered the grandfather of the modern web
-browser. Developed at NCSA, it was the first Web browser to win widespread
-use and acceptance. The last release of Mosaic was in 1997.
+browser. Developed at NCSA, it was the first Web browser to win
+widespread use and acceptance. The last release of Mosaic was in 1997.
 
 mosaic-ck is a fork of Mosaic, with several features that allow it
 to work as a basic, no-frills browser on the modern WWW. Think of it
diff --git a/network/mosaic-ck/doinst.sh b/network/mosaic-ck/doinst.sh
index 6723fb108e..0681523e4f 100644
--- a/network/mosaic-ck/doinst.sh
+++ b/network/mosaic-ck/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 there's no Mosaic link, take over:
 if [ ! -r usr/bin/Mosaic ]; then
   ( cd usr/bin ; ln -sf mosaic-ck Mosaic )
diff --git a/network/mosaic-ck/mosaic-ck.SlackBuild b/network/mosaic-ck/mosaic-ck.SlackBuild
index 2525d76ca7..556e223119 100644
--- a/network/mosaic-ck/mosaic-ck.SlackBuild
+++ b/network/mosaic-ck/mosaic-ck.SlackBuild
@@ -1,11 +1,16 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for mosaic-ck
 
-# 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.
 
+# 20230108 bkw: BUILD=2, fix doinst.sh.
+# 20211207 bkw: update for 2.7ck13, which contains build fixes
+# for recent glibc (e.g. the one in Slackware -current). Also
+# add new-style icons.
+
 # 20161028 bkw: Re-add to SBo, with fix for Slack 14.2's libpng-1.6.
 # If you're wondering why I stick with 2.7ck9 when 2.7ck11 has been
 # out for a while, it's because none of the changes in ck10 or ck11
@@ -16,10 +21,13 @@
 # site isn't wget-friendly. Original URL was:
 # http://www.floodgap.com/retrotech/machten/mosaic/mosaic27ck9.tar.gz
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=mosaic-ck
-VERSION=${VERSION:-2.7ck9}
+VERSION=${VERSION:-2.7ck13}
 BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -29,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}
@@ -59,11 +71,8 @@ rm -rf $PRGNAM
 tar xvf $CWD/$TARBALL
 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 {} \;
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
 
 # I don't know who thought it was a good idea to link with /usr/lib/libjpeg.a
 # and /usr/lib/libpng.a instead of just saying -ljpeg -lpng.
@@ -97,11 +106,18 @@ install -m0644 app-defaults.color $PKG/etc/X11/app-defaults/Mosaic
 mkdir -p $PKG/usr/share/applications
 cat $CWD/$PRGNAM.desktop > $PKG/usr/share/applications/$PRGNAM.desktop
 
-# Original mosaic uses an icon that looks like icon.1.xpm. We'll pick one
-# of the other animation frames for mosaic-ck, to avoid confusion with
-# the original.
+# Original mosaic uses an icon that looks like icon.1.xpm. Go ahead
+# and use it, since there's no chance of conflicting with the original
+# mosaic on modern systems.
+for px in 16 32 48 64; do
+  size=${px}x${px}
+  dir=$PKG/usr/share/icons/hicolor/$size/apps
+  mkdir -p $dir
+  convert -resize $size src/pixmaps/icon.1.xpm $dir/$PRGNAM.png
+done
+
 mkdir -p $PKG/usr/share/pixmaps
-convert src/pixmaps/icon.10.xpm png:- > $PKG/usr/share/pixmaps/$PRGNAM.png
+ln -s ../icons/hicolor/48x48/apps/$PRGNAM.png $PKG/usr/share/pixmaps/$PRGNAM.png
 
 # man page written for this build. kind of amazed that the source doesn't
 # come with a man page.
@@ -119,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/network/mosaic-ck/mosaic-ck.info b/network/mosaic-ck/mosaic-ck.info
index 88f42e0114..6c253f0ffb 100644
--- a/network/mosaic-ck/mosaic-ck.info
+++ b/network/mosaic-ck/mosaic-ck.info
@@ -1,10 +1,10 @@
 PRGNAM="mosaic-ck"
-VERSION="2.7ck9"
-HOMEPAGE="http://www.floodgap.com/retrotech/machten/mosaic/"
-DOWNLOAD="http://urchlay.naptime.net/~urchlay/src/mosaic27ck9.tar.gz"
-MD5SUM="a412ea475bb5059182ee9642c95368cc"
+VERSION="2.7ck13"
+HOMEPAGE="https://www.floodgap.com/retrotech/machten/mosaic/"
+DOWNLOAD="https://slackware.uk/~urchlay/src/mosaic27ck13.tar.gz"
+MD5SUM="7c4c807af8313104bc0fc19ee76325dd"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
 MAINTAINER="B. Watson"
-EMAIL="yalhcru@gmail.com"
+EMAIL="urchlay@slackware.uk"
diff --git a/network/mosh/1282.patch b/network/mosh/1282.patch
new file mode 100644
index 0000000000..c8376a2c12
--- /dev/null
+++ b/network/mosh/1282.patch
@@ -0,0 +1,43 @@
+From 8012ca9c8d16f99679c171b36ad02655549ab7ff Mon Sep 17 00:00:00 2001
+From: Alex Chernyakhovsky <alex@achernya.com>
+Date: Sun, 30 Jul 2023 16:19:46 -0400
+Subject: [PATCH] Bump C++ version to C++17
+
+Protobuf versions since 3.6.0 have long had a C++11 dependency; even
+more recent versions have picked up an Abseil dependency bumping that
+to C++14. Since it is now 2023, defaulting to C++17 is reasonable, so
+remove the conditional C++ standards version check that mosh
+previously had and replace it with an unconditional C++17 check.
+
+This means that all future commits can use C++17 features. According
+to https://en.cppreference.com/w/cpp/compiler_support/17 this means
+that minimum effective compiler versions for mosh become:
+
+gcc 7 (May 2017)
+clang 5 (September 2017)
+
+This, in turn, implies that future versions of mosh will no longer be
+available for RHEL/CentOS 7 (June 2014).
+
+Closes: #1267
+---
+ configure.ac | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index ee70c7b86..7f7dc3bc2 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -22,9 +22,9 @@ AS_IF([test x"$PROTOC" = x],
+ # automake 1.12 seems to require this, but automake 1.11 doesn't recognize it
+ m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
+ 
+-# Protobuf 3.6+ requires C++11.
+-AS_IF([pkg-config --atleast-version 3.6.0 protobuf],
+-  [AX_CXX_COMPILE_STDCXX([11])])
++# Protobuf transitively requires at least C++14, get ahead of the
++# curve and require at least C++17.
++AX_CXX_COMPILE_STDCXX([17])
+ 
+ WARNING_CXXFLAGS=""
+ PICKY_CXXFLAGS=""
diff --git a/network/mosh/README b/network/mosh/README
index 0febc6cfb4..8b1944f8d5 100644
--- a/network/mosh/README
+++ b/network/mosh/README
@@ -1,19 +1,18 @@
-Mosh is a remote terminal application that allows roaming, supports 
-intermittent connectivity, and provides intelligent local echo and line 
-editing of user keystrokes.
+mosh (MObile SHell server and client)
 
-Mosh attempts to improve on SSH by being more robust and responsive, 
-especially over Wi-Fi, cellular, and long-distance links.
+Mosh is a remote terminal application that allows roaming, supports
+intermittent connectivity, and provides intelligent local echo and
+line editing of user keystrokes.
 
-The mosh client must be run with a UTF-8 locale. Locales can be 
-configured system wide in:
+Mosh attempts to improve on SSH by being more robust and responsive,
+especially over Wi-Fi, cellular, and long-distance links.
 
-/etc/profile.d/lang.sh 
-or 
+The mosh client must be run with a UTF-8 locale. Locales
+can be configured system-wide in /etc/profile.d/lang.sh or
 /etc/profile.d/lang.csh
 
-Alternatively set LANG to a UTF-8 locale (e.g. LANG=en_GB.UTF-8) 
+Alternatively set LANG to a UTF-8 locale (e.g. LANG=en_GB.UTF-8)
 somewhere else you consider suitable.
 
-Additionally the server that you are connecting to must have the same 
+Additionally the server that you are connecting to must have the same
 locale installed (though it need not be set as the default).
diff --git a/network/mosh/mosh.SlackBuild b/network/mosh/mosh.SlackBuild
index 4f5fe7ce09..8127e0ff4d 100644
--- a/network/mosh/mosh.SlackBuild
+++ b/network/mosh/mosh.SlackBuild
@@ -1,29 +1,49 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for mosh
 
-# Written by ruario <sbo@ruari.com>
+# Written by ruario
+# Formerly maintained by Donald Cooley, South Haven, Indiana, USA
+# Now maintained by B. Watson <urchlay@slackware.uk>.
+# Original script had no license; modified version licensed under
+# the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
+
+# 20230225 bkw: homepage/download changed.
+
+# 20220425 bkw: BUILD=2
+# - take over maintenance.
+# - relicense script as WTFPL.
+# - include a couple more doc files (THANKS and ocb-license.html).
+# - add bash completion to package.
+# - add ufw integration to package (untested; I don't run ufw).
+
+cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=mosh
-VERSION=${VERSION:-1.2.4}
-BUILD=${BUILD:-1}
+VERSION=${VERSION:-1.4.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"
@@ -45,14 +65,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 {} \+
+
+# patch to work with newer protobuf3
+patch -p1 < $CWD/1282.patch
 
+autoreconf -vif
 CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS -fpermissive" \
 ./configure \
   --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
@@ -63,22 +84,24 @@ CXXFLAGS="$SLKCFLAGS" \
   --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
+install -D -m0644 \
+  conf/bash-completion/completions/$PRGNAM \
+  $PKG/usr/share/bash-completion/completions/$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
+install -D -m0644 \
+  conf/ufw/applications.d/$PRGNAM \
+  $PKG/etc/ufw/applications.d/$PRGNAM
 
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
-  AUTHORS COPYING ChangeLog NEWS README.md \
-  $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 *.md *.html THANKS $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/network/mosh/mosh.info b/network/mosh/mosh.info
index 911318a85f..9578dd57f8 100644
--- a/network/mosh/mosh.info
+++ b/network/mosh/mosh.info
@@ -1,10 +1,10 @@
 PRGNAM="mosh"
-VERSION="1.2.4"
-HOMEPAGE="http://mosh.mit.edu/"
-DOWNLOAD="http://mosh.mit.edu/mosh-1.2.4.tar.gz"
-MD5SUM="c2d918f4d91fdc32546e2e089f9281b2"
+VERSION="1.4.0"
+HOMEPAGE="https://mosh.org"
+DOWNLOAD="https://mosh.org/mosh-1.4.0.tar.gz"
+MD5SUM="c34a647f8545565d79188acacaea7559"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="perl-IO-Tty protobuf"
-MAINTAINER="Ruari Oedegaard"
-EMAIL="sbo@ruari.com"
+REQUIRES="perl-IO-Tty protobuf3"
+MAINTAINER="B. Watson"
+EMAIL="urchlay@slackware.uk"
diff --git a/network/movgrab/movgrab.SlackBuild b/network/movgrab/movgrab.SlackBuild
index a8ea401cb2..fc151c4a1d 100644
--- a/network/movgrab/movgrab.SlackBuild
+++ b/network/movgrab/movgrab.SlackBuild
@@ -1,12 +1,15 @@
-#!/bin/sh
+#!/bin/bash
 # Slackware build script for movgrab
 #
 # Michales - clavisound - Michaloudes korgie@gmail.com <2012>
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=movgrab
 VERSION=${VERSION:-1.2.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}
@@ -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/network/mpop/README b/network/mpop/README
index 00adf573b4..ea0ccad1cb 100644
--- a/network/mpop/README
+++ b/network/mpop/README
@@ -2,5 +2,3 @@ mpop is a small and fast POP3 client. Features include mail filtering,
 delivery to mbox files, maildir folders or a mail delivery agent, a
 very fast POP3 implementation, many authentication methods, good
 TLS/SSL support, IPv6 support, and more.
-
-Optional Dependency: libgsasl
diff --git a/network/mpop/mpop.SlackBuild b/network/mpop/mpop.SlackBuild
index 9e285286ca..a0522fd4e3 100644
--- a/network/mpop/mpop.SlackBuild
+++ b/network/mpop/mpop.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for mpop
 
-# Copyright 2014 Marek Buras Silesia,Poland
+# Copyright spaceman
 # 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=mpop
-VERSION=${VERSION:-1.2.6}
+VERSION=${VERSION:-1.4.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}
@@ -60,8 +70,8 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xf $CWD/$PRGNAM-$VERSION.tar.xz || exit 1
-cd $PRGNAM-$VERSION || exit 1
+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 \) \
@@ -78,25 +88,25 @@ CXXFLAGS="$SLKCFLAGS" \
   --localstatedir=/var \
   --infodir=/usr/info \
   --mandir=/usr/man \
-  --with-libgsasl \
+  --disable-rpath \
   --build=$ARCH-slackware-linux
 
-make || exit 1
-make install-strip DESTDIR=$PKG || exit 1
+make
+make install-strip 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 {} \;
 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*
+gzip -n $PKG/usr/info/*.info*
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/scripts/vim
 cp -a AUTHORS COPYING ChangeLog NEWS NOTES README THANKS doc/mpoprc.example \
   $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a scripts/vim/README -a scripts/vim/mpop.vim \
+cp -a scripts/vim/README scripts/vim/mpop.vim \
   $PKG/usr/doc/$PRGNAM-$VERSION/scripts/vim
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
@@ -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/network/mpop/mpop.info b/network/mpop/mpop.info
index 30cbe03004..7c491d38a8 100644
--- a/network/mpop/mpop.info
+++ b/network/mpop/mpop.info
@@ -1,10 +1,10 @@
 PRGNAM="mpop"
-VERSION="1.2.6"
-HOMEPAGE="http://mpop.sourceforge.net/"
-DOWNLOAD="http://download.sourceforge.net/mpop/mpop-1.2.6.tar.xz"
-MD5SUM="2298ddcf1defbf8e7097a1869c8d39d3"
+VERSION="1.4.18"
+HOMEPAGE="https://marlam.de/mpop"
+DOWNLOAD="https://marlam.de/mpop/releases/mpop-1.4.18.tar.xz"
+MD5SUM="c7671abcdb3fedf429c3e1a01d1d53d1"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="libgsasl"
-MAINTAINER="Marek Buras"
-EMAIL="cyfr0n@onet.pl"
+REQUIRES=""
+MAINTAINER="spaceman"
+EMAIL="spaceman@antispaceman.com"
diff --git a/network/mpop/slack-desc b/network/mpop/slack-desc
index 783c9d5c75..bb93deddb4 100644
--- a/network/mpop/slack-desc
+++ b/network/mpop/slack-desc
@@ -13,7 +13,7 @@ mpop: delivery to mbox files, maildir folders or a mail delivery agent, a
 mpop: very fast POP3 implementation, many authentication methods, good
 mpop: TLS/SSL support, IPv6 support, and more.
 mpop:
-mpop: Homepage: http://mpop.sourceforge.net/
+mpop: Homepage: https://marlam.de/mpop
 mpop:
 mpop:
 mpop:
diff --git a/network/mps-youtube/README b/network/mps-youtube/README
index 876d4da819..8d28abbce4 100644
--- a/network/mps-youtube/README
+++ b/network/mps-youtube/README
@@ -2,6 +2,3 @@ This project is based on mps, a terminal based program to search,
 stream and download music. This implementation uses YouTube as a 
 source of content and can play and download video as well as audio. 
 The pafy library handles interfacing with YouTube.
-
-NOTE: 
-Please install python3 first before installing all other requirements.
diff --git a/network/mps-youtube/mps-youtube.SlackBuild b/network/mps-youtube/mps-youtube.SlackBuild
index 2438dda7f8..deae75b729 100644
--- a/network/mps-youtube/mps-youtube.SlackBuild
+++ b/network/mps-youtube/mps-youtube.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for mps-youtube
 
@@ -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=mps-youtube
 VERSION=${VERSION:-0.2.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}
@@ -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/network/mps-youtube/mps-youtube.info b/network/mps-youtube/mps-youtube.info
index c7ba6ec330..6a4013d274 100644
--- a/network/mps-youtube/mps-youtube.info
+++ b/network/mps-youtube/mps-youtube.info
@@ -5,6 +5,6 @@ DOWNLOAD="https://pypi.python.org/packages/b1/8e/5156416119545e3f5ba16ec0fdbb2c7
 MD5SUM="7560fda429491a41b1a4a20ad9cd3a3b"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="python3 Pafy"
+REQUIRES="Pafy"
 MAINTAINER="Dimitris Zlatanidis"
 EMAIL="d.zlatanidis@gmail.com"
diff --git a/network/mps/mps.SlackBuild b/network/mps/mps.SlackBuild
index 41e63ab80b..240ce010eb 100644
--- a/network/mps/mps.SlackBuild
+++ b/network/mps/mps.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for mps
 
@@ -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=mps
 VERSION=${VERSION:-0.20.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}
@@ -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/network/mrtg/mrtg.SlackBuild b/network/mrtg/mrtg.SlackBuild
index 5fd59b522a..a5428a5c66 100644
--- a/network/mrtg/mrtg.SlackBuild
+++ b/network/mrtg/mrtg.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for mrtg
 
@@ -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=mrtg
-VERSION=${VERSION:-2.17.7}
+VERSION=${VERSION:-2.17.10}
 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 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/network/mrtg/mrtg.info b/network/mrtg/mrtg.info
index c6d454ad45..10b59e2154 100644
--- a/network/mrtg/mrtg.info
+++ b/network/mrtg/mrtg.info
@@ -1,10 +1,10 @@
 PRGNAM="mrtg"
-VERSION="2.17.7"
+VERSION="2.17.10"
 HOMEPAGE="https://oss.oetiker.ch/mrtg/"
-DOWNLOAD="https://oss.oetiker.ch/mrtg/pub/mrtg-2.17.7.tar.gz"
-MD5SUM="eada3870c0419e425299401486600d95"
+DOWNLOAD="https://oss.oetiker.ch/mrtg/pub/mrtg-2.17.10.tar.gz"
+MD5SUM="ab1c14acc9af4221f459707339f361b3"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
 MAINTAINER="Ulrich Schaefer"
-EMAIL="us@ulischaefer.net"
+EMAIL="us@ulischaefer.de"
diff --git a/network/msmtp/README b/network/msmtp/README
index f78cb41d5b..f6a03b8429 100644
--- a/network/msmtp/README
+++ b/network/msmtp/README
@@ -3,8 +3,8 @@ msmtp is a simple SMTP client.
 In the default mode, msmtp transmits a mail to an SMTP server (for
 example, at a free mail provider) which does the delivery.
 
-To use this program with your mail user agent (MUA), create a configuration
-file with your mail account(s) and tell your MUA to call msmtp instead of
-/usr/sbin/sendmail.
+To use this program with your mail user agent (MUA), create a
+configuration file with your mail account(s) and tell your MUA to call
+msmtp instead of /usr/sbin/sendmail.
 
 libgsasl is an optional dependency.
diff --git a/network/msmtp/doinst.sh b/network/msmtp/doinst.sh
index b7c8257e07..1bef502028 100644
--- a/network/msmtp/doinst.sh
+++ b/network/msmtp/doinst.sh
@@ -1 +1,6 @@
-chroot . /usr/bin/install-info /usr/info/msmtp.info.gz /usr/info/dir 2> /dev/null
+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/network/msmtp/msmtp.SlackBuild b/network/msmtp/msmtp.SlackBuild
index ff50ab73b9..8f3cd8eb3b 100644
--- a/network/msmtp/msmtp.SlackBuild
+++ b/network/msmtp/msmtp.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 # Slackware build script for msmtp
 
 # Copyright 2009-2012 Grigorios Bouzakis <grbzks@imap.cc>
@@ -20,10 +20,16 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20230701 bkw: Modified by SlackBuilds.org, BUILD=2:
+# - use correct template for install-info in doinst.sh, add douninst.sh.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=msmtp
-VERSION=${VERSION:-1.8.5}
-BUILD=${BUILD:-1}
+VERSION=${VERSION:-1.8.20}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -33,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}
@@ -52,7 +62,7 @@ else
   LIBDIRSUFFIX=""
 fi
 
-DOCS="AUTHORS COPYING ChangeLog INSTALL NEWS README THANKS
+DOCS="AUTHORS COPYING ChangeLog NEWS README THANKS
       doc/msmtprc-system.example doc/msmtprc-user.example"
 
 set -e
@@ -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,13 +93,9 @@ 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
 
-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 -f $PKG/usr/info/dir
 gzip -9 $PKG/usr/info/*.info*
@@ -101,6 +107,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
+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/network/msmtp/msmtp.info b/network/msmtp/msmtp.info
index 323ecdc064..2c24b07e49 100644
--- a/network/msmtp/msmtp.info
+++ b/network/msmtp/msmtp.info
@@ -1,10 +1,10 @@
 PRGNAM="msmtp"
-VERSION="1.8.5"
+VERSION="1.8.20"
 HOMEPAGE="https://marlam.de/msmtp/"
-DOWNLOAD="https://marlam.de/msmtp/releases/msmtp-1.8.5.tar.xz"
-MD5SUM="5d7bb10606fbceeb2e0687379c75234b"
+DOWNLOAD="https://marlam.de/msmtp/releases/msmtp-1.8.20.tar.xz"
+MD5SUM="6fc0ce864d74992f6c6124c3611d15da"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Dave Woodfall"
+MAINTAINER="D Woodfall"
 EMAIL="dave@slackbuilds.org"
diff --git a/network/msn-proxy/README b/network/msn-proxy/README
deleted file mode 100644
index 98b70961e0..0000000000
--- a/network/msn-proxy/README
+++ /dev/null
@@ -1,12 +0,0 @@
-msn-proxy is a light-weight transparent proxy for MSN Messenger clients that
-allows you to control and monitor the use of Messenger on your network.
-
-This SlackBuild installs the msn-proxy web pages in /var/www/htdocs/
-To change the location, set the DOCROOT variable:
-# DOCROOT=your/docroot/dir ./msn-proxy.SlackBuild
-(be sure to omit the leading "/" from the path; for example, use "home/www/"
-instead of "/home/www/" if your preferred DOCROOT is /home/www/.
-
-This needs httpd, php, mysql configured & running.
-
-See the included README.SLACKWARE file for configuration instructions.
diff --git a/network/msn-proxy/README.SLACKWARE b/network/msn-proxy/README.SLACKWARE
deleted file mode 100644
index 372a28ea2f..0000000000
--- a/network/msn-proxy/README.SLACKWARE
+++ /dev/null
@@ -1,78 +0,0 @@
-README.SLACKWARE
-================
-
-After installing the package, follow these steps to setup msn-proxy:
-
-1) Edit your configuration files
---------------------------------
-
-You'll need to check:
-- /etc/msn-proxy/msn-proxy.conf
-- /etc/msn-proxy/mysql/conf
-- /etc/msn-proxy/mysql.inc.php
-
-2) Create database & user on your MySQL server
-----------------------------------------------
-
-  # mysql -p<your_password>
-  mysql> create database `msn-proxy`;
-  mysql> grant all privileges on `msn-proxy`.* to `msn-proxy`@localhost 
-      -> identified by 'secret';
-  mysql> flush privileges;
-  mysql> quit
-
-Change the password ('secret') and name of the server where msn-proxy will
-run (localhost) as needed.
-
-3) Start msn-proxy first time to create the tables
---------------------------------------------------
-
-  # msn-proxy -f /etc/msn-proxy/
-
-msn-proxy will create the tables and exit with an error:
-
-  fail to read mysql config (check defaults table)
-
-This is normal and will be solved in the next step.
-
-4) Insert server IP in defaults table
--------------------------------------
-
-  # mysql -u msn-proxy -psecret
-  mysql> use database `msn-proxy`;
-  mysql> insert into defaults (internal_host) values ('<your_ip>');
-  mysql> quit
-
-5) Start msn-proxy
-------------------
-
-msn-proxy can be started with:
-
-  # msn-proxy -f /etc/msn-proxy &
-
-Put this line in your /etc/rc.d/rc.local file to always start the service
-when booting.
-
-6) Configuring clients
-----------------------
-
-The clients on your network need to point their MSN to your new proxy.
-You can also do this automatically in your nameserver. If you use dnsmasq
-on Slackware, simply insert this line:
-
-  address=/messenger.hotmail.com/<your_ip>
-
-This way all requests to resolve the IP for "messenger.hotmail.com" will be 
-answered with the address of your msn-proxy server.
-
-It is also a good idea to block http access to messenger.hotmail.com (and
-some of the alternatives out there) in your proxy or firewall if you want
-to be absolutely sure that all messenger traffic goes through msn-proxy.
-
-7) See the result
------------------
-
-Simply point your browser at http://<your_ip>/msn-proxy/index.php
-
-Now you have the option to either keep this address "secret" or use known
-httpd access control methods to prevent all users to see the result :)
diff --git a/network/msn-proxy/config.patch b/network/msn-proxy/config.patch
deleted file mode 100644
index 2e92dcc257..0000000000
--- a/network/msn-proxy/config.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- msn-proxy-0.7_orig/Makefile	2009-01-20 13:34:19.000000000 -0200
-+++ msn-proxy-0.7/Makefile	2009-12-26 23:17:08.000000000 -0200
-@@ -1,18 +1,18 @@
- 
- RM=/bin/rm
- INSTALL=/usr/bin/install
--SYSCONFDIR=$(DESTDIR)/usr/local/etc/msn-proxy
--BINDIR=$(DESTDIR)/usr/local/bin
-+SYSCONFDIR=$(DESTDIR)/etc/msn-proxy
-+BINDIR=$(DESTDIR)/usr/bin
- 
--# FreeBSD
--MYSQLINC=/usr/local/include
--MYSQLLIB=/usr/local/lib/mysql
-+# Slackware
-+MYSQLINC=/usr/include/mysql
-+MYSQLLIB=/usr/lib@LIBDIRSUFFIX@/mysql
- 
- # Linux (most)
- #MYSQLINC=/usr/lib/mysql
- #MYSQLLIB=/usr/local/mysql/lib/mysql
- 
--CCFLAGS=-g -Wall -O2 -pipe -I/usr/local/include -I$(MYSQLINC) -fno-builtin-log
-+CCFLAGS=-g -Wall @SLKCFLAGS@ -pipe -I/usr/local/include -I$(MYSQLINC) -fno-builtin-log
- 
- LDFLAGS=-L/usr/local/lib -levent -L$(MYSQLLIB) -lmysqlclient
- 
diff --git a/network/msn-proxy/doinst.sh b/network/msn-proxy/doinst.sh
deleted file mode 100644
index 4431a61b7c..0000000000
--- a/network/msn-proxy/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/msn-proxy/msn-proxy.conf.new
-config etc/msn-proxy/mysql/conf.new
-config etc/msn-proxy/mysql.inc.php.new
-
diff --git a/network/msn-proxy/msn-proxy.SlackBuild b/network/msn-proxy/msn-proxy.SlackBuild
deleted file mode 100644
index 81fcba81be..0000000000
--- a/network/msn-proxy/msn-proxy.SlackBuild
+++ /dev/null
@@ -1,111 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for msn-proxy
-
-# Written by Niels Horn <niels.horn@gmail.com>
-# revision date: 2009/12/27
-
-PRGNAM=msn-proxy
-VERSION=${VERSION:-0.7}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-DOCROOT=${DOCROOT:-var/www/htdocs}
-
-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 {} \;
-
-# Patch mysql.h because it has the configuration directory hard-coded...
-patch -p1 < $CWD/mysql.patch
-
-# msn-proxy has no "configure", so we'll patch the Makefile to Slackware
-# standards
-patch -p1 < $CWD/config.patch
-
-# Now enter SLKCFLAGS LIBDIRSUFFIX in the Makefile:
-sed -i -e "s,@SLKCFLAGS@,$SLKCFLAGS,g" -e "s,@LIBDIRSUFFIX@,$LIBDIRSUFFIX,g" \
-  Makefile
-
-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
-
-# Rename configuration files
-mv $PKG/etc/$PRGNAM/$PRGNAM.conf $PKG/etc/$PRGNAM/$PRGNAM.conf.new
-mv $PKG/etc/$PRGNAM/mysql/conf $PKG/etc/$PRGNAM/mysql/conf.new
-
-# "Install" web pages
-mkdir -p $PKG/$DOCROOT/$PRGNAM
-cp -a php/* $PKG/$DOCROOT/$PRGNAM/
-chown -R root:apache $PKG/$DOCROOT/$PRGNAM
-
-# Move PHP configuration
-mv $PKG/$DOCROOT/$PRGNAM/mysql.inc.php $PKG/etc/$PRGNAM/mysql.inc.php.new
-chmod 640 $PKG/etc/$PRGNAM/mysql.inc.php.new
-
-# Set correct Slackware location of mysql.sock
-sed -i "s,/tmp/mysql.sock,/var/run/mysql/mysql.sock," \
-  $PKG/etc/$PRGNAM/mysql.inc.php.new
-sed -i "s,/tmp/mysql.sock,/var/run/mysql/mysql.sock," \
-  $PKG/etc/$PRGNAM/mysql/conf.new
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
-  ChangeLog INSTALL \
-  $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
-
-# Put instruction to create symbolic link to PHP conf in doinst script
-cat >> $PKG/install/doinst.sh << EOF
-( cd $DOCROOT/$PRGNAM ; rm -rf mysql.inc.php )
-( cd $DOCROOT/$PRGNAM ; ln -sf /etc/$PRGNAM/mysql.inc.php )
-EOF
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/network/msn-proxy/msn-proxy.info b/network/msn-proxy/msn-proxy.info
deleted file mode 100644
index 4c163f616d..0000000000
--- a/network/msn-proxy/msn-proxy.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="msn-proxy"
-VERSION="0.7"
-HOMEPAGE="http://msn-proxy.sourceforge.net/"
-DOWNLOAD="https://downloads.sourceforge.net/msn-proxy/msn-proxy-0.7.tar.gz"
-MD5SUM="11faa72c70c36874685ca1b0ed382dcc"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Niels Horn"
-EMAIL="niels.horn@gmail.com"
diff --git a/network/msn-proxy/mysql.patch b/network/msn-proxy/mysql.patch
deleted file mode 100644
index 55aac529ef..0000000000
--- a/network/msn-proxy/mysql.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- msn-proxy-0.7_orig/mysql.h	2009-03-15 14:30:28.000000000 -0300
-+++ msn-proxy-0.7/mysql.h	2009-12-27 00:02:26.000000000 -0200
-@@ -22,7 +22,7 @@
- #define MYSQL_H
- 
- #ifndef MYSQLCONFDIR
--#define MYSQLCONFDIR		"/usr/local/etc/msn-proxy/mysql"
-+#define MYSQLCONFDIR		"/etc/msn-proxy/mysql"
- #endif
- #ifndef MYSQLCONF
- #define MYSQLCONF       	"conf"
diff --git a/network/msn-proxy/slack-desc b/network/msn-proxy/slack-desc
deleted file mode 100644
index a884649530..0000000000
--- a/network/msn-proxy/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------------------------------------------------------|
-msn-proxy: msn-proxy (transparent msn proxy)
-msn-proxy:
-msn-proxy: msn-proxy is a light-weight transparent proxy for MSN Messenger
-msn-proxy: clients that allows you to control and monitor the use of Messenger
-msn-proxy: on your network.
-msn-proxy:
-msn-proxy: http://msn-proxy.sourceforge.net/
-msn-proxy:
-msn-proxy:
-msn-proxy:
-msn-proxy:
diff --git a/network/mstflint/README b/network/mstflint/README
new file mode 100644
index 0000000000..b5d4b54723
--- /dev/null
+++ b/network/mstflint/README
@@ -0,0 +1,15 @@
+The mstflint is a set of tools for changing firmware configuration of
+Mellanox ConnectX Ethernet NICs and Infiniband HCA/VPI cards,
+as well as diagnosing (mainly hardware) problems and
+burning firmware for these products.
+
+These open-source tools are based on a subset of the proprietary
+Mellanox Firmware Tools (MFT) package.
+
+The functionality needed to burn firmware for
+Mellanox Infiniband switches from a connected host can be enabled with:
+
+    env ENABLE_INBAND=YES ./mstflint.SlackBuild
+
+which then pulls in the optional dependency upon "rdma-core"
+(available on SlackBuilds.org).
diff --git a/network/mstflint/mstflint.SlackBuild b/network/mstflint/mstflint.SlackBuild
new file mode 100644
index 0000000000..baadb7592c
--- /dev/null
+++ b/network/mstflint/mstflint.SlackBuild
@@ -0,0 +1,125 @@
+#!/bin/bash
+
+# Slackware build script for mstflint
+
+# Copyright 2023 GUAN Xin <guanx.bac@gmail.com> from Beijing
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=mstflint
+VERSION=${VERSION:-4.25.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-$PKGVER-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+ENABLE_INBAND=${ENABLE_INBAND:-no}
+if ! [ `echo x$ENABLE_INBAND | tr '[:lower:]' '[:upper:]'` = XYES ]; then
+  CONFIG_PARAMS_EXTRA="${CONFIG_PARAMS_EXTRA} --disable-inband"
+  SLACK_DESC_SED_CMD='s/ENABLE_INBAND/ but disabled at build time/g'
+else
+  CONFIG_PARAMS_EXTRA=
+  SLACK_DESC_SED_CMD='s/ENABLE_INBAND//g'
+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-1.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} \
+  --mandir=/usr/man \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --build=$ARCH-slackware-linux \
+  --enable-xml2 \
+  --enable-cs \
+  --enable-adb-generic-tools \
+  --enable-dpa \
+  ${CONFIG_PARAMS_EXTRA}
+
+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
+
+chmod 0755 $PKG/usr/lib${LIBDIRSUFFIX}/mstflint/python_tools/*.so
+
+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 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 | sed "$SLACK_DESC_SED_CMD" > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/network/mstflint/mstflint.info b/network/mstflint/mstflint.info
new file mode 100644
index 0000000000..d83a2abc3e
--- /dev/null
+++ b/network/mstflint/mstflint.info
@@ -0,0 +1,10 @@
+PRGNAM="mstflint"
+VERSION="4.25.0"
+HOMEPAGE="https://github.com/Mellanox/mstflint"
+DOWNLOAD="UNSUPPORTED"
+MD5SUM=""
+DOWNLOAD_x86_64="https://github.com/Mellanox/mstflint/releases/download/v4.25.0-1/mstflint-4.25.0-1.tar.gz"
+MD5SUM_x86_64="eb6e67084ed5d85271df0932cdcb4168"
+REQUIRES=""
+MAINTAINER="GUAN Xin"
+EMAIL="guanx.bac@gmail.com"
diff --git a/network/mstflint/slack-desc b/network/mstflint/slack-desc
new file mode 100644
index 0000000000..b46242c6e5
--- /dev/null
+++ b/network/mstflint/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+        |-----handy-ruler------------------------------------------------------|
+mstflint: mstflint (Mellanox firmware configuration tools)
+mstflint:
+mstflint: mstflint is a set of tools for firmware burning and configuration of
+mstflint: Mellanox Ethernet NICs, Infiniband HCA/VPI cards.
+mstflint:
+mstflint: Firmware burning for Mellanox Infiniband switches from a
+mstflint: connected host is supportedENABLE_INBAND.
+mstflint:
+mstflint:
+mstflint: Home: https://github.com/Mellanox/mstflint
+mstflint:
diff --git a/network/mullvadvpn-app/README b/network/mullvadvpn-app/README
new file mode 100644
index 0000000000..64d8bce43e
--- /dev/null
+++ b/network/mullvadvpn-app/README
@@ -0,0 +1,8 @@
+MullvadVPN-app Desktop Client
+
+This is a repackaged Debian binary package for MullvadVPN's
+Desktop Client.
+
+This SlackBuild also supports both x86_64 & aarch64 deb downloads and
+will install the correct package for your arch.
+
diff --git a/network/slimjet/doinst.sh b/network/mullvadvpn-app/doinst.sh
index 65c7e2eeb9..65c7e2eeb9 100644
--- a/network/slimjet/doinst.sh
+++ b/network/mullvadvpn-app/doinst.sh
diff --git a/network/mullvadvpn-app/mullvadvpn-app.SlackBuild b/network/mullvadvpn-app/mullvadvpn-app.SlackBuild
new file mode 100644
index 0000000000..164a12feba
--- /dev/null
+++ b/network/mullvadvpn-app/mullvadvpn-app.SlackBuild
@@ -0,0 +1,113 @@
+#!/bin/bash
+
+# Slackware build script for mullvadvpn-app
+#
+# Copyright 2023 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=mullvadvpn-app
+SRCNAM=MullvadVPN
+VERSION=${VERSION:-2024.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
+  DEBARCH="i386"
+  LIBDIRSUFFIX=""
+  echo "This package is currently only available for 64bit."
+  exit 1
+elif [ "$ARCH" = "x86_64" ]; then
+  DEBARCH="amd64"
+  LIBDIRSUFFIX="64"
+elif [ "$ARCH" = "aarch64" ]; then
+  DEBARCH="arm64"
+  LIBDIRSUFFIX="64"
+else
+  echo "Package for $(uname -m) architecture is not available."
+  exit 1
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $PKG
+ar p $CWD/$SRCNAM-${VERSION}_$DEBARCH.deb data.tar.xz | tar Jxv
+
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -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
+
+# move and cleanup of debian package files
+
+# create rc file, there's no options to change so we'll just install it
+mkdir -p $PKG/etc/rc.d
+cp -a $CWD/rc.mullvad $PKG/etc/rc.d/rc.mullvad
+chmod 755 $PKG/etc/rc.d/rc.mullvad
+chown root:root $PKG/etc/rc.d/rc.mullvad
+
+# mullvad stores login settings here
+mkdir -p $PKG/etc/mullvad-vpn
+
+# location mullvad stores logs
+mkdir -p $PKG/var/log/mullvad-vpn
+
+# docs
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a $PKG/usr/share/doc/mullvad-vpn/* $PKG/opt/Mullvad\ VPN\/LICENSE* \
+  $PKG/usr/doc/$PRGNAM-$VERSION
+mkdir -p $PKG/usr/share/zsh
+cp -a $PKG/usr/local/share/* $PKG/usr/share
+rm -rf $PKG/usr/share/doc
+rm -rf $PKG/usr/local
+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/network/mullvadvpn-app/mullvadvpn-app.info b/network/mullvadvpn-app/mullvadvpn-app.info
new file mode 100644
index 0000000000..12c12a9a7e
--- /dev/null
+++ b/network/mullvadvpn-app/mullvadvpn-app.info
@@ -0,0 +1,12 @@
+PRGNAM="mullvadvpn-app"
+VERSION="2024.1"
+HOMEPAGE="https://mullvad.net/"
+DOWNLOAD="UNSUPPORTED"
+MD5SUM=""
+DOWNLOAD_x86_64="https://github.com/mullvad/mullvadvpn-app/releases/download/2024.1/MullvadVPN-2024.1_amd64.deb \
+                 https://github.com/mullvad/mullvadvpn-app/releases/download/2024.1/MullvadVPN-2024.1_arm64.deb"
+MD5SUM_x86_64="80a62dba93bdbce63f6468ccb2b41d46 \
+               39b9868dbd2a48088c3143c82771b5aa"
+REQUIRES=""
+MAINTAINER="Jay Lanagan"
+EMAIL="j@lngn.net"
diff --git a/network/mullvadvpn-app/rc.mullvad b/network/mullvadvpn-app/rc.mullvad
new file mode 100644
index 0000000000..427f2e3fe6
--- /dev/null
+++ b/network/mullvadvpn-app/rc.mullvad
@@ -0,0 +1,34 @@
+#!/bin/sh
+#
+# /etc/rc.d/rc.mullvad
+#
+# Start/stop/restart - Mullvad VPN Service.
+#
+# To make Mullvad VPN start automatically at boot, make this
+# file executable:  chmod 755 /etc/rc.d/rc.mullvad
+#
+# and also you must add this to /etc/rc.d/rc.local to
+# start MullvadVPN:
+#
+# if [ -x /etc/rc.d/rc.mullvad ]; then
+#   /etc/rc.d/rc.mullvad start
+# fi
+
+
+case "$1" in
+  'start')
+    /usr/bin/mullvad-daemon -v >/dev/null &
+  ;;
+  'stop')
+    pkill -f /usr/bin/mullvad-daemon >/dev/null &
+    # Remove both possible .pid locations:
+    rm -f /var/run/mullvad-vpn.pid /var/run/mullvad-vpn/mullvad-vpn.pid
+  ;;
+  'restart')
+    /usr/bin/mullvad-daemon -v >/dev/null &
+  ;;
+  *)
+    echo "Usage: $0 {start|stop|restart}"
+  ;;
+esac
+
diff --git a/network/mullvadvpn-app/slack-desc b/network/mullvadvpn-app/slack-desc
new file mode 100644
index 0000000000..4cd201b014
--- /dev/null
+++ b/network/mullvadvpn-app/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+              |-----handy-ruler------------------------------------------------------|
+mullvadvpn-app: mullvadvpn-app (vpn service desktop client)
+mullvadvpn-app:
+mullvadvpn-app: This is the VPN client software for the Mullvad VPN service. For more
+mullvadvpn-app: information about the service, please visit the website, mullvad.net.
+mullvadvpn-app:
+mullvadvpn-app: Homepage: https://github.com/mullvad/mullvadvpn-app
+mullvadvpn-app:
+mullvadvpn-app:
+mullvadvpn-app:
+mullvadvpn-app:
+mullvadvpn-app:
diff --git a/network/mumble-server/README b/network/mumble-server/README
new file mode 100644
index 0000000000..b4c6caeeee
--- /dev/null
+++ b/network/mumble-server/README
@@ -0,0 +1,33 @@
+mumble-sever is the VoIP server component for Mumble. Murmur is
+installed in a system-wide fashion, but can also be run by
+individual users. Each mumble-server process supports multiple virtual
+servers, each with their own user base and channel list.
+Administration of mumble-server is done through D-Bus.
+
+This script requires the system to have a mumble-server user and group:
+
+  # groupadd -g 261 murmur
+  # useradd -g murmur -u 261 -d /var/lib/mumble-server -s /bin/false murmur
+
+To use a different user and/or group:
+
+  # MURMUR_USER=user MURMUR_GROUP=group ./mumble-server.SlackBuild
+
+To run mumble-server at boot:
+
+  # chmod +x /etc/rc.d/rc.mumble-server
+
+  Add the following to /etc/rc.d/rc.local:
+  
+  if [ -x /etc/rc.d/rc.mumble-server ]; then
+    /etc/rc.d/rc.mumble-server start
+  fi
+
+Note that the project changed the name from murmurd to mumble-server.
+Not all of the upstream documentation has been updated yet.
+
+Notes: 
+- This does not build the mumble client (mumble).
+- ZeroC Ice is optional for server RPC support. Build with 
+  ICE=yes ./mumble-server.SlackBuild
+  See: https://wiki.mumble.info/wiki/Ice
diff --git a/network/mumble-server/doinst.sh b/network/mumble-server/doinst.sh
new file mode 100644
index 0000000000..4d03c50c4f
--- /dev/null
+++ b/network/mumble-server/doinst.sh
@@ -0,0 +1,28 @@
+#!/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/logrotate.d/mumble-server.new
+config etc/mumble-server.ini.new
+
+preserve_perms etc/rc.d/rc.mumble-server.new
diff --git a/network/mumble-server/mumble-server.SlackBuild b/network/mumble-server/mumble-server.SlackBuild
new file mode 100644
index 0000000000..5d4e1ad82a
--- /dev/null
+++ b/network/mumble-server/mumble-server.SlackBuild
@@ -0,0 +1,177 @@
+#!/bin/bash
+
+# Slackware build script for murmur
+
+# Copyright 2014-2022 Edward W. Koenig <kingbeowulf@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=mumble-server
+SRCNAM=mumble
+VERSION=${VERSION:-1.4.287}
+BUILD=${BUILD:-2}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+ICE=${ICE:-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}
+
+# For simplicity, we'll keep the old name for the user:group
+MURMUR_GROUP=${MURMUR_GROUP:-murmur}
+MURMUR_USER=${MURMUR_USER:-murmur}
+
+if ! getent group $MURMUR_GROUP; then
+  echo "Group $MURMUR_GROUP does not exist. Create it with:"
+  echo "  # groupadd -g 261 $MURMUR_GROUP"
+  echo""
+  exit 1
+fi
+
+if ! getent passwd $MURMUR_USER; then
+  echo "User $MURMUR_USER does not exist. Create it with:"
+  echo "  # useradd -g $MURMUR_GROUP -u 261 -d /var/lib/$PRGNAM -s /bin/false $MURMUR_USER"
+  echo ""
+  exit 1
+fi
+
+if [ "$ICE" = "no" ]; then
+  BUILD_ICE="-Dice=OFF"
+else
+  BUILD_ICE="-Dice=ON"
+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/$SRCNAM-$VERSION.tar.gz
+mv $SRCNAM-$VERSION.src $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 {} \;
+
+sed -e "s|CMAKE_CXX_STANDARD 14|CMAKE_CXX_STANDARD 17|" -i CMakeLists.txt
+mkdir -p build
+
+(cd build
+cmake \
+  -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+  -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+  -DCMAKE_INSTALL_PREFIX=/usr \
+  -DCMAKE_INSTALL_MANDIR=/usr/man \
+  -DCMAKE_BUILD_TYPE=Release \
+  -Dclient=OFF \
+  -Dserver=ON \
+   $BUILD_ICE \
+  -Dzeroconf=OFF ..
+
+make
+make install DESTDIR=$PKG
+)
+
+# remove useless manpage for broken server wrapper
+rm -f $PKG/usr/man/man1/murmur-user-wrapper.1
+
+mkdir -p \
+  $PKG/etc/{logrotate.d,rc.d} \
+  $PKG/var/{lib,log}/$PRGNAM
+
+# choose sane locations in Murmur configuration file, still old name
+sed \
+  -e "s,database=.*,database=/var/lib/$PRGNAM/$PRGNAM.sqlite," \
+  -e "s,;logfile=.*,logfile=/var/log/$PRGNAM/$PRGNAM.log," \
+  -e "s,;pidfile=.*,pidfile=/var/run/$PRGNAM/$PRGNAM.pid," \
+  -e "s,uname=.*,uname=$MURMUR_USER," \
+ $TMP/$PRGNAM-$VERSION/scripts/murmur.ini > $PKG/etc/$PRGNAM.ini.new
+
+# Slackware style logrotate
+sed \
+  -e "s,@LOGFILE@,/var/log/$PRGNAM/$PRGNAM.log," \
+  -e "s,@USER@,$MURMUR_USER,g" \
+  -e "s,@GROUP@,$MURMUR_GROUP,g" \
+ $CWD/$PRGNAM.logrotate > $PKG/etc/logrotate.d/$PRGNAM.new
+
+sed \
+  -e "s,@USER@,$MURMUR_USER,g" \
+  -e "s,@GROUP@,$MURMUR_GROUP,g" \
+ $CWD/rc.$PRGNAM > $PKG/etc/rc.d/rc.$PRGNAM.new
+
+chown root:$MURMUR_GROUP $PKG/etc/$PRGNAM.ini.new
+chmod o-rwx $PKG/etc/$PRGNAM.ini.new
+
+chown $MURMUR_USER:$MURMUR_GROUP $PKG/var/{lib,log}/$PRGNAM
+chmod o-rwx $PKG/var/lib/$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
+
+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
+cp -a AUTHORS CHANGES CODE_OF_CONDUCT.md COMMIT_GUIDELINES.md LICENSE README.md 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
+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/network/mumble-server/mumble-server.info b/network/mumble-server/mumble-server.info
new file mode 100644
index 0000000000..e00b5956a1
--- /dev/null
+++ b/network/mumble-server/mumble-server.info
@@ -0,0 +1,10 @@
+PRGNAM="mumble-server"
+VERSION="1.4.287"
+HOMEPAGE="https://wiki.mumble.info/wiki/Main_Page"
+DOWNLOAD="https://github.com/mumble-voip/mumble/releases/download/v1.4.287/mumble-1.4.287.tar.gz"
+MD5SUM="c9a2eb6413d165da606fb8d4657a1697"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="protobuf3"
+MAINTAINER="Edward W. Koenig"
+EMAIL="kingbeowulf@linuxgalaxy.org"
diff --git a/network/mumble-server/mumble-server.logrotate b/network/mumble-server/mumble-server.logrotate
new file mode 100644
index 0000000000..5abd3b2ac1
--- /dev/null
+++ b/network/mumble-server/mumble-server.logrotate
@@ -0,0 +1,16 @@
+@LOGFILE@ {
+	su @USER@ @GROUP@
+	weekly
+	rotate 7
+	compress
+	create 660 @USER@ @GROUP@
+	delaycompress
+	missingok
+	notifempty
+	sharedscripts
+	postrotate
+		if [ -x /etc/rc.d/rc.mumble-server ]; then
+			/etc/rc.d/rc.mumble-server restart
+		fi
+	endscript
+}
diff --git a/network/mumble-server/rc.mumble-server b/network/mumble-server/rc.mumble-server
new file mode 100644
index 0000000000..0a409067c2
--- /dev/null
+++ b/network/mumble-server/rc.mumble-server
@@ -0,0 +1,44 @@
+#!/bin/bash
+
+PIDFILE=/var/run/mumble-server/mumble-server.pid
+
+murmur_start() {
+  echo -n "Starting Mumble-serverr: "
+  mkdir -p $(dirname $PIDFILE)
+  chown @USER@:@GROUP@ $(dirname $PIDFILE)
+
+  if [ ! -f $PIDFILE ]; then
+    /usr/bin/mumble-server -ini /etc/mumble-server.ini & > /dev/null 2>&1
+    echo "OK"
+  else
+    echo -n "Removing stale lock.. "
+    /bin/rm -f $PIDFILE
+    /usr/bin/mumble-server -ini /etc/mumble-server.ini & > /dev/null 2>&1
+    echo "OK"
+  fi
+}
+
+murmur_stop() {
+  echo -n "Stopping Mumble-server: "
+  if [ -f $PIDFILE ]; then
+    /bin/kill $(/bin/cat $PIDFILE)
+    /bin/rm -f $PIDFILE
+    echo "OK"
+  else
+    echo "Not Running"
+  fi
+}
+
+case "$1" in
+  start)
+    murmur_start
+    ;;
+  stop)
+    murmur_stop
+    ;;
+  restart)
+    murmur_stop && (/bin/sleep 1 && murmur_start)
+    ;;
+  *)
+    echo "Usage: rc.mumble-server {start|stop|restart}"
+esac
diff --git a/network/mumble-server/slack-desc b/network/mumble-server/slack-desc
new file mode 100644
index 0000000000..23b6c345b7
--- /dev/null
+++ b/network/mumble-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 ':' except on otherwise blank lines.
+
+             |-----handy-ruler------------------------------------------------------|
+mumble-server: mumble-server (low latency voip server)
+mumble-server:
+mumble-server: Mumble-server is the VoIP server component for Mumble and is
+mumble-server: installed in a system-wide fashion, but can also be run by individual
+mumble-server: users. Each mumble-server process supports multiple virtual servers,
+mumble-server: each with their own user base and channel list. Administration of
+mumble-server: Mumble-server is done through D-Bus.
+mumble-server:
+mumble-server: Homepage: http://mumble.sourceforge.net/
+mumble-server:
+mumble-server:
diff --git a/network/mumble/README b/network/mumble/README
index 7fb924cb74..bb85a2cbe5 100644
--- a/network/mumble/README
+++ b/network/mumble/README
@@ -5,23 +5,28 @@ can be compared to programs like Ventrilo or TeamSpeak.
 If you have g15tools installed and want mumble to use it:
     G15=yes ./mumble.SlackBuild
 
-If you want the mumble overlay:
-    OVERLAY=yes ./mumble.SlackBuild
-
-If your system is x86_64 based, you can have this script build a
-32-bit libmumble. This will add in a 32-bit library for the
-mumble-overlay script to use for compatability. Please note, you
-*must* have a multilibbed system for this to work.
-
-To build the overlay with 32-bit compatability:
-    OVERLAY=yes COMPAT32=yes ./mumble.SlackBuild
-
-Note: This does not build the mumble server (murmur).
-
-***NOTE: text-to-speech is now an available option in mumble with
-SPEECHD=yes and requires additional optional dependencies:
-speech-dispatcher
-and you will need one text-to-speech engine installed:
-flite
-festival
-espeak
+If you don't want the mumble overlay:
+    OVERLAY=no ./mumble.SlackBuild
+
+If your system is x86_64 based, and you have the 32-bit multilib
+libraries, mumble will can build the 32-bit overlay
+library.
+
+    COMPAT32=yes ./mumble.SlackBuild
+
+Please note, you *must* have a multilibbed system for this to work.
+See the mumble documentation on how to use the mumble overlay. 
+
+Celt is no longer maintained, and dropped in is favor of opus.
+The bundled Celt is used for optional backware compatibility. To use 
+your own try:
+
+    CELT=no ./mumble.SlackBuild
+    
+Text-to-speech is the default (speechd and espeak). Disable with 
+
+    SPEECHD=no ./mumble.SlackBuild
+    
+Notes: 
+- This does not build the mumble server (murmur).
+
diff --git a/network/mumble/libspeechd_header.patch b/network/mumble/libspeechd_header.patch
deleted file mode 100644
index d398777a64..0000000000
--- a/network/mumble/libspeechd_header.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur mumble-1.2.16/src/mumble/TextToSpeech_unix.cpp mumble-1.2.16-new/src/mumble/TextToSpeech_unix.cpp
---- mumble-1.2.16/src/mumble/TextToSpeech_unix.cpp	2016-05-05 07:56:03.000000000 -0700
-+++ mumble-1.2.16-new/src/mumble/TextToSpeech_unix.cpp	2016-05-15 21:58:16.605311547 -0700
-@@ -33,7 +33,7 @@
- #include "TextToSpeech.h"
- 
- #ifdef USE_SPEECHD
--#include <libspeechd.h>
-+#include </usr/include/speech-dispatcher/libspeechd.h>
- #endif
- 
- #include "Global.h"
diff --git a/network/mumble/mumble.SlackBuild b/network/mumble/mumble.SlackBuild
index 9de8dc9468..f9d372c349 100644
--- a/network/mumble/mumble.SlackBuild
+++ b/network/mumble/mumble.SlackBuild
@@ -1,9 +1,9 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for Mumble
 
 # Copyright 2011-2013 James Geboski <jgeboski@gmail.com>
-# Copyright 2014-2015 Edward W. Koenig <kingbeowulf@gmail.com>
+# Copyright 2014-2021 Edward W. Koenig <kingbeowulf@gmail.com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,33 +23,40 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
-# New maintainer: Edward W. Koenig <kingbeowulf@gmail.com>
+
+cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=mumble
-VERSION=${VERSION:-1.2.19}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-1.4.287}
+BUILD=${BUILD:-3}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 G15=${G15:-no}
-OVERLAY=${OVERLAY:-no}
+OVERLAY=${OVERLAY:-yes}
 COMPAT32=${COMPAT32:-no}
-SPEECHD=${SPEECHD:-no}
+SPEECHD=${SPEECHD:-yes}
+CELT=${CELT:-yes}
 
 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,19 +69,37 @@ else
   LIBDIRSUFFIX=""
 fi
 
-BUILD_G15=""
-BUILD_OVERLAY=""
-
 if [ "$G15" = "no" ]; then
-  BUILD_G15="CONFIG+=no-g15"
+  BUILD_G15="-Dg15=OFF"
+else
+  BUILD_G15="-Dg15=ON"
 fi
 
 if [ "$OVERLAY" = "no" ]; then
-  BUILD_OVERLAY="CONFIG+=no-overlay"
+  BUILD_OVERLAY="-Doverlay=OFF"
+else
+  BUILD_OVERLAY="-Doverlay=ON"
+fi
+
+if [ "$COMPAT32" = "no" ]; then
+  BUILD_OVERLAY32="-Doverlay-xcompile=OFF"
+else
+  BUILD_OVERLAY32="-Doverlay-xcompile=ON"
 fi
 
 if [ "$SPEECHD" = "no" ]; then
-  BUILD_SPEECHD="CONFIG+=no-speechd"
+  BUILD_SPEECHD="-Dspeechd=OFF"
+else
+  BUILD_SPEECHD="-Dspeechd=ON"
+fi
+
+# Celt is no longer maintained, and dropped in
+# favor of opus.  Celt is bundled for optional
+# backware compatibility.
+if [ "CELT" = "no" ]; then
+  BUILD_CELT="-Dbundled-celt=OFF"
+else
+  BUILD_CELT="-Dbundled-celt=ON"
 fi
 
 set -e
@@ -84,6 +109,7 @@ mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+mv $PRGNAM-$VERSION.src $PRGNAM-$VERSION
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
@@ -92,88 +118,36 @@ 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 {} \;
 
-# Mumble won't find the speechd header without this
-patch -p1 < $CWD/libspeechd_header.patch
-
-qmake -recursive main.pro \
-  QMAKE_CFLAGS+="$SLKCFLAGS" \
-  QMAKE_CXXFLAGS+="$SLKCFLAGS" \
-  DEFINES*="PLUGIN_PATH=/usr/lib${LIBDIRSUFFIX}/mumble" \
-  CONFIG+=bundled-celt \
-  CONFIG+=no-server \
-  CONFIG+=no-bundled-opus \
-  CONFIG+=no-bundled-speex \
-  CONFIG+=no-update \
-  CONFIG+=no-embed-qt-translations \
-  CONFIG+=no-ice \
-  CONFIG+=no-bonjour \
+# Apply missing GTAV plugin patch for 32-bit alignment
+# https://github.com/mumble-voip/mumble/issues/5849
+patch -p1 < $CWD/positional-audio-plugin-gtav-32-bit-fix.patch
+
+sed -e "s|CMAKE_CXX_STANDARD 14|CMAKE_CXX_STANDARD 17|" -i CMakeLists.txt
+mkdir -p build
+cd build
+
+cmake \
+  -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+  -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+  -DCMAKE_INSTALL_PREFIX=/usr \
+  -DCMAKE_INSTALL_MANDIR=/usr/man \
+  -DCMAKE_BUILD_TYPE=Release \
+  -Dclient=ON \
+  -Dserver=OFF \
+  -Dbundled-opus=OFF \
+  -Dbundled-speex=OFF \
+  -Dupdate=OFF \
+  -Dbundle-qt-translations=OFF \
+  -Dwarnings-as-errors=OFF \
+  -Dzeroconf=OFF \
+  $BUILD_CELT \
+  $BUILD_SPEECHD \
   $BUILD_G15 \
   $BUILD_OVERLAY \
-  $BUILD_SPEECHD
-
-make release
-
-mkdir -p \
-  $PKG/usr/bin \
-  $PKG/usr/lib${LIBDIRSUFFIX}/mumble \
-  $PKG/usr/man/man1 \
-  $PKG/usr/share/{applications,pixmaps}
-
-install -m 755 release/mumble $PKG/usr/bin
-
-# Mumble's bundled celt is needed:
-# celt-0.7.0 is needed to keep compatibility with other clients
-# celt-0.11.0 is needed as SBo's 0.11.3 is incompatible
-cp -a release/libcelt0.so* $PKG/usr/lib${LIBDIRSUFFIX}/mumble
-
-install -m 644 \
-  man/mumble-overlay.1 \
-  man/mumble.1 \
- $PKG/usr/man/man1
+  $BUILD_OVERLAY32 ..
 
-install -m 644 scripts/mumble.desktop $PKG/usr/share/applications
-install -m 644 icons/mumble.svg       $PKG/usr/share/pixmaps
-
-find release/plugins -type f -name *.so \
-  -exec install -m 755 {} $PKG/usr/lib${LIBDIRSUFFIX}/mumble \;
-
-# If the overlay was built, let's install the library for it
-if [ -e release/libmumble.so.$VERSION ]; then
-  install -m 755 release/libmumble.so.$VERSION $PKG/usr/lib${LIBDIRSUFFIX}
-  install -m 755 scripts/mumble-overlay        $PKG/usr/bin
-
-  cd $PKG/usr/lib${LIBDIRSUFFIX}
-    ln -sf libmumble.so.$VERSION libmumble.so.1.2
-    ln -sf libmumble.so.$VERSION libmumble.so.1
-    ln -sf libmumble.so.$VERSION libmumble.so
-  cd -
-fi
-
-# The mumble-overly script will look for a 32-bit libmumble on non-pure x86_64
-# systems. If the x86_64 based system has a multilib setup, the COMPAT32
-# variable can be set to 'yes' to build a 32-bit version of libmumble.
-if [ "$COMPAT32" = "yes" -a "$OVERLAY" = "yes" -a "$ARCH" = "x86_64" ]; then
-  cd overlay_gl
-    make clean
-
-    qmake \
-      QMAKE_CFLAGS="-m32 -O2 -march=i486 -mtune=i686" \
-      QMAKE_CXXFLAGS="-m32 -O2 -march=i486 -mtune=i686" \
-      QMAKE_LFLAGS="-m32" \
-      overlay_gl.pro
-
-    make release DESTDIR_ADD=-32
-  cd -
-
-  mkdir -p $PKG/usr/lib
-  install -m 755 release-32/libmumble.so.$VERSION $PKG/usr/lib
-
-  cd $PKG/usr/lib
-    ln -sf libmumble.so.$VERSION libmumble.so.1.2
-    ln -sf libmumble.so.$VERSION libmumble.so.1
-    ln -sf libmumble.so.$VERSION libmumble.so
-  cd -
-fi
+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
@@ -182,7 +156,10 @@ 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 LICENSE README README.Linux $PKG/usr/doc/$PRGNAM-$VERSION
+(
+cd $TMP/$PRGNAM-$VERSION
+cp -a AUTHORS CHANGES CODE_OF_CONDUCT.md COMMIT_GUIDELINES.md LICENSE README.md SECURITY.md $PKG/usr/doc/$PRGNAM-$VERSION
+)
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
@@ -190,4 +167,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/network/mumble/mumble.info b/network/mumble/mumble.info
index 3842253f5d..553d27e33f 100644
--- a/network/mumble/mumble.info
+++ b/network/mumble/mumble.info
@@ -1,10 +1,10 @@
 PRGNAM="mumble"
-VERSION="1.2.19"
+VERSION="1.4.287"
 HOMEPAGE="https://wiki.mumble.info/wiki/Main_Page"
-DOWNLOAD="https://github.com/mumble-voip/mumble/releases/download/1.2.19/mumble-1.2.19.tar.gz"
-MD5SUM="d101068ed27ce119effdb3765a8cf8e4"
+DOWNLOAD="https://github.com/mumble-voip/mumble/releases/download/v1.4.287/mumble-1.4.287.tar.gz"
+MD5SUM="c9a2eb6413d165da606fb8d4657a1697"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="protobuf opus speex"
+REQUIRES="protobuf3 poco"
 MAINTAINER="Edward W. Koenig"
-EMAIL="kingbeowulf@gmail.com"
+EMAIL="kingbeowulf@linuxgalaxy.org"
diff --git a/network/mumble/positional-audio-plugin-gtav-32-bit-fix.patch b/network/mumble/positional-audio-plugin-gtav-32-bit-fix.patch
new file mode 100644
index 0000000000..59cf2120b3
--- /dev/null
+++ b/network/mumble/positional-audio-plugin-gtav-32-bit-fix.patch
@@ -0,0 +1,30 @@
+From 13c051b36b387356815cff5d685bc628b74ba136 Mon Sep 17 00:00:00 2001
+From: Davide Beatrici <git@davidebeatrici.dev>
+Date: Thu, 1 Sep 2022 23:32:57 +0200
+Subject: [PATCH] FIX(positional-audio): Force 8 bytes alignment for
+ CCameraAngles in GTAV plugin
+
+https://en.cppreference.com/w/cpp/language/alignas
+
+This fixes compilation when the implicit alignment is not 8 bytes.
+
+It can be the case with 32 bit targets.
+---
+ plugins/gtav/structs.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/plugins/gtav/structs.h b/plugins/gtav/structs.h
+index 2829dc11e1..0e4f76edab 100644
+--- a/plugins/gtav/structs.h
++++ b/plugins/gtav/structs.h
+@@ -118,7 +118,7 @@ struct CCameraManagerAngles {
+ 	ptr_t cameraAngles; // CCameraAngles *
+ };
+ 
+-struct CCameraAngles {
++struct alignas(8) CCameraAngles {
+ 	uint8_t pad1[960];
+ 	ptr_t playerAngles; // CPlayerAngles *
+ 	uint8_t pad2[60];
+
+      
diff --git a/network/munge/README b/network/munge/README
index 3d3792de7a..7a6632501a 100644
--- a/network/munge/README
+++ b/network/munge/README
@@ -11,14 +11,14 @@ by a shared cryptographic key. Clients within this security realm can
 create and validate credentials without the use of root privileges,
 reserved ports, or platform-specific methods.
 
-On most platforms, the munged daemon does not require root privileges to run.
-If possible, you should run the daemon as a non-privileged user.
+On most platforms, the munged daemon does not require root privileges to
+run.  If possible, you should run the daemon as a non-privileged user.
 This can be specified in the init script /etc/rc.d/rc.munge.
 
 # groupadd -g 310 munge
 # useradd -u 310 -d /var/lib/munge -s /bin/false -g munge munge
 
-After installation a secret key file needs to be created. Follow instructions
-from:
+After installation a secret key file needs to be created. Follow
+instructions from:
 
 https://github.com/dun/munge/wiki/Installation-Guide#creating-a-secret-key
diff --git a/network/munge/etc.default.munge b/network/munge/etc.default.munge
new file mode 100644
index 0000000000..70f9a98b85
--- /dev/null
+++ b/network/munge/etc.default.munge
@@ -0,0 +1,13 @@
+# MUNGE configuration
+
+# Pass additional command-line options to munged.
+# OPTIONS="--key-file=/etc/munge/munge.key --num-threads=2"
+
+# Adjust the scheduling priority of munged.
+# NICE=
+
+# Execute munged under another username.
+# USER="munge"
+
+# Execute munged under another groupname.
+# GROUP="munge"
diff --git a/network/munge/munge.SlackBuild b/network/munge/munge.SlackBuild
index 714c768926..4fc926ed56 100644
--- a/network/munge/munge.SlackBuild
+++ b/network/munge/munge.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for Munge
 
-# Copyright 2015 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,13 +22,18 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20220308 bkw: Modified by SlackBuilds.org: fix build on 15.0.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=munge
-VERSION=${VERSION:-0.5.13}
-BUILD=${BUILD:-1}
+VERSION=${VERSION:-0.5.14}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 DOCS="AUTHORS COPYING COPYING.LESSER DISCLAIMER.LLNS DISCLAIMER.UC \
-      HISTORY INSTALL JARGON META NEWS PLATFORMS QUICKSTART README README.MULTILIB"
+      HISTORY JARGON KEYS NEWS PLATFORMS QUICKSTART README README.MULTILIB THANKS"
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -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}
@@ -68,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" \
@@ -85,15 +94,23 @@ CXXFLAGS="$SLKCFLAGS" \
   --host=$ARCH-slackware-linux
 
 make
-make install DESTDIR=$PKG
+make install-strip DESTDIR=$PKG
 
 # Remove systemd files
 rm -rf $PKG/usr/lib/systemd/
 
 mv $PKG/etc/rc.d/init.d/munge $PKG/etc/rc.d/rc.munge.new
-mv $PKG/etc/default/munge $PKG/etc/default/munge.new
 rm -rf $PKG/etc/rc.d/init.d/
 
+# 20220308 bkw: sometimes, this file doesn't exist. but sometimes it
+# does. no idea why, no time to deal with it, just add it to git and
+# always install it.
+#mv $PKG/etc/default/munge $PKG/etc/default/munge.new
+
+rm -rf $PKG/etc/default/  # might or might not exist...
+mkdir -p $PKG/etc/default/
+cat $CWD/etc.default.munge > $PKG/etc/default/munge.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
 
@@ -101,9 +118,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/network/munge/munge.info b/network/munge/munge.info
index acebdf893e..58e3aba957 100644
--- a/network/munge/munge.info
+++ b/network/munge/munge.info
@@ -1,8 +1,8 @@
 PRGNAM="munge"
-VERSION="0.5.13"
+VERSION="0.5.14"
 HOMEPAGE="https://dun.github.io/munge/"
-DOWNLOAD="https://github.com/dun/munge/releases/download/munge-0.5.13/munge-0.5.13.tar.xz"
-MD5SUM="9204f34aac7f0cc50880196f4a8f5f33"
+DOWNLOAD="https://github.com/dun/munge/releases/download/munge-0.5.14/munge-0.5.14.tar.xz"
+MD5SUM="e81db7faf729611e23d0552334dfc212"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/network/murmur/README b/network/murmur/README
deleted file mode 100644
index bebdb01949..0000000000
--- a/network/murmur/README
+++ /dev/null
@@ -1,27 +0,0 @@
-Murmur is the VoIP server component for Mumble. Murmur is
-installed in a system-wide fashion, but can also be run by
-individual users. Each murmur process supports multiple virtual
-servers, each with their own user base and channel list.
-Administration of murmur is done through D-Bus.
-
-NOTE: If you're upgrading from 1.1.4, the SlackBuild has changed:
-      /var/{lib,log,run}/mumble-server moved to /var/{lib,log,run}/murmur
-
-This script requires the system to have a murmur user and group:
-
-  # groupadd -g 261 murmur
-  # useradd -g murmur -u 261 -d /var/lib/murmur -s /bin/false murmur
-
-To use a different user and/or group:
-
-  # MURMUR_USER=user MURMUR_GROUP=group ./murmur.SlackBuild
-
-To run murmur at boot:
-
-  # chmod +x /etc/rc.d/rc.murmur
-
-  Add the following to /etc/rc.d/rc.local:
-  
-  if [ -x /etc/rc.d/rc.murmur ]; then
-    /etc/rc.d/rc.murmur start
-  fi
diff --git a/network/murmur/doinst.sh b/network/murmur/doinst.sh
deleted file mode 100644
index 116fd0b4fa..0000000000
--- a/network/murmur/doinst.sh
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/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/logrotate.d/murmur.new
-config etc/murmur.ini.new
-
-preserve_perms etc/rc.d/rc.murmur.new
diff --git a/network/murmur/murmur.SlackBuild b/network/murmur/murmur.SlackBuild
deleted file mode 100644
index 0ca99608da..0000000000
--- a/network/murmur/murmur.SlackBuild
+++ /dev/null
@@ -1,153 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for murmur
-
-# Copyright 2014, 2015 Edward W. Koenig <kingbeowulf@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=murmur
-SRCNAM=mumble
-VERSION=${VERSION:-1.2.19}
-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}
-
-MURMUR_GROUP=${MURMUR_GROUP:-murmur}
-MURMUR_USER=${MURMUR_USER:-murmur}
-
-if ! getent group $MURMUR_GROUP; then
-  echo "Group $MURMUR_GROUP does not exist. Create it with:"
-  echo "  # groupadd -g 261 $MURMUR_GROUP"
-  echo""
-  exit 1
-fi
-
-if ! getent passwd $MURMUR_USER; then
-  echo "User $MURMUR_USER does not exist. Create it with:"
-  echo "  # useradd -g $MURMUR_GROUP -u 261 -d /var/lib/$PRGNAM -s /bin/false $MURMUR_USER"
-  echo ""
-  exit 1
-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 -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 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
-
-qmake \
-  -recursive \
-  main.pro \
-  QMAKE_CFLAGS+="$SLKCFLAGS" \
-  QMAKE_CXXFLAGS+="$SLKCFLAGS" \
-  CONFIG+=no-update \
-  CONFIG+=no-client \
-  CONFIG+=no-ice \
-  CONFIG+=no-bonjour
-
-make release
-
-mkdir -p \
-  $PKG/etc/{logrotate.d,rc.d} \
-  $PKG/usr/bin \
-  $PKG/usr/man/man1 \
-  $PKG/var/{lib,log,run}/$PRGNAM
-
-install -m 644 $CWD/rc.$PRGNAM $PKG/etc/rc.d/rc.$PRGNAM.new
-install -m 755 release/murmurd $PKG/usr/bin
-install -m 644 man/murmurd.1   $PKG/usr/man/man1
-
-sed \
-  -e "s,database=.*,database=/var/lib/$PRGNAM/$PRGNAM.sqlite," \
-  -e "s,logfile=.*,logfile=/var/log/$PRGNAM/$PRGNAM.log," \
-  -e "s,pidfile=.*,pidfile=/var/run/$PRGNAM/$PRGNAM.pid," \
-  -e "s,uname=.*,uname=$MURMUR_USER," \
- scripts/murmur.ini.system > $PKG/etc/$PRGNAM.ini.new
-
-sed \
-  -i "s,PIDFILE=.*,PIDFILE=/var/run/$PRGNAM/$PRGNAM.pid," \
- $PKG/etc/rc.d/rc.$PRGNAM.new
-
-sed \
-  -e "s,@LOGFILE@,/var/log/$PRGNAM/$PRGNAM.log," \
-  -e "s,@USER@,$MURMUR_USER,g" \
-  -e "s,@GROUP@,$MURMUR_GROUP,g" \
- $CWD/$PRGNAM.logrotate > $PKG/etc/logrotate.d/$PRGNAM.new
-
-chown root:$MURMUR_GROUP $PKG/etc/$PRGNAM.ini.new
-chmod o-rwx $PKG/etc/murmur.ini.new
-
-chown $MURMUR_USER:$MURMUR_GROUP $PKG/var/{lib,log,run}/$PRGNAM
-chmod o-rwx $PKG/var/lib/$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
-
-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 INSTALL LICENSE README README.Linux \
-  $PKG/usr/doc/$PRGNAM-$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/network/murmur/murmur.info b/network/murmur/murmur.info
deleted file mode 100644
index eeeb72dadd..0000000000
--- a/network/murmur/murmur.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="murmur"
-VERSION="1.2.19"
-HOMEPAGE="https://github.com/mumble-voip/mumble/"
-DOWNLOAD="https://github.com/mumble-voip/mumble/releases/download/1.2.19/mumble-1.2.19.tar.gz"
-MD5SUM="d101068ed27ce119effdb3765a8cf8e4"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="protobuf"
-MAINTAINER="Edward W. Koenig"
-EMAIL="kingbeowulf@gmail.com"
diff --git a/network/murmur/murmur.logrotate b/network/murmur/murmur.logrotate
deleted file mode 100644
index 4d0c2f82bf..0000000000
--- a/network/murmur/murmur.logrotate
+++ /dev/null
@@ -1,16 +0,0 @@
-@LOGFILE@ {
-	su @USER@ @GROUP@
-	weekly
-	rotate 7
-	compress
-	create 660 @USER@ @GROUP@
-	delaycompress
-	missingok
-	notifempty
-	sharedscripts
-	postrotate
-		if [ -x /etc/rc.d/rc.murmur ]; then
-			/etc/rc.d/rc.murmur restart
-		fi
-	endscript
-}
diff --git a/network/murmur/rc.murmur b/network/murmur/rc.murmur
deleted file mode 100644
index 90d3c99a40..0000000000
--- a/network/murmur/rc.murmur
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/bash
-
-PIDFILE=""
-
-murmur_start() {
-  echo -n "Starting Murmur Server: "
-  if [ ! -f $PIDFILE ]; then
-    /usr/bin/murmurd -ini /etc/murmur.ini & > /dev/null 2>&1
-    echo "OK"
-  else
-    echo -n "Removing stale lock.. "
-    /bin/rm -f $PIDFILE
-    /usr/bin/murmurd -ini /etc/murmur.ini & > /dev/null 2>&1
-    echo "OK"
-  fi
-}
-
-murmur_stop() {
-  echo -n "Stopping Murmur: "
-  if [ -f $PIDFILE ]; then
-    /bin/kill $(/bin/cat $PIDFILE)
-    /bin/rm -f $PIDFILE
-    echo "OK"
-  else
-    echo "Not Running"
-  fi
-}
-
-case "$1" in
-  start)
-    murmur_start
-    ;;
-  stop)
-    murmur_stop
-    ;;
-  restart)
-    murmur_stop && (/bin/sleep 1 && murmur_start)
-    ;;
-  *)
-    echo "Usage: rc.murmur {start|stop|restart}"
-esac
diff --git a/network/murmur/slack-desc b/network/murmur/slack-desc
deleted file mode 100644
index c88ec71fe6..0000000000
--- a/network/murmur/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------------------------------------------------------|
-murmur: murmur (low latency voip server)
-murmur:
-murmur: Murmur is the VoIP server component for Mumble. Murmur is
-murmur: installed in a system-wide fashion, but can also be run by
-murmur: individual users. Each murmur process supports multiple virtual
-murmur: servers, each with their own user base and channel list.
-murmur: Administration of murmur is done through D-Bus.
-murmur:
-murmur: Homepage: http://mumble.sourceforge.net/
-murmur:
-murmur:
diff --git a/network/museek+/README b/network/museek+/README
deleted file mode 100644
index 350f3838de..0000000000
--- a/network/museek+/README
+++ /dev/null
@@ -1,23 +0,0 @@
-Museek+ is a file-sharing application for the Soulseek peer-to-peer network,
-written in C++. It's an enhanced version of Hyriand's original Museek
-(see http://museek.thegraveyard.org). It supports chat, transferring files,
-searching, user-management, shares browsing and more. The new features are:
-room searching, interests, buddy-only shares, banlists, icon themes, and 
-font/color selecting.
-
-Museek+ consists of museekd (daemon), muscan (shares scanning tool), muscand
-(automated shares scanning tool), musetup (command-line configuration script),
-musetup-gtk (PyGTK configuration app), museeq (QT GUI client), mucous (curses
-python client), murmur (PyGTK client) and museekcontrol (command-line python 
-client).
-
-After installing museek+ follow these steps:
-  1) Configure your settings with musetup: server, username, password, 
-     interface password, download directory, shared directories.
-  2) Run museekd.
-  3) Run museeq, mucous, or museekcontrol.
-  4) Login into museekd via the interface socket or host:port and the 
-     interface password.
-
-An example init script (rc.museekd) for the museekd daemon is provided. 
-Feel free to modify it for your needs.  Use it at your own risk.
diff --git a/network/museek+/doinst.sh b/network/museek+/doinst.sh
deleted file mode 100644
index 74a3bd3a48..0000000000
--- a/network/museek+/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...
-}
-
-# Keep same perms on rc.museekd.new:
-#if [ -e etc/rc.d/rc.museekd ]; then
-#  cp -a etc/rc.d/rc.museekd etc/rc.d/rc.museekd.new.incoming
-#  cat etc/rc.d/rc.museekd.new > etc/rc.d/rc.museekd.new.incoming
-#  mv etc/rc.d/rc.museekd.new.incoming etc/rc.d/rc.museekd.new
-#fi
-#
-#config etc/rc.d/rc.museekd.new
-
-if [ -x /usr/bin/update-desktop-database ]; then
-  /usr/bin/update-desktop-database usr/share/applications >/dev/null 2>&1
-fi
-
diff --git a/network/museek+/museek+.SlackBuild b/network/museek+/museek+.SlackBuild
deleted file mode 100644
index 347b8903bf..0000000000
--- a/network/museek+/museek+.SlackBuild
+++ /dev/null
@@ -1,90 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for museek+
-# Written by Iskar Enev <iskar.enev[@]gmail.com>
-# Currently maintained by B. Watson <yalhcru@gmail.com>
-
-PRGNAM=museek+
-VERSION=${VERSION:-0.2}
-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 {} \;
-
-# This patch fixes the python modules install path
-# to be architecture aware
-patch -p0 < $CWD/museek-python.diff
-
-cmake -DPREFIX=/usr \
-	-DMANDIR=man \
-	-DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
-	-DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS -std=c++11" \
-	-DSWIG_DIR:PATH=`swig -swiglib` \
-	-DEVERYTHING=1 \
-	-DTRAYICON=1 \
-	-DBINRELOC=0
-
-make VERBOSE=1
-make install VERBOSE=1 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
-
-( 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 \
-  COPYING CREDITS FILES LICENSE README TODO INSTALL \
-    $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-cat $CWD/rc.museekd > $PKG/usr/doc/$PRGNAM-$VERSION/rc.museekd.new
-
-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/network/museek+/museek+.info b/network/museek+/museek+.info
deleted file mode 100644
index 8ee1bc1126..0000000000
--- a/network/museek+/museek+.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="museek+"
-VERSION="0.2"
-HOMEPAGE="http://museek-plus.sourceforge.net/"
-DOWNLOAD="http://downloads.sourceforge.net/museek-plus/museek+-0.2.tar.bz2"
-MD5SUM="66d3eab341e1cd6642f83d329a18c3b5"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="libxml++"
-MAINTAINER="B. Watson"
-EMAIL="yalhcru@gmail.com"
diff --git a/network/museek+/museek-python.diff b/network/museek+/museek-python.diff
deleted file mode 100644
index 844d17d624..0000000000
--- a/network/museek+/museek-python.diff
+++ /dev/null
@@ -1,44 +0,0 @@
---- murmur/CMakeLists.txt	2008-09-22 11:49:33.000000000 +0300
-+++ murmur/CMakeLists.txt.1	2009-09-01 12:04:34.000000000 +0300
-@@ -25,7 +25,7 @@
-   ${PYMURMUR_FILES}
- )
- 
--EXECUTE_PROCESS(COMMAND python -c "import sys; import os; print os.path.join('lib', 'python' + str(sys.version_info[0]) + '.' + str(sys.version_info[1]), 'site-packages')" museek OUTPUT_VARIABLE sitepackages OUTPUT_STRIP_TRAILING_WHITESPACE ERROR_VARIABLE error)
-+EXECUTE_PROCESS(COMMAND python -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1,0,'')" museek OUTPUT_VARIABLE sitepackages OUTPUT_STRIP_TRAILING_WHITESPACE ERROR_VARIABLE error)
- 
- if (NOT sitepackages OR error)
- 	MESSAGE(FATAL_ERROR "Failed to find Python's site-packages directory" ${sitepackages} ${error})
---- mucous/CMakeLists.txt	2008-09-22 11:49:33.000000000 +0300
-+++ mucous/CMakeLists.txt.1	2009-09-01 12:04:55.000000000 +0300
-@@ -28,7 +28,7 @@
-   ${PYMUCOUS_FILES}
- )
- 
--EXECUTE_PROCESS(COMMAND python -c "import sys; import os; print os.path.join('lib', 'python' + str(sys.version_info[0]) + '.' + str(sys.version_info[1]), 'site-packages')" museek OUTPUT_VARIABLE sitepackages OUTPUT_STRIP_TRAILING_WHITESPACE ERROR_VARIABLE error)
-+EXECUTE_PROCESS(COMMAND python -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1,0,'')" museek OUTPUT_VARIABLE sitepackages OUTPUT_STRIP_TRAILING_WHITESPACE ERROR_VARIABLE error)
- 
- if (NOT sitepackages OR error)
- 	MESSAGE(FATAL_ERROR "Failed to find Python's site-packages directory" ${sitepackages} ${error})
---- python-bindings/CMakeLists.txt	2008-09-22 11:49:33.000000000 +0300
-+++ python-bindings/CMakeLists.txt.1	2009-09-01 12:04:15.000000000 +0300
-@@ -18,7 +18,7 @@
- museek/driver.py
- )
- 
--EXECUTE_PROCESS(COMMAND python -c "import sys; import os; print os.path.join('lib', 'python' + str(sys.version_info[0]) + '.' + str(sys.version_info[1]), 'site-packages')" museek OUTPUT_VARIABLE sitepackages OUTPUT_STRIP_TRAILING_WHITESPACE ERROR_VARIABLE error)
-+EXECUTE_PROCESS(COMMAND python -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1,0,'')" museek OUTPUT_VARIABLE sitepackages OUTPUT_STRIP_TRAILING_WHITESPACE ERROR_VARIABLE error)
- 
- if (NOT sitepackages OR error)
- 	MESSAGE(FATAL_ERROR "Failed to find Python's site-packages directory" ${sitepackages} ${error})
---- Mucipher/PyMucipher/CMakeLists.txt	2008-10-07 19:58:27.000000000 +0300
-+++ Mucipher/PyMucipher/CMakeLists.txt.1	2009-09-01 12:05:46.000000000 +0300
-@@ -37,7 +37,7 @@
-   ${CMAKE_CURRENT_BINARY_DIR}/mucipherc.py
-   ${CMAKE_CURRENT_BINARY_DIR}/_mucipherc.so
- )
--EXECUTE_PROCESS(COMMAND python -c "import sys; import os; print os.path.join('lib', 'python' + str(sys.version_info[0]) + '.' + str(sys.version_info[1]), 'site-packages')" museek OUTPUT_VARIABLE sitepackages OUTPUT_STRIP_TRAILING_WHITESPACE ERROR_VARIABLE error)
-+EXECUTE_PROCESS(COMMAND python -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1,0,'')" museek OUTPUT_VARIABLE sitepackages OUTPUT_STRIP_TRAILING_WHITESPACE ERROR_VARIABLE error)
- 
- if (NOT sitepackages OR error)
- 	MESSAGE(FATAL_ERROR "Failed to find Python's site-packages directory" ${sitepackages} ${error})
diff --git a/network/museek+/rc.museekd b/network/museek+/rc.museekd
deleted file mode 100644
index 8c74eb95ab..0000000000
--- a/network/museek+/rc.museekd
+++ /dev/null
@@ -1,105 +0,0 @@
-#!/bin/sh
-#
-# This shell script takes care of starting and stopping museekd.
-
-MUSEEKD=/usr/bin/museekd
-MUSETUP=/usr/bin/musetup
-MUSCAN=/usr/bin/muscan
-MUSOCKET=/tmp/museekd.root
-PIDFILE=/var/run/museekd.pid
-DBDIR=/var/museek
-CONFIG=$DBDIR/museekd.xml
-CHOWNSOCKET=YES
-
-case "$1" in
-  start)
-	if [ ! -d $DBDIR ]; then 
-		mkdir $DBDIR
-	fi	
-	if [ ! -f $CONFIG ]; then
-		echo -n "Starting Museek Setup"
-		echo
-		if [ ! -d $DBDIR ]; then 
-			mkdir $DBDIR
-		fi
-		$MUSETUP $CONFIG
-		echo
-	fi
-	if [ -f $PIDFILE ]; then
-		echo -n "Museek Daemon already running (or zombie pid file in /var/run/)"
-		echo
-		exit
-	fi
-	echo -n "Starting Museek Daemon"
-	$MUSEEKD -c $CONFIG &>/dev/null &
-	PID="$!"
-	sleep 2
-	if kill -0 $PID # pid check
-	then 
- 		if [ $CHOWNSOCKET = YES  ];
- 		then 
-			if [ -e $MUSOCKET ]; then chmod 666 $MUSOCKET
-			# access the museekd socket from other users, may be a security risk on multiuser systems
-			fi
-		fi
-		echo $PID > $PIDFILE
-		echo
-	else
-		echo -n "Museekd isn't starting up properly. Check your Config file, \nor run 'museekd -c /var/museek/museekd.xml' for verbose messages."
-		echo
-	fi
-	;;
-  stop)
-	echo -n "Stopping Museek Daemon"
-	echo
-	if [ -f $PIDFILE ]; then
-		kill -15 $(cat $PIDFILE)  &>/dev/null
-		rm $PIDFILE
-	else
-		echo -n "Museek Daemon not running"
-		echo
-		exit
-	fi
-	;;
-  reconnect)
-	if [ -f $PIDFILE ]; then
-		echo -n "Attempting to reconnect Museekd to the Server" 
-		kill -ALRM $(cat $PIDFILE)  &>/dev/null
-		echo
-	fi
-  	;;
-  restart)
-	$0 stop
-	sleep 3
-	$0 start
-	;;
-  rescan)
-	echo -n "Starting Muscan, rescanning shared files" 
-	echo
-	$MUSCAN -c $CONFIG -r -v
-	echo
-	$0 reload
-	;;
-  setup)
-	echo -n "Starting Museek Setup"
-	echo
-	if [ ! -d $DBDIR ]; then 
-		mkdir $DBDIR
-	fi
-	$MUSETUP $CONFIG
-	echo
-	;;
-  reload)
-	if [ -f $PIDFILE ]; then
-		echo -n "Reloading Museek Daemon to update Shares" 
-		kill -HUP $(cat $PIDFILE)
-		echo
-	else
-		echo -n "Museek Daemon not running, can't reload shares"
-		echo
-	fi
-	;;
-  *)
-    echo "usage: $0 {start|stop|restart|rescan|reconnect|setup|reload}"  
-    echo -n
-esac
diff --git a/network/museek+/slack-desc b/network/museek+/slack-desc
deleted file mode 100644
index 58f0d98ace..0000000000
--- a/network/museek+/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------------------------------------------------------|
-museek+: museek+ (file-sharing application)
-museek+:
-museek+: Museek+ is a file-sharing application for the Soulseek p2p network,
-museek+: written in C++. It's an enhanced version of Hyriand's original Museek
-museek+: (http://museek.thegraveyard.org). It supports chat, transferring
-museek+: files, searching, user-management, sharing, banlists, interests
-museek+: and more.  Museek+ consists of museekd (daemon), muscan (shares
-museek+: scanning tool), muscand (automated shares scanning tool), musetup
-museek+: (command-line configuration script), musetup-gtk (PyGTK configuration
-museek+: app), museeq (QT GUI client), mucous (curses python client),
-museek+: museekcontrol (command-line python client) and murmur (PyGTK client).
diff --git a/network/mysecureshell/README b/network/mysecureshell/README
index 43e5369b35..4c0ccbda7b 100644
--- a/network/mysecureshell/README
+++ b/network/mysecureshell/README
@@ -1,9 +1,9 @@
 MySecureShell (sftp server based on OpenSSH's internal sftp-server)
 
-MySecureShell is a replacement for the OpenSSH sftp-server subsystem that
-offers advanced features such as jailing, group-based access controls,
-and up/download limits.  The configuration file is easy to read and
-resembles apache/ProFTPd.
+MySecureShell is a replacement for the OpenSSH sftp-server subsystem
+that offers advanced features such as jailing, group-based access
+controls, and up/download limits. The configuration file is easy to
+read and resembles apache/ProFTPd.
 
 After installing the package, add the following to your sshd_config,
 commenting out the previous sftp entry if there was one:
@@ -11,4 +11,3 @@ commenting out the previous sftp entry if there was one:
 Subsystem sftp /bin/MySecureShell -c sftp-server
 
 and restart sshd (/etc/rc.d/rc.sshd restart)
-
diff --git a/network/mysecureshell/mysecureshell.SlackBuild b/network/mysecureshell/mysecureshell.SlackBuild
index b846c9dcd4..2522481c94 100644
--- a/network/mysecureshell/mysecureshell.SlackBuild
+++ b/network/mysecureshell/mysecureshell.SlackBuild
@@ -1,32 +1,42 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for MySecureShell
 
 # Written by adaptr <jeroen@adaptr.nl>
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=mysecureshell
 VERSION=${VERSION:-1.25}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 ## The source has an underscore
 SRCNAME=$PRGNAM\_$VERSION
 
 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"
@@ -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/network/mysecureshell/mysecureshell.info b/network/mysecureshell/mysecureshell.info
index 7112264535..cef3380479 100644
--- a/network/mysecureshell/mysecureshell.info
+++ b/network/mysecureshell/mysecureshell.info
@@ -6,5 +6,5 @@ MD5SUM="f612d96c9ff3e99806c3c076acef0946"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="adaptr"
-EMAIL="jeroen@adaptr.nl"
+MAINTAINER="Matteo Bernardini"
+EMAIL="ponce@slackbuilds.org"
diff --git a/network/nagios/README b/network/nagios/README
index f08b8b64c3..950695f0ca 100644
--- a/network/nagios/README
+++ b/network/nagios/README
@@ -1,6 +1,6 @@
-Nagios is a powerful monitoring system that enables organizations to identify
-and resolve IT infrastructure problems before they affect critical business
-processes.
+Nagios is a powerful monitoring system that enables organizations to
+identify and resolve IT infrastructure problems before they affect
+critical business processes.
 
 For some functions (most notably the "map" function), you need to have X
 installed on your server. You do not have to start X though, nagios just
@@ -9,7 +9,8 @@ needs some of the libraries and fonts.
 For a useful setup, you will want to have monitoring-plugins installed
 (nagios-plugins is also an option, but make sure to edit resource.cfg).
 
-Check the included 'README.SLACKWARE' file for additional setup instructions.
+Check the included 'README.SLACKWARE' file for additional setup
+instructions.
 
 Lots of information is available in the included documentation, and even
 more can be found on the nagios site and wiki <http://wiki.nagios.org>.
diff --git a/network/nagios/default-init.in.diff b/network/nagios/default-init.in.diff
new file mode 100644
index 0000000000..f1b3bf8373
--- /dev/null
+++ b/network/nagios/default-init.in.diff
@@ -0,0 +1,13 @@
+--- nagios-4.4.6/startup/default-init.in.orig	2020-04-28 22:48:29.000000000 +0200
++++ nagios-4.4.6/startup/default-init.in	2021-07-31 23:32:21.895857400 +0200
+@@ -180,6 +180,10 @@
+ 
+ 		check_config
+ 
++		NagiosRunDir=`dirname $NagiosRunFile`
++		mkdir -p $NagiosRunDir
++		chown $NagiosUser:$NagiosGroup $NagiosRunDir
++
+ 		if test -f $NagiosRunFile; then
+ 			NagiosPID=`head -n 1 $NagiosRunFile`
+ 			if status_nagios; then
diff --git a/network/nagios/nagios.SlackBuild b/network/nagios/nagios.SlackBuild
index d19ea44f60..1a607c99db 100644
--- a/network/nagios/nagios.SlackBuild
+++ b/network/nagios/nagios.SlackBuild
@@ -1,9 +1,9 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for nagios
 
 # Copyright 2009-2013 Niels Horn, Rio de Janeiro, RJ, Brazil
-# Copyright 2014, 2015, 2016, 2017  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
@@ -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
-VERSION=${VERSION:-4.3.4}
+VERSION=${VERSION:-4.4.6}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -44,7 +47,14 @@ for i in $(echo $DOCROOT | tr "/" " "); do
   RELPATH="${RELPATH}../"
 done
 
-CWD=$(pwd)
+# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
+# the name of the created package would be, and then exit. This information
+# could be useful to other scripts.
+if [ ! -z "${PRINT_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,7 +115,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 {} \;
 
-CFLAGS="$SLKCFLAGS" \
+# Fix /var/run usage
+patch -p1 <$CWD/default-init.in.diff
+
+CFLAGS="$SLKCFLAGS -w -Wl,--allow-multiple-definition" \
   ./configure \
   --prefix=/usr \
   --sbindir=/usr/sbin/$PRGNAM \
@@ -119,6 +132,7 @@ CFLAGS="$SLKCFLAGS" \
   --with-httpd-conf=/etc/httpd/extra \
   --with-checkresult-dir=/var/spool/$PRGNAM \
   --with-init-dir=/etc/rc.d \
+  --with-init-type=sysv \
   --with-lockfile=/var/run/nagios/nagios.lock
 
 make all
@@ -161,25 +175,29 @@ chmod -R g-w,o-rx $PKG/etc/$PRGNAM
 mkdir -p $PKG/var/run/nagios
 
 # Change init script and leave it -x
+mv $PKG/etc/init.d $PKG/etc/rc.d
 mv $PKG/etc/rc.d/$PRGNAM $PKG/etc/rc.d/rc.$PRGNAM.new
 chmod -x $PKG/etc/rc.d/rc.$PRGNAM.new
 
 # Move documentation to right location
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
-  Changelog INSTALLING LEGAL LICENSE README THANKS UPGRADING contrib \
-    $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a CONTRIBUTING.md Changelog INSTALLING LEGAL LICENSE README.md \
+  THANKS UPGRADING contrib $PKG/usr/doc/$PRGNAM-$VERSION
 mv $PKG/$DOCROOT/$PRGNAM/docs $PKG/usr/doc/$PRGNAM-$VERSION/html
 find $PKG/usr/doc/$PRGNAM-$VERSION -type f -exec chmod 644 {} \;
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 cat $CWD/README.SLACKWARE > $PKG/usr/doc/$PRGNAM-$VERSION/README.SLACKWARE
 
+# Move cgi files to their place
+mkdir -p $PKG/usr/sbin/$PRGNAM
+mv $PKG/usr/sbin/*.cgi $PKG/usr/sbin/$PRGNAM/
+
 # Fixup some ownership and permission issues
 chown root:root $PKG/usr/sbin
 chown -R root:nagios $PKG/usr/sbin/$PRGNAM
 chmod -R 0754 $PKG/usr/sbin/$PRGNAM
 chown root:root $PKG/usr/bin
-chmod 0755 $PKG/usr/bin
+chmod 0755 $PKG/usr/{,s}bin
 chown root:nagios $PKG/usr/bin/*
 chmod 0754 $PKG/usr/bin/*
 chown nagios:nagios $PKG/var/run/$PRGNAM
@@ -190,4 +208,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/network/nagios/nagios.info b/network/nagios/nagios.info
index d1a7bcbd3a..ccd88f61a4 100644
--- a/network/nagios/nagios.info
+++ b/network/nagios/nagios.info
@@ -1,8 +1,8 @@
 PRGNAM="nagios"
-VERSION="4.3.4"
+VERSION="4.4.6"
 HOMEPAGE="https://www.nagios.org/"
-DOWNLOAD="https://downloads.sourceforge.net/nagios/nagios-4.3.4.tar.gz"
-MD5SUM="e2229f9a98c2577d51576daf19713e4d"
+DOWNLOAD="https://downloads.sourceforge.net/nagios/nagios-4.4.6.tar.gz"
+MD5SUM="ba849e9487e13859381eb117127bfee2"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/network/nagiosgraph/nagiosgraph.SlackBuild b/network/nagiosgraph/nagiosgraph.SlackBuild
index 07b1c469a7..02c320a83f 100644
--- a/network/nagiosgraph/nagiosgraph.SlackBuild
+++ b/network/nagiosgraph/nagiosgraph.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for nagiosgraph
 
@@ -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=nagiosgraph
 VERSION=${VERSION:-1.5.2}
 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}
@@ -89,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-noarch-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/network/naim/naim.SlackBuild b/network/naim/naim.SlackBuild
index a46f07f17a..fa846a7cdb 100644
--- a/network/naim/naim.SlackBuild
+++ b/network/naim/naim.SlackBuild
@@ -1,28 +1,38 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for naim
 # Written by Nai (bluedbs@gmail.com)
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=naim
 VERSION=${VERSION:-0.11.8.3.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"
@@ -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/network/nbd/nbd.SlackBuild b/network/nbd/nbd.SlackBuild
index 8029af0994..9ecb5d019a 100644
--- a/network/nbd/nbd.SlackBuild
+++ b/network/nbd/nbd.SlackBuild
@@ -1,9 +1,9 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for NBD (Network Block Device)
 
 # Previously maintained by Stu Miller <slackbuilds@go4it2day.com>
-# Maintained 2013-2019 by Christoph Willing, Brisbane Australia
+# Maintained 2013-2022 by Christoph Willing, Brisbane Australia
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are
@@ -31,10 +31,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=nbd
-VERSION=${VERSION:-3.19}
+VERSION=${VERSION:-3.24}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -44,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}
@@ -111,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/network/nbd/nbd.info b/network/nbd/nbd.info
index bddd105ef2..dbd8a708c6 100644
--- a/network/nbd/nbd.info
+++ b/network/nbd/nbd.info
@@ -1,8 +1,8 @@
 PRGNAM="nbd"
-VERSION="3.19"
+VERSION="3.24"
 HOMEPAGE="https://nbd.sourceforge.io/"
-DOWNLOAD="https://downloads.sourceforge.net/nbd/nbd-3.19.tar.xz"
-MD5SUM="162da84302abb5b9be06143c7943a642"
+DOWNLOAD="https://downloads.sourceforge.net/nbd/nbd-3.24.tar.xz"
+MD5SUM="a6d9e7bbc311a2ed07ef84a58b82b5dd"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/network/nbtscan/nbtscan.SlackBuild b/network/nbtscan/nbtscan.SlackBuild
index f16951335b..8993b678d0 100644
--- a/network/nbtscan/nbtscan.SlackBuild
+++ b/network/nbtscan/nbtscan.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for nbtscan
 
-# Copyright 2013 - Fernando Giannasi - S�o Paulo - Brasil
+# Copyright 2013 - Fernando Giannasi - São Paulo - Brasil
 # 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=nbtscan
 VERSION=${VERSION:-1.0.35}
 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,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/network/nbtscan/nbtscan.info b/network/nbtscan/nbtscan.info
index 0762abefa4..7b7f1276e8 100644
--- a/network/nbtscan/nbtscan.info
+++ b/network/nbtscan/nbtscan.info
@@ -6,5 +6,5 @@ MD5SUM="ec21e504d27acb2a0f049c7421ace462"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Fernando Giannasi"
-EMAIL="phoemur@gmail.com"
+MAINTAINER="Michael Edie"
+EMAIL="michael@sawbox.net"
diff --git a/network/nbwmon/nbwmon.SlackBuild b/network/nbwmon/nbwmon.SlackBuild
index 49808a3ea5..fc1b6be8df 100644
--- a/network/nbwmon/nbwmon.SlackBuild
+++ b/network/nbwmon/nbwmon.SlackBuild
@@ -1,10 +1,10 @@
-#!/bin/sh
+#!/bin/bash
 # Generated by Alien's SlackBuild Toolkit: http://slackware.com/~alien/AST
 # Copyright 2009, 2010, 2011, 2012, 2013, 2014  Eric Hameleers, Eindhoven, Netherlands
 
 # Slackware build script for nbwmon
 
-# Copyright 2015 Aaditya Bagga <aaditya_gnulinux@zoho.com>>
+# Copyright 2015 Aaditya <aaditya_gnulinux@zoho.com>>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,20 +24,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=nbwmon
 VERSION=${VERSION:-0.5.2}
 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}
@@ -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/network/nbwmon/nbwmon.info b/network/nbwmon/nbwmon.info
index d5e5d46a79..e8afeaa521 100644
--- a/network/nbwmon/nbwmon.info
+++ b/network/nbwmon/nbwmon.info
@@ -1,10 +1,10 @@
 PRGNAM="nbwmon"
 VERSION="0.5.2"
 HOMEPAGE="https://github.com/causes-/nbwmon"
-DOWNLOAD="https://github.com/causes-/nbwmon/archive/0.5.2.tar.gz"
+DOWNLOAD="https://github.com/causes-/nbwmon/archive/0.5.2/nbwmon-0.5.2.tar.gz"
 MD5SUM="d337ba71c670823e5878fa87c94d9c4d"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Aaditya Bagga"
+MAINTAINER="Aaditya"
 EMAIL="aaditya_gnulinux@zoho.com"
diff --git a/network/ncp/README b/network/ncp/README
new file mode 100644
index 0000000000..44ea9d5e9d
--- /dev/null
+++ b/network/ncp/README
@@ -0,0 +1,16 @@
+ncp (fast file copy tool for LANs)
+
+"ncp" is a utility for copying files in a LAN. It has absolutely no
+security or integrity checking, no throttling, no features, except
+one: you don't have to type the coordinates of your peer.
+
+Basically it works like this:
+
+ 1. You and your buddy want to play Quake.
+ 2. Your buddy has a level that you don't have.
+ 3. He types "npush filename" and waits. npush sends out UDP
+    announcement packets proclaiming that someone wants to send
+    something.
+ 4. You type "npoll". npoll waits until it sees one of these packets.
+ 5. The files are copied with tar over a TCP socket, so permissions
+    and file dates (and if you are root, owners) are preserved.
diff --git a/network/ncp/README.upstream b/network/ncp/README.upstream
new file mode 100644
index 0000000000..d25d9b1c2d
--- /dev/null
+++ b/network/ncp/README.upstream
@@ -0,0 +1,54 @@
+                      ncp - a fast file copy tool for LANs
+
+(Note: This is from 2000 and has not been touched since. I still use it on a
+daily basis)
+
+Download it from http://dl.fefe.de/ncp-1.2.4.tar.bz2 [pgp sig]! The current
+version is 1.2.4. Recent changes: switch to libowfat
+
+Good news: I got an email from Ripclaw from Rock Linux who told me that they are
+going to integrate ncp.
+
+Please note that on recent IPv6 implementations, link-local addresses are not
+valid without specifying an interface, so you can't npoll with a link-local
+address on the command line. Standard npush/npoll now works with link-local
+addresses, though. Due to Linux 2.4.0test brokenness, you currently can't npoll
+from the same machine that runs npush.
+
+Since ncp is based on libdjb, it features full IPv6 support and the DNS resolver
+is built in, i.e. no more security problems because of lame libc functions.
+
+I also provide a statically linked x86 Linux binary [sig] compressed with upx
+which only weighs in at ~20k. I shrunk the binary with diet libc.
+
+npush will now use IPv6 and IPv4 multicast on the multicast groups
+ff02::6e63:7030 (6e63:7030 == 'ncp0') and 224.110.99.112 (110.99.112 == 'ncp').
+If both methods fail, npush will resort to the broadcast packets used by
+previous versions. You can force the broadcast method by passing "-b" to npush
+so that previous npoll versions can see the announcements.
+
+"ncp" is a utility for copying files in a LAN. It has absolutely no security or
+integrity checking, no throttling, no features, except one: you don't have to
+type the coordinates of your peer.
+
+Please note that the DNS resolver does not use /etc/hosts (as that would not
+work with IPv6 anyway), so you should have a properly configured DNS server.
+
+Basically it works like this:
+ 1. You and your buddy want to play Quake
+ 2. Your buddy has a level that you don't have
+ 3. He types npush filename and waits. npush sends out UDP announcement packets
+    proclaiming that someone wants to send something
+ 4. You type npoll. npoll waits until it sees one of these packets
+ 5. The files are copied with tar over a TCP socket, so permissions and file
+    dates (and if you are root, owners) are preserved.
+
+There are other usage modes. You can also use it like this:
+
+  peer1$ ncp
+                           peer2$ ncp peer1 file1 file2 file3
+
+or like this:
+
+  peer1$ npush file1
+                           peer2$ npoll peer1
diff --git a/network/ncp/ncp.SlackBuild b/network/ncp/ncp.SlackBuild
new file mode 100644
index 0000000000..4f18477fee
--- /dev/null
+++ b/network/ncp/ncp.SlackBuild
@@ -0,0 +1,95 @@
+#!/bin/bash
+
+# Slackware build script for ncp
+
+# Written by B. Watson (urchlay@slackware.uk)
+
+# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
+
+# 20230706 bkw: BUILD=4, someone updated libowfat and broke my build.
+# 20230103 bkw: BUILD=3, how did I miss broken symlinks?
+# 20220207 bkw: BUILD=2, libowfat changed its dir structure.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=ncp
+VERSION=${VERSION:-1.2.4}
+BUILD=${BUILD:-4}
+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}
+
+# 20220207 bkw: libowfat doesn't use standard lib or lib64 in its dir,
+# which is annoying.
+L=/opt/diet/lib-i386
+
+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
+  L=/opt/diet/lib-x86_64
+  SLKCFLAGS="-O2 -fPIC"
+else
+  # this will fail, would someone who uses arm or aarch64 please add
+  # them here?
+  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 .
+chmod 644 *
+
+# We want symlinks, not hardlinks.
+sed -i 's,ln -f,ln -s,' GNUmakefile
+
+# The libowfat detection stuff needs a little help...
+
+INC="-I/opt/diet/include/libowfat -I/opt/diet/include"
+make PREFIX=/usr CFLAGS="$SLKCFLAGS -Wl,-s $INC -L$L"
+make install PREFIX=$PKG/usr
+gzip $PKG/usr/man/man1/*.1
+ln -s npush.1.gz $PKG/usr/man/man1/npoll.1.gz
+
+# 20230103 bkw: grrr. no DESTDIR support in the Makefile, so we get
+# broken symlinks.
+rm -f $PKG/usr/bin/{npush,npoll}
+ln -s ncp $PKG/usr/bin/npush
+ln -s ncp $PKG/usr/bin/npoll
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a NEWS $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+# Upstream doesn't include a README with the source, so here's the web page
+# rendered as text (with links).
+cat $CWD/README.upstream > $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/network/ncp/ncp.info b/network/ncp/ncp.info
new file mode 100644
index 0000000000..cce23cfaed
--- /dev/null
+++ b/network/ncp/ncp.info
@@ -0,0 +1,10 @@
+PRGNAM="ncp"
+VERSION="1.2.4"
+HOMEPAGE="https://www.fefe.de/ncp/"
+DOWNLOAD="https://dl.fefe.de/ncp-1.2.4.tar.bz2"
+MD5SUM="421c4855bd3148b7d0a4342942b4bf13"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="libowfat"
+MAINTAINER="B. Watson"
+EMAIL="urchlay@slackware.uk"
diff --git a/network/ncp/slack-desc b/network/ncp/slack-desc
new file mode 100644
index 0000000000..4895444571
--- /dev/null
+++ b/network/ncp/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+   |-----handy-ruler------------------------------------------------------|
+ncp: ncp (fast file copy tool for LANs)
+ncp:
+ncp: "ncp" is a utility for copying files in a LAN. It has absolutely no
+ncp: security or integrity checking, no throttling, no features, except
+ncp: one: you don't have to type the coordinates of your peer.
+ncp:
+ncp:
+ncp:
+ncp:
+ncp:
+ncp:
diff --git a/network/ncrack/README b/network/ncrack/README
index 25c21e81f7..8678b315ca 100644
--- a/network/ncrack/README
+++ b/network/ncrack/README
@@ -1,15 +1,15 @@
-Ncrack is a high-speed network authentication cracking tool.
-It was built to help companies secure their networks by proactively
-testing all their hosts and networking devices for poor passwords.
-Security professionals also rely on Ncrack when auditing their clients.
-Ncrack was designed using a modular approach, a command-line syntax
-similar to Nmap and a dynamic engine that can adapt its behaviour based
+Ncrack is a high-speed network authentication cracking tool. It was
+built to help companies secure their networks by proactively testing
+all their hosts and networking devices for poor passwords. Security
+professionals also rely on Ncrack when auditing their clients. Ncrack
+was designed using a modular approach, a command-line syntax similar
+to Nmap and a dynamic engine that can adapt its behaviour based
 on network feedback. It allows for rapid, yet reliable large-scale
 auditing of multiple hosts.
 
 Ncrack's features include a very flexible interface granting the user
 full control of network operations, allowing for very sophisticated
 bruteforcing attacks, timing templates for ease of use, runtime
-interaction similar to Nmap's and many more. Protocols supported include
-RDP, SSH, HTTP(S), SMB, POP3(S), VNC, FTP, SIP, Redis, PostgreSQL, MySQL,
-and Telnet. 
+interaction similar to Nmap's and many more. Protocols supported
+include RDP, SSH, HTTP(S), SMB, POP3(S), VNC, FTP, SIP, Redis,
+PostgreSQL, MySQL, and Telnet.
diff --git a/network/ncrack/ncrack.SlackBuild b/network/ncrack/ncrack.SlackBuild
index e7fa0d50de..e65deaaa95 100644
--- a/network/ncrack/ncrack.SlackBuild
+++ b/network/ncrack/ncrack.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for ncrack
 
@@ -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=ncrack
-VERSION=${VERSION:-0.6}
-SRCVER=${VERSION}.0
+VERSION=${VERSION:-0.7}
 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-$SRCVER
+rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-cd $PRGNAM-$SRCVER
+cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -70,8 +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 {} \;
 
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
+CFLAGS="$SLKCFLAGS -std=gnu11 -fcommon" \
+CXXFLAGS="$SLKCFLAGS -fpermissive" \
 ./configure \
   --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
@@ -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/network/ncrack/ncrack.info b/network/ncrack/ncrack.info
index 7448777c83..ebb67cfbed 100644
--- a/network/ncrack/ncrack.info
+++ b/network/ncrack/ncrack.info
@@ -1,8 +1,8 @@
 PRGNAM="ncrack"
-VERSION="0.6"
+VERSION="0.7"
 HOMEPAGE="https://nmap.org/ncrack/"
-DOWNLOAD="https://nmap.org/ncrack/dist/ncrack-0.6.tar.gz"
-MD5SUM="bde92d8b16949432c7e8b04614314e85"
+DOWNLOAD="https://nmap.org/ncrack/dist/ncrack-0.7.tar.gz"
+MD5SUM="a6417241c994d8687dcfef1f40ac3f34"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/network/neomutt/README b/network/neomutt/README
index 6da5020cbc..bb806f5098 100644
--- a/network/neomutt/README
+++ b/network/neomutt/README
@@ -6,13 +6,12 @@ for selecting groups of messages.
 
 Optional dependencies:
 
-* lua53 or lua52 - Powerful, fast, light-weight, embeddable scripting language
 * notmuch - fast mail indexer for maildir
-* kyotocabinet - straightforward implementation of DBM
-* libidn2 - GNU IDN Library version 2
+* lua53 - Powerful, fast, light-weight, embeddable scripting language
+  NOTE: this won't work if you have multiple versions of lua installed.
 
 This script builds neomutt without optional support
-for notmuch, lua and kyotocabinet.
+for idn2, notmuch, lua and kyotocabinet.
 You can be enabled with:
 
-# USENOTMUCH=yes USELUA=yes USEKYOTO=yes USEIDN2:-yes ./neomutt.SlackBuild
+# USENOTMUCH=yes USELUA=yes ./neomutt.SlackBuild
diff --git a/network/neomutt/doinst.sh b/network/neomutt/doinst.sh
index 32e580cced..ab5c5595b5 100644
--- a/network/neomutt/doinst.sh
+++ b/network/neomutt/doinst.sh
@@ -14,3 +14,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 -t -f -q usr/share/icons/hicolor >/dev/null 2>&1
+  fi
+fi
+
diff --git a/network/neomutt/neomutt.SlackBuild b/network/neomutt/neomutt.SlackBuild
index 67f0738f64..51d1f52858 100644
--- a/network/neomutt/neomutt.SlackBuild
+++ b/network/neomutt/neomutt.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 #
 # Slackware build script for neomutt
 #
-# Copyright 2016-2018 Corrado Franco (http://conraid.net)
+# Copyright 2016-2022 Corrado Franco (https://corradofranco.it)
 # All rights reserved.
 #
 # This program is free software: you can redistribute it and/or modify
@@ -25,22 +25,30 @@
 #
 # Latest version of this SlackBuild at https://github.com/conraid/SlackBuilds
 
-set -eu
+cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=neomutt
-VERSION=${VERSION:-20180716}
+VERSION=${VERSION:-20240329}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z ${ARCH:=""} ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i686 ;;
+    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}
@@ -60,17 +68,16 @@ else
 fi
 
 [ ${USELUA:-no} == 'yes' ] && LUA="--lua" || LUA=""
-[ ${USEKYOTO:-no} == 'yes' ] && KYOTO="--kyotocabinet" || KYOTO=""
 [ ${USENOTMUCH:-no} == 'yes' ] && NOTMUCH="--notmuch" || NOTMUCH=""
-[ ${USEIDN2:-no} == 'yes' ] && IDN2="--idn2 --disable-idn" || IDN2=""
+
+set -eu
 
 rm -rf $PKG
 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
-cd $PRGNAM-$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 \
@@ -94,9 +101,14 @@ CXXFLAGS="$SLKCFLAGS" \
   --gdbm \
   --gpgme \
   --locales-fix \
+  --sqlite \
+  --full-doc \
+  --idn2 \
+  --autocrypt \
+  --lmdb  \
   --host=$ARCH-slackware-linux \
   --build=$ARCH-slackware-linux \
-  $LUA $NOTMUCH $KYOTO $IDN2
+  $NOTMUCH $LUA
 
 make
 make DESTDIR=$PKG install
@@ -110,6 +122,12 @@ 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
 
+# install desktop file and icons
+install -Dm644 $CWD/files/$PRGNAM.desktop $PKG/usr/share/applications/$PRGNAM.desktop
+for i in 32 64 128 256; do
+  install -Dm644 data/logo/$PRGNAM-$i.png $PKG/usr/share/icons/hicolor/${i}x${i}/apps/$PRGNAM.png
+done
+
 # Rename conf files
 mv $PKG/etc/$PRGNAM/neomuttrc $PKG/etc/$PRGNAM/neomuttrc.new
 
@@ -120,8 +138,6 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
-install -Dm644 $CWD/files/$PRGNAM.desktop $PKG/usr/share/applications/$PRGNAM.desktop
-install -Dm644 contrib/logo/$PRGNAM.svg $PKG/usr/share/pixmaps/$PRGNAM.svg
-
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
+
diff --git a/network/neomutt/neomutt.info b/network/neomutt/neomutt.info
index af4825ea8a..fab43ad595 100644
--- a/network/neomutt/neomutt.info
+++ b/network/neomutt/neomutt.info
@@ -1,8 +1,8 @@
 PRGNAM="neomutt"
-VERSION="20180716"
+VERSION="20240329"
 HOMEPAGE="https://github.com/neomutt/neomutt"
-DOWNLOAD="https://github.com/neomutt/neomutt/archive/neomutt-20180716.tar.gz"
-MD5SUM="f628d1bcb31d36c926ed60f2105f742a"
+DOWNLOAD="https://github.com/neomutt/neomutt/archive/20240329/neomutt-20240329.tar.gz"
+MD5SUM="3ea5e0b732ecff28a2105041602e6222"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/network/nessus/README b/network/nessus/README
new file mode 100644
index 0000000000..6833489890
--- /dev/null
+++ b/network/nessus/README
@@ -0,0 +1,7 @@
+Nessus Vulnerability Scanner
+
+Nessus Professional, the industry's most widely deployed vulnerability
+assessment solution helps you reduce your organization's attack surface
+and ensure compliance. Nessus features high-speed asset discovery,
+configuration auditing, target profiling, malware detection, sensitive
+data discovery, and more.
diff --git a/network/nessus/doinst.sh b/network/nessus/doinst.sh
new file mode 100644
index 0000000000..d27a6df2c1
--- /dev/null
+++ b/network/nessus/doinst.sh
@@ -0,0 +1,43 @@
+#!/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...
+}
+
+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
+}
+
+if [ -e /etc/rc.d/rc.nessusd ]; then
+  chroot . sh /etc/rc.d/rc.nessusd status > /dev/null 2>&1
+  RETVAL=$?
+  if [ "$RETVAL" == "0" ]; then
+    chroot . sh /etc/rc.d/rc.nessusd stop > /dev/null 2>&1
+  fi
+fi
+
+preserve_perms etc/rc.d/rc.nessusd.new
+
+echo ""
+echo "Unpacking Nessus Core Components..."
+chroot . /opt/nessus/sbin/nessuscli install /opt/nessus/var/nessus/plugins-core.tar.gz
+
+echo " - You can start Nessus by typing sh /etc/rc.d/rc.nessusd start"
+echo " - Then go to https://"`hostname`":8834/ to configure your scanner"
+echo ""
diff --git a/network/nessus/nessus.SlackBuild b/network/nessus/nessus.SlackBuild
new file mode 100644
index 0000000000..780603c7f3
--- /dev/null
+++ b/network/nessus/nessus.SlackBuild
@@ -0,0 +1,89 @@
+#!/bin/bash
+
+# Slackware build script for Tenable(TM) Nessus Vulnerability Scanner
+
+# Copyright 2019-2024 Giuseppe Di Terlizzi <giuseppe.diterlizzi@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=nessus
+VERSION=${VERSION:-10.7.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 [ "$ARCH" != "x86_64" ]; then
+  echo "Unsupported platform"
+  exit 1
+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
+cd $PKG
+
+rpm2cpio $CWD/Nessus-$VERSION-*.rpm | cpio --extract --make-directories --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 \
+ \( -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/rc.d
+
+# Remove SystemD and Firewalld rules
+rm -rf $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/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+cat $CWD/rc.nessusd > $PKG/etc/rc.d/rc.nessusd.new
+
+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/network/nessus/nessus.info b/network/nessus/nessus.info
new file mode 100644
index 0000000000..aabe4b852c
--- /dev/null
+++ b/network/nessus/nessus.info
@@ -0,0 +1,10 @@
+PRGNAM="nessus"
+VERSION="10.7.0"
+HOMEPAGE="https://www.tenable.com/products/nessus"
+DOWNLOAD="UNSUPPORTED"
+MD5SUM=""
+DOWNLOAD_x86_64="https://www.tenable.com/downloads/api/v2/pages/nessus/files/Nessus-10.7.0-el7.x86_64.rpm"
+MD5SUM_x86_64="618234819d2fc39c49890abb595c87e8"
+REQUIRES=""
+MAINTAINER="Giuseppe Di Terlizzi"
+EMAIL="giuseppe.diterlizzi@gmail.com"
diff --git a/network/nessus/rc.nessusd b/network/nessus/rc.nessusd
new file mode 100644
index 0000000000..a4a9c47376
--- /dev/null
+++ b/network/nessus/rc.nessusd
@@ -0,0 +1,112 @@
+#!/bin/sh
+
+# Tenable(TM) Nessus Scanner Start & Stop script
+#
+
+# Source function library.
+if [ -f /etc/init.d/functions ] ; then
+  . /etc/init.d/functions
+else
+  exit 0
+fi
+
+# Load nessusd environment
+[ -f /etc/sysconfig/nessusd ] && . /etc/sysconfig/nessusd
+
+# Avoid using root's TMPDIR
+unset TMPDIR
+
+test -x /opt/nessus/sbin/nessus-service || {
+  echo "Nessus not properly installed"
+  exit 1
+}
+
+RETVAL=0
+
+NESSUS_PID_FILE="/opt/nessus/var/nessus/nessus-service.pid"
+NESSUS_NAME="Nessus"
+
+start() {
+
+  echo -n $"Starting Nessus services: "
+  
+  /opt/nessus/sbin/nessus-service -q -D
+  RETVAL=$?
+
+  if [ "$RETVAL" == "0" ]; then
+    success
+  else
+    failure
+  fi
+
+  echo
+  return 0
+
+}
+
+stop() {
+
+  echo -n $"Shutting down Nessus services: "
+
+  test -f "$NESSUS_PID_FILE" && kill `cat /opt/nessus/var/nessus/nessus-service.pid`
+  RETVAL=$?
+  
+  sleep 4
+  
+  if [ "$RETVAL" == "0" ]; then
+    success
+  else
+    failure
+  fi
+  
+  echo
+  return 0
+
+}
+
+restart() {
+  stop
+  start
+}
+
+status() {
+
+  if [ -f "$NESSUS_PID_FILE" ]; then
+
+    exp_pid=$(cat $NESSUS_PID_FILE)
+    pid_dir="/proc/$exp_pid"
+    
+    if [ -d "$pid_dir" ]; then
+      if [ "$(cat ${pid_dir}/stat | awk '{print $2}' | tr -d '()')" == "nessus-service" ]; then
+        echo "$NESSUS_NAME is running"
+        return 0
+      fi
+    fi
+
+  fi
+
+  echo "$NESSUS_NAME is not running"
+  return 3
+
+}
+
+
+case "$1" in
+  start)
+    start
+    ;;
+  status)
+    status 
+    ;;
+  stop)
+    stop
+    ;;
+  restart)
+    restart
+    ;;
+  *)
+    echo $"Usage: $0 {start|stop|restart|status}"
+    exit 1
+esac
+
+exit $?
diff --git a/network/nessus/slack-desc b/network/nessus/slack-desc
new file mode 100644
index 0000000000..f89856a44a
--- /dev/null
+++ b/network/nessus/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+      |-----handy-ruler------------------------------------------------------|
+nessus: nessus (Nessus Vulnerability Scanner)
+nessus:
+nessus: Nessus Professional, the industry's most widely deployed
+nessus: vulnerability assessment solution helps you reduce your
+nessus: organization's attack surface and ensure compliance. Nessus features
+nessus: high-speed asset discovery, configuration auditing, target profiling,
+nessus: malware detection, sensitive data discovery, and more.
+nessus:
+nessus:
+nessus: Homepage: https://www.tenable.com/products/nessus
+nessus:
diff --git a/network/netcat-openbsd/README b/network/netcat-openbsd/README
index 9431a830ae..09b5adca4e 100644
--- a/network/netcat-openbsd/README
+++ b/network/netcat-openbsd/README
@@ -1,16 +1,16 @@
-Netcat is a featured networking utility which reads and writes data across 
-network connections, using the TCP/IP protocol.
+Netcat is a simple Unix utility which reads and writes data across
+network connections, using the TCP or UDP protocol.
 
-It is designed to be a reliable "back-end" tool that can be used directly
-or easily driven by other programs and scripts. At the same time, it is a
-feature-rich network debugging and exploration tool, since it can create
-almost any kind of connection you would need and has several interesting
-built-in capabilities.
+It is designed to be a reliable "back-end" tool that can be used
+directly or easily driven by other programs and scripts. At the same
+time, it is a feature-rich network debugging and exploration tool, since
+it can create almost any kind of connection you would need and has
+several interesting built-in capabilities.
 
-This package contains the OpenBSD rewrite of netcat, including support 
-for IPv6, proxies, and Unix sockets.  The installed binary is named
-"nc.openbsd" and the manpage is as well.
+This package contains the OpenBSD rewrite of netcat, with Debian and
+other patches, including support for IPv6, proxies, and Unix sockets.
+The installed binary is named "nc.openbsd" and the manpage is as well.
 
-BTW, this package conflicts with the netcat in slackware as it creates
-a symbolic link /usr/bin/nc (to let libvirt stuff work correctly), so
+BTW, this package conflicts with the netcat in slackware as it creates a
+symbolic link /usr/bin/nc (to let libvirt stuff work correctly), so
 remove netcat (nc) from your system before building/installing this.
diff --git a/network/netcat-openbsd/netcat-openbsd.SlackBuild b/network/netcat-openbsd/netcat-openbsd.SlackBuild
index c807a163db..eb0218d7ea 100644
--- a/network/netcat-openbsd/netcat-openbsd.SlackBuild
+++ b/network/netcat-openbsd/netcat-openbsd.SlackBuild
@@ -1,7 +1,9 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for netcat-openbsd
 #
+# Copyright 2020 Duncan Roe, Melbourne, Australia
+# Copyright 2020 Donald Cooley, South Haven, Indiana USA
 # Copyright 2010, 2014 Slax-Dude <jmfl {at} sapo [dot] pt>
 # All rights reserved.
 #
@@ -22,28 +24,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=netcat-openbsd
-VERSION=${VERSION:-1.105}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-7.4_1}
+SRCVER=$(echo $VERSION | tr _ -)
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
-
-DEBVER=7
+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,9 +79,9 @@ 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
+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 \) \
@@ -78,10 +89,7 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-# Apply Debian patches
-for i in $CWD/patches/* ; do patch -p1 < $i ; done
-
-make CFLAGS="$SLKCFLAGS -DDEBIAN_VERSION=\"\\\"$DEBVER\\\"\""
+make
 
 mkdir -p $PKG/usr/bin/ $PKG/usr/man/man1/
 install -s -m 0755 nc $PKG/usr/bin/nc.openbsd
@@ -90,9 +98,10 @@ gzip -9c nc.1 > $PKG/usr/man/man1/nc.openbsd.1.gz
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+cp -a changelog copyright README* $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/network/netcat-openbsd/netcat-openbsd.info b/network/netcat-openbsd/netcat-openbsd.info
index dc9b850460..d28e0d33d7 100644
--- a/network/netcat-openbsd/netcat-openbsd.info
+++ b/network/netcat-openbsd/netcat-openbsd.info
@@ -1,10 +1,10 @@
 PRGNAM="netcat-openbsd"
-VERSION="1.105"
-HOMEPAGE="http://packages.debian.org/sid/netcat-openbsd"
-DOWNLOAD="http://ponce.cc/slackware/sources/repo/netcat-openbsd_1.105.orig.tar.gz"
-MD5SUM="7e67b22f1ad41a1b7effbb59ff28fca1"
+VERSION="7.4_1"
+HOMEPAGE="https://github.com/duncan-roe/netcat-openbsd"
+DOWNLOAD="https://github.com/duncan-roe/netcat-openbsd/archive/refs/tags/7.4-1/netcat-openbsd-7.4-1.tar.gz"
+MD5SUM="f38105e0185390273075177379e6273d"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="%README% libbsd"
-MAINTAINER="Slax-Dude"
-EMAIL="jmfl@sapo.pt"
+MAINTAINER="Duncan Roe"
+EMAIL="duncan_roe@optusnet.com.au"
diff --git a/network/netcat-openbsd/patches/0001-port-to-linux-with-libsd.patch b/network/netcat-openbsd/patches/0001-port-to-linux-with-libsd.patch
deleted file mode 100644
index 08567c7986..0000000000
--- a/network/netcat-openbsd/patches/0001-port-to-linux-with-libsd.patch
+++ /dev/null
@@ -1,475 +0,0 @@
-From: Aron Xu <aron@debian.org>
-Date: Mon, 13 Feb 2012 15:59:31 +0800
-Subject: port to linux with libsd
-
----
- Makefile |   17 ++++++++--
- nc.1     |    4 +--
- netcat.c |  105 +++++++++++++++++++++++++++++++++++++++++++++++++++++---------
- socks.c  |   46 +++++++++++++--------------
- 4 files changed, 130 insertions(+), 42 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 150f829..96a6587 100644
---- a/Makefile
-+++ b/Makefile
-@@ -1,6 +1,19 @@
--#	$OpenBSD: Makefile,v 1.6 2001/09/02 18:45:41 jakob Exp $
-+#       $OpenBSD: Makefile,v 1.6 2001/09/02 18:45:41 jakob Exp $
- 
- PROG=	nc
- SRCS=	netcat.c atomicio.c socks.c
- 
--.include <bsd.prog.mk>
-+LIBS=  `pkg-config --libs libbsd` -lresolv
-+OBJS=  $(SRCS:.c=.o)
-+CFLAGS=  -g -O2
-+LDFLAGS=  -Wl,--no-add-needed
-+
-+all: nc
-+nc: $(OBJS)
-+	$(CC) $(CFLAGS) $(LDFLAGS) $(OBJS) $(LIBS) -o nc
-+
-+$(OBJS): %.o: %.c
-+	$(CC) $(CFLAGS) -c $< -o $@
-+
-+clean:
-+	rm -f $(OBJS) nc
-diff --git a/nc.1 b/nc.1
-index 75d1437..b7014a2 100644
---- a/nc.1
-+++ b/nc.1
-@@ -146,9 +146,6 @@ Proxy authentication is only supported for HTTP CONNECT proxies at present.
- Specifies the source port
- .Nm
- should use, subject to privilege restrictions and availability.
--It is an error to use this option in conjunction with the
--.Fl l
--option.
- .It Fl r
- Specifies that source and/or destination ports should be chosen randomly
- instead of sequentially within a range or in the order that the system
-@@ -170,6 +167,7 @@ Change IPv4 TOS value.
- may be one of
- .Ar critical ,
- .Ar inetcontrol ,
-+.Ar lowcost ,
- .Ar lowdelay ,
- .Ar netcontrol ,
- .Ar throughput ,
-diff --git a/netcat.c b/netcat.c
-index cc4683a..9b2def2 100644
---- a/netcat.c
-+++ b/netcat.c
-@@ -42,6 +42,46 @@
- #include <netinet/ip.h>
- #include <arpa/telnet.h>
- 
-+#ifndef IPTOS_LOWDELAY
-+# define IPTOS_LOWDELAY 0x10
-+# define IPTOS_THROUGHPUT 0x08
-+# define IPTOS_RELIABILITY 0x04
-+# define IPTOS_LOWCOST 0x02
-+# define IPTOS_MINCOST IPTOS_LOWCOST
-+#endif /* IPTOS_LOWDELAY */
-+
-+# ifndef IPTOS_DSCP_AF11
-+# define	IPTOS_DSCP_AF11		0x28
-+# define	IPTOS_DSCP_AF12		0x30
-+# define	IPTOS_DSCP_AF13		0x38
-+# define	IPTOS_DSCP_AF21		0x48
-+# define	IPTOS_DSCP_AF22		0x50
-+# define	IPTOS_DSCP_AF23		0x58
-+# define	IPTOS_DSCP_AF31		0x68
-+# define	IPTOS_DSCP_AF32		0x70
-+# define	IPTOS_DSCP_AF33		0x78
-+# define	IPTOS_DSCP_AF41		0x88
-+# define	IPTOS_DSCP_AF42		0x90
-+# define	IPTOS_DSCP_AF43		0x98
-+# define	IPTOS_DSCP_EF		0xb8
-+#endif /* IPTOS_DSCP_AF11 */
-+
-+#ifndef IPTOS_DSCP_CS0
-+# define	IPTOS_DSCP_CS0		0x00
-+# define	IPTOS_DSCP_CS1		0x20
-+# define	IPTOS_DSCP_CS2		0x40
-+# define	IPTOS_DSCP_CS3		0x60
-+# define	IPTOS_DSCP_CS4		0x80
-+# define	IPTOS_DSCP_CS5		0xa0
-+# define	IPTOS_DSCP_CS6		0xc0
-+# define	IPTOS_DSCP_CS7		0xe0
-+#endif /* IPTOS_DSCP_CS0 */
-+
-+#ifndef IPTOS_DSCP_EF
-+# define	IPTOS_DSCP_EF		0xb8
-+#endif /* IPTOS_DSCP_EF */
-+
-+
- #include <err.h>
- #include <errno.h>
- #include <netdb.h>
-@@ -53,6 +93,8 @@
- #include <unistd.h>
- #include <fcntl.h>
- #include <limits.h>
-+#include <bsd/stdlib.h>
-+#include <bsd/string.h>
- #include "atomicio.h"
- 
- #ifndef SUN_LEN
-@@ -118,7 +160,7 @@ main(int argc, char *argv[])
- 	struct servent *sv;
- 	socklen_t len;
- 	struct sockaddr_storage cliaddr;
--	char *proxy;
-+	char *proxy = NULL;
- 	const char *errstr, *proxyhost = "", *proxyport = NULL;
- 	struct addrinfo proxyhints;
- 	char unix_dg_tmp_socket_buf[UNIX_DG_TMP_SOCKET_SIZE];
-@@ -164,7 +206,11 @@ main(int argc, char *argv[])
- 				errx(1, "interval %s: %s", errstr, optarg);
- 			break;
- 		case 'j':
-+# if defined(SO_JUMBO)
- 			jflag = 1;
-+# else
-+			errx(1, "no jumbo frame support available");
-+# endif
- 			break;
- 		case 'k':
- 			kflag = 1;
-@@ -194,10 +240,14 @@ main(int argc, char *argv[])
- 			uflag = 1;
- 			break;
- 		case 'V':
-+# if defined(RT_TABLEID_MAX)
- 			rtableid = (unsigned int)strtonum(optarg, 0,
- 			    RT_TABLEID_MAX, &errstr);
- 			if (errstr)
- 				errx(1, "rtable %s: %s", errstr, optarg);
-+# else
-+			errx(1, "no alternate routing table support available");
-+# endif
- 			break;
- 		case 'v':
- 			vflag = 1;
-@@ -232,7 +282,11 @@ main(int argc, char *argv[])
- 				    errstr, optarg);
- 			break;
- 		case 'S':
-+# if defined(TCP_MD5SIG)
- 			Sflag = 1;
-+# else
-+			errx(1, "no TCP MD5 signature support available");
-+# endif
- 			break;
- 		case 'T':
- 			errstr = NULL;
-@@ -259,6 +313,15 @@ main(int argc, char *argv[])
- 	if (argv[0] && !argv[1] && family == AF_UNIX) {
- 		host = argv[0];
- 		uport = NULL;
-+	} else if (!argv[0] && lflag) {
-+		if (sflag)
-+			errx(1, "cannot use -s and -l");
-+		if (zflag)
-+			errx(1, "cannot use -z and -l");
-+		if (pflag)
-+			uport=pflag;
-+	} else if (!lflag && kflag) {
-+		errx(1, "cannot use -k without -l");
- 	} else if (argv[0] && !argv[1]) {
- 		if  (!lflag)
- 			usage(1);
-@@ -270,14 +333,7 @@ main(int argc, char *argv[])
- 	} else
- 		usage(1);
- 
--	if (lflag && sflag)
--		errx(1, "cannot use -s and -l");
--	if (lflag && pflag)
--		errx(1, "cannot use -p and -l");
--	if (lflag && zflag)
--		errx(1, "cannot use -z and -l");
--	if (!lflag && kflag)
--		errx(1, "must use -l with -k");
-+
- 
- 	/* Get name of temporary socket for unix datagram client */
- 	if ((family == AF_UNIX) && uflag && !lflag) {
-@@ -286,8 +342,8 @@ main(int argc, char *argv[])
- 		} else {
- 			strlcpy(unix_dg_tmp_socket_buf, "/tmp/nc.XXXXXXXXXX",
- 				UNIX_DG_TMP_SOCKET_SIZE);
--			if (mktemp(unix_dg_tmp_socket_buf) == NULL)
--				err(1, "mktemp");
-+			if (mkstemp(unix_dg_tmp_socket_buf) == -1)
-+				err(1, "mkstemp");
- 			unix_dg_tmp_socket = unix_dg_tmp_socket_buf;
- 		}
- 	}
-@@ -563,18 +619,22 @@ remote_connect(const char *host, const char *port, struct addrinfo hints)
- 		    res0->ai_protocol)) < 0)
- 			continue;
- 
-+# if defined(RT_TABLEID_MAX)
- 		if (rtableid) {
- 			if (setsockopt(s, SOL_SOCKET, SO_RTABLE, &rtableid,
- 			    sizeof(rtableid)) == -1)
- 				err(1, "setsockopt SO_RTABLE");
- 		}
-+# endif
- 
- 		/* Bind to a local port or source address if specified. */
- 		if (sflag || pflag) {
- 			struct addrinfo ahints, *ares;
- 
-+# if defined (SO_BINDANY)
- 			/* try SO_BINDANY, but don't insist */
- 			setsockopt(s, SOL_SOCKET, SO_BINDANY, &on, sizeof(on));
-+# endif
- 			memset(&ahints, 0, sizeof(struct addrinfo));
- 			ahints.ai_family = res0->ai_family;
- 			ahints.ai_socktype = uflag ? SOCK_DGRAM : SOCK_STREAM;
-@@ -674,15 +734,23 @@ local_listen(char *host, char *port, struct addrinfo hints)
- 		    res0->ai_protocol)) < 0)
- 			continue;
- 
-+# if defined(RT_TABLEID_MAX)
- 		if (rtableid) {
- 			if (setsockopt(s, IPPROTO_IP, SO_RTABLE, &rtableid,
- 			    sizeof(rtableid)) == -1)
- 				err(1, "setsockopt SO_RTABLE");
- 		}
-+# endif
-+
-+		ret = setsockopt(s, SOL_SOCKET, SO_REUSEADDR, &x, sizeof(x));
-+		if (ret == -1)
-+			err(1, NULL);
- 
-+# if defined(SO_REUSEPORT)
- 		ret = setsockopt(s, SOL_SOCKET, SO_REUSEPORT, &x, sizeof(x));
- 		if (ret == -1)
- 			err(1, NULL);
-+# endif
- 
- 		set_common_sockopts(s);
- 
-@@ -886,21 +954,25 @@ set_common_sockopts(int s)
- {
- 	int x = 1;
- 
-+# if defined(TCP_MD5SIG)
- 	if (Sflag) {
- 		if (setsockopt(s, IPPROTO_TCP, TCP_MD5SIG,
- 			&x, sizeof(x)) == -1)
- 			err(1, NULL);
- 	}
-+# endif
- 	if (Dflag) {
- 		if (setsockopt(s, SOL_SOCKET, SO_DEBUG,
- 			&x, sizeof(x)) == -1)
- 			err(1, NULL);
- 	}
-+# if defined(SO_JUMBO)
- 	if (jflag) {
- 		if (setsockopt(s, SOL_SOCKET, SO_JUMBO,
- 			&x, sizeof(x)) == -1)
- 			err(1, NULL);
- 	}
-+# endif
- 	if (Tflag != -1) {
- 		if (setsockopt(s, IPPROTO_IP, IP_TOS,
- 		    &Tflag, sizeof(Tflag)) == -1)
-@@ -949,6 +1021,7 @@ map_tos(char *s, int *val)
- 		{ "cs7",		IPTOS_DSCP_CS7 },
- 		{ "ef",			IPTOS_DSCP_EF },
- 		{ "inetcontrol",	IPTOS_PREC_INTERNETCONTROL },
-+		{ "lowcost",		IPTOS_LOWCOST },
- 		{ "lowdelay",		IPTOS_LOWDELAY },
- 		{ "netcontrol",		IPTOS_PREC_NETCONTROL },
- 		{ "reliability",	IPTOS_RELIABILITY },
-@@ -969,6 +1042,9 @@ map_tos(char *s, int *val)
- void
- help(void)
- {
-+# if defined(DEBIAN_VERSION)
-+        fprintf(stderr, "OpenBSD netcat (Debian patchlevel " DEBIAN_VERSION ")\n");
-+# endif
- 	usage(0);
- 	fprintf(stderr, "\tCommand Summary:\n\
- 	\t-4		Use IPv4\n\
-@@ -978,6 +1054,7 @@ help(void)
- 	\t-h		This help text\n\
- 	\t-I length	TCP receive buffer length\n\
- 	\t-i secs\t	Delay interval for lines sent, ports scanned\n\
-+	\t-j		Use jumbo frame\n\
- 	\t-k		Keep inbound sockets open for multiple connects\n\
- 	\t-l		Listen mode, for inbound connects\n\
- 	\t-n		Suppress name/port resolutions\n\
-@@ -998,15 +1075,15 @@ help(void)
- 	\t-x addr[:port]\tSpecify proxy address and port\n\
- 	\t-z		Zero-I/O mode [used for scanning]\n\
- 	Port numbers can be individual or ranges: lo-hi [inclusive]\n");
--	exit(1);
-+	exit(0);
- }
- 
- void
- usage(int ret)
- {
- 	fprintf(stderr,
--	    "usage: nc [-46DdhklnrStUuvz] [-I length] [-i interval] [-O length]\n"
--	    "\t  [-P proxy_username] [-p source_port] [-s source] [-T ToS]\n"
-+	    "usage: nc [-46DdhjklnrStUuvz] [-I length] [-i interval] [-O length]\n"
-+	    "\t  [-P proxy_username] [-p source_port] [-s source] [-T toskeyword]\n"
- 	    "\t  [-V rtable] [-w timeout] [-X proxy_protocol]\n"
- 	    "\t  [-x proxy_address[:port]] [destination] [port]\n");
- 	if (ret)
-diff --git a/socks.c b/socks.c
-index 71108d5..befd0a9 100644
---- a/socks.c
-+++ b/socks.c
-@@ -38,7 +38,7 @@
- #include <string.h>
- #include <unistd.h>
- #include <resolv.h>
--#include <readpassphrase.h>
-+#include <bsd/readpassphrase.h>
- #include "atomicio.h"
- 
- #define SOCKS_PORT	"1080"
-@@ -167,11 +167,11 @@ socks_connect(const char *host, const char *port,
- 		buf[2] = SOCKS_NOAUTH;
- 		cnt = atomicio(vwrite, proxyfd, buf, 3);
- 		if (cnt != 3)
--			err(1, "write failed (%zu/3)", cnt);
-+			err(1, "write failed (%zu/3)", (size_t)cnt);
- 
- 		cnt = atomicio(read, proxyfd, buf, 2);
- 		if (cnt != 2)
--			err(1, "read failed (%zu/3)", cnt);
-+			err(1, "read failed (%zu/3)", (size_t)cnt);
- 
- 		if (buf[1] == SOCKS_NOMETHOD)
- 			errx(1, "authentication method negotiation failed");
-@@ -220,23 +220,23 @@ socks_connect(const char *host, const char *port,
- 
- 		cnt = atomicio(vwrite, proxyfd, buf, wlen);
- 		if (cnt != wlen)
--			err(1, "write failed (%zu/%zu)", cnt, wlen);
-+			err(1, "write failed (%zu/%zu)", (size_t)cnt, (size_t)wlen);
- 
- 		cnt = atomicio(read, proxyfd, buf, 4);
- 		if (cnt != 4)
--			err(1, "read failed (%zu/4)", cnt);
-+			err(1, "read failed (%zu/4)", (size_t)cnt);
- 		if (buf[1] != 0)
- 			errx(1, "connection failed, SOCKS error %d", buf[1]);
- 		switch (buf[3]) {
- 		case SOCKS_IPV4:
- 			cnt = atomicio(read, proxyfd, buf + 4, 6);
- 			if (cnt != 6)
--				err(1, "read failed (%d/6)", cnt);
-+				err(1, "read failed (%lu/6)", (unsigned long)cnt);
- 			break;
- 		case SOCKS_IPV6:
- 			cnt = atomicio(read, proxyfd, buf + 4, 18);
- 			if (cnt != 18)
--				err(1, "read failed (%d/18)", cnt);
-+				err(1, "read failed (%lu/18)", (unsigned long)cnt);
- 			break;
- 		default:
- 			errx(1, "connection failed, unsupported address type");
-@@ -256,11 +256,11 @@ socks_connect(const char *host, const char *port,
- 
- 		cnt = atomicio(vwrite, proxyfd, buf, wlen);
- 		if (cnt != wlen)
--			err(1, "write failed (%zu/%zu)", cnt, wlen);
-+			err(1, "write failed (%zu/%zu)", (size_t)cnt, (size_t)wlen);
- 
- 		cnt = atomicio(read, proxyfd, buf, 8);
- 		if (cnt != 8)
--			err(1, "read failed (%zu/8)", cnt);
-+			err(1, "read failed (%zu/8)", (size_t)cnt);
- 		if (buf[1] != 90)
- 			errx(1, "connection failed, SOCKS error %d", buf[1]);
- 	} else if (socksv == -1) {
-@@ -272,39 +272,39 @@ socks_connect(const char *host, const char *port,
- 
- 		/* Try to be sane about numeric IPv6 addresses */
- 		if (strchr(host, ':') != NULL) {
--			r = snprintf(buf, sizeof(buf),
-+			r = snprintf((char*)buf, sizeof(buf),
- 			    "CONNECT [%s]:%d HTTP/1.0\r\n",
- 			    host, ntohs(serverport));
- 		} else {
--			r = snprintf(buf, sizeof(buf),
-+			r = snprintf((char*)buf, sizeof(buf),
- 			    "CONNECT %s:%d HTTP/1.0\r\n",
- 			    host, ntohs(serverport));
- 		}
- 		if (r == -1 || (size_t)r >= sizeof(buf))
- 			errx(1, "hostname too long");
--		r = strlen(buf);
-+		r = strlen((char*)buf);
- 
- 		cnt = atomicio(vwrite, proxyfd, buf, r);
- 		if (cnt != r)
--			err(1, "write failed (%zu/%d)", cnt, r);
-+			err(1, "write failed (%zu/%d)", (size_t)cnt, (int)r);
- 
- 		if (authretry > 1) {
- 			char resp[1024];
- 
- 			proxypass = getproxypass(proxyuser, proxyhost);
--			r = snprintf(buf, sizeof(buf), "%s:%s",
-+			r = snprintf((char*)buf, sizeof(buf), "%s:%s",
- 			    proxyuser, proxypass);
- 			if (r == -1 || (size_t)r >= sizeof(buf) ||
--			    b64_ntop(buf, strlen(buf), resp,
-+			    b64_ntop(buf, strlen((char*)buf), resp,
- 			    sizeof(resp)) == -1)
- 				errx(1, "Proxy username/password too long");
--			r = snprintf(buf, sizeof(buf), "Proxy-Authorization: "
-+			r = snprintf((char*)buf, sizeof((char*)buf), "Proxy-Authorization: "
- 			    "Basic %s\r\n", resp);
- 			if (r == -1 || (size_t)r >= sizeof(buf))
- 				errx(1, "Proxy auth response too long");
--			r = strlen(buf);
-+			r = strlen((char*)buf);
- 			if ((cnt = atomicio(vwrite, proxyfd, buf, r)) != r)
--				err(1, "write failed (%zu/%d)", cnt, r);
-+				err(1, "write failed (%zu/%d)", (size_t)cnt, r);
- 		}
- 
- 		/* Terminate headers */
-@@ -312,22 +312,22 @@ socks_connect(const char *host, const char *port,
- 			err(1, "write failed (2/%d)", r);
- 
- 		/* Read status reply */
--		proxy_read_line(proxyfd, buf, sizeof(buf));
-+		proxy_read_line(proxyfd, (char*)buf, sizeof(buf));
- 		if (proxyuser != NULL &&
--		    strncmp(buf, "HTTP/1.0 407 ", 12) == 0) {
-+		    strncmp((char*)buf, "HTTP/1.0 407 ", 12) == 0) {
- 			if (authretry > 1) {
- 				fprintf(stderr, "Proxy authentication "
- 				    "failed\n");
- 			}
- 			close(proxyfd);
- 			goto again;
--		} else if (strncmp(buf, "HTTP/1.0 200 ", 12) != 0 &&
--		    strncmp(buf, "HTTP/1.1 200 ", 12) != 0)
-+		} else if (strncmp((char*)buf, "HTTP/1.0 200 ", 12) != 0 &&
-+		    strncmp((char*)buf, "HTTP/1.1 200 ", 12) != 0)
- 			errx(1, "Proxy error: \"%s\"", buf);
- 
- 		/* Headers continue until we hit an empty line */
- 		for (r = 0; r < HTTP_MAXHDRS; r++) {
--			proxy_read_line(proxyfd, buf, sizeof(buf));
-+			proxy_read_line(proxyfd, (char*)buf, sizeof(buf));
- 			if (*buf == '\0')
- 				break;
- 		}
--- 
diff --git a/network/netcat-openbsd/patches/0002-connect-timeout.patch b/network/netcat-openbsd/patches/0002-connect-timeout.patch
deleted file mode 100644
index 30d1d550e1..0000000000
--- a/network/netcat-openbsd/patches/0002-connect-timeout.patch
+++ /dev/null
@@ -1,121 +0,0 @@
-From: Aron Xu <aron@debian.org>
-Date: Mon, 13 Feb 2012 14:43:56 +0800
-Subject: connect timeout
-
----
- netcat.c |   77 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
- 1 file changed, 75 insertions(+), 2 deletions(-)
-
-diff --git a/netcat.c b/netcat.c
-index 9b2def2..f3cc8c1 100644
---- a/netcat.c
-+++ b/netcat.c
-@@ -106,6 +106,10 @@
- #define PORT_MAX_LEN	6
- #define UNIX_DG_TMP_SOCKET_SIZE	19
- 
-+#define CONNECTION_SUCCESS 0
-+#define CONNECTION_FAILED 1
-+#define CONNECTION_TIMEOUT 2
-+
- /* Command Line Options */
- int	dflag;					/* detached, no stdin */
- unsigned int iflag;				/* Interval Flag */
-@@ -151,6 +155,9 @@ void	set_common_sockopts(int);
- int	map_tos(char *, int *);
- void	usage(int);
- 
-+static int connect_with_timeout(int fd, const struct sockaddr *sa,
-+        socklen_t salen, int ctimeout);
-+
- int
- main(int argc, char *argv[])
- {
-@@ -651,11 +658,14 @@ remote_connect(const char *host, const char *port, struct addrinfo hints)
- 
- 		set_common_sockopts(s);
- 
--		if (timeout_connect(s, res0->ai_addr, res0->ai_addrlen) == 0)
-+                if ((error = connect_with_timeout(s, res0->ai_addr, res0->ai_addrlen, timeout))== CONNECTION_SUCCESS)
- 			break;
--		else if (vflag)
-+		else if (vflag && error == CONNECTION_FAILED)
- 			warn("connect to %s port %s (%s) failed", host, port,
- 			    uflag ? "udp" : "tcp");
-+                else if (vflag && error == CONNECTION_TIMEOUT)
-+                    warn("connect to %s port %s (%s) timed out", host, port,
-+                            uflag ? "udp" : "tcp");
- 
- 		close(s);
- 		s = -1;
-@@ -703,6 +713,69 @@ timeout_connect(int s, const struct sockaddr *name, socklen_t namelen)
- 	return (ret);
- }
- 
-+static int connect_with_timeout(int fd, const struct sockaddr *sa,
-+		                socklen_t salen, int ctimeout)
-+{
-+	int err;
-+	struct timeval tv, *tvp = NULL;
-+	fd_set connect_fdset;
-+	socklen_t len;
-+	int orig_flags;
-+
-+	orig_flags = fcntl(fd, F_GETFL, 0);
-+	if (fcntl(fd, F_SETFL, orig_flags | O_NONBLOCK) < 0 ) {
-+		warn("can't set O_NONBLOCK - timeout not available");
-+		if (connect(fd, sa, salen) == 0)
-+			return CONNECTION_SUCCESS;
-+		else
-+			return CONNECTION_FAILED;
-+	}
-+
-+	/* set connect timeout */
-+	if (ctimeout > 0) {
-+		tv.tv_sec = (time_t)ctimeout/1000;
-+		tv.tv_usec = 0;
-+		tvp = &tv;
-+	}
-+
-+	/* attempt the connection */
-+	err = connect(fd, sa, salen);
-+	if (err != 0 && errno == EINPROGRESS) {
-+		/* connection is proceeding
-+		 * it is complete (or failed) when select returns */
-+
-+		/* initialize connect_fdset */
-+		FD_ZERO(&connect_fdset);
-+		FD_SET(fd, &connect_fdset);
-+
-+		/* call select */
-+		do {
-+			err = select(fd + 1, NULL, &connect_fdset,
-+				     NULL, tvp);
-+		} while (err < 0 && errno == EINTR);
-+
-+		/* select error */
-+		if (err < 0)
-+			errx(1,"select error: %s", strerror(errno));
-+		/* we have reached a timeout */
-+		if (err == 0)
-+			return CONNECTION_TIMEOUT;
-+		/* select returned successfully, but we must test socket
-+		 * error for result */
-+		len = sizeof(err);
-+		if (getsockopt(fd, SOL_SOCKET, SO_ERROR, &err, &len) < 0)
-+			errx(1, "getsockopt error: %s", strerror(errno));
-+		/* setup errno according to the result returned by
-+		 * getsockopt */
-+		if (err != 0)
-+			errno = err;
-+	}
-+
-+	/* return aborted if an error occured, and valid otherwise */
-+	fcntl(fd, F_SETFL, orig_flags);
-+	return (err != 0)? CONNECTION_FAILED : CONNECTION_SUCCESS;
-+}
-+
- /*
-  * local_listen()
-  * Returns a socket listening on a local port, binds to specified source
--- 
diff --git a/network/netcat-openbsd/patches/0003-get-sev-by-name.patch b/network/netcat-openbsd/patches/0003-get-sev-by-name.patch
deleted file mode 100644
index 1d1cca8a46..0000000000
--- a/network/netcat-openbsd/patches/0003-get-sev-by-name.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From: Aron Xu <aron@debian.org>
-Date: Mon, 13 Feb 2012 14:45:08 +0800
-Subject: get sev by name
-
----
- netcat.c |    9 ++++++++-
- 1 file changed, 8 insertions(+), 1 deletion(-)
-
-diff --git a/netcat.c b/netcat.c
-index f3cc8c1..d912544 100644
---- a/netcat.c
-+++ b/netcat.c
-@@ -949,12 +949,19 @@ atelnet(int nfd, unsigned char *buf, unsigned int size)
- void
- build_ports(char *p)
- {
-+        struct servent *sv;
- 	const char *errstr;
- 	char *n;
- 	int hi, lo, cp;
- 	int x = 0;
- 
--	if ((n = strchr(p, '-')) != NULL) {
-+        sv = getservbyname(p, uflag ? "udp" : "tcp");
-+        if (sv) {
-+                portlist[0] = calloc(1, PORT_MAX_LEN);
-+                if (portlist[0] == NULL)
-+                        err(1, NULL);
-+                snprintf(portlist[0], PORT_MAX_LEN, "%d", ntohs(sv->s_port));
-+        } else if ((n = strchr(p, '-')) != NULL) {
- 		*n = '\0';
- 		n++;
- 
--- 
diff --git a/network/netcat-openbsd/patches/0004-poll-hup.patch b/network/netcat-openbsd/patches/0004-poll-hup.patch
deleted file mode 100644
index 14923cbfa2..0000000000
--- a/network/netcat-openbsd/patches/0004-poll-hup.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From: Aron Xu <aron@debian.org>
-Date: Mon, 13 Feb 2012 15:08:33 +0800
-Subject: poll hup
-
----
- netcat.c |   24 +++++++++++++++++-------
- 1 file changed, 17 insertions(+), 7 deletions(-)
-
-diff --git a/netcat.c b/netcat.c
-index d912544..fdaca44 100644
---- a/netcat.c
-+++ b/netcat.c
-@@ -884,9 +884,7 @@ readwrite(int nfd)
- 			if ((n = read(nfd, buf, plen)) < 0)
- 				return;
- 			else if (n == 0) {
--				shutdown(nfd, SHUT_RD);
--				pfd[0].fd = -1;
--				pfd[0].events = 0;
-+				goto shutdown_rd;
- 			} else {
- 				if (tflag)
- 					atelnet(nfd, buf, n);
-@@ -894,18 +892,30 @@ readwrite(int nfd)
- 					return;
- 			}
- 		}
-+		else if (pfd[0].revents & POLLHUP) {
-+		shutdown_rd:
-+			shutdown(nfd, SHUT_RD);
-+			pfd[0].fd = -1;
-+			pfd[0].events = 0;
-+		}
- 
--		if (!dflag && pfd[1].revents & POLLIN) {
-+		if (!dflag) {
-+		    if(pfd[1].revents & POLLIN) {
- 			if ((n = read(wfd, buf, plen)) < 0)
- 				return;
- 			else if (n == 0) {
--				shutdown(nfd, SHUT_WR);
--				pfd[1].fd = -1;
--				pfd[1].events = 0;
-+				goto shutdown_wr;
- 			} else {
- 				if (atomicio(vwrite, nfd, buf, n) != n)
- 					return;
- 			}
-+			}
-+			else if (pfd[1].revents & POLLHUP) {
-+			shutdown_wr:
-+				shutdown(nfd, SHUT_WR);
-+				pfd[1].fd = -1;
-+				pfd[1].events = 0;
-+			}
- 		}
- 	}
- }
--- 
diff --git a/network/netcat-openbsd/patches/0005-send-crlf.patch b/network/netcat-openbsd/patches/0005-send-crlf.patch
deleted file mode 100644
index 1a5fc6eeb8..0000000000
--- a/network/netcat-openbsd/patches/0005-send-crlf.patch
+++ /dev/null
@@ -1,108 +0,0 @@
-From: Aron Xu <aron@debian.org>
-Date: Mon, 13 Feb 2012 14:57:45 +0800
-Subject: send crlf
-
----
- nc.1     |    6 ++++--
- netcat.c |   21 +++++++++++++++++----
- 2 files changed, 21 insertions(+), 6 deletions(-)
-
-diff --git a/nc.1 b/nc.1
-index b7014a2..af44976 100644
---- a/nc.1
-+++ b/nc.1
-@@ -34,7 +34,7 @@
- .Sh SYNOPSIS
- .Nm nc
- .Bk -words
--.Op Fl 46DdhklnrStUuvz
-+.Op Fl 46CDdhklnrStUuvz
- .Op Fl I Ar length
- .Op Fl i Ar interval
- .Op Fl O Ar length
-@@ -98,6 +98,8 @@ to use IPv4 addresses only.
- Forces
- .Nm
- to use IPv6 addresses only.
-+.It Fl C
-+Send CRLF as line-ending.
- .It Fl D
- Enable debugging on the socket.
- .It Fl d
-@@ -355,7 +357,7 @@ More complicated examples can be built up when the user knows the format
- of requests required by the server.
- As another example, an email may be submitted to an SMTP server using:
- .Bd -literal -offset indent
--$ nc localhost 25 \*(Lt\*(Lt EOF
-+$ nc [\-C] localhost 25 \*(Lt\*(Lt EOF
- HELO host.example.com
- MAIL FROM:\*(Ltuser@host.example.com\*(Gt
- RCPT TO:\*(Ltuser2@host.example.com\*(Gt
-diff --git a/netcat.c b/netcat.c
-index fdaca44..4f4d2bf 100644
---- a/netcat.c
-+++ b/netcat.c
-@@ -111,6 +111,7 @@
- #define CONNECTION_TIMEOUT 2
- 
- /* Command Line Options */
-+int     Cflag = 0;                              /* CRLF line-ending */
- int	dflag;					/* detached, no stdin */
- unsigned int iflag;				/* Interval Flag */
- int	jflag;					/* use jumbo frames if we can */
-@@ -180,7 +181,7 @@ main(int argc, char *argv[])
- 	sv = NULL;
- 
- 	while ((ch = getopt(argc, argv,
--	    "46DdhI:i:jklnO:P:p:rSs:tT:UuV:vw:X:x:z")) != -1) {
-+	    "46CDdhI:i:jklnO:P:p:rSs:tT:UuV:vw:X:x:z")) != -1) {
- 		switch (ch) {
- 		case '4':
- 			family = AF_INET;
-@@ -309,6 +310,9 @@ main(int argc, char *argv[])
- 			if (Tflag < 0 || Tflag > 255 || errstr || errno)
- 				errx(1, "illegal tos value %s", optarg);
- 			break;
-+                case 'C':
-+                        Cflag = 1;
-+                        break;
- 		default:
- 			usage(1);
- 		}
-@@ -906,8 +910,16 @@ readwrite(int nfd)
- 			else if (n == 0) {
- 				goto shutdown_wr;
- 			} else {
--				if (atomicio(vwrite, nfd, buf, n) != n)
--					return;
-+				if ((Cflag) && (buf[n-1]=='\n')) {
-+					if (atomicio(vwrite, nfd, buf, n-1) != (n-1))
-+						return;
-+					if (atomicio(vwrite, nfd, "\r\n", 2) != 2)
-+						return;
-+				}
-+				else {
-+					if (atomicio(vwrite, nfd, buf, n) != n)
-+						return;
-+				}
- 			}
- 			}
- 			else if (pfd[1].revents & POLLHUP) {
-@@ -1139,6 +1151,7 @@ help(void)
- 	fprintf(stderr, "\tCommand Summary:\n\
- 	\t-4		Use IPv4\n\
- 	\t-6		Use IPv6\n\
-+	\t-C		Send CRLF as line-ending\n\
- 	\t-D		Enable the debug socket option\n\
- 	\t-d		Detach from stdin\n\
- 	\t-h		This help text\n\
-@@ -1172,7 +1185,7 @@ void
- usage(int ret)
- {
- 	fprintf(stderr,
--	    "usage: nc [-46DdhjklnrStUuvz] [-I length] [-i interval] [-O length]\n"
-+	    "usage: nc [-46CDdhjklnrStUuvz] [-I length] [-i interval] [-O length]\n"
- 	    "\t  [-P proxy_username] [-p source_port] [-s source] [-T toskeyword]\n"
- 	    "\t  [-V rtable] [-w timeout] [-X proxy_protocol]\n"
- 	    "\t  [-x proxy_address[:port]] [destination] [port]\n");
--- 
diff --git a/network/netcat-openbsd/patches/0006-quit-timer.patch b/network/netcat-openbsd/patches/0006-quit-timer.patch
deleted file mode 100644
index 40d6a2a3a5..0000000000
--- a/network/netcat-openbsd/patches/0006-quit-timer.patch
+++ /dev/null
@@ -1,133 +0,0 @@
-From: Aron Xu <aron@debian.org>
-Date: Mon, 13 Feb 2012 15:16:04 +0800
-Subject: quit timer
-
----
- nc.1     |    5 +++++
- netcat.c |   38 +++++++++++++++++++++++++++++++++-----
- 2 files changed, 38 insertions(+), 5 deletions(-)
-
-diff --git a/nc.1 b/nc.1
-index af44976..0d92b74 100644
---- a/nc.1
-+++ b/nc.1
-@@ -40,6 +40,7 @@
- .Op Fl O Ar length
- .Op Fl P Ar proxy_username
- .Op Fl p Ar source_port
-+.Op Fl q Ar seconds
- .Op Fl s Ar source
- .Op Fl T Ar toskeyword
- .Op Fl V Ar rtable
-@@ -148,6 +149,10 @@ Proxy authentication is only supported for HTTP CONNECT proxies at present.
- Specifies the source port
- .Nm
- should use, subject to privilege restrictions and availability.
-+.It Fl q Ar seconds
-+after EOF on stdin, wait the specified number of seconds and then quit. If
-+.Ar seconds
-+is negative, wait forever.
- .It Fl r
- Specifies that source and/or destination ports should be chosen randomly
- instead of sequentially within a range or in the order that the system
-diff --git a/netcat.c b/netcat.c
-index 4f4d2bf..29ecf1a 100644
---- a/netcat.c
-+++ b/netcat.c
-@@ -86,6 +86,7 @@
- #include <errno.h>
- #include <netdb.h>
- #include <poll.h>
-+#include <signal.h>
- #include <stdarg.h>
- #include <stdio.h>
- #include <stdlib.h>
-@@ -120,6 +121,7 @@ int	lflag;					/* Bind to local port */
- int	nflag;					/* Don't do name look up */
- char   *Pflag;					/* Proxy username */
- char   *pflag;					/* Localport flag */
-+int     qflag = 0;                             /* Quit after some secs */
- int	rflag;					/* Random ports flag */
- char   *sflag;					/* Source Address */
- int	tflag;					/* Telnet Emulation */
-@@ -158,6 +160,7 @@ void	usage(int);
- 
- static int connect_with_timeout(int fd, const struct sockaddr *sa,
-         socklen_t salen, int ctimeout);
-+static void quit();
- 
- int
- main(int argc, char *argv[])
-@@ -181,7 +184,7 @@ main(int argc, char *argv[])
- 	sv = NULL;
- 
- 	while ((ch = getopt(argc, argv,
--	    "46CDdhI:i:jklnO:P:p:rSs:tT:UuV:vw:X:x:z")) != -1) {
-+	    "46CDdhI:i:jklnO:P:p:q:rSs:tT:UuV:vw:X:x:z")) != -1) {
- 		switch (ch) {
- 		case '4':
- 			family = AF_INET;
-@@ -235,6 +238,11 @@ main(int argc, char *argv[])
- 		case 'p':
- 			pflag = optarg;
- 			break;
-+                case 'q':
-+			qflag = strtonum(optarg, INT_MIN, INT_MAX, &errstr);
-+			if (errstr)
-+				errx(1, "quit timer %s: %s", errstr, optarg);
-+			break;
- 		case 'r':
- 			rflag = 1;
- 			break;
-@@ -924,9 +932,18 @@ readwrite(int nfd)
- 			}
- 			else if (pfd[1].revents & POLLHUP) {
- 			shutdown_wr:
-+			/* if the user asked to exit on EOF, do it */
-+			if (qflag == 0) {
- 				shutdown(nfd, SHUT_WR);
--				pfd[1].fd = -1;
--				pfd[1].events = 0;
-+				close(wfd);
-+			}
-+			/* if user asked to die after a while, arrange for it */
-+			if (qflag > 0) {
-+				signal(SIGALRM, quit);
-+				alarm(qflag);
-+			}
-+			pfd[1].fd = -1;
-+			pfd[1].events = 0;
- 			}
- 		}
- 	}
-@@ -1164,6 +1181,7 @@ help(void)
- 	\t-O length	TCP send buffer length\n\
- 	\t-P proxyuser\tUsername for proxy authentication\n\
- 	\t-p port\t	Specify local port for remote connects\n\
-+        \t-q secs\t	quit after EOF on stdin and delay of secs\n\
- 	\t-r		Randomize remote ports\n\
- 	\t-S		Enable the TCP MD5 signature option\n\
- 	\t-s addr\t	Local source address\n\
-@@ -1186,9 +1204,19 @@ usage(int ret)
- {
- 	fprintf(stderr,
- 	    "usage: nc [-46CDdhjklnrStUuvz] [-I length] [-i interval] [-O length]\n"
--	    "\t  [-P proxy_username] [-p source_port] [-s source] [-T toskeyword]\n"
--	    "\t  [-V rtable] [-w timeout] [-X proxy_protocol]\n"
-+	    "\t  [-P proxy_username] [-p source_port] [-q seconds] [-s source]\n"
-+	    "\t  [-T toskeyword] [-V rtable] [-w timeout] [-X proxy_protocol]\n"
- 	    "\t  [-x proxy_address[:port]] [destination] [port]\n");
- 	if (ret)
- 		exit(1);
- }
-+
-+/*
-+ * quit()
-+ * handler for a "-q" timeout (exit 0 instead of 1)
-+ */
-+static void quit()
-+{
-+        /* XXX: should explicitly close fds here */
-+        exit(0);
-+}
--- 
diff --git a/network/netcat-openbsd/patches/0007-udp-scan-timeout.patch b/network/netcat-openbsd/patches/0007-udp-scan-timeout.patch
deleted file mode 100644
index c63775a495..0000000000
--- a/network/netcat-openbsd/patches/0007-udp-scan-timeout.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From: Aron Xu <aron@debian.org>
-Date: Mon, 13 Feb 2012 15:29:37 +0800
-Subject: udp scan timeout
-
----
- netcat.c |   25 ++++++++++++++++---------
- 1 file changed, 16 insertions(+), 9 deletions(-)
-
-diff --git a/netcat.c b/netcat.c
-index 29ecf1a..baab909 100644
---- a/netcat.c
-+++ b/netcat.c
-@@ -111,6 +111,8 @@
- #define CONNECTION_FAILED 1
- #define CONNECTION_TIMEOUT 2
- 
-+#define UDP_SCAN_TIMEOUT 3			/* Seconds */
-+
- /* Command Line Options */
- int     Cflag = 0;                              /* CRLF line-ending */
- int	dflag;					/* detached, no stdin */
-@@ -497,7 +499,7 @@ main(int argc, char *argv[])
- 				continue;
- 
- 			ret = 0;
--			if (vflag || zflag) {
-+			if (vflag) {
- 				/* For UDP, make sure we are connected. */
- 				if (uflag) {
- 					if (udptest(s) == -1) {
-@@ -1057,15 +1059,20 @@ build_ports(char *p)
- int
- udptest(int s)
- {
--	int i, ret;
--
--	for (i = 0; i <= 3; i++) {
--		if (write(s, "X", 1) == 1)
--			ret = 1;
--		else
--			ret = -1;
-+	int i, t;
-+
-+	if ((write(s, "X", 1) != 1) ||
-+	    ((write(s, "X", 1) != 1) && (errno == ECONNREFUSED)))
-+		return -1;
-+
-+	/* Give the remote host some time to reply. */
-+	for (i = 0, t = (timeout == -1) ? UDP_SCAN_TIMEOUT : (timeout / 1000);
-+	     i < t; i++) {
-+		sleep(1);
-+		if ((write(s, "X", 1) != 1) && (errno == ECONNREFUSED))
-+			return -1;
- 	}
--	return (ret);
-+	return 1;
- }
- 
- void
--- 
diff --git a/network/netcat-openbsd/patches/0008-verbose-numeric-port.patch b/network/netcat-openbsd/patches/0008-verbose-numeric-port.patch
deleted file mode 100644
index fa1cf991a0..0000000000
--- a/network/netcat-openbsd/patches/0008-verbose-numeric-port.patch
+++ /dev/null
@@ -1,106 +0,0 @@
-From: Aron Xu <aron@debian.org>
-Date: Mon, 13 Feb 2012 15:38:15 +0800
-Subject: verbose numeric port
-
----
- netcat.c |   59 +++++++++++++++++++++++++++++++++++++++++++++++++++++++----
- 1 file changed, 55 insertions(+), 4 deletions(-)
-
-diff --git a/netcat.c b/netcat.c
-index baab909..eb3453e 100644
---- a/netcat.c
-+++ b/netcat.c
-@@ -41,6 +41,7 @@
- #include <netinet/tcp.h>
- #include <netinet/ip.h>
- #include <arpa/telnet.h>
-+#include <arpa/inet.h>
- 
- #ifndef IPTOS_LOWDELAY
- # define IPTOS_LOWDELAY 0x10
-@@ -424,6 +425,18 @@ main(int argc, char *argv[])
- 				s = local_listen(host, uport, hints);
- 			if (s < 0)
- 				err(1, NULL);
-+
-+			char* local;
-+			if (family == AF_INET6
-+				local = "0.0.0.0";
-+			else if (family == AF_INET)
-+				local = ":::";
-+			else
-+				local = "unknown"
-+			fprintf(stderr, "Listening on [%s] (family %d, port %d)\n",
-+				host ?: local,
-+				family,
-+				*uport);
- 			/*
- 			 * For UDP, we will use recvfrom() initially
- 			 * to wait for a caller, then use the regular
-@@ -432,16 +445,15 @@ main(int argc, char *argv[])
- 			if (uflag) {
- 				int rv, plen;
- 				char buf[16384];
--				struct sockaddr_storage z;
- 
--				len = sizeof(z);
-+				len = sizeof(cliaddr);
- 				plen = jflag ? 16384 : 2048;
- 				rv = recvfrom(s, buf, plen, MSG_PEEK,
--				    (struct sockaddr *)&z, &len);
-+				    (struct sockaddr *)&cliaddr, &len);
- 				if (rv < 0)
- 					err(1, "recvfrom");
- 
--				rv = connect(s, (struct sockaddr *)&z, len);
-+				rv = connect(s, (struct sockaddr *)&cliaddr, len);
- 				if (rv < 0)
- 					err(1, "connect");
- 
-@@ -450,6 +462,45 @@ main(int argc, char *argv[])
- 				len = sizeof(cliaddr);
- 				connfd = accept(s, (struct sockaddr *)&cliaddr,
- 				    &len);
-+				if(vflag) {
-+				/* Don't look up port if -n. */
-+					if (nflag)
-+						sv = NULL;
-+					else
-+						sv = getservbyport(ntohs(atoi(uport)),
-+							uflag ? "udp" : "tcp");
-+
-+					if (((struct sockaddr *)&cliaddr)->sa_family == AF_INET) {
-+						char dst[INET_ADDRSTRLEN];
-+						inet_ntop(((struct sockaddr *)&cliaddr)->sa_family,&(((struct sockaddr_in *)&cliaddr)->sin_addr),dst,INET_ADDRSTRLEN);
-+						fprintf(stderr, "Connection from [%s] port %s [%s/%s] accepted (family %d, sport %d)\n",
-+							dst,
-+							uport,
-+							uflag ? "udp" : "tcp",
-+							sv ? sv->s_name : "*",
-+							((struct sockaddr *)(&cliaddr))->sa_family,
-+							ntohs(((struct sockaddr_in *)&cliaddr)->sin_port));
-+					}
-+					else if(((struct sockaddr *)&cliaddr)->sa_family == AF_INET6) {
-+						char dst[INET6_ADDRSTRLEN];
-+						inet_ntop(((struct sockaddr *)&cliaddr)->sa_family,&(((struct sockaddr_in6 *)&cliaddr)->sin6_addr),dst,INET6_ADDRSTRLEN);
-+						fprintf(stderr, "Connection from [%s] port %s [%s/%s] accepted (family %d, sport %d)\n",
-+							dst,
-+							uport,
-+							uflag ? "udp" : "tcp",
-+							sv ? sv->s_name : "*",
-+							((struct sockaddr *)&cliaddr)->sa_family,
-+							ntohs(((struct sockaddr_in6 *)&cliaddr)->sin6_port));
-+					}
-+					else {
-+						fprintf(stderr, "Connection from unknown port %s [%s/%s] accepted (family %d, sport %d)\n",
-+							uport,
-+							uflag ? "udp" : "tcp",
-+							sv ? sv->s_name : "*",
-+							((struct sockaddr *)(&cliaddr))->sa_family,
-+							ntohs(((struct sockaddr_in *)&cliaddr)->sin_port));
-+					}
-+				}
- 				readwrite(connfd);
- 				close(connfd);
- 			}
--- 
diff --git a/network/netcat-openbsd/patches/0009-dccp-support.patch b/network/netcat-openbsd/patches/0009-dccp-support.patch
deleted file mode 100644
index 3a81b4b5ce..0000000000
--- a/network/netcat-openbsd/patches/0009-dccp-support.patch
+++ /dev/null
@@ -1,304 +0,0 @@
-From: Aron Xu <aron@debian.org>
-Date: Mon, 13 Feb 2012 15:56:51 +0800
-Subject: dccp support
-
----
- nc.1     |    4 ++-
- netcat.c |  111 ++++++++++++++++++++++++++++++++++++++++++++++++++------------
- 2 files changed, 93 insertions(+), 22 deletions(-)
-
-diff --git a/nc.1 b/nc.1
-index 0d92b74..60e3668 100644
---- a/nc.1
-+++ b/nc.1
-@@ -34,7 +34,7 @@
- .Sh SYNOPSIS
- .Nm nc
- .Bk -words
--.Op Fl 46CDdhklnrStUuvz
-+.Op Fl 46CDdhklnrStUuvZz
- .Op Fl I Ar length
- .Op Fl i Ar interval
- .Op Fl O Ar length
-@@ -257,6 +257,8 @@ If
- .Ar port
- is not specified, the well-known port for the proxy protocol is used (1080
- for SOCKS, 3128 for HTTPS).
-+.It Fl Z
-+DCCP mode.
- .It Fl z
- Specifies that
- .Nm
-diff --git a/netcat.c b/netcat.c
-index eb3453e..56cc15e 100644
---- a/netcat.c
-+++ b/netcat.c
-@@ -129,6 +129,7 @@ int	rflag;					/* Random ports flag */
- char   *sflag;					/* Source Address */
- int	tflag;					/* Telnet Emulation */
- int	uflag;					/* UDP - Default to TCP */
-+int	dccpflag;				/* DCCP - Default to TCP */
- int	vflag;					/* Verbosity */
- int	xflag;					/* Socks proxy */
- int	zflag;					/* Port Scan Flag */
-@@ -160,6 +161,7 @@ int	unix_listen(char *);
- void	set_common_sockopts(int);
- int	map_tos(char *, int *);
- void	usage(int);
-+char    *proto_name(int uflag, int dccpflag);
- 
- static int connect_with_timeout(int fd, const struct sockaddr *sa,
-         socklen_t salen, int ctimeout);
-@@ -187,7 +189,7 @@ main(int argc, char *argv[])
- 	sv = NULL;
- 
- 	while ((ch = getopt(argc, argv,
--	    "46CDdhI:i:jklnO:P:p:q:rSs:tT:UuV:vw:X:x:z")) != -1) {
-+	    "46CDdhI:i:jklnO:P:p:q:rSs:tT:UuV:vw:X:x:Zz")) != -1) {
- 		switch (ch) {
- 		case '4':
- 			family = AF_INET;
-@@ -258,6 +260,13 @@ main(int argc, char *argv[])
- 		case 'u':
- 			uflag = 1;
- 			break;
-+		case 'Z':
-+# if defined(IPPROTO_DCCP) && defined(SOCK_DCCP)
-+			dccpflag = 1;
-+# else
-+			errx(1, "no DCCP support available");
-+# endif
-+			break;
- 		case 'V':
- # if defined(RT_TABLEID_MAX)
- 			rtableid = (unsigned int)strtonum(optarg, 0,
-@@ -333,6 +342,12 @@ main(int argc, char *argv[])
- 
- 	/* Cruft to make sure options are clean, and used properly. */
- 	if (argv[0] && !argv[1] && family == AF_UNIX) {
-+ 		if (uflag)
-+ 			errx(1, "cannot use -u and -U");
-+# if defined(IPPROTO_DCCP) && defined(SOCK_DCCP)
-+		if (dccpflag)
-+			errx(1, "cannot use -Z and -U");
-+# endif
- 		host = argv[0];
- 		uport = NULL;
- 	} else if (!argv[0] && lflag) {
-@@ -374,8 +389,20 @@ main(int argc, char *argv[])
- 	if (family != AF_UNIX) {
- 		memset(&hints, 0, sizeof(struct addrinfo));
- 		hints.ai_family = family;
--		hints.ai_socktype = uflag ? SOCK_DGRAM : SOCK_STREAM;
--		hints.ai_protocol = uflag ? IPPROTO_UDP : IPPROTO_TCP;
-+		if (uflag) {
-+		    hints.ai_socktype = SOCK_DGRAM;
-+		    hints.ai_protocol = IPPROTO_UDP;
-+		}
-+# if defined(IPPROTO_DCCP) && defined(SOCK_DCCP)
-+		else if (dccpflag) {
-+		    hints.ai_socktype = SOCK_DCCP;
-+		    hints.ai_protocol = IPPROTO_DCCP;
-+		}
-+# endif
-+		else {
-+		    hints.ai_socktype = SOCK_STREAM;
-+		    hints.ai_protocol = IPPROTO_TCP;
-+		}
- 		if (nflag)
- 			hints.ai_flags |= AI_NUMERICHOST;
- 	}
-@@ -383,7 +410,10 @@ main(int argc, char *argv[])
- 	if (xflag) {
- 		if (uflag)
- 			errx(1, "no proxy support for UDP mode");
--
-+# if defined(IPPROTO_DCCP) && defined(SOCK_DCCP)
-+		if (dccpflag)
-+			errx(1, "no proxy support for DCCP mode");
-+# endif
- 		if (lflag)
- 			errx(1, "no proxy support for listen");
- 
-@@ -427,12 +457,12 @@ main(int argc, char *argv[])
- 				err(1, NULL);
- 
- 			char* local;
--			if (family == AF_INET6
-+			if (family == AF_INET6 )
- 				local = "0.0.0.0";
- 			else if (family == AF_INET)
- 				local = ":::";
- 			else
--				local = "unknown"
-+				local = "unknown";
- 			fprintf(stderr, "Listening on [%s] (family %d, port %d)\n",
- 				host ?: local,
- 				family,
-@@ -463,12 +493,13 @@ main(int argc, char *argv[])
- 				connfd = accept(s, (struct sockaddr *)&cliaddr,
- 				    &len);
- 				if(vflag) {
-+					char *proto = proto_name(uflag, dccpflag);
- 				/* Don't look up port if -n. */
- 					if (nflag)
- 						sv = NULL;
- 					else
- 						sv = getservbyport(ntohs(atoi(uport)),
--							uflag ? "udp" : "tcp");
-+							proto);
- 
- 					if (((struct sockaddr *)&cliaddr)->sa_family == AF_INET) {
- 						char dst[INET_ADDRSTRLEN];
-@@ -476,7 +507,7 @@ main(int argc, char *argv[])
- 						fprintf(stderr, "Connection from [%s] port %s [%s/%s] accepted (family %d, sport %d)\n",
- 							dst,
- 							uport,
--							uflag ? "udp" : "tcp",
-+							proto,
- 							sv ? sv->s_name : "*",
- 							((struct sockaddr *)(&cliaddr))->sa_family,
- 							ntohs(((struct sockaddr_in *)&cliaddr)->sin_port));
-@@ -487,7 +518,7 @@ main(int argc, char *argv[])
- 						fprintf(stderr, "Connection from [%s] port %s [%s/%s] accepted (family %d, sport %d)\n",
- 							dst,
- 							uport,
--							uflag ? "udp" : "tcp",
-+							proto,
- 							sv ? sv->s_name : "*",
- 							((struct sockaddr *)&cliaddr)->sa_family,
- 							ntohs(((struct sockaddr_in6 *)&cliaddr)->sin6_port));
-@@ -495,7 +526,7 @@ main(int argc, char *argv[])
- 					else {
- 						fprintf(stderr, "Connection from unknown port %s [%s/%s] accepted (family %d, sport %d)\n",
- 							uport,
--							uflag ? "udp" : "tcp",
-+							proto,
- 							sv ? sv->s_name : "*",
- 							((struct sockaddr *)(&cliaddr))->sa_family,
- 							ntohs(((struct sockaddr_in *)&cliaddr)->sin_port));
-@@ -559,19 +590,20 @@ main(int argc, char *argv[])
- 					}
- 				}
- 
-+				char *proto = proto_name(uflag, dccpflag);
- 				/* Don't look up port if -n. */
- 				if (nflag)
- 					sv = NULL;
- 				else {
- 					sv = getservbyport(
- 					    ntohs(atoi(portlist[i])),
--					    uflag ? "udp" : "tcp");
-+					    proto);
- 				}
- 
- 				fprintf(stderr,
- 				    "Connection to %s %s port [%s/%s] "
- 				    "succeeded!\n", host, portlist[i],
--				    uflag ? "udp" : "tcp",
-+				    proto,
- 				    sv ? sv->s_name : "*");
- 			}
- 			if (!zflag)
-@@ -671,6 +703,24 @@ unix_listen(char *path)
- 	return (s);
- }
- 
-+char *proto_name(uflag, dccpflag) {
-+
-+    char *proto = NULL;
-+    if (uflag) {
-+	proto = "udp";
-+    }
-+# if defined(IPPROTO_DCCP) && defined(SOCK_DCCP)
-+    else if (dccpflag) {
-+	proto = "dccp";
-+    }
-+# endif
-+    else {
-+	proto = "tcp";
-+    }
-+
-+    return proto;
-+}
-+
- /*
-  * remote_connect()
-  * Returns a socket connected to a remote host. Properly binds to a local
-@@ -709,8 +759,21 @@ remote_connect(const char *host, const char *port, struct addrinfo hints)
- # endif
- 			memset(&ahints, 0, sizeof(struct addrinfo));
- 			ahints.ai_family = res0->ai_family;
--			ahints.ai_socktype = uflag ? SOCK_DGRAM : SOCK_STREAM;
--			ahints.ai_protocol = uflag ? IPPROTO_UDP : IPPROTO_TCP;
-+			if (uflag) {
-+			    ahints.ai_socktype = SOCK_DGRAM;
-+			    ahints.ai_protocol = IPPROTO_UDP;
-+
-+			}
-+# if defined(IPPROTO_DCCP) && defined(SOCK_DCCP)
-+			else if (dccpflag) {
-+			    hints.ai_socktype = SOCK_DCCP;
-+			    hints.ai_protocol = IPPROTO_DCCP;
-+			}
-+# endif
-+			else {
-+		    	    ahints.ai_socktype = SOCK_STREAM;
-+			    ahints.ai_protocol = IPPROTO_TCP;
-+			}
- 			ahints.ai_flags = AI_PASSIVE;
- 			if ((error = getaddrinfo(sflag, pflag, &ahints, &ares)))
- 				errx(1, "getaddrinfo: %s", gai_strerror(error));
-@@ -722,15 +785,19 @@ remote_connect(const char *host, const char *port, struct addrinfo hints)
- 		}
- 
- 		set_common_sockopts(s);
-+		char *proto = proto_name(uflag, dccpflag);
- 
--                if ((error = connect_with_timeout(s, res0->ai_addr, res0->ai_addrlen, timeout))== CONNECTION_SUCCESS)
-+                if ((error = connect_with_timeout(s, res0->ai_addr, res0->ai_addrlen, timeout))== CONNECTION_SUCCESS) {
- 			break;
--		else if (vflag && error == CONNECTION_FAILED)
-+		}
-+		else if (vflag && error == CONNECTION_FAILED) {
- 			warn("connect to %s port %s (%s) failed", host, port,
--			    uflag ? "udp" : "tcp");
--                else if (vflag && error == CONNECTION_TIMEOUT)
-+			     proto);
-+		}
-+                else if (vflag && error == CONNECTION_TIMEOUT) {
-                     warn("connect to %s port %s (%s) timed out", host, port,
--                            uflag ? "udp" : "tcp");
-+                             proto);
-+		}
- 
- 		close(s);
- 		s = -1;
-@@ -1047,7 +1114,8 @@ build_ports(char *p)
- 	int hi, lo, cp;
- 	int x = 0;
- 
--        sv = getservbyname(p, uflag ? "udp" : "tcp");
-+	char *proto = proto_name(uflag, dccpflag);
-+	sv = getservbyname(p, proto);
-         if (sv) {
-                 portlist[0] = calloc(1, PORT_MAX_LEN);
-                 if (portlist[0] == NULL)
-@@ -1252,6 +1320,7 @@ help(void)
- 	\t-w secs\t	Timeout for connects and final net reads\n\
- 	\t-X proto	Proxy protocol: \"4\", \"5\" (SOCKS) or \"connect\"\n\
- 	\t-x addr[:port]\tSpecify proxy address and port\n\
-+	\t-Z		DCCP mode\n\
- 	\t-z		Zero-I/O mode [used for scanning]\n\
- 	Port numbers can be individual or ranges: lo-hi [inclusive]\n");
- 	exit(0);
-@@ -1261,7 +1330,7 @@ void
- usage(int ret)
- {
- 	fprintf(stderr,
--	    "usage: nc [-46CDdhjklnrStUuvz] [-I length] [-i interval] [-O length]\n"
-+	    "usage: nc [-46CDdhjklnrStUuvZz] [-I length] [-i interval] [-O length]\n"
- 	    "\t  [-P proxy_username] [-p source_port] [-q seconds] [-s source]\n"
- 	    "\t  [-T toskeyword] [-V rtable] [-w timeout] [-X proxy_protocol]\n"
- 	    "\t  [-x proxy_address[:port]] [destination] [port]\n");
--- 
diff --git a/network/netcat-openbsd/patches/0010-serialized-handling-multiple-clients.patch b/network/netcat-openbsd/patches/0010-serialized-handling-multiple-clients.patch
deleted file mode 100644
index 0d3ea68b96..0000000000
--- a/network/netcat-openbsd/patches/0010-serialized-handling-multiple-clients.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-From: Aron Xu <aron@debian.org>
-Date: Tue, 14 Feb 2012 23:02:00 +0800
-Subject: serialized handling multiple clients
-
----
- netcat.c |   39 +++++++++++++++++++--------------------
- 1 file changed, 19 insertions(+), 20 deletions(-)
-
-diff --git a/netcat.c b/netcat.c
-index 56cc15e..bf9940f 100644
---- a/netcat.c
-+++ b/netcat.c
-@@ -447,26 +447,24 @@ main(int argc, char *argv[])
- 				s = unix_bind(host);
- 			else
- 				s = unix_listen(host);
--		}
-+		} else
-+			s = local_listen(host, uport, hints);
-+		if (s < 0)
-+			err(1, NULL);
-+
-+		char* local;
-+		if (family == AF_INET6)
-+			local = ":::";
-+		else
-+			local = "0.0.0.0";
-+		fprintf(stderr, "Listening on [%s] (family %d, port %d)\n",
-+			host ?: local,
-+			family,
-+			*uport);
- 
- 		/* Allow only one connection at a time, but stay alive. */
- 		for (;;) {
--			if (family != AF_UNIX)
--				s = local_listen(host, uport, hints);
--			if (s < 0)
--				err(1, NULL);
- 
--			char* local;
--			if (family == AF_INET6 )
--				local = "0.0.0.0";
--			else if (family == AF_INET)
--				local = ":::";
--			else
--				local = "unknown";
--			fprintf(stderr, "Listening on [%s] (family %d, port %d)\n",
--				host ?: local,
--				family,
--				*uport);
- 			/*
- 			 * For UDP, we will use recvfrom() initially
- 			 * to wait for a caller, then use the regular
-@@ -536,15 +534,16 @@ main(int argc, char *argv[])
- 				close(connfd);
- 			}
- 
--			if (family != AF_UNIX)
-+			if (kflag)
-+				continue;
-+			if (family != AF_UNIX) {
- 				close(s);
-+			}
- 			else if (uflag) {
- 				if (connect(s, NULL, 0) < 0)
- 					err(1, "connect");
- 			}
--
--			if (!kflag)
--				break;
-+			break;
- 		}
- 	} else if (family == AF_UNIX) {
- 		ret = 0;
--- 
diff --git a/network/netcat-openbsd/patches/0011-misc-failures-and-features.patch b/network/netcat-openbsd/patches/0011-misc-failures-and-features.patch
deleted file mode 100644
index 3ed0523cff..0000000000
--- a/network/netcat-openbsd/patches/0011-misc-failures-and-features.patch
+++ /dev/null
@@ -1,457 +0,0 @@
-From: Aron Xu <aron@debian.org>
-Date: Mon, 13 Feb 2012 19:06:52 +0800
-Subject: misc connection failures
-
----
- nc.1     |   76 ++++++++++++++++++++++++++++++++++++---
- netcat.c |  119 ++++++++++++++++++++++++++++++++++++++++++--------------------
- 2 files changed, 153 insertions(+), 42 deletions(-)
-
-diff --git a/nc.1 b/nc.1
-index 60e3668..477cb1b 100644
---- a/nc.1
-+++ b/nc.1
-@@ -34,7 +34,7 @@
- .Sh SYNOPSIS
- .Nm nc
- .Bk -words
--.Op Fl 46CDdhklnrStUuvZz
-+.Op Fl 46bCDdhklnrStUuvZz
- .Op Fl I Ar length
- .Op Fl i Ar interval
- .Op Fl O Ar length
-@@ -99,6 +99,8 @@ to use IPv4 addresses only.
- Forces
- .Nm
- to use IPv6 addresses only.
-+.It Fl b
-+Allow broadcast.
- .It Fl C
- Send CRLF as line-ending.
- .It Fl D
-@@ -323,6 +325,54 @@ and which side is being used as a
- The connection may be terminated using an
- .Dv EOF
- .Pq Sq ^D .
-+.Pp
-+There is no
-+.Fl c
-+or
-+.Fl e
-+option in this netcat, but you still can execute a command after connection
-+being established by redirecting file descriptors. Be cautious here because
-+opening a port and let anyone connected execute arbitrary command on your
-+site is DANGEROUS. If you really need to do this, here is an example:
-+.Pp
-+On
-+.Sq server
-+side:
-+.Pp
-+.Dl $ rm -f /tmp/f; mkfifo /tmp/f
-+.Dl $ cat /tmp/f | /bin/sh -i 2>&1 | nc -l 127.0.0.1 1234 > /tmp/f
-+.Pp
-+On
-+.Sq client
-+side:
-+.Pp
-+.Dl $ nc host.example.com 1234
-+.Dl $ (shell prompt from host.example.com)
-+.Pp
-+By doing this, you create a fifo at /tmp/f and make nc listen at port 1234
-+of address 127.0.0.1 on
-+.Sq server
-+side, when a
-+.Sq client
-+establishes a connection successfully to that port, /bin/sh gets executed
-+on
-+.Sq server
-+side and the shell prompt is given to
-+.Sq client
-+side.
-+.Pp
-+When connection is terminated,
-+.Nm
-+quits as well. Use
-+.Fl k
-+if you want it keep listening, but if the command quits this option won't
-+restart it or keep
-+.Nm
-+running. Also don't forget to remove the file descriptor once you don't need
-+it anymore:
-+.Pp
-+.Dl $ rm -f /tmp/f
-+.Pp
- .Sh DATA TRANSFER
- The example in the previous section can be expanded to build a
- basic data transfer model.
-@@ -382,15 +432,30 @@ The
- flag can be used to tell
- .Nm
- to report open ports,
--rather than initiate a connection.
-+rather than initiate a connection. Usually it's useful to turn on verbose
-+output to stderr by use this option in conjunction with
-+.Fl v
-+option.
-+.Pp
- For example:
- .Bd -literal -offset indent
--$ nc -z host.example.com 20-30
-+$ nc \-zv host.example.com 20-30
- Connection to host.example.com 22 port [tcp/ssh] succeeded!
- Connection to host.example.com 25 port [tcp/smtp] succeeded!
- .Ed
- .Pp
--The port range was specified to limit the search to ports 20 \- 30.
-+The port range was specified to limit the search to ports 20 \- 30, and is
-+scanned by increasing order.
-+.Pp
-+You can also specify a list of ports to scan, for example:
-+.Bd -literal -offset indent
-+$ nc \-zv host.example.com 80 20 22
-+nc: connect to host.example.com 80 (tcp) failed: Connection refused
-+nc: connect to host.example.com 20 (tcp) failed: Connection refused
-+Connection to host.example.com port [tcp/ssh] succeeded!
-+.Ed
-+.Pp
-+The ports are scanned by the order you given.
- .Pp
- Alternatively, it might be useful to know which server software
- is running, and which versions.
-@@ -455,6 +520,9 @@ Original implementation by *Hobbit*
- .br
- Rewritten with IPv6 support by
- .An Eric Jackson Aq ericj@monkey.org .
-+.br
-+Modified for Debian port by Aron Xu
-+.Aq aron@debian.org .
- .Sh CAVEATS
- UDP port scans using the
- .Fl uz
-diff --git a/netcat.c b/netcat.c
-index bf9940f..c938d11 100644
---- a/netcat.c
-+++ b/netcat.c
-@@ -88,6 +88,7 @@
- #include <netdb.h>
- #include <poll.h>
- #include <signal.h>
-+#include <stddef.h>
- #include <stdarg.h>
- #include <stdio.h>
- #include <stdlib.h>
-@@ -115,6 +116,7 @@
- #define UDP_SCAN_TIMEOUT 3			/* Seconds */
- 
- /* Command Line Options */
-+int	bflag;					/* Allow Broadcast */
- int     Cflag = 0;                              /* CRLF line-ending */
- int	dflag;					/* detached, no stdin */
- unsigned int iflag;				/* Interval Flag */
-@@ -146,7 +148,7 @@ char *portlist[PORT_MAX+1];
- char *unix_dg_tmp_socket;
- 
- void	atelnet(int, unsigned char *, unsigned int);
--void	build_ports(char *);
-+void	build_ports(char **);
- void	help(void);
- int	local_listen(char *, char *, struct addrinfo);
- void	readwrite(int);
-@@ -171,11 +173,14 @@ int
- main(int argc, char *argv[])
- {
- 	int ch, s, ret, socksv;
--	char *host, *uport;
-+	char *host, **uport;
- 	struct addrinfo hints;
- 	struct servent *sv;
- 	socklen_t len;
--	struct sockaddr_storage cliaddr;
-+	union {
-+        	struct sockaddr_storage storage;
-+		struct sockaddr_un forunix;
-+	} cliaddr;
- 	char *proxy = NULL;
- 	const char *errstr, *proxyhost = "", *proxyport = NULL;
- 	struct addrinfo proxyhints;
-@@ -189,7 +194,7 @@ main(int argc, char *argv[])
- 	sv = NULL;
- 
- 	while ((ch = getopt(argc, argv,
--	    "46CDdhI:i:jklnO:P:p:q:rSs:tT:UuV:vw:X:x:Zz")) != -1) {
-+	    "46bCDdhI:i:jklnO:P:p:q:rSs:tT:UuV:vw:X:x:Zz")) != -1) {
- 		switch (ch) {
- 		case '4':
- 			family = AF_INET;
-@@ -197,6 +202,13 @@ main(int argc, char *argv[])
- 		case '6':
- 			family = AF_INET6;
- 			break;
-+		case 'b':
-+# if defined(SO_BROADCAST)
-+			bflag = 1;
-+# else
-+			errx(1, "no broadcast frame support available");
-+# endif
-+			break;
- 		case 'U':
- 			family = AF_UNIX;
- 			break;
-@@ -342,35 +354,40 @@ main(int argc, char *argv[])
- 
- 	/* Cruft to make sure options are clean, and used properly. */
- 	if (argv[0] && !argv[1] && family == AF_UNIX) {
-- 		if (uflag)
-- 			errx(1, "cannot use -u and -U");
- # if defined(IPPROTO_DCCP) && defined(SOCK_DCCP)
- 		if (dccpflag)
- 			errx(1, "cannot use -Z and -U");
- # endif
- 		host = argv[0];
- 		uport = NULL;
--	} else if (!argv[0] && lflag) {
--		if (sflag)
--			errx(1, "cannot use -s and -l");
--		if (zflag)
--			errx(1, "cannot use -z and -l");
--		if (pflag)
--			uport=pflag;
--	} else if (!lflag && kflag) {
--		errx(1, "cannot use -k without -l");
--	} else if (argv[0] && !argv[1]) {
--		if  (!lflag)
--			usage(1);
--		uport = argv[0];
-+	} else if (argv[0] && !argv[1] && lflag) {
-+		if (pflag) {
-+			uport = &pflag;
-+			host = argv[0];
-+		} else {
-+			uport = argv;
-+			host = NULL;
-+		}
-+	} else if (!argv[0] && lflag && pflag) {
-+		uport = &pflag;
- 		host = NULL;
- 	} else if (argv[0] && argv[1]) {
- 		host = argv[0];
--		uport = argv[1];
-+		uport = &argv[1];
- 	} else
- 		usage(1);
- 
--
-+	if (lflag) {
-+		if (sflag)
-+			errx(1, "cannot use -s and -l");
-+		if (zflag)
-+			errx(1, "cannot use -z and -l");
-+		if (pflag)
-+			/* This still does not work well because of getopt mess
-+			errx(1, "cannot use -p and -l"); */
-+			uport = &pflag;
-+	} else if (!lflag && kflag)
-+		errx(1, "cannot use -k without -l");
- 
- 	/* Get name of temporary socket for unix datagram client */
- 	if ((family == AF_UNIX) && uflag && !lflag) {
-@@ -448,7 +465,7 @@ main(int argc, char *argv[])
- 			else
- 				s = unix_listen(host);
- 		} else
--			s = local_listen(host, uport, hints);
-+			s = local_listen(host, *uport, hints);
- 		if (s < 0)
- 			err(1, NULL);
- 
-@@ -457,7 +474,8 @@ main(int argc, char *argv[])
- 			local = ":::";
- 		else
- 			local = "0.0.0.0";
--		fprintf(stderr, "Listening on [%s] (family %d, port %d)\n",
-+		if (vflag && (family != AF_UNIX))
-+		fprintf(stderr, "Listening on [%s] (family %d, port %s)\n",
- 			host ?: local,
- 			family,
- 			*uport);
-@@ -490,13 +508,17 @@ main(int argc, char *argv[])
- 				len = sizeof(cliaddr);
- 				connfd = accept(s, (struct sockaddr *)&cliaddr,
- 				    &len);
--				if(vflag) {
-+				if(vflag && family == AF_UNIX) {
-+					fprintf(stderr, "Connection from \"%.*s\" accepted\n",
-+						(len - (int)offsetof(struct sockaddr_un, sun_path)),
-+						((struct sockaddr_un*)&cliaddr)->sun_path);
-+				} else if(vflag) {
- 					char *proto = proto_name(uflag, dccpflag);
- 				/* Don't look up port if -n. */
- 					if (nflag)
- 						sv = NULL;
- 					else
--						sv = getservbyport(ntohs(atoi(uport)),
-+						sv = getservbyport(ntohs(atoi(*uport)),
- 							proto);
- 
- 					if (((struct sockaddr *)&cliaddr)->sa_family == AF_INET) {
-@@ -504,7 +526,7 @@ main(int argc, char *argv[])
- 						inet_ntop(((struct sockaddr *)&cliaddr)->sa_family,&(((struct sockaddr_in *)&cliaddr)->sin_addr),dst,INET_ADDRSTRLEN);
- 						fprintf(stderr, "Connection from [%s] port %s [%s/%s] accepted (family %d, sport %d)\n",
- 							dst,
--							uport,
-+							*uport,
- 							proto,
- 							sv ? sv->s_name : "*",
- 							((struct sockaddr *)(&cliaddr))->sa_family,
-@@ -515,7 +537,7 @@ main(int argc, char *argv[])
- 						inet_ntop(((struct sockaddr *)&cliaddr)->sa_family,&(((struct sockaddr_in6 *)&cliaddr)->sin6_addr),dst,INET6_ADDRSTRLEN);
- 						fprintf(stderr, "Connection from [%s] port %s [%s/%s] accepted (family %d, sport %d)\n",
- 							dst,
--							uport,
-+							*uport,
- 							proto,
- 							sv ? sv->s_name : "*",
- 							((struct sockaddr *)&cliaddr)->sa_family,
-@@ -523,17 +545,21 @@ main(int argc, char *argv[])
- 					}
- 					else {
- 						fprintf(stderr, "Connection from unknown port %s [%s/%s] accepted (family %d, sport %d)\n",
--							uport,
-+							*uport,
- 							proto,
- 							sv ? sv->s_name : "*",
- 							((struct sockaddr *)(&cliaddr))->sa_family,
- 							ntohs(((struct sockaddr_in *)&cliaddr)->sin_port));
- 					}
- 				}
-+                                if(!kflag)
-+                                        close(s);
- 				readwrite(connfd);
- 				close(connfd);
- 			}
- 
-+			if (vflag && kflag)
-+                                fprintf(stderr, "Connection closed, listening again.\n");
- 			if (kflag)
- 				continue;
- 			if (family != AF_UNIX) {
-@@ -641,6 +667,8 @@ unix_bind(char *path)
- 		return (-1);
- 	}
- 
-+        unlink(path);
-+
- 	if (bind(s, (struct sockaddr *)&sun, SUN_LEN(&sun)) < 0) {
- 		close(s);
- 		return (-1);
-@@ -662,8 +690,10 @@ unix_connect(char *path)
- 		if ((s = unix_bind(unix_dg_tmp_socket)) < 0)
- 			return (-1);
- 	} else {
--		if ((s = socket(AF_UNIX, SOCK_STREAM, 0)) < 0)
-+		if ((s = socket(AF_UNIX, SOCK_STREAM, 0)) < 0) {
-+                        errx(1,"create unix socket failed");
- 			return (-1);
-+                }
- 	}
- 	(void)fcntl(s, F_SETFD, 1);
- 
-@@ -674,9 +704,11 @@ unix_connect(char *path)
- 	    sizeof(sun.sun_path)) {
- 		close(s);
- 		errno = ENAMETOOLONG;
-+                warn("unix connect abandoned");
- 		return (-1);
- 	}
- 	if (connect(s, (struct sockaddr *)&sun, SUN_LEN(&sun)) < 0) {
-+                warn("unix connect failed");
- 		close(s);
- 		return (-1);
- 	}
-@@ -1105,22 +1137,23 @@ atelnet(int nfd, unsigned char *buf, unsigned int size)
-  * that we should try to connect to.
-  */
- void
--build_ports(char *p)
-+build_ports(char **p)
- {
-         struct servent *sv;
- 	const char *errstr;
- 	char *n;
- 	int hi, lo, cp;
- 	int x = 0;
-+	int i;
- 
- 	char *proto = proto_name(uflag, dccpflag);
--	sv = getservbyname(p, proto);
-+	sv = getservbyname(*p, proto);
-         if (sv) {
-                 portlist[0] = calloc(1, PORT_MAX_LEN);
-                 if (portlist[0] == NULL)
-                         err(1, NULL);
-                 snprintf(portlist[0], PORT_MAX_LEN, "%d", ntohs(sv->s_port));
--        } else if ((n = strchr(p, '-')) != NULL) {
-+        } else if ((n = strchr(*p, '-')) != NULL) {
- 		*n = '\0';
- 		n++;
- 
-@@ -1128,9 +1161,9 @@ build_ports(char *p)
- 		hi = strtonum(n, 1, PORT_MAX, &errstr);
- 		if (errstr)
- 			errx(1, "port number %s: %s", errstr, n);
--		lo = strtonum(p, 1, PORT_MAX, &errstr);
-+		lo = strtonum(*p, 1, PORT_MAX, &errstr);
- 		if (errstr)
--			errx(1, "port number %s: %s", errstr, p);
-+			errx(1, "port number %s: %s", errstr, *p);
- 
- 		if (lo > hi) {
- 			cp = hi;
-@@ -1160,10 +1193,12 @@ build_ports(char *p)
- 			}
- 		}
- 	} else {
--		hi = strtonum(p, 1, PORT_MAX, &errstr);
-+		hi = strtonum(*p, 1, PORT_MAX, &errstr);
- 		if (errstr)
--			errx(1, "port number %s: %s", errstr, p);
--		portlist[0] = strdup(p);
-+			errx(1, "port number %s: %s", errstr, *p);
-+		for (i=0;p[i];i++) {
-+			portlist[i] = strdup(p[i]);
-+		}
- 		if (portlist[0] == NULL)
- 			err(1, NULL);
- 	}
-@@ -1198,6 +1233,13 @@ set_common_sockopts(int s)
- {
- 	int x = 1;
- 
-+# if defined(SO_BROADCAST)
-+	if (bflag) {
-+		if (setsockopt(s, IPPROTO_TCP, SO_BROADCAST,
-+			&x, sizeof(x)) == -1)
-+			err(1, NULL);
-+	}
-+# endif
- # if defined(TCP_MD5SIG)
- 	if (Sflag) {
- 		if (setsockopt(s, IPPROTO_TCP, TCP_MD5SIG,
-@@ -1293,6 +1335,7 @@ help(void)
- 	fprintf(stderr, "\tCommand Summary:\n\
- 	\t-4		Use IPv4\n\
- 	\t-6		Use IPv6\n\
-+	\t-b		Allow broadcast\n\
- 	\t-C		Send CRLF as line-ending\n\
- 	\t-D		Enable the debug socket option\n\
- 	\t-d		Detach from stdin\n\
-@@ -1329,7 +1372,7 @@ void
- usage(int ret)
- {
- 	fprintf(stderr,
--	    "usage: nc [-46CDdhjklnrStUuvZz] [-I length] [-i interval] [-O length]\n"
-+	    "usage: nc [-46bCDdhjklnrStUuvZz] [-I length] [-i interval] [-O length]\n"
- 	    "\t  [-P proxy_username] [-p source_port] [-q seconds] [-s source]\n"
- 	    "\t  [-T toskeyword] [-V rtable] [-w timeout] [-X proxy_protocol]\n"
- 	    "\t  [-x proxy_address[:port]] [destination] [port]\n");
--- 
diff --git a/network/netcat/README b/network/netcat/README
index ae3a8f1d03..c65b54b32b 100644
--- a/network/netcat/README
+++ b/network/netcat/README
@@ -1,8 +1,8 @@
-GNU Netcat is a featured networking utility which reads and writes data 
-across network connections, using the TCP/IP protocol.
+GNU Netcat is a featured networking utility which reads and writes
+data across network connections, using the TCP/IP protocol.
 
-It is designed to be a reliable "back-end" tool that can be used directly
-or easily driven by other programs and scripts. At the same time, it is a
-feature-rich network debugging and exploration tool, since it can create
-almost any kind of connection you would need and has several interesting
-built-in capabilities.
+It is designed to be a reliable "back-end" tool that can be used
+directly or easily driven by other programs and scripts. At the same
+time, it is a feature-rich network debugging and exploration tool,
+since it can create almost any kind of connection you would need and
+has several interesting built-in capabilities.
diff --git a/network/netcat/netcat.SlackBuild b/network/netcat/netcat.SlackBuild
index 264acf5a6b..d2ae8e92a3 100644
--- a/network/netcat/netcat.SlackBuild
+++ b/network/netcat/netcat.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # SlackBuild script for netcat.
 #
@@ -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=netcat
 VERSION=${VERSION:-0.7.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}
@@ -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/network/netdiscover/README b/network/netdiscover/README
index 1f3c41ba6f..d2622ed000 100644
--- a/network/netdiscover/README
+++ b/network/netdiscover/README
@@ -1,3 +1,4 @@
-Netdiscover is a network address discovering tool, developed mainly for those
-wireless networks without dhcp server, it also works on hub/switched networks.
-It is based on arp packets, it will send arp requests and sniff for replys.
+Netdiscover is a network address discovering tool, developed mainly
+for those wireless networks without dhcp server, it also works on
+hub/switched networks. It is based on ARP packets, it will send ARP
+requests and sniff for replys.
diff --git a/network/netdiscover/netdiscover.SlackBuild b/network/netdiscover/netdiscover.SlackBuild
index a9cbccaaf5..492169248b 100644
--- a/network/netdiscover/netdiscover.SlackBuild
+++ b/network/netdiscover/netdiscover.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for netdiscover
 
@@ -18,11 +18,14 @@
 #  0. You just DO WHAT THE FUCK YOU WANT TO.
 
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=netdiscover
-VERSION=${VERSION:-886319a}
-COMMIT=${COMMIT:-886319af1758a1cb9cc1ec904ea46646572797c9}
-BUILD=${BUILD:-1}
+VERSION=${VERSION:-053dda2}
+COMMIT=${COMMIT:-053dda2f3a8cdb749f8100735d78af427aa417b0}
+BUILD=${BUILD:-2}
 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}
@@ -71,7 +81,7 @@ sed -i -e 's:share/man:man:' CMakeLists.txt
 mkdir -p build
 cd build
   cmake \
-    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS -fcommon" \
     -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DCMAKE_BUILD_TYPE=Release ..
@@ -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/network/netdiscover/netdiscover.info b/network/netdiscover/netdiscover.info
index c48e710ce2..11fb0aa74b 100644
--- a/network/netdiscover/netdiscover.info
+++ b/network/netdiscover/netdiscover.info
@@ -1,8 +1,8 @@
 PRGNAM="netdiscover"
-VERSION="886319a"
+VERSION="053dda2"
 HOMEPAGE="https://github.com/alexxy/netdiscover/"
-DOWNLOAD="https://github.com/alexxy/netdiscover/archive/886319a/netdiscover-886319af1758a1cb9cc1ec904ea46646572797c9.tar.gz"
-MD5SUM="ae7f940fd699ccce7c0167f215a7e217"
+DOWNLOAD="https://github.com/alexxy/netdiscover/archive/053dda2/netdiscover-053dda2f3a8cdb749f8100735d78af427aa417b0.tar.gz"
+MD5SUM="949e75e011b41ad8cc9a6e36a13d93cd"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/network/netdrive-connector/README b/network/netdrive-connector/README
index 29036fe8d9..048f715b30 100644
--- a/network/netdrive-connector/README
+++ b/network/netdrive-connector/README
@@ -4,10 +4,9 @@ Utility to setup mountable SFTP and WebDAV connections.
 
 Includes a GUI tool written in PyQt4 and command line tools as follows:
 
- - add-sftp-connector      : sets up a mountable SFTP (sshfs) connection
- - remove-sftp-connector   : removes a mountable SFTP (sshfs) connection
- - add-webdav-connector    : sets up a mountable webdav (davfs2) connection
- - remove-webdav-connector : removes a mountable webdav (davfs2) connection
+add-sftp-connector:      sets up a mountable SFTP (sshfs) connection
+remove-sftp-connector:   removes a mountable SFTP (sshfs) connection
+add-webdav-connector:    sets up a mountable webdav (davfs2) connection
+remove-webdav-connector: removes a mountable webdav (davfs2) connection
 
-Either one of the dependencies (davfs2, sshfs-fuse) can be left out,
-if you choose not to use that connection type.
+davfs2 can be left out if you choose not to use that connection type.
diff --git a/network/netdrive-connector/netdrive-connector.SlackBuild b/network/netdrive-connector/netdrive-connector.SlackBuild
index ab200b4059..30a2765878 100644
--- a/network/netdrive-connector/netdrive-connector.SlackBuild
+++ b/network/netdrive-connector/netdrive-connector.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for netdrive-connector
 
@@ -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=netdrive-connector
 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}
 
-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"
@@ -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/network/netdrive-connector/netdrive-connector.info b/network/netdrive-connector/netdrive-connector.info
index 02ffb0b05e..3b228f2dd9 100644
--- a/network/netdrive-connector/netdrive-connector.info
+++ b/network/netdrive-connector/netdrive-connector.info
@@ -5,6 +5,6 @@ DOWNLOAD="https://github.com/ethoms/netdrive-connector/releases/download/v1.1/ne
 MD5SUM="4cedc2949a7b3017f5db7c4b6d99404d"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="davfs2 sshfs-fuse"
+REQUIRES="davfs2"
 MAINTAINER="Euan Thoms"
 EMAIL="euan at potensol dot com"
diff --git a/network/nethogs/nethogs.SlackBuild b/network/nethogs/nethogs.SlackBuild
index 3438e14b8c..181782a549 100644
--- a/network/nethogs/nethogs.SlackBuild
+++ b/network/nethogs/nethogs.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for <nethogs>
 # Written by Michales Michaloudes korgie@gmail.com
@@ -6,10 +6,13 @@
 # Modified by Erik Hanson <erik@slackbuilds.org>
 # sed in SLKCFLAGS and removed template left-overs.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=nethogs
-VERSION=${VERSION:-0.8.5}
+VERSION=${VERSION:-0.8.6}
 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}
@@ -73,11 +80,11 @@ gzip -9 $PKG/usr/man/man8/*.?
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cd $TMP/$PRGNAM-$VERSION/
-cp -a DESIGN Changelog INSTALL README.* $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a COPYING DESIGN 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
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/network/nethogs/nethogs.info b/network/nethogs/nethogs.info
index cd4b591ee4..6abd087985 100644
--- a/network/nethogs/nethogs.info
+++ b/network/nethogs/nethogs.info
@@ -1,8 +1,8 @@
 PRGNAM="nethogs"
-VERSION="0.8.5"
+VERSION="0.8.6"
 HOMEPAGE="https://github.com/raboof/nethogs"
-DOWNLOAD="https://github.com/raboof/nethogs/archive/v0.8.5/nethogs-0.8.5.tar.gz"
-MD5SUM="002fd7227d8ed2a8b0fcb0a1b44731bf"
+DOWNLOAD="https://github.com/raboof/nethogs/archive/v0.8.6/nethogs-0.8.6.tar.gz"
+MD5SUM="e7acdcf0fd73975eb8bdf3704c952b2a"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/network/netperf/001-fix-inlining.patch b/network/netperf/001-fix-inlining.patch
new file mode 100644
index 0000000000..eb8c09b846
--- /dev/null
+++ b/network/netperf/001-fix-inlining.patch
@@ -0,0 +1,32 @@
+# Copyright Seblu 2015
+--- a/src/netlib.c	2015-08-04 20:30:43.449468815 +0200
++++ b/src/netlib.c	2015-08-04 20:31:40.317792002 +0200
+@@ -3997,11 +3997,7 @@
+   }
+ }
+ 
+-#ifdef WIN32
+-__forceinline void demo_interval_display(double actual_interval)
+-#else
+-  inline void demo_interval_display(double actual_interval)
+-#endif
++void demo_interval_display(double actual_interval)
+ {
+   static int count = 0;
+   struct timeval now;
+@@ -4060,15 +4056,7 @@
+    important compilers have supported such a construct so it should
+    not be a big deal. raj 2012-01-23 */
+ 
+-#ifdef WIN32
+-/* It would seem that the Microsoft compiler will not inline across
+-   source files. So there is little point in having an inline
+-   directive in that situation.  Of course that makes me wonder if an
+-   inline directive has to appear in netlib.h... */
+ void demo_interval_tick(uint32_t units)
+-#else
+-  inline void demo_interval_tick(uint32_t units)
+-#endif
+ {
+   double actual_interval = 0.0;
+ 
diff --git a/network/netperf/netperf.SlackBuild b/network/netperf/netperf.SlackBuild
index 7a89d146f4..a7c1b3b5a6 100644
--- a/network/netperf/netperf.SlackBuild
+++ b/network/netperf/netperf.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for netperf.
 
@@ -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=netperf
-VERSION=${VERSION:-2.6.0}
+VERSION=${VERSION:-2.7.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=${PKG:-$TMP/package-$PRGNAM}
+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,9 +69,9 @@ 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
+rm -rf $PRGNAM-$PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$PRGNAM-$VERSION.tar.?z*
+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 \) \
@@ -69,7 +79,9 @@ find -L . \
   \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
   -exec chmod 644 {} \;
 
-CFLAGS="$SLKCFLAGS" \
+patch -p1 < $CWD/001-fix-inlining.patch
+
+CFLAGS="$SLKCFLAGS -fcommon" \
 ./configure \
   --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
@@ -91,12 +103,11 @@ rm -f $PKG/usr/info/dir
 gzip -9 $PKG/usr/info/*
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
-  AUTHORS COPYING* ChangeLog INSTALL NEWS README* doc \
+cp -a AUTHORS COPYING* ChangeLog INSTALL README* doc \
   $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 -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/network/netperf/netperf.info b/network/netperf/netperf.info
index d5b403eeb9..08e8298f2c 100644
--- a/network/netperf/netperf.info
+++ b/network/netperf/netperf.info
@@ -1,8 +1,8 @@
 PRGNAM="netperf"
-VERSION="2.6.0"
+VERSION="2.7.0"
 HOMEPAGE="http://www.netperf.org/netperf"
-DOWNLOAD="http://ponce.cc/slackware/sources/repo/netperf-2.6.0.tar.bz2"
-MD5SUM="9654ffdfd4c4f2c93ce3733cd9ed9236"
+DOWNLOAD="https://github.com/HewlettPackard/netperf/archive/netperf-2.7.0/netperf-netperf-2.7.0.tar.gz"
+MD5SUM="e0d45b5bca1eee2aef0155de82366202"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/network/netqmail/README b/network/netqmail/README
index bc385cb16b..0abd5b9cd3 100644
--- a/network/netqmail/README
+++ b/network/netqmail/README
@@ -14,4 +14,5 @@ The following 2 changes are made to the installed layout:
 Please see README.SBo for important information on how to build and
 install this package.
 
-You can perform test installs to a chroot environment - see tests/README.
+You can perform test installs to a chroot environment - see
+tests/README.
diff --git a/network/netqmail/netqmail.SlackBuild b/network/netqmail/netqmail.SlackBuild
index d967339a8e..3a49cf1008 100644
--- a/network/netqmail/netqmail.SlackBuild
+++ b/network/netqmail/netqmail.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for netqmail
 
@@ -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=netqmail
 VERSION=${VERSION:-1.06}
 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}
@@ -270,4 +280,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 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/network/netqmail/netqmail.info b/network/netqmail/netqmail.info
index fa425f3c70..35bd0e2e11 100644
--- a/network/netqmail/netqmail.info
+++ b/network/netqmail/netqmail.info
@@ -1,7 +1,7 @@
 PRGNAM="netqmail"
 VERSION="1.06"
-HOMEPAGE="http://www.qmail.org/netqmail/"
-DOWNLOAD="http://www.qmail.org/netqmail-1.06.tar.gz"
+HOMEPAGE="http://netqmail.org/"
+DOWNLOAD="http://netqmail.org/netqmail-1.06.tar.gz"
 MD5SUM="c922f776140b2c83043a6195901c67d3"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/network/netsniff-ng/netsniff-ng.SlackBuild b/network/netsniff-ng/netsniff-ng.SlackBuild
index 8905eb803d..8855337e85 100644
--- a/network/netsniff-ng/netsniff-ng.SlackBuild
+++ b/network/netsniff-ng/netsniff-ng.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for netsniff-ng
 
-# Copyright 2013-2018 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,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=netsniff-ng
-VERSION=${VERSION:-0.6.6}
+VERSION=${VERSION:-0.6.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}
@@ -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/network/netsniff-ng/netsniff-ng.info b/network/netsniff-ng/netsniff-ng.info
index 89247067ae..7db97b295c 100644
--- a/network/netsniff-ng/netsniff-ng.info
+++ b/network/netsniff-ng/netsniff-ng.info
@@ -1,8 +1,8 @@
 PRGNAM="netsniff-ng"
-VERSION="0.6.6"
+VERSION="0.6.8"
 HOMEPAGE="http://netsniff-ng.org"
-DOWNLOAD="http://pub.netsniff-ng.org/netsniff-ng/netsniff-ng-0.6.6.tar.xz"
-MD5SUM="513f85b6bf93d90c6c616cda4967181b"
+DOWNLOAD="http://pub.netsniff-ng.org/netsniff-ng/netsniff-ng-0.6.8.tar.xz"
+MD5SUM="477580690816dc7eacaaca444a6bdb55"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="libcli libnet nacl liburcu GeoIP"
diff --git a/network/netstat-nat/netstat-nat.SlackBuild b/network/netstat-nat/netstat-nat.SlackBuild
index 705b0fe8de..8683fea296 100644
--- a/network/netstat-nat/netstat-nat.SlackBuild
+++ b/network/netstat-nat/netstat-nat.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for netstat-nat
 
@@ -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=netstat-nat
 VERSION=${VERSION:-1.4.10}
 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/network/netsurf/README b/network/netsurf/README
index c99baf10ac..5128197079 100644
--- a/network/netsurf/README
+++ b/network/netsurf/README
@@ -1,6 +1,6 @@
-NetSurf is a free, open source web browser. It is written in C and released 
-under the GNU Public Licence version 2. NetSurf has its own layout and 
-rendering engine entirely written from scratch. It is small and capable of 
-handling many of the web standards in use today.
+NetSurf is a free, open source web browser. It is written in C and
+released under the GNU Public Licence version 2. NetSurf has its own
+layout and rendering engine entirely written from scratch. It is small
+and capable of handling many of the web standards in use today.
 
 Build-time requires: perl-html-parser
diff --git a/network/netsurf/enable-deprecated.diff b/network/netsurf/enable-deprecated.diff
deleted file mode 100644
index 3378406e85..0000000000
--- a/network/netsurf/enable-deprecated.diff
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/netsurf/gtk/Makefile.target	2015-03-21 20:50:22.018730471 +0300
-+++ b/netsurf/gtk/Makefile.target	2015-03-22 11:38:07.809544850 +0300
-@@ -34,7 +34,6 @@
- 
- # GTK and GLIB flags to disable depricated usage
- GTKDEPFLAGS := -DG_DISABLE_SINGLE_INCLUDES \
--		-DG_DISABLE_DEPRECATED \
- 	       	-DGTK_DISABLE_SINGLE_INCLUDES \
- 	       	-DGTK_DISABLE_DEPRECATED \
- 		-DGTK_MULTIHEAD_SAFE \
diff --git a/network/netsurf/netsurf.SlackBuild b/network/netsurf/netsurf.SlackBuild
index 649dd16b9a..44634ce5f7 100644
--- a/network/netsurf/netsurf.SlackBuild
+++ b/network/netsurf/netsurf.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for netsurf
 
@@ -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=netsurf
-VERSION=${VERSION:-3.8}
+VERSION=${VERSION:-3.10}
 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 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/network/netsurf/netsurf.desktop b/network/netsurf/netsurf.desktop
index 256cd87298..0a46c65a1a 100644
--- a/network/netsurf/netsurf.desktop
+++ b/network/netsurf/netsurf.desktop
@@ -3,7 +3,7 @@ Type=Application
 Name=Netsurf
 GenericName=Web Browser
 Comment=Lightweight web browser
-Exec=netsurf-gtk %U
+Exec=netsurf-gtk2 %U
 Icon=netsurf
 Terminal=false
 StartupNotify=false
diff --git a/network/netsurf/netsurf.info b/network/netsurf/netsurf.info
index a63840e0a4..76745e7077 100644
--- a/network/netsurf/netsurf.info
+++ b/network/netsurf/netsurf.info
@@ -1,8 +1,8 @@
 PRGNAM="netsurf"
-VERSION="3.8"
+VERSION="3.10"
 HOMEPAGE="http://www.netsurf-browser.org"
-DOWNLOAD="https://download.netsurf-browser.org/netsurf/releases/source-full/netsurf-all-3.8.tar.gz"
-MD5SUM="cf3e00b98b630d552ae694be52e23c8a"
+DOWNLOAD="https://download.netsurf-browser.org/netsurf/releases/source-full/netsurf-all-3.10.tar.gz"
+MD5SUM="f5b2ea34c85775941ab3c2144783d396"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="perl-html-parser"
diff --git a/network/newsboat/README b/network/newsboat/README
index a3f047cc4f..245f4911b1 100644
--- a/network/newsboat/README
+++ b/network/newsboat/README
@@ -1,5 +1,5 @@
-Newsboat is a fork of Newsbeuter, an open-source RSS/Atom feed reader for text
-terminals. Newsboat's configurability and features make it a good choice for
-users that want a fast feed reader controlled by the keyboard. Newsboat can
-sync with TinyTinyRSS and other online feed readers. It can also download
-podcasts distributed through RSS feeds.
+Newsboat is a fork of Newsbeuter, an open-source RSS/Atom feed reader
+for text terminals. Newsboat's configurability and features make it a
+good choice for users that want a fast feed reader controlled by the
+keyboard. Newsboat can sync with TinyTinyRSS and other online feed
+readers. It can also download podcasts distributed through RSS feeds.
diff --git a/network/newsboat/doinst.sh b/network/newsboat/doinst.sh
new file mode 100644
index 0000000000..4110f5514d
--- /dev/null
+++ b/network/newsboat/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/network/newsboat/newsboat.SlackBuild b/network/newsboat/newsboat.SlackBuild
index c7a2dcef52..5a66aba35e 100644
--- a/network/newsboat/newsboat.SlackBuild
+++ b/network/newsboat/newsboat.SlackBuild
@@ -1,9 +1,10 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for newsboat
 
 # Copyright 2017-2018 Benjamin Trigona-Harany <slackbuilds@jaxartes.net>
-# Copyright 2019 Andrew Clemons, Wellington New Zealand
+# Copyright 2019-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
@@ -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=newsboat
-VERSION=${VERSION:-2.16.1}
+VERSION=${VERSION:-2.34}
 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=""
@@ -76,7 +84,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]
@@ -92,11 +100,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)"
 
@@ -115,12 +131,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
+    } > $dep-$ver/.cargo-checksum.json
   done
 )
 
@@ -136,6 +150,15 @@ if [ "$CARGOTARGET" != "" ] ; then
   sed -i "s|target/release|target/$RELEASEDIR/release|" Makefile
 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
+
+export CARGO_HOME=.cargo
+
 CXXFLAGS="$SLKCFLAGS" \
 CARGO_FLAGS="$CARGOTARGET" \
 make -j1 prefix=/usr
@@ -152,12 +175,13 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr
 find $PKG/usr/man -type f -exec gzip -9 {} \;
 
 cp -a \
-  CHANGELOG.md LICENSE README.md TODO \
+  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
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/network/newsboat/newsboat.info b/network/newsboat/newsboat.info
index 5a9e17c29f..57a50f27b5 100644
--- a/network/newsboat/newsboat.info
+++ b/network/newsboat/newsboat.info
@@ -1,212 +1,240 @@
 PRGNAM="newsboat"
-VERSION="2.16.1"
+VERSION="2.34"
 HOMEPAGE="https://www.newsboat.org/"
-DOWNLOAD="https://newsboat.org/releases/2.16.1/newsboat-2.16.1.tar.xz \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/aho-corasick/aho-corasick-0.6.9.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/argon2rs/argon2rs-0.2.5.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/arrayvec/arrayvec-0.4.10.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/autocfg/autocfg-0.1.2.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/backtrace-sys/backtrace-sys-0.1.28.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/backtrace/backtrace-0.3.13.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/bit-set/bit-set-0.5.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/bit-vec/bit-vec-0.5.1.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/blake2-rfc/blake2-rfc-0.2.18.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/cc/cc-1.0.29.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/cfg-if/cfg-if-0.1.6.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/chrono/chrono-0.4.6.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/clap/clap-2.33.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/constant_time_eq/constant_time_eq-0.1.3.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/curl-sys/curl-sys-0.4.5.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/dirs/dirs-1.0.4.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/failure/failure-0.1.5.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/failure_derive/failure_derive-0.1.5.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/fnv/fnv-1.0.6.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/gettext-rs/gettext-rs-0.4.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/gettext-sys/gettext-sys-0.19.8.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/kernel32-sys/kernel32-sys-0.2.2.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/lazy_static/lazy_static-0.2.11.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/lazy_static/lazy_static-1.2.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/libc/libc-0.2.48.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/libz-sys/libz-sys-1.0.17.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/locale_config/locale_config-0.2.2.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/lock_api/lock_api-0.1.5.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.1.3.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/nodrop/nodrop-0.1.13.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/nom/nom-4.2.3.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/num-integer/num-integer-0.1.39.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/once_cell/once_cell-0.1.8.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/openssl-sys/openssl-sys-0.9.46.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/parking_lot/parking_lot-0.7.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/parking_lot_core/parking_lot_core-0.4.0.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/proc-macro2/proc-macro2-0.4.27.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/proptest/proptest-0.7.2.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/quote/quote-0.6.11.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/rand-0.5.6.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/rand/rand-0.6.5.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/rand_chacha/rand_chacha-0.1.1.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.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/rand_hc/rand_hc-0.1.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/rand_isaac/rand_isaac-0.1.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/rand_jitter/rand_jitter-0.1.3.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/rand_os/rand_os-0.1.2.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/rand_pcg/rand_pcg-0.1.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/rand_xorshift/rand_xorshift-0.1.1.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.51.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/redox_users/redox_users-0.2.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/regex-syntax/regex-syntax-0.4.2.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/regex-syntax/regex-syntax-0.5.6.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/regex-syntax/regex-syntax-0.6.5.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/regex/regex-0.2.11.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/regex/regex-1.1.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/remove_dir_all/remove_dir_all-0.5.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/rustc-demangle/rustc-demangle-0.1.13.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/rusty-fork/rusty-fork-0.2.1.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/scopeguard/scopeguard-0.3.3.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/smallvec/smallvec-0.6.8.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/syn/syn-0.15.26.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/synstructure/synstructure-0.10.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/tempfile/tempfile-3.0.6.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-0.3.6.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/time/time-0.1.42.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-segmentation/unicode-segmentation-1.2.1.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/unicode-xid/unicode-xid-0.1.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/unreachable/unreachable-1.0.0.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/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/version_check/version_check-0.1.5.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/wait-timeout/wait-timeout-0.1.5.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/winapi/winapi-0.2.8.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/winapi/winapi-0.3.6.crate"
-MD5SUM="8cb3a173cb0aa89ef40c18a01d6f0732 \
-        d26d000426208c255a95368923467618 \
-        e1efb9a37395a38bd80ccfc911d4a6e8 \
-        46a048c0b8b765bcbdc131e166410510 \
-        59f345457ff5690527e5a9a863856a75 \
-        b94bcb41f342404852b7d763700fb6fe \
-        d38ff4b8e1d15e7488420ea9c428e8a2 \
-        a5c5256b590620d2344a2e5dc5a79af9 \
-        e9c5e38e5371071eb97de27e204dd3d6 \
-        e5767560aad375059c975285c07022c0 \
-        027635e453eccbfd0a2b02a440e334a6 \
-        85ee799e11dc75b822045f440f00e62a \
-        daa64e5a0e1b6d710877be51f27ccd3c \
-        ed2b1c5fd000f926c2aedb0c3bd1d199 \
-        135f6d6306e50606f0475ada50c33ce2 \
-        1c8b50f8528dd37df7d984e0e4b61bd5 \
-        701334c674b3fc3ace74045e3a2fae50 \
-        25bf715a8e88aeca16633c33f9b6d932 \
-        701d24caea00efef86966950d11900da \
-        6d780ab18da07be9ed423e7edfbcfd7e \
-        e8e663e88ee02ec47cfb984382cb62ae \
-        b0fd8ad50f5e64c71f0daf8af79ca952 \
-        27260b46db6b9ac40318143d70a80ba3 \
-        e5eadbf9c92867ed30b7d9e772e46f10 \
-        118f516871262287864157772d51ca12 \
-        89cabfcb37602a7b200b1a9cd660ee2e \
-        9d033cc2daa6924420a4a89e6705773f \
-        527a21498a2024a22701808bfc3eba54 \
-        330c760718d1130f318457fe4725b0dd \
-        7091a59caa55c94b0b088bf1814b85fd \
-        9b6701c1f22494454d9c6c87187c6b3a \
-        25c6e48abb18260fb7aedcb340cdd8d0 \
-        ac6a4d0d3c5cd5718800d285c2da55c5 \
-        7916dcd738a8fa6a2798754c20d6e146 \
-        853896d75f0103a9c61f933cb8f1f40a \
-        8a39d8bd95f15af0840d2049f0e78a37 \
-        92bcd45a654d9e24c86f3465c6387c47 \
-        4092ed5c67c6ff1c6a7bcf463bc40a53 \
-        cbdebc326641fcab42bc92a113548740 \
-        758bb6105f13a925fad3d384af0ecc78 \
-        254017876c89feab72dd61d37a617653 \
-        e0493a4c121cded246f611c435dce2b7 \
-        f59fef46e6ebc8bfcca5bd8c05e23089 \
-        8a5fc6ba84f3ac8a7e43ecb99322866c \
-        87a9d36f5ebe5eae0c3e8d69d58752e1 \
-        4692e7114db87556e0edd3750cdef9ac \
-        44a4077593da78251dbe3152de73ccc5 \
-        4563373184ff931ec276dc1a659d52d2 \
-        ed68fecc548f1bd3e6415764c21af10c \
-        9e99a37f8c37bb953732ef46ac2b12a1 \
-        936be8fb046f02bd6a336ffbbf02b3b3 \
-        793627c8c18012ad77cb3e81fa4c2195 \
-        3ab5a79607a4d260bf61cd99dc82ab05 \
-        8cab41822d03dfa674870315308fa392 \
-        7058895bdca83bbda052d66b087f902e \
-        28b1e6d15e1ba8cf3a2e953ce7fcd3de \
-        74b15f1928431937f14ed91fdc12b542 \
-        43ad2d3886f3b95564b5d46fb7e3ccec \
-        5ccf992fee1f4744f9d1aa9d45d5b5db \
-        3f5b37c228efbd014e7bb617f2abedf1 \
-        7826deb76941fc36c2391951bd65ba47 \
-        c8d655d206cbe48b84a22544d6fc6d15 \
-        3056ab938614a0a76bd60dff8bb3b519 \
-        f91e69d935946bdc258a0ed22dceeaad \
-        54a8acc2e193a77476d7517963cbfdc0 \
-        de7bb5037caf6403d859c56b09fedcd2 \
-        90a40d2cf8b2d7c3d21a80f3af7693ad \
-        d3652677415c9ed4cae3b602316ff8bd \
-        9f099c64e6db617887ba150c117baf13 \
-        09422dcb1cd6e3c30598296d2d3d4798 \
-        cc9ba070db558012ede5e80022020e1b \
-        4d101ab24d14c54937c5f45ece8fad5f \
-        8f316480245db44925b8f70ab3e18559 \
-        b492e0a70603c3903a44ec5cabd3ba21 \
-        500e5bb7d9b5a8882e2e961012391a58 \
-        8b4d8c7b6e3a060d365bc1ad650929fa \
-        64111c20b69aa1532fb66b70c4660b55 \
-        7711037ca3fab7e50a9f732935d24e1d \
-        5b9db74833b5ff325b1b9aa7fe96d5f8 \
-        d155c08de6c18bd55639ffed629894b9 \
-        df95befa0dfecdf80b51ad30deb4d320 \
-        a8de006fe0c7e373c560dd51599287a8 \
-        baaa166f66e90e94b76b7418afd5df90 \
-        3d311d2cedf2d3d7b11b32baf470b178 \
-        d34a9f507f3ecf7d93c07deb74f1cd7c \
-        f403bbb812ce1a2d9270d9159cf9e8d3 \
-        60eec117e8efaa29b898e43319da2b05 \
-        8861b627334c6ecbb355741162ea6022 \
-        d7c493ca4f84a7d50b53646421a37487 \
-        5aaf04f9a94a6450e3e4963ddd62b92d \
-        b390278bbea483da591b1bc026be5fa2 \
-        32f0ced8a8881d2c0572b879bf15b91e \
-        9c27232c12abb96c68e10e21f2012639 \
-        e75c0721667b6bc86472ecf7b286d9fc \
-        f48add3d6234e8b9829fa5364509f425 \
-        689203efc084fc0f1d1f74f5d354ae75 \
-        2c263ce21ea756b9a2cb626a36750efb \
-        c900e7dbce808ff8ced375077b17a163 \
+DOWNLOAD="https://newsboat.org/releases/2.34/newsboat-2.34.tar.xz \
+          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/aho-corasick/aho-corasick-1.1.1.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/autocfg/autocfg-1.1.0.crate \
+          https://static.crates.io/crates/backtrace/backtrace-0.3.69.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.1.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/byteorder/byteorder-1.4.3.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/codespan-reporting/codespan-reporting-0.11.1.crate \
+          https://static.crates.io/crates/core-foundation-sys/core-foundation-sys-0.8.4.crate \
+          https://static.crates.io/crates/curl-sys/curl-sys-0.4.70%2Bcurl-8.5.0.crate \
+          https://static.crates.io/crates/cxx-build/cxx-build-1.0.111.crate \
+          https://static.crates.io/crates/cxx/cxx-1.0.111.crate \
+          https://static.crates.io/crates/cxxbridge-flags/cxxbridge-flags-1.0.111.crate \
+          https://static.crates.io/crates/cxxbridge-macro/cxxbridge-macro-1.0.111.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/fastrand/fastrand-2.0.1.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/getrandom/getrandom-0.2.10.crate \
+          https://static.crates.io/crates/gettext-rs/gettext-rs-0.7.0.crate \
+          https://static.crates.io/crates/gettext-sys/gettext-sys-0.21.3.crate \
+          https://static.crates.io/crates/gimli/gimli-0.28.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.57.crate \
+          https://static.crates.io/crates/idna/idna-0.5.0.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/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.7.crate \
+          https://static.crates.io/crates/libz-sys/libz-sys-1.1.12.crate \
+          https://static.crates.io/crates/link-cplusplus/link-cplusplus-1.0.9.crate \
+          https://static.crates.io/crates/linux-raw-sys/linux-raw-sys-0.4.10.crate \
+          https://static.crates.io/crates/locale_config/locale_config-0.3.0.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/md5/md5-0.7.0.crate \
+          https://static.crates.io/crates/memchr/memchr-2.6.3.crate \
+          https://static.crates.io/crates/minimal-lexical/minimal-lexical-0.2.1.crate \
+          https://static.crates.io/crates/miniz_oxide/miniz_oxide-0.7.1.crate \
+          https://static.crates.io/crates/natord/natord-1.0.9.crate \
+          https://static.crates.io/crates/nom/nom-7.1.3.crate \
+          https://static.crates.io/crates/num-traits/num-traits-0.2.16.crate \
+          https://static.crates.io/crates/objc-foundation/objc-foundation-0.1.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/object/object-0.32.1.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/pkg-config/pkg-config-0.3.27.crate \
+          https://static.crates.io/crates/ppv-lite86/ppv-lite86-0.2.17.crate \
+          https://static.crates.io/crates/proc-macro2/proc-macro2-1.0.67.crate \
+          https://static.crates.io/crates/proptest/proptest-1.2.0.crate \
+          https://static.crates.io/crates/quick-error/quick-error-1.2.3.crate \
+          https://static.crates.io/crates/quote/quote-1.0.33.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/rand_xorshift/rand_xorshift-0.3.0.crate \
+          https://static.crates.io/crates/redox_syscall/redox_syscall-0.4.1.crate \
+          https://static.crates.io/crates/regex-automata/regex-automata-0.3.8.crate \
+          https://static.crates.io/crates/regex-syntax/regex-syntax-0.6.29.crate \
+          https://static.crates.io/crates/regex-syntax/regex-syntax-0.7.5.crate \
+          https://static.crates.io/crates/regex/regex-1.9.5.crate \
+          https://static.crates.io/crates/rustc-demangle/rustc-demangle-0.1.23.crate \
+          https://static.crates.io/crates/rustix/rustix-0.38.21.crate \
+          https://static.crates.io/crates/rusty-fork/rusty-fork-0.3.0.crate \
+          https://static.crates.io/crates/scratch/scratch-1.0.7.crate \
+          https://static.crates.io/crates/section_testing/section_testing-0.0.5.crate \
+          https://static.crates.io/crates/syn/syn-2.0.37.crate \
+          https://static.crates.io/crates/temp-dir/temp-dir-0.1.11.crate \
+          https://static.crates.io/crates/tempfile/tempfile-3.8.1.crate \
+          https://static.crates.io/crates/termcolor/termcolor-1.3.0.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/unarray/unarray-0.1.4.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/unicode-width/unicode-width-0.1.11.crate \
+          https://static.crates.io/crates/url/url-2.5.0.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/wasi/wasi-0.11.0%2Bwasi-snapshot-preview1.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-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/windows-0.48.0.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/xdg/xdg-2.5.2.crate"
+MD5SUM="e2dedca7d28e53fbc2f117bad343ec27 \
+        55e15000c4c210f0bb2aca6f38fbe424 \
+        669215548c64019c08c92b2c1afd3deb \
+        245579618dd635377c5987690a7e2153 \
+        e0a03581a6aea080315323651f272d65 \
+        bf23cd323c33a8c283c41bb9b79e4ce4 \
+        05d77ef52e90ad161fdd41b252420467 \
+        66c5beb5a77eccb0d86ce626651f393b \
+        b174984f0ec889f5c32e90bddb80f674 \
+        45a867175c81501378699f80724393c0 \
+        a295edb6953237ebbdfa8e731229f9a3 \
+        ebcf604c44976809506192718f439dc1 \
+        ea2d23ceb9f98853a7dffc6c02884464 \
+        d8cacbb844fca8c0ca102c7576946131 \
+        1e704be5ddde9d6b5383ef1035309f91 \
+        9241fa90ea8b17c00010be46c9aa1ac5 \
+        74634128440dbc3766bda76fdf0aaa05 \
+        ddca5e4cff2fcc78d99a9efe991c5cf2 \
+        faa32da3be14130a4525bb7ba601c62e \
+        b477cc1c7b45e2187b3cad0377b504d8 \
+        b4b1c9ce4db1569f17f64239adcdbeae \
+        e198b52b3219b6be4a3f6bea2158f03e \
+        7608f1c36c68ce36c1428a5183b9c419 \
+        89d343b23ff81dc1af48a1043f7a7202 \
+        52dc52f9c2adfdba6f0d90ca7b92042f \
+        fc65414dcac661c46f2cfad7722304f9 \
+        33479bc3e6a76008f4d1654925cd3a94 \
+        80e1c1b89d858c93fc5946b4a8266504 \
+        8dab3b3ec00dc56cffde0b0c410d47b5 \
+        c3e51926c9853b714191ef1bec90e2ce \
+        f204ba6fc9394724826f177433fe9a98 \
+        bb072f15d5e4067bea6933a4fbeb9c0a \
+        9486190bcfe1c4af6a50d265a113ac12 \
+        6646a563c6f7e9b24d9db2271b720a2b \
+        87b1b7cb12ef4dfe842c212b98263048 \
+        7ff000f771e742396faed3c83c82fab4 \
+        b5305bde14813da51d536a9df564db69 \
+        d580c0380408c62e04e018eaaf4258af \
+        fba3b040a55c01be7376d3dd5c4d4920 \
+        d71093319a2c1efa90475bd45d34fab3 \
+        181cb83a57d327b26ebc21db41b28480 \
+        71bf1bf53c8321f7f1cbc13575353d6b \
+        779addfdf18a31c1d8d3f53b7a8395e0 \
+        d6c6a27e29d9270a2ac318eacdf8e436 \
+        70bd18c57397442e0abc67dfa1c99e0f \
+        6fa7c4b0da26b511570845e41527bc8f \
+        8ee79b4fe4c43d9ab09f16344612a656 \
+        7c81e7a61ec172a229d6fdbc553e883d \
+        65470cdfd1fa2a2de9fdf873a58d72aa \
+        0f6cf3b35ff80cee7da9243e76c94532 \
+        8b708bc4b33c5e1683467444c9ed41b0 \
+        eb7e04508518ed8f29935ec874e1740a \
+        5a9b94ba54ea1f52f2a496ba982e3282 \
+        f17aecb8887cf0ecd823623160aed7db \
+        256ede6773f2f67e26e92f36c04eb4f7 \
+        aecd889de42c8168e1bc97a6f2720d8f \
+        b4dcac855af5df71f3383d86c4a96b78 \
+        fd9aa273ad560dedd00ddcf3dbe808ce \
+        ecddc695e4dba2383b326dc361e9e07d \
+        2dc8aacabbc090f8025a4789d4d6d8f0 \
+        0ba30a94d7b8865c23e86d4d64e5b91e \
+        73d4dff694f3acab34c217b4f4943a37 \
+        5c69337d37e58a380e00eac9ce0373bb \
+        80235d435deb3e8c2f28a8e666cae1a2 \
+        61b3316c1f5c6059bef9022fe8a08685 \
+        3181dca31efe33cbed29a45d0ec67848 \
+        0ddb8bccd3198892d0dd0ec7151f7cd3 \
+        ee7a5f842c39bc47c474196e83b0df5f \
+        e30085994bbeb4b7f4895d48216d5476 \
+        a1626b8f4d165b1b60d960862eba4cf0 \
+        f9e79ef04a0f168cd981aaf93eb25272 \
+        ff1d093069cfc9eb161907e17a51208b \
+        9e3731fbbac07e3f5363d5527765fb41 \
+        f2303650593b13e30a85e39d8c79c961 \
+        5ad40eb548ec91179c2e5bafd26f1d30 \
+        32f2a2626ae2f18e34cbb7d814ca8d37 \
+        24fcbc2986fad09b25c9a4f9aef0a9e4 \
+        3bd91868192fbb6c457c856a1a430a3d \
+        13268e6ab4023043e6dd8e993ce8b88a \
+        bb56e53d09b09eb11536cb69734564de \
+        b13390ad50aa277e39e4d46f7ed3eb14 \
+        344753a95db4f193f068b3cf4b75d83b \
+        73ff8cffc66d065488dcf50e3b8c0c1f \
+        f80faded72df19d43134e2b44137376a \
+        be0724e892719d0813323cbb4bfb5372 \
+        5f0470696baaa4e5953bddbf196998f9 \
+        c678a7da0ee4b850ebde0474144a0415 \
+        00dda16f17b456d99fb1cafa9125ed22 \
+        04c5de5f2fcb441ced909a45cff020bd \
+        ca65153603a1a7240bbd9d2ce19f2d67 \
+        c12d182417999fc365f952e701f6071f \
+        908ec8a89821b72f3a35726bab24461f \
+        e547b0e754cd61f24f9ef8c9e26fcd95 \
+        e900a384ac7dbb320fe6a7279fbfef89 \
+        6708629acf3d2ecb7404e43255d2df85 \
+        e972ea58ec203bfa6c79c1207852298b \
+        e1aaf0d487ef02def77307a74ee35606 \
+        b3139f7d066250bfaf96b99e913ee75d \
+        e41541041285d9f05d372cdac02a4bf7 \
+        4185de0682e5e5f3a9f13285218e59aa \
+        64f9f5c520b25087ba70e4194d6aea9c \
         db96b50050277bf05a3c68534bbb9586 \
+        306c0281447d1876e8220007b7a7e053 \
         09de9d01e7331ff3da11f58be8bef0df \
-        b44489eb4799c4fabac3fceb48de54f7 \
-        40909511b3d0e2dba891f438715808d0"
+        0498c4a11448bfc35dc7bb2caa64c753 \
+        f2797ade0e36f1e5d6be9d11b5076582 \
+        24c64817e85ef77765ed0f26c31c9b4c \
+        f4620d6217497ee2c54090cd353ceec4 \
+        dae6d89034a6988042fd8be4cf5e037d \
+        de2839e16d9d7a9fd1c397da62f62b4a \
+        e0c35ffb8cfdb74a39bf799811f79304 \
+        d990172b607020701f9e84ca8e1c043c \
+        0a68848588e847ceccf504891584d00b \
+        45b469ad607b912256b7c80141fa2d17 \
+        7799baff9a5664205d9110a2624e8989 \
+        1613d0f9e24d4b05e81748ea1f355f6c"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="stfl"
+REQUIRES="stfl rust16"
 MAINTAINER="Andrew Clemons"
 EMAIL="andrew.clemons@gmail.com"
diff --git a/network/nextcloud-client/README b/network/nextcloud-client/README
deleted file mode 100644
index cd3a1eda51..0000000000
--- a/network/nextcloud-client/README
+++ /dev/null
@@ -1,13 +0,0 @@
-The Nextcloud Client is a file synchronization desktop utility. It synchronizes
-files on your local computer, tablet, or hand-held device with a Nextcloud
-Server. If you make a change to the files on one device, the change is
-propagated to all other synchronized devices using the desktop synchronization
-clients.
-
-Normally, you start the client by clicking on the desktop icon or by starting
-it from the client application menu. After starting, a Nextcloud icon appears
-in the computer system tray or on your tablet or handheld device.
-
-Nextcloud is an actively maintained fork of ownCloud.
-
-Important: install qt5 first, then build qtkeychain.
diff --git a/network/nextcloud-client/doinst.sh b/network/nextcloud-client/doinst.sh
deleted file mode 100644
index bb8462acaa..0000000000
--- a/network/nextcloud-client/doinst.sh
+++ /dev/null
@@ -1,24 +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/Nextcloud/sync-exclude.lst.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/network/nextcloud-client/nextcloud-client.SlackBuild b/network/nextcloud-client/nextcloud-client.SlackBuild
deleted file mode 100644
index 61bb4e7bde..0000000000
--- a/network/nextcloud-client/nextcloud-client.SlackBuild
+++ /dev/null
@@ -1,118 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for nextcloud-client
-
-# Copyright 2013-2016 Christopher Walker Copperas Cove, TX
-# Copyright 2016-2018 Chris Abela <kristofru@gmail.com>, Malta
-# Copyright 2017-2018 Rodrigo Gimenez <estrod@zoho.com>, 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.
-
-# This is based on the owncloud-client slackbuild in https://slackbuilds.org
-
-PRGNAM=nextcloud-client
-VERSION=${VERSION:-2.3.3}
-OWNCLOUD_VERSION=${OWNCLOUD_VERSION:-2.4.2}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-SRCNAM=client_theming
-
-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
-tar xvf $CWD/client_theming-$VERSION.tar.gz
-mv $SRCNAM-$VERSION $SRCNAM
-cd $SRCNAM
-tar xvf $CWD/client-$OWNCLOUD_VERSION.tar.gz
-rmdir client
-mv client-$OWNCLOUD_VERSION client
-
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -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="$SLKCFLAGS" \
-    -DCMAKE_CXX_FLAGS="$SLKCFLAGS" \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DCMAKE_INSTALL_DOCDIR=/usr/doc/$PRGNAM-$VERSION \
-    -DCMAKE_INSTALL_MANDIR=/usr/man \
-    -DCMAKE_INSTALL_SYSCONFDIR=/etc/$PRGNAM \
-    -DCMAKE_BUILD_TYPE="Release" \
-    -D OEM_THEME_DIR=$(realpath ../nextcloudtheme) \
-    ../client
-  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 LICENSE  README.md \
-  $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-[ -d "$PKG/usr/man" ] && find $PKG/usr/man -type f -exec gzip -9 '{}' \;
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-cat $CWD/doinst.sh > $PKG/install/doinst.sh
-
-cat $CWD/nextcloud.desktop > $PKG/usr/share/applications/nextcloud.desktop
-mv $PKG/etc/Nextcloud/sync-exclude.lst $PKG/etc/Nextcloud/sync-exclude.lst.new
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/network/nextcloud-client/nextcloud-client.info b/network/nextcloud-client/nextcloud-client.info
deleted file mode 100644
index e2484f63a1..0000000000
--- a/network/nextcloud-client/nextcloud-client.info
+++ /dev/null
@@ -1,12 +0,0 @@
-PRGNAM="nextcloud-client"
-VERSION="2.3.3"
-HOMEPAGE="https://nextcloud.com/"
-DOWNLOAD="https://github.com/nextcloud/client_theming/archive/v2.3.3/client_theming-2.3.3.tar.gz \
-          https://github.com/owncloud/client/archive/v2.4.2/client-2.4.2.tar.gz"
-MD5SUM="ad74d32b6c9f6da1b8e145fd586ad13e \
-        c0a01710f340a840cf38e4573034be2b"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="qt5-webkit qtkeychain"
-MAINTAINER="Rodrigo Gimenez"
-EMAIL="estrod@zoho.com"
diff --git a/network/nextcloud-client/nextcloud.desktop b/network/nextcloud-client/nextcloud.desktop
deleted file mode 100644
index e816fcc710..0000000000
--- a/network/nextcloud-client/nextcloud.desktop
+++ /dev/null
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Name=Nextcloud desktop sync client 
-Comment=Nextcloud desktop sync client
-Exec=/usr/bin/nextcloud
-Icon=Nextcloud
-Type=Application
-GenericName=Folder Sync
-Categories=Network;FileTransfer;X-Cloud;X-Sync;
diff --git a/network/nextcloud-client/slack-desc b/network/nextcloud-client/slack-desc
deleted file mode 100644
index 76d70047e1..0000000000
--- a/network/nextcloud-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------------------------------------------------------|
-nextcloud-client: nextcloud-client (Nextcloud Desktop Client)
-nextcloud-client:
-nextcloud-client: The Nextcloud Client is a file synchronization desktop utility. It
-nextcloud-client: synchronizes files on your local computer, tablet, or hand-held
-nextcloud-client: device with a Nextcloud Server. If you make a change to the files on
-nextcloud-client: one device, the change is propagated to all other synchronized
-nextcloud-client: devices using the desktop synchronization clients.
-nextcloud-client:
-nextcloud-client: Nextcloud is an actively maintained fork of ownCloud.
-nextcloud-client:
-nextcloud-client: Homepage: http://nextcloud.com/
diff --git a/network/nextcloud-desktop/README b/network/nextcloud-desktop/README
new file mode 100644
index 0000000000..da9c4b07e7
--- /dev/null
+++ b/network/nextcloud-desktop/README
@@ -0,0 +1,2 @@
+The Nextcloud Desktop Client is a tool to synchronize files from
+Nextcloud Server with your computer.
diff --git a/network/nextcloud-desktop/doinst.sh b/network/nextcloud-desktop/doinst.sh
new file mode 100644
index 0000000000..1fc4aa5bc1
--- /dev/null
+++ b/network/nextcloud-desktop/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
+  # Otherwise, we leave the .new copy for the admin to consider...
+}
+
+config etc/Nextcloud/sync-exclude.lst.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/network/nextcloud-desktop/nextcloud-desktop.SlackBuild b/network/nextcloud-desktop/nextcloud-desktop.SlackBuild
new file mode 100644
index 0000000000..7bd204277b
--- /dev/null
+++ b/network/nextcloud-desktop/nextcloud-desktop.SlackBuild
@@ -0,0 +1,125 @@
+#!/bin/bash
+
+# Slackware build script for Nextcloud Desktop Client
+
+# Copyright 2022-2024 Andrew Payne <phalange@komputermatrix.com>
+# Copyright 2017-2018 Rodrigo Gimenez <estrod@zoho.com>, Argentina
+# Copyright 2016-2018 Chris Abela <kristofru@gmail.com>, Malta
+# Copyright 2013-2016 Christopher Walker Copperas Cove, TX
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=nextcloud-desktop
+SRCNAM=desktop
+VERSION=${VERSION:-3.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
+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
+
+# handle tarball with a truncated name
+tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
+
+mv $SRCNAM-$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 640 -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 \
+  -DLIB_SUFFIX=${LIBDIRSUFFIX} \
+  -DMAN_INSTALL_DIR=/usr/man \
+  -DCMAKE_BUILD_TYPE=Release
+make
+make install DESTDIR=$PKG
+
+# Strip binaries and libraries
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+# Don't overwrite existing config file:
+mv $PKG/etc/Nextcloud/sync-exclude.lst $PKG/etc/Nextcloud/sync-exclude.lst.new
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a {CONTRIBUTING.md,COPYING,COPYING.documentation,README.md} \
+   $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+# put the manual in the right place skipping uneeded files
+# we'll work around sphinx by converting the rst files to man pages
+mkdir -p $PKG/usr/man/man1
+rst2man --no-file-insertion -r 5 \
+        $TMP/$PRGNAM-$VERSION/man/nextcloud.1.rst $PKG/usr/man/man1/nextcloud.1
+rst2man --no-file-insertion -r 5 \
+        $TMP/$PRGNAM-$VERSION/man/nextcloudcmd.1.rst $PKG/usr/man/man1/nextcloudcmd.1
+
+find $PKG/usr/man/man1 -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man/man1 -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/network/nextcloud-desktop/nextcloud-desktop.info b/network/nextcloud-desktop/nextcloud-desktop.info
new file mode 100644
index 0000000000..a6a8559331
--- /dev/null
+++ b/network/nextcloud-desktop/nextcloud-desktop.info
@@ -0,0 +1,10 @@
+PRGNAM="nextcloud-desktop"
+VERSION="3.12.3"
+HOMEPAGE="https://nextcloud.com/"
+DOWNLOAD="UNSUPPORTED"
+MD5SUM=""
+DOWNLOAD_x86_64="https://github.com/nextcloud/desktop/archive/refs/tags/v3.12.3/desktop-3.12.3.tar.gz"
+MD5SUM_x86_64="e018bec41afc23060ea6afea6108e94f"
+REQUIRES=""
+MAINTAINER="Andrew Payne"
+EMAIL="phalange@komputermatrix.com"
diff --git a/network/nextcloud-desktop/slack-desc b/network/nextcloud-desktop/slack-desc
new file mode 100644
index 0000000000..769cfc1b1c
--- /dev/null
+++ b/network/nextcloud-desktop/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+                 |-----handy-ruler------------------------------------------------------|
+nextcloud-desktop: nextcloud-desktop (Nextcloud Desktop Client)
+nextcloud-desktop:
+nextcloud-desktop: The computer Nextcloud Desktop Client is a tool to synchronize files
+nextcloud-desktop: from Nextcloud Server with your computer.
+nextcloud-desktop:
+nextcloud-desktop:
+nextcloud-desktop:
+nextcloud-desktop:
+nextcloud-desktop: Homepage: https://nextcloud.com/
+nextcloud-desktop:
+nextcloud-desktop:
diff --git a/network/nextcloud-server/nextcloud-server.SlackBuild b/network/nextcloud-server/nextcloud-server.SlackBuild
index 1a139248f2..dfc5fd4850 100644
--- a/network/nextcloud-server/nextcloud-server.SlackBuild
+++ b/network/nextcloud-server/nextcloud-server.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for nextcloud-server
 
@@ -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=nextcloud-server
 SRCNAM=nextcloud
-VERSION=${VERSION:-13.0.7}
+VERSION=${VERSION:-18.0.4}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 ARCH=noarch
 
@@ -34,7 +37,14 @@ DOCROOT=${DOCROOT:-/srv/httpd/htdocs}
 PHPUSER=${PHPUSER:-apache}
 PHPGROUP=${PHPGROUP:-apache}
 
-CWD=$(pwd)
+# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
+# the name of the created package would be, and then exit. This information
+# could be useful to other scripts.
+if [ ! -z "${PRINT_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/network/nextcloud-server/nextcloud-server.info b/network/nextcloud-server/nextcloud-server.info
index 4087894048..42fbb27b4b 100644
--- a/network/nextcloud-server/nextcloud-server.info
+++ b/network/nextcloud-server/nextcloud-server.info
@@ -1,8 +1,8 @@
 PRGNAM="nextcloud-server"
-VERSION="13.0.7"
+VERSION="18.0.4"
 HOMEPAGE="https://nextcloud.com/"
-DOWNLOAD="https://download.nextcloud.com/server/releases/nextcloud-13.0.7.tar.bz2"
-MD5SUM="ee0c0e53a1ac8e2feb3ce0fdfe27f9b2"
+DOWNLOAD="https://download.nextcloud.com/server/releases/nextcloud-18.0.4.tar.bz2"
+MD5SUM="d2f3c7bd402ef61d30a576d165fe7c1d"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/network/nfdump/nfdump.SlackBuild b/network/nfdump/nfdump.SlackBuild
index ab06d987ab..0028e69055 100644
--- a/network/nfdump/nfdump.SlackBuild
+++ b/network/nfdump/nfdump.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for nfdump
 
@@ -24,26 +24,36 @@
 
 # Modified by Mario Preksavec <mario@slackware.hr>
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=nfdump
 VERSION=${VERSION:-1.6.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"
@@ -71,7 +81,7 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-CFLAGS="$SLKCFLAGS -fgnu89-inline" \
+CFLAGS="$SLKCFLAGS -fgnu89-inline -fcommon" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
@@ -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/network/nghttp2/README b/network/nghttp2/README
deleted file mode 100644
index 3d05758f54..0000000000
--- a/network/nghttp2/README
+++ /dev/null
@@ -1,4 +0,0 @@
-nghttp2 is an implementation of HTTP/2 and its header compression
-algorithm HPACK in C.
-The framing layer of HTTP/2 is implemented as a form of reusable C
-library.
diff --git a/network/nghttp2/nghttp2.SlackBuild b/network/nghttp2/nghttp2.SlackBuild
deleted file mode 100644
index 39af89748f..0000000000
--- a/network/nghttp2/nghttp2.SlackBuild
+++ /dev/null
@@ -1,102 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for "nghttp2".
-
-# Copyright 2016 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=nghttp2
-VERSION=${VERSION:-1.16.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.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 \
-  --disable-python-bindings \
-  --with-jemalloc \
-  --disable-static \
-  --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 -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
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/network/nghttp2/nghttp2.info b/network/nghttp2/nghttp2.info
deleted file mode 100644
index 11476aa1b8..0000000000
--- a/network/nghttp2/nghttp2.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="nghttp2"
-VERSION="1.16.1"
-HOMEPAGE="https://nghttp2.org/"
-DOWNLOAD="https://github.com/nghttp2/nghttp2/releases/download/v1.16.1/nghttp2-1.16.1.tar.xz"
-MD5SUM="bde0dca3fd5da7bc5c7c8470ed0674b5"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="jansson"
-MAINTAINER="Marcel Saegebarth"
-EMAIL="marc@mos6581.de"
diff --git a/network/nghttp2/slack-desc b/network/nghttp2/slack-desc
deleted file mode 100644
index a1d218da43..0000000000
--- a/network/nghttp2/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------------------------------------------------------|
-nghttp2: nghttp2 (HTTP/2 implementation)
-nghttp2:
-nghttp2: nghttp2 is an implementation of HTTP/2 and its header compression
-nghttp2: algorithm HPACK in C.
-nghttp2: The framing layer of HTTP/2 is implemented as a form of reusable C
-nghttp2: library.
-nghttp2:
-nghttp2: Homepage: https://nghttp2.org/
-nghttp2:
-nghttp2:
-nghttp2:
diff --git a/network/nginx/README b/network/nginx/README
index 74a77e254d..b8437d7888 100644
--- a/network/nginx/README
+++ b/network/nginx/README
@@ -4,31 +4,32 @@ as well as an IMAP/POP3 proxy server.
 By default, nginx will use the "nobody" user and group accounts. You may
 specify alternate values on the command line if desired; for example:
 
-    NGINXUSER=backup NGINXGROUP=backup ./nginx.SlackBuild
+  NGINXUSER=backup NGINXGROUP=backup ./nginx.SlackBuild
 
-Regardless of which user and group you decide to use, you will need to make
-sure they exist on both the build system and the target system.
+Regardless of which user and group you decide to use, you will need to
+make sure they exist on both the build system and the target system.
 
-Geoip support is now available as an option using the GeopIP package. If you wish
-to enable GeoIP the pass GEOIP variable to the slackbuild:
+Geoip support is now available as an option using the GeopIP
+package. If you wish to enable GeoIP the pass GEOIP variable to the
+slackbuild:
 
-    GEOIP=yes ./nginx.SlackBuild
+  GEOIP=yes ./nginx.SlackBuild
 
-Support for gperftools is available as an option using the gperftools package.
-If you wish to enable gperftools pass the GPERF variable to the slackbuild:
+Support for gperftools is available as an option using the gperftools
+package. If you wish to enable gperftools pass the GPERF variable to
+the slackbuild:
 
-    GPERF=yes ./nginx.SlackBuild
+  GPERF=yes ./nginx.SlackBuild
 
-Extra modules not included with stock nginx can be added by passing them as a
-variable to the slackbuild as a space separated list of full paths to modules.
-List of extra 3rd party modules available at http://wiki.nginx.org/3rdPartyModules.
+Extra modules not included with stock nginx can be added by passing
+them as a variable to the slackbuild as a space separated list of
+full paths to modules.  List of extra 3rd party modules available at
+http://wiki.nginx.org/3rdPartyModules.
 
-    ADDMODULE="/tmp/passenger-release-5.0.13/ext/nginx" ./nginx.SlackBuild
+  ADDMODULE="/tmp/passenger-release-5.0.13/ext/nginx" ./nginx.SlackBuild
 
-Using the optional dynamic loadable module support in nginx >= 1.10.0. Understand
-that dynamic modules are a new feature in nginx and issues may arise until further
-testing is done.
+Using the optional dynamic loadable module support in nginx >=
+1.10.0. Understand that dynamic modules are a new feature in nginx and
+issues may arise until further testing is done.
 
-    DYNAMIC=yes ./nginx.SlackBuild
-
-Optional dependency: libwebp (requires gd to be recompiled)
+  DYNAMIC=yes ./nginx.SlackBuild
diff --git a/network/nginx/nginx.SlackBuild b/network/nginx/nginx.SlackBuild
index 4e47858118..4f1d69da2e 100644
--- a/network/nginx/nginx.SlackBuild
+++ b/network/nginx/nginx.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for nginx
 
@@ -27,10 +27,13 @@
 
 # Special thanks to Thomas Morper for some configuration adjustments tips
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=nginx
-VERSION=${VERSION:-1.12.2}
+VERSION=${VERSION:-1.23.2}
 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}
@@ -246,4 +256,4 @@ for i in $(find $PKG/etc/$PRGNAM -type f ! -name "*\.default"); do
 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/network/nginx/nginx.info b/network/nginx/nginx.info
index 862442df34..05ddb11d29 100644
--- a/network/nginx/nginx.info
+++ b/network/nginx/nginx.info
@@ -1,8 +1,8 @@
 PRGNAM="nginx"
-VERSION="1.12.2"
-HOMEPAGE="http://nginx.org/"
-DOWNLOAD="http://nginx.org/download/nginx-1.12.2.tar.gz"
-MD5SUM="4d2fc76211435f029271f1cf6d7eeae3"
+VERSION="1.23.2"
+HOMEPAGE="https://nginx.org/"
+DOWNLOAD="https://nginx.org/download/nginx-1.23.2.tar.gz"
+MD5SUM="131948d88349e20afd69a1b43b3c1d47"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/network/nginx/nginx.logrotate b/network/nginx/nginx.logrotate
index 626cebddba..1110c53702 100644
--- a/network/nginx/nginx.logrotate
+++ b/network/nginx/nginx.logrotate
@@ -2,7 +2,7 @@
   su @USER@ @GROUP@
   rotate 10
   notifempty
-  size=5M
+  size 5M
   compress
   delaycompress
   sharedscripts
diff --git a/network/ngircd/ngircd.SlackBuild b/network/ngircd/ngircd.SlackBuild
index 0b52da5332..0cf54b3854 100644
--- a/network/ngircd/ngircd.SlackBuild
+++ b/network/ngircd/ngircd.SlackBuild
@@ -1,13 +1,16 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for ngircd
 
 # Written by /dev/rob0 <rob0@slackbuilds.org>
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=ngircd
-VERSION=${VERSION:-24}
+VERSION=${VERSION:-26.1}
 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}
@@ -45,7 +55,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 . \
@@ -68,7 +78,7 @@ CXXFLAGS="$SLKCFLAGS" \
   --with-syslog \
   --without-tcp-wrappers \
   --with-iconv \
-  --without-pam \
+  --with-pam \
   --${do_ident} \
   --build=$ARCH-slackware-linux
 
@@ -82,7 +92,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 ChangeLog README COPYING INSTALL NEWS doc/*.txt \
+cp -a AUTHORS ChangeLog README.md COPYING INSTALL.md NEWS doc/*.txt \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
@@ -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/network/ngircd/ngircd.info b/network/ngircd/ngircd.info
index 472925788a..35cc3cafbd 100644
--- a/network/ngircd/ngircd.info
+++ b/network/ngircd/ngircd.info
@@ -1,8 +1,8 @@
 PRGNAM="ngircd"
-VERSION="24"
+VERSION="26.1"
 HOMEPAGE="https://ngircd.barton.de/"
-DOWNLOAD="https://ngircd.barton.de/pub/ngircd/ngircd-24.tar.gz"
-MD5SUM="59b2d56f6eb55b85225e91ebfbfc848b"
+DOWNLOAD="https://ngircd.barton.de/pub/ngircd/ngircd-26.1.tar.xz"
+MD5SUM="9fe97dec829ee09306d871ab8f0c194a"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/network/ngrep/README b/network/ngrep/README
index 5c94af27b4..b9d5da3356 100644
--- a/network/ngrep/README
+++ b/network/ngrep/README
@@ -1,14 +1,11 @@
 ngrep strives to provide most of GNU grep's common features, applying
 them to the network layer. ngrep is a pcap-aware tool that will allow
 you to specify extended regular or hexadecimal expressions to match
-against data payloads of packets. It currently recognizes IPv4/6, TCP,
-UDP, ICMPv4/6, IGMP and Raw across Ethernet, PPP, SLIP, FDDI, Token
-Ring and null interfaces, and understands BPF filter logic in the same
-fashion as more common packet sniffing tools, such as tcpdump and snoop.
+against data payloads of packets. It currently recognizes IPv4/6,
+TCP, UDP, ICMPv4/6, IGMP and Raw across Ethernet, PPP, SLIP, FDDI,
+Token Ring and null interfaces, and understands BPF filter logic in
+the same fashion as more common packet sniffing tools, such as tcpdump
+and snoop.
 
 ngrep is built with IPV6 support by default; to disable it, do this:
   NGREP_IPV6=no ./ngrep.SlackBuild
-
-A patch is included for IPV4 and IPV6 packet reassembly applied by default.
-The patch adds the -r switch to ngrep.  To disable the patch, do this:
-  ASSEM_PATCH=no ./ngrep.SlackBuild
diff --git a/network/ngrep/ngrep-1.45-reasm.diff b/network/ngrep/ngrep-1.45-reasm.diff
deleted file mode 100644
index ed33fb6f65..0000000000
--- a/network/ngrep/ngrep-1.45-reasm.diff
+++ /dev/null
@@ -1,939 +0,0 @@
-diff -urN ngrep-1.45/ipreasm.c ngrep-1.45-reasm/ipreasm.c
---- ngrep-1.45/ipreasm.c	1970-01-01 01:00:00.000000000 +0100
-+++ ngrep-1.45-reasm/ipreasm.c	2007-06-16 19:17:20.124795623 +0200
-@@ -0,0 +1,717 @@
-+/*
-+ * ipreasm -- Routines for reassembly of fragmented IPv4 and IPv6 packets.
-+ *
-+ * Copyright (c) 2007  Jan Andres <jandres@gmx.net>
-+ *
-+ */
-+
-+#include <stdio.h>
-+#include <stdlib.h>
-+#include <string.h>
-+#include <stddef.h>
-+
-+#ifdef HAVE_CONFIG_H
-+#include "config.h"
-+#endif /* HAVE_CONFIG_H */
-+
-+#include <netinet/ip.h>
-+#include <netinet/udp.h>
-+#if USE_IPv6
-+#include <netinet/ip6.h>
-+#endif /* USE_IPv6 */
-+
-+#include "ipreasm.h"
-+
-+
-+#define REASM_IP_HASH_SIZE 1021U
-+
-+
-+enum entry_state {
-+	STATE_ACTIVE,
-+	STATE_INVALID,
-+};
-+
-+
-+enum reasm_proto {
-+	PROTO_IPV4,
-+#if USE_IPv6
-+	PROTO_IPV6,
-+#endif /* USE_IPv6 */
-+};
-+
-+
-+/*
-+ * This tuple uniquely identifies all fragments belonging to
-+ * the same IPv4 packet.
-+ */
-+struct reasm_id_ipv4 {
-+	uint8_t ip_src[4], ip_dst[4];
-+	uint16_t ip_id;
-+	uint8_t ip_proto;
-+};
-+
-+
-+/*
-+ * Same for IPv6.
-+ */
-+struct reasm_id_ipv6 {
-+	uint8_t ip_src[16], ip_dst[16];
-+	uint32_t ip_id;
-+};
-+
-+
-+union reasm_id {
-+	struct reasm_id_ipv4 ipv4;
-+	struct reasm_id_ipv6 ipv6;
-+};
-+
-+
-+struct reasm_frag_entry {
-+	unsigned len;  /* payload length of this fragment */
-+	unsigned offset; /* offset of this fragment into the payload of the reassembled packet */
-+	unsigned data_offset; /* offset to the data pointer where payload starts */
-+	unsigned char *data; /* payload starts at data + data_offset */
-+	struct reasm_frag_entry *next;
-+};
-+
-+
-+/*
-+ * Reception of a complete packet is detected by counting the number
-+ * of "holes" that remain between the cached fragments. A hole is
-+ * assumed to exist at the upper end of the packet until the final
-+ * fragment has been received. When the number of holes drops to 0,
-+ * all fragments have been received and the packet can be reassembled.
-+ */
-+struct reasm_ip_entry {
-+	union reasm_id id;
-+	unsigned len, holes, frag_count, hash;
-+	reasm_time_t timeout;
-+	enum entry_state state;
-+	enum reasm_proto protocol;
-+	struct reasm_frag_entry *frags;
-+	struct reasm_ip_entry *prev, *next;
-+	struct reasm_ip_entry *time_prev, *time_next;
-+};
-+
-+
-+/*
-+ * This struct contains some metadata, the main hash table, and a pointer
-+ * to the first entry that will time out. A linked list is kept in the
-+ * order in which packets will time out. Using a linked list for this
-+ * purpose requires that packets are input in chronological order, and
-+ * that a constant timeout value is used, which doesn't change even when
-+ * the entry's state transitions from active to invalid.
-+ */
-+struct reasm_ip {
-+	struct reasm_ip_entry *table[REASM_IP_HASH_SIZE];
-+	struct reasm_ip_entry *time_first, *time_last;
-+	unsigned waiting, max_waiting, timed_out, dropped_frags;
-+	reasm_time_t timeout;
-+};
-+
-+
-+/*
-+ * Hash functions.
-+ */
-+static unsigned reasm_ipv4_hash (const struct reasm_id_ipv4 *id);
-+#if USE_IPv6
-+static unsigned reasm_ipv6_hash (const struct reasm_id_ipv6 *id);
-+#endif /* USE_IPv6 */
-+
-+/*
-+ * Insert a new fragment to the correct position in the list of fragments.
-+ * Check for fragment overlap and other error conditions. Update the
-+ * "hole count".
-+ */
-+static bool add_fragment (struct reasm_ip_entry *entry, struct reasm_frag_entry *frag, bool last_frag);
-+
-+/*
-+ * Is the entry complete, ready for reassembly?
-+ */
-+static bool is_complete (struct reasm_ip_entry *entry);
-+
-+/*
-+ * Create the reassembled packet.
-+ */
-+static unsigned char *assemble (struct reasm_ip_entry *entry, unsigned *output_len);
-+
-+/*
-+ * Drop and free entries.
-+ */
-+static void drop_entry (struct reasm_ip *reasm, struct reasm_ip_entry *entry);
-+static void free_entry (struct reasm_ip_entry *entry);
-+
-+/*
-+ * Dispose of any entries which have expired before "now".
-+ */
-+static void process_timeouts (struct reasm_ip *reasm, reasm_time_t now);
-+
-+/*
-+ * Create fragment structure from IPv6 packet. Returns NULL if the input
-+ * is not a fragment.
-+ * This function is called by parse_packet(), don't call it directly.
-+ */
-+#if USE_IPv6
-+static struct reasm_frag_entry *frag_from_ipv6 (unsigned char *packet, uint32_t *ip_id, bool *last_frag);
-+#endif /* USE_IPv6 */
-+
-+/*
-+ * Compare packet identification tuples for specified protocol.
-+ */
-+static bool reasm_id_equal (enum reasm_proto proto, const union reasm_id *left, const union reasm_id *right);
-+
-+/*
-+ * Create fragment structure from an IPv4 or IPv6 packet. Returns NULL
-+ * if the input is not a fragment.
-+ */
-+static struct reasm_frag_entry *parse_packet (unsigned char *packet, unsigned len, enum reasm_proto *protocol, union reasm_id *id, unsigned *hash, bool *last_frag);
-+
-+
-+static unsigned
-+reasm_ipv4_hash (const struct reasm_id_ipv4 *id)
-+{
-+	unsigned hash = 0;
-+	int i;
-+
-+	for (i = 0; i < 4; i++) {
-+		hash = 37U * hash + id->ip_src[i];
-+		hash = 37U * hash + id->ip_dst[i];
-+	}
-+
-+	hash = 59U * hash + id->ip_id;
-+
-+	hash = 47U * hash + id->ip_proto;
-+
-+	return hash;
-+}
-+
-+
-+#if USE_IPv6
-+static unsigned
-+reasm_ipv6_hash (const struct reasm_id_ipv6 *id)
-+{
-+	unsigned hash = 0;
-+	int i;
-+
-+	for (i = 0; i < 16; i++) {
-+		hash = 37U * hash + id->ip_src[i];
-+		hash = 37U * hash + id->ip_dst[i];
-+	}
-+
-+	hash = 59U * hash + id->ip_id;
-+
-+	return hash;
-+}
-+#endif /* USE_IPv6 */
-+
-+
-+unsigned char *
-+reasm_ip_next (struct reasm_ip *reasm, unsigned char *packet, unsigned len, reasm_time_t timestamp, unsigned *output_len)
-+{
-+	enum reasm_proto proto;
-+	union reasm_id id;
-+	unsigned hash;
-+	bool last_frag;
-+
-+	process_timeouts (reasm, timestamp);
-+
-+	struct reasm_frag_entry *frag = parse_packet (packet, len, &proto, &id, &hash, &last_frag);
-+	if (frag == NULL) {
-+		*output_len = len;
-+		return packet; /* some packet that we don't recognize as a fragment */
-+	}
-+
-+	hash %= REASM_IP_HASH_SIZE;
-+	struct reasm_ip_entry *entry = reasm->table[hash];
-+	while (entry != NULL && (proto != entry->protocol || !reasm_id_equal (proto, &id, &entry->id)))
-+		entry = entry->next;
-+
-+	if (entry == NULL) {
-+		entry = malloc (sizeof (*entry));
-+		if (entry == NULL) {
-+			free (frag);
-+			abort ();
-+		}
-+
-+		struct reasm_frag_entry *list_head = malloc (sizeof (*list_head));
-+		if (list_head == NULL) {
-+			free (frag);
-+			free (entry);
-+			abort ();
-+		}
-+
-+		*entry = (struct reasm_ip_entry) {
-+			.id = id,
-+			.len = 0,
-+			.holes = 1,
-+			.frags = list_head,
-+			.hash = hash,
-+			.protocol = proto,
-+			.timeout = timestamp + reasm->timeout,
-+			.state = STATE_ACTIVE,
-+			.prev = NULL,
-+			.next = reasm->table[hash],
-+			.time_prev = reasm->time_last,
-+			.time_next = NULL,
-+		};
-+
-+		*list_head = (struct reasm_frag_entry) {
-+			.len = 0,
-+			.offset = 0,
-+			.data_offset = 0,
-+			.data = NULL,
-+		};
-+
-+		if (entry->next != NULL)
-+			entry->next->prev = entry;
-+		reasm->table[hash] = entry;
-+
-+		if (reasm->time_last != NULL)
-+			reasm->time_last->time_next = entry;
-+		else
-+			reasm->time_first = entry;
-+		reasm->time_last = entry;
-+
-+		reasm->waiting++;
-+		if (reasm->waiting > reasm->max_waiting)
-+			reasm->max_waiting = reasm->waiting;
-+	}
-+
-+	if (entry->state != STATE_ACTIVE) {
-+		reasm->dropped_frags++;
-+		return NULL;
-+	}
-+
-+	if (!add_fragment (entry, frag, last_frag)) {
-+		entry->state = STATE_INVALID;
-+		reasm->dropped_frags += entry->frag_count + 1;
-+		return NULL;
-+	}
-+
-+	if (!is_complete (entry))
-+		return NULL;
-+
-+	unsigned char *r = assemble (entry, output_len);
-+	drop_entry (reasm, entry);
-+	return r;
-+}
-+
-+
-+static bool
-+add_fragment (struct reasm_ip_entry *entry, struct reasm_frag_entry *frag, bool last_frag)
-+{
-+	/*
-+	 * When a fragment is inserted into the list, different cases can occur
-+	 * concerning the number of holes.
-+	 * - The new fragment can be inserted in the middle of a hole, such that
-+	 *   it will split the hole in two. The number of holes increases by 1.
-+	 * - The new fragment can be attached to one end of a hole, such that
-+	 *   the rest of the hole remains at the opposite side of the fragment.
-+	 *   The number of holes remains constant.
-+	 * - The new fragment can fill a hole completely. The number of holes
-+	 *   decreases by 1.
-+	 */
-+
-+	/*
-+	 * If more fragments follow and the payload size is not an integer
-+	 * multiple of 8, the packet will never be reassembled completely.
-+	 */
-+	if (!last_frag && (frag->len & 7) != 0)
-+		return false;
-+
-+	if (entry->len != 0 && frag->len + frag->offset > entry->len)
-+		return false; /* fragment extends past end of packet */
-+
-+	bool fit_left = false, fit_right = false;
-+
-+	if (last_frag) {
-+		if (entry->len != 0) {
-+			fprintf (stderr, "* ERROR: Multiple final fragments.\n");
-+			return false;
-+		}
-+		entry->len = frag->offset + frag->len;
-+		fit_right = true;
-+	}
-+
-+	struct reasm_frag_entry *cur = entry->frags, *next = cur->next;
-+
-+	while (cur->next != NULL && cur->next->offset <= frag->offset)
-+		cur = cur->next;
-+	next = cur->next;
-+
-+	/* Fragment is to be inserted between cur and next; next may be NULL. */
-+
-+	/* Overlap checks. */
-+	if (cur->offset + cur->len > frag->offset)
-+		return false; /* overlaps with cur */
-+	else if (cur->offset + cur->len == frag->offset)
-+		fit_left = true;
-+
-+	if (next != NULL) {
-+		if (last_frag)
-+			return false; /* next extends past end of packet */
-+		if (frag->offset + frag->len > next->offset)
-+			return false; /* overlaps with next */
-+		else if (frag->offset + frag->len == next->offset)
-+			fit_right = true;
-+	}
-+
-+	/*
-+	 * Everything's fine, insert it.
-+	 */
-+	if (frag->len != 0) {
-+		frag->next = cur->next;
-+		cur->next = frag;
-+
-+		if (fit_left && fit_right)
-+			entry->holes--;
-+		else if (!fit_left && !fit_right)
-+			entry->holes++;
-+
-+		entry->frag_count++;
-+	} else {
-+		/*
-+		 * If the fragment has zero size, we don't insert it into the list,
-+		 * but one case remains to be handled: If the zero-size fragment
-+		 * is the last fragment, and fits exactly with the fragment to its
-+		 * left, the number of holes decreases.
-+		 */
-+		if (last_frag && fit_left)
-+			entry->holes--;
-+	}
-+
-+
-+	return true;
-+}
-+
-+
-+struct reasm_ip *
-+reasm_ip_new (void)
-+{
-+	struct reasm_ip *reasm = malloc (sizeof (*reasm));
-+	if (reasm == NULL)
-+		return NULL;
-+
-+	memset (reasm, 0, sizeof (*reasm));
-+	return reasm;
-+}
-+
-+
-+void
-+reasm_ip_free (struct reasm_ip *reasm)
-+{
-+	while (reasm->time_first != NULL)
-+		drop_entry (reasm, reasm->time_first);
-+	free (reasm);
-+}
-+
-+
-+static bool
-+is_complete (struct reasm_ip_entry *entry)
-+{
-+	return entry->holes == 0;
-+}
-+
-+
-+static unsigned char *
-+assemble (struct reasm_ip_entry *entry, unsigned *output_len)
-+{
-+	struct reasm_frag_entry *frag = entry->frags->next; /* skip list head */
-+	unsigned offset0 = frag->data_offset;
-+	unsigned char *p = malloc (entry->len + offset0);
-+	if (p == NULL)
-+		abort ();
-+
-+	switch (entry->protocol) {
-+		case PROTO_IPV4:
-+			break;
-+
-+#if USE_IPv6
-+		case PROTO_IPV6:
-+			offset0 -= 8; /* size of frag header */
-+			break;
-+#endif /* USE_IPv6 */
-+
-+		default:
-+			abort ();
-+	}
-+
-+	*output_len = entry->len + offset0;
-+
-+	/* copy the (unfragmentable) header from the first fragment received */
-+	memcpy (p, frag->data, offset0);
-+
-+	/* join all the payload fragments together */
-+	while (frag != NULL) {
-+		memcpy (p + offset0 + frag->offset, frag->data + frag->data_offset, frag->len);
-+		frag = frag->next;
-+	}
-+
-+	/* some cleanups, e.g. update the length field of reassembled packet */
-+	switch (entry->protocol) {
-+		case PROTO_IPV4: {
-+			struct ip *ip_header = (struct ip *) p;
-+			ip_header->ip_len = htons (offset0 + entry->len);
-+			ip_header->ip_off = 0;
-+			//  XXX recompute the checksum
-+			break;
-+		}
-+
-+#if USE_IPv6
-+		case PROTO_IPV6: {
-+			struct ip6_hdr *ip6_header = (struct ip6_hdr *) p;
-+			ip6_header->ip6_plen = htons (offset0 + entry->len - 40);
-+			break;
-+		}
-+#endif /* USE_IPv6 */
-+
-+		default:
-+			abort ();
-+	}
-+
-+	return p;
-+}
-+
-+
-+static void
-+drop_entry (struct reasm_ip *reasm, struct reasm_ip_entry *entry)
-+{
-+	if (entry->prev != NULL)
-+		entry->prev->next = entry->next;
-+	else
-+		reasm->table[entry->hash] = entry->next;
-+
-+	if (entry->next != NULL)
-+		entry->next->prev = entry->prev;
-+
-+	if (entry->time_prev != NULL)
-+		entry->time_prev->time_next = entry->time_next;
-+	else
-+		reasm->time_first = entry->time_next;
-+
-+	if (entry->time_next != NULL)
-+		entry->time_next->time_prev = entry->time_prev;
-+	else
-+		reasm->time_last = entry->time_prev;
-+
-+	reasm->waiting--;
-+
-+	free_entry (entry);
-+}
-+
-+
-+static void
-+free_entry (struct reasm_ip_entry *entry)
-+{
-+	struct reasm_frag_entry *frag = entry->frags, *next;
-+	while (frag != NULL) {
-+		next = frag->next;
-+		if (frag->data != NULL)
-+			free (frag->data);
-+		free (frag);
-+		frag = next;
-+	}
-+
-+	free (entry);
-+}
-+
-+
-+unsigned
-+reasm_ip_waiting (const struct reasm_ip *reasm)
-+{
-+	return reasm->waiting;
-+}
-+
-+
-+unsigned
-+reasm_ip_max_waiting (const struct reasm_ip *reasm)
-+{
-+	return reasm->max_waiting;
-+}
-+
-+
-+unsigned
-+reasm_ip_timed_out (const struct reasm_ip *reasm)
-+{
-+	return reasm->timed_out;
-+}
-+
-+
-+unsigned
-+reasm_ip_dropped_frags (const struct reasm_ip *reasm)
-+{
-+	return reasm->dropped_frags;
-+}
-+
-+
-+bool
-+reasm_ip_set_timeout (struct reasm_ip *reasm, reasm_time_t timeout)
-+{
-+	if (reasm->time_first != NULL)
-+		return false;
-+
-+	reasm->timeout = timeout;
-+	return true;
-+}
-+
-+
-+static void
-+process_timeouts (struct reasm_ip *reasm, reasm_time_t now)
-+{
-+	while (reasm->time_first != NULL && reasm->time_first->timeout < now) {
-+		reasm->timed_out++;
-+		drop_entry (reasm, reasm->time_first);
-+	}
-+}
-+
-+
-+#if USE_IPv6
-+static struct reasm_frag_entry *
-+frag_from_ipv6 (unsigned char *packet, uint32_t *ip_id, bool *last_frag)
-+{
-+	struct ip6_hdr *ip6_header = (struct ip6_hdr *) packet;
-+	unsigned offset = 40; /* IPv6 header size */
-+	uint8_t nxt = ip6_header->ip6_nxt;
-+	unsigned total_len = 40 + ntohs (ip6_header->ip6_plen);
-+	unsigned last_nxt = offsetof (struct ip6_hdr, ip6_nxt);
-+
-+	/*
-+	 * IPv6 extension headers from RFC 2460:
-+	 *   0 Hop-by-Hop Options
-+	 *  43 Routing
-+	 *  44 Fragment
-+	 *  60 Destination Options
-+	 *
-+	 * We look out for the Fragment header; the other 3 header
-+	 * types listed above are recognized and considered safe to
-+	 * skip over if they occur before the Fragment header.
-+	 * Any unrecognized header will cause processing to stop and
-+	 * a subsequent Fragment header to stay unrecognized.
-+	 */
-+	while (nxt == IPPROTO_HOPOPTS || nxt == IPPROTO_ROUTING || nxt == IPPROTO_DSTOPTS) {
-+		if (offset + 2 > total_len)
-+			return NULL;  /* header extends past end of packet */
-+
-+		unsigned exthdr_len = 8 + 8 * packet[offset + 1];
-+		if (offset + exthdr_len > total_len)
-+			return NULL;  /* header extends past end of packet */
-+
-+		nxt = packet[offset];
-+		last_nxt = offset;
-+		offset += exthdr_len;
-+	}
-+
-+	if (nxt != IPPROTO_FRAGMENT)
-+		return NULL;
-+
-+	if (offset + 8 > total_len)
-+		return NULL;  /* Fragment header extends past end of packet */
-+
-+	struct reasm_frag_entry *frag = malloc (sizeof (*frag));
-+	if (frag == NULL)
-+		abort ();
-+
-+	struct ip6_frag *frag_header = (struct ip6_frag *) (packet + offset);
-+	offset += 8;
-+
-+	/*
-+	 * The Fragment header will be removed on reassembly, so we have to
-+	 * replace the Next Header field of the previous header (which is
-+	 * currently IPPROTO_FRAGMENT), with the Next Header field of the
-+	 * Fragment header.
-+	 *
-+	 * XXX We really shouldn't manipulate the input packet in-place.
-+	 */
-+	packet[last_nxt] = frag_header->ip6f_nxt;
-+
-+	*frag = (struct reasm_frag_entry) {
-+		.len = total_len - offset,
-+		.data_offset = offset,
-+		.offset = ntohs (frag_header->ip6f_offlg & IP6F_OFF_MASK),
-+		.data = packet,
-+	};
-+
-+	*ip_id = ntohl (frag_header->ip6f_ident);
-+	*last_frag = (frag_header->ip6f_offlg & IP6F_MORE_FRAG) == 0;
-+
-+	return frag;
-+}
-+#endif /* USE_IPv6 */
-+
-+
-+static bool
-+reasm_id_equal (enum reasm_proto proto, const union reasm_id *left, const union reasm_id *right)
-+{
-+	switch (proto) {
-+		case PROTO_IPV4:
-+			return memcmp (left->ipv4.ip_src, right->ipv4.ip_src, 4) == 0
-+				&& memcmp (left->ipv4.ip_dst, right->ipv4.ip_dst, 4) == 0
-+				&& left->ipv4.ip_id == right->ipv4.ip_id
-+				&& left->ipv4.ip_proto == right->ipv4.ip_proto;
-+#if USE_IPv6
-+		case PROTO_IPV6:
-+			return memcmp (left->ipv6.ip_src, right->ipv6.ip_src, 16) == 0
-+				&& memcmp (left->ipv6.ip_dst, right->ipv6.ip_dst, 16) == 0
-+				&& left->ipv6.ip_id == right->ipv6.ip_id;
-+#endif /* USE_IPv6 */
-+		default:
-+			abort ();
-+	}
-+}
-+
-+
-+static struct reasm_frag_entry *
-+parse_packet (unsigned char *packet, unsigned len, enum reasm_proto *protocol, union reasm_id *id, unsigned *hash, bool *last_frag)
-+{
-+	struct ip *ip_header = (struct ip *) packet;
-+	struct reasm_frag_entry *frag = NULL;
-+
-+	switch (ip_header->ip_v) {
-+		case 4: {
-+			*protocol = PROTO_IPV4;
-+			uint16_t offset = ntohs (ip_header->ip_off);
-+			if (len >= ntohs (ip_header->ip_len) && (offset & (IP_MF | IP_OFFMASK)) != 0) {
-+				frag = malloc (sizeof (*frag));
-+				if (frag == NULL)
-+					abort ();
-+
-+				*frag = (struct reasm_frag_entry) {
-+					.len = ntohs (ip_header->ip_len) - ip_header->ip_hl * 4,
-+					.offset = (offset & IP_OFFMASK) * 8,
-+					.data_offset = ip_header->ip_hl * 4,
-+					.data = packet,
-+				};
-+
-+				*last_frag = (offset & IP_MF) == 0;
-+
-+				memcpy (id->ipv4.ip_src, &ip_header->ip_src, 4);
-+				memcpy (id->ipv4.ip_dst, &ip_header->ip_dst, 4);
-+				id->ipv4.ip_id = ntohs (ip_header->ip_id);
-+				id->ipv4.ip_proto = ip_header->ip_p;
-+
-+				*hash = reasm_ipv4_hash (&id->ipv4);
-+			}
-+			break;
-+		}
-+
-+#if USE_IPv6
-+		case 6: {
-+			struct ip6_hdr *ip6_header = (struct ip6_hdr *) packet;
-+			*protocol = PROTO_IPV6;
-+			if (len >= ntohs (ip6_header->ip6_plen) + 40)
-+				frag = frag_from_ipv6 (packet, &id->ipv6.ip_id, last_frag);
-+			if (frag != NULL) {
-+				memcpy (id->ipv6.ip_src, &ip6_header->ip6_src, 16);
-+				memcpy (id->ipv6.ip_dst, &ip6_header->ip6_dst, 16);
-+				*hash = reasm_ipv6_hash (&id->ipv6);
-+			}
-+			break;
-+		}
-+#endif /* USE_IPv6 */
-+
-+		default:
-+			break;
-+	}
-+
-+	return frag;
-+}
-diff -urN ngrep-1.45/ipreasm.h ngrep-1.45-reasm/ipreasm.h
---- ngrep-1.45/ipreasm.h	1970-01-01 01:00:00.000000000 +0100
-+++ ngrep-1.45-reasm/ipreasm.h	2007-06-16 19:17:20.124795623 +0200
-@@ -0,0 +1,57 @@
-+#ifndef _IPREASM_H
-+#define _IPREASM_H
-+
-+#include <stdbool.h>
-+
-+#include <pcap.h>
-+
-+
-+/*
-+ * This is an abstract time stamp. ipreasm doesn't care whether it is
-+ * in seconds, milliseconds, or nanodecades. All it does it add the
-+ * configured timeout value to it, and then compare it to the timstamps
-+ * of subsequent packets to decide whether a fragment has expired.
-+ */
-+typedef uint64_t reasm_time_t;
-+
-+struct reasm_ip;
-+
-+/*
-+ * Functions to create and destroy the reassembly environment.
-+ */
-+struct reasm_ip *reasm_ip_new (void);
-+void reasm_ip_free (struct reasm_ip *reasm);
-+
-+/*
-+ * This is the main packet processing function. It inputs one packet,
-+ * and MAY output one packet in turn. If the input was not a fragment,
-+ * it is passed unmodified. If the input was a fragment that completed
-+ * reassembly of a packet, the reassembled packet is output.
-+ * If more fragments are required for reassembly, or the input packet
-+ * is invalid for some reason, a NULL pointer is returned.
-+ *
-+ * The input must be a pointer allocated by malloc(). The output will
-+ * be a pointer allocated by malloc().
-+ *
-+ * Note that in the case of an IPv6 fragment, the input buffer will be
-+ * modified in-place. This is considered a bug and should be fixed in
-+ * the future.
-+ */
-+unsigned char *reasm_ip_next (struct reasm_ip *reasm, unsigned char *packet, unsigned len, reasm_time_t timestamp, unsigned *output_len);
-+
-+/*
-+ * Set the timeout after which a noncompleted reassembly expires, in
-+ * abstract time units (see above for the definition of reasm_time_t).
-+ */
-+bool reasm_ip_set_timeout (struct reasm_ip *reasm, reasm_time_t timeout);
-+
-+/*
-+ * Query certain information about the current state.
-+ */
-+unsigned reasm_ip_waiting (const struct reasm_ip *reasm);
-+unsigned reasm_ip_max_waiting (const struct reasm_ip *reasm);
-+unsigned reasm_ip_timed_out (const struct reasm_ip *reasm);
-+unsigned reasm_ip_dropped_frags (const struct reasm_ip *reasm);
-+
-+
-+#endif /* _IPREASM_H */
-diff -urN ngrep-1.45/Makefile.in ngrep-1.45-reasm/Makefile.in
---- ngrep-1.45/Makefile.in	2006-11-28 14:35:37.000000000 +0100
-+++ ngrep-1.45-reasm/Makefile.in	2007-06-16 15:41:22.859876074 +0200
-@@ -15,8 +15,8 @@
- 
- STRIPFLAG=@STRIPFLAG@
- 
--SRC=ngrep.c 
--OBJS=ngrep.o 
-+SRC=ngrep.c ipreasm.c
-+OBJS=ngrep.o ipreasm.o
- TARGET=ngrep
- MANPAGE=ngrep.8
- 
-@@ -65,7 +65,7 @@
- $(REGEX_OBJS): $(REGEX_OBJS:.o=.c) $(REGEX_DIR)/*.h
- 	$(MAKE) $(MAKEFLAGS) -C $(REGEX_DIR) $(notdir $(REGEX_OBJS))
- 
--$(OBJS): Makefile ngrep.c ngrep.h
-+$(OBJS): Makefile ngrep.c ngrep.h ipreasm.c ipreasm.h
- 
- tardist:
- 	@( VERSION=`perl -ne '/VERSION\s+"(.*)"/ && print "$$1\n"' ngrep.h` ; \
-diff -urN ngrep-1.45/ngrep.c ngrep-1.45-reasm/ngrep.c
---- ngrep-1.45/ngrep.c	2006-11-28 14:38:43.000000000 +0100
-+++ ngrep-1.45-reasm/ngrep.c	2007-06-16 21:41:43.142117150 +0200
-@@ -98,6 +98,7 @@
- #endif
- 
- #include "ngrep.h"
-+#include "ipreasm.h"
- 
- 
- static char rcsver[] = "$Revision: 1.93 $";
-@@ -156,7 +157,7 @@
- uint8_t link_offset;
- uint8_t radiotap_present = 0;
- 
--pcap_t *pd = NULL;
-+pcap_t *pd = NULL, *pd_dumppcap = NULL;
- pcap_dumper_t *pd_dump = NULL;
- struct bpf_program pcapfilter;
- struct in_addr net, mask;
-@@ -183,6 +184,12 @@
- uint32_t ws_row, ws_col = 80, ws_col_forced = 0;
- 
- 
-+/*
-+ * Reassembly
-+ */
-+struct reasm_ip *reasm = NULL;
-+
-+
- int main(int argc, char **argv) {
-     int32_t c;
- 
-@@ -195,7 +202,7 @@
-     signal(SIGWINCH, update_windowsize);
- #endif
- 
--    while ((c = getopt(argc, argv, "LNhXViwqpevxlDtTRMs:n:c:d:A:I:O:S:P:F:W:")) != EOF) {
-+    while ((c = getopt(argc, argv, "LNhXViwqpevxlDtTrRMs:n:c:d:A:I:O:S:P:F:W:")) != EOF) {
-         switch (c) {
-             case 'W': {
-                 if (!strcasecmp(optarg, "normal"))
-@@ -260,6 +267,10 @@
-             case 'M':
-                 re_multiline_match = 0;
-                 break;
-+            case 'r':
-+                reasm = reasm_ip_new ();
-+                reasm_ip_set_timeout (reasm, 30000000);
-+                break;
-             case 'R':
-                 dont_dropprivs = 1;
-                 break;
-@@ -585,7 +596,15 @@
-     }
- 
-     if (dump_file) {
--        if (!(pd_dump = pcap_dump_open(pd, dump_file))) {
-+		if (reasm != NULL) {
-+			if (!(pd_dumppcap = pcap_open_dead(DLT_RAW, 65535))) {
-+            	fprintf(stderr, "fatal: pcap_open_dead failed\n");
-+				clean_exit(-1);
-+			}
-+			pd_dump = pcap_dump_open(pd_dumppcap, dump_file);
-+		} else
-+			pd_dump = pcap_dump_open(pd, dump_file);
-+        if (!pd_dump) {
-             fprintf(stderr, "fatal: %s\n", pcap_geterr(pd));
-             clean_exit(-1);
-         } else printf("output: %s\n", dump_file);
-@@ -641,6 +660,23 @@
-     }
- #endif
- 
-+	if (reasm != NULL) {
-+		unsigned new_len;
-+		u_char *new_p = malloc(len - link_offset);
-+		memcpy(new_p, ip4_pkt, len - link_offset);
-+		p = reasm_ip_next(reasm, new_p, len - link_offset, (reasm_time_t) 1000000UL * h->ts.tv_sec + h->ts.tv_usec, &new_len);
-+		if (p == NULL)
-+			return;
-+		len = new_len + link_offset;
-+		h->len = new_len;
-+		h->caplen = new_len;
-+
-+		ip4_pkt = (struct ip *)    p;
-+#if USE_IPv6
-+		ip6_pkt = (struct ip6_hdr*)p;
-+#endif
-+	}
-+
-     ip_ver = ip4_pkt->ip_v;
- 
-     switch (ip_ver) {
-@@ -802,6 +838,9 @@
- 
-     if (match_after && keep_matching)
-         keep_matching--;
-+
-+	if (reasm != NULL)
-+		free(p);
- }
- 
- void dump_packet(struct pcap_pkthdr *h, u_char *p, uint8_t proto, unsigned char *data, uint32_t len,
-@@ -1242,6 +1281,7 @@
-            "   -s  is set the bpf caplen\n"
-            "   -S  is set the limitlen on matched packets\n"
-            "   -W  is set the dump format (normal, byline, single, none)\n"
-+           "   -r  is reassemble any fragmented IPV4 or IPV6 packets\n"
-            "   -c  is force the column width to the specified size\n"
-            "   -P  is set the non-printable display char to what is specified\n"
-            "   -F  is read the bpf filter from the specified file\n"
-@@ -1292,8 +1331,9 @@
-      && pd && !pcap_stats(pd, &s))
-         printf("%u received, %u dropped\n", s.ps_recv, s.ps_drop);
- 
--    if (pd)      pcap_close(pd);
--    if (pd_dump) pcap_dump_close(pd_dump);
-+    if (pd)           pcap_close(pd);
-+    if (pd_dumppcap)  pcap_close(pd_dumppcap);
-+    if (pd_dump)      pcap_dump_close(pd_dump);
- 
- #if defined(_WIN32)
-     if (delay_socket) closesocket(delay_socket);
-@@ -1301,6 +1341,9 @@
-     if (usedev)       free(usedev);
- #endif
- 
-+	if (reasm != NULL)
-+		reasm_ip_free(reasm);
-+
-     exit(sig);
- }
- 
diff --git a/network/ngrep/ngrep.SlackBuild b/network/ngrep/ngrep.SlackBuild
index 1923b4d5c4..84422910d0 100644
--- a/network/ngrep/ngrep.SlackBuild
+++ b/network/ngrep/ngrep.SlackBuild
@@ -1,13 +1,37 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for ngrep
 
-# Written by Larry Hajali <larryhaja[at]gmail[dot]com>
+# Copyright 2023 Yossi Neiman, mishehu+sbo@shavedgoats.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.
+
+# Based upon the script written by Larry Hajali <larryhaja[at]gmail[dot]com>
+
+cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=ngrep
-VERSION=${VERSION:-1.45}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-1.47}
+SOURCEVERSION=${VERSION/./_}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -17,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}
@@ -38,18 +66,15 @@ fi
 
 set -e
 
-# Option to add packet reassembly patch (default = yes)
-REASSEM_PATCH=${ASSEM_PATCH:-yes}
-
 # Enable IPV6; either yes or no
 NGREP_IPV6=${NGREP_IPV6:-yes}
 
 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-$SOURCEVERSION
+tar xvf $CWD/$PRGNAM-$SOURCEVERSION.tar.gz
+cd $PRGNAM-$SOURCEVERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -57,11 +82,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 adds IPv4 and IPv6 fragment reassembly for ngrep 1.45
-if [ $REASSEM_PATCH == yes ]; then
-  patch -p1 < $CWD/ngrep-1.45-reasm.diff
-fi
-
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
@@ -70,9 +90,6 @@ CXXFLAGS="$SLKCFLAGS" \
   --sysconfdir=/etc \
   --localstatedir=/var \
   --enable-ipv6=${NGREP_IPV6} \
-  --with-pcap-includes=/usr/include/pcap \
-  --disable-static \
-  --disable-pcap-restart \
   --build=$ARCH-slackware-linux
 
 make
@@ -84,11 +101,11 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr
 find $PKG/usr/man -type f -exec gzip -9 {} \;
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a LICENSE.txt doc/*.txt $PKG/usr/doc/$PRGNAM-$VERSION
+cp CHANGES 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/network/ngrep/ngrep.info b/network/ngrep/ngrep.info
index 0866f50fd1..906619b38d 100644
--- a/network/ngrep/ngrep.info
+++ b/network/ngrep/ngrep.info
@@ -1,10 +1,10 @@
 PRGNAM="ngrep"
-VERSION="1.45"
-HOMEPAGE="http://ngrep.sourceforge.net/"
-DOWNLOAD="http://downloads.sourceforge.net/ngrep/ngrep-1.45.tar.bz2"
-MD5SUM="bc8150331601f3b869549c94866b4f1c"
+VERSION="1.47"
+HOMEPAGE="https://github.com/jpr5/ngrep/"
+DOWNLOAD="https://github.com/jpr5/ngrep/archive/refs/tags/V1_47.tar.gz"
+MD5SUM="03cb1229ad586495852ea316262e8f38"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Larry Hajali"
-EMAIL="larryhaja[at]gmail[dot]com"
+MAINTAINER="Yossi Neiman"
+EMAIL="mishehu+sbo@shavedgoats.net"
diff --git a/network/ngrep/slack-desc b/network/ngrep/slack-desc
index d6c0756893..90762ea885 100644
--- a/network/ngrep/slack-desc
+++ b/network/ngrep/slack-desc
@@ -15,5 +15,5 @@ ngrep: to match against data payloads of packets. It currently recognizes
 ngrep: IPv4/6, TCP, UDP and ICMPv4/6, IGMP and Raw across Ethernet, PPP,
 ngrep: SLIP, FDDI, Token Ring and null interfaces.
 ngrep:
-ngrep: Homepage: http://ngrep.sourceforge.net/
+ngrep: Homepage: https://github.com/jpr5/ngrep/
 ngrep:
diff --git a/network/ngrok/README b/network/ngrok/README
new file mode 100644
index 0000000000..d667ff684a
--- /dev/null
+++ b/network/ngrok/README
@@ -0,0 +1,5 @@
+ngrok (Tunnel local servers to be reachable via the internet)
+
+ngrok allows you to expose TCP/TLS/HTTP servers running on your local
+machine to the internet. Just tell ngrok what port your server is
+listening on.
diff --git a/network/ngrok/ngrok.SlackBuild b/network/ngrok/ngrok.SlackBuild
new file mode 100644
index 0000000000..17a21d9468
--- /dev/null
+++ b/network/ngrok/ngrok.SlackBuild
@@ -0,0 +1,92 @@
+#!/bin/bash
+
+# Slackware build script for ngrok
+
+# Copyright 2020-2023 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=ngrok
+VERSION=${VERSION:-3.5.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}
+
+case "$ARCH" in
+  x86_64)
+    BINARCH="amd64"
+    ;;
+  i?86)
+    BINARCH="386"
+    ;;
+  *)
+    echo "$ARCH is not supported."
+    exit 1
+    ;;
+esac
+
+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/${PRGNAM}-v3-${VERSION}-linux-${BINARCH}.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
+install -D -m 0755 $PRGNAM $PKG/usr/bin/$PRGNAM
+
+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/network/ngrok/ngrok.info b/network/ngrok/ngrok.info
new file mode 100644
index 0000000000..99ae27e927
--- /dev/null
+++ b/network/ngrok/ngrok.info
@@ -0,0 +1,10 @@
+PRGNAM="ngrok"
+VERSION="3.5.0"
+HOMEPAGE="https://ngrok.com"
+DOWNLOAD="https://bin.equinox.io/c/bNyj1mQVY4c/ngrok-v3-3.5.0-linux-386.tar.gz"
+MD5SUM="a6049195365e77c3cc30abc53d57fc5a"
+DOWNLOAD_x86_64="https://bin.equinox.io/c/bNyj1mQVY4c/ngrok-v3-3.5.0-linux-amd64.tar.gz"
+MD5SUM_x86_64="0fff0e38125e1b90663b1a7a9c90c701"
+REQUIRES=""
+MAINTAINER="Ebben Aries"
+EMAIL="slackbuilds@dscp.org"
diff --git a/network/ngrok/slack-desc b/network/ngrok/slack-desc
new file mode 100644
index 0000000000..f01b45f15c
--- /dev/null
+++ b/network/ngrok/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+     |-----handy-ruler------------------------------------------------------|
+ngrok: ngrok (Tunnel local servers to be reachable via the internet)
+ngrok:
+ngrok: ngrok allows you to expose TCP/TLS/HTTP servers running on your local
+ngrok: machine to the internet. Just tell ngrok what port your server is
+ngrok: listening on.
+ngrok:
+ngrok: Home-Page: https://ngrok.com
+ngrok:
+ngrok:
+ngrok:
+ngrok:
diff --git a/network/nheko/README b/network/nheko/README
new file mode 100644
index 0000000000..c8f3acf246
--- /dev/null
+++ b/network/nheko/README
@@ -0,0 +1,26 @@
+nheko is a native client for the Matrix network.
+
+Most of the features you would expect from a chat application are
+missing right now but we are getting close to a more feature complete
+client. Specifically there is support for:
+
+E2E encryption.
+VoIP calls (voice & video).
+User registration.
+Creating, joining & leaving rooms.
+Sending & receiving invites.
+Sending & receiving files and emoji (inline widgets for images, audio
+and file messages).
+Replies with text, images and other media (and actually render them
+as inline widgets).
+Typing notifications.
+Username auto-completion.
+Message & mention notifications.
+Redacting messages.
+Read receipts.
+Basic communities support.
+Room switcher (ctrl-K).
+Light, Dark & System themes.
+Creating separate profiles (command line only, use -p name).
+D-Bus API to allow integration with third-party plugins (does not
+support Windows or macOS).
diff --git a/network/weboob/doinst.sh b/network/nheko/doinst.sh
index 65c7e2eeb9..65c7e2eeb9 100644
--- a/network/weboob/doinst.sh
+++ b/network/nheko/doinst.sh
diff --git a/network/nheko/douninst.sh b/network/nheko/douninst.sh
new file mode 100644
index 0000000000..65c7e2eeb9
--- /dev/null
+++ b/network/nheko/douninst.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/network/nheko/nheko.SlackBuild b/network/nheko/nheko.SlackBuild
new file mode 100644
index 0000000000..3785ce2f90
--- /dev/null
+++ b/network/nheko/nheko.SlackBuild
@@ -0,0 +1,145 @@
+#!/bin/bash
+
+# Slackware build script for nheko
+
+# 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=nheko
+VERSION=${VERSION:-0.11.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 the variable PRINT_PACKAGE_NAME is set, then this script will report what
+# the name of the created package would be, and then exit. This information
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; 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
+
+cp $CWD/lmdb++.h includes/
+
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -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/nheko-0.11.3-fix-for-fmt-10.patch
+patch -p1 < $CWD/871e403f6799df48cfbbe08eba56d473a0c34216.patch
+
+mkdir -p build
+cd build
+cmake \
+  -DHUNTER_ENABLED=OFF \
+  -DUSE_BUNDLED_SPDLOG=OFF \
+  -DUSE_BUNDLED_OLM=OFF \
+  -DUSE_BUNDLED_CMARK=OFF \
+  -DUSE_BUNDLED_JSON=OFF \
+  -DUSE_BUNDLED_OPENSSL=OFF \
+  -DUSE_BUNDLED_MTXCLIENT=OFF \
+  -DUSE_BUNDLED_LMDB=OFF \
+  -DUSE_BUNDLED_LMDBXX=OFF \
+  -DUSE_BUNDLED_QTKEYCHAIN=OFF \
+  -DUSE_BUNDLED_COEURL=OFF \
+  -DUSE_BUNDLED_LIBEVENT=OFF \
+  -DUSE_BUNDLED_LIBCURL=OFF \
+  -DUSE_BUNDLED_RE2=OFF \
+  -DUSE_BUNDLED_CPPHTTPLIB=ON \
+  -DUSE_BUNDLED_BLURHASH=ON \
+  -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+  -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+  -DCMAKE_INSTALL_PREFIX=/usr \
+  -DLIB_SUFFIX=${LIBDIRSUFFIX} \
+  -DMAN_INSTALL_DIR=/usr/man \
+  -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
+  -DCMAKE_BUILD_TYPE=Release ..
+  make
+  make install/strip DESTDIR=$PKG
+cd ..
+
+mkdir -p $PKG/usr/man/
+mv $PKG/usr/share/man/* $PKG/usr/man/
+rmdir $PKG/usr/share/man
+
+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.md CHANGELOG.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
+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/network/nheko/nheko.info b/network/nheko/nheko.info
new file mode 100644
index 0000000000..2f17d23f69
--- /dev/null
+++ b/network/nheko/nheko.info
@@ -0,0 +1,16 @@
+PRGNAM="nheko"
+VERSION="0.11.3"
+HOMEPAGE="https://github.com/Nheko-Reborn/nheko/"
+DOWNLOAD="https://github.com/Nheko-Reborn/nheko/archive/v0.11.3/nheko-0.11.3.tar.gz \
+https://raw.githubusercontent.com/hoytech/lmdbxx/1.0.0/lmdb++.h \
+https://gitlab.archlinux.org/archlinux/packaging/packages/nheko/-/raw/main/nheko-0.11.3-fix-for-fmt-10.patch \
+https://nheko.im/nheko-reborn/nheko/-/commit/871e403f6799df48cfbbe08eba56d473a0c34216.patch"
+MD5SUM="ec254f372b397d0c24c6d9075aac1335 \
+153c1d78ae29c4251afb7fbd8148d6eb \
+201b729f89ffdc33074758de0c27149f \
+772d4d2338c43a5fe7b45c6b71052e4c"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="mtxclient cmark"
+MAINTAINER="Lockywolf"
+EMAIL="for_sbo.nheko_2023-10-18@lockywolf.net"
diff --git a/network/nheko/slack-desc b/network/nheko/slack-desc
new file mode 100644
index 0000000000..cd8cbef1cd
--- /dev/null
+++ b/network/nheko/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+     |-----handy-ruler------------------------------------------------------|
+nheko: nheko (matrix client written in C++)
+nheko:
+nheko: The motivation behind the project is to provide a native desktop app
+nheko: for Matrix.
+nheko:
+nheko:
+nheko:
+nheko:
+nheko:
+nheko:
+nheko:
diff --git a/network/niceshaper/niceshaper.SlackBuild b/network/niceshaper/niceshaper.SlackBuild
index 315ea9b45a..672141a462 100644
--- a/network/niceshaper/niceshaper.SlackBuild
+++ b/network/niceshaper/niceshaper.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for niceshaper
 
@@ -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=niceshaper
 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=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"
@@ -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/network/nicotine+/README b/network/nicotine+/README
index 893f99ddb8..b1a132acdd 100644
--- a/network/nicotine+/README
+++ b/network/nicotine+/README
@@ -1,5 +1,6 @@
-Nicotine+ is a client for the SoulSeek filesharing network.  It was
-"forked" from Nicotine, Hyriand's Soulseek client, which in turn was
-forked from the PySoulSeek project by Alexander Kanavin.
+Nicotine+ is a graphical client for the Soulseek peer-to-peer file
+sharing network.
 
-Optional dependencies are GeoIP-Python and miniupnpc.
+Nicotine+ aims to be a pleasant, Free and Open Source (FOSS)
+alternative to the official Soulseek client, providing additional
+functionality while keeping current with the Soulseek protocol.
diff --git a/network/nicotine+/nicotine+.SlackBuild b/network/nicotine+/nicotine+.SlackBuild
index 9313aebb91..7c5c828c06 100644
--- a/network/nicotine+/nicotine+.SlackBuild
+++ b/network/nicotine+/nicotine+.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for nicotine+
 
@@ -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=nicotine+
 SRCNAM=nicotine-plus
-VERSION=${VERSION:-1.4.1}
+VERSION=${VERSION:-3.3.2}
 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}
@@ -59,15 +69,15 @@ find -L . \
 
 # Fix paths.
 sed -i 's|share/man|man|' setup.py
-sed -i "s|share/doc/nicotine|doc/$PRGNAM-$VERSION|" \
-  setup.py pynicotine/gtkgui/frame.py
+sed -i "s|share/doc/nicotine|doc/$PRGNAM-$VERSION|" setup.py
 
-python setup.py install --root=$PKG
+python3 setup.py install --root=$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
 
-cp -a AUTHORS.md COPYING NEWS README.md $PKG/usr/doc/$PRGNAM-$VERSION
+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
@@ -75,4 +85,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/network/nicotine+/nicotine+.info b/network/nicotine+/nicotine+.info
index 5485d503bb..cf73ff8d7e 100644
--- a/network/nicotine+/nicotine+.info
+++ b/network/nicotine+/nicotine+.info
@@ -1,10 +1,10 @@
 PRGNAM="nicotine+"
-VERSION="1.4.1"
-HOMEPAGE="http://nicotine-plus.org/"
-DOWNLOAD="https://github.com/Nicotine-Plus/nicotine-plus/archive/1.4.1/nicotine-plus-1.4.1.tar.gz"
-MD5SUM="43a6a38ba276dc2a13dce7fd66bdb467"
+VERSION="3.3.2"
+HOMEPAGE="https://nicotine-plus.org/"
+DOWNLOAD="https://github.com/Nicotine-Plus/nicotine-plus/archive/3.3.2/nicotine-plus-3.3.2.tar.gz"
+MD5SUM="40dd230cfac61eda0c0500e5aab6e586"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="mutagen"
-MAINTAINER="Audrius Kažukauskas"
-EMAIL="audrius@neutrino.lt"
+REQUIRES=""
+MAINTAINER="Sasha Abbott"
+EMAIL="sashaa@disroot.org"
diff --git a/network/nicotine+/slack-desc b/network/nicotine+/slack-desc
index d81df9e3d4..cd5c55343a 100644
--- a/network/nicotine+/slack-desc
+++ b/network/nicotine+/slack-desc
@@ -6,14 +6,14 @@
 # customary to leave one space after the ':' except on otherwise blank lines.
 
          |-----handy-ruler------------------------------------------------------|
-nicotine+: nicotine+ (SoulSeek client written in Python)
+nicotine+: nicotine+ (graphical client for Soulseek)
 nicotine+:
-nicotine+: Nicotine+ is a SoulSeek client written in Python, based on the
-nicotine+: PySoulSeek project by Alexander Kanavin.  It features, among other
-nicotine+: things, a completely rewritten graphical user interface which
-nicotine+: uses the PyGTK-2 toolkit and a less strict user request policy.
-nicotine+: Nicotine+ is a fork of Hyriand's original Nicotine Soulseek client.
+nicotine+: Nicotine+ is a graphical client for the Soulseek peer-to-peer file
+nicotine+: sharing network.
 nicotine+:
-nicotine+: Homepage: http://nicotine-plus.org/
+nicotine+: Nicotine+ aims to be a pleasant, Free and Open Source (FOSS)
+nicotine+: alternative to the official Soulseek client, providing additional
+nicotine+: functionality while keeping current with the Soulseek protocol.
 nicotine+:
+nicotine+: Homepage: https://nicotine-plus.org/
 nicotine+:
diff --git a/network/nikto/README b/network/nikto/README
index 0174ffe58d..904c57657a 100644
--- a/network/nikto/README
+++ b/network/nikto/README
@@ -1,19 +1,20 @@
-Nikto is an Open Source (GPL) web server scanner which performs comprehensive
-tests against web servers for multiple items, including over 6700 potentially
-dangerous files/programs, checks for outdated versions of over 1250 servers,
-and version specific problems on over 270 servers. It also checks for server
-configuration items such as the presence of multiple index files, HTTP server
-options, and will attempt to identify installed web servers and software. Scan
-items and plugins are frequently updated and can be automatically updated.
+Nikto is an Open Source (GPL) web server scanner which performs
+comprehensive tests against web servers for multiple items, including
+over 6700 potentially dangerous files/programs, checks for outdated
+versions of over 1250 servers, and version specific problems on over
+270 servers. It also checks for server configuration items such as
+the presence of multiple index files, HTTP server options, and will
+attempt to identify installed web servers and software. Scan items and
+plugins are frequently updated and can be automatically updated.
 
-Nikto is not designed as a stealthy tool. It will test a web server in the
-quickest time possible, and is obvious in log files or to an IPS/IDS. However,
-there is support for LibWhisker's anti-IDS methods in case you want to give it
-a try (or test your IDS system).
+Nikto is not designed as a stealthy tool. It will test a web server
+in the quickest time possible, and is obvious in log files or to an
+IPS/IDS. However, there is support for LibWhisker's anti-IDS methods
+in case you want to give it a try (or test your IDS system).
 
-Not every check is a security problem, though most are. There are some items
-that are "info only" type checks that look for things that may not have a
-security flaw, but the webmaster or security engineer may not know are present
-on the server. These items are usually marked appropriately in the information
-printed. There are also some checks for unknown items which have been seen
-scanned for in log files.
+Not every check is a security problem, though most are. There are some
+items that are "info only" type checks that look for things that may
+not have a security flaw, but the webmaster or security engineer may
+not know are present on the server. These items are usually marked
+appropriately in the information printed. There are also some checks
+for unknown items which have been seen scanned for in log files.
diff --git a/network/nikto/nikto.SlackBuild b/network/nikto/nikto.SlackBuild
index ac6cd320fe..6d9112861d 100644
--- a/network/nikto/nikto.SlackBuild
+++ b/network/nikto/nikto.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for Nikto Web Scanner
 
@@ -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=nikto
 VERSION=${VERSION:-2.1.6}
 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}
@@ -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/network/nikto/nikto.info b/network/nikto/nikto.info
index 46c249a44d..4a4e2582e8 100644
--- a/network/nikto/nikto.info
+++ b/network/nikto/nikto.info
@@ -5,6 +5,6 @@ DOWNLOAD="https://github.com/sullo/nikto/archive/2.1.6/nikto-2.1.6.tar.gz"
 MD5SUM="3d6c1b5a6fcdd47c18169febda02393e"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="Net-SSLeay libwhisker2"
+REQUIRES="libwhisker2"
 MAINTAINER="Brenton Earl"
 EMAIL="brent@exitstatusone.com"
diff --git a/network/nload/nload.SlackBuild b/network/nload/nload.SlackBuild
index cb1a6d9f13..4fd1c733c0 100644
--- a/network/nload/nload.SlackBuild
+++ b/network/nload/nload.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for <nload>
 
@@ -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=nload
 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"
@@ -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/network/nmh/nmh.SlackBuild b/network/nmh/nmh.SlackBuild
index d8dd4250ae..6d5abd51a0 100644
--- a/network/nmh/nmh.SlackBuild
+++ b/network/nmh/nmh.SlackBuild
@@ -1,14 +1,17 @@
-#!/bin/sh
+#!/bin/bash
 
 # SlackBuild for New MH System (nmh)
 # Joel J. Adamson <adamsonj@email.unc.edu>
 #
 # Updated for 1.6 by Leonard Schmidt <lems@gmx.net>
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=nmh
-VERSION=${VERSION:-1.7.1}
+VERSION=${VERSION:-1.8}
 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}
@@ -93,4 +103,4 @@ cat $CWD/doinst.sh > $PKG/install/doinst.sh
 )
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/network/nmh/nmh.info b/network/nmh/nmh.info
index f04d375ac6..f90a2634f3 100644
--- a/network/nmh/nmh.info
+++ b/network/nmh/nmh.info
@@ -1,8 +1,8 @@
 PRGNAM="nmh"
-VERSION="1.7.1"
+VERSION="1.8"
 HOMEPAGE="https://www.nongnu.org/nmh/"
-DOWNLOAD="https://download.savannah.nongnu.org/releases/nmh/nmh-1.7.1.tar.gz"
-MD5SUM="0f2e117eb3acbe949af43b5048de28c5"
+DOWNLOAD="https://download.savannah.nongnu.org/releases/nmh/nmh-1.8.tar.gz"
+MD5SUM="a9bb7636cd8a75c522a48f5d942314fb"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/network/noip2/noip2.SlackBuild b/network/noip2/noip2.SlackBuild
index 9ea7572479..e4b38251d5 100644
--- a/network/noip2/noip2.SlackBuild
+++ b/network/noip2/noip2.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for NoIP2
 
@@ -24,11 +24,14 @@
 
 # Modified by SlackBuilds.org
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=noip2
 SRCNAM=noip
 VERSION=${VERSION:-2.1.9}
 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}
@@ -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/network/nordvpn/README b/network/nordvpn/README
new file mode 100644
index 0000000000..b4f3ba5626
--- /dev/null
+++ b/network/nordvpn/README
@@ -0,0 +1,39 @@
+The NordVPN app for Linux protects your sensitive data with
+military-grade encryption, so that whatever you do online stays secure
+and private.
+More than 5000 servers worldwide. No logs of your online activity.
+Secure up to 6 devices with a single account.
+Access online content securely, with no restrictions.
+
+This script requires a 'nordvpn' group to exist before running.
+You can create this group like this (Run these as root):
+    groupadd -g 373 nordvpn
+    usermod -aG nordvpn $USER (Replace $USER with your username)
+Then log out of the system and login again.
+
+The following can be used to start/stop NordVPN automatically:
+/etc/rc.d/rc.local
+  if [ -x /etc/rc.d/rc.nordvpn ]; then
+    /etc/rc.d/rc.nordvpn start
+  fi
+
+/etc/rc.d/rc.local_shutdown
+  if [ -x /etc/rc.d/rc.nordvpn ]; then
+    /etc/rc.d/rc.nordvpn stop
+  fi
+
+NOTE: NordVPN has implemented NordLynx (WireGuard protocol) into the
+app. Dependencies already satisfied at full install.
+In case of any issue, you need to reinstall following packages:
+
+wireguard-linux-compat
+wireguard-tools
+
+Then you can switch to NordLynx with the following command:
+'nordvpn set technology NordLynx'
+
+And connect using:
+'nordvpn c'
+
+You can always switch back to OpenVPN using this command:
+'nordvpn set technology OpenVPN'
diff --git a/network/nordvpn/doinst.sh b/network/nordvpn/doinst.sh
new file mode 100644
index 0000000000..51d3c3bd15
--- /dev/null
+++ b/network/nordvpn/doinst.sh
@@ -0,0 +1,17 @@
+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 [ -x /etc/rc.d/rc.nordvpn ]; then
+    /etc/rc.d/rc.nordvpn restart > /dev/null
+fi
diff --git a/network/nordvpn/nordvpn.SlackBuild b/network/nordvpn/nordvpn.SlackBuild
new file mode 100644
index 0000000000..742c2b86c7
--- /dev/null
+++ b/network/nordvpn/nordvpn.SlackBuild
@@ -0,0 +1,108 @@
+#!/bin/bash
+#
+# Slackware build script for NordVPN
+#
+# Copyright 2019-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.
+
+# Modified by Pouria Rezaei <Pouria.rz@outlook.com>
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=nordvpn
+VERSION=${VERSION:-3.17.2}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+# Select nordvpn's default group
+NORD_GROUP=${NORD_GROUP:-nordvpn}
+
+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
+
+if [ "$ARCH" = "i586" ]; then
+  DEBARCH="i386"
+elif [ "$ARCH" = "i686" ]; then
+  DEBARCH="i386"
+elif [ "$ARCH" = "x86_64" ]; then
+  DEBARCH="amd64"
+else
+  echo "Package for $ARCH architecture is not available."
+  exit 1
+fi
+
+bailout() {
+  echo "  You must have a $NORD_GROUP group to run this script. "
+  echo "  Something like this should suffice for most systems (Run as root): "
+  echo "    # groupadd -g 373 $NORD_GROUP "
+  echo "    # usermod -aG $NORD_GROUP \$USER (Replace \$USER with your username)"
+  echo "  Then log out of the system and login again."
+  exit 1
+}
+
+# Bail if group isn't valid on your system.
+if ! grep -q "^$NORD_GROUP:" /etc/group; then
+  bailout
+fi
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+mkdir -p $PRGNAM-$VERSION
+
+cd $PKG
+ar p $CWD/${PRGNAM}_${VERSION}_${DEBARCH}.deb data.tar.gz | tar zxv
+
+rm -fR etc usr/lib
+
+# Move man where the man likes
+mv usr/share/man usr/
+rm -rf $PKG/usr/share/doc
+
+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
+
+mkdir -p $PKG/etc/rc.d
+install -m 0755 $CWD/rc.$PRGNAM $PKG/etc/rc.d/rc.$PRGNAM
+
+cd $PKG
+/sbin/makepkg -l y -p -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/network/nordvpn/nordvpn.info b/network/nordvpn/nordvpn.info
new file mode 100644
index 0000000000..4b04fd56b2
--- /dev/null
+++ b/network/nordvpn/nordvpn.info
@@ -0,0 +1,10 @@
+PRGNAM="nordvpn"
+VERSION="3.17.2"
+HOMEPAGE="https://www.nordvpn.com/"
+DOWNLOAD="https://repo.nordvpn.com/deb/nordvpn/debian/pool/main/nordvpn_3.17.2_i386.deb"
+MD5SUM="cfa324fa4b8280710f00e5c4634711cb"
+DOWNLOAD_x86_64="https://repo.nordvpn.com/deb/nordvpn/debian/pool/main/nordvpn_3.17.2_amd64.deb"
+MD5SUM_x86_64="9fe543322dd827857a9de14241b1b38f"
+REQUIRES=""
+MAINTAINER="Reza Talebi"
+EMAIL="reza.talebi.73@outlook.com"
diff --git a/network/nordvpn/rc.nordvpn b/network/nordvpn/rc.nordvpn
new file mode 100644
index 0000000000..bc1eb255a4
--- /dev/null
+++ b/network/nordvpn/rc.nordvpn
@@ -0,0 +1,118 @@
+#!/usr/bin/env bash
+
+# Short-Description: Protect your privacy online and access media content with no regional restrictions. Strong encryption and no-log policy with 3000+ servers in 60+ countries.
+### END INIT INFO
+
+PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin
+
+BASE=nordvpn
+
+DAEMON=/usr/sbin/${BASE}d
+PID=/var/run/$BASE.pid
+SOCK=/run/$BASE/${BASE}d.sock
+SOCKDIR=/run/$BASE
+
+create_socket_dir() {
+  if [[ -d $SOCKDIR ]]; then
+    return
+  fi
+  mkdir -m 0770 $SOCKDIR
+  chown root:$BASE $SOCKDIR
+}
+
+checkuser() {
+    status=0
+    for u in $(who | awk '{print $1}' | sort | uniq)
+    do
+          if [ "$u" == "$1" ]; then
+                return 0
+	  fi
+    done
+    return 1
+}
+#
+# Function that starts the daemon
+#
+nordvpnd_start()
+{
+  checkuser
+  create_socket_dir
+  rm -rf $SOCK
+  if [ -s $PID ]; then
+    echo "$BASE is already running: $(cat $PID)"
+    exit 1
+  fi
+
+  if [ -x $DAEMON ]; then
+    echo "Starting $BASE"
+    sleep 1
+    # $DAEMON start-stop-daemon --start --quiet -g "nordvpn" --pidfile $PID --exec $DAEMON
+    $DAEMON > /dev/null &
+    pidof $DAEMON > $PID
+    sleep 10
+    if [ -S "$SOCK" ]; then
+      echo "$BASE has been started."
+    else
+      echo "$BASE failed to start. Please restart the daemon."
+    fi
+  fi
+}
+
+#
+# Function that stops the daemon
+#
+nordvpnd_stop()
+{
+  if [ -s $PID ]; then
+    echo "Stopping $BASE"
+    sleep 1
+    kill $(cat $PID)
+    rm -rf $PID $SOCK
+    sleep 1
+    echo "$BASE has been stopped."
+  else
+    echo "$BASE is not running."
+  fi
+}
+
+#
+# Function that restarts the daemon
+#
+nordvpnd_restart()
+{
+  nordvpnd_stop
+  sleep 1
+  nordvpnd_start
+}
+
+#
+# Function that shows the current status of the daemon
+#
+nordvpnd_status()
+{
+  if [ -s $PID ]; then
+    echo "$BASE is running: $(cat $PID)"
+  else
+    echo "$BASE is not running."
+  fi
+}
+
+
+case "$1" in
+  start)
+    nordvpnd_start
+    ;;
+  stop)
+    nordvpnd_stop
+    ;;
+  restart)
+    nordvpnd_restart
+    ;;
+  status)
+    nordvpnd_status
+    ;;
+  *)
+    echo $"Usage: $0 {start|stop|restart|status}"
+    exit 1
+    ;;
+esac
diff --git a/network/nordvpn/slack-desc b/network/nordvpn/slack-desc
new file mode 100644
index 0000000000..62ee422dbb
--- /dev/null
+++ b/network/nordvpn/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+       |-----handy-ruler------------------------------------------------------|
+nordvpn: nordvpn (Protect your privacy online.)
+nordvpn:
+nordvpn: The NordVPN app for Linux protects your sensitive data
+nordvpn: with military-grade encryption, so that whatever you
+nordvpn: do online stays secure and private. More than 5000
+nordvpn: servers worldwide. No logs of your online activity.
+nordvpn: Secure up to 6 devices with a single account.
+nordvpn: Access online content securely, with no restrictions.
+nordvpn:
+nordvpn: https://www.nordvpn.com/
+nordvpn:
diff --git a/network/nrpe/README b/network/nrpe/README
index 2dba6da61d..06c1426952 100644
--- a/network/nrpe/README
+++ b/network/nrpe/README
@@ -1,8 +1,8 @@
 nrpe (Nagios Remote Plugin Executor)
 
-The NRPE addon is designed to allow you to execute Nagios plugins on remote
-Linux/Unix machines. The main reason for doing this is to allow Nagios
-to monitor "local" resources (like CPU load, memory usage, etc.) remote
-machines. Since these public resources are not usually exposed to external
-machines, an agent like NRPE must be installed on the remote Linux/Unix
-machines.
+The NRPE addon is designed to allow you to execute Nagios plugins on
+remote Linux/Unix machines. The main reason for doing this is to allow
+Nagios to monitor "local" resources (like CPU load, memory usage,
+etc.) remote machines. Since these public resources are not usually
+exposed to external machines, an agent like NRPE must be installed on
+the remote Linux/Unix machines.
diff --git a/network/nrpe/nrpe.SlackBuild b/network/nrpe/nrpe.SlackBuild
index 4c6b97b537..cf9a72b14e 100644
--- a/network/nrpe/nrpe.SlackBuild
+++ b/network/nrpe/nrpe.SlackBuild
@@ -1,30 +1,40 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for nrpe
 
 # Written by Zordrak <slackbuilds@tpa.me.uk>
 # Modified by Mario Preksavec <mario@slackware.hr>
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=nrpe
 VERSION=${VERSION:-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"
@@ -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/network/nsca/README b/network/nsca/README
index 16fc72d038..9a5c7c7ebd 100644
--- a/network/nsca/README
+++ b/network/nsca/README
@@ -1,5 +1,5 @@
 nsca (Nagios Service Check Acceptor)
 
-NSCA is a Linux/Unix daemon allows you to integrate passive alerts and checks
-from remote machines and applications with Nagios.  Useful for processing
-security alerts, as well as redundant Nagios setups.
+NSCA is a Linux/Unix daemon allows you to integrate passive alerts and
+checks from remote machines and applications with Nagios. Useful for
+processing security alerts, as well as redundant Nagios setups.
diff --git a/network/nsca/nsca.SlackBuild b/network/nsca/nsca.SlackBuild
index 7efdabe20c..8b1b867b6f 100644
--- a/network/nsca/nsca.SlackBuild
+++ b/network/nsca/nsca.SlackBuild
@@ -1,14 +1,17 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for nsca
 
 # Written by Bas Couwenberg <sebastic@xs4all.nl>
 # Modified by Mario Preksavec <mario@slackware.hr>
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=nsca
 VERSION=${VERSION:-2.9.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}
@@ -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/network/nsd/README b/network/nsd/README
index 521b12bdb1..7aeed422b9 100644
--- a/network/nsd/README
+++ b/network/nsd/README
@@ -1,18 +1,16 @@
-NSD is being developed with the purpose of creating more diversity in the
-DNS landscape. Secondly we want to create a fast, modern, RFC compliant
-nameserver.
-
-NSD requires its own user in order to run securely. It is not advised to
-run services as root user without special reason.
+NSD is being developed with the purpose of creating more diversity
+in the DNS landscape. Secondly we want to create a fast, modern, RFC
+compliant nameserver.
 
+NSD requires its own user in order to run securely. It is not advised
+to run services as root user without special reason.
 
 To add NSD user in system run as root:
 
 # groupadd -g 336 nsd
 # useradd -u 336 -d /var/lib/nsd -g nsd -s /bin/false nsd
 
-
-In order to run NSD during boot process, add to /etc/rc.d/rc.local :
+In order to run NSD during boot process, add to /etc/rc.d/rc.local:
 
 if [ -x /etc/rc.d/rc.nsd ]; then
   /etc/rc.d/rc.nsd start
diff --git a/network/nsd/nsd.SlackBuild b/network/nsd/nsd.SlackBuild
index e1370d03a2..b3a40a706a 100644
--- a/network/nsd/nsd.SlackBuild
+++ b/network/nsd/nsd.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
-# Slackware build script for YADIFA, Authoritative DNS server
+# Slackware build script for NSD, Authoritative DNS server
 
-# Copyright (c) 2017, Sergey Fedosov <eleksir@gmail.com>
+# Copyright (c) 2017-2020 Sergey Fedosov <eleksir@gmail.com>
 # 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=nsd
 USER=$PRGNAM
 GROUP=$PRGNAM
-VERSION=${VERSION:-4.1.15}
+VERSION=${VERSION:-4.3.3}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if ! grep -q "^nsd:" /etc/group; then
         echo "$0: Error: $PRGNAM group ($GROUP) doesn't exist."
@@ -51,7 +54,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
+# the name of the created package would be, and then exit. This information
+# could be useful to other scripts.
+if [ ! -z "${PRINT_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 @@ cd "$TMP"
 rm -rf "$PRGNAM-$VERSION"
 tar xvf "$CWD/$PRGNAM-$VERSION.tar.gz"
 cd "$PRGNAM-$VERSION"
-chown -R root:root .
+#chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
   -o -perm 511 \) -exec chmod 755 {} \; -o \
@@ -88,25 +98,25 @@ find -L . \
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
---prefix=/usr \
---bindir=/usr/bin \
---sbindir=/usr/sbin \
---libexecdir=/usr/libexec \
---sysconfdir=/etc \
---localstatedir=/var \
---libdir=/usr/lib \
---enable-ratelimit \
---enable-ratelimit-default-is-off \
---with-nsd_conf_file="/etc/$PRGNAM/$PRGNAM.conf" \
---with-configdir="/var/lib/$USER" \
---with-logfile="/var/log/$PRGNAM/$PRGNAM.log" \
---with-pidfile="/var/run/$PRGNAM/$PRGNAM.pid" \
---with-dbfile="/var/lib/$USER/$PRGNAM.db" \
---with-zonesdir="/var/lib/$USER/zones" \
---with-xfrdfile="/var/lib/$USER/$PRGNAM.xfrd" \
---with-zonelistfile="/var/lib/$USER/$PRGNAM.zones" \
---with-xfrdir="/var/lib/$USER/xfrd" \
---with-user=$USER
+  --prefix=/usr \
+  --bindir=/usr/bin \
+  --sbindir=/usr/sbin \
+  --libexecdir=/usr/libexec \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --libdir=/usr/lib \
+  --enable-ratelimit \
+  --enable-ratelimit-default-is-off \
+  --with-nsd_conf_file="/etc/$PRGNAM/$PRGNAM.conf" \
+  --with-configdir="/var/lib/$USER" \
+  --with-logfile="/var/log/$PRGNAM/$PRGNAM.log" \
+  --with-pidfile="/var/run/$PRGNAM/$PRGNAM.pid" \
+  --with-dbfile="/var/lib/$USER/$PRGNAM.db" \
+  --with-zonesdir="/var/lib/$USER/zones" \
+  --with-xfrdfile="/var/lib/$USER/$PRGNAM.xfrd" \
+  --with-zonelistfile="/var/lib/$USER/$PRGNAM.zones" \
+  --with-xfrdir="/var/lib/$USER/xfrd" \
+  --with-user=$USER
 
 make
 make install DESTDIR="$PKG"
@@ -115,39 +125,25 @@ find "$PKG" -print0 | xargs -0 file | grep -e "executable" -e "shared object" |
   | 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 {} \;
+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"
-install --mode=644 "$CWD/$PRGNAM.SlackBuild" "$PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild"
-
-mkdir -p "$PKG/install"
-install --mode=644 "$CWD/slack-desc" "$PKG/install/slack-desc"
-install --mode=644 "$CWD/doinst.sh"  "$PKG/install/doinst.sh"
+# remove empty file
+rm -rf "$PKG/etc/$PRGNAM/$PRGNAM.conf.sample"
 
-mkdir -p "$PKG/etc/rc.d"
-install --mode=644 "$CWD/rc.$PRGNAM"  "$PKG/etc/rc.d/rc.$PRGNAM.new"
+install -Dpm 0644 "$CWD/$PRGNAM.SlackBuild" "$PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild"
+install -Dpm 0644 "$CWD/slack-desc" "$PKG/install/slack-desc"
+install -Dpm 0644 "$CWD/doinst.sh" "$PKG/install/doinst.sh"
+install -Dpm 0644 "$CWD/rc.$PRGNAM" "$PKG/etc/rc.d/rc.$PRGNAM.new"
+install -Dpm 0644 "$CWD/$PRGNAM.conf" "$PKG/etc/$PRGNAM/${PRGNAM}.conf.new"
+install -Dpm 0644 "$CWD/nsd.logrotate" "$PKG/etc/logrotate.d/nsd.new"
+# add sample zone
+install -Dpm 0644 "$CWD/localhost.zone" "$PKG/var/lib/$PRGNAM/zones/master/localhost.zone.new"
 
-mkdir -p "$PKG/var/run/$PRGNAM"
-chown $USER:$GROUP "$PKG/var/run/$PRGNAM"
+chown -R $USER:$GROUP "$PKG/var/lib/$USER"
 
 mkdir -p "$PKG/var/log/$PRGNAM"
 chown $USER:$GROUP "$PKG/var/log/$PRGNAM"
 
-chown -R $USER:$GROUP "$PKG/var/lib/$USER"
-
-mkdir -p "$PKG/etc/$PRGNAM"
-install --mode=644 "$CWD/$PRGNAM.conf" "$PKG/etc/$PRGNAM/${PRGNAM}.conf.new"
-
-mkdir -p $PKG/etc/logrotate.d
-install --mode=644 $CWD/nsd.logrotate $PKG/etc/logrotate.d/nsd.new
-
-# remove empty file
-rm -rf "$PKG/etc/$PRGNAM/$PRGNAM.conf.sample"
-
-# add sample zone
-mkdir -p "$PKG/var/lib/$USER/zones/master"
-install --mode=644 "$CWD/localhost.zone" "$PKG/var/lib/$USER/zones/master/localhost.zone.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/network/nsd/nsd.info b/network/nsd/nsd.info
index 5d43eb4c17..5d20217e0d 100644
--- a/network/nsd/nsd.info
+++ b/network/nsd/nsd.info
@@ -1,8 +1,8 @@
 PRGNAM="nsd"
-VERSION="4.1.15"
-HOMEPAGE="https://www.nlnetlabs.nl/projects/nsd/"
-DOWNLOAD="https://www.nlnetlabs.nl/downloads/nsd/nsd-4.1.15.tar.gz"
-MD5SUM="8b13973ae94ea02bd205734af61f3329"
+VERSION="4.3.3"
+HOMEPAGE="https://www.nlnetlabs.nl/projects/nsd/about/"
+DOWNLOAD="https://www.nlnetlabs.nl/downloads/nsd/nsd-4.3.3.tar.gz"
+MD5SUM="e80bd8845b4f3ba514fd255343c5097c"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/network/nsd/nsd.logrotate b/network/nsd/nsd.logrotate
index eb49072a75..5df3e2ba4a 100644
--- a/network/nsd/nsd.logrotate
+++ b/network/nsd/nsd.logrotate
@@ -2,6 +2,8 @@
   daily
   rotate 14
   notifempty
+  create 0640 nsd nsd
+  su nsd nsd
   missingok
   compress
   sharedscripts
diff --git a/network/nsd/rc.nsd b/network/nsd/rc.nsd
index 55118d9464..d86761afd8 100644
--- a/network/nsd/rc.nsd
+++ b/network/nsd/rc.nsd
@@ -6,6 +6,8 @@
 do_start() {
   if [ -x /usr/sbin/nsd ]; then
     echo "Starting Name Server Daemon:  /usr/sbin/nsd"
+    mkdir -p /var/run/nsd
+    chown nsd:nsd /var/run/nsd
     /usr/sbin/nsd -c /etc/nsd/nsd.conf 2> /dev/null
   fi
 }
diff --git a/network/nsd/slack-desc b/network/nsd/slack-desc
index 2aec14873a..dc16e047ac 100644
--- a/network/nsd/slack-desc
+++ b/network/nsd/slack-desc
@@ -11,9 +11,9 @@ nsd:
 nsd: NSD is an authoritative only, high performance, simple and open
 nsd: source name server.
 nsd:
+nsd: Website: https://www.nlnetlabs.nl/projects/nsd/about/
 nsd:
 nsd:
 nsd:
 nsd:
-nsd: Website: https://www.nlnetlabs.nl/projects/nsd/
 nsd:
diff --git a/network/nss-mdns/README b/network/nss-mdns/README
index 742b398335..461764b63f 100644
--- a/network/nss-mdns/README
+++ b/network/nss-mdns/README
@@ -1,8 +1,11 @@
-nss-mdns is a plugin for the GNU Name Service Switch (NSS) functionality
-of the GNU C Library (glibc) which provides host name resolution via
-Multicast DNS (a.k.a. Zeroconf, a.k.a. Apple Rendezvous, a.k.a Apple Bonjour).
-This effectively allows name resolution by common Unix/Linux programs in the
-ad-hoc mDNS domain .local.
+nss-mdns is a plugin for the GNU Name Service Switch (NSS)
+functionality of the GNU C Library (glibc) which provides host
+name resolution via Multicast DNS (a.k.a. Zeroconf, a.k.a. Apple
+Rendezvous, a.k.a Apple Bonjour). This effectively allows name
+resolution by common Unix/Linux programs in the ad-hoc mDNS domain
+.local.
+
+To test, the following command should return a mapping for the remote
+host:
 
-To test, the following command should return a mapping for the remote host:
   getent hosts <hostname>.local
diff --git a/network/nss-mdns/nss-mdns.SlackBuild b/network/nss-mdns/nss-mdns.SlackBuild
index e7710120a0..a25fd3ed77 100644
--- a/network/nss-mdns/nss-mdns.SlackBuild
+++ b/network/nss-mdns/nss-mdns.SlackBuild
@@ -1,13 +1,16 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for nss-mdns
 # Written by Menno Duursma <druiloor@zonnet.nl>
-# Maintained by Robby Workman <rw@rlworkman.net>
+# Maintained by Robby Workman <rworkman@slackbuilds.org>
+
+cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=nss-mdns
-VERSION=${VERSION:-0.10}
+VERSION=${VERSION:-0.14.1}
 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,6 +61,7 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
+AVAHI_SOCKET="/run/avahi-daemon/socket" \
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
@@ -58,8 +69,7 @@ CXXFLAGS="$SLKCFLAGS" \
   --libdir=/lib${LIBDIRSUFFIX} \
   --sysconfdir=/etc \
   --localstatedir=/var \
-  --disable-legacy \
-  --enable-avahi \
+  --mandir=/usr/man \
   --build=$ARCH-slackware-linux
 
 make
@@ -72,9 +82,8 @@ mkdir -p $PKG/etc
 cat $CWD/mdns.allow > $PKG/etc/mdns.allow.new
 cat $CWD/nsswitch.conf-mdns > $PKG/etc/nsswitch.conf-mdns.new
 
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/html
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a [A-Z][A-Z]* $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a doc/README.html $PKG/usr/doc/$PRGNAM-$VERSION/html
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
@@ -82,4 +91,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/network/nss-mdns/nss-mdns.info b/network/nss-mdns/nss-mdns.info
index c4eaec54a6..db0d6deb38 100644
--- a/network/nss-mdns/nss-mdns.info
+++ b/network/nss-mdns/nss-mdns.info
@@ -1,8 +1,8 @@
 PRGNAM="nss-mdns"
-VERSION="0.10"
-HOMEPAGE="http://0pointer.de/lennart/projects/nss-mdns/"
-DOWNLOAD="http://0pointer.de/lennart/projects/nss-mdns/nss-mdns-0.10.tar.gz"
-MD5SUM="03938f17646efbb50aa70ba5f99f51d7"
+VERSION="0.14.1"
+HOMEPAGE="https://github.com/lathiat/nss-mdns"
+DOWNLOAD="https://github.com/lathiat/nss-mdns/releases/download/v0.14.1/nss-mdns-0.14.1.tar.gz"
+MD5SUM="39b7f6ccfa0605321c7ee6e78478b83b"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="avahi"
diff --git a/network/nss-tls/README b/network/nss-tls/README
new file mode 100644
index 0000000000..fe975e3661
--- /dev/null
+++ b/network/nss-tls/README
@@ -0,0 +1,23 @@
+nss-tls (DNS-over-HTTPS resolver)
+
+nss-tls is an alternative, encrypted name resolving library for Linux
+distributions with glibc which uses DNS-over-HTTPS. The glibc name
+resolver can be configured through nsswitch.conf(5) to use nss-tls
+instead of the DNS resolver, or fall back to DNS when nss-tls fails.
+
+This way, all applications that use the standard resolver API
+(getaddrinfo(), gethostbyname(), etc'), are transparently
+migrated from DNS to encrypted means of name resolving, with
+zero application-side changes and minimal resource consumption
+footprint. However, nss-tls does not deal with applications that use
+their own, built-in DNS resolver.
+
+See README_SBo.txt for instructions on setting things up, once the
+package is installed. It won't "just work", you really do have to
+configure it.
+
+The default servers in the config file are provided by Google, Quad9,
+and Cloudflare. If you'd like to change these, there is a list of
+public DoH servers here:
+
+https://zenodo.org/records/4923371
diff --git a/network/nss-tls/README_SBo.txt b/network/nss-tls/README_SBo.txt
new file mode 100644
index 0000000000..6c82bc23ee
--- /dev/null
+++ b/network/nss-tls/README_SBo.txt
@@ -0,0 +1,64 @@
+Slackware-specific nss-tls HOWTO
+--------------------------------
+
+1. Make sure /etc/nss-tls.conf has at least one DNS-over-HTTPS server URL
+   listed. The default config file has 3, so you shouldn't need to
+   change it unless you don't trust the default servers (one of which
+   belongs to Google). Although it's possible to use hostnames in the
+   config file, I highly recommend using IP addresses.
+
+2. Add this code to your /etc/rc.d/rc.local:
+
+   [ -x /etc/rc.d/rc.nss-tlsd ] && /etc/rc.d/rc.nss-tlsd start
+
+3. Make sure /etc/rc.d/rc.nss-tlsd is executable (it is, by default).
+
+4. Manually start the daemon with the command: /etc/rc.d/rc.nss-tlsd start
+   Or, you could reboot instead.
+
+   At this point, you should be able to use the tlslookup(1) tool to
+   do some test lookups. Try "tlslookup www.slackware.com". You should
+   get output similar to:
+
+   $ tlslookup www.slackware.com
+   23.218.93.137
+   23.218.93.171
+   2600:1402:9800:d::b833:2ac7
+   2600:1402:9800:d::b833:2acd
+
+5. Edit /etc/nsswitch.conf and find the line that reads "hosts: files dns".
+   Replace the "dns" with "tls", so the line looks like:
+
+   hosts: files tls
+
+   Now, try "ping www.slackware.com". If this works, you should be
+   able to use normal clients (web browsers, mail, etc). nss-tls
+   transparently replaces the DNS resolver... but not everything
+   will work. In particular, git, curl, and alpine (the mail client)
+   are known not to work in this configuration. To support these
+   applications, see the next step.
+
+6. To keep regular DNS as a fallback option, change the line in
+   /etc/nss-tls.conf again, so it looks like:
+
+   hosts: files tls dns
+
+   This allows applications that don't work with nss-tls to use regular
+   DNS instead. Notably, git won't work without fallback DNS.
+
+7. Optional: users can run their own instances of the daemon, with
+   caching support. Run the command /usr/bin/nss-tlsd-user from
+   your startup scripts (~/.bash_profile for console logins, or
+   whatever your desktop environment uses if you use GUI login).
+
+   This isn't really required, though it can provide some extra
+   security on multi-user systems. If you're the only person who uses
+   your Slackware box, you probably don't need this.
+
+Running a server
+----------------
+
+nss-tls is just the client side of DNS-over-HTTPS. If you want to run
+a server, look into unbound (on SBo). In future Slackware versions,
+you may be able to use Slackware's bind for this (the version in 15.0
+doesn't support it, but the one in -current should).
diff --git a/network/nss-tls/doinst.sh b/network/nss-tls/doinst.sh
new file mode 100644
index 0000000000..6f2d8b6559
--- /dev/null
+++ b/network/nss-tls/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/nss-tls.conf.new
+config etc/default/nss-tls.new
diff --git a/network/nss-tls/nss-tls.SlackBuild b/network/nss-tls/nss-tls.SlackBuild
new file mode 100644
index 0000000000..88db43b377
--- /dev/null
+++ b/network/nss-tls/nss-tls.SlackBuild
@@ -0,0 +1,120 @@
+#!/bin/bash
+
+# Slackware build script for nss-tls
+
+# Written by B. Watson (urchlay@slackware.uk)
+
+# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
+
+# Notes:
+
+# Building with --buildtype=debug makes the daemon write HTTP request
+# and response headers to its stdout. This isn't very useful, so this
+# script doesn't support it.
+
+# It would be nice if the daemon would log to syslog, or had some
+# runtime-configurable verbose/debug options.
+
+# I wish git would work with this. If it would, it'd be possible
+# to use 'hosts: files tls' in nsswitch.conf (curl and alpine still
+# wouldn't work, but there are decent workarounds for those).
+
+# By default, when the daemon runs as root, it switches UID/GID to
+# daemon/daemon. This seems fine to me. It would be possible to
+# reserve a UID/GID and build with -Duser=<blah> -Dgroup=<blah>, if
+# there were any real need for it.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=nss-tls
+VERSION=${VERSION:-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
+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 makes the client and server agree on the per-user socket path.
+patch -p1 < $CWD/per_user_dir.diff
+
+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*/*
+rm -f $PKG/etc/nss-tls.conf
+cat $CWD/nss-tls.conf > $PKG/etc/nss-tls.conf.new
+
+install -D -m0755 -oroot -groot $CWD/nss-tlsd-user.sh $PKG/usr/bin/nss-tlsd-user
+
+mkdir -p $PKG/etc/rc.d $PKG/etc/default
+cat $CWD/rc.nss-tlsd > $PKG/etc/rc.d/rc.nss-tlsd
+cat $CWD/nss-tlsd.default > $PKG/etc/default/nss-tlsd.new
+chmod 755 $PKG/etc/rc.d/rc.nss-tlsd
+
+PKGDOC=$PKG/usr/doc/$PRGNAM-$VERSION
+mkdir -p $PKGDOC
+cp -a AUTHORS COPYING README* $PKGDOC
+cat $CWD/README_SBo.txt > $PKGDOC/README_SBo.txt
+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/network/nss-tls/nss-tls.conf b/network/nss-tls/nss-tls.conf
new file mode 100644
index 0000000000..5227d4d752
--- /dev/null
+++ b/network/nss-tls/nss-tls.conf
@@ -0,0 +1,27 @@
+# nss-tls.conf - config for nss-tlsd daemon, part of nss-tls SBo package.
+
+# The only setting here is 'resolvers=', which must be a comma-separated
+# list of one or more DNS-over-HTTPS server URLs. Although it's possible
+# to use hostnames, it's better to use IP addresses in the URLs.
+
+# There's a list of public DoH servers found by port-scanning, here:
+# https://zenodo.org/records/4923371
+
+# Or, you could run your own (with unbound).
+
+# Do not remove this line:
+[global]
+
+# Google, DNS9, Cloudflare. These are the default servers from Debian's
+# nss-tls package.
+resolvers=https://9.9.9.9/dns-query,https://1.1.1.1/dns-query,https://8.8.8.8/dns-query
+
+# AdGuards's default (ad/tracker blocking, but no content filtering) servers.
+# These can be IPv6, too. See https://adguard-dns.io/en/public-dns.html
+# resolvers=https://94.140.14.14/dns-query,https://94.140.15.15/dns-query
+
+# AdGuards's non-filtering servers
+# resolvers=https://94.140.14.140/dns-query,https://94.140.15.141/dns-query
+
+# AdGuards's "family protection" content-filtering server
+# resolvers=https://94.140.14.15/dns-query,https://94.140.15.16/dns-query
diff --git a/network/nss-tls/nss-tls.info b/network/nss-tls/nss-tls.info
new file mode 100644
index 0000000000..ada3217a79
--- /dev/null
+++ b/network/nss-tls/nss-tls.info
@@ -0,0 +1,10 @@
+PRGNAM="nss-tls"
+VERSION="1.1"
+HOMEPAGE="https://github.com/dimkr/nss-tls/"
+DOWNLOAD="https://github.com/dimkr/nss-tls/archive/1.1/nss-tls-1.1.tar.gz"
+MD5SUM="a9e8c63856bf63ad2d1bedf46a01a48d"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="B. Watson"
+EMAIL="urchlay@slackware.uk"
diff --git a/network/nss-tls/nss-tlsd-user.sh b/network/nss-tls/nss-tlsd-user.sh
new file mode 100644
index 0000000000..0b395ea2ba
--- /dev/null
+++ b/network/nss-tls/nss-tlsd-user.sh
@@ -0,0 +1,20 @@
+#!/bin/bash
+
+# Launch a per-user nss-tlsd process, with caching.
+# Part of the SBo nss-tls build, by B. Watson, WTFPL licensed.
+# Other distributions use systemd to launch this when a user logs
+# in, we have to have users launch it from e.g. .bash_profile. This
+# wrapper script simplifies the setup.
+
+# Note that launching the user daemon isn't required, but since the
+# system daemon doesn't do caching for security reasons, the user
+# daemon might help performance a bit.
+
+# Using setsid --fork here prevents this script from hanging around
+# waiting for nss-tlsd to exit.
+
+if [ -x /usr/sbin/nss-tlsd ]; then
+  [ -e ~/.cache/nss-tlsd.sock ] || setsid --fork /usr/sbin/nss-tlsd -c &>/dev/null &
+fi
+
+exit 0
diff --git a/network/nss-tls/nss-tlsd.default b/network/nss-tls/nss-tlsd.default
new file mode 100644
index 0000000000..60cbbdf542
--- /dev/null
+++ b/network/nss-tls/nss-tlsd.default
@@ -0,0 +1,8 @@
+# Default options for the nss-tlsd daemon:
+#
+# Supported options:
+# -c: cache results. This is really intended for per-user daemons.
+# -r: use a random server, when multiple servers are configured.
+# By default, all the above are disabled.
+
+NSS_TLSD_OPTS=""
diff --git a/network/nss-tls/per_user_dir.diff b/network/nss-tls/per_user_dir.diff
new file mode 100644
index 0000000000..d833c6ea95
--- /dev/null
+++ b/network/nss-tls/per_user_dir.diff
@@ -0,0 +1,23 @@
+diff -Naur nss-tls-1.1/nss-tls.c nss-tls-1.1.patched/nss-tls.c
+--- nss-tls-1.1/nss-tls.c	2020-07-16 19:09:59.000000000 -0400
++++ nss-tls-1.1.patched/nss-tls.c	2024-01-17 15:57:03.989437314 -0500
+@@ -68,7 +68,7 @@
+     if (geteuid() == 0)
+         strcpy(sun.sun_path, NSS_TLS_SOCKET_PATH);
+     else {
+-        dir = getenv("XDG_RUNTIME_DIR");
++        dir = getenv("HOME");
+         if (dir) {
+             len = strlen(dir);
+             if (len > sizeof(sun.sun_path) - sizeof("/"NSS_TLS_SOCKET_NAME))
+@@ -77,6 +77,10 @@
+             memcpy(sun.sun_path, dir, len);
+             sun.sun_path[len] = '/';
+             ++len;
++            memcpy(sun.sun_path + len, ".cache", 6);
++				len += 6;
++            sun.sun_path[len] = '/';
++            ++len;
+             strncpy(sun.sun_path + len,
+                     NSS_TLS_SOCKET_NAME,
+                     sizeof(sun.sun_path) - len);
diff --git a/network/nss-tls/rc.nss-tlsd b/network/nss-tls/rc.nss-tlsd
new file mode 100644
index 0000000000..752027b0f5
--- /dev/null
+++ b/network/nss-tls/rc.nss-tlsd
@@ -0,0 +1,55 @@
+#!/bin/sh
+
+# rc.nss-tlsd - by B. Watson (urchlay@slackware.uk). Part of the
+# SlackBuilds.org nss-tlsd package. WTFPL licensed.
+
+DAEMON=/usr/sbin/nss-tlsd
+PIDFILE=/run/nss-tlsd.pid
+
+[ -f /etc/default/nss-tlsd ] && . /etc/default/nss-tlsd
+
+# we try to make sure not only that the PID file exists, but that the
+# PID is actually that of a running nss-tlsd process. the 'cut' stuff
+# is in case the package was upgraded, which results in /proc/<pid>/exe
+# pointing to "/usr/sbin/nss-tlsd (deleted)".
+daemon_is_running() {
+  [ -e "$PIDFILE" ] || return 1
+  [ "$( readlink /proc/$( cat $PIDFILE )/exe 2>/dev/null | cut -d' ' -f1 )" = "$DAEMON" ] || return 1
+  return 0
+}
+
+start_daemon() {
+  if daemon_is_running; then
+    echo "$DAEMON is already running, PID $( cat $PIDFILE )"
+  else
+    echo "Starting $DAEMON"
+    nohup $DAEMON $NSS_TLSD_OPTS >/dev/null 2>&1 &
+    echo "${!}" > $PIDFILE
+  fi
+}
+
+stop_daemon() {
+  if daemon_is_running; then
+    echo "Stopping $DAEMON"
+    kill "$( cat $PIDFILE )"
+    sleep 1
+    kill -9 "$( cat $PIDFILE )" >/dev/null 2>&1
+	 rm -f $PIDFILE
+  else
+    echo "$DAEMON not running"
+  fi
+}
+
+# most rc scripts don't need this: daemons will fail to start as non-root.
+# this one is designed to work either way.
+if [ "$(id -u)" != "0" ]; then
+  echo "$0: must run as root."
+  exit 1
+fi
+
+case "$1" in
+  start|"") start_daemon ;;
+  stop) stop_daemon ;;
+  restart) stop_daemon; sleep 1; start_daemon ;;
+  *) echo "Usage: $0 start|stop|restart" ;;
+esac
diff --git a/network/nss-tls/slack-desc b/network/nss-tls/slack-desc
new file mode 100644
index 0000000000..8965e2029d
--- /dev/null
+++ b/network/nss-tls/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 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-tls: nss-tls (DNS-over-HTTPS resolver)
+nss-tls:
+nss-tls: nss-tls is an alternative, encrypted name resolving library for Linux
+nss-tls: distributions with glibc which uses DNS-over-HTTPS. The glibc name
+nss-tls: resolver can be configured through nsswitch.conf(5) to use nss-tls
+nss-tls: instead of the DNS resolver, or fall back to DNS when nss-tls fails.
+nss-tls:
+nss-tls:
+nss-tls:
+nss-tls:
+nss-tls:
diff --git a/network/ntop/README b/network/ntop/README
deleted file mode 100644
index 2108bcb9bc..0000000000
--- a/network/ntop/README
+++ /dev/null
@@ -1,24 +0,0 @@
-ntop is a network probe that shows network usage in a way similar to
-what top does for processes. In interactive mode, it displays the
-network status on the user's terminal. In Web mode, it acts as a Web
-server, creating an HTML dump of the network status.
-
-It sports a NetFlow/sFlow emitter/collector, an HTTP-based client
-interface for creating ntop-centric monitoring applications, and
-RRD for persistently storing traffic statistics.
-
-ntop 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:   ntop            UID: 212        GID: 212
-  group:  ntop                            GID: 212
-You can change pass alternate values for the user and group using
-NTOPUSER and NTOPGROUP variables when running the build script.
-
-Logs are placed in /var/log/ntop/ and will be rotated every week. The
-log rotation will restart the ntop server which will reset the ntop
-statistics. If you want to keep the statistics you have to edit or delete
-the /etc/logrotate.d/ntop file.
-
-For some important post-build and basic configuration instructions,
-see the included 'README.SLACKWARE' file.
diff --git a/network/ntop/README.SLACKWARE b/network/ntop/README.SLACKWARE
deleted file mode 100644
index e9c0595b29..0000000000
--- a/network/ntop/README.SLACKWARE
+++ /dev/null
@@ -1,185 +0,0 @@
-README.Slackware
-================
-
-This file contains some specific instructions to complete the
-installation of ntop on Slackware.
-
-0) Before running the SlackBuild script
----------------------------------------
-
-0.1) ntop group & user
-
-Before running the ntop.SlackBuild script, you will need to create
-the 'ntop' user and group. The script won't run if these do not
-exist.
-
-The suggested UID and GID is 212, but you can change this as needed:
-
-  # groupadd -g 212 ntop
-  # useradd -u 212 -g ntop -d /var/lib/ntop -s /bin/false ntop
-
-If you want to use a different user and/or group under which to run
-ntop, you can pass alternate values to the NTOPUSER and NTOPGROUP variables
-when running the build script.
-
-1) Start & Stop scripts for ntop
---------------------------------
-
-1.1) Automatic startup and shutdown
-
-If you want to start ntop on system bootup, include these lines in your
-/etc/rc.d/rc.local:
-
-  # Start ntop
-  if [ -x /etc/rc.d/rc.ntop ]; then
-    echo "Starting ntop..."
-    /etc/rc.d/rc.ntop start
-  fi
-
-To guarantee a clean shutdown of ntop, include this in
-/etc/rc.d/rc.local_shutdown:
-
-  # Stop ntop
-  if [ -x /etc/rc.d/rc.ntop ]; then
-    echo "Stopping ntop..."
-    /etc/rc.d/rc.ntop stop
-  fi
-
-1.2) Make /etc/rc.d/rc.ntop executable
-
-Additionally, you'll have to set the rc script to be executable just like
-any other Slackware rc script:
-
-  # chmod +x /etc/rc.d/rc.ntop
-
-2) Set the administrator password
----------------------------------
-
-When ntop is installed at the first time, you MUST set the administration
-password for ntop (user 'admin'). You do that by running ntop with the
-option -A (or --set-admin-password) as root:
-# /usr/bin/ntop -P <ntop_homedirectory> -u <ntopuser> -A
-For example:
-
-  # /usr/bin/ntop -P /var/lib/ntop -u ntop -A
-
-It will prompt you for the password and then exit.
-
-3) Starting ntop
-----------------
-
-Now you are ready to start ntop by calling the startup script:
-
-  # /etc/rc.d/rc.ntop start
-
-Once ntop has started and configured correctly, you should be able to look
-at all the data it's collected by pointing your browser at:
-
-  http://(ip-of-your-ntop-server):3000/
-
-Browse through the configuration menu (Admin / Configure / Startup options)
-to set the interfaces you want to capture and many more parameters.
-
-Fore more documentation on ntop, check:
-- http://www.ntop.org/documentation.html
-- http://www.ntop.org/needHelp.html
-
-There are also some mailing lists you can subscribe to, that can be found on
-the pages mentioned above.
-
-4) Keeping your ntop tables up-to-date
---------------------------------------
-
-Now that your ntop server is running, you might want to keep some of the
-tables that are installed updated automatically.
-
-I do this with a few simple shell scripts I copy to the /etc/cron.xxxx/
-directories, where xxxx stands for:
-
-  - hourly
-  - daily
-  - weekly
-  - monthly
-
-So saving a script in /etc/cron.weekly/ means it will be run every week.
-Saving it in /etc/cron/monthly/ means it will run once a month, etc.
-
-My suggestions are:
-  - save ntop_update_geoip	in /etc/cron.weekly
-  - save ntop_update_oui	in /etc/cron.daily
-
-Don't forget to make the script executable.
-
-The following scripts are examples for the GeoIP and OUI tables, feel free
-to adapt them to your reality.
-
-The "OS Fingerprint" table has not changed since 2005, so I did not
-create a script for it.  If you want, you can check for updates at:
-http://ettercap.cvs.sourceforge.net/ettercap/ettercap_ng/share/etter.finger.os?rev=HEAD
-
-=============================================================================
-*********************
-* ntop_update_geoip * - Suggestion: save in /etc/cron.weekly
-*********************
------------------------------------------------------------------------------
-#!/bin/sh
-#
-# ntop_update_geoip:    update GeoIP tables
-
-UPDATE_DIR="/etc/ntop"
-UPDATE_LOG="/var/log/ntop_update.log"
-UPDATE_OUT="wget.out"
-UPDATES="\
-http://geolite.maxmind.com/download/geoip/database/,GeoLiteCity.dat \
-http://geolite.maxmind.com/download/geoip/database/asnum/,GeoIPASNum.dat"
-
-cd $UPDATE_DIR
-
-for update in $UPDATES; do
-         update_url=`echo $update | awk -F , {'print $1'}`
-        update_file=`echo $update | awk -F , {'print $2'}`
-
-        wget -o $UPDATE_OUT -N ${update_url}${update_file}.gz
-        WGET_TEST=$(grep "saved" $UPDATE_OUT > /dev/null 2> /dev/null; echo $?)
-        if [ $WGET_TEST -eq "0" ]; then
-                tail -n2 $UPDATE_OUT | head -n1 >> $UPDATE_LOG
-                gunzip -c ${update_file}.gz > ${update_file}
-        fi
-done
-
-rm $UPDATE_OUT
-=============================================================================
-*******************
-* ntop_update_oui * - Suggestion: save in /etc/cron.daily
-*******************
------------------------------------------------------------------------------
-#!/bin/sh
-#
-# ntop_update_oui:      update OUI table
-
-UPDATE_DIR="/etc/ntop"
-UPDATE_LOG="/var/log/ntop_update.log"
-UPDATE_OUT="wget.out"
-UPDATES="\
-http://standards.ieee.org/regauth/oui/,oui.txt"
-
-cd $UPDATE_DIR
-
-for update in $UPDATES; do
-         update_url=`echo $update | awk -F , {'print $1'}`
-        update_file=`echo $update | awk -F , {'print $2'}`
-
-        wget -o $UPDATE_OUT -N ${update_url}${update_file}
-        WGET_TEST=$(grep "saved" $UPDATE_OUT > /dev/null 2> /dev/null; echo $?)
-        if [ $WGET_TEST -eq "0" ]; then
-                tail -n2 $UPDATE_OUT | head -n1 >> $UPDATE_LOG
-                gzip -c ${update_file} > ${update_file}.gz
-        fi
-done
-
-rm $UPDATE_OUT
-=============================================================================
-
-(Note that there are some subtle differences between the scripts, so beware
-when copying)
-
diff --git a/network/ntop/doinst.sh b/network/ntop/doinst.sh
deleted file mode 100644
index 17fa8ad81f..0000000000
--- a/network/ntop/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.ntop.new
-config etc/logrotate.d/ntop.new
-config etc/ntop/specialMAC.txt.gz.new
-config etc/ntop/ntop-cert.pem.new
-config etc/ntop/GeoIPASNum.dat.new
-config etc/ntop/GeoLiteCity.dat.new
-config etc/ntop/etter.finger.os.gz.new
-config etc/ntop/oui.txt.gz.new
diff --git a/network/ntop/no_downloads.patch b/network/ntop/no_downloads.patch
deleted file mode 100644
index 9574662b43..0000000000
--- a/network/ntop/no_downloads.patch
+++ /dev/null
@@ -1,48 +0,0 @@
---- ntop-4.0.1_orig/Makefile.am	2010-04-25 09:52:28.000000000 -0300
-+++ ntop-4.0.1/Makefile.am	2010-08-23 18:00:49.000000000 -0300
-@@ -403,44 +403,9 @@
- dnetter:
- 	@echo ""
- 	@echo ""
--	@echo "Preparing "
-+	@echo "Skipping download "
- 	@echo ""
- 
--	@if test -f $(ETTER_PASSIVE).old; then \
--	  echo "...Deleting prior file, $(ETTER_PASSIVE).old..."; \
--	  rm -rf $(ETTER_PASSIVE).old; \
--	fi;
--	@if test -f $(ETTER_PASSIVE); then \
--	  echo "...Moving current $(ETTER_PASSIVE) to $(ETTER_PASSIVE).old"; \
--	  mv $(ETTER_PASSIVE) $(ETTER_PASSIVE).old; \
--	fi;
--	@for file in $(ETTER_PASSIVE) $(ETTER_PASSIVE).gz \
--		$(ETTER_PASSIVE_FILE) $(ETTER_PASSIVE_FILE).gz; do \
--          if test -f $$file; then \
--	     echo "...Deleting prior file, $$file..."; \
--             rm -rf $$file; \
--          fi; \
--        done
--	@echo ""
--	@echo "...Downloading new file..."
--	@wget -O $(ETTER_PASSIVE_FILE) \
--		$(ETTER_PASSIVE_DOWNLOAD_FROM)/$(ETTER_PASSIVE_FILE)?$(ETTER_PASSIVE_DOWNLOAD_PARMS)
--	@echo ""
--	@echo "gziping downloaded file..."
--	@gzip $(ETTER_PASSIVE_FILE)
--	@echo ""
--	@echo ""
--	@if test -f $(ETTER_PASSIVE).old; then \
--	  echo -n "Old file lines were: "; \
--	  gunzip -c $(ETTER_PASSIVE).old | wc -l; \
--	fi;
--	@echo -n "New file lines are:  "
--	@gunzip -c $(ETTER_PASSIVE) | wc -l
--	@echo ""
--	@echo ""
--	@echo "New file is:"
--	@ls -l $(ETTER_PASSIVE)
--
- # ntop census
- census-fail:
- 	@echo "This option is no longer available... thanks for trying"
diff --git a/network/ntop/ntop-5.0.1-librrd.patch b/network/ntop/ntop-5.0.1-librrd.patch
deleted file mode 100644
index db2530c8a5..0000000000
--- a/network/ntop/ntop-5.0.1-librrd.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- a/configure.in
-+++ b/configure.in
-@@ -887,28 +887,6 @@
-    fi
- fi
- 
--RRD_LIB="-L${RRD_HOME}/lib -lrrd_th"
--
--if test -f "$RRD_HOME/lib/librrd_th.so"; then
--   AC_MSG_RESULT(checking for rrdtool... yes)
--else
--  if test -f "$RRD_HOME/lib/librrd_th.dylib"; then # OSX
--     AC_MSG_RESULT(checking for rrdtool... yes)
--  else
--     if test -f "$RRD_HOME/lib/librrd_th.a"; then
--       AC_MSG_RESULT(checking for rrdtool... yes)
--     else
--       AC_CHECK_LIB([rrd_th], [main])
--       if test ".${ac_cv_lib_rrd_th_main}" != ".yes"; then
--         AC_MSG_ERROR(Unable to find RRD at $RRD_HOME: please use --with-rrd-home=DIR);
--	 AC_MSG_ERROR(RRD source can be downloaded from http://www.rrdtool.org/);
--       else
--         RRD_LIB=
--       fi
--     fi
--  fi
--fi
--
- RRD_INC=
- if test -d "${RRD_HOME}/include"; then
-   RRD_INC="-I${RRD_HOME}/include"
diff --git a/network/ntop/ntop.SlackBuild b/network/ntop/ntop.SlackBuild
deleted file mode 100644
index 2e3de40b16..0000000000
--- a/network/ntop/ntop.SlackBuild
+++ /dev/null
@@ -1,160 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for ntop
-
-# Copyright 2007-2008  Michiel van Wessem, Manchester, United Kingdom
-# Copyright 2009-2011  Niels Horn, Rio de Janeiro, RJ, 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.
-
-# Maintained by David Spencer <baildon.research@googlemail.com>
-
-PRGNAM=ntop
-VERSION=${VERSION:-5.0.1}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-NTOPUSER=${NTOPUSER:-ntop}
-NTOPGROUP=${NTOPGROUP:-ntop}
-
-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}
-
-# Bail out if user or group isn't valid on your system
-# For slackbuilds.org, assigned ntop uid/gid are 212/212
-# See http://slackbuilds.org/uid_gid.txt
-if ! grep ^$NTOPGROUP: /etc/group 2>&1 > /dev/null; then
-    echo "  You must have a \"$NTOPGROUP\" group to run this script."
-    echo "    # groupadd -g 212 $NTOPGROUP"
-    exit 1
-elif ! grep ^$NTOPUSER: /etc/passwd 2>&1 > /dev/null; then
-    echo "  You must have a \"$NTOPUSER\" user to run this script."
-    echo "    # useradd -u 212 -g $NTOPGROUP -d /var/lib/ntop -s /bin/false $NTOPUSER"
-    exit 1
-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.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 Makefile so we won't do automatic downloads
-patch -p1 < $CWD/no_downloads.patch
-
-# Patch for rrdtool-1.6.0 (thanks to Gentoo)
-patch -p1 < $CWD/ntop-5.0.1-librrd.patch
-
-# Since ntop calls their ./configure from autogen.sh anything passed onto
-# autogen.sh (ie $@) is passed off as command line arguments to configure.
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-RRD_LIB="-lrrd" \
-LOCALEDIR=/usr/lib${LIBDIRSUFFIX}/locale \
-./autogen.sh \
-  --prefix=/usr \
-  --sysconfdir=/etc \
-  --localstatedir=/var/lib \
-  --mandir=/usr/man \
-  --docdir=/usr/doc/$PRGNAM-$VERSION \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --with-rrd-home=/usr/lib${LIBDIRSUFFIX} \
-  --enable-snmp \
-  --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
-
-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
-
-# Bug in ntop source:: http://tinyurl.com/2wf7ou . This should at some point
-# be dealt with upstream. For now fix this in $PKG :)
-if [ -d $PKG/usr/lib${LIBDIRSUFFIX}/plugins ]; then
-    rmdir -v $PKG/usr/lib${LIBDIRSUFFIX}/plugins
-fi
-
-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.ntop > $PKG/etc/rc.d/rc.ntop.new
-
-# Rename some data to .new to avoid overwriting existing files
-cd $PKG/etc/$PRGNAM
-  for f in \
-  specialMAC.txt.gz ntop-cert.pem GeoIPASNum.dat GeoLiteCity.dat etter.finger.os.gz oui.txt.gz; do
-    mv $f $f.new
-  done
-cd - >/dev/null
-
-# Change the permissions on ntop's homedir so we can write logs
-chown -R $NTOPUSER:$NTOPGROUP $PKG/var/lib/$PRGNAM
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
-  AUTHORS CONTENTS COPYING ChangeLog INSTALL LICENSE* MANIFESTO NEWS PORTING \
-  README SUPPORT_NTOP.txt THANKS ntop.html ntop.txt \
-  docs/ NetFlow/ www/ \
-  $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:-tgz}
diff --git a/network/ntop/ntop.info b/network/ntop/ntop.info
deleted file mode 100644
index 9ad336e061..0000000000
--- a/network/ntop/ntop.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="ntop"
-VERSION="5.0.1"
-HOMEPAGE="https://www.ntop.org"
-DOWNLOAD="https://downloads.sourceforge.net/ntop/ntop-5.0.1.tar.gz"
-MD5SUM="01710b6925a8a5ffe1a41b8b512ebd69"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="GeoIP graphviz rrdtool"
-MAINTAINER="David Spencer"
-EMAIL="baildon.research@googlemail.com"
diff --git a/network/ntop/ntop.logrotate b/network/ntop/ntop.logrotate
deleted file mode 100644
index a387c5018f..0000000000
--- a/network/ntop/ntop.logrotate
+++ /dev/null
@@ -1,11 +0,0 @@
-/var/log/ntop {
-    # based on ntop.logrotate included in the ntop/debian source.
-    weekly
-    missingok
-    rotate 4
-    # ntop doesn't handle SIGHUP
-    copytruncate
-    nocompress
-    notifempty
-    create 640 root wheel
-}
diff --git a/network/ntop/rc.ntop b/network/ntop/rc.ntop
deleted file mode 100644
index 2d29aac6c6..0000000000
--- a/network/ntop/rc.ntop
+++ /dev/null
@@ -1,95 +0,0 @@
-#!/bin/sh
-
-# /etc/rc.d/rc.ntop : start/stop/restart ntop
-# usage: ./rc.ntop { 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=@NTOPUSER@
-NTOPGID=@NTOPGROUP@
-NTOPLOG=/var/log/ntop
-DATE=$(date +%a\ %b\ %d\ %T\ %Y)
-RETVAL=0
-
-# Sanity Checking
-if [  ! -r "/var/lib/ntop/ntop_pw.db" ]; then
-    echo "Can not read ntop password database. Exiting..."
-    exit 1
-fi
-
-ntop_start() {
-    echo -n $"Starting ntop ...  "
-    if [ -r /var/run/ntop.pid ]; then
-        if $(! /sbin/pidof ntop > /dev/null 2>&1 ) ; then
-            echo "Removing an old /var/run/ntop.pid"
-            rm -f /var/run/ntop.pid
-        fi
-    fi
-    /usr/bin/ntop --w3c -u $NTOPUID -d >> $NTOPLOG 2>&1
-    RETVAL=$?
-
-    if [ $RETVAL -eq 0 ]; then
-        touch /var/lock/ntop
-        sleep 2
-        echo "Done"
-    else
-        echo "Failed"
-    fi
-    return $RETVAL
-}
-
-ntop_stop() {
-    echo -n $"Stopping ntop ...  "
-    RETVAL=$?
-    if [ $RETVAL -eq 0 ]; then
-        if [ -r /var/run/ntop.pid ]; then
-            killall ntop
-            # 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 ntop > /dev/null 2>&1 ) ; then
-                    # ntop is a dirty little daemon:
-                    rm -f /var/run/ntop.pid
-                    break
-                fi
-                sleep 1
-            done
-
-            if [ "$second" = "10" ]; then
-                echo "\nWARNING: ntop did not exit!"
-                sleep 10
-            else
-                # Yes there are two spaces as this is the way ntop writes
-                # their logfiles.
-                echo "$DATE  EXIT: ntop stopped by user: $USER (UID: $EUID)" >> $NTOPLOG
-                echo "Done"
-            fi
-        fi
-        rm -f /var/lock/ntop
-    fi
-    return $RETVAL
-}
-
-# Lets see how we are being called:
-case "$1" in
-    start)
-        ntop_start
-        ;;
-    stop)
-        ntop_stop
-        ;;
-    restart|reload)
-        ntop_stop
-        # Takes a few to recover and be able to start again:
-        sleep 10
-        ntop_start
-        ;;
-    *)
-        echo ""
-        echo "Usage: $(basename $0) {start | stop | restart }"
-        RETVAL=1
-esac
-
-exit $RETVAL
-#EOF
diff --git a/network/ntop/slack-desc b/network/ntop/slack-desc
deleted file mode 100644
index ec79cc9821..0000000000
--- a/network/ntop/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------------------------------------------------------|
-ntop: ntop (Network usage with shiny graphs)
-ntop:
-ntop: ntop is a network probe that shows network usage in a way similar to
-ntop: what top does for processes. In interactive mode, it displays the
-ntop: network status on the user's terminal. In Web mode, it acts as a Web
-ntop: server, creating an HTML dump of the network status.
-ntop:
-ntop: It sports a NetFlow/sFlow emitter/collector, an HTTP-based client
-ntop: interface for creating ntop-centric monitoring applications, and
-ntop: RRD for persistently storing traffic statistics.
-ntop:
diff --git a/network/ntpclient/ntpclient.SlackBuild b/network/ntpclient/ntpclient.SlackBuild
index a5ccfbfe13..8c7d328ad9 100644
--- a/network/ntpclient/ntpclient.SlackBuild
+++ b/network/ntpclient/ntpclient.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for ntpclient
 
@@ -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.
 
+# 20220125 bkw: Modified by the SlackBuilds.org project.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=ntpclient
 VERSION=${VERSION:-2015_365}
 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}
@@ -70,6 +82,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 {} \;
 
+# 20220125 bkw: fix build for -current (missing include).
+sed -i '/sys\/ioctl\.h/a#include <linux/sockios.h>' $PRGNAM.c
+
+# 20220125 bkw: fix man page typo.
+sed -i 's/^top after/s&/' $PRGNAM.1
+
 sed -i "/^CFLAGS += -O2$/d" Makefile
 CFLAGS="$SLKCFLAGS" \
 make
@@ -91,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/network/nweb/README b/network/nweb/README
new file mode 100644
index 0000000000..9f882d64d9
--- /dev/null
+++ b/network/nweb/README
@@ -0,0 +1,23 @@
+A tiny web server in C.
+
+nweb is a small and very safe mini web server nweb only servers out
+file/web pages with extensions named below and only from the named
+directory or its sub-directories.
+
+There is no fancy features = safe and secure.
+
+Example: nweb 8181 /home/nwebdir &
+
+Only Supports: gif jpg jpeg png ico zip gz tar htm html
+Not Supported: URLs including "..", Java, Javascript, CGI
+Not Supported: directories / /etc /bin /lib /tmp /usr /dev /sbin
+
+client.c:
+
+Also included is the source for a client.  This client.c program is
+designed to fake being a web browser. It sends the expected requests to
+the web server over a network socket connection and displays the results
+as text rather than graphically displaying the results. In the code you
+will have to change the two lines as below to match your web server or
+nweb server.  See README.client for instructions.  The client.c source
+code can be found in the /usr/doc/nweb-<VERSION> directory.
diff --git a/network/nweb/README.client b/network/nweb/README.client
new file mode 100644
index 0000000000..1fd848e0bd
--- /dev/null
+++ b/network/nweb/README.client
@@ -0,0 +1,64 @@
+                                      client.c
+
+This client.c program is designed to fake being a web browser. It sends the
+expected requests to the web server over a network socket connection and
+displays the results as text rather than graphically displaying the results. In
+the code you will have to change the two lines as below to match your web
+server or nweb server.
+
+/* YOU WILL HAVE TO CHANGE THESE TWO LINES TO MATCH YOUR CONFIG / #define PORT
+ * 8181 /
+Port number as an integer - web server default is 80 / #define IP_ADDRESS
+"192.168.0.8" / IP Address as a string */
+
+The default is to request the /index.html from the web server. If you want to
+request another file then change the GET line as below:
+
+char *command = "GET /index.html HTTP/1.0 \r\n\r\n" ;
+
+To, for example:
+
+char *command = "GET /nigel.jpg HTTP/1.0 \r\n\r\n" ;
+
+Then compile the program with: cc client.c -o client
+
+I save the output in to a file as putting a non-test file like .jpg to the
+terminal screen can cause chaos: client >output
+
+Then edit the output file: vi output
+
+In real life, the interaction of web browser and web server can be much more complex.
+
+ 1. The web browser can tell the web server about its name, version and capabilities.
+
+ 2. The web server can send complex file types line JavaScript or Java programs
+or other active components.
+
+ 3. They can maintain a longer connection over the socket for efficiency.
+
+ 4. Below is an example of my Firefox brower requesting an index.html file. I
+have added newline characters to make it readable - it is 1300 bytes long! I
+have no idea what most of it is about. You will have to read the The World Wide
+Web Consortium (W3C) at http://www.w3.org for all the details.
+
+GET /index.html HTTP/1.1Host: myserver.home.com:80User-Agent: Mozilla/5.0 (W indows;
+U; Windows NT 5.1; en-GB; rv:1.9.2.28) Gecko/20120306 Firefox/3.6.28 (.NET CLR
+3.5.30729)Ac cept: image/png,image/;q=0.8,/*;q=0.5Accept-Language:
+en-gb,en;q=0.5Accept-Encoding: gzip,defla teAccept-Charset: ISO-8859-1,utf-8;
+q=0.7,*;q=0.7Keep-Alive: 115Connection: keep-alive**Referer:
+http://myserver.uk.home.com:8181/index.html**Cookie:
+__utma=101107545.1790272076.1316019590.13289002 55.1328908680.164;
+__utmz=101107545.1328566199.157.46.utmcsr=t.co|utmccn=(referral)|utmcmd=referral| u
+tmcct=/iTJx4DO1; UnicaNIODID=ZBr8gm79vIG-XKeoGGb; W3SSO_ACCESS=abc.home.com;
+ISP=70fdfc95
+d93011d783e4de784ea97766-70fdfc95d93011d783e4de784ea97766-f67749a8b899e8ceed7e940b8c4bf189;
+Prof ile=2000121913394303111032836125|EN|866|866.BDF|en-GB;
+_unam=693fb60-1337f162b72-11770d11-5; WLS intra_USERID=nigel@hotmail.com;
+ipcInfo=cc%3Duk%3Blc%3Den%3Bac%3Dall; iwm1p=214617669; bprememberme=nigel@
+hotmail.com; EPSPROFILE=EE2355DFE16AE020BE6C62FCB6BF5602;
+DWPERM=Xa.2/Xb.Xzso3-U35t8RWKvqBreGaQMgsP_RG
+Fl1124oIt-L-OPJIdSautkBN0D4NUp9JLlpUqPqB6CWOo-pgrJwhxNvvSfPAajgetaA2MOYwHfQPXPTRG9zwOMMR57EHQtXhOy5Om
+yzanyZthvVClm6uxvbwh0isEQ2Mm_9g2l7NjcA3RJdjuLaB3qlljOmyVuhDjBkgdNEb3PgYcCpbiu1FUzXrhPalhgsbAj7NBkaY88
+Yyg/Xc./Xd./Xf./Xg.1696801
+
+I hope this has been instructive, thanks, Nigel Griffiths
diff --git a/network/nweb/nweb.SlackBuild b/network/nweb/nweb.SlackBuild
new file mode 100644
index 0000000000..12729200dd
--- /dev/null
+++ b/network/nweb/nweb.SlackBuild
@@ -0,0 +1,99 @@
+#!/bin/bash
+
+# Slackware build script for nweb
+
+# Copyright 2021  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.
+
+# 20220312 bkw: Modified by SlackBuilds.org: VERSION must be constant,
+# and match VERSION in the .info file.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=nweb
+COMMIT=${COMMIT:-867a6dd46298c882501f5c26d31ee821177542ab}
+VERSION=${VERSION:-23_867a6dd}
+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/usr/bin $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 {} \;
+
+${CC:-gcc} $SLKCFLAGS nweb${VERSION:0:2}.c -o $PKG/usr/bin/nweb
+strip --strip-unneeded $PKG/usr/bin/nweb
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/{www-example,client}
+
+cp -a client.c $PKG/usr/doc/$PRGNAM-$VERSION/client
+cp -a nigel.jpg favicon.ico nweb.log index.html \
+  $PKG/usr/doc/$PRGNAM-$VERSION/www-example
+
+cp -a README.md $CWD/README.client $PKG/usr/doc/$PRGNAM-$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/network/nweb/nweb.info b/network/nweb/nweb.info
new file mode 100644
index 0000000000..74e51e8a34
--- /dev/null
+++ b/network/nweb/nweb.info
@@ -0,0 +1,10 @@
+PRGNAM="nweb"
+VERSION="23_867a6dd"
+HOMEPAGE="https://github.com/ankushagarwal/nweb"
+DOWNLOAD="https://github.com/ankushagarwal/nweb/archive/867a6dd46298c882501f5c26d31ee821177542ab/nweb-867a6dd46298c882501f5c26d31ee821177542ab.tar.gz"
+MD5SUM="7570ab89a441f1b11f2ab099660b9daa"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="D Woodfall"
+EMAIL="dave@slackbuilds.org"
diff --git a/network/nweb/slack-desc b/network/nweb/slack-desc
new file mode 100644
index 0000000000..a271191935
--- /dev/null
+++ b/network/nweb/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+    |-----handy-ruler------------------------------------------------------|
+nweb: nweb (A tiny web server in C)
+nweb:
+nweb: nweb is a small and very safe mini web server nweb only servers out
+nweb: file/web pages with certain extensions and only from the named
+nweb: directory or its sub-directories.
+nweb:
+nweb: There is no fancy features = safe and secure.
+nweb:
+nweb: Example: nweb 8181 /home/nwebdir &
+nweb:
+nweb:
diff --git a/network/nxclient/nxclient.SlackBuild b/network/nxclient/nxclient.SlackBuild
index fde485e581..8a0e18f677 100644
--- a/network/nxclient/nxclient.SlackBuild
+++ b/network/nxclient/nxclient.SlackBuild
@@ -1,24 +1,42 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for nxclient
 # Written by Matteo Bernardini <ponce@slackbuilds.org>
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=nxclient
 VERSION=${VERSION:-3.5.0_7}
 BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 LVERSION=$(printf $VERSION|tr _ -)
 
 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 [ "$ARCH" = "x86_64" ]; then
+  SRCARCH=$ARCH
+elif [[ $ARCH = i?86 ]]; then
+  SRCARCH=i386
+else
+  echo "$ARCH architecture is unsupported." >/dev/stderr
+  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
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -32,17 +50,16 @@ mkdir -p $PKG/usr/bin
 
 # installing in /usr/NX looks pretty ugly, maybe better symlink from /opt
 mkdir -p $PKG/opt
-tar xvf $CWD/$PRGNAM-$LVERSION.$ARCH.tar.gz -C $PKG/opt
+tar xvf $CWD/$PRGNAM-$LVERSION.$SRCARCH.tar.gz -C $PKG/opt
 chown -R root:root $PKG
 find $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 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
-ln -s /opt/NX $PKG/usr/NX
 
-cd $PKG/usr/bin
-ln -s /usr/NX/bin/$PRGNAM $PRGNAM
+( cd $PKG/usr ; ln -s ../opt/NX NX )
+( cd $PKG/usr/bin ; ln -s ../../opt/NX/bin/$PRGNAM . )
 
 mkdir -p $PKG/usr/share/applications
 cat $CWD/$PRGNAM.desktop > $PKG/usr/share/applications/$PRGNAM.desktop
@@ -55,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/network/nyxt/README b/network/nyxt/README
new file mode 100644
index 0000000000..376aba2c78
--- /dev/null
+++ b/network/nyxt/README
@@ -0,0 +1,3 @@
+Nyxt is a keyboard-driven web browser designed for power users.
+Inspired by Emacs and Vim, it has familiar keybindings
+(Emacs, vi, CUA), and is infinitely extensible in Lisp.
diff --git a/network/nyxt/doinst.sh b/network/nyxt/doinst.sh
new file mode 100644
index 0000000000..65c7e2eeb9
--- /dev/null
+++ b/network/nyxt/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/network/nyxt/nyxt.SlackBuild b/network/nyxt/nyxt.SlackBuild
new file mode 100644
index 0000000000..bf714dae9e
--- /dev/null
+++ b/network/nyxt/nyxt.SlackBuild
@@ -0,0 +1,89 @@
+#!/bin/bash
+
+# Slackware build script for nyxt
+
+# Copyright 2023, Pu Du
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=nyxt
+VERSION=${VERSION:-3.11.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
+mkdir $PRGNAM-$VERSION
+cd $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION-source-with-submodules.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 {} \;
+
+# use $TMP/$PRGNAM-$VERSION/.cache dir instead of $HOME/.cache/common-lisp/
+(
+  code="(setf asdf:*user-cache* \"$TMP/$PRGNAM-$VERSION/.cache/\")"
+  sed "s,--eval '(require \"asdf\")',& --eval '$code'," -i makefile
+)
+
+(
+  export PREFIX=/usr NASDF_COMPRESS=t
+  make -j1 doc nyxt LIBDIR=$PREFIX/lib${LIBDIRSUFFIX} NASDF_SOURCE_PATH=$PREFIX/share/nyxt
+  make install DESTDIR=$PKG LIBDIR=$PKG/$PREFIX/lib${LIBDIRSUFFIX}
+)
+
+# It's not a good idea to strip the lisp image, so we don't
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a manual.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/network/nyxt/nyxt.info b/network/nyxt/nyxt.info
new file mode 100644
index 0000000000..144fd0164a
--- /dev/null
+++ b/network/nyxt/nyxt.info
@@ -0,0 +1,10 @@
+PRGNAM="nyxt"
+VERSION="3.11.5"
+HOMEPAGE="https://nyxt.atlas.engineer/"
+DOWNLOAD="https://github.com/atlas-engineer/nyxt/releases/download/3.11.5/nyxt-3.11.5-source-with-submodules.tar.xz"
+MD5SUM="0adaeb586f5ebc4653f0effbd13747c3"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="libfixposix sbcl webkit2gtk"
+MAINTAINER="Pu Du"
+EMAIL="pu.du@ro.ru"
diff --git a/network/nyxt/slack-desc b/network/nyxt/slack-desc
new file mode 100644
index 0000000000..05367e0fb4
--- /dev/null
+++ b/network/nyxt/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+    |-----handy-ruler------------------------------------------------------|
+nyxt: nyxt (hacker's power-browser)
+nyxt:
+nyxt: Nyxt is a keyboard-driven web browser designed for power users.
+nyxt: Inspired by Emacs and Vim, it has familiar keybindings
+nyxt: (Emacs, vi, CUA), and is infinitely extensible in Lisp.
+nyxt:
+nyxt:
+nyxt:
+nyxt:
+nyxt:
+nyxt:
diff --git a/network/nzbget/nzbget.SlackBuild b/network/nzbget/nzbget.SlackBuild
index 4e8d95a744..58e86674b5 100644
--- a/network/nzbget/nzbget.SlackBuild
+++ b/network/nzbget/nzbget.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for "nzbget".
 
@@ -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=nzbget
 VERSION=${VERSION:-17.1}
 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}
@@ -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/network/ocserv/README b/network/ocserv/README
new file mode 100644
index 0000000000..82510b0a05
--- /dev/null
+++ b/network/ocserv/README
@@ -0,0 +1,39 @@
+The OpenConnect VPN server (ocserv) is an open source Linux SSL VPN
+server designed for organizations that require a remote access VPN with
+enterprise user management and control. It follows the openconnect
+protocol and is the counterpart of the openconnect VPN client. It is
+also compatible with CISCO's AnyConnect SSL VPN.
+
+The OpenConnect VPN is less vulnerable to detection than OpenVPN, IPSec,
+and WireGuard because it looks like a normal https connection (if udp is
+not used).
+
+The program consists of:
+
+1. ocserv, the main server application
+2. occtl, the server's control tool. A tool which allows one to query
+   the server for information.
+3. ocpasswd, a tool to administer simple password files.
+
+A user and group "ocserv" must exist prior to running this script.
+To create them run as root:
+  groupadd -g 382 ocserv
+  useradd -u 382 -g 382 -s /sbin/nologin -M ocserv
+
+
+In order to start ocserv at boot and stop it properly at shutdown,
+make sure rc.local and rc.local_shutdown contain the following lines:
+
+  /etc/rc.d/rc.local
+  ==================
+  # Start ocserv
+  if [ -x /etc/rc.d/rc.ocserv ]; then
+    /etc/rc.d/rc.ocserv start
+  fi
+
+  /etc/rc.d/rc.local_shutdown
+  ===========================
+  # Stop ocserv
+  if [ -x /etc/rc.d/rc.ocserv ]; then
+    /etc/rc.d/rc.ocserv stop
+  fi
diff --git a/network/ocserv/doinst.sh b/network/ocserv/doinst.sh
new file mode 100644
index 0000000000..1d3e5778f8
--- /dev/null
+++ b/network/ocserv/doinst.sh
@@ -0,0 +1,23 @@
+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.ocserv.new
+config etc/ocserv/ocserv.conf.new
diff --git a/network/ocserv/ocserv.SlackBuild b/network/ocserv/ocserv.SlackBuild
new file mode 100644
index 0000000000..0636d788d7
--- /dev/null
+++ b/network/ocserv/ocserv.SlackBuild
@@ -0,0 +1,119 @@
+#!/bin/bash
+
+# Slackware build script for ocserv
+
+# Copyright 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=ocserv
+VERSION=${VERSION:-1.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 [ ! -z "${PRINT_PACKAGE_NAME}" ]; 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
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -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 CONTRIBUTING* ChangeLog NEWS README* \
+  doc/README* doc/sample.* doc/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
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
+mkdir -p $PKG/etc/{rc.d,ocserv}
+cat $CWD/rc.ocserv > $PKG/etc/rc.d/rc.ocserv.new
+cat $CWD/ocserv.conf > $PKG/etc/ocserv/ocserv.conf.new
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/network/ocserv/ocserv.conf b/network/ocserv/ocserv.conf
new file mode 100644
index 0000000000..d00fdcb414
--- /dev/null
+++ b/network/ocserv/ocserv.conf
@@ -0,0 +1,779 @@
+### The following directives do not change with server reload.
+
+# User authentication method. To require multiple methods to be
+# used for the user to login, add multiple auth directives. The values
+# in the 'auth' directive are AND composed (if multiple all must
+# succeed).
+# Available options: certificate, plain, pam, radius, gssapi.
+# Note that authentication methods utilizing passwords cannot be
+# combined (e.g., the plain, pam or radius methods).
+
+# certificate:
+#  This indicates that all connecting users must present a certificate.
+#  The username and user group will be then extracted from it (see
+#  cert-user-oid and cert-group-oid). The certificate to be accepted
+#  it must be signed by the CA certificate as specified in 'ca-cert' and
+#  it must not be listed in the CRL, as specified by the 'crl' option.
+#
+# pam[gid-min=1000]:
+#  This enabled PAM authentication of the user. The gid-min option is used
+# by auto-select-group option, in order to select the minimum valid group ID.
+#
+# plain[passwd=/etc/ocserv/ocpasswd,otp=/etc/ocserv/users.otp]
+#  The plain option requires specifying a password file which contains
+# entries of the following format.
+# "username:groupname1,groupname2:encoded-password"
+# One entry must be listed per line, and 'ocpasswd' should be used
+# to generate password entries. The 'otp' suboption allows one to specify
+# an oath password file to be used for one time passwords; the format of
+# the file is described in https://github.com/archiecobbs/mod-authn-otp/wiki/UsersFile
+#
+# radius[config=/etc/radiusclient/radiusclient.conf,groupconfig=true,nas-identifier=name]:
+#  The radius option requires specifying freeradius-client configuration
+# file. If the groupconfig option is set, then config-per-user/group will be overridden,
+# and all configuration will be read from radius. That also includes the
+# Acct-Interim-Interval, and Session-Timeout values.
+#
+# See doc/README-radius.md for the supported radius configuration attributes.
+#
+# gssapi[keytab=/etc/key.tab,require-local-user-map=true,tgt-freshness-time=900]
+#  The gssapi option allows one to use authentication methods supported by GSSAPI,
+# such as Kerberos tickets with ocserv. It should be best used as an alternative
+# to PAM (i.e., have pam in auth and gssapi in enable-auth), to allow users with
+# tickets and without tickets to login. The default value for require-local-user-map
+# is true. The 'tgt-freshness-time' if set, it would require the TGT tickets presented
+# to have been issued within the provided number of seconds. That option is used to
+# restrict logins even if the KDC provides long time TGT tickets.
+
+#auth = "pam"
+#auth = "pam[gid-min=1000]"
+#auth = "plain[passwd=./sample.passwd,otp=./sample.otp]"
+auth = "plain[passwd=/etc/ocserv/passwd]"
+#auth = "certificate"
+#auth = "radius[config=/etc/radiusclient/radiusclient.conf,groupconfig=true]"
+
+# Specify alternative authentication methods that are sufficient
+# for authentication. That is, if set, any of the methods enabled
+# will be sufficient to login, irrespective of the main 'auth' entries.
+# When multiple options are present, they are OR composed (any of them
+# succeeding allows login).
+#enable-auth = "certificate"
+#enable-auth = "gssapi"
+#enable-auth = "gssapi[keytab=/etc/key.tab,require-local-user-map=true,tgt-freshness-time=900]"
+
+# Accounting methods available:
+# radius: can be combined with any authentication method, it provides
+#      radius accounting to available users (see also stats-report-time).
+#
+# pam: can be combined with any authentication method, it provides
+#      a validation of the connecting user's name using PAM. It is
+#      superfluous to use this method when authentication is already
+#      PAM.
+#
+# Only one accounting method can be specified.
+#acct = "radius[config=/etc/radiusclient/radiusclient.conf]"
+
+# Use listen-host to limit to specific IPs or to the IPs of a provided
+# hostname.
+#listen-host = [IP|HOSTNAME]
+
+# Use udp-listen-host to limit udp to specific IPs or to the IPs of a provided
+# hostname. if not set, listen-host will be used
+#udp-listen-host = [IP|HOSTNAME]
+
+# When the server has a dynamic DNS address (that may change),
+# should set that to true to ask the client to resolve again on
+# reconnects.
+#listen-host-is-dyndns = true
+
+# move the listen socket within the specified network namespace
+# listen-netns = "foo"
+
+# TCP and UDP port number
+tcp-port = 443
+udp-port = 443
+
+# The user the worker processes will be run as. This should be a dedicated
+# unprivileged user (e.g., 'ocserv') and no other services should run as this
+# user.
+run-as-user = ocserv
+run-as-group = ocserv
+
+# socket file used for IPC with occtl. You only need to set that,
+# if you use more than a single servers.
+#occtl-socket-file = /var/run/occtl.socket
+
+# socket file used for server IPC (worker-main), will be appended with .PID
+# It must be accessible within the chroot environment (if any), so it is best
+# specified relatively to the chroot directory.
+socket-file = /var/run/ocserv-socket
+
+# The default server directory. Does not require any devices present.
+#chroot-dir = /var/lib/ocserv
+
+# The key and the certificates of the server
+# The key may be a file, or any URL supported by GnuTLS (e.g.,
+# tpmkey:uuid=xxxxxxx-xxxx-xxxx-xxxx-xxxxxxxx;storage=user
+# or pkcs11:object=my-vpn-key;object-type=private)
+#
+# The server-cert file may contain a single certificate, or
+# a sorted certificate chain.
+# There may be multiple server-cert and server-key directives,
+# but each key should correspond to the preceding certificate.
+# The certificate files will be reloaded when changed allowing for in-place
+# certificate renewal (they are checked and reloaded periodically;
+# a SIGHUP signal to main server will force reload).
+
+#server-cert = /etc/ocserv/fullchain.pem
+#server-key = /etc/ocserv/privkey.pem
+
+# Diffie-Hellman parameters. Only needed if for old (pre 3.6.0
+# versions of GnuTLS for supporting DHE ciphersuites.
+# Can be generated using:
+# certtool --generate-dh-params --outfile /etc/ocserv/dh.pem
+#dh-params = /etc/ocserv/dh.pem
+
+# In case PKCS #11, TPM or encrypted keys are used the PINs should be available
+# in files. The srk-pin-file is applicable to TPM keys only, and is the
+# storage root key.
+#pin-file = /etc/ocserv/pin.txt
+#srk-pin-file = /etc/ocserv/srkpin.txt
+
+# The password or PIN needed to unlock the key in server-key file.
+# Only needed if the file is encrypted or a PKCS #11 object. This
+# is an alternative method to pin-file.
+#key-pin = 1234
+
+# The SRK PIN for TPM.
+# This is an alternative method to srk-pin-file.
+#srk-pin = 1234
+
+# The Certificate Authority that will be used to verify
+# client certificates (public keys) if certificate authentication
+# is set.
+#ca-cert = /etc/ocserv/ca.pem
+
+# The number of sub-processes to use for the security module (authentication)
+# processes. Typically this should not be set as the number of processes
+# is determined automatically by the initially set maximum number of clients.
+#sec-mod-scale = 4
+
+
+
+### All configuration options below this line are reloaded on a SIGHUP.
+### The options above, will remain unchanged. Note however, that the
+### server-cert, server-key, dh-params and ca-cert options will be reloaded
+### if the provided file changes, on server reload. That allows certificate
+### rotation, but requires the server key to remain the same for seamless
+### operation. If the server key changes on reload, there may be connection
+### failures during the reloading time.
+
+
+# Whether to enable seccomp/Linux namespaces worker isolation. That restricts the number of
+# system calls allowed to a worker process, in order to reduce damage from a
+# bug in the worker process. It is available on Linux systems at a performance cost.
+# The performance cost is roughly 2% overhead at transfer time (tested on a Linux 3.17.8).
+# Note however, that process isolation is restricted to the specific libc versions
+# the isolation was tested at. If you get random failures on worker processes, try
+# disabling that option and report the failures you, along with system and debugging
+# information at: https://gitlab.com/openconnect/ocserv/issues
+isolate-workers = true
+
+# A banner to be displayed on clients after connection
+#banner = "Welcome"
+
+# A banner to be displayed on clients before connection
+#pre-login-banner = "Welcome"
+
+# Limit the number of clients. Unset or set to zero if unknown. In
+# that case the maximum value is ~8k clients.
+#max-clients = 1024
+max-clients = 16
+
+# Limit the number of identical clients (i.e., users connecting
+# multiple times). Unset or set to zero for unlimited.
+max-same-clients = 2
+
+# When the server receives connections from a proxy, like haproxy
+# which supports the proxy protocol, set this to obtain the correct
+# client addresses. The proxy protocol would then be expected in
+# the TCP or UNIX socket (not the UDP one). Although both v1
+# and v2 versions of proxy protocol are supported, the v2 version
+# is recommended as it is more efficient in parsing.
+#listen-proxy-proto = true
+
+# Rate limit the number of incoming connections to one every X milliseconds
+# (X is the provided value), as the secmod backlog grows. This
+# makes the server more resilient (and prevents connection failures) on
+# multiple concurrent connections. Set to zero for no limit.
+rate-limit-ms = 100
+
+# Stats report time. The number of seconds after which each
+# worker process will report its usage statistics (number of
+# bytes transferred etc). This is useful when accounting like
+# radius is in use.
+#stats-report-time = 360
+
+# Stats reset time. The period of time statistics kept by main/sec-mod
+# processes will be reset. These are the statistics shown by cmd
+# 'occtl show stats'. For daily: 86400, weekly: 604800
+# This is unrelated to stats-report-time.
+server-stats-reset-time = 604800
+
+# Keepalive in seconds
+keepalive = 32400
+
+# Dead peer detection in seconds.
+# Note that when the client is behind a NAT this value
+# needs to be short enough to prevent the NAT disassociating
+# his UDP session from the port number. Otherwise the client
+# could have his UDP connection stalled, for several minutes.
+dpd = 90
+
+# Dead peer detection for mobile clients. That needs to
+# be higher to prevent such clients being awaken too
+# often by the DPD messages, and save battery.
+# The mobile clients are distinguished from the header
+# 'X-AnyConnect-Identifier-Platform'.
+mobile-dpd = 1800
+
+# If using DTLS, and no UDP traffic is received for this
+# many seconds, attempt to send future traffic over the TCP
+# connection instead, in an attempt to wake up the client
+# in the case that there is a NAT and the UDP translation
+# was deleted. If this is unset, do not attempt to use this
+# recovery mechanism.
+switch-to-tcp-timeout = 25
+
+# MTU discovery (DPD must be enabled)
+try-mtu-discovery = false
+
+# To enable load-balancer connection draining, set server-drain-ms to a value
+# higher than your load-balancer health probe interval.
+#server-drain-ms = 15000
+
+# If you have a certificate from a CA that provides an OCSP
+# service you may provide a fresh OCSP status response within
+# the TLS handshake. That will prevent the client from connecting
+# independently on the OCSP server.
+# You can update this response periodically using:
+# ocsptool --ask --load-cert=your_cert --load-issuer=your_ca --outfile response
+# Make sure that you replace the following file in an atomic way.
+#ocsp-response = /etc/ocserv/ocsp.der
+
+# The object identifier that will be used to read the user ID in the client
+# certificate. The object identifier should be part of the certificate's DN
+# Useful OIDs are:
+#  CN = 2.5.4.3, UID = 0.9.2342.19200300.100.1.1, SAN(rfc822name)
+cert-user-oid = 0.9.2342.19200300.100.1.1
+
+# The object identifier that will be used to read the user group in the
+# client certificate. The object identifier should be part of the certificate's
+# DN. If the user may belong to multiple groups, then use multiple such fields
+# in the certificate's DN. Useful OIDs are:
+#  OU (organizational unit) = 2.5.4.11
+#cert-group-oid = 2.5.4.11
+
+# The revocation list of the certificates issued by the 'ca-cert' above.
+# See the manual to generate an empty CRL initially. The CRL will be reloaded
+# periodically when ocserv detects a change in the file. To force a reload use
+# SIGHUP.
+#crl = /etc/ocserv/crl.pem
+
+# Uncomment this to enable compression negotiation (LZS, LZ4).
+#compression = true
+
+# Set the minimum size under which a packet will not be compressed.
+# That is to allow low-latency for VoIP packets. The default size
+# is 256 bytes. Modify it if the clients typically use compression
+# as well of VoIP with codecs that exceed the default value.
+#no-compress-limit = 256
+
+# GnuTLS priority string; note that SSL 3.0 is disabled by default
+# as there are no openconnect (and possibly anyconnect clients) using
+# that protocol. The string below does not enforce perfect forward
+# secrecy, in order to be compatible with legacy clients.
+#
+# Note that the most performant ciphersuites are the moment are the ones
+# involving AES-GCM. These are very fast in x86 and x86-64 hardware, and
+# in addition require no padding, thus taking full advantage of the MTU.
+# For that to be taken advantage of, the openconnect client must be
+# used, and the server must be compiled against GnuTLS 3.2.7 or later.
+# Use "gnutls-cli --benchmark-tls-ciphers", to see the performance
+# difference with AES_128_CBC_SHA1 (the default for anyconnect clients)
+# in your system.
+
+tls-priorities = "NORMAL:%SERVER_PRECEDENCE:%COMPAT:-VERS-SSL3.0:-VERS-TLS1.0:-VERS-TLS1.1"
+
+# More combinations in priority strings are available, check
+# http://gnutls.org/manual/html_node/Priority-Strings.html
+# E.g., the string below enforces perfect forward secrecy (PFS)
+# on the main channel.
+#tls-priorities = "NORMAL:%SERVER_PRECEDENCE:%COMPAT:-RSA:-VERS-SSL3.0:-ARCFOUR-128"
+
+# That option requires the established DTLS channel to use the same
+# cipher as the primary TLS channel.Note also, that this option implies
+# that the dtls-legacy option is false; this option cannot be enforced
+# in the legacy/compat protocol.
+#match-tls-dtls-ciphers = true
+
+# The time (in seconds) that a client is allowed to stay connected prior
+# to authentication
+auth-timeout = 240
+
+# The time (in seconds) that a client is allowed to stay idle (no traffic)
+# before being disconnected. Unset to disable.
+#idle-timeout = 1200
+
+# The time (in seconds) that a client is allowed to stay connected
+# Unset to disable. When set a client will be disconnected after being
+# continuously connected for this amount of time, and its cookies will
+# be invalidated (i.e., re-authentication will be required).
+#session-timeout = 86400
+
+# The time (in seconds) that a mobile client is allowed to stay idle (no
+# traffic) before being disconnected. Unset to disable.
+#mobile-idle-timeout = 2400
+
+# The time (in seconds) that a client is not allowed to reconnect after
+# a failed authentication attempt.
+min-reauth-time = 300
+
+# Banning clients in ocserv works with a point system. IP addresses
+# that get a score over that configured number are banned for
+# min-reauth-time seconds. By default a wrong password attempt is 10 points,
+# a KKDCP POST is 1 point, and a connection is 1 point. Note that
+# due to different processes being involved the count of points
+# will not be real-time precise. Local subnet IPs are exempt to allow
+# services that check for process health.
+#
+# Set to zero to disable.
+max-ban-score = 80
+
+# The time (in seconds) that all score kept for a client is reset.
+ban-reset-time = 1200
+
+# In case you'd like to change the default points.
+#ban-points-wrong-password = 10
+#ban-points-connection = 1
+#ban-points-kkdcp = 1
+
+# Cookie timeout (in seconds)
+# Once a client is authenticated he's provided a cookie with
+# which he can reconnect. That cookie will be invalidated if not
+# used within this timeout value. This cookie remains valid, during
+# the user's connected time, and after user disconnection it
+# remains active for this amount of time. That setting should allow a
+# reasonable amount of time for roaming between different networks.
+cookie-timeout = 300
+
+# If this is enabled (not recommended) the cookies will stay
+# valid even after a user manually disconnects, and until they
+# expire. This may improve roaming with some broken clients.
+#persistent-cookies = true
+
+# Whether roaming is allowed, i.e., if true a cookie is
+# restricted to a single IP address and cannot be reused
+# from a different IP.
+deny-roaming = false
+
+# ReKey time (in seconds)
+# ocserv will ask the client to refresh keys periodically once
+# this amount of seconds is elapsed. Set to zero to disable (note
+# that, some clients fail if rekey is disabled).
+rekey-time = 172800
+
+# ReKey method
+# Valid options: ssl, new-tunnel
+#  ssl: Will perform an efficient rehandshake on the channel allowing
+#       a seamless connection during rekey.
+#  new-tunnel: Will instruct the client to discard and re-establish the channel.
+#       Use this option only if the connecting clients have issues with the ssl
+#       option.
+rekey-method = ssl
+
+# Script to call when a client connects and obtains an IP.
+# The following parameters are passed on the environment.
+# REASON, VHOST, USERNAME, GROUPNAME, DEVICE, IP_REAL (the real IP of the client),
+# REMOTE_HOSTNAME (the remotely advertised hostname), IP_REAL_LOCAL
+# (the local interface IP the client connected), IP_LOCAL
+# (the local IP in the P-t-P connection), IP_REMOTE (the VPN IP of the client),
+# IPV6_LOCAL (the IPv6 local address if there are both IPv4 and IPv6
+# assigned), IPV6_REMOTE (the IPv6 remote address), IPV6_PREFIX, and
+# ID (a unique numeric ID); REASON may be "connect" or "disconnect".
+# In addition the following variables OCSERV_ROUTES (the applied routes for this
+# client), OCSERV_NO_ROUTES, OCSERV_DNS (the DNS servers for this client),
+# will contain a space separated list of routes or DNS servers. A version
+# of these variables with the 4 or 6 suffix will contain only the IPv4 or
+# IPv6 values. The connect script must return zero as exit code, or the
+# client connection will be refused.
+
+# The disconnect script will receive the additional values: STATS_BYTES_IN,
+# STATS_BYTES_OUT, STATS_DURATION that contain a 64-bit counter of the bytes
+# output from the tun device, and the duration of the session in seconds.
+
+#connect-script = /usr/bin/myscript
+#disconnect-script = /usr/bin/myscript
+
+# This script is to be called when the client's advertised hostname becomes
+# available. It will contain REASON with "host-update" value and the
+# variable REMOTE_HOSTNAME in addition to the connect variables.
+
+#host-update-script = /usr/bin/myhostnamescript
+
+# UTMP
+# Register the connected clients to utmp. This will allow viewing
+# the connected clients using the command 'who'.
+#use-utmp = true
+
+# Whether to enable support for the occtl tool (i.e., either through D-BUS,
+# or via a unix socket).
+use-occtl = true
+
+# PID file. It can be overridden in the command line.
+pid-file = /run/ocserv.pid
+
+# Log Level. Ocserv sends the logging messages to standard error
+# as well as the system log. The log level can be overridden in the
+# command line with the -d option. All messages at the configured
+# level and lower will be displayed.
+# Supported levels (default 0):
+#   0 default (Same as info)
+#   1 basic
+#   2 info
+#   3 debug
+#   4 http
+#   8 sensitive
+#   9 TLS
+log-level = 2
+
+# Set the protocol-defined priority (SO_PRIORITY) for packets to
+# be sent. That is a number from 0 to 6 with 0 being the lowest
+# priority. Alternatively this can be used to set the IP Type-
+# Of-Service, by setting it to a hexadecimal number (e.g., 0x20).
+# This can be set per user/group or globally.
+#net-priority = 3
+
+# Set the VPN worker process into a specific cgroup. This is Linux
+# specific and can be set per user/group or globally.
+#cgroup = "cpuset,cpu:test"
+
+#
+# Network settings
+#
+
+# The name to use for the tun device
+device = vpns
+
+# Whether the generated IPs will be predictable, i.e., IP stays the
+# same for the same user when possible.
+predictable-ips = true
+
+# The default domain to be advertised. Multiple domains (functional on
+# openconnect clients) can be provided in a space separated list.
+default-domain = example.com
+#default-domain = "example.com one.example.com"
+
+# The pool of addresses that leases will be given from. If the leases
+# are given via Radius, or via the explicit-ip? per-user config option then
+# these network values should contain a network with at least a single
+# address that will remain under the full control of ocserv (that is
+# to be able to assign the local part of the tun device address).
+# Note that, you could use addresses from a subnet of your LAN network if you
+# enable [proxy arp in the LAN interface](http://ocserv.gitlab.io/www/recipes-ocserv-pseudo-bridge.html);
+# in that case it is recommended to set ping-leases to true.
+ipv4-network = 192.168.1.0
+ipv4-netmask = 255.255.255.0
+
+# An alternative way of specifying the network:
+#ipv4-network = 192.168.1.0/24
+
+# The IPv6 subnet that leases will be given from.
+#ipv6-network = fda9:4efe:7e3b:03ea::/48
+
+# Specify the size of the network to provide to clients. It is
+# generally recommended to provide clients with a /64 network in
+# IPv6, but any subnet may be specified. To provide clients only
+# with a single IP use the prefix 128.
+#ipv6-subnet-prefix = 128
+#ipv6-subnet-prefix = 64
+
+# Whether to tunnel all DNS queries via the VPN. This is the default
+# when a default route is set.
+#tunnel-all-dns = true
+
+# The advertised DNS server. Use multiple lines for
+# multiple servers.
+# dns = fc00::4be0
+dns = 192.168.1.1
+
+# The NBNS server (if any)
+#nbns = 192.168.1.3
+
+# The domains over which the provided DNS should be used. Use
+# multiple lines for multiple domains.
+#split-dns = example.com
+
+# Prior to leasing any IP from the pool ping it to verify that
+# it is not in use by another (unrelated to this server) host.
+# Only set to true, if there can be occupied addresses in the
+# IP range for leases.
+ping-leases = false
+
+# Use this option to set a link MTU value to the incoming
+# connections. Unset to use the default MTU of the TUN device.
+# Note that the MTU is negotiated using the value set and the
+# value sent by the peer.
+#mtu = 1420
+
+# Unset to enable bandwidth restrictions (in bytes/sec). The
+# setting here is global, but can also be set per user or per group.
+# The RX direction refers to received data on the server from the
+# VPN client, and the TX refers to transmitted data by the server
+# to the client.
+#rx-data-per-sec = 40000
+#tx-data-per-sec = 40000
+
+# The number of packets (of MTU size) that are available in
+# the output buffer. The default is low to improve latency.
+# Setting it higher will improve throughput.
+#output-buffer = 10
+
+# Routes to be forwarded to the client. If you need the
+# client to forward routes to the server, you may use the
+# config-per-user/group or even connect and disconnect scripts.
+#
+# To set the server as the default gateway for the client just
+# comment out all routes from the server, or use the special keyword
+# 'default'.
+
+#route = 10.10.10.0/255.255.255.0
+#route = 192.168.0.0/255.255.0.0
+#route = fef4:db8:1000:1001::/64
+#route = default
+
+route = 10.10.10.0/24
+route = 192.168.0.0/16
+
+# Subsets of the routes above that will not be routed by
+# the server.
+
+#no-route = 192.168.5.0/255.255.255.0
+
+# Note the that following two firewalling options currently are available
+# in Linux systems with iptables software.
+
+# If set, the script /usr/libexec/ocserv-fw will be called to restrict
+# the user to its allowed routes and prevent him from accessing
+# any other routes. In case of defaultroute, the no-routes are restricted.
+# All the routes applied by ocserv can be reverted using /usr/libexec/ocserv-fw
+# --removeall. This option can be set globally or in the per-user configuration.
+#restrict-user-to-routes = true
+
+# This option implies restrict-user-to-routes set to true. If set, the
+# script /usr/libexec/ocserv-fw will be called to restrict the user to
+# access specific ports in the network. This option can be set globally
+# or in the per-user configuration.
+#restrict-user-to-ports = "tcp(443), tcp(80), udp(443), sctp(99), tcp(583), icmp(), icmpv6()"
+
+# You could also use negation, i.e., block the user from accessing these ports only.
+#restrict-user-to-ports = "!(tcp(443), tcp(80))"
+
+# When set to true, all client's iroutes are made visible to all
+# connecting clients except for the ones offering them. This option
+# only makes sense if config-per-user is set.
+#expose-iroutes = true
+
+# Groups that a client is allowed to select from.
+# A client may belong in multiple groups, and in certain use-cases
+# it is needed to switch between them. For these cases the client can
+# select prior to authentication. Add multiple entries for multiple groups.
+# The group may be followed by a user-friendly name in brackets.
+#select-group = group1
+#select-group = group2[My special group]
+
+# The name of the (virtual) group that if selected it would assign the user
+# to its default group.
+#default-select-group = DEFAULT
+
+# Instead of specifying manually all the allowed groups, you may instruct
+# ocserv to scan all available groups and include the full list.
+#auto-select-group = true
+
+# Configuration files that will be applied per user connection or
+# per group. Each file name on these directories must match the username
+# or the groupname.
+# The options allowed in the configuration files are dns, nbns,
+#  ipv?-network, ipv4-netmask, rx/tx-data-per-sec, iroute, route, no-route,
+#  explicit-ipv4, explicit-ipv6, net-priority, deny-roaming, no-udp,
+#  keepalive, dpd, mobile-dpd, max-same-clients, tunnel-all-dns,
+#  restrict-user-to-routes, cgroup, stats-report-time,
+#  mtu, idle-timeout, mobile-idle-timeout, restrict-user-to-ports,
+#  split-dns and session-timeout.
+#
+# Note that the 'iroute' option allows one to add routes on the server
+# based on a user or group. The syntax depends on the input accepted
+# by the commands route-add-cmd and route-del-cmd (see below). The no-udp
+# is a boolean option (e.g., no-udp = true), and will prevent a UDP session
+# for that specific user or group. The hostname option will set a
+# hostname to override any proposed by the user. Note also, that, any
+# routes, no-routes, DNS or NBNS servers present will overwrite the global ones.
+
+#config-per-user = /etc/ocserv/config-per-user/
+#config-per-group = /etc/ocserv/config-per-group/
+
+# When config-per-xxx is specified and there is no group or user that
+# matches, then utilize the following configuration.
+#default-user-config = /etc/ocserv/defaults/user.conf
+#default-group-config = /etc/ocserv/defaults/group.conf
+
+# The system command to use to setup a route. %{R} will be replaced with the
+# route/mask, %{RI} with the route in CIDR format, and %{D} with the (tun) device.
+#
+# The following example is from linux systems. %{R} should be something
+# like 192.168.2.0/255.255.255.0 and %{RI} 192.168.2.0/24 (the argument of iroute).
+
+#route-add-cmd = "ip route add %{R} dev %{D}"
+#route-del-cmd = "ip route delete %{R} dev %{D}"
+
+# This option allows one to forward a proxy. The special keywords '%{U}'
+# and '%{G}', if present will be replaced by the username and group name.
+#proxy-url = http://example.com/
+#proxy-url = http://example.com/%{U}/
+
+# This option allows you to specify a URL location where a client can
+# post using MS-KKDCP, and the message will be forwarded to the provided
+# KDC server. That is a translation URL between HTTP and Kerberos.
+# In MIT kerberos you'll need to add in realms:
+#   EXAMPLE.COM = {
+#     kdc = https://ocserv.example.com/KdcProxy
+#     http_anchors = FILE:/etc/ocserv-ca.pem
+#   }
+# In some distributions the krb5-k5tls plugin of kinit is required.
+#
+# The following option is available in ocserv, when compiled with GSSAPI support.
+
+#kkdcp = "SERVER-PATH KERBEROS-REALM PROTOCOL@SERVER:PORT"
+#kkdcp = "/KdcProxy KERBEROS.REALM udp@127.0.0.1:88"
+#kkdcp = "/KdcProxy KERBEROS.REALM tcp@127.0.0.1:88"
+#kkdcp = "/KdcProxy KERBEROS.REALM tcp@[::1]:88"
+
+# Client profile xml. This can be used to advertise alternative servers
+# to the client. A minimal file can be:
+# <?xml version="1.0" encoding="UTF-8"?>
+# <AnyConnectProfile xmlns="http://schemas.xmlsoap.org/encoding/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://schemas.xmlsoap.org/encoding/ AnyConnectProfile.xsd">
+#	<ServerList>
+#		<HostEntry>
+#	            <HostName>VPN Server name</HostName>
+#	            <HostAddress>localhost</HostAddress>
+#		</HostEntry>
+#	</ServerList>
+# </AnyConnectProfile>
+#
+# Other fields may be used by some of the CISCO clients.
+# This file must be accessible from inside the worker's chroot.
+# Note that:
+#  (1) enabling this option is not recommended as it will allow the
+#      worker processes to open arbitrary files (when isolate-workers is
+#      set to true).
+#  (2) This option cannot be set per-user or per-group; only the global
+#      version is being sent to client.
+#user-profile = profile.xml
+
+#
+# The following options are for (experimental) AnyConnect client
+# compatibility.
+
+# This option will enable the pre-draft-DTLS version of DTLS, and
+# will not require clients to present their certificate on every TLS
+# connection. It must be set to true to support legacy CISCO clients
+# and openconnect clients < 7.08. When set to true, it implies dtls-legacy = true.
+cisco-client-compat = true
+
+# This option allows one to disable the DTLS-PSK negotiation (enabled by default).
+# The DTLS-PSK negotiation was introduced in ocserv 0.11.5 to deprecate
+# the pre-draft-DTLS negotiation inherited from AnyConnect. It allows the
+# DTLS channel to negotiate its ciphers and the DTLS protocol version.
+#dtls-psk = false
+
+# This option allows one to disable the legacy DTLS negotiation (enabled by default,
+# but that may change in the future).
+# The legacy DTLS uses a pre-draft version of the DTLS protocol and was
+# from AnyConnect protocol. It has several limitations, that are addressed
+# by the dtls-psk protocol supported by openconnect 7.08+.
+dtls-legacy = true
+
+# This option will enable the settings needed for Cisco SVC IPPhone clients
+# to connect. It implies dtls-legacy = true and tls-priorities is changed to
+# only the ciphers the device supports.
+cisco-svc-client-compat = false
+
+# This option will enable the X-CSTP-Client-Bypass-Protocol (disabled by default).
+# If the server has not configured an IPv6 or IPv4 address pool, enabling this option
+# will instruct the client to bypass the server for that IP protocol. The option is
+# currently only understood by Anyconnect clients.
+client-bypass-protocol = false
+
+# The following options are related to server camouflage (hidden service)
+
+# This option allows you to enable the camouflage feature of ocserv that makes it look
+# like a web server to unauthorized parties.
+# With "camouflage" enabled, connection to the VPN can be established only if the client provided a specific
+# "secret string" in the connection URL, e.g. "https://example.com/?mysecretkey",
+# otherwise the server will return HTTP error for all requests.
+camouflage = false
+
+# The URL prefix that should be set on the client (after '?' sign) to pass through the camouflage check,
+# e.g. in case of 'mysecretkey', the server URL on the client should be like "https://example.com/?mysecretkey".
+camouflage_secret = "mysecretkey"
+
+# Defines the realm (browser prompt) for HTTP authentication.
+# If no realm is set, the server will return 404 Not found error instead of 401 Unauthorized.
+# Better change it from the default value to avoid fingerprinting.
+camouflage_realm = "Restricted Content"
+
+#Advanced options
+
+# Option to allow sending arbitrary custom headers to the client after
+# authentication and prior to VPN tunnel establishment. You shouldn't
+# need to use this option normally; if you do and you think that
+# this may help others, please send your settings and reason to
+# the openconnect mailing list. The special keywords '%{U}'
+# and '%{G}', if present will be replaced by the username and group name.
+#custom-header = "X-My-Header: hi there"
+
+
+
+# An example virtual host with different authentication methods serviced
+# by this server.
+
+#[vhost:www.example.com]
+#auth = "certificate"
+
+#ca-cert = ../tests/certs/ca.pem
+
+# The certificate set here must include a 'dns_name' corresponding to
+# the virtual host name.
+
+#server-cert = ../tests/certs/server-cert-secp521r1.pem
+#server-key = ../tests/certs/server-key-secp521r1.pem
+
+#ipv4-network = 192.168.2.0
+#ipv4-netmask = 255.255.255.0
+
+#cert-user-oid = 0.9.2342.19200300.100.1.1
+
+# HTTP headers
+#included-http-headers = Strict-Transport-Security: max-age=31536000 ; includeSubDomains
+#included-http-headers = X-Frame-Options: deny
+#included-http-headers = X-Content-Type-Options: nosniff
+#included-http-headers = Content-Security-Policy: default-src 'none'
+#included-http-headers = X-Permitted-Cross-Domain-Policies: none
+#included-http-headers = Referrer-Policy: no-referrer
+#included-http-headers = Clear-Site-Data: "cache","cookies","storage"
+#included-http-headers = Cross-Origin-Embedder-Policy: require-corp
+#included-http-headers = Cross-Origin-Opener-Policy: same-origin
+#included-http-headers = Cross-Origin-Resource-Policy: same-origin
+#included-http-headers = X-XSS-Protection: 0
+#included-http-headers = Pragma: no-cache
+#included-http-headers = Cache-control: no-store, no-cache
diff --git a/network/ocserv/ocserv.info b/network/ocserv/ocserv.info
new file mode 100644
index 0000000000..da8951388a
--- /dev/null
+++ b/network/ocserv/ocserv.info
@@ -0,0 +1,10 @@
+PRGNAM="ocserv"
+VERSION="1.2.4"
+HOMEPAGE="https://ocserv.openconnect-vpn.net"
+DOWNLOAD="https://www.infradead.org/ocserv/download/ocserv-1.2.4.tar.xz"
+MD5SUM="6f82a924f998a646512714c4544aaee2"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="http-parser libev protobuf-c rubygem-ronn"
+MAINTAINER="Alexander Verbovetsky"
+EMAIL="alik@ejik.org"
diff --git a/network/ocserv/rc.ocserv b/network/ocserv/rc.ocserv
new file mode 100644
index 0000000000..83fa395888
--- /dev/null
+++ b/network/ocserv/rc.ocserv
@@ -0,0 +1,55 @@
+#!/bin/bash
+# Start/stop/restart the ocserv vpn server
+# This script uses the occtl tool
+
+start_ocserv() {
+  if [ -S /var/run/occtl.socket ]; then
+      echo "ocserv is already running"
+      exit 0
+  fi
+  echo "Starting ocserv"
+  /usr/sbin/ocserv 2>/dev/null
+}
+
+stop_ocserv() {
+  /usr/bin/occtl stop now
+}
+
+restart_ocserv() {
+  stop_ocserv
+  sleep 1
+  start_ocserv
+}
+
+reload_ocserv() {
+  /usr/bin/occtl reload
+}
+
+status_ocserv() {
+  if [ -S /var/run/occtl.socket ]; then
+    /usr/bin/occtl show status
+  else
+    echo "ocserv is stopped"
+    exit 1
+  fi
+}
+
+case "$1" in
+'start')
+  start_ocserv
+  ;;
+'stop')
+  stop_ocserv
+  ;;
+'restart')
+  restart_ocserv
+  ;;
+'reload')
+  reload_ocserv
+  ;;
+'status')
+  status_ocserv
+  ;;
+*)
+  echo "usage $0 start|stop|restart|reload|status"
+esac
diff --git a/network/ocserv/slack-desc b/network/ocserv/slack-desc
new file mode 100644
index 0000000000..c62e2e9f87
--- /dev/null
+++ b/network/ocserv/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+      |-----handy-ruler------------------------------------------------------|
+ocserv: ocserv (OpenConnect SSL VPN server)
+ocserv:
+ocserv: The OpenConnect VPN server (ocserv) is an open source Linux SSL VPN
+ocserv: server designed for organizations that require a remote access VPN
+ocserv: with enterprise user management and control. It follows the
+ocserv: openconnect protocol and is the counterpart of the openconnect VPN
+ocserv: client. It is also compatible with CISCO's AnyConnect SSL VPN.
+ocserv:
+ocserv: Homepage: https://ocserv.openconnect-vpn.net
+ocserv:
+ocserv:
diff --git a/network/offlineimap/README b/network/offlineimap/README
index 75daf1b19d..8ef06d382f 100644
--- a/network/offlineimap/README
+++ b/network/offlineimap/README
@@ -1,6 +1,3 @@
 OfflineIMAP is a tool to sync remote imap mailboxes
 and particularly useful in syncing mailboxes between
 two imap servers.
-
-NOTE: docutils is needed with version >= 6.3.2, for
-generating documentation and man page.
diff --git a/network/offlineimap/offlineimap.SlackBuild b/network/offlineimap/offlineimap.SlackBuild
index 5bde6878da..f9c0e9033f 100644
--- a/network/offlineimap/offlineimap.SlackBuild
+++ b/network/offlineimap/offlineimap.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for OfflineIMAP
 # Home Page http://offlineimap.org/
@@ -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="offlineimap"
-VERSION=${VERSION:-7.2.2}
+VERSION=${VERSION:-7.3.4}
 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}
@@ -81,4 +91,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/network/offlineimap/offlineimap.info b/network/offlineimap/offlineimap.info
index 5801c579b8..6aabd7cdaa 100644
--- a/network/offlineimap/offlineimap.info
+++ b/network/offlineimap/offlineimap.info
@@ -1,10 +1,10 @@
 PRGNAM="offlineimap"
-VERSION="7.2.2"
+VERSION="7.3.4"
 HOMEPAGE="http://offlineimap.org/"
-DOWNLOAD="https://github.com/OfflineIMAP/offlineimap/archive/v7.2.2/offlineimap-7.2.2.tar.gz"
-MD5SUM="30ceddc4aac9bdc0bf0eb9f5f1010f17"
+DOWNLOAD="https://github.com/OfflineIMAP/offlineimap/archive/v7.3.4/offlineimap-7.3.4.tar.gz"
+MD5SUM="4494e696fc20a49db4e4a90f252df2c4"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="docutils six"
+REQUIRES="rfc6555"
 MAINTAINER="Nishant Limbachia"
 EMAIL="nishant@mnspace.net"
diff --git a/network/oidentd/README b/network/oidentd/README
index 9dab19cfcf..6939f9bdc6 100644
--- a/network/oidentd/README
+++ b/network/oidentd/README
@@ -1,10 +1,11 @@
 oidentd (an identd daemon)
 
-Oidentd is an ident daemon (rfc1413) that runs on Linux, FreeBSD, OpenBSD
-and Solaris 2.x. Oidentd supports most features of pidentd plus more. Most
-notably, oidentd allows users to specify the identd response that the server
-will output when a successful lookup is completed. Oidentd supports IP
-masqueraded connections on Linux, and is able to forward requests to hosts
-that masq through the host on which oidentd runs.
+Oidentd is an ident daemon (rfc1413) that runs on Linux, FreeBSD,
+OpenBSD and Solaris 2.x. Oidentd supports most features of pidentd
+plus more. Most notably, oidentd allows users to specify the identd
+response that the server will output when a successful lookup is
+completed. Oidentd supports IP masqueraded connections on Linux, and
+is able to forward requests to hosts that masq through the host on
+which oidentd runs.
 
 This is a fork of the ojnk oidentd released in 2006
diff --git a/network/oidentd/oidentd.SlackBuild b/network/oidentd/oidentd.SlackBuild
index 0a03220600..b877ebb21c 100644
--- a/network/oidentd/oidentd.SlackBuild
+++ b/network/oidentd/oidentd.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for oidentd
 
@@ -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=oidentd
 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}
@@ -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/network/oinkmaster/oinkmaster.SlackBuild b/network/oinkmaster/oinkmaster.SlackBuild
index c86dd69510..7de9b5d3fe 100644
--- a/network/oinkmaster/oinkmaster.SlackBuild
+++ b/network/oinkmaster/oinkmaster.SlackBuild
@@ -1,7 +1,7 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for oinkmaster
-# Copyright 2017 David Woodfall <dave@dawoodfall.net>
+# Copyright 2017 David Woodfall <dave@slackbuilds.org>
 # 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=oinkmaster
 VERSION=${VERSION:-2.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}
@@ -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/network/oinkmaster/oinkmaster.info b/network/oinkmaster/oinkmaster.info
index ba65512aeb..ae5139aa1a 100644
--- a/network/oinkmaster/oinkmaster.info
+++ b/network/oinkmaster/oinkmaster.info
@@ -6,5 +6,5 @@ MD5SUM="d2a1b56f51cf40e919c63206ca4ec8f8"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="David Woodfall"
-EMAIL="dave@dawoodfall.net"
+MAINTAINER="D Woodfall"
+EMAIL="dave@slackbuilds.org"
diff --git a/network/onedrive/README b/network/onedrive/README
new file mode 100644
index 0000000000..4d1699de4e
--- /dev/null
+++ b/network/onedrive/README
@@ -0,0 +1,19 @@
+A complete tool to interact with OneDrive on Linux.
+Built following the UNIX philosophy
+
+What's missing: while local changes are uploaded right away, remote
+changes are delayed.
+
+After installing the package:
+1) For configuration and Usage, see
+/usr/doc/onedrive-$VERSION/docs/USAGE.md,
+/usr/doc/onedrive-$VERSION/config and
+man onedrive
+2) For Docker support, see
+/usr/doc/onedrive-$VERSION/docs/Docker.md
+3) For Sharepoint group drive in Office 365 business or education, see
+/usr/doc/onedrive-$VERSION/docs/Office365.md
+4) If you encounter any bugs you can report them here on Github:
+https://github.com/abraunegg/onedrive
+(see /usr/doc/onedrive-$VERSION/README.md for more details how to do
+this)
diff --git a/network/onedrive/doinst.sh b/network/onedrive/doinst.sh
new file mode 100644
index 0000000000..182d35ba3a
--- /dev/null
+++ b/network/onedrive/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/logrotate.d/onedrive.new
+
diff --git a/network/onedrive/onedrive.SlackBuild b/network/onedrive/onedrive.SlackBuild
new file mode 100644
index 0000000000..b15aa0b989
--- /dev/null
+++ b/network/onedrive/onedrive.SlackBuild
@@ -0,0 +1,119 @@
+#!/bin/bash
+
+# Slackware build script for onedrive
+# Copyright 2019-2023 Rob van Nues
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=onedrive
+VERSION=${VERSION:-2.4.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 {} \;
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --enable-notifications \
+  --enable-debug \
+  --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
+
+
+mv $PKG/etc/logrotate.d/onedrive $PKG/etc/logrotate.d/onedrive.new
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+  README.md LICENSE CHANGELOG.md docs \
+  $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+cp $PKG/usr/share/doc/onedrive/config $PKG/usr/doc/$PRGNAM-$VERSION/config
+rm -r $PKG/usr/share
+
+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/network/onedrive/onedrive.info b/network/onedrive/onedrive.info
new file mode 100644
index 0000000000..f7ca138caa
--- /dev/null
+++ b/network/onedrive/onedrive.info
@@ -0,0 +1,10 @@
+PRGNAM="onedrive"
+VERSION="2.4.25"
+HOMEPAGE="https://github.com/abraunegg/onedrive/releases"
+DOWNLOAD="https://github.com/abraunegg/onedrive/archive/v2.4.25/onedrive-2.4.25.tar.gz"
+MD5SUM="09a7b7be0f24006ec7afd10e2ba194da"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="dmd"
+MAINTAINER="Rob van Nues"
+EMAIL="sborg63@disroot.org"
diff --git a/network/onedrive/slack-desc b/network/onedrive/slack-desc
new file mode 100644
index 0000000000..79770c29e1
--- /dev/null
+++ b/network/onedrive/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+        |-----handy-ruler------------------------------------------------------|
+onedrive: onedrive (OneDrive Tool)
+onedrive:
+onedrive: A complete tool to interact with OneDrive on Linux.
+onedrive: Built following the UNIX philosophy.
+onedrive:
+onedrive: https://github.com/abraunegg/onedrive
+onedrive:
+onedrive:
+onedrive:
+onedrive:
+onedrive:
diff --git a/network/onioncat/README b/network/onioncat/README
index f45fc75710..8de34eae3d 100644
--- a/network/onioncat/README
+++ b/network/onioncat/README
@@ -1,5 +1,7 @@
-onioncat creates a transparent IP layer on top of Tor's hidden services.
-It trainsmits IP-based data transparently through the Tor network on a
-location hidden basis. You can think of it as a point-to -multipoint VPN
-between hidden services.
+OnionCat creates a transparent IPv6 layer on top of Tor's hidden
+services or I2P's tunnels. It transmits any kind of IP-based data
+transparently through the Tor/I2P network on a location hidden basis.
+You can think of it as a peer-to-peer VPN between hidden services.
 
+Having Tor/I2P installed is not required for building.
+The Tor/I2P installation does not have to be from SBo.
diff --git a/network/onioncat/onioncat.SlackBuild b/network/onioncat/onioncat.SlackBuild
index be43971e3c..cfa73b3300 100644
--- a/network/onioncat/onioncat.SlackBuild
+++ b/network/onioncat/onioncat.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for onioncat
 
-# Copyright 2013-2017 Markus Reichelt, Aachen, DE
+# Copyright 2013-2023 Markus Reichelt, Aachen, DE
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -25,10 +25,13 @@
 # Originally written by crocket (crockabiscuit@gmail.com) - Thanks!
 # Now maintained by Markus Reichelt, slackbuilds@mareichelt.de, 0xCCEEF115
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=onioncat
-VERSION=${VERSION:-0.2.2.r578}
+VERSION=${VERSION:-4.11.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}
@@ -68,9 +78,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,6 +96,7 @@ CXXFLAGS="$SLKCFLAGS" \
   --enable-handle-http \
   --enable-packet-queue \
   --enable-rtt \
+  --disable-static \
   --build=$ARCH-slackware-linux
 
 make
@@ -94,12 +105,11 @@ 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/man1/*
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
-  AUTHORS COPYING ChangeLog INSTALL NEWS TODO \
+  AUTHORS COPYING ChangeLog NEWS TODO \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
@@ -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/network/onioncat/onioncat.info b/network/onioncat/onioncat.info
index 8b95c0635c..1372a96b27 100644
--- a/network/onioncat/onioncat.info
+++ b/network/onioncat/onioncat.info
@@ -1,8 +1,8 @@
 PRGNAM="onioncat"
-VERSION="0.2.2.r578"
-HOMEPAGE="https://www.cypherpunk.at/onioncat/"
-DOWNLOAD="https://www.cypherpunk.at/ocat/download/Source/stable/onioncat-0.2.2.r578.tar.gz"
-MD5SUM="53654ed95b88773b48bcaf5aa6a619e3"
+VERSION="4.11.0"
+HOMEPAGE="https://www.onioncat.org/"
+DOWNLOAD="https://github.com/rahra/onioncat/releases/download/v4.11.0/onioncat-4.11.0.tar.gz"
+MD5SUM="8c12109c84aac6d0e1ee3bcc89c7b084"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/network/onioncat/slack-desc b/network/onioncat/slack-desc
index f61e2634b1..20e1864969 100644
--- a/network/onioncat/slack-desc
+++ b/network/onioncat/slack-desc
@@ -13,7 +13,7 @@ onioncat: services. It trainsmits IP-based data transparently through the Tor
 onioncat: network on a location hidden basis. You can think of it as a point-to
 onioncat: -multipoint VPN between hidden services.
 onioncat:
+onioncat: I2P is also supported.
 onioncat:
-onioncat: Website : https://www.cypherpunk.at/onioncat/
-onioncat:
+onioncat: Website : https://www.onioncat.org/
 onioncat:
diff --git a/network/onionshare/README b/network/onionshare/README
index c6fbb9c999..51b25a52f4 100644
--- a/network/onionshare/README
+++ b/network/onionshare/README
@@ -1,8 +1,9 @@
-OnionShare lets you securely and anonymously send and receive files. 
-It works by starting a web server, making it accessible as a Tor onion 
-service, and generating an unguessable web address so others can download 
-files from you, or upload files to you. It does not require setting up 
-a separate server or using a third party file-sharing service.
+OnionShare lets you securely and anonymously send and receive files.
+It works by starting a web server, making it accessible as a Tor
+onion service, and generating an unguessable web address so others can
+download files from you, or upload files to you. It does not require
+setting up a separate server or using a third party file-sharing
+service.
 
 It also requires obfs4proxy (or others e.g. meek) if tor bridge is used.
 
diff --git a/network/onionshare/onionshare.SlackBuild b/network/onionshare/onionshare.SlackBuild
index 75caaab646..e3c418adcd 100644
--- a/network/onionshare/onionshare.SlackBuild
+++ b/network/onionshare/onionshare.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for onionshare
 
@@ -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=onionshare
-VERSION=${VERSION:-2.1}
+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}
@@ -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/network/onionshare/onionshare.info b/network/onionshare/onionshare.info
index f54d6f8277..3abd74af06 100644
--- a/network/onionshare/onionshare.info
+++ b/network/onionshare/onionshare.info
@@ -1,10 +1,10 @@
 PRGNAM="onionshare"
-VERSION="2.1"
+VERSION="2.2"
 HOMEPAGE="https://onionshare.org/"
-DOWNLOAD="https://github.com/micahflee/onionshare/archive/v2.1/onionshare-2.1.tar.gz"
-MD5SUM="f991eacdbae6f144e307409b47740f34"
+DOWNLOAD="https://github.com/micahflee/onionshare/archive/v2.2/onionshare-2.2.tar.gz"
+MD5SUM="3ff52742b7e6809b9646605e10b25562"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="tor python3-Flask stem python3-pycrypto PySocks python3-PyQt5 pysha3"
+REQUIRES="tor stem python3-Flask-httpauth python3-pycrypto PySocks pysha3"
 MAINTAINER="MDrights"
 EMAIL="psychi2009@gmail.com"
diff --git a/network/onyx/onyx.SlackBuild b/network/onyx/onyx.SlackBuild
index 9a367557a6..e59e1066ed 100644
--- a/network/onyx/onyx.SlackBuild
+++ b/network/onyx/onyx.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh -e
+#!/bin/bash -e
 
 # Slackware build script for onyx
 
@@ -22,16 +22,19 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=onyx
 VERSION=${VERSION:-0.9.2.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 # The source extracts to the "overbitenx" directory, but the actual utility
 # we're building is "onyx" (the rest of overbitenx is a Firefox extension that the
 # user should obtain through the usual interface), so we've got to keep the
 # two names straight.
 
-PRGNAM=onyx
 APP=overbitenx
 
 if [ -z "$ARCH" ]; then
@@ -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}
@@ -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/network/ookla-speedtest/README b/network/ookla-speedtest/README
new file mode 100644
index 0000000000..d851665ecc
--- /dev/null
+++ b/network/ookla-speedtest/README
@@ -0,0 +1,17 @@
+Speedtest CLI brings the trusted technology and global server network
+behind Speedtest to the command line. Built for software developers,
+system administrators and computer enthusiasts alike, Speedtest CLI is
+the first official Linux-native Speedtest application backed by Ookla®.
+
+With Speedtest CLI, you can easily:
+
+* Measure internet connection performance metrics like download, upload,
+  latency and packet loss natively without relying on a web browser
+* Test the internet connection of your Linux desktop, a remote server or
+  even lower-powered devices such as the Raspberry Pi with the
+  Speedtest Server Network
+* Set up automated scripts to collect connection performance data,
+  including trends over time
+* Use Speedtest in your programs by wrapping it in the programming
+  language of your choice
+* View test results via CSV, JSONL or JSON
diff --git a/network/ookla-speedtest/ookla-speedtest.SlackBuild b/network/ookla-speedtest/ookla-speedtest.SlackBuild
new file mode 100644
index 0000000000..075d8ca5b7
--- /dev/null
+++ b/network/ookla-speedtest/ookla-speedtest.SlackBuild
@@ -0,0 +1,93 @@
+#!/bin/bash
+
+# Slackware build script for ookla-speedtest
+
+# Copyright 2023 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=ookla-speedtest
+SRCNAM=speedtest
+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 [ ! -z "${PRINT_PACKAGE_NAME}" ]; 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
+  PKG_ARCH=i386
+elif [ "$ARCH" = "i686" ]; then
+  PKG_ARCH=i386
+elif [ "$ARCH" = "x86_64" ]; then
+  PKG_ARCH=$ARCH
+else
+  echo "$ARCH is not supported."
+  exit 1
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+mkdir -p $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION-linux-$PKG_ARCH.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 \) -exec chmod 755 {} \; -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,usr/man/man5}
+install -D -m 0755 $SRCNAM $PKG/usr/bin/$SRCNAM
+install -m 0644 $SRCNAM.5 $PKG/usr/man/man5/
+
+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 $SRCNAM.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/network/ookla-speedtest/ookla-speedtest.info b/network/ookla-speedtest/ookla-speedtest.info
new file mode 100644
index 0000000000..b579aa19d4
--- /dev/null
+++ b/network/ookla-speedtest/ookla-speedtest.info
@@ -0,0 +1,10 @@
+PRGNAM="ookla-speedtest"
+VERSION="1.2.0"
+HOMEPAGE="https://www.speedtest.net/apps/cli"
+DOWNLOAD="https://install.speedtest.net/app/cli/ookla-speedtest-1.2.0-linux-i386.tgz"
+MD5SUM="d573e2ab8fa4f0951a5f32adaf1913b4"
+DOWNLOAD_x86_64="https://install.speedtest.net/app/cli/ookla-speedtest-1.2.0-linux-x86_64.tgz"
+MD5SUM_x86_64="76de75a734cf98d70eee0d362bad365a"
+REQUIRES=""
+MAINTAINER="Ebben Aries"
+EMAIL="slackbuilds@dscp.org"
diff --git a/network/ookla-speedtest/slack-desc b/network/ookla-speedtest/slack-desc
new file mode 100644
index 0000000000..96a8eaa471
--- /dev/null
+++ b/network/ookla-speedtest/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+               |-----handy-ruler------------------------------------------------------|
+ookla-speedtest: ookla-speedtest (Speedtest CLI)
+ookla-speedtest:
+ookla-speedtest: Speedtest CLI brings the trusted technology and global server network
+ookla-speedtest: behind Speedtest to the command line. Built for software developers,
+ookla-speedtest: system administrators and computer enthusiasts alike, Speedtest CLI
+ookla-speedtest: is the first official Linux-native Speedtest application backed by
+ookla-speedtest: Ookla.
+ookla-speedtest:
+ookla-speedtest:
+ookla-speedtest: Homepage: https://www.speedtest.net/apps/cli
+ookla-speedtest:
diff --git a/network/open-iscsi/doinst.sh b/network/open-iscsi/doinst.sh
index 718295b2e7..a4797f0184 100644
--- a/network/open-iscsi/doinst.sh
+++ b/network/open-iscsi/doinst.sh
@@ -1,16 +1,19 @@
+# 20230620 bkw: reverted this to the config() function from SBo
+# template. Please leave this as-is. It works, and it won't confuse
+# us (we have over 8000 scripts to look after...)
 
 config() {
-  NEW="${1}.new"
-  OLD="$1"
+  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 [ "$(md5sum <$OLD)" = "$(md5sum <$NEW)" ]; then
+  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/iscsi/iscsid.conf
-config etc/iscsi/initiatorname.iscsi
+config etc/iscsi/iscsid.conf.new
+config etc/iscsi/initiatorname.iscsi.new
diff --git a/network/open-iscsi/include_sysmacros.patch b/network/open-iscsi/include_sysmacros.patch
new file mode 100644
index 0000000000..6e357faef3
--- /dev/null
+++ b/network/open-iscsi/include_sysmacros.patch
@@ -0,0 +1,22 @@
+diff -Naur open-iscsi-2.0.875.orig/iscsiuio/src/unix/libs/bnx2.c open-iscsi-2.0.875/iscsiuio/src/unix/libs/bnx2.c
+--- open-iscsi-2.0.875.orig/iscsiuio/src/unix/libs/bnx2.c	2017-09-01 20:05:23.000000000 +0200
++++ open-iscsi-2.0.875/iscsiuio/src/unix/libs/bnx2.c	2019-09-06 14:24:47.943039000 +0200
+@@ -47,6 +47,7 @@
+ #include <sys/user.h>
+ #include <fcntl.h>
+ #include <unistd.h>
++#include <sys/sysmacros.h>
+ 
+ #include "config.h"
+ 
+diff -Naur open-iscsi-2.0.875.orig/iscsiuio/src/unix/libs/bnx2x.c open-iscsi-2.0.875/iscsiuio/src/unix/libs/bnx2x.c
+--- open-iscsi-2.0.875.orig/iscsiuio/src/unix/libs/bnx2x.c	2017-09-01 20:05:23.000000000 +0200
++++ open-iscsi-2.0.875/iscsiuio/src/unix/libs/bnx2x.c	2019-09-06 14:24:23.527039000 +0200
+@@ -51,6 +51,7 @@
+ #include <sys/user.h>
+ #include <fcntl.h>
+ #include <unistd.h>
++#include <sys/sysmacros.h>
+ 
+ #include "config.h"
+ 
diff --git a/network/open-iscsi/open-iscsi.SlackBuild b/network/open-iscsi/open-iscsi.SlackBuild
index 00883e1321..fe0c9a4274 100644
--- a/network/open-iscsi/open-iscsi.SlackBuild
+++ b/network/open-iscsi/open-iscsi.SlackBuild
@@ -1,8 +1,9 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for open-iscsi
 
 # Copyright 2019 Wayne Cuddy USA
+# Copyright 2021  Mario Preksavec, Zagreb, Croatia
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,10 +23,21 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20230620 bkw: Modified by SlackBuilds.org, BUILD=2:
+# - Fix doinst.sh (conf files were missing .new suffix).
+# - Do not install /usr/include headers with +x permission.
+
+#
+# 2019/09/08 - add patch to support building on Slackware "current"
+#
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=open-iscsi
-VERSION=${VERSION:-2.0.875}
+VERSION=${VERSION:-2.1.5}
 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}
@@ -62,16 +78,24 @@ cd $TMP
 rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
+
+# Allow this SB to work on "current", benign on 14.2.
+patch -p1 <$CWD/include_sysmacros.patch
+
+patch -p1 <$CWD/remove_werror.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 \
+  -o -perm 511 \) -exec chmod 755 {} \+ -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 OPTFLAGS="-DNO_SYSTEMD" NO_SYSTEMD=1
 make install DESTDIR=$PKG
 
+chmod -x $PKG/usr/include/*.h
+
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
@@ -107,4 +131,4 @@ mkdir -p $PKG/etc/rc.d
 cat $CWD/rc.$PRGNAM > $PKG/etc/rc.d/rc.$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/network/open-iscsi/open-iscsi.info b/network/open-iscsi/open-iscsi.info
index 1b71602177..ea87d3944b 100644
--- a/network/open-iscsi/open-iscsi.info
+++ b/network/open-iscsi/open-iscsi.info
@@ -1,8 +1,8 @@
 PRGNAM="open-iscsi"
-VERSION="2.0.875"
+VERSION="2.1.5"
 HOMEPAGE="https://github.com/open-iscsi/open-iscsi"
-DOWNLOAD="https://github.com/open-iscsi/open-iscsi/archive/2.0.875/open-iscsi-2.0.875.tar.gz"
-MD5SUM="982e48181411365fa11b3364cf91a977"
+DOWNLOAD="https://github.com/open-iscsi/open-iscsi/archive/2.1.5/open-iscsi-2.1.5.tar.gz"
+MD5SUM="fcde2e39f3bec7b668751035987fdc35"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="open-isns"
diff --git a/network/open-iscsi/remove_werror.patch b/network/open-iscsi/remove_werror.patch
new file mode 100644
index 0000000000..03164c9a59
--- /dev/null
+++ b/network/open-iscsi/remove_werror.patch
@@ -0,0 +1,24 @@
+--- open-iscsi-2.1.1/libopeniscsiusr/Makefile.orig	2020-02-26 20:07:13.000000000 +0100
++++ open-iscsi-2.1.1/libopeniscsiusr/Makefile	2020-07-14 18:13:07.144477155 +0200
+@@ -44,7 +44,7 @@
+ OBJS = context.o misc.o session.o sysfs.o iface.o idbm.o node.o default.o
+ 
+ CFLAGS ?= -O2 -g
+-CFLAGS += -Wall -Werror -Wextra -fvisibility=hidden -fPIC
++CFLAGS += -Wall -Wextra -fvisibility=hidden -fPIC
+ CFLAGS += $(shell $(PKG_CONFIG) --cflags libkmod)
+ 
+ LDFLAGS += $(shell $(PKG_CONFIG) --libs libkmod)
+
+--- open-iscsi-2.1.1/usr/Makefile	2020-02-26 20:07:13.000000000 +0100
++++ open-iscsi-2.1.1/usr/Makefile	2020-07-14 17:56:48.298477155 +0200
+@@ -35,7 +35,7 @@
+ PKG_CONFIG = /usr/bin/pkg-config
+ 
+ CFLAGS ?= -O2 -g
+-WARNFLAGS ?= -Wall -Wextra -Werror -Wstrict-prototypes -fno-common
++WARNFLAGS ?= -Wall -Wextra -Wstrict-prototypes -fno-common
+ CFLAGS += $(WARNFLAGS) -I../include -I. -D_GNU_SOURCE \
+ 	  -I$(TOPDIR)/libopeniscsiusr
+ CFLAGS += $(shell $(PKG_CONFIG) --cflags libkmod)
+ 
diff --git a/network/open-isns/doinst.sh b/network/open-isns/doinst.sh
index 8fad217bd6..ffe6583a67 100644
--- a/network/open-isns/doinst.sh
+++ b/network/open-isns/doinst.sh
@@ -1,17 +1,18 @@
+# 20230620 bkw: Please stick with the config() from our template.
 
 config() {
-  NEW="${1}.new"
-  OLD="$1"
+  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 [ "$(md5sum <$OLD)" = "$(md5sum <$NEW)" ]; then
+  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/isns/isnsd.conf
-config etc/isns/isnsdd.conf
-config etc/isns/isnsadm.conf
+config etc/isns/isnsd.conf.new
+config etc/isns/isnsdd.conf.new
+config etc/isns/isnsadm.conf.new
diff --git a/network/open-isns/open-isns.SlackBuild b/network/open-isns/open-isns.SlackBuild
index 8aa11e23d4..93207785d0 100644
--- a/network/open-isns/open-isns.SlackBuild
+++ b/network/open-isns/open-isns.SlackBuild
@@ -1,8 +1,9 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for open-isns
 
 # Copyright 2019 Wayne Cuddy USA
+# Copyright 2021  Mario Preksavec, Zagreb, Croatia
 # 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=open-isns
-VERSION=${VERSION:-0.99}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-0.101}
+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}
@@ -65,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" \
@@ -114,4 +122,4 @@ mkdir -p $PKG/etc/rc.d
 cp $CWD/rc.isnsd $CWD/rc.isnsdd $PKG/etc/rc.d
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/network/open-isns/open-isns.info b/network/open-isns/open-isns.info
index 49ce2080f5..36f15a044e 100644
--- a/network/open-isns/open-isns.info
+++ b/network/open-isns/open-isns.info
@@ -1,8 +1,8 @@
 PRGNAM="open-isns"
-VERSION="0.99"
+VERSION="0.101"
 HOMEPAGE="https://github.com/open-iscsi/open-isns"
-DOWNLOAD="https://github.com/open-iscsi/open-isns/archive/v0.99/open-isns-0.99.tar.gz"
-MD5SUM="512413a285c852195b6240d6a0ad7f5b"
+DOWNLOAD="https://github.com/open-iscsi/open-isns/archive/v0.101/open-isns-0.101.tar.gz"
+MD5SUM="bd017a07d685b9c87e0da29fc3f899a2"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/network/openconnect-sso/README b/network/openconnect-sso/README
new file mode 100644
index 0000000000..c090bb28b1
--- /dev/null
+++ b/network/openconnect-sso/README
@@ -0,0 +1,11 @@
+Wrapper script for OpenConnect supporting Azure AD (SAMLv2)
+authentication to Cisco SSL-VPNs
+
+Create a shell script with the following content:
+
+#!/bin/bash
+konsole -e openconnect-sso --server your.server.extension
+
+Set it as executable and run it
+
+Enjoy!
diff --git a/network/openconnect-sso/openconnect-sso.SlackBuild b/network/openconnect-sso/openconnect-sso.SlackBuild
new file mode 100644
index 0000000000..3b263267af
--- /dev/null
+++ b/network/openconnect-sso/openconnect-sso.SlackBuild
@@ -0,0 +1,89 @@
+#!/bin/bash
+
+# Slackware build script for openconnect-sso
+
+# Copyright 2021 Nowhere Man Houston, TX
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=openconnect-sso
+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 [ ! -z "${PRINT_PACKAGE_NAME}" ]; 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 {} \;
+
+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/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/network/openconnect-sso/openconnect-sso.info b/network/openconnect-sso/openconnect-sso.info
new file mode 100644
index 0000000000..efa458d31a
--- /dev/null
+++ b/network/openconnect-sso/openconnect-sso.info
@@ -0,0 +1,10 @@
+PRGNAM="openconnect-sso"
+VERSION="0.8.0"
+HOMEPAGE="https://github.com/vlaci/openconnect-sso"
+DOWNLOAD="https://github.com/vlaci/openconnect-sso/releases/download/v0.8.0/openconnect-sso-0.8.0.tar.gz"
+MD5SUM="f16b7eba5760f725ddbff8d6114878db"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="openconnect"
+MAINTAINER="Bubba Bubbanion"
+EMAIL="none@none.com"
diff --git a/network/openconnect-sso/slack-desc b/network/openconnect-sso/slack-desc
new file mode 100644
index 0000000000..e0dc1b75af
--- /dev/null
+++ b/network/openconnect-sso/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+               |-----handy-ruler------------------------------------------------------|
+openconnect-sso: openconnect-sso (Wrapper for OpenConnect)
+openconnect-sso:
+openconnect-sso: Wrapper script for OpenConnect supporting Azure AD (SAMLv2)
+openconnect-sso: authentication to Cisco SSL-VPNs
+openconnect-sso:
+openconnect-sso:
+openconnect-sso:
+openconnect-sso: It still requires openconnect for the VPN connection, this is just a
+openconnect-sso: wrapper for OpenConnect to enable MFA connectivity
+openconnect-sso:
+openconnect-sso:
diff --git a/network/openconnect/README b/network/openconnect/README
index 39833f870a..26903d4a4f 100644
--- a/network/openconnect/README
+++ b/network/openconnect/README
@@ -1,6 +1,7 @@
-OpenConnect is a client for Cisco's AnyConnect SSL VPN, which is supported 
-by the ASA5500 Series, by IOS 12.4(9)T or later on Cisco SR500, 870, 880, 
-1800, 2800, 3800, 7200 Series and Cisco 7301 Routers, and probably others.
+OpenConnect is a client for Cisco's AnyConnect SSL VPN, which is
+supported by the ASA5500 Series, by IOS 12.4(9)T or later on Cisco
+SR500, 870, 880, 1800, 2800, 3800, 7200 Series and Cisco 7301 Routers,
+and probably others.
 
 Like vpnc, OpenConnect is not officially supported by, or associated in 
 any way with, Cisco Systems. It just happens to interoperate with their 
diff --git a/network/openconnect/libxml-fix.patch b/network/openconnect/libxml-fix.patch
new file mode 100644
index 0000000000..f6ee59a16a
--- /dev/null
+++ b/network/openconnect/libxml-fix.patch
@@ -0,0 +1,10 @@
+--- openconnect-internal.h.org	2023-05-19 18:12:15.000000000 +0200
++++ openconnect-internal.h	2023-12-12 18:38:19.651357296 +0100
+@@ -85,6 +85,7 @@
+ #define N_(s) s
+ 
+ #include <libxml/tree.h>
++#include <libxml/parser.h>
+ #include <zlib.h>
+ 
+ #ifdef _WIN32
diff --git a/network/openconnect/openconnect.SlackBuild b/network/openconnect/openconnect.SlackBuild
index 423cf89792..918ca05b51 100644
--- a/network/openconnect/openconnect.SlackBuild
+++ b/network/openconnect/openconnect.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for openconnect
 
@@ -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=openconnect
-VERSION=${VERSION:-7.08}
-BUILD=${BUILD:-1}
+VERSION=${VERSION:-9.12}
+BUILD=${BUILD:-3}
 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,7 @@ cd $TMP
 rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
+patch -p0 < $CWD/libxml-fix.patch
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -96,9 +107,11 @@ mkdir -p $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
 
+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/network/openconnect/openconnect.info b/network/openconnect/openconnect.info
index d2a600cc2b..d0caf6691a 100644
--- a/network/openconnect/openconnect.info
+++ b/network/openconnect/openconnect.info
@@ -1,10 +1,10 @@
 PRGNAM="openconnect"
-VERSION="7.08"
-HOMEPAGE="http://www.infradead.org/openconnect.html"
-DOWNLOAD="ftp://ftp.infradead.org/pub/openconnect/openconnect-7.08.tar.gz"
-MD5SUM="ca2ca1f61b8515879b481dcf6ed4366b"
+VERSION="9.12"
+HOMEPAGE="https://www.infradead.org/openconnect/"
+DOWNLOAD="https://www.infradead.org/openconnect/download/openconnect-9.12.tar.gz"
+MD5SUM="39060dcb58ebfb261bb6faf17755b98b"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Robby Workman"
-EMAIL="rworkman@slackbuilds.org"
+MAINTAINER="Marek Wodzinski"
+EMAIL="majek@w7i.pl"
diff --git a/network/openconnect/slack-desc b/network/openconnect/slack-desc
index addc710418..03c8767563 100644
--- a/network/openconnect/slack-desc
+++ b/network/openconnect/slack-desc
@@ -12,8 +12,8 @@ openconnect: OpenConnect is a client for Cisco's AnyConnect SSL VPN, which is
 openconnect: supported by the ASA5500 Series, by IOS 12.4(9)T or later on Cisco
 openconnect: SR500, 870, 880, 1800, 2800, 3800, 7200 Series, and Cisco 7301
 openconnect: Routers, and probably others.
+openconnect: It supports also Juniper and GlobalProtect VPN protocols and
+openconnect: have partial support for Pulse Connect Secure.
 openconnect:
 openconnect: This is released under the GNU Lesser Public License, version 2.1.
 openconnect:
-openconnect:
-openconnect:
diff --git a/network/opendchub/README b/network/opendchub/README
index 54c1da32ca..e0a9844e8f 100644
--- a/network/opendchub/README
+++ b/network/opendchub/README
@@ -1 +1,2 @@
-An Open Source Linux/Unix version of the hub software for Direct Connect.
+An Open Source Linux/Unix version of the hub software for Direct
+Connect.
diff --git a/network/opendchub/opendchub.SlackBuild b/network/opendchub/opendchub.SlackBuild
index 566a11cf11..1dada1930a 100644
--- a/network/opendchub/opendchub.SlackBuild
+++ b/network/opendchub/opendchub.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for OpenDC Hub
 #
@@ -19,10 +19,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=opendchub
 VERSION=${VERSION:-0.7.15}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 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}
@@ -66,7 +76,7 @@ find -L . \
  \( -perm 666 -o -perm 664 -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 \
@@ -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/network/opendkim/README b/network/opendkim/README
index 7b7c156c03..fe6f3d451b 100644
--- a/network/opendkim/README
+++ b/network/opendkim/README
@@ -32,4 +32,5 @@ support requires OpenDBX installed. To enable:
 USE_MYSQL=yes ./opendkim.SlackBuild
 USE_UNBOUND=yes ./opendkim.SlackBuild
 
-Unbound will require the unbound package which is available in SlackBuilds.
+Unbound will require the unbound package, which is available at
+SlackBuilds.org
diff --git a/network/opendkim/opendkim.SlackBuild b/network/opendkim/opendkim.SlackBuild
index 85b2b88f4b..fcac38bd7d 100644
--- a/network/opendkim/opendkim.SlackBuild
+++ b/network/opendkim/opendkim.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for OpenDKIM
 
@@ -22,31 +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=opendkim
 VERSION=${VERSION:-2.10.3}
-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" = "i386" ]; then
-  SLKCFLAGS="-O2 -march=i386 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$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
@@ -104,6 +108,9 @@ else
   UNBOUND=""
 fi
 
+patch -p1 < $CWD/openssl_1.1.0_compat.patch
+autoreconf -vif
+
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
@@ -130,19 +137,22 @@ mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a FEATURES INSTALL KNOWNBUGS LICENSE* README* RELEASE_NOTES* $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
-mkdir -p $PKG/var/run/opendkim
-chown $USER:$GROUP $PKG/var/run/opendkim/
+mkdir -p $PKG/etc/rc.d
 install -m 0640 -D $PRGNAM/opendkim.conf.simple $PKG/etc/opendkim.conf.new
-install -m 0755 -D $CWD/rc.opendkim $PKG/etc/rc.d/rc.opendkim.new
+sed -e "s,@DKUSER@,$DKUSER,g" -e "s,@DKGROUP@,$DKGROUP,g" \
+  $CWD/rc.opendkim > $PKG/etc/rc.d/rc.opendkim.new
+chmod 0755 $PKG/etc/rc.d/rc.opendkim.new
 
 # Change KeyFile to match rc.opendkim
 sed -i 's|^KeyFile.*|KeyFile /etc/opendkim/keys/default.private|' $PKG/etc/opendkim.conf.new
 
 echo "UserID $DKUSER:$DKGROUP" >> $PKG/etc/opendkim.conf.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/network/opendkim/openssl_1.1.0_compat.patch b/network/opendkim/openssl_1.1.0_compat.patch
new file mode 100644
index 0000000000..383990832a
--- /dev/null
+++ b/network/opendkim/openssl_1.1.0_compat.patch
@@ -0,0 +1,90 @@
+Description: Build and work with either openssl 1.0.2 or 1.1.0
+   * Add patch to build with either openssl 1.0.2 or 1.1.0 (Closes: #828466)
+     - Thanks to Sebastian Andrzej Siewior for the patch
+Author: Sebastian Andrzej Siewior
+Bug-Debian: http://bugs.debian.org/828466
+Origin: vendor
+Forwarded: no
+Reviewed-By: Scott Kitterman <scott@kitterman.com>
+Last-Update: <YYYY-MM-DD>
+
+--- opendkim-2.11.0~alpha.orig/configure.ac
++++ opendkim-2.11.0~alpha/configure.ac
+@@ -864,26 +864,28 @@ then
+ 	AC_SEARCH_LIBS([ERR_peek_error], [crypto], ,
+ 	               AC_MSG_ERROR([libcrypto not found]))
+ 
+-	AC_SEARCH_LIBS([SSL_library_init], [ssl], ,
+-		[
+-			if test x"$enable_shared" = x"yes"
+-			then
+-				AC_MSG_ERROR([Cannot build shared opendkim
+-				              against static openssl libraries.
+-				              Configure with --disable-shared
+-				              to get this working or obtain a
+-				              shared libssl library for
+-				              opendkim to use.])
+-			fi
+ 
+-			# avoid caching issue - last result of SSL_library_init
+-			# shouldn't be cached for this next check
+-			unset ac_cv_search_SSL_library_init
+-			LIBCRYPTO_LIBS="$LIBCRYPTO_LIBS -ldl"
+-			AC_SEARCH_LIBS([SSL_library_init], [ssl], ,
+-			               AC_MSG_ERROR([libssl not found]), [-ldl])
+-		]
+-	)
++	AC_LINK_IFELSE(
++		       [AC_LANG_PROGRAM([[#include <openssl/ssl.h>]],
++					[[SSL_library_init();]])],
++					[od_have_ossl="yes";],
++					[od_have_ossl="no";])
++	if test x"$od_have_ossl" = x"no"
++	then
++		if test x"$enable_shared" = x"yes"
++		then
++			AC_MSG_ERROR([Cannot build shared opendkim
++			              against static openssl libraries.
++			              Configure with --disable-shared
++			              to get this working or obtain a
++			              shared libssl library for
++			              opendkim to use.])
++		fi
++
++		LIBCRYPTO_LIBS="$LIBCRYPTO_LIBS -ldl"
++		AC_SEARCH_LIBS([SSL_library_init], [ssl], ,
++		               AC_MSG_ERROR([libssl not found]), [-ldl])
++	fi
+ 
+ 	AC_CHECK_DECL([SHA256_DIGEST_LENGTH],
+                       AC_DEFINE([HAVE_SHA256], 1,
+--- opendkim-2.11.0~alpha.orig/opendkim/opendkim-crypto.c
++++ opendkim-2.11.0~alpha/opendkim/opendkim-crypto.c
+@@ -222,7 +222,11 @@ dkimf_crypto_free_id(void *ptr)
+ 	{
+ 		assert(pthread_setspecific(id_key, ptr) == 0);
+ 
++#if OPENSSL_VERSION_NUMBER >= 0x10100000
++		OPENSSL_thread_stop();
++#else
+ 		ERR_remove_state(0);
++#endif
+ 
+ 		free(ptr);
+ 
+@@ -392,11 +396,15 @@ dkimf_crypto_free(void)
+ {
+ 	if (crypto_init_done)
+ 	{
++#if OPENSSL_VERSION_NUMBER >= 0x10100000
++		OPENSSL_thread_stop();
++#else
+ 		CRYPTO_cleanup_all_ex_data();
+ 		CONF_modules_free();
+ 		EVP_cleanup();
+ 		ERR_free_strings();
+ 		ERR_remove_state(0);
++#endif
+ 
+ 		if (nmutexes > 0)
+ 		{
diff --git a/network/opendkim/rc.opendkim b/network/opendkim/rc.opendkim
index 23170a16e6..ef6e1a6ff5 100644
--- a/network/opendkim/rc.opendkim
+++ b/network/opendkim/rc.opendkim
@@ -6,7 +6,8 @@
 # Modified from the  script by Steve Jenkins (SteveJenkins.com) - 10-29-2012
 # Based on a script by Andrew Colin Kissa (TopDog) for dkim-milter - 05-28-2009
 
-USER="opendkim"
+DKUSER="@DKUSER@"
+DKGROUP="@DKGROUP@"
 PROGRAM=/usr/sbin/opendkim
 CONF_FILE=/etc/opendkim.conf
 PID_FILE=/var/run/opendkim/opendkim.pid
@@ -23,8 +24,8 @@ do_dkim_keygen() {
                 else
                         mkdir -p $DKIM_KEYDIR
                         $KEYGEN -b 2048 -D $DKIM_KEYDIR -s $DKIM_SELECTOR -d "$(hostname -d)"
-                        chown root:$USER $DKIM_KEYDIR
-                        chown $USER:$USER $DKIM_KEYDIR/$DKIM_SELECTOR.{private,txt}
+                        chown root:$DK_USER $DKIM_KEYDIR
+                        chown $DKUSER:$DKGROUP $DKIM_KEYDIR/$DKIM_SELECTOR.{private,txt}
                         chmod 600 $DKIM_KEYDIR/$DKIM_SELECTOR.private
                         chmod 644 $DKIM_KEYDIR/$DKIM_SELECTOR.txt
                         echo
@@ -47,6 +48,8 @@ case "$1" in
                 echo OpenDKIM already running as pid "$PID"
                 exit 2;
         else
+                mkdir -p $(dirname $PID_FILE)
+                chown $DKUSER:$DKGROUP $(dirname $PID_FILE)
                 $PROGRAM -l -x $CONF_FILE -P $PID_FILE
         fi
         ;;
diff --git a/network/opendmarc/README b/network/opendmarc/README
index ba50fb5889..1765ffa51d 100644
--- a/network/opendmarc/README
+++ b/network/opendmarc/README
@@ -8,9 +8,10 @@ Optional dependency (will be autodetected): libspf2
 You must have a opendmarc user to run this script:
 
   # groupadd -g 362 opendmarc
-  # useradd -u 362 -d /var/run/opendmarc -s /bin/false -g opendmarc opendmarc
+  # useradd -u 362 -d /var/run/opendmarc \
+      -s /bin/false -g opendmarc opendmarc
 
-And if you have postfix installed, add it to the group:
+And if you use postfix, add it to the group:
 
   # usermod -a -G opendmarc postfix
 
diff --git a/network/opendmarc/opendmarc.SlackBuild b/network/opendmarc/opendmarc.SlackBuild
index 1747782641..9047568793 100644
--- a/network/opendmarc/opendmarc.SlackBuild
+++ b/network/opendmarc/opendmarc.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for opendmarc
 
-# Copyright 2019  Mario Preksavec, Zagreb, Croatia
+# Copyright 2019, 2021  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.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=opendmarc
-VERSION=${VERSION:-1.3.2}
-BUILD=${BUILD:-1}
+VERSION=${VERSION:-1.4.1.1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+SRCNAM=OpenDMARC-rel-$PRGNAM-${VERSION//./-}
 
 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}
@@ -87,9 +99,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
+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 \
@@ -98,8 +110,13 @@ find -L . \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 # http://batleth.sapienti-sat.org/projects/opendmarc/
-# ... and a few more
-for i in $CWD/patches/* ; do patch -p1 <$i ; done
+# https://github.com/trusteddomainproject/OpenDMARC/pulls
+for i in $CWD/patches/* ; do
+  case $i in
+    */z04_moreHeadersFailureReportVsBeta1.patch) : ;;
+    *) patch -p1 <$i ;;
+  esac
+done
 
 autoreconf -vif
 
@@ -120,12 +137,10 @@ CXXFLAGS="$SLKCFLAGS" \
 make
 make install DESTDIR=$PKG
 
+rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la
+
 # Install init script
 install -D -m0755 -oroot -groot contrib/init/generic/$PRGNAM $PKG/etc/rc.d/rc.$PRGNAM.new
-sed -e "s|^\(prefix=\).*|\1|" \
-    -e "s|^\(exec_prefix=\).*|\1/usr|" \
-    -e "s|/etc/sysconfig/opendmarc|/etc/default/opendmarc|" \
-    -i $PKG/etc/rc.d/rc.$PRGNAM.new
 
 # Configure defaults
 install -D -m0644 -oroot -groot $PRGNAM/$PRGNAM.conf.sample $PKG/etc/$PRGNAM.conf.new
@@ -139,10 +154,6 @@ sed -e "s|^# \(AuthservID\) .*|\1 HOSTNAME|" \
     -e "s|^# \(UserID\) .*|\1 $PRGNAM:$PRGNAM|" \
     -i $PKG/etc/$PRGNAM.conf.new
 
-# Home directory for runtime data
-mkdir -p $PKG/var/run/$PRGNAM
-chown $PRGNAM:$PRGNAM $PKG/var/run/$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
 
@@ -150,7 +161,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 RELEASE_NOTES $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a CONTRIBUTING README README.md RELEASE_NOTES $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
 
@@ -159,4 +170,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/network/opendmarc/opendmarc.info b/network/opendmarc/opendmarc.info
index 061a20ed5e..5b345d1f09 100644
--- a/network/opendmarc/opendmarc.info
+++ b/network/opendmarc/opendmarc.info
@@ -1,8 +1,8 @@
 PRGNAM="opendmarc"
-VERSION="1.3.2"
+VERSION="1.4.1.1"
 HOMEPAGE="http://www.trusteddomain.org/opendmarc/"
-DOWNLOAD="https://sourceforge.net/projects/opendmarc/files/opendmarc-1.3.2.tar.gz"
-MD5SUM="2b4e9b8be7fe61800515cef1d7e6a905"
+DOWNLOAD="https://github.com/trusteddomainproject/OpenDMARC/archive/rel-opendmarc-1-4-1-1/OpenDMARC-rel-opendmarc-1-4-1-1.tar.gz"
+MD5SUM="18fe4c7bedbc6f893e96b0b47dfcc280"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/network/opendmarc/patches/fix-generic-init-script.diff b/network/opendmarc/patches/fix-generic-init-script.diff
new file mode 100644
index 0000000000..0c9a794915
--- /dev/null
+++ b/network/opendmarc/patches/fix-generic-init-script.diff
@@ -0,0 +1,36 @@
+--- OpenDMARC-rel-opendmarc-1-4-1-1/contrib/init/generic/opendmarc.orig	2021-04-30 18:34:43.000000000 +0200
++++ OpenDMARC-rel-opendmarc-1-4-1-1/contrib/init/generic/opendmarc	2021-08-15 04:11:56.270775519 +0200
+@@ -19,18 +19,19 @@
+ 
+ . /etc/rc.d/init.d/functions
+ 
+-prefix=/usr/local
+-exec_prefix=${prefix}
++prefix=
++exec_prefix=/usr
+ 
+ RETVAL=0
+ prog="opendmarc"
+ 
+ DAEMON=${exec_prefix}/sbin/$prog
+ CONF_FILE=${prefix}/etc/$prog.conf
+-PID_FILE=${prefix}/var/run/$prog/$prog.pid
++RUN_DIR=${prefix}/var/run/$prog
++PID_FILE=$RUN_DIR/$prog.pid
+ 
+-if [ -f /etc/sysconfig/opendmarc ]; then
+-	. /etc/sysconfig/opendmarc
++if [ -f /etc/default/opendmarc ]; then
++	. /etc/default/opendmarc
+ fi
+ 
+ start() {
+@@ -40,6 +41,8 @@
+ 		echo OpenDMARC already running as pid $PID
+ 	        exit 2;
+ 	else
++		mkdir -p $RUN_DIR
++		chown $prog:$prog $RUN_DIR
+ 		daemon $DAEMON -c $CONF_FILE -P $PID_FILE
+ 		RETVAL=$?
+ 		[ $RETVAL -eq 0 ] && touch /var/lock/subsys/opendmarc
diff --git a/network/opendmarc/patches/pull116.diff b/network/opendmarc/patches/pull116.diff
new file mode 100644
index 0000000000..cdedb80324
--- /dev/null
+++ b/network/opendmarc/patches/pull116.diff
@@ -0,0 +1,131 @@
+diff --git a/opendmarc/opendmarc-config.h b/opendmarc/opendmarc-config.h
+index 1b781df..8398007 100644
+--- a/opendmarc/opendmarc-config.h
++++ b/opendmarc/opendmarc-config.h
+@@ -47,6 +47,7 @@ struct configdef dmarcf_config[] =
+ 	{ "RequiredHeaders",		CONFIG_TYPE_BOOLEAN,	FALSE },
+ 	{ "RejectFailures",		CONFIG_TYPE_BOOLEAN,	FALSE },
+ 	{ "RejectMultiValueFrom",	CONFIG_TYPE_BOOLEAN,	FALSE },
++	{ "RejectString",		CONFIG_TYPE_STRING,	FALSE },
+ 	{ "ReportCommand",		CONFIG_TYPE_STRING,	FALSE },
+ 	{ "Socket",			CONFIG_TYPE_STRING,	FALSE },
+ 	{ "SoftwareHeader",		CONFIG_TYPE_BOOLEAN,	FALSE },
+diff --git a/opendmarc/opendmarc.c b/opendmarc/opendmarc.c
+index a1e49ec..c28aedd 100644
+--- a/opendmarc/opendmarc.c
++++ b/opendmarc/opendmarc.c
+@@ -190,6 +190,7 @@ struct dmarcf_config
+ 	char *			conf_historyfile;
+ 	char *			conf_pslist;
+ 	char *			conf_ignorelist;
++	char *			conf_rejectstring;
+ 	char **			conf_trustedauthservids;
+ 	char **			conf_ignoredomains;
+ 	struct list *		conf_domainwhitelist;
+@@ -1427,6 +1428,10 @@ dmarcf_config_load(struct config *data, struct dmarcf_config *conf,
+ 		                  &conf->conf_rejectfail,
+ 		                  sizeof conf->conf_rejectfail);
+ 
++		(void) config_get(data, "RejectString",
++						  &conf->conf_rejectstring,
++						  sizeof conf->conf_rejectstring);
++
+ 		(void) config_get(data, "RequiredHeaders",
+ 		                  &conf->conf_reqhdrs,
+ 		                  sizeof conf->conf_reqhdrs);
+@@ -1635,6 +1640,36 @@ dmarcf_config_load(struct config *data, struct dmarcf_config *conf,
+ 
+ 	pthread_rwlock_unlock(&hash_lock);
+ 
++	if ( conf->conf_rejectstring == NULL ) {
++		conf->conf_rejectstring = DEFREJECTSTR;
++	} else {
++		/* Count occurrences of "%s" in RejectString */
++		int countocc = 0;
++		const char *tmp = conf->conf_rejectstring;
++		if (strstr(tmp, '%%')) {
++			snprintf(err, errlen, "%s: The RejectString contains a %%%% (escaped %%)!",
++				basedir);
++			return -1;
++		}
++		while(tmp = strstr(tmp, "%s"))
++		{
++			countocc++;
++			tmp++;
++		}
++		switch ( countocc ) {
++			case 0:
++				snprintf(err, errlen, "%s: The RejectString doesn't contain %%s!",
++					basedir);
++				return -1;
++			case 1:
++				break;
++			default:
++				snprintf(err, errlen, "%s: The RejectString contains %d occurences of %%s instead of one!",
++					basedir, countocc);
++				return -1;
++		}
++	}
++
+ 	return 0;
+ }
+ 
+@@ -3566,7 +3601,7 @@ mlfi_eom(SMFICTX *ctx)
+ 		    random() % 100 < pct)
+ 		{
+ 			snprintf(replybuf, sizeof replybuf,
+-			         "rejected by DMARC policy for %s", pdomain);
++			         conf->conf_rejectstring, pdomain);
+ 
+ 			status = dmarcf_setreply(ctx, DMARC_REJECT_SMTP,
+ 			                         DMARC_REJECT_ESC, replybuf);
+diff --git a/opendmarc/opendmarc.conf.5.in b/opendmarc/opendmarc.conf.5.in
+index f6fd6b4..4b6df51 100644
+--- a/opendmarc/opendmarc.conf.5.in
++++ b/opendmarc/opendmarc.conf.5.in
+@@ -261,6 +261,13 @@ If set, messages with multiple addresses in the From: field of the message
+ will be rejected unless all domain names in that field are the same.  They
+ will otherwise be ignored by the filter (the default).
+ 
++.TP
++.I RejectString (string)
++This string describes the reason of reject at SMTP level.
++The message MUST contain the word "%s" once, which will be replaced by the
++RFC5322.From domain. Escaped "%" ("%%") are not allowed in this string.
++The default is "rejected by DMARC policy for %s"
++
+ .TP
+ .I ReportCommand (string)
+ Indicates the shell command to which failure reports should be passed for
+diff --git a/opendmarc/opendmarc.conf.sample b/opendmarc/opendmarc.conf.sample
+index 7b31987..462e6cf 100644
+--- a/opendmarc/opendmarc.conf.sample
++++ b/opendmarc/opendmarc.conf.sample
+@@ -303,6 +303,15 @@
+ #
+ # RejectFailures false
+ 
++##  RejectString string
++##      default ("rejected by DMARC policy for %s")
++##
++##  This string describes the reason of reject. The message MUST contain the
++##  word "%s" (only once), which will be replaced with the RFC5322.From domain.
++##  Escaped "%" ("%%") are not allowed in this string.
++#
++# RejectString rejected by DMARC policy for %s
++
+ ##  RejectMultiValueFrom { true | false }
+ ##  	default "false"
+ ##
+diff --git a/opendmarc/opendmarc.h b/opendmarc/opendmarc.h
+index e36f93a..a4593dc 100644
+--- a/opendmarc/opendmarc.h
++++ b/opendmarc/opendmarc.h
+@@ -34,6 +34,7 @@
+ #define	BUFRSZ		2048
+ #define	DEFCONFFILE	CONFIG_BASE "/opendmarc.conf"
+ #define	DEFREPORTCMD	"/usr/sbin/sendmail -t -odq"
++#define DEFREJECTSTR    "rejected by DMARC policy for %s"
+ #define	JOBIDUNKNOWN	"(unknown-jobid)"
+ #define	MAXARGV		65536
+ #define	MAXHEADER	1024
diff --git a/network/opendmarc/patches/pull172.diff b/network/opendmarc/patches/pull172.diff
new file mode 100644
index 0000000000..1b7cd634fc
--- /dev/null
+++ b/network/opendmarc/patches/pull172.diff
@@ -0,0 +1,58 @@
+diff --git a/opendmarc/opendmarc.conf.5.in b/opendmarc/opendmarc.conf.5.in
+index f7cea9a..52490cd 100644
+--- a/opendmarc/opendmarc.conf.5.in
++++ b/opendmarc/opendmarc.conf.5.in
+@@ -196,18 +196,7 @@ aggregate reports can be extracted using
+ If set, the milter will signal to the mta that messages with
+ p=quarantine, which fail dmarc authentication, should be held in
+ the MTA's "Hold" or "Quarantine" queue.  The name varies by MTA.
+-If false, messsages will be accepted and passed along with the 
+-regular mail flow, and the quarantine will be left up to downstream
+-MTA/MDA/MUA filters, if any, to handle by re-evaluating the headers,
+-including the Authentication-Results header added by this filter.
+-The default is "false".
+-
+-.TP
+-.I HoldQuarantinedMessages (Boolean)
+-If set, the milter will signal to the mta that messages with
+-p=quarantine, which fail dmarc authentication, should be held in
+-the MTA's "Hold" or "Quarantine" queue.  The name varies by MTA.
+-If false, messsages will be accepted and passed along with the 
++If false, messages will be accepted and passed along with the
+ regular mail flow, and the quarantine will be left up to downstream
+ MTA/MDA/MUA filters, if any, to handle by re-evaluating the headers,
+ including the Authentication-Results header added by this filter.
+diff --git a/opendmarc/opendmarc.conf.sample b/opendmarc/opendmarc.conf.sample
+index 69c9afb..0222ecd 100644
+--- a/opendmarc/opendmarc.conf.sample
++++ b/opendmarc/opendmarc.conf.sample
+@@ -219,7 +219,7 @@
+ ##  If set, the milter will signal to the mta that messages with
+ ##  p=quarantine, which fail dmarc authentication, should be held in
+ ##  the MTA's "Hold" or "Quarantine" queue.  The name varies by MTA.
+-##  If false, messsages will be accepted and passed along with the 
++##  If false, messages will be accepted and passed along with the
+ ##  regular mail flow, and the quarantine will be left up to downstream
+ ##  MTA/MDA/MUA filters, if any, to handle by re-evaluating the headers,
+ ##  including the Authentication-Results header added by OpenDMARC
+@@ -234,20 +234,6 @@
+ #
+ # IgnoreAuthenticatedClients false
+ 
+-## HoldQuarantinedMessages { true | false }
+-##  	default "false"
+-##
+-##  If set, the milter will signal to the mta that messages with
+-##  p=quarantine, which fail dmarc authentication, should be held in
+-##  the MTA's "Hold" or "Quarantine" queue.  The name varies by MTA.
+-##  If false, messsages will be accepted and passed along with the 
+-##  regular mail flow, and the quarantine will be left up to downstream
+-##  MTA/MDA/MUA filters, if any, to handle by re-evaluating the headers,
+-##  including the Authentication-Results header added by OpenDMARC
+-#
+-# HoldQuarantinedMessages false
+-
+-
+ ##  IgnoreHosts path
+ ##  	default (internal)
+ ##
diff --git a/network/opendmarc/patches/pull178.diff b/network/opendmarc/patches/pull178.diff
new file mode 100644
index 0000000000..39eaf43386
--- /dev/null
+++ b/network/opendmarc/patches/pull178.diff
@@ -0,0 +1,36 @@
+diff --git a/opendmarc/opendmarc.c b/opendmarc/opendmarc.c
+index 65f6b49..ffcbc3f 100644
+--- a/opendmarc/opendmarc.c
++++ b/opendmarc/opendmarc.c
+@@ -2474,17 +2474,22 @@ mlfi_eom(SMFICTX *ctx)
+ 
+ 		for (c = 1; users[c] != NULL; c++)
+ 		{
+-			if (strcasecmp(domains[0], domains[c]) != 0)
++			if (domains[0] != NULL
++			    && domains[c] != NULL
++			    && strcasecmp(domains[0], domains[c]) != 0)
+ 			{
+-				syslog(LOG_ERR,
+-				       "%s: multi-valued From field detected",
+-				       dfc->mctx_jobid);
+-			}
++				if (conf->conf_dolog)
++				{
++					syslog(LOG_ERR,
++					       "%s: multi-valued From field detected",
++					       dfc->mctx_jobid);
++				}
+ 
+-			if (conf->conf_reject_multi_from)
+-				return SMFIS_REJECT;
+-			else
+-				return SMFIS_ACCEPT;
++				if (conf->conf_reject_multi_from)
++					return SMFIS_REJECT;
++				else
++					return SMFIS_ACCEPT;
++			}
+ 		}
+ 
+ 		user = users[0];
diff --git a/network/opendmarc/patches/ticket137.patch b/network/opendmarc/patches/ticket137.patch
deleted file mode 100644
index df6c062152..0000000000
--- a/network/opendmarc/patches/ticket137.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From afc1615946cd127d9ea28e0892934251c6a00a84 Mon Sep 17 00:00:00 2001
-From: "Murray S. Kucherawy" <msk@trusteddomain.org>
-Date: Sat, 4 Mar 2017 08:03:22 -0800
-Subject: [PATCH] Fix bug #137: Handle base64 inside AR tokens that are values.
- Problem reported by Joseph Coffland.
-
----
- RELEASE_NOTES            |  2 ++
- opendmarc/opendmarc-ar.c | 14 +++++++++++++-
- 2 files changed, 15 insertions(+), 1 deletion(-)
-
-Index: opendmarc/RELEASE_NOTES
-===================================================================
---- opendmarc.orig/RELEASE_NOTES	2018-12-17 01:38:44.570329334 -0500
-+++ opendmarc/RELEASE_NOTES	2018-12-17 01:40:21.062333399 -0500
-@@ -3,6 +3,10 @@
- This listing shows the versions of the OpenDMARC package, the date of
- release, and a summary of the changes in that release.
- 
-+ 1.4.0          2017/??/??
-+        Fix bug #137: Handle base64 inside AR tokens that are values.
-+                Problem reported by Joseph Coffland.
-+
- 1.3.2		2016/12/19
- 	Feature request #86: Change meaning of "RequiredHeaders" such that
- 		header validity is always checked, but messages are only
-Index: opendmarc/opendmarc/opendmarc-ar.c
-===================================================================
---- opendmarc.orig/opendmarc/opendmarc-ar.c	2018-12-17 01:38:44.570329334 -0500
-+++ opendmarc/opendmarc/opendmarc-ar.c	2018-12-17 01:38:44.566329334 -0500
-@@ -602,7 +602,19 @@
- 			ar->ares_result[n - 1].result_props = r;
- 
- 			prevstate = state;
--			state = 9;
-+			if (c < ntoks - 1 && tokens[c + 1][1] == '\0')
-+			{
-+				if (tokens[c + 1][0] == ';')
-+					state = 2;
-+				else if (tokens[c + 1][0] == '=')
-+					r--;
-+				else
-+					state = 9;
-+			}
-+			else
-+			{
-+				state = 9;
-+			}
- 
- 			break;
- 		}
diff --git a/network/opendmarc/patches/ticket146.patch b/network/opendmarc/patches/ticket146.patch
deleted file mode 100644
index c7f6f5748b..0000000000
--- a/network/opendmarc/patches/ticket146.patch
+++ /dev/null
@@ -1,110 +0,0 @@
-diff --git a/reports/opendmarc-import.8.in b/reports/opendmarc-import.8.in
-index 8f55848..4e854ac 100644
---- a/reports/opendmarc-import.8.in
-+++ b/reports/opendmarc-import.8.in
-@@ -12,8 +12,6 @@ reads per-message data recorded by an instance of
- and inserts it into an SQL database, for later use by
- .B opendmarc-reports(8)
- to generate aggregate reports.
--
--Records are read from standard input.
- .SH OPTIONS
- .TP
- .I --dbhost=hostname
-@@ -44,6 +42,9 @@ the environment variable is not set.
- .I --help
- Prints a help message and terminates.
- .TP
-+.I --input=file
-+Reads from the named file instead of from standard input (the default).
-+.TP
- .I --verbose
- Increase the amount of verbosity written to standard output.
- .TP
-diff --git a/reports/opendmarc-import.in b/reports/opendmarc-import.in
-index 5a28f2f..cccbace 100755
---- a/reports/opendmarc-import.in
-+++ b/reports/opendmarc-import.in
-@@ -35,11 +35,14 @@ my $def_dbuser    = "opendmarc";
- my $def_dbpasswd  = "opendmarc";
- my $def_dbport    = "3306";
- my $def_interval  = "86400";
-+my $def_inputfh   = *STDIN;
- my $dbhost;
- my $dbname;
- my $dbuser;
- my $dbpasswd;
- my $dbport;
-+my $inputfile;
-+my $inputfh;
- 
- my $dbscheme     = "@SQL_BACKEND@";
- 
-@@ -326,6 +329,7 @@ sub usage
- 	print STDERR "\t--dbpasswd=passwd  database password [$def_dbpasswd]\n";
- 	print STDERR "\t--dbport=port      database port [$def_dbport]\n";
- 	print STDERR "\t--dbuser=user      database user [$def_dbuser]\n";
-+	print STDERR "\t--input=file       input file [STDIN]\n";
- 	print STDERR "\t--help             print help and exit\n";
- 	print STDERR "\t--verbose          verbose output\n";
- 	print STDERR "\t--version          print version and exit\n";
-@@ -337,6 +341,7 @@ my $opt_retval = &Getopt::Long::GetOptions ('dbhost=s' => \$dbhost,
-                                             'dbpasswd=s' => \$dbpasswd,
-                                             'dbport=s' => \$dbport,
-                                             'dbuser=s' => \$dbuser,
-+                                            'input=s' => \$inputfile,
-                                             'help!' => \$helponly,
-                                             'verbose!' => \$verbose,
-                                             'version!' => \$showversion,
-@@ -428,6 +433,24 @@ if ($verbose)
- 	print STDERR "$progname: started at " . localtime() . "\n";
- }
- 
-+
-+if (!defined($inputfile))
-+{
-+	$inputfh = $def_inputfh;
-+}
-+else
-+{
-+	open($inputfh, "<", $inputfile) or die "$progname: unable to open $inputfile: $!\n";
-+	if ($verbose)
-+	{
-+		print STDERR "$progname: opened file $inputfile\n"
-+	}
-+}
-+if (!flock($inputfh, LOCK_SH))
-+{
-+	print STDERR "$progname: warning: unable to establish read lock\n";
-+}
-+
- my $dbi_dsn = "DBI:" . $dbscheme . ":database=" . $dbname .
-               ";host=" . $dbhost . ";port=" . $dbport;
- 
-@@ -447,13 +470,10 @@ if ($verbose)
- # Read history file from stdin.
- #
- 
-+	
- $lineno = 0;
--if (!flock(STDIN, LOCK_SH))
--{
--	print STDERR "$progname: warning: unable to establish read lock\n";
--}
- 
--while (<STDIN>)
-+while (<$inputfh>)
- {
- 	$lineno++;
- 
-@@ -592,6 +612,10 @@ if (defined($jobid))
- 	update_db();
- }
- 
-+if (defined($inputfile))
-+{
-+	close($inputfh);
-+}
- #
- # all done!
- #
diff --git a/network/opendmarc/patches/ticket153.patch b/network/opendmarc/patches/ticket153.patch
deleted file mode 100644
index 1193409cb7..0000000000
--- a/network/opendmarc/patches/ticket153.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-Description: do not report same dkim result multiple times
-             in the same record object
-URL: https://sf.net/p/opendmarc/tickets/153/
-Author: Tomki
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
-Index: opendmarc-1.3.2/reports/opendmarc-reports.in
-===================================================================
---- opendmarc-1.3.2.orig/reports/opendmarc-reports.in	2017-03-13 19:01:56.496961757 -0400
-+++ opendmarc-1.3.2/reports/opendmarc-reports.in	2017-03-13 19:01:56.492961756 -0400
-@@ -703,6 +703,7 @@
- 			exit(1);
- 		}
- 
-+		my %dkim_domain_result_cache = ();
- 		while ($dbi_a = $dbi_d->fetchrow_arrayref())
- 		{
- 			undef $dkimdomain;
-@@ -716,11 +717,15 @@
- 				$dkimresult = $dbi_a->[1];
- 			}
- 
--
- 			if (!defined($dkimdomain))
- 			{
- 				next;
- 			}
-+			if (defined($dkim_domain_result_cache{$dkimdomain}{$dkimresult}))
-+			{
-+				next; # no duplicate per-record auth_result dkim sections
-+			}
-+			$dkim_domain_result_cache{$dkimdomain}{$dkimresult}++;
- 
- 			switch ($dkimresult)
- 			{
diff --git a/network/opendmarc/patches/ticket180.patch b/network/opendmarc/patches/ticket180.patch
deleted file mode 100644
index cd38c39c38..0000000000
--- a/network/opendmarc/patches/ticket180.patch
+++ /dev/null
@@ -1,280 +0,0 @@
-diff --git a/opendmarc/opendmarc-config.h b/opendmarc/opendmarc-config.h
-index 7ba394b..28f605e 100644
---- a/opendmarc/opendmarc-config.h
-+++ b/opendmarc/opendmarc-config.h
-@@ -36,6 +36,7 @@ struct configdef dmarcf_config[] =
- 	{ "IgnoreHosts",		CONFIG_TYPE_STRING,	FALSE },
- 	{ "IgnoreMailFrom",		CONFIG_TYPE_STRING,	FALSE },
- 	{ "MilterDebug",		CONFIG_TYPE_INTEGER,	FALSE },
-+	{ "OverrideMLM",		CONFIG_TYPE_STRING,	FALSE },
- 	{ "PidFile",			CONFIG_TYPE_STRING,	FALSE },
- 	{ "PublicSuffixList",		CONFIG_TYPE_STRING,	FALSE },
- 	{ "RecordAllMessages",		CONFIG_TYPE_BOOLEAN,	FALSE },
-diff --git a/opendmarc/opendmarc.c b/opendmarc/opendmarc.c
-index ba04312..07e089d 100644
---- a/opendmarc/opendmarc.c
-+++ b/opendmarc/opendmarc.c
-@@ -168,6 +168,7 @@ struct dmarcf_config
- 	char *			conf_ignorelist;
- 	char **			conf_trustedauthservids;
- 	char **			conf_ignoredomains;
-+	struct list *		conf_overridemlm;
- };
- 
- /* LIST -- basic linked list of strings */
-@@ -1221,6 +1222,18 @@ dmarcf_config_load(struct config *data, struct dmarcf_config *conf,
- 		if (str != NULL)
- 			dmarcf_mkarray(str, &conf->conf_ignoredomains);
- 
-+		str = NULL;
-+		(void) config_get(data, "OverrideMLM", &str, sizeof str);
-+		if (str != NULL)
-+		{
-+			if (!dmarcf_loadlist(str, &conf->conf_overridemlm))
-+			{
-+				fprintf(stderr,
-+					"%s: can't load override MLM list from %s: %s\n",
-+					progname, str, strerror(errno));
-+			}
-+		}
-+
- 		(void) config_get(data, "AuthservIDWithJobID",
- 		                  &conf->conf_authservidwithjobid,
- 		                  sizeof conf->conf_authservidwithjobid);
-@@ -2982,30 +2995,45 @@ mlfi_eom(SMFICTX *ctx)
- 	  case DMARC_POLICY_REJECT:		/* Explicit reject */
- 		aresult = "fail";
- 
--		if (conf->conf_rejectfail && random() % 100 < pct)
-+		if (conf->conf_overridemlm != NULL &&
-+		    (dmarcf_checkhost(cc->cctx_host, conf->conf_overridemlm) ||
-+		    (dmarcf_checkip((struct sockaddr *)&cc->cctx_ip, conf->conf_overridemlm))))
- 		{
--			snprintf(replybuf, sizeof replybuf,
--			         "rejected by DMARC policy for %s", pdomain);
--
--			status = dmarcf_setreply(ctx, DMARC_REJECT_SMTP,
--			                         DMARC_REJECT_ESC, replybuf);
--			if (status != MI_SUCCESS && conf->conf_dolog)
-+			if (conf->conf_dolog)
- 			{
--				syslog(LOG_ERR, "%s: smfi_setreply() failed",
--				       dfc->mctx_jobid);
-+				syslog(LOG_INFO, "%s: overriding policy for mail from %s: MLM",
-+				       dfc->mctx_jobid, dfc->mctx_fromdomain);
- 			}
--
--			ret = SMFIS_REJECT;
--			result = DMARC_RESULT_REJECT;
-+			ret = SMFIS_ACCEPT;
-+			result = DMARC_RESULT_OVRD_MAILING_LIST;
- 		}
--
--		if (conf->conf_copyfailsto != NULL)
-+		else
- 		{
--			status = dmarcf_addrcpt(ctx, conf->conf_copyfailsto);
--			if (status != MI_SUCCESS && conf->conf_dolog)
-+			if (conf->conf_rejectfail && random() % 100 < pct)
-+			{
-+				snprintf(replybuf, sizeof replybuf,
-+					 "rejected by DMARC policy for %s", pdomain);
-+
-+				status = dmarcf_setreply(ctx, DMARC_REJECT_SMTP,
-+							 DMARC_REJECT_ESC, replybuf);
-+				if (status != MI_SUCCESS && conf->conf_dolog)
-+				{
-+					syslog(LOG_ERR, "%s: smfi_setreply() failed",
-+					       dfc->mctx_jobid);
-+				}
-+
-+				ret = SMFIS_REJECT;
-+				result = DMARC_RESULT_REJECT;
-+			}
-+
-+			if (conf->conf_copyfailsto != NULL)
- 			{
--				syslog(LOG_ERR, "%s: smfi_addrcpt() failed",
--				       dfc->mctx_jobid);
-+				status = dmarcf_addrcpt(ctx, conf->conf_copyfailsto);
-+				if (status != MI_SUCCESS && conf->conf_dolog)
-+				{
-+					syslog(LOG_ERR, "%s: smfi_addrcpt() failed",
-+					       dfc->mctx_jobid);
-+				}
- 			}
- 		}
- 
-@@ -3014,30 +3042,45 @@ mlfi_eom(SMFICTX *ctx)
- 	  case DMARC_POLICY_QUARANTINE:		/* Explicit quarantine */
- 		aresult = "fail";
- 
--		if (conf->conf_rejectfail && random() % 100 < pct)
-+		if (conf->conf_overridemlm != NULL &&
-+		    (dmarcf_checkhost(cc->cctx_host, conf->conf_overridemlm) ||
-+		    (dmarcf_checkip((struct sockaddr *)&cc->cctx_ip, conf->conf_overridemlm))))
- 		{
--			snprintf(replybuf, sizeof replybuf,
--			         "quarantined by DMARC policy for %s",
--			         pdomain);
--
--			status = smfi_quarantine(ctx, replybuf);
--			if (status != MI_SUCCESS && conf->conf_dolog)
-+			if (conf->conf_dolog)
- 			{
--				syslog(LOG_ERR, "%s: smfi_quarantine() failed",
--				       dfc->mctx_jobid);
-+				syslog(LOG_INFO, "%s: overriding policy for mail from %s: MLM",
-+				       dfc->mctx_jobid, dfc->mctx_fromdomain);
- 			}
--
- 			ret = SMFIS_ACCEPT;
--			result = DMARC_RESULT_QUARANTINE;
-+			result = DMARC_RESULT_OVRD_MAILING_LIST;
- 		}
--
--		if (conf->conf_copyfailsto != NULL)
-+		else
- 		{
--			status = dmarcf_addrcpt(ctx, conf->conf_copyfailsto);
--			if (status != MI_SUCCESS && conf->conf_dolog)
-+			if (conf->conf_rejectfail && random() % 100 < pct)
-+			{
-+				snprintf(replybuf, sizeof replybuf,
-+					 "quarantined by DMARC policy for %s",
-+					 pdomain);
-+
-+				status = smfi_quarantine(ctx, replybuf);
-+				if (status != MI_SUCCESS && conf->conf_dolog)
-+				{
-+					syslog(LOG_ERR, "%s: smfi_quarantine() failed",
-+					       dfc->mctx_jobid);
-+				}
-+
-+				ret = SMFIS_ACCEPT;
-+				result = DMARC_RESULT_QUARANTINE;
-+			}
-+
-+			if (conf->conf_copyfailsto != NULL)
- 			{
--				syslog(LOG_ERR, "%s: smfi_addrcpt() failed",
--				       dfc->mctx_jobid);
-+				status = dmarcf_addrcpt(ctx, conf->conf_copyfailsto);
-+				if (status != MI_SUCCESS && conf->conf_dolog)
-+				{
-+					syslog(LOG_ERR, "%s: smfi_addrcpt() failed",
-+					       dfc->mctx_jobid);
-+				}
- 			}
- 		}
- 
-diff --git a/opendmarc/opendmarc.conf.5.in b/opendmarc/opendmarc.conf.5.in
-index bdf2550..9ee16ae 100644
---- a/opendmarc/opendmarc.conf.5.in
-+++ b/opendmarc/opendmarc.conf.5.in
-@@ -190,6 +190,14 @@ Sets the debug level to be requested from the milter library.  The
- default is 0.
- 
- .TP
-+.I OverrideMLM (string)
-+Specifies the path to a file that contains a list of hostnames, IP
-+addresses, and/or CIDR expressions identifying hosts that run
-+mailing lists. Mails from these systems will be accepted even if
-+all DMARC tests fail. Such cases will be reported as "override/
-+reason: MLM"
-+
-+.TP
- .I PidFile (string)
- Specifies the path to a file that should be created at process start
- containing the process ID.
-diff --git a/opendmarc/opendmarc.conf.sample b/opendmarc/opendmarc.conf.sample
-index 97b210f..fbfa49d 100644
---- a/opendmarc/opendmarc.conf.sample
-+++ b/opendmarc/opendmarc.conf.sample
-@@ -212,6 +212,17 @@
- #
- # MilterDebug 0
- 
-+##  OverrideMLM (path)
-+##  	default (none)
-+##
-+##  Specifies the path to a file that contains a list of hostnames, IP
-+##  addresses, and/or CIDR expressions identifying hosts that run
-+##  mailing lists. Mails from these systems will be accepted even if
-+##  all DMARC tests fail. Such cases will be reported as "override/
-+##  reason: MLM"
-+#
-+# OverrideMLM /usr/local/etc/opendmarc/overrideMLM.conf
-+
- ##  PidFile path
- ##  	default (none)
- ##
-diff --git a/opendmarc/opendmarc.h b/opendmarc/opendmarc.h
-index c1d6593..f9b1e0b 100644
---- a/opendmarc/opendmarc.h
-+++ b/opendmarc/opendmarc.h
-@@ -52,6 +52,12 @@
- #define	DMARC_RESULT_ACCEPT	2
- #define	DMARC_RESULT_TEMPFAIL	3
- #define	DMARC_RESULT_QUARANTINE	4
-+#define	DMARC_RESULT_OVRD_FORWARDED	5
-+#define	DMARC_RESULT_OVRD_SAMPLED_OUT	6
-+#define	DMARC_RESULT_OVRD_TRUSTED_FORWARDER	7
-+#define	DMARC_RESULT_OVRD_MAILING_LIST	8
-+#define	DMARC_RESULT_OVRD_LOCAL_POLICY	9
-+#define	DMARC_RESULT_OVRD_OTHER	10
- 
- /* prototypes, etc., exported for test.c */
- extern char *progname;
-diff --git a/reports/opendmarc-reports.in b/reports/opendmarc-reports.in
-index 2da1c31..a489c95 100755
---- a/reports/opendmarc-reports.in
-+++ b/reports/opendmarc-reports.in
-@@ -91,6 +91,8 @@ my $ipaddr;
- my $fromdomain;
- my $envdomain;
- my $dkimdomain;
-+my $reason;
-+my $comment;
- 
- my $repdest;
- 
-@@ -609,6 +611,8 @@ foreach (@$domainset)
- 	while ($dbi_a = $dbi_s->fetchrow_arrayref())
- 	{
- 		undef $msgid;
-+		undef $reason;
-+		undef $comment;
- 
- 		if (defined($dbi_a->[0]))
- 		{
-@@ -656,6 +660,12 @@ foreach (@$domainset)
- 			case 1	{ $dispstr = "reject"; }
- 			case 2	{ $dispstr = "none"; }
- 			case 4	{ $dispstr = "quarantine"; }
-+			case 5	{ $dispstr = "none"; $reason = "forwarded"; }
-+			case 6	{ $dispstr = "none"; $reason = "sampled_out"; }
-+			case 7	{ $dispstr = "none"; $reason = "trusted_forwarder"; }
-+			case 8	{ $dispstr = "none"; $reason = "mailing_list"; }
-+			case 9	{ $dispstr = "none"; $reason = "local_policy"; $comment = ""; }
-+			case 10	{ $dispstr = "none"; $reason = "other"; $comment = ""; }
- 			else	{ $dispstr = "unknown"; }
- 		}
- 
-@@ -697,6 +707,16 @@ foreach (@$domainset)
- 		print $tmpout "    <disposition>$dispstr</disposition>\n";
- 		print $tmpout "    <dkim>$align_dkimstr</dkim>\n";
- 		print $tmpout "    <spf>$align_spfstr</spf>\n";
-+		if (defined($reason))
-+		{
-+			print $tmpout "    <reason>\n";
-+			print $tmpout "      <type>$reason</type>\n";
-+			if (defined($comment))
-+			{
-+				print $tmpout "      <comment>$comment</$comment>\n";
-+			}
-+			print $tmpout "    </reason>\n";
-+		}
- 		print $tmpout "   </policy_evaluated>\n";
- 		print $tmpout "  </row>\n";
- 		print $tmpout "  <identifiers>\n";
diff --git a/network/opendmarc/patches/ticket193-fixed.patch b/network/opendmarc/patches/ticket193-fixed.patch
new file mode 100644
index 0000000000..7ccb1424c5
--- /dev/null
+++ b/network/opendmarc/patches/ticket193-fixed.patch
@@ -0,0 +1,177 @@
+Index: opendmarc/db/Makefile.am
+===================================================================
+--- opendmarc.orig/db/Makefile.am	2018-12-17 01:41:11.326335516 -0500
++++ opendmarc/db/Makefile.am	2018-12-17 01:41:11.318335516 -0500
+@@ -1,3 +1,3 @@
+ # Copyright (c) 2012, The Trusted Domain Project.  All rights reserved.
+ 
+-dist_doc_DATA = README.schema schema.mysql
++dist_doc_DATA = README.schema schema.mysql README.update-db-schema.mysql update-db-schema.mysql
+Index: opendmarc/db/README.update-db-schema.mysql
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ opendmarc/db/README.update-db-schema.mysql	2018-12-17 01:41:11.318335516 -0500
+@@ -0,0 +1,8 @@
++
++To update your database to the current state use this script like this:
++
++  mysql -u <user> -p <passwd> --force < update-db-schema.mysql
++
++You might receive up to four errors about duplicate keys - this is expected if your database
++already has these keys (because you used the MySQL schema in the db sub-direcory instead of
++the obsolete schema in the reports sub-dirctory).
+Index: opendmarc/db/schema.mysql
+===================================================================
+--- opendmarc.orig/db/schema.mysql	2018-12-17 01:41:11.326335516 -0500
++++ opendmarc/db/schema.mysql	2018-12-17 01:41:11.318335516 -0500
+@@ -5,6 +5,7 @@
+ 
+ CREATE DATABASE IF NOT EXISTS opendmarc;
+ USE opendmarc;
++SET TIME_ZONE='+00:00';
+ 
+ -- A table for mapping domain names and their DMARC policies to IDs
+ CREATE TABLE IF NOT EXISTS domains (
+Index: opendmarc/db/update-db-schema.mysql
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ opendmarc/db/update-db-schema.mysql	2018-12-17 01:41:11.318335516 -0500
+@@ -0,0 +1,12 @@
++use opendmarc;
++SET TIME_ZONE="+00:00";
++ALTER TABLE ipaddr MODIFY COLUMN addr VARCHAR(64) NOT NULL;
++DELETE FROM ipaddr WHERE addr = NULL;
++ALTER TABLE messages MODIFY COLUMN spf TINYINT NOT NULL;
++ALTER TABLE requests ALTER COLUMN locked SET DEFAULT '0';
++ALTER TABLE requests ALTER COLUMN lastsent SET DEFAULT '1970-01-01 00:00:01';
++ALTER TABLE requests ADD UNIQUE KEY domain (domain);
++ALTER TABLE requests ADD KEY lastsent (lastsent);
++ALTER TABLE messages ADD KEY date (date);
++ALTER TABLE signatures ADD KEY message (message);
++
+Index: opendmarc/reports/opendmarc-expire.in
+===================================================================
+--- opendmarc.orig/reports/opendmarc-expire.in	2018-12-17 01:41:11.326335516 -0500
++++ opendmarc/reports/opendmarc-expire.in	2018-12-17 01:41:11.318335516 -0500
+@@ -210,6 +210,17 @@
+ 	print STDERR "$progname: connected to database\n";
+ }
+ 
++# switch to UTC to have a defined date behaviour
++$dbi_s = $dbi_h->prepare("SET TIME_ZONE='+00:00'");
++
++if (!$dbi_s->execute())
++{
++	print STDERR "$progname: failed to change to UTC: " . $dbi_h->errstr . "\n";
++	$dbi_s->finish;
++	$dbi_h->disconnect;
++	exit(1);
++}
++
+ #
+ # Expire messages
+ #
+@@ -340,7 +351,7 @@
+ 	print STDERR "$progname: expiring request data older than $maxage days\n";
+ }
+ 
+-$dbi_s = $dbi_h->prepare("DELETE FROM requests WHERE lastsent <= DATE_SUB(CURRENT_TIMESTAMP(), INTERVAL ? DAY) AND NOT lastsent = '0000-00-00 00:00:00'");
++$dbi_s = $dbi_h->prepare("DELETE FROM requests WHERE lastsent <= DATE_SUB(CURRENT_TIMESTAMP(), INTERVAL ? DAY) AND NOT lastsent <= '1970-01-01 00:00:01'");
+ $rows = $dbi_s->execute($maxage);
+ if (!$rows)
+ {
+Index: opendmarc/reports/opendmarc-import.in
+===================================================================
+--- opendmarc.orig/reports/opendmarc-import.in	2018-12-17 01:41:11.326335516 -0500
++++ opendmarc/reports/opendmarc-import.in	2018-12-17 01:41:11.322335516 -0500
+@@ -207,14 +207,12 @@
+ 	$envfrom_id = get_table_id($envdomain, "domains");
+ 	$pdomain_id = get_table_id($pdomain, "domains");
+ 	$ipaddr_id = get_table_id($ipaddr, "ipaddr", "addr");
+-	$request_id = get_table_id($from_id, "requests", "domain");
+ 
+ 	if (!defined($rep_id) ||
+ 	    !defined($from_id) ||
+ 	    !defined($envfrom_id) ||
+ 	    !defined($pdomain_id) ||
+-	    !defined($ipaddr_id) ||
+-	    !defined($request_id))
++	    !defined($ipaddr_id))
+ 	{
+ 		return;
+ 	}
+ 
+@@ -278,41 +276,51 @@
+ 	}
+ 	$dbi_s->finish;
+ 
+-	if (get_value("requests", "locked", $request_id) != 1)
++	$dbi_t = $dbi_h->prepare("SELECT id FROM requests WHERE domain = ?");
++	if (!$dbi_t->execute($from_id))
+ 	{
+-		if (scalar @rua > 0)
++		print STDERR "$progname: failed to retrieve table ID: " . $dbi_h->errstr . "\n";
++		return undef;
++	}
++
++	undef $request_id;
++	while ($dbi_a = $dbi_t->fetchrow_arrayref())
++	{
++		if (defined($dbi_a->[0]))
+ 		{
+-			$repuri = join(",", @rua);
+-			$dbi_s = $dbi_h->prepare("UPDATE requests SET repuri = ? WHERE id = ?");
++			$request_id = $dbi_a->[0];
++		}
++	}
+ 
+-			if (!$dbi_s->execute($repuri, $request_id))
+-			{
+-				print STDERR "$progname: failed to update reporting URI for $fdomain: " . $dbi_h->errstr . "\n";
+-				$dbi_s->finish;
+-				return;
+-			}
++	$dbi_t->finish;
+ 
+-			$dbi_s->finish;
+-		}
+-		else
++	$repuri = join(",", @rua);
++
++	if (defined($request_id))
++	{
++		if (get_value("requests", "locked", $request_id) != 1)
+ 		{
+-			$dbi_s = $dbi_h->prepare("UPDATE requests SET repuri = NULL WHERE id = ?");
++			$dbi_s = $dbi_h->prepare("UPDATE requests SET domain = ?, repuri = ?, adkim = ?, aspf = ?, policy = ?, spolicy = ?, pct = ? WHERE id = ?");
+ 
+-			if (!$dbi_s->execute($request_id))
++			if (!$dbi_s->execute($from_id, $repuri, $adkim, $aspf, $p, $sp, $pct, $request_id))
+ 			{
+-				print STDERR "$progname: failed to update reporting URI for $fdomain: " . $dbi_h->errstr . "\n";
++				print STDERR "$progname: failed to update policy data for $fdomain: " . $dbi_h->errstr . "\n";
+ 				$dbi_s->finish;
+ 				return;
+ 			}
+-
+-			$dbi_s->finish;
+ 		}
++		else
++		{
++			print STDERR "$progname: policy data for $fdomain not updated, because they are locked\n";
++		}
++	}
++	else
++	{
++		$dbi_s = $dbi_h->prepare("insert requests SET domain = ?, repuri = ?, adkim = ?, aspf = ?, policy = ?, spolicy = ?, pct = ?");
+ 
+-		$dbi_s = $dbi_h->prepare("UPDATE requests SET adkim = ?, aspf = ?, policy = ?, spolicy = ?, pct = ? WHERE id = ?");
+-
+-		if (!$dbi_s->execute($adkim, $aspf, $p, $sp, $pct, $request_id))
++		if (!$dbi_s->execute($from_id, $repuri, $adkim, $aspf, $p, $sp, $pct))
+ 		{
+-			print STDERR "$progname: failed to update policy data for $fdomain: " . $dbi_h->errstr . "\n";
++			print STDERR "$progname: failed to insert policy data for $fdomain: " . $dbi_h->errstr . "\n";
+ 			$dbi_s->finish;
+ 			return;
+ 		}
diff --git a/network/opendmarc/patches/ticket193.patch b/network/opendmarc/patches/ticket193.patch
deleted file mode 100644
index 1ee1911174..0000000000
--- a/network/opendmarc/patches/ticket193.patch
+++ /dev/null
@@ -1,193 +0,0 @@
-Index: opendmarc/db/Makefile.am
-===================================================================
---- opendmarc.orig/db/Makefile.am	2018-12-17 01:41:11.326335516 -0500
-+++ opendmarc/db/Makefile.am	2018-12-17 01:41:11.318335516 -0500
-@@ -1,3 +1,3 @@
- # Copyright (c) 2012, The Trusted Domain Project.  All rights reserved.
- 
--dist_doc_DATA = README.schema schema.mysql
-+dist_doc_DATA = README.schema schema.mysql README.update-db-schema.mysql update-db-schema.mysql
-Index: opendmarc/db/README.update-db-schema.mysql
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ opendmarc/db/README.update-db-schema.mysql	2018-12-17 01:41:11.318335516 -0500
-@@ -0,0 +1,8 @@
-+
-+To update your database to the current state use this script like this:
-+
-+  mysql -u <user> -p <passwd> --force < update-db-schema.mysql
-+
-+You might receive up to four errors about duplicate keys - this is expected if your database
-+already has these keys (because you used the MySQL schema in the db sub-direcory instead of
-+the obsolete schema in the reports sub-dirctory).
-Index: opendmarc/db/schema.mysql
-===================================================================
---- opendmarc.orig/db/schema.mysql	2018-12-17 01:41:11.326335516 -0500
-+++ opendmarc/db/schema.mysql	2018-12-17 01:41:11.318335516 -0500
-@@ -5,6 +5,7 @@
- 
- CREATE DATABASE IF NOT EXISTS opendmarc;
- USE opendmarc;
-+SET TIME_ZONE='+00:00';
- 
- -- A table for mapping domain names and their DMARC policies to IDs
- CREATE TABLE IF NOT EXISTS domains (
-@@ -28,7 +29,7 @@
-         pct TINYINT NOT NULL,
-         locked TINYINT NOT NULL DEFAULT '0',
- 	firstseen TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
--	lastsent TIMESTAMP NOT NULL DEFAULT '0000-00-00 00:00:00',
-+	lastsent TIMESTAMP NOT NULL DEFAULT '1970-01-01 00:00:01',
- 
- 	PRIMARY KEY(id),
- 	KEY(lastsent),
-Index: opendmarc/db/update-db-schema.mysql
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ opendmarc/db/update-db-schema.mysql	2018-12-17 01:41:11.318335516 -0500
-@@ -0,0 +1,12 @@
-+use opendmarc;
-+SET TIME_ZONE="+00:00";
-+ALTER TABLE ipaddr MODIFY COLUMN addr VARCHAR(64) NOT NULL;
-+DELETE FROM ipaddr WHERE addr = NULL;
-+ALTER TABLE messages MODIFY COLUMN spf TINYINT NOT NULL;
-+ALTER TABLE requests ALTER COLUMN locked SET DEFAULT '0';
-+ALTER TABLE requests ALTER COLUMN lastsent SET DEFAULT '1970-01-01 00:00:01';
-+ALTER TABLE requests ADD UNIQUE KEY domain (domain);
-+ALTER TABLE requests ADD KEY lastsent (lastsent);
-+ALTER TABLE messages ADD KEY date (date);
-+ALTER TABLE signatures ADD KEY message (message);
-+
-Index: opendmarc/reports/opendmarc-expire.in
-===================================================================
---- opendmarc.orig/reports/opendmarc-expire.in	2018-12-17 01:41:11.326335516 -0500
-+++ opendmarc/reports/opendmarc-expire.in	2018-12-17 01:41:11.318335516 -0500
-@@ -210,6 +210,17 @@
- 	print STDERR "$progname: connected to database\n";
- }
- 
-+# switch to UTC to have a defined date behaviour
-+$dbi_s = $dbi_h->prepare("SET TIME_ZONE='+00:00'");
-+
-+if (!$dbi_s->execute())
-+{
-+	print STDERR "$progname: failed to change to UTC: " . $dbi_h->errstr . "\n";
-+	$dbi_s->finish;
-+	$dbi_h->disconnect;
-+	exit(1);
-+}
-+
- #
- # Expire messages
- #
-@@ -340,7 +351,7 @@
- 	print STDERR "$progname: expiring request data older than $maxage days\n";
- }
- 
--$dbi_s = $dbi_h->prepare("DELETE FROM requests WHERE lastsent <= DATE_SUB(CURRENT_TIMESTAMP(), INTERVAL ? DAY) AND NOT lastsent = '0000-00-00 00:00:00'");
-+$dbi_s = $dbi_h->prepare("DELETE FROM requests WHERE lastsent <= DATE_SUB(CURRENT_TIMESTAMP(), INTERVAL ? DAY) AND NOT lastsent <= '1970-01-01 00:00:01'");
- $rows = $dbi_s->execute($maxage);
- if (!$rows)
- {
-Index: opendmarc/reports/opendmarc-import.in
-===================================================================
---- opendmarc.orig/reports/opendmarc-import.in	2018-12-17 01:41:11.326335516 -0500
-+++ opendmarc/reports/opendmarc-import.in	2018-12-17 01:41:11.322335516 -0500
-@@ -207,20 +207,18 @@
- 	$envfrom_id = get_table_id($envdomain, "domains");
- 	$pdomain_id = get_table_id($pdomain, "domains");
- 	$ipaddr_id = get_table_id($ipaddr, "ipaddr", "addr");
--	$request_id = get_table_id($from_id, "requests", "domain");
- 
- 	if (!defined($rep_id) ||
- 	    !defined($from_id) ||
- 	    !defined($envfrom_id) ||
- 	    !defined($pdomain_id) ||
--	    !defined($ipaddr_id) ||
--	    !defined($request_id))
-+	    !defined($ipaddr_id))
- 	{
- 		return;
- 	}
- 
--	$dbi_s = $dbi_h->prepare("INSERT INTO messages (date, jobid, reporter, policy, disp, ip, env_domain, from_domain, spf, align_spf, align_dkim, sigcount) VALUES(FROM_UNIXTIME(?), ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)");
--	if (!$dbi_s->execute($received, $jobid, $rep_id, $policy, $action, $ipaddr_id, $envfrom_id, $from_id, $spf, $align_spf, $align_dkim, $sigcount))
-+	$dbi_s = $dbi_h->prepare("INSERT INTO messages (date, jobid, reporter, policy, disp, ip, env_domain, from_domain, policy_domain, spf, align_spf, align_dkim, sigcount) VALUES(FROM_UNIXTIME(?), ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)");
-+	if (!$dbi_s->execute($received, $jobid, $rep_id, $policy, $action, $ipaddr_id, $envfrom_id, $from_id, $pdomain_id, $spf, $align_spf, $align_dkim, $sigcount))
- 	{
- 		print STDERR "$progname: failed to insert message: " . $dbi_h->errstr . "\n";
- 		return;
-@@ -278,41 +276,51 @@
- 	}
- 	$dbi_s->finish;
- 
--	if (get_value("requests", "locked", $request_id) != 1)
-+	$dbi_t = $dbi_h->prepare("SELECT id FROM requests WHERE domain = ?");
-+	if (!$dbi_t->execute($from_id))
- 	{
--		if (scalar @rua > 0)
-+		print STDERR "$progname: failed to retrieve table ID: " . $dbi_h->errstr . "\n";
-+		return undef;
-+	}
-+
-+	undef $request_id;
-+	while ($dbi_a = $dbi_t->fetchrow_arrayref())
-+	{
-+		if (defined($dbi_a->[0]))
- 		{
--			$repuri = join(",", @rua);
--			$dbi_s = $dbi_h->prepare("UPDATE requests SET repuri = ? WHERE id = ?");
-+			$request_id = $dbi_a->[0];
-+		}
-+	}
- 
--			if (!$dbi_s->execute($repuri, $request_id))
--			{
--				print STDERR "$progname: failed to update reporting URI for $fdomain: " . $dbi_h->errstr . "\n";
--				$dbi_s->finish;
--				return;
--			}
-+	$dbi_t->finish;
- 
--			$dbi_s->finish;
--		}
--		else
-+	$repuri = join(",", @rua);
-+
-+	if (defined($request_id))
-+	{
-+		if (get_value("requests", "locked", $request_id) != 1)
- 		{
--			$dbi_s = $dbi_h->prepare("UPDATE requests SET repuri = NULL WHERE id = ?");
-+			$dbi_s = $dbi_h->prepare("UPDATE requests SET domain = ?, repuri = ?, adkim = ?, aspf = ?, policy = ?, spolicy = ?, pct = ? WHERE id = ?");
- 
--			if (!$dbi_s->execute($request_id))
-+			if (!$dbi_s->execute($from_id, $repuri, $adkim, $aspf, $p, $sp, $pct, $request_id))
- 			{
--				print STDERR "$progname: failed to update reporting URI for $fdomain: " . $dbi_h->errstr . "\n";
-+				print STDERR "$progname: failed to update policy data for $fdomain: " . $dbi_h->errstr . "\n";
- 				$dbi_s->finish;
- 				return;
- 			}
--
--			$dbi_s->finish;
- 		}
-+		else
-+		{
-+			print STDERR "$progname: policy data for $fdomain not updated, because they are locked\n";
-+		}
-+	}
-+	else
-+	{
-+		$dbi_s = $dbi_h->prepare("insert requests SET domain = ?, repuri = ?, adkim = ?, aspf = ?, policy = ?, spolicy = ?, pct = ?");
- 
--		$dbi_s = $dbi_h->prepare("UPDATE requests SET adkim = ?, aspf = ?, policy = ?, spolicy = ?, pct = ? WHERE id = ?");
--
--		if (!$dbi_s->execute($adkim, $aspf, $p, $sp, $pct, $request_id))
-+		if (!$dbi_s->execute($from_id, $repuri, $adkim, $aspf, $p, $sp, $pct))
- 		{
--			print STDERR "$progname: failed to update policy data for $fdomain: " . $dbi_h->errstr . "\n";
-+			print STDERR "$progname: failed to insert policy data for $fdomain: " . $dbi_h->errstr . "\n";
- 			$dbi_s->finish;
- 			return;
- 		}
diff --git a/network/opendmarc/patches/ticket203.patch b/network/opendmarc/patches/ticket203.patch
deleted file mode 100644
index 8aa5113176..0000000000
--- a/network/opendmarc/patches/ticket203.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/libopendmarc/opendmarc_policy.c b/libopendmarc/opendmarc_policy.c
-index 862c449..8048ec3 100644
---- a/libopendmarc/opendmarc_policy.c
-+++ b/libopendmarc/opendmarc_policy.c
-@@ -1087,6 +1087,10 @@ opendmarc_policy_parse_dmarc(DMARC_POLICY_T *pctx, u_char *domain, u_char *recor
- 			/*
- 			 * A possibly comma delimited list of URI of where to send reports.
- 			 */
-+
-+			if (pctx->rua_list != NULL)
-+				return DMARC_PARSE_ERROR_BAD_VALUE;
-+
- 			for (xp = vp; *xp != '\0'; )
- 			{
- 				u_char	xbuf[256];
-@@ -1115,6 +1119,10 @@ opendmarc_policy_parse_dmarc(DMARC_POLICY_T *pctx, u_char *domain, u_char *recor
- 			 * A possibly comma delimited list of URI of where to send 
- 			 * MARF reports.
- 			 */
-+
-+			if (pctx->ruf_list != NULL)
-+				return DMARC_PARSE_ERROR_BAD_VALUE;
-+
- 			for (xp = vp; *xp != '\0'; )
- 			{
- 				u_char	xbuf[256];
diff --git a/network/opendmarc/patches/ticket207-fixed.patch b/network/opendmarc/patches/ticket207-fixed.patch
new file mode 100644
index 0000000000..149a676c76
--- /dev/null
+++ b/network/opendmarc/patches/ticket207-fixed.patch
@@ -0,0 +1,49 @@
+Index: opendmarc/reports/opendmarc-reports.in
+===================================================================
+--- opendmarc.orig/reports/opendmarc-reports.in	2018-12-17 01:41:49.094337107 -0500
++++ opendmarc/reports/opendmarc-reports.in	2018-12-17 01:41:49.090337107 -0500
+@@ -65,6 +65,7 @@
+ my $forcedomain;
+ my @skipdomains;
+ 
++my $poldomain;
+ my $policy;
+ my $spolicy;
+ my $policystr;
+@@ -441,7 +442,7 @@
+ 		next;
+ 	}
+ 
+-	$dbi_s = $dbi_h->prepare("SELECT repuri, adkim, aspf, policy, spolicy, pct, UNIX_TIMESTAMP(lastsent) FROM requests WHERE domain = ?");
++	$dbi_s = $dbi_h->prepare("SELECT repuri, adkim, aspf, requests.policy, spolicy, pct, UNIX_TIMESTAMP(lastsent), domains.name FROM requests JOIN messages ON messages.from_domain=requests.domain LEFT JOIN domains ON messages.policy_domain = domains.id WHERE domain = ? GROUP BY policy_domain");
+ 	if (!$dbi_s->execute($domainid))
+ 	{
+ 		print STDERR "$progname: can't get reporting URI for domain $domain: " . $dbi_h->errstr . "\n";
+@@ -451,6 +452,7 @@
+ 	}
+ 
+ 	undef $repuri;
++	$poldomain=$domain;
+ 
+ 	while ($dbi_a = $dbi_s->fetchrow_arrayref())
+ 	{
+@@ -482,6 +484,10 @@
+ 		{
+ 			$lastsent = $dbi_a->[6];
+ 		}
++		if (defined($dbi_a->[7]))
++		{
++			$poldomain = $dbi_a->[7];
++		}
+ 	}
+ 
+ 	$dbi_s->finish;
+@@ -564,7 +570,7 @@
+ 	print $tmpout "    </report_metadata>\n";
+ 
+ 	print $tmpout "    <policy_published>\n";
+-	print $tmpout "        <domain>$domain</domain>\n";
++	print $tmpout "        <domain>$poldomain</domain>\n";
+ 	print $tmpout "        <adkim>$adkimstr</adkim>\n";
+ 	print $tmpout "        <aspf>$aspfstr</aspf>\n";
+ 	print $tmpout "        <p>$policystr</p>\n";
diff --git a/network/opendmarc/patches/ticket207.patch b/network/opendmarc/patches/ticket207.patch
deleted file mode 100644
index e86b8c7704..0000000000
--- a/network/opendmarc/patches/ticket207.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-Index: opendmarc/reports/opendmarc-reports.in
-===================================================================
---- opendmarc.orig/reports/opendmarc-reports.in	2018-12-17 01:41:49.094337107 -0500
-+++ opendmarc/reports/opendmarc-reports.in	2018-12-17 01:41:49.090337107 -0500
-@@ -65,6 +65,7 @@
- my $forcedomain;
- my @skipdomains;
- 
-+my $poldomain;
- my $policy;
- my $spolicy;
- my $policystr;
-@@ -441,7 +442,7 @@
- 		next;
- 	}
- 
--	$dbi_s = $dbi_h->prepare("SELECT repuri, adkim, aspf, policy, spolicy, pct, UNIX_TIMESTAMP(lastsent) FROM requests WHERE domain = ?");
-+	$dbi_s = $dbi_h->prepare("SELECT repuri, adkim, aspf, requests.policy, spolicy, pct, UNIX_TIMESTAMP(lastsent), domains.name FROM requests JOIN messages ON messages.from_domain=requests.domain LEFT JOIN domains ON messages.policy_domain = domains.id WHERE domain = ? GROUP BY policy_domain");
- 	if (!$dbi_s->execute($domainid))
- 	{
- 		print STDERR "$progname: can't get reporting URI for domain $domain: " . $dbi_h->errstr . "\n";
-@@ -451,6 +452,7 @@
- 	}
- 
- 	undef $repuri;
-+	$poldomain=$domain;
- 
- 	while ($dbi_a = $dbi_s->fetchrow_arrayref())
- 	{
-@@ -482,6 +484,10 @@
- 		{
- 			$lastsent = $dbi_a->[6];
- 		}
-+		if (defined($dbi_a->[7]))
-+		{
-+			$poldomain = $dbi_a->[7];
-+		}
- 	}
- 
- 	$dbi_s->finish;
-@@ -564,7 +570,7 @@
- 	print $tmpout " </report_metadata>\n";
- 
- 	print $tmpout " <policy_published>\n";
--	print $tmpout "  <domain>$domain</domain>\n";
-+	print $tmpout "  <domain>$poldomain</domain>\n";
- 	print $tmpout "  <adkim>$adkimstr</adkim>\n";
- 	print $tmpout "  <aspf>$aspfstr</aspf>\n";
- 	print $tmpout "  <p>$policystr</p>\n";
diff --git a/network/opendmarc/patches/ticket208-fixed.patch b/network/opendmarc/patches/ticket208-fixed.patch
new file mode 100644
index 0000000000..e44589e471
--- /dev/null
+++ b/network/opendmarc/patches/ticket208-fixed.patch
@@ -0,0 +1,115 @@
+diff -ur opendmarc-1.3.2/opendmarc/opendmarc.c opendmarc-1.3.2_fix/opendmarc/opendmarc.c
+--- opendmarc-1.3.2/opendmarc/opendmarc.c	2017-03-04 14:28:39.000000000 +0100
++++ opendmarc-1.3.2_fix/opendmarc/opendmarc.c	2017-03-27 18:11:14.977304726 +0200
+@@ -168,6 +168,7 @@
+ 	char *			conf_ignorelist;
+ 	char **			conf_trustedauthservids;
+ 	char **			conf_ignoredomains;
++	char **			conf_ignorereceivers;
+ 	struct list *		conf_domainwhitelist;
+ 	unsigned int		conf_domainwhitelisthashcount;
+ };
+@@ -1226,6 +1227,11 @@
+ 		if (str != NULL)
+ 			dmarcf_mkarray(str, ",", &conf->conf_ignoredomains);
+ 
++		str = NULL;
++		(void) config_get(data, "IgnoreMailTo", &str, sizeof str);
++		if (str != NULL)
++			dmarcf_mkarray(str, ",", &conf->conf_ignorereceivers);
++
+ 		(void) config_get(data, "AuthservIDWithJobID",
+ 		                  &conf->conf_authservidwithjobid,
+ 		                  sizeof conf->conf_authservidwithjobid);
+@@ -2015,6 +2021,7 @@
+ mlfi_eom(SMFICTX *ctx)
+ {
+ 	_Bool wspf = FALSE;
++	int skiphistory;
+ 	int c;
+ 	int pc;
+ 	int policy;
+@@ -3147,7 +3154,34 @@
+ 	**  Record activity in the history file.
+ 	*/
+ 
+-	if (conf->conf_historyfile != NULL &&
++	skiphistory = 0;
++	if (conf->conf_ignorereceivers != NULL)
++	{
++		struct dmarcf_header *to = dmarcf_findheader(dfc, "To", 0);
++		if (to != NULL)
++		{
++			char *val = to->hdr_value;
++			while (*val && !skiphistory)
++			{
++				memset(addrbuf, '\0', sizeof addrbuf);
++				strncpy(addrbuf, val, sizeof addrbuf - 1);
++				status = dmarcf_mail_parse(addrbuf, &user, &domain);
++				if (status == 0 && user != NULL && domain != NULL)
++				{
++					snprintf(replybuf, sizeof replybuf - 1, "%s@%s", user, domain);
++					if(dmarcf_match(replybuf, conf->conf_ignorereceivers, TRUE))
++					{
++						skiphistory = 1;
++					}
++				}
++				while(*val && *val != ',' && *val != ';')
++					++val;
++				if(*val)
++					++val;
++			}
++		}
++	}
++	if (!skiphistory && conf->conf_historyfile != NULL &&
+ 	    (conf->conf_recordall || ostatus != DMARC_DNS_ERROR_NO_RECORD))
+ 	{
+ 		FILE *f;
+diff -ur opendmarc-1.3.2/opendmarc/opendmarc.conf.5.in opendmarc-1.3.2_fix/opendmarc/opendmarc.conf.5.in
+--- opendmarc-1.3.2/opendmarc/opendmarc.conf.5.in	2016-12-18 08:50:34.000000000 +0100
++++ opendmarc-1.3.2_fix/opendmarc/opendmarc.conf.5.in	2017-03-27 17:00:14.424955664 +0200
+@@ -185,6 +185,13 @@
+ no mail is ignored.
+ 
+ .TP
++.I IgnoreMailTo (string)
++Gives a list of mail addresses which aren't entered into the history file.
++This is useful to prevent exchanging single message reports.  The
++list should be comma-separated.  Matching against this list is
++case-insensitive.  The default is an empty list, meaning no mail is ignored.
++
++.TP
+ .I MilterDebug (integer)
+ Sets the debug level to be requested from the milter library.  The
+ default is 0.
+diff -ur opendmarc-1.3.2/opendmarc/opendmarc-config.h opendmarc-1.3.2_fix/opendmarc/opendmarc-config.h
+--- opendmarc-1.3.2/opendmarc/opendmarc-config.h	2016-12-18 08:50:34.000000000 +0100
++++ opendmarc-1.3.2_fix/opendmarc/opendmarc-config.h	2017-03-27 17:39:01.727649907 +0200
+@@ -35,6 +35,7 @@
+ 	{ "IgnoreAuthenticatedClients",	CONFIG_TYPE_BOOLEAN,	FALSE },
+ 	{ "IgnoreHosts",		CONFIG_TYPE_STRING,	FALSE },
+ 	{ "IgnoreMailFrom",		CONFIG_TYPE_STRING,	FALSE },
++	{ "IgnoreMailTo",		CONFIG_TYPE_STRING,	FALSE },
+ 	{ "MilterDebug",		CONFIG_TYPE_INTEGER,	FALSE },
+ 	{ "PidFile",			CONFIG_TYPE_STRING,	FALSE },
+ 	{ "PublicSuffixList",		CONFIG_TYPE_STRING,	FALSE },
+diff -ur opendmarc-1.3.2/opendmarc/opendmarc.conf.sample opendmarc-1.3.2_fix/opendmarc/opendmarc.conf.sample
+--- opendmarc-1.3.2/opendmarc/opendmarc.conf.sample	2017-03-04 14:28:39.000000000 +0100
++++ opendmarc-1.3.2_fix/opendmarc/opendmarc.conf.sample	2017-03-27 17:39:32.594647158 +0200
+@@ -205,6 +205,16 @@
+ #
+ # IgnoreMailFrom example.com
+ 
++##  IgnoreMailTo email[,...]
++##  	default (none)
++##
++##  Gives a list of mail addresses which aren't entered into the history file.
++##  This is useful to prevent exchanging mutual message reports.  The
++##  list should be comma-separated.  Matching against this list is
++##  case-insensitive.  The default is an empty list, meaning no mail is ignored.
++#
++# IgnoreMailTo dmarc-ruf@example.com
++
+ ##  MilterDebug (integer)
+ ##  	default 0
+ ##
diff --git a/network/opendmarc/patches/ticket208.patch b/network/opendmarc/patches/ticket208.patch
deleted file mode 100644
index fc8c6455d8..0000000000
--- a/network/opendmarc/patches/ticket208.patch
+++ /dev/null
@@ -1,116 +0,0 @@
-diff -ur opendmarc-1.3.2/opendmarc/opendmarc.c opendmarc-1.3.2_fix/opendmarc/opendmarc.c
---- opendmarc-1.3.2/opendmarc/opendmarc.c	2017-03-04 14:28:39.000000000 +0100
-+++ opendmarc-1.3.2_fix/opendmarc/opendmarc.c	2017-03-27 18:11:14.977304726 +0200
-@@ -168,7 +168,8 @@
- 	char *			conf_ignorelist;
- 	char **			conf_trustedauthservids;
- 	char **			conf_ignoredomains;
-	struct list *		conf_overridemlm;
-+	char **			conf_ignorereceivers;
- };
- 
- /* LIST -- basic linked list of strings */
-@@ -1226,6 +1227,11 @@
- 		if (str != NULL)
- 			dmarcf_mkarray(str, &conf->conf_ignoredomains);
- 
-+		str = NULL;
-+		(void) config_get(data, "IgnoreMailTo", &str, sizeof str);
-+		if (str != NULL)
-+			dmarcf_mkarray(str, &conf->conf_ignorereceivers);
-+
- 		(void) config_get(data, "AuthservIDWithJobID",
- 		                  &conf->conf_authservidwithjobid,
- 		                  sizeof conf->conf_authservidwithjobid);
-@@ -2015,6 +2021,7 @@
- mlfi_eom(SMFICTX *ctx)
- {
- 	_Bool wspf = FALSE;
-+	int skiphistory;
- 	int c;
- 	int pc;
- 	int policy;
-@@ -3147,7 +3154,34 @@
- 	**  Record activity in the history file.
- 	*/
- 
--	if (conf->conf_historyfile != NULL &&
-+	skiphistory = 0;
-+	if (conf->conf_ignorereceivers != NULL)
-+	{
-+		struct dmarcf_header *to = dmarcf_findheader(dfc, "To", 0);
-+		if (to != NULL)
-+		{
-+			char *val = to->hdr_value;
-+			while (*val && !skiphistory)
-+			{
-+				memset(addrbuf, '\0', sizeof addrbuf);
-+				strncpy(addrbuf, val, sizeof addrbuf - 1);
-+				status = dmarcf_mail_parse(addrbuf, &user, &domain);
-+				if (status == 0 && user != NULL && domain != NULL)
-+				{
-+					snprintf(replybuf, sizeof replybuf - 1, "%s@%s", user, domain);
-+					if(dmarcf_match(replybuf, conf->conf_ignorereceivers, TRUE))
-+					{
-+						skiphistory = 1;
-+					}
-+				}
-+				while(*val && *val != ',' && *val != ';')
-+					++val;
-+				if(*val)
-+					++val;
-+			}
-+		}
-+	}
-+	if (!skiphistory && conf->conf_historyfile != NULL &&
- 	    (conf->conf_recordall || ostatus != DMARC_DNS_ERROR_NO_RECORD))
- 	{
- 		FILE *f;
-diff -ur opendmarc-1.3.2/opendmarc/opendmarc.conf.5.in opendmarc-1.3.2_fix/opendmarc/opendmarc.conf.5.in
---- opendmarc-1.3.2/opendmarc/opendmarc.conf.5.in	2016-12-18 08:50:34.000000000 +0100
-+++ opendmarc-1.3.2_fix/opendmarc/opendmarc.conf.5.in	2017-03-27 17:00:14.424955664 +0200
-@@ -185,6 +185,13 @@
- no mail is ignored.
- 
- .TP
-+.I IgnoreMailTo (string)
-+Gives a list of mail addresses which aren't entered into the history file.
-+This is useful to prevent exchanging single message reports.  The
-+list should be comma-separated.  Matching against this list is
-+case-insensitive.  The default is an empty list, meaning no mail is ignored.
-+
-+.TP
- .I MilterDebug (integer)
- Sets the debug level to be requested from the milter library.  The
- default is 0.
-diff -ur opendmarc-1.3.2/opendmarc/opendmarc-config.h opendmarc-1.3.2_fix/opendmarc/opendmarc-config.h
---- opendmarc-1.3.2/opendmarc/opendmarc-config.h	2016-12-18 08:50:34.000000000 +0100
-+++ opendmarc-1.3.2_fix/opendmarc/opendmarc-config.h	2017-03-27 17:39:01.727649907 +0200
-@@ -35,6 +35,7 @@
- 	{ "IgnoreAuthenticatedClients",	CONFIG_TYPE_BOOLEAN,	FALSE },
- 	{ "IgnoreHosts",		CONFIG_TYPE_STRING,	FALSE },
- 	{ "IgnoreMailFrom",		CONFIG_TYPE_STRING,	FALSE },
-+	{ "IgnoreMailTo",		CONFIG_TYPE_STRING,	FALSE },
- 	{ "MilterDebug",		CONFIG_TYPE_INTEGER,	FALSE },
- 	{ "PidFile",			CONFIG_TYPE_STRING,	FALSE },
- 	{ "PublicSuffixList",		CONFIG_TYPE_STRING,	FALSE },
-diff -ur opendmarc-1.3.2/opendmarc/opendmarc.conf.sample opendmarc-1.3.2_fix/opendmarc/opendmarc.conf.sample
---- opendmarc-1.3.2/opendmarc/opendmarc.conf.sample	2017-03-04 14:28:39.000000000 +0100
-+++ opendmarc-1.3.2_fix/opendmarc/opendmarc.conf.sample	2017-03-27 17:39:32.594647158 +0200
-@@ -205,6 +205,16 @@
- #
- # IgnoreMailFrom example.com
- 
-+##  IgnoreMailTo email[,...]
-+##  	default (none)
-+##
-+##  Gives a list of mail addresses which aren't entered into the history file.
-+##  This is useful to prevent exchanging mutual message reports.  The
-+##  list should be comma-separated.  Matching against this list is
-+##  case-insensitive.  The default is an empty list, meaning no mail is ignored.
-+#
-+# IgnoreMailTo dmarc-ruf@example.com
-+
- ##  MilterDebug (integer)
- ##  	default 0
- ##
diff --git a/network/opendmarc/patches/ticket227.patch b/network/opendmarc/patches/ticket227.patch
deleted file mode 100644
index b2786aef61..0000000000
--- a/network/opendmarc/patches/ticket227.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-diff --git a/libopendmarc/opendmarc_policy.c b/libopendmarc/opendmarc_policy.c
-index 36412e4..f151fda 100644
---- a/libopendmarc/opendmarc_policy.c
-+++ b/libopendmarc/opendmarc_policy.c
-@@ -1058,7 +1058,7 @@ opendmarc_policy_parse_dmarc(DMARC_POLICY_T *pctx, u_char *domain, u_char *recor
- 					*yp = '\0';
- 
- 				xp = opendmarc_util_cleanup(xp, xbuf, sizeof xbuf);
--				if (xp != NULL || strlen((char *)xp) > 0)
-+				if (xp != NULL && strlen((char *)xp) > 0)
- 				{
- 					/*
- 					 * Be generous. Accept, for example, "rf=a, aspf=afrf or any
-@@ -1100,7 +1100,7 @@ opendmarc_policy_parse_dmarc(DMARC_POLICY_T *pctx, u_char *domain, u_char *recor
- 					*yp = '\0';
- 
- 				xp = opendmarc_util_cleanup(xp, xbuf, sizeof xbuf);
--				if (xp != NULL || strlen((char *)xp) > 0)
-+				if (xp != NULL && strlen((char *)xp) > 0)
- 				{
- 					pctx->rua_list = opendmarc_util_pushargv(xp, pctx->rua_list,
- 										&(pctx->rua_cnt));
-@@ -1132,7 +1132,7 @@ opendmarc_policy_parse_dmarc(DMARC_POLICY_T *pctx, u_char *domain, u_char *recor
- 					*yp = '\0';
- 
- 				xp = opendmarc_util_cleanup(xp, xbuf, sizeof xbuf);
--				if (xp != NULL || strlen((char *)xp) > 0)
-+				if (xp != NULL && strlen((char *)xp) > 0)
- 				{
- 					pctx->ruf_list = opendmarc_util_pushargv(xp, pctx->ruf_list,
- 										&(pctx->ruf_cnt));
-@@ -1159,7 +1159,7 @@ opendmarc_policy_parse_dmarc(DMARC_POLICY_T *pctx, u_char *domain, u_char *recor
- 					*yp = '\0';
- 
- 				xp = opendmarc_util_cleanup(xp, xbuf, sizeof xbuf);
--				if (xp != NULL || strlen((char *)xp) > 0)
-+				if (xp != NULL && strlen((char *)xp) > 0)
- 				{
- 					switch ((int)*xp)
- 					{
diff --git a/network/opendmarc/patches/z00_ticket138_v3.patch b/network/opendmarc/patches/z00_ticket138_v3.patch
deleted file mode 100644
index 4bcd4f92b4..0000000000
--- a/network/opendmarc/patches/z00_ticket138_v3.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-diff --git a/opendmarc/opendmarc-config.h b/opendmarc/opendmarc-config.h
-index 28f605e..ff4983d 100644
---- a/opendmarc/opendmarc-config.h
-+++ b/opendmarc/opendmarc-config.h
-@@ -32,6 +32,7 @@ struct configdef dmarcf_config[] =
- 	{ "FailureReportsOnNone",	CONFIG_TYPE_BOOLEAN,	FALSE },
- 	{ "FailureReportsSentBy",	CONFIG_TYPE_STRING,	FALSE },
- 	{ "HistoryFile",		CONFIG_TYPE_STRING,	FALSE },
-+	{ "HoldQuarantinedMessages",	CONFIG_TYPE_BOOLEAN,	FALSE },
- 	{ "IgnoreAuthenticatedClients",	CONFIG_TYPE_BOOLEAN,	FALSE },
- 	{ "IgnoreHosts",		CONFIG_TYPE_STRING,	FALSE },
- 	{ "IgnoreMailFrom",		CONFIG_TYPE_STRING,	FALSE },
-diff --git a/opendmarc/opendmarc.c b/opendmarc/opendmarc.c
-index 0179f4d..5aade55 100644
---- a/opendmarc/opendmarc.c
-+++ b/opendmarc/opendmarc.c
-@@ -155,6 +155,7 @@ struct dmarcf_config
- 	_Bool			conf_spfselfvalidate;
- #endif /* WITH_SPF */
- 	_Bool			conf_ignoreauthclients;
-+	_Bool			conf_holdquarantinedmessages;
- 	unsigned int		conf_refcnt;
- 	unsigned int		conf_dnstimeout;
- 	struct config *		conf_data;
-@@ -1297,6 +1298,10 @@ dmarcf_config_load(struct config *data, struct dmarcf_config *conf,
- 		                  &conf->conf_recordall,
- 		                  sizeof conf->conf_recordall);
- 
-+		(void) config_get(data, "HoldQuarantinedMessages",
-+		                  &conf->conf_holdquarantinedmessages,
-+		                  sizeof conf->conf_holdquarantinedmessages);
-+
- 		(void) config_get(data, "IgnoreAuthenticatedClients",
- 		                  &conf->conf_ignoreauthclients,
- 		                  sizeof conf->conf_ignoreauthclients);
-@@ -3064,7 +3069,8 @@ mlfi_eom(SMFICTX *ctx)
- 		}
- 		else
- 		{
--			if (conf->conf_rejectfail && random() % 100 < pct)
-+			if (conf->conf_rejectfail && random() % 100 < pct &&
-+			    conf->conf_holdquarantinedmessages)
- 			{
- 				snprintf(replybuf, sizeof replybuf,
- 					 "quarantined by DMARC policy for %s",
-diff --git a/opendmarc/opendmarc.conf.5.in b/opendmarc/opendmarc.conf.5.in
-index 9ee16ae..565e992 100644
---- a/opendmarc/opendmarc.conf.5.in
-+++ b/opendmarc/opendmarc.conf.5.in
-@@ -167,6 +167,13 @@ rather periodically imported into a relational database from which the
- aggregate reports can be extracted.
- 
- .TP
-+.I HoldQuarantinedMessages (Boolean)
-+If set to true, causes mail that fails the DMARC tests to get hold
-+by the MTA if the purported sender of the message has a policy of
-+"quarantine". Does nothing if the policy is either "none" or "reject".
-+The default is "true".
-+
-+.TP
- .I IgnoreAuthenticatedClients (Boolean)
- If set, causes mail from authenticated clients (i.e., those that used
- SMTP AUTH) to be ignored by the filter.  The default is "false".
-diff --git a/opendmarc/opendmarc.conf.sample b/opendmarc/opendmarc.conf.sample
-index fbfa49d..a2e1da3 100644
---- a/opendmarc/opendmarc.conf.sample
-+++ b/opendmarc/opendmarc.conf.sample
-@@ -177,6 +177,15 @@
- #
- # HistoryFile /var/run/opendmarc.dat
- 
-+##  HoldQuarantinedMessages { true | false }
-+##  	default "true"
-+##
-+##  If set to true, causes mail that fails the DMARC tests to get hold
-+##  by the MTA if the purported sender of the message has a policy of
-+##  "quarantine". Does nothing if the policy is either "none" or "reject".
-+#
-+# HoldQuarantinedMessages true
-+
- ##  IgnoreAuthenticatedClients { true | false }
- ##  	default "false"
- ##
diff --git a/network/opendmarc/patches/z06_use_envdomain_SPF_logging.patch b/network/opendmarc/patches/z06_use_envdomain_SPF_logging.patch
deleted file mode 100644
index 3a702fe8c0..0000000000
--- a/network/opendmarc/patches/z06_use_envdomain_SPF_logging.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/opendmarc/opendmarc.c b/opendmarc/opendmarc.c
-index f5c30f9..29f3f93 100644
---- a/opendmarc/opendmarc.c
-+++ b/opendmarc/opendmarc.c
-@@ -2542,7 +2542,7 @@ mlfi_eom(SMFICTX *ctx)
- 				&used_mfrom);
- 			if (used_mfrom == TRUE)
- 			{
--				use_domain = dfc->mctx_envfrom;
-+				use_domain = dfc->mctx_envdomain;
- 				spf_mode   = DMARC_POLICY_SPF_ORIGIN_MAILFROM;
- 			}
- 			else
diff --git a/network/openfire/openfire.SlackBuild b/network/openfire/openfire.SlackBuild
index 44fb36eabb..e7921ffb25 100644
--- a/network/openfire/openfire.SlackBuild
+++ b/network/openfire/openfire.SlackBuild
@@ -1,18 +1,28 @@
-#!/bin/sh
+#!/bin/bash
 #
 # Slackware build script for openfire
 # Written by Mário Antunes (mariolpantunes@gmail.com)
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=openfire
 VERSION=${VERSION:-4.1.4}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 SRCVER=$(echo $VERSION | tr . _)
 
 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}
@@ -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/network/openfire/openfire.info b/network/openfire/openfire.info
index 25817fc247..b33415c3ca 100644
--- a/network/openfire/openfire.info
+++ b/network/openfire/openfire.info
@@ -5,6 +5,6 @@ DOWNLOAD="https://github.com/igniterealtime/Openfire/releases/download/v4.1.4/op
 MD5SUM="64842b2853db006165a67c80dc91edc7"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="jdk"
+REQUIRES="zulu-openjdk8"
 MAINTAINER="Mário Antunes"
 EMAIL="mariolpantunes@gmail.com"
diff --git a/network/openfortivpn/openfortivpn.SlackBuild b/network/openfortivpn/openfortivpn.SlackBuild
index b0dd518e5e..bcc28fe805 100644
--- a/network/openfortivpn/openfortivpn.SlackBuild
+++ b/network/openfortivpn/openfortivpn.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for openfortivpn
 
@@ -21,11 +21,17 @@
 #  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+# Maintained by Gerardo Zamudio <gerardo.zamudio@linux.com> Mexico City, Mexico
+#
+
+cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=openfortivpn
-VERSION=${VERSION:-1.1.4}
+VERSION=${VERSION:-1.20.3}
 BUILD=${BUILD:-1}
 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}
@@ -104,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/network/openfortivpn/openfortivpn.info b/network/openfortivpn/openfortivpn.info
index 3bae8f084d..2c01532cce 100644
--- a/network/openfortivpn/openfortivpn.info
+++ b/network/openfortivpn/openfortivpn.info
@@ -1,10 +1,10 @@
 PRGNAM="openfortivpn"
-VERSION="1.1.4"
+VERSION="1.20.3"
 HOMEPAGE="https://github.com/adrienverge/openfortivpn"
-DOWNLOAD="https://github.com/adrienverge/openfortivpn/archive/v1.1.4/openfortivpn-1.1.4.zip"
-MD5SUM="0c091f3306cadcd870b92925d241c011"
+DOWNLOAD="https://github.com/adrienverge/openfortivpn/archive/v1.20.3/openfortivpn-1.20.3.zip"
+MD5SUM="b977bf460bcb0be55c7b01f7e810d1e4"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Antonio Taverna"
-EMAIL="antonio.tvr@gmail.com"
+MAINTAINER="Gerardo Zamudio"
+EMAIL="gerardo.zamudio@linux.com"
diff --git a/network/openl2tp/Makefile.diff b/network/openl2tp/Makefile.diff
deleted file mode 100644
index 3f136aac2c..0000000000
--- a/network/openl2tp/Makefile.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./Makefile.orig	2010-11-22 11:47:26.000000000 +0200
-+++ ./Makefile	2011-06-21 22:51:24.000000000 +0300
-@@ -158,7 +158,7 @@
- 				$(CPPFLAGS) $(CPPFLAGS.dmalloc) \
- 				-DSYS_LIBDIR=$(SYS_LIBDIR)
- LDFLAGS.l2tpd=		-Wl,-E -L. -Lusl -lusl -ldl $(LIBS.dmalloc) -lc
--LDFLAGS.l2tpconfig=	-Lcli -lcli -lreadline $(LIBS.dmalloc) $(READLINE_LDFLAGS) -lc
-+LDFLAGS.l2tpconfig=	-Lcli -lcli -lreadline -ltermcap $(LIBS.dmalloc) $(READLINE_LDFLAGS) -lc
- 
- OPT_CFLAGS?=		-O
- 
diff --git a/network/openl2tp/README b/network/openl2tp/README
deleted file mode 100644
index fe4ea05077..0000000000
--- a/network/openl2tp/README
+++ /dev/null
@@ -1,17 +0,0 @@
-OpenL2TP is a complete implementation of RFC2661 - Layer Two Tunneling
-Protocol Version 2, able to operate as both a server and a client.
-
-OpenL2TP has been written specifically for Linux. It consists of
-- a daemon, openl2tpd, handling the L2TP control protocol exchanges
-  for all tunnels and sessions
-- a plugin for pppd to allow its PPP connections to run over L2TP
-  sessions
-- a Linux kernel driver for efficient datapath (packaged separately).
-- a command line application for management.
-
-All data packets are handled by the Linux kernel in order that the
-datapath be as efficient as possible. The Linux PPP-over-L2TP kernel
-driver (pppol2tp.o) must be loaded either dynamically as a kernel
-module or linked in statically.
-
-See README.SLACKWARE for post-installation configuration notes.
diff --git a/network/openl2tp/README.SLACKWARE b/network/openl2tp/README.SLACKWARE
deleted file mode 100644
index 204e78ad81..0000000000
--- a/network/openl2tp/README.SLACKWARE
+++ /dev/null
@@ -1,24 +0,0 @@
-To start openl2tpd at boot, you will need to add the following 
-lines to /etc/rc.d/rc.local:
-
-  if [ -x /etc/rc.d/rc.openl2tpd ]; then
-    /etc/rc.d/rc.openl2tpd start
-  fi
-
-Then add the following lines to /etc/rc.d/rc.local_shutdown:
-
-  if [ -x /etc/rc.d/rc.openl2tpd ]; then
-    /etc/rc.d/rc.openl2tpd stop
-  fi
-
-Then make sure /etc/rc.d/rc.rpc is executable:
-  # chmod 0755 /etc/rc.d/rc.rpc
-
-##############################################################
-
-If you want to start it without a reboot, first follow the
-above directions, and then do this:
-
-  # /etc/rc.d/rc.rpc start
-  # /etc/rc.d/rc.openl2tpd start
-
diff --git a/network/openl2tp/doinst.sh b/network/openl2tp/doinst.sh
deleted file mode 100644
index f62e4e7af9..0000000000
--- a/network/openl2tp/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.openl2tpd.new
-config etc/sysconfig/openl2tpd.new
-config etc/openl2tpd.conf.new
-
diff --git a/network/openl2tp/openl2tp.SlackBuild b/network/openl2tp/openl2tp.SlackBuild
deleted file mode 100644
index a16d787436..0000000000
--- a/network/openl2tp/openl2tp.SlackBuild
+++ /dev/null
@@ -1,88 +0,0 @@
-#!/bin/sh
-#
-# Slackware build script for openl2tp
-#
-# Written by Eugene P. <pieu@mail.ru>
-#
-
-PRGNAM=openl2tp
-VERSION=${VERSION:-1.8}
-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
-
-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
-
-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 {} \;
-
-patch -p1 < $CWD/Makefile.diff
-
-make OPT_CFLAGS="$SLKCFLAGS -Wno-error=unused-but-set-variable" \
-  SYS_LIBDIR=/usr/lib${LIBDIRSUFFIX}
-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 and fix perms on manpages
-mv $PKG/usr/share/man $PKG/usr ; rmdir $PKG/usr/share
-find $PKG/usr/man -type f -exec chmod 0644 {} \;
-
-mkdir -p $PKG/etc/rc.d
-cat etc/rc.d/init.d/openl2tpd > $PKG/etc/rc.d/rc.openl2tpd.new
-chmod 0755 $PKG/etc/rc.d/rc.openl2tpd.new
-
-mkdir -p $PKG/etc/sysconfig
-sed -e "s,^OPENL2TPD_CONFIG_FILE=.*$,OPENL2TPD_CONFIG_FILE=/etc/openl2tpd.conf," \
-  etc/sysconfig/openl2tpd > $PKG/etc/sysconfig/openl2tpd.new
-
-# Copy config files for the OpenL2TP daemon
-cat $CWD/sample.conf > $PKG/etc/openl2tpd.conf.new
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a README CHANGES LICENSE COPYING 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/network/openl2tp/openl2tp.info b/network/openl2tp/openl2tp.info
deleted file mode 100644
index d38d0ca354..0000000000
--- a/network/openl2tp/openl2tp.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="openl2tp"
-VERSION="1.8"
-HOMEPAGE="http://www.openl2tp.org/"
-DOWNLOAD="http://downloads.sourceforge.net/openl2tp/openl2tp-1.8.tar.gz"
-MD5SUM="e3d08dedfb9e6a9a1e24f6766f6dadd0"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Eugene P."
-EMAIL="pieu@mail.ru"
diff --git a/network/openl2tp/sample.conf b/network/openl2tp/sample.conf
deleted file mode 100644
index fba34766c7..0000000000
--- a/network/openl2tp/sample.conf
+++ /dev/null
@@ -1,17 +0,0 @@
-system modify deny_remote_tunnel_creates=yes \
-	tunnel_establish_timeout=60 \
-	session_establish_timeout=30 \
-	tunnel_persist_pend_timeout=60 \
-	session_persist_pend_timeout=30
-
-peer profile modify profile_name=default lac_lns=lac
-
-ppp profile modify profile_name=default \
-	auth_pap=no auth_eap=no auth_none=no auth_mschapv1=no auth_mschapv2=yes \
-	default_route=no proxy_arp=no
-
-tunnel create tunnel_name=CONNECTION_NAME dest_ipaddr=VPN_SERVER_IP persist=yes
-
-session create tunnel_name=CONNECTION_NAME session_name=CONNECTION_NAME \
-	user_name="LOGIN" user_password="PASSWORD"
-
diff --git a/network/openl2tp/slack-desc b/network/openl2tp/slack-desc
deleted file mode 100644
index 82de4fc13b..0000000000
--- a/network/openl2tp/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------------------------------------------------------|
-openl2tp: openl2tp (Layer Two Tunneling Protocol Version 2)
-openl2tp:
-openl2tp: OpenL2TP has been written specifically for Linux.  It consists of
-openl2tp: - a daemon, openl2tpd, handling the L2TP control protocol exchanges
-openl2tp: for all tunnels and sessions
-openl2tp: - a plugin for pppd to allow its PPP connections to run over L2TP
-openl2tp: - a kernel driver for efficient datapath (packaged separately)
-openl2tp: - a command line application for management.
-openl2tp:
-openl2tp: http://www.openl2tp.org/
-openl2tp:
diff --git a/network/openldap-server/README b/network/openldap-server/README
deleted file mode 100644
index 6a31d75bf8..0000000000
--- a/network/openldap-server/README
+++ /dev/null
@@ -1,22 +0,0 @@
-OpenLDAP Server
-
-OpenLDAP is an open source implementation of the Lightweight Directory
-Access Protocol.
-
-The suite includes:
-
-  * slapd - stand-alone LDAP daemon (server)
-  * libraries implementing the LDAP protocol
-  * utilities, tools, and sample clients.
-
-
-Groupname and Username
-
-You must have the 'ldap' group and user to run this script,
-for example:
-
-  groupadd -g 330 ldap
-  useradd -u 330 -d /var/lib/openldap -s /bin/false -c "OpenLDAP server" -g ldap ldap
-
-
-For more information see README.SLACKWARE
diff --git a/network/openldap-server/README.SLACKWARE b/network/openldap-server/README.SLACKWARE
deleted file mode 100644
index ea245662b6..0000000000
--- a/network/openldap-server/README.SLACKWARE
+++ /dev/null
@@ -1,103 +0,0 @@
-# Initial Setup
-
-Set the directory suffix and Manager user in your slapd.conf(5):
-
-  [...]
-  suffix  "dc=example,dc=org"
-  rootdn  "cn=Manager,dc=example,dc=org"
-  rootpw  {SSHA}CjQ2ddDHu92qd2BrcNYT1hQDzLrVlgCo  # Encryted password using slappasswd(8)
-  [...]
-
-Create the DB_CONFIG file to initialize the database:
-
-  # cd /var/lib/openldap
-  # cp -a DB_CONFIG.example DB_CONFIG
-
-
-
-# Logging
-
-Add this to your /etc/syslog.conf file, and then restart syslogd,
-to enable the slapd log file:
-
-  local4.*  -/var/log/slapd
-
-
-
-# Configuration
-
-All configuration and schemas are stored in /etc/openlap
-
-  slapd.conf   legacy OpenLDAP configuration file (see slapd.conf(5))
-  slapd.ldif   OpenLDAP configuration file (see slapd-config(5))
-  ldap.conf    ldap client (eg. ldapsearch) configuration file (see ldap.conf(5))
-  certs/       directory can contains server certificates
-  schema/      OpenLDAP schema
-
-The default OpenLDAP database is located in /var/lib/openldap
-
-*NOTE* OpenLDAP 2.3 and later supports old slapd.conf(5) and dynamic
-       configuration engine, slapd-config(5).
-
-
-
-# Using the slapd.d directory
-
-An existing slapd.conf(5) file can be converted to the new format using
-slaptest(8):
-
-  # sh /etc/rc.d/rc.openldap stop
-  # mkdir -p /etc/openldap/slapd.d
-  # slaptest -f /etc/openldap/slapd.conf -F /etc/openldap/slapd.d
-  # chown ldap:ldap /etc/openldap/slapd.d
-
-
-
-# Starting and Stopping the OpenLDAP server
-
-This package provides the /etc/rc.d/rc.openldap start/stop script.
-
-Slackware is OpenLDAP server ready (see the rc.M script) and you can start
-the OpenLDAP server automatically at boot by adding execution permission to 
-/etc/rc.d/rc.openldap
-
-
-
-# Troubleshooting
-
-## Can't contact LDAP server via ldapi:/// url
-
-  $ ldapadd  -Y EXTERNAL -H ldapi:/// -f /tmp/test.ldif 
-  ldap_sasl_interactive_bind_s: Can't contact LDAP server (-1)
-
-openldap-server package use the same libraries from n/openldap-client Slackware 
-package. The openldap-client package use a non-standard location for ldapi socket.
-
-### Solution 1
-
-Create a symlink from /var/run/openldap/ldapi to /var/lib/run/ldapi
-
-  # mkdir -p /var/lib/run
-  # ln -sf /var/run/openldap/ldapi /var/lib/run/ldapi
-
-### Solution 2
-
-Change or add the URI in ldap.conf(5) file:
-
-  URI   ldapi://%2fvar%2frun%2fopenldap%2fldapi
-
-Run the ldap utility command without "-H" argument (example):
-
-  $ ldapadd  -Y EXTERNAL -f /tmp/test.ldif
-
-### Solution 3
-
-Use ldapi url with ldap utility command:
-
-  $ ldapadd  -Y EXTERNAL -H ldapi://%2fvar%2frun%2fopenldap%2fldapi -f /tmp/test.ldif
-
-
-
-# Documentation
-
-See /usr/doc/openldap-2.4.42/guide.html (OpenLDAP Administrator Guide)
diff --git a/network/openldap-server/doinst.sh b/network/openldap-server/doinst.sh
deleted file mode 100644
index 17bd5215de..0000000000
--- a/network/openldap-server/doinst.sh
+++ /dev/null
@@ -1,28 +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.openldap.new
-
-config etc/openldap/slapd.conf.new
-config etc/openldap/slapd.ldif.new
-config etc/default/slapd.new
diff --git a/network/openldap-server/openldap-server.SlackBuild b/network/openldap-server/openldap-server.SlackBuild
deleted file mode 100644
index 54e8fbe773..0000000000
--- a/network/openldap-server/openldap-server.SlackBuild
+++ /dev/null
@@ -1,255 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for OpenLDAP server
-
-# Copyright 2015-2017 Giuseppe Di Terlizzi <giuseppe.diterlizzi@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=openldap-server
-VERSION=${VERSION:-2.4.42}
-BUILD=${BUILD:-1}
-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) export ARCH=i586 ;;
-    arm*) export ARCH=arm ;;
-       *) export ARCH=$( uname -m ) ;;
-  esac
-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
-
-if ! grep ^ldap: /etc/group 2>&1 > /dev/null; then
-  echo "  You must have a ldap group to run this script."
-  echo "    # groupadd -r -g 330 ldap"
-  echo "  Or something similar."
-  exit 1
-elif ! grep ^ldap: /etc/passwd 2>&1 > /dev/null; then
-  echo "  You must have a ldap user to run this script."
-  echo "    # useradd -r -u 330 -g ldap -d /var/lib/openldap -s /bin/false -c \"OpenLDAP server\" ldap"
-  echo "  Or something similar."
-  exit 1
-fi
-
-rm -rf $PKG
-mkdir -p $TMP $PKG
-cd $TMP
-rm -rf openldap-$VERSION
-tar xvf $CWD/openldap-$VERSION.t*z*
-cd openldap-$VERSION
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-
-# Change the location of run directory into /var/run/openldap
-sed -i -e 's|%LOCALSTATEDIR%/run/|/var/run/openldap/|' \
-  servers/slapd/slapd.*
-
-# Change the location of ldapi socket into /var/run/openldap
-sed -i -e 's|\(#define LDAPI_SOCK\).*|\1 "/var/run/openldap/ldapi"|' \
-  include/ldap_defaults.h
-
-# Change the default OpenLDAP database directory
-sed -i -e 's|openldap-data|lib/openldap|' \
-  servers/slapd/slapd.* include/ldap_defaults.h servers/slapd/Makefile.in
-
-
-CFLAGS="$SLKCFLAGS" \
-./configure \
-  --prefix=/usr \
-  --exec-prefix=/usr \
-  --sysconfdir=/etc \
-  --mandir=/usr/man \
-  --localstatedir=/var \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  \
-  --enable-debug \
-  --enable-dynamic \
-  --enable-syslog \
-  --enable-proctitle \
-  --enable-ipv6 \
-  --enable-local \
-  \
-  --enable-slapd \
-  --enable-dynacl \
-  --enable-aci \
-  --enable-cleartext \
-  --enable-crypt \
-  --enable-lmpasswd \
-  --enable-spasswd \
-  --enable-modules \
-  --enable-rewrite \
-  --enable-rlookups \
-  --enable-slapi \
-  --disable-slp \
-  --enable-wrappers \
-  \
-  --enable-backends=mod \
-  --enable-bdb=yes \
-  --enable-hdb=yes \
-  --enable-mdb=yes \
-  --enable-monitor=yes \
-  --enable-perl=yes \
-  --disable-ndb \
-  \
-  --enable-overlays=mod \
-  \
-  --disable-static \
-  --enable-shared \
-  \
-  --with-cyrus-sasl \
-  --without-fetch \
-  --with-threads \
-  --with-pic \
-  --with-tls
-
-make depend
-
-# Build only slapd server. The libraries and header files are present in
-# Slackware n/openldap-client package
-
-( cd libraries
-  make
-)
-
-( cd servers
-  make -j1
-  make -j1 install DESTDIR=$PKG
-)
-
-( cd doc
-  make
-  make install DESTDIR=$PKG
-)
-
-rm -f $PKG/etc/openldap/*.default
-
-# Copy default slapd configuration
-mv $PKG/etc/openldap/slapd.conf $PKG/etc/openldap/slapd.conf.new
-mv $PKG/etc/openldap/slapd.ldif $PKG/etc/openldap/slapd.ldif.new
-
-# Create a symlink for slapd into /usr/sbin
-mkdir -p $PKG/usr/sbin
-( cd $PKG/usr/sbin ; ln -sf ../libexec/slapd slapd )
-
-# Create OpenLDAP run directory
-mkdir -p $PKG/var/run/openldap
-
-# Fix ldapi socket location for n/openldap-client package
-mkdir -p $PKG/var/lib/run
-( cd $PKG/var/lib/run; ln -sf ../../run/openldap/ldapi ldapi )
-
-# Create OpenLDAP certificates directory
-mkdir -p $PKG/etc/openldap/certs
-
-# Copy rc.openldap
-mkdir -p $PKG/etc/rc.d
-cat $CWD/rc.openldap > $PKG/etc/rc.d/rc.openldap.new
-
-# Copy slapd default file
-mkdir -p $PKG/etc/default
-cat $CWD/slapd > $PKG/etc/default/slapd.new
-
-mkdir -p $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
-
-cp -a \
-  ANNOUNCEMENT COPYRIGHT LICENSE README CHANGES \
-  $PKG/usr/doc/$PRGNAM-$VERSION
-
-# Include monitor backend README
-cp -a \
-  servers/slapd/back-monitor/README \
-  $PKG/usr/doc/$PRGNAM-$VERSION/README.back-monitor
-
-# Include Perl backend README
-cp -a \
-  servers/slapd/back-perl/README \
-  $PKG/usr/doc/$PRGNAM-$VERSION/README.back-perl
-
-# Include Perl backend sample file
-cp -a \
-  servers/slapd/back-perl/SampleLDAP.pm \
-  $PKG/usr/doc/$PRGNAM-$VERSION
-
-# Include OpenLDAP documentation
-cp -a \
-  doc/guide/admin/*.png \
-  doc/guide/admin/*.html \
-  $PKG/usr/doc/$PRGNAM-$VERSION
-
-# Fix permissions
-chmod 755 $PKG/usr/lib${LIBDIRSUFFIX}/*.so.*
-chmod 700 $PKG/var/lib/openldap
-chmod 755 $PKG/usr/libexec/openldap
-
-# Fix ownership
-chown -R ldap:ldap $PKG/var/lib/openldap
-chown -R ldap:ldap $PKG/var/run/openldap
-chown -R ldap:ldap $PKG/etc/openldap
-
-# Remove OpenLDAP client man pages
-rm -rf $PKG/usr/man/man1
-rm -rf $PKG/usr/man/man3
-rm -rf $PKG/usr/man/man5/{ldap,ldif}.*
-
-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
-
-# Create an empty slapd log file
-mkdir -p $PKG/var/log
-touch $PKG/var/log/slapd
-chown ldap:ldap $PKG/var/log/slapd
-
-
-mkdir $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/network/openldap-server/openldap-server.info b/network/openldap-server/openldap-server.info
deleted file mode 100644
index c2602f06af..0000000000
--- a/network/openldap-server/openldap-server.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="openldap-server"
-VERSION="2.4.42"
-HOMEPAGE="http://www.openldap.org"
-DOWNLOAD="http://www.openldap.org/software/download/OpenLDAP/openldap-release/openldap-2.4.42.tgz"
-MD5SUM="47c8e2f283647a6105b8b0325257e922"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Giuseppe Di Terlizzi"
-EMAIL="giuseppe.diterlizzi@gmail.com"
diff --git a/network/openldap-server/rc.openldap b/network/openldap-server/rc.openldap
deleted file mode 100644
index 0e64c219fc..0000000000
--- a/network/openldap-server/rc.openldap
+++ /dev/null
@@ -1,100 +0,0 @@
-#!/bin/sh
-
-# OpenLDAP Server start/stop script
-
-
-. /etc/default/slapd
-
-PID_FILE=/var/run/openldap/slapd.pid
-EXEC=/usr/sbin/slapd
-
-
-# re-create /var/run/openldap directory
-if [ ! -d /var/run/openldap ]; then
-  mkdir -p /var/run/openldap
-  chown ldap:ldap /var/run/openldap
-fi
-
-
-slapd_start() {
-
-  echo -n "Starting OpenLDAP server..."
-
-  if [ -e $PID_FILE ]; then
-
-    if ps axc | grep slapd >/dev/null 2>&1 ; then
-      echo "already running!"
-      return 1
-    else
-      rm $PID_FILE
-    fi
-
-  fi
-
-  $EXEC -u ldap -h "$SLAPD_URLS" $SLAPD_OPTIONS > /dev/null 2>&1
-  echo "done!"
-
-}
-
-
-slapd_stop() {
-
-  echo -n "Stopping OpenLDAP server..."
-
-  if [ -e $PID_FILE ]; then
-    if ps axc | grep slapd >/dev/null 2>&1; then
-      kill -INT $(cat $PID_FILE)
-    else
-      echo "already stopped!"
-    fi
-  fi
-
-  rm $PID_FILE >/dev/null 2>&1
-  echo "done!"
-
-}
-
-
-slapd_restart() {
-  slapd_stop
-  sleep 1
-  slapd_start
-}
-
-
-slapd_status() {
-
-  if [ -e $PID_FILE ]; then
-    if ps axc | grep slapd >/dev/null 2>&1; then
-      echo "OpenLDAP is running!"
-      return 0
-    fi
-
-    echo "OpenLDAP PID file exists but the service is down!"
-    return 1
-
-  else
-    echo "OpenLDAP is stopped!"
-    return 0
-  fi
-
-}
-
-
-case "$1" in
-  'start')
-    slapd_start
-    ;;
-  'stop')
-    slapd_stop
-    ;;
-  'restart')
-    slapd_restart
-    ;;
-  'status')
-    slapd_status
-    ;;
-  *)
-    echo "usage $0 start|stop|restart"
-esac
-
diff --git a/network/openldap-server/slack-desc b/network/openldap-server/slack-desc
deleted file mode 100644
index 92bf98bc92..0000000000
--- a/network/openldap-server/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------------------------------------------------------|
-openldap-server: openldap-server (OpenLDAP server)
-openldap-server:
-openldap-server: OpenLDAP is an open source implementation of the Lightweight
-openldap-server: Directory Access Protocol.  LDAP is a alternative to the X.500
-openldap-server: Directory Access Protocol (DAP). It uses the TCP/IP stack versus
-openldap-server: the overly complex OSI stack.
-openldap-server:
-openldap-server: LDAP is often used to provide authentication (such as for email).
-openldap-server:
-openldap-server: The OpenLDAP homepage is http://www.openldap.org/
-openldap-server:
diff --git a/network/openldap-server/slapd b/network/openldap-server/slapd
deleted file mode 100644
index afbbfb55fc..0000000000
--- a/network/openldap-server/slapd
+++ /dev/null
@@ -1,16 +0,0 @@
-# OpenLDAP server configuration
-# see 'man slapd' for additional information
-
-# Where the server will run (-h option)
-# - ldapi:/// is required for on-the-fly configuration using client tools
-#   (use SASL with EXTERNAL mechanism for authentication)
-# - default: ldapi:/// ldap:///
-# - example: ldapi:/// ldap://127.0.0.1/ ldap://10.0.0.1:1389/ ldaps:///
-SLAPD_URLS="ldapi:/// ldap:///"
-
-# Any custom options
-#SLAPD_OPTIONS=""
-
-# Keytab location for GSSAPI Kerberos authentication
-#KRB5_KTNAME="FILE:/etc/openldap/ldap.keytab"
-
diff --git a/network/openntpd/README b/network/openntpd/README
index 9f0051a26e..6eaa07cbeb 100644
--- a/network/openntpd/README
+++ b/network/openntpd/README
@@ -1,13 +1,15 @@
-OpenNTPD is a FREE, easy to use implementation of the Network Time Protocol. It
-provides the ability to sync the local clock to remote NTP servers and can act
-as NTP server itself, redistributing the local clock.
+OpenNTPD is a FREE, easy to use implementation of the Network Time
+Protocol. It provides the ability to sync the local clock to remote
+NTP servers and can act as NTP server itself, redistributing the local
+clock.
 
-OpenNTPD was primarily developed by Henning Brauer as part of the OpenBSD
-Project and gets released as a base component of OpenBSD every six months.
+OpenNTPD was primarily developed by Henning Brauer as part of the
+OpenBSD Project and gets released as a base component of OpenBSD every
+six months.
 
-The portable version is maintained by Brent Cook and is mirrored on Github and
-available as periodic tarball releases. Contributions are welcome to both the
-OpenNTPD core and the portable build framework.
+The portable version is maintained by Brent Cook and is mirrored on
+Github and available as periodic tarball releases. Contributions are
+welcome to both the OpenNTPD core and the portable build framework.
 
 This build script will try to create the user and group '_ntp', that is
 necessary to run openntpd.
diff --git a/network/openntpd/openntpd.SlackBuild b/network/openntpd/openntpd.SlackBuild
index 07347afb53..16e2296ec5 100644
--- a/network/openntpd/openntpd.SlackBuild
+++ b/network/openntpd/openntpd.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for openntpd
 
@@ -25,11 +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=openntpd
-VERSION=${VERSION:-6.2p3}
+VERSION=${VERSION:-6.8p1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
+PKGTYPE=${PKGTYPE:-tgz}
+
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
     i?86) ARCH=i586 ;;
@@ -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}
@@ -131,7 +142,7 @@ mkdir -p $PKG/etc/rc.d
 install -m 0644 $CWD/rc.openntpd $PKG/etc/rc.d/rc.openntpd.new
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a INSTALL README $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
@@ -139,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/network/openntpd/openntpd.info b/network/openntpd/openntpd.info
index d341aada73..70ab063e2d 100644
--- a/network/openntpd/openntpd.info
+++ b/network/openntpd/openntpd.info
@@ -1,8 +1,8 @@
 PRGNAM="openntpd"
-VERSION="6.2p3"
+VERSION="6.8p1"
 HOMEPAGE="http://www.openntpd.org/portable.html"
-DOWNLOAD="http://ftp.OpenBSD.org/pub/OpenBSD/OpenNTPD/openntpd-6.2p3.tar.gz"
-MD5SUM="5b67827f8ce7e24f38c895787036658d"
+DOWNLOAD="https://mirrors.mit.edu/pub/OpenBSD/OpenNTPD/openntpd-6.8p1.tar.gz"
+MD5SUM="7c68ce2627b2ea13f2b95db1ef4fcfc5"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/network/openntpd/patches/01-ntpctl_rename.diff b/network/openntpd/patches/01-ntpctl_rename.diff
index 5406b5cc35..c24c6f8bf3 100644
--- a/network/openntpd/patches/01-ntpctl_rename.diff
+++ b/network/openntpd/patches/01-ntpctl_rename.diff
@@ -1,6 +1,7 @@
---- a/src/ntpd.c.orig	2015-03-25 02:18:56.000000000 +0100
-+++ b/src/ntpd.c	2015-03-25 14:55:29.964709538 +0100
-@@ -100,9 +100,8 @@ usage(void)
+diff -Nur openntpd-6.8p1.orig/src/ntpd.c openntpd-6.8p1/src/ntpd.c
+--- openntpd-6.8p1.orig/src/ntpd.c	2020-12-07 02:20:35.000000000 -0600
++++ openntpd-6.8p1/src/ntpd.c	2021-07-18 21:33:55.169706930 -0500
+@@ -113,9 +113,8 @@
  {
  	extern char *__progname;
  
@@ -10,28 +11,28 @@
 +	if (strcmp(__progname, "openntpctl") == 0)
 +		fprintf(stderr, "usage: %s -s all | peers | Sensors | status\n", __progname);
  	else
- 		fprintf(stderr, "usage: %s [-dnSsv] [-f file] [-p file]\n",
+ 		fprintf(stderr, "usage: %s [-dnv] [-f file] [-p file]\n",
  		    __progname);
-@@ -131,7 +130,7 @@ main(int argc, char *argv[])
- 	struct passwd		*pw;
- 	extern char		*__progname;
+@@ -171,7 +170,7 @@
+ 
+ 	__progname = get_progname(argv[0]);
  
 -	if (strcmp(__progname, "ntpctl") == 0) {
 +	if (strcmp(__progname, "openntpctl") == 0) {
  		ctl_main(argc, argv);
  		/* NOTREACHED */
  	}
-@@ -598,7 +597,7 @@ ctl_main(int argc, char *argv[])
+@@ -736,7 +735,7 @@
  		/* NOTREACHED */
  
  	if ((fd = socket(AF_UNIX, SOCK_STREAM, 0)) == -1)
 -		err(1, "ntpctl: socket");
 +		err(1, "openntpctl: socket");
  
- 	bzero(&sa, sizeof(sa));
+ 	memset(&sa, 0, sizeof(sa));
  	sa.sun_family = AF_UNIX;
-@@ -643,7 +642,7 @@ ctl_main(int argc, char *argv[])
- 		if ((n = imsg_read(ibuf_ctl)) == -1)
+@@ -784,7 +783,7 @@
+ 		if ((n = imsg_read(ibuf_ctl)) == -1 && errno != EAGAIN)
  			err(1, "ibuf_ctl: imsg_read error");
  		if (n == 0)
 -			errx(1, "ntpctl: pipe closed");
diff --git a/network/openntpd/patches/02-ntpd_8_clean.diff b/network/openntpd/patches/02-ntpd_8_clean.diff
index 8e999afdec..049806b1f4 100644
--- a/network/openntpd/patches/02-ntpd_8_clean.diff
+++ b/network/openntpd/patches/02-ntpd_8_clean.diff
@@ -1,6 +1,7 @@
---- a/src/ntpd.8.orig	2017-10-30 09:57:40.000000000 +0100
-+++ b/src/ntpd.8	2017-10-30 16:40:00.501570572 +0100
-@@ -102,18 +102,6 @@ adjusts the clock frequency using the
+diff -Nur openntpd-6.8p1.orig/src/ntpd.8 openntpd-6.8p1/src/ntpd.8
+--- openntpd-6.8p1.orig/src/ntpd.8	2020-12-07 02:20:35.000000000 -0600
++++ openntpd-6.8p1/src/ntpd.8	2021-07-18 21:34:49.338076927 -0500
+@@ -102,18 +102,6 @@
  .Xr adjfreq 2
  system call to compensate for systematic drift.
  .Pp
@@ -19,7 +20,7 @@
  When
  .Nm
  starts up, it reads settings from its configuration file,
-@@ -138,8 +126,6 @@ Socket file for communication with
+@@ -138,8 +126,6 @@
  .Xr adjtime 2 ,
  .Xr ntpd.conf 5 ,
  .Xr ntpctl 8 ,
diff --git a/network/openrdate/README b/network/openrdate/README
deleted file mode 100644
index a8ff621639..0000000000
--- a/network/openrdate/README
+++ /dev/null
@@ -1,5 +0,0 @@
-Good-old rdate date- and time-setting software implementing RFC 868
-(inetd time) and RFC 2030 (SNTP/NTP) protocols. An independent package
-of OpenBSD's rdate program.
-
-An alternative to netdate and ntpd/ntpdate.
diff --git a/network/openrdate/openrdate.SlackBuild b/network/openrdate/openrdate.SlackBuild
deleted file mode 100644
index 7cb565d7e0..0000000000
--- a/network/openrdate/openrdate.SlackBuild
+++ /dev/null
@@ -1,77 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for openrdate
-# Written by slakmagik <slakmagik@gmail.com>
-# Released under the WTFPL
-
-PRGNAM=openrdate
-VERSION=${VERSION:-1.2}
-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 {} \;
-
-# I put this in sbin because, while an unprivileged user can do 'rdate -p
-# SERVER', it's still a system management command and the manual's in 8, etc.
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
-  --prefix=/usr \
-  --bindir=/usr/sbin \
-  --mandir=/usr/man \
-  --build=$ARCH-slackware-linux
-
-make
-make DESTDIR=$PKG install-strip
-
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a [ACINR]* $PKG/usr/doc/$PRGNAM-$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/network/openrdate/openrdate.info b/network/openrdate/openrdate.info
deleted file mode 100644
index 0d4ca6d7cb..0000000000
--- a/network/openrdate/openrdate.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="openrdate"
-VERSION="1.2"
-HOMEPAGE="https://sourceforge.net/projects/openrdate/"
-DOWNLOAD="https://downloads.sourceforge.net/openrdate/openrdate-1.2.tar.gz"
-MD5SUM="ad9bd58e1fb7babc74d0a0a16a1248a2"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="slakmagik"
-EMAIL="slakmagik@gmail.com"
diff --git a/network/openrdate/slack-desc b/network/openrdate/slack-desc
deleted file mode 100644
index 53c44ee1e4..0000000000
--- a/network/openrdate/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------------------------------------------------------|
-openrdate: openrdate (date/time printing/setting program)
-openrdate:
-openrdate: Good-old rdate date- and time-setting software implementing RFC
-openrdate: 868 (inetd time) and RFC 2030 (SNTP/NTP) protocols. An independent
-openrdate: package of the OpenBSD's rdate program.
-openrdate:
-openrdate: Homepage: https://sourceforge.net/projects/openrdate/
-openrdate:
-openrdate:
-openrdate:
-openrdate:
diff --git a/network/openresolv/README b/network/openresolv/README
deleted file mode 100644
index abe4b9d7c7..0000000000
--- a/network/openresolv/README
+++ /dev/null
@@ -1,17 +0,0 @@
-openresolv (management framework for resolv.conf)
-
-Allows multiple daemons to manage resolv.conf and configures local
-resolvers such as dnsmasq and unbound.
-
-This package may require some manual configuration. Please read
-resolvconf(8) and resolvconf.conf(5) for detailed instructions.
-
-Passing OPENVPN=yes will add the update-resolv-conf script to
-/etc/openvpn/. To use the script, make sure the following lines are
-added to your openvpn client configuration file.
-
-up /etc/openvpn/update-resolv-conf
-down /etc/openvpn/update-resolv-conf
-
-Please consult /etc/openvpn/update-resolv-conf before using the script.
-It will likely require editing before use.
diff --git a/network/openresolv/doinst.sh b/network/openresolv/doinst.sh
deleted file mode 100644
index 810b1c10cb..0000000000
--- a/network/openresolv/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/resolvconf.conf.new
-# This file is optional (added with OPENVPN=yes); let's make sure it exists
-if [ -e etc/openvpn/update-resolv-conf.new ]; then
-  config etc/openvpn/update-resolv-conf.new
-fi
diff --git a/network/openresolv/openresolv.SlackBuild b/network/openresolv/openresolv.SlackBuild
deleted file mode 100644
index 5e4735da16..0000000000
--- a/network/openresolv/openresolv.SlackBuild
+++ /dev/null
@@ -1,114 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for openresolv
-
-# Copyright 2012-2013 synbq Bucharest
-# Copyright 2017  Jeremy Hansen <jebrhansen+SBo -at- 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=openresolv
-VERSION=${VERSION:-3.9.0}
-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 building openvpn support, ensure it's installed
-if [ "${OPENVPN:-no}" = "yes" ] && [ ! -d /etc/openvpn ]; then
-    echo "You must to have openvpn installed"
-    exit 1
-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.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 \
-  --libexecdir=/usr/libexec/openresolv \
-  --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
-
-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 README $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-if [ "${OPENVPN}" = "yes" ]; then
-  mkdir -p $PKG/etc/openvpn
-  install -m 0755 $CWD/update-resolv-conf $PKG/etc/openvpn/update-resolv-conf.new
-fi
-
-mv $PKG/etc/resolvconf.conf $PKG/etc/resolvconf.conf.new
-
-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/network/openresolv/openresolv.info b/network/openresolv/openresolv.info
deleted file mode 100644
index 44dc4e4482..0000000000
--- a/network/openresolv/openresolv.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="openresolv"
-VERSION="3.9.0"
-HOMEPAGE="https://roy.marples.name/projects/openresolv"
-DOWNLOAD="https://roy.marples.name/downloads/openresolv/openresolv-3.9.0.tar.xz"
-MD5SUM="177ad48b768d4d1bf37510f1af99dffe"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Jeremy Hansen"
-EMAIL="jebrhansen+SBo@gmail.com"
diff --git a/network/openresolv/slack-desc b/network/openresolv/slack-desc
deleted file mode 100644
index 1b64db5fe9..0000000000
--- a/network/openresolv/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------------------------------------------------------|
-openresolv: openresolv (management framework for resolv.conf)
-openresolv:
-openresolv: Allows multiple daemons to manage resolv.conf and configures local
-openresolv: resolvers such as dnsmasq and unbound.
-openresolv: This package may require some manual configuration.
-openresolv: Please read resolvconf(8) and resolvconf.conf(5) for detailed
-openresolv: instructions.
-openresolv:
-openresolv: Visit the openresolv project online:
-openresolv: https://roy.marples.name/projects/openresolv
-openresolv:
diff --git a/network/openresolv/update-resolv-conf b/network/openresolv/update-resolv-conf
deleted file mode 100644
index 3c95f84531..0000000000
--- a/network/openresolv/update-resolv-conf
+++ /dev/null
@@ -1,54 +0,0 @@
-#!/bin/bash
-#
-# Parses DHCP options from openvpn to update resolv.conf
-# To use set as 'up' and 'down' script in your openvpn *.conf:
-# up /etc/openvpn/update-resolv-conf
-# down /etc/openvpn/update-resolv-conf
-#
-# Used snippets of resolvconf script by Thomas Hood <jdthood@yahoo.co.uk>
-# and Chris Hanson
-# Licensed under the GNU GPL.  See /usr/share/common-licenses/GPL.
-#
-# 05/2006 chlauber@bnc.ch
-#
-# Example envs set from openvpn:
-# foreign_option_1='dhcp-option DNS 193.43.27.132'
-# foreign_option_2='dhcp-option DNS 193.43.27.133'
-# foreign_option_3='dhcp-option DOMAIN be.bnc.ch'
-
-[ -x /usr/sbin/resolvconf ] || exit 0
-
-case $script_type in
-
-up)
-	for optionname in ${!foreign_option_*} ; do
-		option="${!optionname}"
-		echo $option
-		part1=$(echo "$option" | cut -d " " -f 1)
-		if [ "$part1" == "dhcp-option" ] ; then
-			part2=$(echo "$option" | cut -d " " -f 2)
-			part3=$(echo "$option" | cut -d " " -f 3)
-			if [ "$part2" == "DNS" ] ; then
-				IF_DNS_NAMESERVERS="$IF_DNS_NAMESERVERS $part3"
-			fi
-			if [ "$part2" == "DOMAIN" ] ; then
-				IF_DNS_SEARCH="$IF_DNS_SEARCH $part3"
-			fi
-		fi
-	done
-	R=""
-	for SS in $IF_DNS_SEARCH ; do
-        	R="${R}search $SS
-"
-	done
-	for NS in $IF_DNS_NAMESERVERS ; do
-        	R="${R}nameserver $NS
-"
-	done
-	echo -n "$R" | /usr/sbin/resolvconf -a "${dev}.inet"
-	;;
-down)
-	/usr/sbin/resolvconf -d "${dev}.inet"
-	;;
-esac
-
diff --git a/network/openresty/README b/network/openresty/README
new file mode 100644
index 0000000000..e2acd5778c
--- /dev/null
+++ b/network/openresty/README
@@ -0,0 +1,40 @@
+openresty is a dynamic web platform based on NGINX and LuaJIT.
+
+Install dependence packages
+  slackpkg -batch=on -default_answer=y install zlib \
+    gd libxslt fontconfig libxcb libX11 libXau libXdmcp libXpm
+
+By default, openresty will use the "nobody" user and group accounts.
+You may specify alternate values on the command line if desired;
+for example:
+
+  OPENRESTYUSER=backup OPENRESTYGROUP=backup ./openresty.SlackBuild
+
+Regardless of which user and group you decide to use, you will need to
+make sure they exist on both the build system and the target system.
+
+Geoip support is now available as an option using the GeopIP
+package. If you wish to enable GeoIP the pass GEOIP variable to the
+slackbuild:
+
+  GEOIP=yes ./openresty.SlackBuild
+
+Support for gperftools is available as an option using the gperftools
+package. If you wish to enable gperftools pass the GPERF variable to
+the slackbuild:
+
+  GPERF=yes ./openresty.SlackBuild
+
+Extra modules not included with stock openresty can be added by passing
+them as a variable to the slackbuild as a space separated list of
+full paths to modules.  List of extra 3rd party modules available at
+http://wiki.openresty.org/3rdPartyModules.
+
+  ADDMODULE="/tmp/passenger-release-5.0.13/ext/openresty" \
+     ./openresty.SlackBuild
+
+Using the optional dynamic loadable module support in openresty >=
+1.10.0. Understand that dynamic modules are a new feature in \
+openresty and issues may arise until further testing is done.
+
+  DYNAMIC=yes ./openresty.SlackBuild
diff --git a/network/openresty/doinst.sh b/network/openresty/doinst.sh
new file mode 100644
index 0000000000..ea975c41a5
--- /dev/null
+++ b/network/openresty/doinst.sh
@@ -0,0 +1,35 @@
+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.openresty.new
+config etc/logrotate.d/openresty.new
+config etc/openresty/fastcgi_params.new
+config etc/openresty/fastcgi.conf.new
+config etc/openresty/mime.types.new
+config etc/openresty/nginx.conf.new
+config etc/openresty/koi-utf.new
+config etc/openresty/koi-win.new
+config etc/openresty/scgi_params.new
+config etc/openresty/uwsgi_params.new
+config etc/openresty/win-utf.new
diff --git a/network/openresty/openresty.SlackBuild b/network/openresty/openresty.SlackBuild
new file mode 100644
index 0000000000..62ba6dba89
--- /dev/null
+++ b/network/openresty/openresty.SlackBuild
@@ -0,0 +1,195 @@
+#!/bin/bash
+
+# Slackware build script for openresty
+
+# Copyright 2008 Cherife Li <cherife-#-dotimes.com>
+# Copyright 2011 Diogo Leal <diogo@diogoleal.com>
+# Copyright 2012-13 Francisco Ambrozio <sbo@franciscoambrozio.com>
+# Copyright 2014-2017 Larry Hajali <larryhaja[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.
+
+# Special thanks to Thomas Morper for some configuration adjustments tips
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=openresty
+VERSION=${VERSION:-1.21.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 [ ! -z "${PRINT_PACKAGE_NAME}" ]; 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=""
+   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=/opt/openresty \
+  --conf-path=/etc/openresty/nginx.conf \
+  --pid-path=/var/run/openresty.pid \
+  --user=${NGINXUSER:=nobody} \
+  --group=${NGINXGROUP:=nogroup} \
+  --error-log-path=/var/log/openresty/error.log \
+  --http-log-path=/var/log/openresty/access.log \
+  --with-file-aio \
+  --with-select_module \
+  --with-poll_module \
+  --with-threads \
+  --with-http_ssl_module \
+  --with-http_v2_module \
+  --with-http_realip_module \
+  --with-http_addition_module \
+  --with-http_xslt_module${DYNAMIC_MODULE} \
+  --with-http_image_filter_module${DYNAMIC_MODULE} \
+  --with-http_sub_module \
+  --with-http_dav_module \
+  --with-http_flv_module \
+  --with-http_mp4_module \
+  --with-http_gunzip_module \
+  --with-http_gzip_static_module \
+  --with-http_auth_request_module \
+  --with-http_random_index_module \
+  --with-http_secure_link_module \
+  --with-http_degradation_module \
+  --with-http_slice_module \
+  --with-http_stub_status_module \
+  --with-http_perl_module${DYNAMIC_MODULE} \
+  --with-mail${DYNAMIC_MODULE} \
+  --with-mail_ssl_module \
+  --with-stream${DYNAMIC_MODULE} \
+  --with-stream_ssl_module \
+  --with-stream_realip_module \
+  --with-stream_ssl_preread_module \
+  --with-cpp_test_module \
+  --with-compat \
+  --with-pcre \
+  --with-pcre-jit \
+  --with-libatomic \
+  $GEOIP_MOD \
+  $GPERF_MOD \
+  $ADD_MODULE
+
+gmake
+gmake install \
+  DESTDIR=$PKG \
+  INSTALLDIRS=vendor \
+  INSTALLVENDORMAN3DIR=/usr/man/man3
+
+find $PKG -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/man8
+install -m 0644 ./build/nginx-1.21.4/docs/man/nginx.8 $PKG/usr/man/man8
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+
+find $PKG -name perllocal.pod \
+  -o -name ".packlist" \
+  -o -name "*.bs" \
+  | xargs rm -f
+
+find $PKG/opt/openresty/ -type d -empty -delete
+
+find $PKG -perm 444 -exec chmod 0644 {} \;
+find $PKG -perm 555 -exec chmod 0755 {} \;
+
+# Make the temp path.
+mkdir -p $PKG/var/lib/$PRGNAM
+chmod 0700 $PKG/var/lib/$PRGNAM
+chown $NGINXUSER $PKG/var/lib/$PRGNAM
+
+# Move html directory
+#mkdir -p $PKG/var/www
+#mv $PKG/usr/html $PKG/var/www
+
+# Add an init script
+mkdir -p $PKG/etc/rc.d
+cat $CWD/rc.openresty > $PKG/etc/rc.d/rc.openresty.new
+
+mkdir -p $PKG/etc/logrotate.d
+sed -e "s,@USER@,$NGINXUSER," -e "s,@GROUP@,$NGINXGROUP," $CWD/openresty.logrotate \
+  > $PKG/etc/logrotate.d/openresty.new
+
+# Set the permissions for the log directory.
+chown $NGINXUSER $PKG/var/log/$PRGNAM
+chmod 750 $PKG/var/log/$PRGNAM
+
+# Create sub-directory for virtual servers.
+mkdir $PKG/etc/$PRGNAM/conf.d
+
+mkdir -p $PKG/usr/doc/openresty-$VERSION
+#cp -a CHANGES* LICENSE README $PKG/usr/doc/openresty-$VERSION
+cat $CWD/openresty.SlackBuild > $PKG/usr/doc/openresty-$VERSION/openresty.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
+ln -sf $PKG/opt/openresty/nginx/sbin/nginx /usr/bin/openresty
+
+# Don't clobber config files
+for i in $(find $PKG/etc/$PRGNAM -type f ! -name "*\.default"); do
+  mv "$i" "$i".new
+done
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/network/openresty/openresty.info b/network/openresty/openresty.info
new file mode 100644
index 0000000000..e371a6cbf1
--- /dev/null
+++ b/network/openresty/openresty.info
@@ -0,0 +1,10 @@
+PRGNAM="openresty"
+VERSION="1.21.4.3"
+HOMEPAGE="https://openresty.org/"
+DOWNLOAD="https://openresty.org/download/openresty-1.21.4.3.tar.gz"
+MD5SUM="9bb434e21a71d891b233fc1636186060"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="janshuez"
+EMAIL="janshuez[at]outlook[dot]com"
diff --git a/network/openresty/openresty.logrotate b/network/openresty/openresty.logrotate
new file mode 100644
index 0000000000..44a32e710e
--- /dev/null
+++ b/network/openresty/openresty.logrotate
@@ -0,0 +1,12 @@
+/var/log/openresty/*.log {
+  su @USER@ @GROUP@
+  rotate 10
+  notifempty
+  size 5M
+  compress
+  delaycompress
+  sharedscripts
+  postrotate
+    /etc/rc.d/rc.openresty rotate
+  endscript
+}
diff --git a/network/openresty/rc.openresty b/network/openresty/rc.openresty
new file mode 100644
index 0000000000..5df133ffc4
--- /dev/null
+++ b/network/openresty/rc.openresty
@@ -0,0 +1,96 @@
+#!/bin/sh
+#
+# Openresty daemon control script.
+# Written for Slackware Linux by Cherife Li <cherife-#-dotimes.com>.
+
+BIN=/usr/bin/openresty
+CONF=/etc/openresty/nginx.conf
+PID=/var/run/openresty.pid
+
+openresty_start() {
+  # Sanity checks.
+  if [ ! -r $CONF ]; then # no config file, exit:
+    echo "$CONF does not appear to exist. Abort."
+    exit 1
+  fi
+
+  if [ -s $PID ]; then
+    echo "Openresty appears to already be running?"
+    exit 1
+  fi
+
+  echo "Starting Openresty server daemon..."
+  if [ -x $BIN ]; then
+    $BIN -c $CONF
+  fi
+}
+
+openresty_test_conf() {
+  echo "Checking configuration for correct syntax and"
+  echo "then trying to open files referenced in configuration..."
+  $BIN -t -c $CONF
+}
+
+openresty_term() {
+  echo "Shutdown Openresty quickly..."
+  kill -TERM $(cat $PID)
+}
+
+openresty_stop() {
+  echo "Shutdown Openresty gracefully..."
+  kill -QUIT $(cat $PID)
+}
+
+openresty_reload() {
+  echo "Reloading Openresty configuration..."
+  kill -HUP $(cat $PID)
+}
+
+openresty_upgrade() {
+  echo "Upgrading to the new Openresty binary."
+  echo "Make sure the Openresty binary has been replaced with new one"
+  echo "or Openresty server modules were added/removed."
+  kill -USR2 $(cat $PID)
+  sleep 3
+  kill -QUIT $(cat $PID.oldbin)
+}
+
+openresty_rotate() {
+  echo "Rotating Openresty logs..."
+  kill -USR1 $(cat $PID)
+}
+
+openresty_restart() {
+  openresty_stop
+  sleep 3
+  openresty_start
+}
+
+case "$1" in
+  check)
+    openresty_test_conf
+    ;;
+  start)
+    openresty_start
+    ;;
+  term)
+    openresty_term
+    ;;
+  stop)
+    openresty_stop
+    ;;
+  reload)
+    openresty_reload
+    ;;
+  restart)
+    openresty_restart
+    ;;
+  upgrade)
+    openresty_upgrade
+    ;;
+  rotate)
+    openresty_rotate
+    ;;
+  *)
+  echo "usage: `basename $0` {check|start|term|stop|reload|restart|upgrade|rotate}"
+esac
diff --git a/network/openresty/slack-desc b/network/openresty/slack-desc
new file mode 100644
index 0000000000..7ad72b60a9
--- /dev/null
+++ b/network/openresty/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+         |-----handy-ruler------------------------------------------------------|
+openresty: openresty (a full-fledged web application server)
+openresty:
+openresty: bundling the standard nginx core.
+openresty: lots of 3rd-party nginx modules.
+openresty: as well as most of their external dependencies.
+openresty: as well as an IMAP/POP3 proxy server.
+openresty:
+openresty: Openresty is maintained by Yichun Zhang (agentzh).
+openresty: Nginx was written by Igor Sysoev.
+openresty: Homepage: https://openresty.org/
+openresty:
diff --git a/network/opensm/README b/network/opensm/README
index ba703b0980..7b58311899 100644
--- a/network/opensm/README
+++ b/network/opensm/README
@@ -4,9 +4,9 @@ for in order to initialize the InfiniBand hardware (at least
 one per each InfiniBand subnet).
 
 Run the SlackBild script with the environment variable METIS set to
-anything but "no" to enable metis support for nue routing:
+"YES" to enable metis support for nue routing:
 
-    env METIS=yes ./opensm.SlackBuild
+    env METIS=YES ./opensm.SlackBuild
 
 The optional dependency "metis" can be installed from either the
 "metis" or the "suitesparse" package, both of which are available
diff --git a/network/opensm/opensm.SlackBuild b/network/opensm/opensm.SlackBuild
index 5f62f4e5a7..2b51a9254e 100644
--- a/network/opensm/opensm.SlackBuild
+++ b/network/opensm/opensm.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for opensm
 
@@ -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=opensm
-VERSION=${VERSION:-3.3.22}
+VERSION=${VERSION:-3.3.24}
 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}
@@ -56,13 +63,17 @@ fi
 
 METIS=${METIS:-no}
 WITH_METIS=
-if [ "$METIS" != no ]; then
+if [ "`echo $METIS | tr 'a-z' 'A-Z'`" = YES ]; then
   for inc_dir in /usr/include/metis /usr/include/suitesparse; do
     if [ -e $inc_dir/metis.h ]; then
       WITH_METIS="--with-metis --with-metis-includes=$inc_dir"
       break
     fi
   done
+  if [ -z "$WITH_METIS" ]; then
+    echo "Error: metis enabled but headers not found."
+    exit 1
+  fi
 fi
 
 set -e
@@ -108,8 +119,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/network/opensm/opensm.info b/network/opensm/opensm.info
index a930e63f08..33a698e965 100644
--- a/network/opensm/opensm.info
+++ b/network/opensm/opensm.info
@@ -1,8 +1,8 @@
 PRGNAM="opensm"
-VERSION="3.3.22"
+VERSION="3.3.24"
 HOMEPAGE="https://github.com/linux-rdma"
-DOWNLOAD="https://github.com/linux-rdma/opensm/archive/3.3.22/opensm-3.3.22.tar.gz"
-MD5SUM="d29495665edbfede565cfa2958d7cf01"
+DOWNLOAD="https://github.com/linux-rdma/opensm/archive/3.3.24/opensm-3.3.24.tar.gz"
+MD5SUM="e469eb593366b22cea7415a860886338"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="rdma-core"
diff --git a/network/opensmtpd-extras/README b/network/opensmtpd-extras/README
new file mode 100644
index 0000000000..3ea2084472
--- /dev/null
+++ b/network/opensmtpd-extras/README
@@ -0,0 +1,37 @@
+OpenSMTPD extras - backends for OpenSMTPD tables, schedulers, queues
+and filters
+
+Allows using different backends for OpenSMTPD tables, schedulers, queues
+and filters, including SQLite, MySQL, PostgreSQL, LDAP...
+
+Each backend can be activated or deactivated by setting the relevant env
+var to yes or no. By default, Password, MySQL and SQLite table backends
+are built, since they are pretty straightforward to use, and everything
+is available on a stock Slackware installation.
+
+* Tables:
+TLDAP=no
+TMYSQL=yes
+TPOSTGRES=no   # requires potgresql
+TREDIS=no      # requires hiredis and redis
+TSOCKETMAP=no
+TPASSWORD=yes
+TPYTHON=no
+TSQLITE=yes
+TSTUB=no
+* Queues:
+QNULL=no
+QPYTHON=no
+QRAM=no
+QSTUB=no
+* Schedulers:
+SRAM=no
+SSTUB=no
+SPYTHON=no
+* Filters:
+FMONKEY=no
+FSTUB=no
+FTRACE=no
+FVOID=no
+* Other:
+STATS=no   # enable tool stats
diff --git a/network/opensmtpd-extras/opensmtpd-extras.SlackBuild b/network/opensmtpd-extras/opensmtpd-extras.SlackBuild
new file mode 100644
index 0000000000..d88626fa12
--- /dev/null
+++ b/network/opensmtpd-extras/opensmtpd-extras.SlackBuild
@@ -0,0 +1,191 @@
+#!/bin/bash
+# Slackware build script for opensmtpd-extras
+# Yth | Pont-en-Royans, France | yth@ythogtha.org
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
+# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=opensmtpd-extras
+SRCNAM=OpenSMTPD-extras
+VERSION=${VERSION:-6.7.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 -fstack-protector"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686 -fstack-protector"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC -fstack-protector"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2 -fstack-protector"
+  LIBDIRSUFFIX=""
+fi
+
+# Thanks to ffmpeg4 slackbuild !
+enable() {
+  VAR="$1"; shift
+  DEF="$1"; shift
+  YES="$1"; shift
+  NO="$1"; shift
+  eval "$VAR=\${$VAR:-$DEF}"
+  eval "enable_$VAR=\"$NO\""
+  eval "[ \"\$$VAR\" = \"yes\" ] && enable_$VAR=\"$YES\""
+}
+# set "enable_$VAR" variables
+#      ENV VAR      DEFAULT  IF YES                   IF NO
+# Filters
+enable "FMONKEY"    "no"     "--with-filter-monkey"   ""
+enable "FSTUB"      "no"     "--with-filter-stub"     ""
+enable "FTRACE"     "no"     "--with-filter-trace"    ""
+enable "FVOID"      "no"     "--with-filter-void"     ""
+# Queues
+enable "QNULL"      "no"     "--with-queue-null"      ""
+enable "QPYTHON"    "no"     "--with-queue-python"    ""
+enable "QRAM"       "no"     "--with-queue-ram"       ""
+enable "QSTUB"      "no"     "--with-queue-stub"      ""
+# Tables
+enable "TLDAP"      "no"     "--with-table-ldap"      ""
+enable "TMYSQL"     "yes"    "--with-table-mysql"     ""
+enable "TPOSTGRES"  "no"     "--with-table-postgres"  ""
+enable "TREDIS"     "no"     "--with-table-redis"     ""
+enable "TSOCKETMAP" "no"     "--with-table-socketmap" ""
+enable "TPASSWORD"  "yes"    "--with-table-passwd"    ""
+enable "TPYTHON"    "no"     "--with-table-python"    ""
+enable "TSQLITE"    "yes"    "--with-table-sqlite"    ""
+enable "TSTUB"      "no"     "--with-table-stub"      ""
+# Stats
+enable "STATS"      "no"     "--with-tool-stats"      ""
+# Schedulers
+enable "SRAM"       "no"     "--with-scheduler-ram"    ""
+enable "SSTUB"      "no"     "--with-scheduler-stub"   ""
+enable "SPYTHON"    "no"     "--with-scheduler-python" ""
+
+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 {} \;
+
+sh bootstrap
+
+CFLAGS="$SLKCFLAGS -D_DEFAULT_SOURCE" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc/opensmtpd \
+  --localstatedir=/var \
+  --mandir=/usr/man \
+  --with-mantype=doc \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --without-rpath \
+  --with-user-smtpd=smtpd \
+  --with-libssl=/usr/lib64/openssl-1.0/ \
+  $enable_FMONKEY \
+  $enable_FSTUB \
+  $enable_FTRACE \
+  $enable_FVOID \
+  $enable_QNULL \
+  $enable_QPYTHON \
+  $enable_QRAM \
+  $enable_QSTUB \
+  $enable_TLDAP \
+  $enable_TMYSQL \
+  $enable_TPOSTGRES \
+  $enable_TREDIS \
+  $enable_TSOCKETMAP \
+  $enable_TPASSWORD \
+  $enable_TPYTHON \
+  $enable_TSQLITE \
+  $enable_TSTUB \
+  $enable_STATS \
+  $enable_SRAM \
+  $enable_SSTUB \
+  $enable_SPYTHON \
+  --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
+
+# MySQL and Postgres man pages aren't installed by the build, but they are still relevant
+# We add them here if required.
+[ "$TMYSQL" = "yes" ] && MAN=1
+[ "$TPOSTGRES" = "yes" ] && MAN=1
+if [ "$MAN" = "1" ]; then
+	mkdir -p $PKG/usr/man/man5
+	[ "$TMYSQL" = "yes" ] && install -D -m 0644 extras/tables/table-mysql/table-mysql.5 \
+									 $PKG/usr/man/man5/table-mysql.5
+	[ "$TPOSTGRES" = "yes" ] && install -D -m 0644 extras/tables/table-postgres/table-postgres.5 \
+										$PKG/usr/man/man5/table-postgres.5
+fi
+# There might not be any man pages, depending on activated backends.
+# We wouldn't want to fail for such a petty reason, wouldn't we?
+if [ -d $PKG/usr/man ]; then
+	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 README.md $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 -p -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/network/opensmtpd-extras/opensmtpd-extras.info b/network/opensmtpd-extras/opensmtpd-extras.info
new file mode 100644
index 0000000000..d4461b1b3f
--- /dev/null
+++ b/network/opensmtpd-extras/opensmtpd-extras.info
@@ -0,0 +1,10 @@
+PRGNAM="opensmtpd-extras"
+VERSION="6.7.1"
+HOMEPAGE="https://www.opensmtpd.org/"
+DOWNLOAD="https://github.com/OpenSMTPD/OpenSMTPD-extras/archive/6.7.1/OpenSMTPD-extras-6.7.1.tar.gz"
+MD5SUM="342d3f9eebaf4171df6378642136f075"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="opensmtpd"
+MAINTAINER="Yth - Arnaud"
+EMAIL="yth@ythogtha.org"
diff --git a/network/opensmtpd-extras/slack-desc b/network/opensmtpd-extras/slack-desc
new file mode 100644
index 0000000000..51eea6e3a3
--- /dev/null
+++ b/network/opensmtpd-extras/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+                |-----handy-ruler------------------------------------------------------|
+opensmtpd-extras: opensmtpd-extras (backends for OpenSMTPD tables)
+opensmtpd-extras:
+opensmtpd-extras: Allows using different backends for OpenSMTPD tables, schedulers,
+opensmtpd-extras: queues and filters
+opensmtpd-extras:
+opensmtpd-extras: This includes using tables provided by SQLite, MySQL, PostgreSQL...
+opensmtpd-extras:
+opensmtpd-extras:
+opensmtpd-extras:
+opensmtpd-extras:
+opensmtpd-extras:
diff --git a/network/opensmtpd-filter-dkimsign/README b/network/opensmtpd-filter-dkimsign/README
new file mode 100644
index 0000000000..94f0e2330a
--- /dev/null
+++ b/network/opensmtpd-filter-dkimsign/README
@@ -0,0 +1,13 @@
+opensmtpd-filter-dkimsign adds a dkim signature to the email message.
+It supports the rsa and ed25519 signing algorithms.
+
+mandoc is needed only at build time.
+
+It is recommended to run filter-dkimsign as a non root user. For
+example, create a user and group "_dkimsign" (this name has come from
+an example in smtpd.conf(5)):
+
+  groupadd -g 376 _dkimsign
+  useradd -u 376 -g 376 -s /sbin/nologin -M _dkimsign
+
+The private key must be readable by this user.
diff --git a/network/opensmtpd-filter-dkimsign/opensmtpd-filter-dkimsign.SlackBuild b/network/opensmtpd-filter-dkimsign/opensmtpd-filter-dkimsign.SlackBuild
new file mode 100644
index 0000000000..9101a0c36c
--- /dev/null
+++ b/network/opensmtpd-filter-dkimsign/opensmtpd-filter-dkimsign.SlackBuild
@@ -0,0 +1,98 @@
+#!/bin/bash
+
+# Slackware build script for opensmtpd-filter-dkimsign
+
+# Copyright 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:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=opensmtpd-filter-dkimsign
+SPRGNAM=${PRGNAM#*-}
+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"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $SPRGNAM-$VERSION
+tar xvf $CWD/$SPRGNAM-$VERSION.tar.gz
+cd $SPRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -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 -f Makefile.gnu
+make -f Makefile.gnu CFLAGS="$SLKCFLAGS" MANDIR=/usr/man/man8 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
+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/network/opensmtpd-filter-dkimsign/opensmtpd-filter-dkimsign.info b/network/opensmtpd-filter-dkimsign/opensmtpd-filter-dkimsign.info
new file mode 100644
index 0000000000..35f3aa9e1e
--- /dev/null
+++ b/network/opensmtpd-filter-dkimsign/opensmtpd-filter-dkimsign.info
@@ -0,0 +1,10 @@
+PRGNAM="opensmtpd-filter-dkimsign"
+VERSION="0.6"
+HOMEPAGE="https://imperialat.at/dev/filter-dkimsign/"
+DOWNLOAD="https://imperialat.at/releases/filter-dkimsign-0.6.tar.gz"
+MD5SUM="f1ec294c9f1526d07c569e66d2d90d18"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="libopensmtpd"
+MAINTAINER="Alexander Verbovetsky"
+EMAIL="alik@ejik.org"
diff --git a/network/opensmtpd-filter-dkimsign/slack-desc b/network/opensmtpd-filter-dkimsign/slack-desc
new file mode 100644
index 0000000000..4a66d92236
--- /dev/null
+++ b/network/opensmtpd-filter-dkimsign/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+                         |-----handy-ruler------------------------------------------------------|
+opensmtpd-filter-dkimsign: opensmtpd-filter-dkimsign (OpenSMTPD filter for DKIM signing)
+opensmtpd-filter-dkimsign:
+opensmtpd-filter-dkimsign:
+opensmtpd-filter-dkimsign: opensmtpd-filter-dkimsign adds a dkim signature to the email message.
+opensmtpd-filter-dkimsign: It supports the rsa and ed25519 signing algorithms.
+opensmtpd-filter-dkimsign:
+opensmtpd-filter-dkimsign: Homepage: https://imperialat.at/dev/filter-dkimsign/
+opensmtpd-filter-dkimsign:
+opensmtpd-filter-dkimsign:
+opensmtpd-filter-dkimsign:
+opensmtpd-filter-dkimsign:
diff --git a/network/opensmtpd/README b/network/opensmtpd/README
index bbd1b2606f..fba4cc0dd4 100644
--- a/network/opensmtpd/README
+++ b/network/opensmtpd/README
@@ -3,6 +3,10 @@ as defined by RFC 5321, with some additional standard extensions.
 It allows ordinary machines to exchange e-mails with other systems
 speaking the SMTP protocol.
 
+This package conflicts with the stock postfix (or sendmail) package
+included in Slackware and overwrites some of its files,
+so remove the postfix (or sendmail) package before installing opensmtpd
+
 You must have smtpd and smtpq users and groups on the system for
 privilege separation - something like this should suffice:
 
@@ -11,16 +15,18 @@ privilege separation - something like this should suffice:
   groupadd -g 271 smtpq
   useradd -u 271 -g 271 -r -s /bin/false -d /var/empty smtpq
 
-You will want to add /etc/rc.d/rc.opensmtpd to rc.local so that it
-will start on boot (or perhaps consider symlinking rc.sendmail to
-rc.opensmtpd).
+You will want to modify rc.local so that OpenSMTPD
+will start on boot something like this:
+
+  # start opensmtpd a replacement for sendmail and postfix
+  if [ -x /etc/rc.d/rc.opensmtpd ]; then
+        . /etc/rc.d/rc.opensmtpd start
+  fi
 
-This package conflicts with the stock sendmail package included in
-Slackware and overwrites some of its files, so remove the sendmail
-package before installing opensmtpd.
+Optional Dependency: LibreSSL
 
-In the change from version 5.7.3p2 to 5.9.2p1 the ownership and permissions
-changed for the /var/spool/offline directory
+To use the LibreSSL runtime libraries
+   First install LibreSSL 
+    then build   OpenSMTPD
 
-  chown -R root:smtpq /var/spool/offline
-  chmod 770           /var/spool/offline
+For hints on using alpine with OpenSMTPD see the README.alpine file
diff --git a/network/opensmtpd/README.alpine b/network/opensmtpd/README.alpine
new file mode 100644
index 0000000000..e1d149b683
--- /dev/null
+++ b/network/opensmtpd/README.alpine
@@ -0,0 +1,21 @@
+
+Alpine hangs when sending mail using the opensmtp sendmail command and
+the opensmtpd server is down.
+
+To prevent this, modify the /etc/pine.conf or the user .pinerc to
+send the mail directly to the server instead of using the
+opensmtpd sendmail command:
+
+  smtp-server=localhost
+
+If the OpenSMTPD server is down, then alpine will indicate that
+the localhost has refused the connection.
+
+Or modify the sendmail command to have the -t option:
+
+  sendmail-path=/usr/sbin/sendmail -t
+
+And if the OpenSMTPD server is down, then alpine will indicate that
+the sendmail command has gotten an error.
+
+
diff --git a/network/opensmtpd/aliases b/network/opensmtpd/aliases
index ea54878974..85cc8e71ac 100644
--- a/network/opensmtpd/aliases
+++ b/network/opensmtpd/aliases
@@ -1,23 +1,49 @@
-# See aliases(5) for more information
+# Sample aliases file installed in /etc/opensmtpd/aliases
+#
+# Aliases in this file will NOT be expanded in the header from
+# Mail, but WILL be visible over networks or from /usr/libexec/mail.local.
+#
+#       >>>>>>>>>>      The program "newaliases" must be run after
+#       >> NOTE >>      this file is updated for any changes to
+#       >>>>>>>>>>      show through to smtpd.
+#
+
+# Person who should get root's mail. Don't receive mail as root!
+#root:          you
 
 # Basic system aliases -- these MUST be present
 MAILER-DAEMON:  postmaster
 postmaster:     root
 
 # General redirections for pseudo accounts
-bin:            root
 daemon:         root
 named:          root
-nobody:         root
 uucp:           root
 www:            root
 ftp-bugs:       root
 
+# Redirections for pseudo accounts that should not receive mail
+bin:    /dev/null
+build:  /dev/null
+nobody: /dev/null
+sshd:   /dev/null
+
 # Well-known aliases
 manager:        root
 dumper:         root
 operator:       root
-abuse:          postmaster
+
+# RFC 2142: NETWORK OPERATIONS MAILBOX NAMES
+abuse:          root
+# noc:          root
+security:       root
+
+# RFC 2142: SUPPORT MAILBOX NAMES FOR SPECIFIC INTERNET SERVICES
+# hostmaster:   root
+# usenet:       root
+# news:         usenet
+# webmaster:    root
+# ftp:          root
 
 # trap decode to catch security attacks
 decode:         root
diff --git a/network/opensmtpd/openbsd64-020-smtpd.patch b/network/opensmtpd/openbsd64-020-smtpd.patch
deleted file mode 100644
index a1aa51607a..0000000000
--- a/network/opensmtpd/openbsd64-020-smtpd.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- a/smtpd/smtp_session.c	3 Sep 2018 19:01:29 -0000	1.337
-+++ b/smtpd/smtp_session.c	1 Aug 2019 21:18:53 -0000
-@@ -1904,15 +1904,21 @@ smtp_reply(struct smtp_session *s, char 
- {
- 	va_list	 ap;
- 	int	 n;
--	char	 buf[LINE_MAX], tmp[LINE_MAX];
-+	char	 buf[LINE_MAX*2], tmp[LINE_MAX*2];
- 
- 	va_start(ap, fmt);
- 	n = vsnprintf(buf, sizeof buf, fmt, ap);
- 	va_end(ap);
--	if (n == -1 || n >= LINE_MAX)
--		fatalx("smtp_reply: line too long");
-+	if (n < 0)
-+		fatalx("smtp_reply: response format error");
- 	if (n < 4)
- 		fatalx("smtp_reply: response too short");
-+	if (n >= (int)sizeof buf) {
-+		/* only first three bytes are used by SMTP logic,
-+		 * so if _our_ reply does not fit entirely in the
-+		 * buffer, it's ok to truncate.
-+		 */
-+	}
- 
- 	log_trace(TRACE_SMTP, "smtp: %p: >>> %s", s, buf);
- 
diff --git a/network/opensmtpd/opensmtpd.SlackBuild b/network/opensmtpd/opensmtpd.SlackBuild
index b429cf360a..342996614b 100644
--- a/network/opensmtpd/opensmtpd.SlackBuild
+++ b/network/opensmtpd/opensmtpd.SlackBuild
@@ -1,9 +1,9 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for opensmtpd
 
 # Copyright 2013-2014  Robby Workman, Northport, Alabama, USA
-# Copyright 2015-2018  Richard Narron, California, USA
+# Copyright 2015-2024  Richard Narron, California, USA
 # 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=opensmtpd
-VERSION=${VERSION:-6.0.3p1}
-BUILD=${BUILD:-3}
+VERSION=${VERSION:-7.5.0p0}
+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}
@@ -81,9 +91,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
+
+rm -rf       $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd           $PRGNAM-$VERSION
 
 chown -R root:root .
 find -L . \
@@ -92,11 +103,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 {} \;
 
-# fix reply buffer overflow
-cat $CWD/openbsd64-020-smtpd.patch | patch -p1
-
-CFLAGS="$SLKCFLAGS -D_DEFAULT_SOURCE" \
-CXXFLAGS="$SLKCFLAGS" \
+# pickup files from libressl if it is installed
+CFLAGS="$SLKCFLAGS  -I/usr/include/libressl" \
+LDFLAGS="-L/usr/lib${LIBDIRSUFFIX}/libressl -lcrypto -lssl \
+-Wl,-rpath=/usr/lib${LIBDIRSUFFIX}/libressl" \
 ./configure \
   --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
@@ -104,7 +114,6 @@ CXXFLAGS="$SLKCFLAGS" \
   --localstatedir=/var \
   --with-path-socket=/var/run \
   --mandir=/usr/man \
-  --with-mantype=doc \
   --docdir=/usr/doc/$PRGNAM-$VERSION \
   --without-rpath \
   --with-path-mbox=/var/spool/mail \
@@ -138,10 +147,16 @@ ln -s smtpctl $PKG/usr/sbin/makemap
 mkdir -p $PKG/etc/rc.d
 cat $CWD/rc.opensmtpd > $PKG/etc/rc.d/rc.opensmtpd.new
 
-# Don't clobber the config file
+# copy original smtpd.conf file
+cp -p $PKG/etc/opensmtpd/smtpd.conf $PKG/etc/opensmtpd/smtpd.conf.upstream.default
+
+# Don't clobber the existing config file
 mv $PKG/etc/opensmtpd/smtpd.conf $PKG/etc/opensmtpd/smtpd.conf.new
 # and reflect the correct path to aliases file
-sed -i "s,/etc/mail/,/etc/opensmtpd/,g" $PKG/etc/opensmtpd/smtpd.conf.new
+# and use mbox instead of maildir
+sed -i -e "s,/etc/mail/,/etc/opensmtpd/,g" \
+       -e "s,maildir alias,mbox alias,g" \
+     $PKG/etc/opensmtpd/smtpd.conf.new
 
 # Create (but don't clobber) the aliases file
 cat $CWD/aliases > $PKG/etc/opensmtpd/aliases.new
@@ -163,14 +178,15 @@ chmod 0700 $PKG/var/spool/smtpd/purge
 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 LICENSE README.md THANKS $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/usr/doc/$PRGNAM-$VERSION
+cp -a CHANGES.md LICENSE README.md $PKG/usr/doc/$PRGNAM-$VERSION/
+cat $CWD/README             >      $PKG/usr/doc/$PRGNAM-$VERSION/README.slackware
+cat $CWD/README.alpine      >      $PKG/usr/doc/$PRGNAM-$VERSION/README.alpine
+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/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -p -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -p -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/network/opensmtpd/opensmtpd.info b/network/opensmtpd/opensmtpd.info
index 0930880299..31413fe623 100644
--- a/network/opensmtpd/opensmtpd.info
+++ b/network/opensmtpd/opensmtpd.info
@@ -1,10 +1,10 @@
 PRGNAM="opensmtpd"
-VERSION="6.0.3p1"
-HOMEPAGE="https://www.opensmtpd.org/"
-DOWNLOAD="https://www.opensmtpd.org/archives/opensmtpd-6.0.3p1.tar.gz"
-MD5SUM="66e496bb0f3303d660744f4fa2178765"
+VERSION="7.5.0p0"
+HOMEPAGE="https://opensmtpd.org/"
+DOWNLOAD="https://www.opensmtpd.org/archives/opensmtpd-7.5.0p0.tar.gz"
+MD5SUM="81d1987ab1bdbb04dbbedffb3334cc01"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="libasr"
+REQUIRES=""
 MAINTAINER="Richard Narron"
 EMAIL="richard@aaazen.com"
diff --git a/network/opensmtpd/rc.opensmtpd b/network/opensmtpd/rc.opensmtpd
index b75e3c53e4..f3154061c5 100644
--- a/network/opensmtpd/rc.opensmtpd
+++ b/network/opensmtpd/rc.opensmtpd
@@ -10,7 +10,7 @@ smtpd_start() {
 
 smtpd_stop() {
   echo "Stopping OpenSMTPD"
-  /usr/sbin/smtpctl stop 1>/dev/null 2>/dev/null || /usr/bin/pkill smtpd
+  /usr/bin/pkill -f /usr/sbin/smtpd
 }
 
 # Restart smtpd:
@@ -20,6 +20,12 @@ smtpd_restart() {
   smtpd_start
 }
 
+# Test the smtpd configuration:
+smtpd_testconf() {
+    echo "testing OpenSMTPD configuration:  /usr/sbin/smtpd -n"
+    /usr/sbin/smtpd -n
+}
+
 case "$1" in
 'start')
   smtpd_start
@@ -30,6 +36,9 @@ case "$1" in
 'restart')
   smtpd_restart
   ;;
+'testconf')
+  smtpd_testconf
+  ;;
 *)
-  echo "usage $0 start|stop|restart"
+  echo "usage $0 start|stop|restart|testconf"
 esac
diff --git a/network/openssh-krb5/README b/network/openssh-krb5/README
deleted file mode 100644
index 0ca4d8a065..0000000000
--- a/network/openssh-krb5/README
+++ /dev/null
@@ -1,12 +0,0 @@
-openssh-krb5 (Secure Shell daemon and clients - with Kerberos)
-
-ssh (Secure Shell) is a program for logging into a remote machine and
-for executing commands on a remote machine.  It is intended to replace
-rlogin and rsh, and provide secure encrypted communications between
-two untrusted hosts over an insecure network.
-
-This package builds openssh with Kerberos support, and it does not 
-conflict with the stock Slackware package (in fact, that package needs
-to stay, as this depends on other files contained in it).
-
-You will need to start /etc/rc.d/rc.sshd.krb5 during boot.
diff --git a/network/openssh-krb5/doinst.sh b/network/openssh-krb5/doinst.sh
deleted file mode 100644
index 18db6dbc1e..0000000000
--- a/network/openssh-krb5/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/rc.d/rc.sshd.krb5.new
-
diff --git a/network/openssh-krb5/openssh-7.4p1-libwrap.diff.gz b/network/openssh-krb5/openssh-7.4p1-libwrap.diff.gz
deleted file mode 100644
index 2e1900a528..0000000000
--- a/network/openssh-krb5/openssh-7.4p1-libwrap.diff.gz
+++ /dev/null
diff --git a/network/openssh-krb5/openssh-krb5.SlackBuild b/network/openssh-krb5/openssh-krb5.SlackBuild
deleted file mode 100644
index 1cd66566ee..0000000000
--- a/network/openssh-krb5/openssh-krb5.SlackBuild
+++ /dev/null
@@ -1,126 +0,0 @@
-#!/bin/sh
-
-# Copyright 2000 BSDi, Inc. Concord, CA, USA
-# Copyright 2001, 2002, 2003, 2004  Slackware Linux, Inc. Concord, CA, USA
-# Copyright 2006, 2007, 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, 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 Leigh Wedding <leigh.wedding@telstra.com> to build with
-# Kerberos support.  Note: requires MIT Kerberos to be installed.  Generated
-# package also relies in standard Slackware openssh package being installed.
-# Generated package does not overwrite or interfere with the standard
-# Slackware openssh package.
-
-PRGNAM=openssh-krb5
-SRCNAM=openssh
-VERSION=${VERSION:-7.4p1}
-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"
-elif [ "$ARCH" = "arm" ]; then
-  SLKCFLAGS="-O2 -march=armv4 -mtune=xscale"
-elif [ "$ARCH" = "armel" ]; then
-  SLKCFLAGS="-O2 -march=armv4t"
-else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-fi
-
-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 {} \;
-
-zcat $CWD/openssh-7.4p1-libwrap.diff.gz | patch -p1
-autoreconf -vif
-
-CFLAGS="$SLKCFLAGS" \
-./configure \
-  --prefix=/usr/kerberos \
-  --mandir=/usr/kerberos/man \
-  --sysconfdir=/etc/ssh \
-  --without-pam \
-  --with-md5-passwords \
-  --with-tcp-wrappers \
-  --with-default-path=/usr/local/sbin:/usr/sbin:/sbin:/usr/local/bin:/usr/bin:/bin:/usr/kerberos/bin \
-  --with-privsep-path=/var/empty \
-  --with-privsep-user=sshd \
-  --with-kerberos5=/usr/kerberos \
-  --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 un-needed stuff
-rm -r $PKG/usr/kerberos/man/ $PKG/etc/ssh $PKG/var
-rm -f $PKG/usr/kerberos/bin/ssh-{keyscan,keygen,agent,add}
-#for i in ssh-keyscan ssh-keygen ssh-agent ssh-add; do
-#  find $PKG -name ${i}\* -exec rm {} \;
-#done
-
-# Rename programs with .krb5 extension so we don't interfere with native
-for i in ssh scp sftp; do
-  mv $PKG/usr/kerberos/bin/$i $PKG/usr/kerberos/bin/$i.krb5
-done
-
-# Add init script
-mkdir -p $PKG/etc/rc.d
-cat $CWD/rc.sshd.krb5 > $PKG/etc/rc.d/rc.sshd.krb5.new
-chmod 0755 $PKG/etc/rc.d/rc.sshd.krb5.new
-
-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/network/openssh-krb5/openssh-krb5.info b/network/openssh-krb5/openssh-krb5.info
deleted file mode 100644
index 0163b7453c..0000000000
--- a/network/openssh-krb5/openssh-krb5.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="openssh-krb5"
-VERSION="7.4p1"
-HOMEPAGE="http://www.openssh.com/"
-DOWNLOAD="http://slackware.osuosl.org/slackware-14.2/patches/source/openssh/openssh-7.4p1.tar.gz"
-MD5SUM="b2db2a83caf66a208bb78d6d287cdaa3"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="krb5"
-MAINTAINER="Leigh Wedding"
-EMAIL="leigh.wedding@telstra.com"
diff --git a/network/openssh-krb5/rc.sshd.krb5 b/network/openssh-krb5/rc.sshd.krb5
deleted file mode 100644
index 5a324f0c2e..0000000000
--- a/network/openssh-krb5/rc.sshd.krb5
+++ /dev/null
@@ -1,59 +0,0 @@
-#!/bin/sh
-# Start/stop/restart the secure shell server:
-
-sshd_start() {
-  # Create host keys if needed.
-  if [ ! -r /etc/ssh/ssh_host_key ]; then
-    /usr/bin/ssh-keygen -t rsa1 -f /etc/ssh/ssh_host_key -N '' 
-  fi
-  if [ ! -f /etc/ssh/ssh_host_dsa_key ]; then
-    /usr/bin/ssh-keygen -t dsa -f /etc/ssh/ssh_host_dsa_key -N ''
-  fi
-  if [ ! -f /etc/ssh/ssh_host_rsa_key ]; then
-    /usr/bin/ssh-keygen -t rsa -f /etc/ssh/ssh_host_rsa_key -N ''
-  fi
-  if [ ! -f /etc/ssh/ssh_host_ecdsa_key ]; then
-    /usr/bin/ssh-keygen -t ecdsa -f /etc/ssh/ssh_host_ecdsa_key -N ''
-  fi
-  if [ ! -f /etc/ssh/ssh_host_ed25519_key ]; then
-    /usr/bin/ssh-keygen -t ed25519 -f /etc/ssh/ssh_host_ed25519_key -N ''
-  fi
-  /usr/kerberos/sbin/sshd
-}
-
-sshd_stop() {
-  killall sshd
-}
-
-sshd_restart() {
-  if [ -r /var/run/sshd.pid ]; then
-    echo "WARNING: killing listener process only.  To kill every sshd process, you must"
-    echo "         use 'rc.sshd stop'.  'rc.sshd restart' kills only the parent sshd to"
-    echo "         allow an admin logged in through sshd to use 'rc.sshd restart' without"
-    echo "         being cut off.  If sshd has been upgraded, new connections will now"
-    echo "         use the new version, which should be a safe enough approach."
-    kill `cat /var/run/sshd.pid`
-  else
-    echo "WARNING: There does not appear to be a parent instance of sshd running."
-    echo "         If you really want to kill all running instances of sshd (including"
-    echo "         any sessions currently in use), run '/etc/rc.d/rc.sshd stop' instead."
-    exit 1
-  fi
-  sleep 1
-  sshd_start
-}
-
-case "$1" in
-'start')
-  sshd_start
-  ;;
-'stop')
-  sshd_stop
-  ;;
-'restart')
-  sshd_restart
-  ;;
-*)
-  echo "usage $0 start|stop|restart"
-esac
-
diff --git a/network/openssh-krb5/slack-desc b/network/openssh-krb5/slack-desc
deleted file mode 100644
index be6325e2a6..0000000000
--- a/network/openssh-krb5/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------------------------------------------------------|
-openssh-krb5: openssh-krb5 (Secure Shell daemon and clients - with Kerberos)
-openssh-krb5:
-openssh-krb5: ssh (Secure Shell) is a program for logging into a remote machine and
-openssh-krb5: for executing commands on a remote machine.  It is intended to replace
-openssh-krb5: rlogin and rsh, and provide secure encrypted communications between
-openssh-krb5: two untrusted hosts over an insecure network.  sshd (SSH Daemon) is
-openssh-krb5: the daemon program for ssh.  OpenSSH is based on the last free version
-openssh-krb5: of Tatu Ylonen's SSH, further enhanced and cleaned up by Aaron
-openssh-krb5: Campbell, Bob Beck, Markus Friedl, Niels Provos, Theo de Raadt, and
-openssh-krb5: Dug Song.  It has a homepage at http://www.openssh.com/
-openssh-krb5:
diff --git a/network/openvas-cli/README b/network/openvas-cli/README
deleted file mode 100644
index 7ecb115885..0000000000
--- a/network/openvas-cli/README
+++ /dev/null
@@ -1,4 +0,0 @@
-openvas-cli (CLI for OpenVAS)
-
-This is the CLI module for the Open Vulnerability Assessment
-System (OpenVAS).
diff --git a/network/openvas-cli/openvas-cli.SlackBuild b/network/openvas-cli/openvas-cli.SlackBuild
deleted file mode 100644
index f76e48f398..0000000000
--- a/network/openvas-cli/openvas-cli.SlackBuild
+++ /dev/null
@@ -1,100 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for openvas-cli
-
-# Copyright 2015,2017 Kent Fritz, Mountain View, CA
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
-#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
-#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (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=openvas-cli
-VERSION=${VERSION:-1.4.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 {} \;
-
-mkdir -p build
-cd build
-  cmake \
-    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DLOCALSTATEDIR=/var \
-    -DSYSCONFDIR=/etc \
-    -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
-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
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a CHANGES 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
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/network/openvas-cli/openvas-cli.info b/network/openvas-cli/openvas-cli.info
deleted file mode 100644
index 7af2383962..0000000000
--- a/network/openvas-cli/openvas-cli.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="openvas-cli"
-VERSION="1.4.5"
-HOMEPAGE="http://www.openvas.org"
-DOWNLOAD="http://wald.intevation.org/frs/download.php/2397/openvas-cli-1.4.5.tar.gz"
-MD5SUM="4b03ea3e851d787ff7596bd3e08b20ba"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="openvas-libraries"
-MAINTAINER="Kent Fritz"
-EMAIL="fritz.kent@gmail.com"
diff --git a/network/openvas-cli/slack-desc b/network/openvas-cli/slack-desc
deleted file mode 100644
index 63e444a4c8..0000000000
--- a/network/openvas-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------------------------------------------------------|
-openvas-cli: openvas-cli (CLI for OpenVAS)
-openvas-cli:
-openvas-cli: This is the CLI module for the Open Vulnerability Assessment
-openvas-cli: System (OpenVAS).
-openvas-cli:
-openvas-cli: For more information, please refer to the OpenVAS website available
-openvas-cli: at http://www.openvas.org/ .
-openvas-cli:
-openvas-cli:
-openvas-cli:
-openvas-cli:
diff --git a/network/openvas-libraries/README b/network/openvas-libraries/README
deleted file mode 100644
index 066ad36f84..0000000000
--- a/network/openvas-libraries/README
+++ /dev/null
@@ -1,4 +0,0 @@
-openvas-libraries (Libraries used in OpenVAS)
-
-This is the libraries module for the Open Vulnerability Assessment
-System (OpenVAS).
diff --git a/network/openvas-libraries/openvas-libraries.SlackBuild b/network/openvas-libraries/openvas-libraries.SlackBuild
deleted file mode 100644
index bdf8afb040..0000000000
--- a/network/openvas-libraries/openvas-libraries.SlackBuild
+++ /dev/null
@@ -1,97 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for openvas-libraries
-
-# Copyright 2014-2015,2017 Kent Fritz, Mountain View, CA
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
-#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
-#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (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=openvas-libraries
-VERSION=${VERSION:-8.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 {} \;
-
-mkdir -p build
-cd build
-  cmake \
-    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DLOCALSTATEDIR=/var \
-    -DSYSCONFDIR=/etc \
-    -DCMAKE_BUILD_TYPE=Release ..
-  make
-  make install/strip DESTDIR=$PKG
-cd ..
-
-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 CHANGES COPYING COPYING.GPLv2 COPYING.LGPLv2 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
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/network/openvas-libraries/openvas-libraries.info b/network/openvas-libraries/openvas-libraries.info
deleted file mode 100644
index 4d0910950c..0000000000
--- a/network/openvas-libraries/openvas-libraries.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="openvas-libraries"
-VERSION="8.0.9"
-HOMEPAGE="http://www.openvas.org"
-DOWNLOAD="http://wald.intevation.org/frs/download.php/2433/openvas-libraries-8.0.9.tar.gz"
-MD5SUM="29a7da4958aa578f5ca35148f2ff456b"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="hiredis"
-MAINTAINER="Kent Fritz"
-EMAIL="fritz.kent@gmail.com"
diff --git a/network/openvas-libraries/slack-desc b/network/openvas-libraries/slack-desc
deleted file mode 100644
index c7e82f2d2e..0000000000
--- a/network/openvas-libraries/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------------------------------------------------------|
-openvas-libraries: openvas-libraries (Libraries used in OpenVAS)
-openvas-libraries:
-openvas-libraries: This is the libraries module for the Open Vulnerability Assessment
-openvas-libraries: System (OpenVAS).
-openvas-libraries:
-openvas-libraries: For more information, please refer to the OpenVAS website available
-openvas-libraries: at http://www.openvas.org/ .
-openvas-libraries:
-openvas-libraries:
-openvas-libraries:
-openvas-libraries:
diff --git a/network/openvas-manager/README b/network/openvas-manager/README
deleted file mode 100644
index 8906e2a1eb..0000000000
--- a/network/openvas-manager/README
+++ /dev/null
@@ -1,4 +0,0 @@
-openvas-manager (Manager for OpenVAS)
-
-This is the manager module for the Open Vulnerability Assessment
-System (OpenVAS).
diff --git a/network/openvas-manager/doinst.sh b/network/openvas-manager/doinst.sh
deleted file mode 100644
index 62615e72a5..0000000000
--- a/network/openvas-manager/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.openvasmd.new
-config etc/openvas/openvasmd_log.conf.new
-config etc/openvas/pwpolicy.conf.new
diff --git a/network/openvas-manager/openvas-manager.SlackBuild b/network/openvas-manager/openvas-manager.SlackBuild
deleted file mode 100644
index 3bdf8bcb9d..0000000000
--- a/network/openvas-manager/openvas-manager.SlackBuild
+++ /dev/null
@@ -1,109 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for openvas-manager
-
-# Copyright 2014-2015,2017 Kent Fritz, Mountain View, CA
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
-#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
-#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (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=openvas-manager
-VERSION=${VERSION:-6.0.11}
-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 {} \;
-
-mkdir -p build
-cd build
-  cmake \
-    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DLOCALSTATEDIR=/var \
-    -DSYSCONFDIR=/etc \
-    -DCMAKE_BUILD_TYPE=Release ..
-  make
-  make install DESTDIR=$PKG
-cd ..
-
-mkdir -p $PKG/etc/rc.d
-cat $CWD/rc.openvasmd > $PKG/etc/rc.d/rc.openvasmd.new
-chmod 0644 $PKG/etc/rc.d/rc.openvasmd.new
-mv $PKG/etc/openvas/openvasmd_log.conf $PKG/etc/openvas/openvasmd_log.conf.new
-mv $PKG/etc/openvas/pwpolicy.conf $PKG/etc/openvas/pwpolicy.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
-
-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
-mv $PKG/usr/share/doc/$PRGNAM/* $PKG/usr/doc/$PRGNAM-$VERSION
-rm -r $PKG/usr/share/doc
-cp -a CHANGES COPYING ChangeLog 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/network/openvas-manager/openvas-manager.info b/network/openvas-manager/openvas-manager.info
deleted file mode 100644
index ef14d38440..0000000000
--- a/network/openvas-manager/openvas-manager.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="openvas-manager"
-VERSION="6.0.11"
-HOMEPAGE="http://www.openvas.org"
-DOWNLOAD="http://wald.intevation.org/frs/download.php/2445/openvas-manager-6.0.11.tar.gz"
-MD5SUM="a9329a2e2329b2d1b7863d07ea0a8c22"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="openvas-libraries"
-MAINTAINER="Kent Fritz"
-EMAIL="fritz.kent@gmail.com"
diff --git a/network/openvas-manager/rc.openvasmd b/network/openvas-manager/rc.openvasmd
deleted file mode 100644
index 78595eea78..0000000000
--- a/network/openvas-manager/rc.openvasmd
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/bin/sh
-#
-# /etc/rc.d/rc.openvasmd
-#
-# Start/stop/restart the OpenVAS Manager Daemon.
-#
-# To make OpenVAS Manager start automatically at boot, make this
-# file executable:  chmod 755 /etc/rc.d/rc.openvasmd
-# and add to rc.local:
-# if [ -x /etc/rc.d/rc.openvasmd ]; then
-#   . /etc/rc.d/rc.openvasmd start
-# fi
-#
-
-OPENVASMD_PATH=/usr/sbin
-OPENVASMD_BIN=openvasmd
-OPENVASMD_OPTIONS="-a 127.0.0.1 --gnutls-priorities=SECURE128:-VERS-SSL3.0"
-OPENVASMD_CMD="$OPENVASMD_PATH/$OPENVASMD_BIN $OPENVASMD_OPTIONS"
-
-openvasmd_start() {
-  echo Starting OpenVAS Manager: $OPENVASMD_CMD
-  $OPENVASMD_CMD
-}
-
-openvasmd_stop() {
-  echo "Stopping OpenVAS Manager"
-  /bin/killall $OPENVASMD_BIN
-}
-
-openvasmd_restart() {
-  openvasmd_stop
-  openvasmd_start
-}
-
-case "$1" in
-'start')
-  openvasmd_start
-  ;;
-'stop')
-  openvasmd_stop
-  ;;
-'restart')
-  openvasmd_restart
-  ;;
-*)
-  echo "usage $0 start|stop|restart|reload"
-esac
diff --git a/network/openvas-manager/slack-desc b/network/openvas-manager/slack-desc
deleted file mode 100644
index 37a73de886..0000000000
--- a/network/openvas-manager/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------------------------------------------------------|
-openvas-manager: openvas-manager (Manager for OpenVAS)
-openvas-manager:
-openvas-manager: This is the manager module for the Open Vulnerability Assessment
-openvas-manager: System (OpenVAS).
-openvas-manager:
-openvas-manager: For more information, please refer to the OpenVAS website available
-openvas-manager: at http://www.openvas.org/ .
-openvas-manager:
-openvas-manager:
-openvas-manager:
-openvas-manager:
diff --git a/network/openvas-scanner/README b/network/openvas-scanner/README
deleted file mode 100644
index 807bb5dab5..0000000000
--- a/network/openvas-scanner/README
+++ /dev/null
@@ -1,4 +0,0 @@
-openvas-scanner (Scanner for OpenVAS)
-
-This is the scanner module for the Open Vulnerability Assessment
-System (OpenVAS).
diff --git a/network/openvas-scanner/doinst.sh b/network/openvas-scanner/doinst.sh
deleted file mode 100644
index 272ee56c16..0000000000
--- a/network/openvas-scanner/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.openvassd.new
diff --git a/network/openvas-scanner/openvas-scanner.SlackBuild b/network/openvas-scanner/openvas-scanner.SlackBuild
deleted file mode 100644
index 9ac50dd549..0000000000
--- a/network/openvas-scanner/openvas-scanner.SlackBuild
+++ /dev/null
@@ -1,107 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for openvas-scanner
-
-# Copyright 2014-2015,2017 Kent Fritz, Mountain View, CA
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
-#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
-#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (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=openvas-scanner
-VERSION=${VERSION:-5.0.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 {} \;
-
-mkdir -p build
-cd build
-  cmake \
-    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DLOCALSTATEDIR=/var \
-    -DSYSCONFDIR=/etc \
-    -DCMAKE_BUILD_TYPE=Release ..
-  make
-  make install DESTDIR=$PKG
-cd ..
-
-mkdir -p $PKG/etc/rc.d
-cat $CWD/rc.openvassd > $PKG/etc/rc.d/rc.openvassd.new
-chmod 0644 $PKG/etc/rc.d/rc.openvassd.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
-
-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
-mv $PKG/usr/share/doc/$PRGNAM/* $PKG/usr/doc/$PRGNAM-$VERSION
-rm -r $PKG/usr/share
-cp -a CHANGES COPYING COPYING.GPLv2 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/network/openvas-scanner/openvas-scanner.info b/network/openvas-scanner/openvas-scanner.info
deleted file mode 100644
index c2e10f02ac..0000000000
--- a/network/openvas-scanner/openvas-scanner.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="openvas-scanner"
-VERSION="5.0.8"
-HOMEPAGE="http://www.openvas.org"
-DOWNLOAD="http://wald.intevation.org/frs/download.php/2436/openvas-scanner-5.0.8.tar.gz"
-MD5SUM="020fb07e295c9695976bd397cab35926"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="openvas-libraries"
-MAINTAINER="Kent Fritz"
-EMAIL="fritz.kent@gmail.com"
diff --git a/network/openvas-scanner/rc.openvassd b/network/openvas-scanner/rc.openvassd
deleted file mode 100644
index 4be5cc156d..0000000000
--- a/network/openvas-scanner/rc.openvassd
+++ /dev/null
@@ -1,55 +0,0 @@
-#!/bin/sh
-#
-# /etc/rc.d/rc.openvassd
-#
-# Start/stop/restart/reload the OpenVAS Scanner Daemon.
-#
-# To make OpenVAS Scanner start automatically at boot, make this
-# file executable:  chmod 755 /etc/rc.d/rc.openvassd
-# and add to rc.local:
-# if [ -x /etc/rc.d/rc.openvassd ]; then
-#   . /etc/rc.d/rc.openvassd start
-# fi
-#
-
-OPENVASSD_PATH=/usr/sbin
-OPENVASSD_BIN=openvassd
-OPENVASSD_OPTIONS="-a 127.0.0.1 --gnutls-priorities=SECURE128:-VERS-SSL3.0"
-OPENVASSD_CMD="$OPENVASSD_PATH/$OPENVASSD_BIN $OPENVASSD_OPTIONS"
-
-openvassd_start() {
-  echo Starting OpenVAS Scanner: $OPENVASSD_CMD
-  $OPENVASSD_CMD
-}
-
-openvassd_stop() {
-  echo "Stopping OpenVAS Scanner"
-  /bin/killall $OPENVASSD_BIN
-}
-
-openvassd_restart() {
-  openvassd_stop
-  sleep 2
-  openvassd_start
-}
-
-openvassd_reload() {
-  /bin/killall -HUP $OPENVASSD_BIN
-}
-
-case "$1" in
-'start')
-  openvassd_start
-  ;;
-'stop')
-  openvassd_stop
-  ;;
-'restart')
-  openvassd_restart
-  ;;
-'reload')
-  openvassd_reload
-  ;;
-*)
-  echo "usage $0 start|stop|restart|reload"
-esac
diff --git a/network/openvas-scanner/slack-desc b/network/openvas-scanner/slack-desc
deleted file mode 100644
index 00047336b6..0000000000
--- a/network/openvas-scanner/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------------------------------------------------------|
-openvas-scanner: openvas-scanner (Scanner for OpenVAS)
-openvas-scanner:
-openvas-scanner: This is the scanner module for the Open Vulnerability Assessment
-openvas-scanner: System (OpenVAS).
-openvas-scanner:
-openvas-scanner: For more information, please refer to the OpenVAS website available
-openvas-scanner: at http://www.openvas.org/ .
-openvas-scanner:
-openvas-scanner:
-openvas-scanner:
-openvas-scanner:
diff --git a/network/openvswitch-utils/README b/network/openvswitch-utils/README
index 1efa3d3dcc..53793d8348 100644
--- a/network/openvswitch-utils/README
+++ b/network/openvswitch-utils/README
@@ -1,20 +1,21 @@
 Open vSwitch is a multilayer software switch licensed under the open
 source Apache 2 license. The goal is to implement a production quality
-switch platform that supports standard management interfaces and opens the
-forwarding functions to programmatic extension and control.
+switch platform that supports standard management interfaces and opens
+the forwarding functions to programmatic extension and control.
 
 Open vSwitch is well suited to function as a virtual switch in VM
 environments. In addition to exposing standard control and visibility
-interfaces to the virtual networking layer, it was designed to support
-distribution across multiple physical servers. Open vSwitch supports
-multiple Linux-based virtualization technologies including Xen/XenServer,
-KVM, and VirtualBox.
+interfaces to the virtual networking layer, it was designed to
+support distribution across multiple physical servers. Open vSwitch
+supports multiple Linux-based virtualization technologies including
+Xen/XenServer, KVM, and VirtualBox.
 
-Note: This package builds only the Open vSwitch userspace utilities, and
-it is incompatible with 'openvswitch' package found on SlackBuilds.org
-website. The stock Slackware kernel has been shipping Open vSwitch support
-for a while now, and these utilities take this advantage into account
-while providing a different approach to Open vSwitch management.
+Note: This package builds only the Open vSwitch userspace
+utilities, and it is incompatible with 'openvswitch' package found on
+SlackBuilds.org website. The stock Slackware kernel has been shipping
+Open vSwitch support for a while now, and these utilities take this
+advantage into account while providing a different approach to Open
+vSwitch management.
 
 See README.SLACKWARE (which is also installed with the package docs) for
 setup, configuration, and usage hints.
diff --git a/network/openvswitch-utils/openvswitch-utils.SlackBuild b/network/openvswitch-utils/openvswitch-utils.SlackBuild
index 14fe64a5bf..e8a64f0664 100644
--- a/network/openvswitch-utils/openvswitch-utils.SlackBuild
+++ b/network/openvswitch-utils/openvswitch-utils.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for openvswitch-utils
 
-# Copyright 2010, 2011, 2013, 2014, 2015, 2016, 2018  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
@@ -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=openvswitch-utils
-VERSION=${VERSION:-2.5.6}
-BUILD=${BUILD:-1}
+VERSION=${VERSION:-2.15.1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 SRCNAM=openvswitch
 
 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,12 +110,14 @@ 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 AUTHORS COPYING NEWS NOTICE $CWD/README.SLACKWARE $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a *.rst LICENSE NEWS NOTICE $CWD/README.SLACKWARE $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/network/openvswitch-utils/openvswitch-utils.info b/network/openvswitch-utils/openvswitch-utils.info
index b6c74887e9..5e074837c4 100644
--- a/network/openvswitch-utils/openvswitch-utils.info
+++ b/network/openvswitch-utils/openvswitch-utils.info
@@ -1,8 +1,8 @@
 PRGNAM="openvswitch-utils"
-VERSION="2.5.6"
+VERSION="2.15.1"
 HOMEPAGE="http://openvswitch.org/"
-DOWNLOAD="http://openvswitch.org/releases/openvswitch-2.5.6.tar.gz"
-MD5SUM="4b27da13c7f0c76c56bdcfa76deb0e77"
+DOWNLOAD="http://openvswitch.org/releases/openvswitch-2.15.1.tar.gz"
+MD5SUM="2eaee0ffd9caee87bed2d682af7075ac"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/network/openvswitch-utils/rc.openvswitch b/network/openvswitch-utils/rc.openvswitch
index 8022ae3b74..c173da0a92 100644
--- a/network/openvswitch-utils/rc.openvswitch
+++ b/network/openvswitch-utils/rc.openvswitch
@@ -13,9 +13,10 @@
 #
 
 DBCONF=/etc/openvswitch/ovs-vswitchd.conf.db
-SOCKET=/var/run/openvswitch/db.sock
-VSPID=/var/run/openvswitch/ovs-vswitchd.pid
-DBPID=/var/run/openvswitch/ovsdb-server.pid
+RUNDIR=/var/run/openvswitch
+SOCKET=$RUNDIR/db.sock
+VSPID=$RUNDIR/ovs-vswitchd.pid
+DBPID=$RUNDIR/ovsdb-server.pid
 
 # Insert kernel driver for Open vSwitch:
 /sbin/modprobe openvswitch
@@ -26,6 +27,7 @@ DBPID=/var/run/openvswitch/ovsdb-server.pid
 # Start openvswitch:
 openvswitch_start() {
   echo "Starting openvswitch:  /etc/rc.d/rc.openvswitch"
+  mkdir -p $RUNDIR
   /usr/sbin/ovsdb-server /etc/openvswitch/ovs-vswitchd.conf.db --remote=punix:$SOCKET \
     --detach --pidfile=$DBPID --verbose=ANY:ANY:err
   /usr/bin/ovs-vsctl --no-wait --verbose=ANY:ANY:err init
@@ -37,11 +39,11 @@ openvswitch_stop() {
   echo "Stopping openvswitch:  /etc/rc.d/rc.openvswitch"
   if [ -e $VSPID ]; then
     pid=$(cat $VSPID)
-    /usr/bin/ovs-appctl -t /var/run/openvswitch/ovs-vswitchd.$pid.ctl exit
+    /usr/bin/ovs-appctl -t $RUNDIR/ovs-vswitchd.$pid.ctl exit
   fi
   if [ -e $DBPID ]; then
     pid=$(cat $DBPID)
-    /usr/bin/ovs-appctl -t /var/run/openvswitch/ovsdb-server.$pid.ctl exit
+    /usr/bin/ovs-appctl -t $RUNDIR/ovsdb-server.$pid.ctl exit
   fi
 }
 
diff --git a/network/opera-developer/README b/network/opera-developer/README
deleted file mode 100644
index 5c3077c8bb..0000000000
--- a/network/opera-developer/README
+++ /dev/null
@@ -1,16 +0,0 @@
-opera-developer (A fast and secure web browser)
-
-Opera is a graphical Web browser available on several platforms.
-The desktop version runs on GNU/Linux and FreeBSD. Versions for
-Macintosh and Windows are also available.
-
-This is a Development version of Opera browser, for Stable version
-please see "opera" and for a old version based on
-Presto engine, please see a SlackBuild called "opera-legacy".
-
-NOTE: Since version 46.0.2590.0 Opera's drops 32 bits support, for more:
-https://blogs.opera.com/desktop/2017/05/opera-developer-46-0-2590-0-update/
-
-This suggests: pepperflash-plugin, ffmpeg, opera-developer-ffmpeg-codecs
-
-Changelog: https://blogs.opera.com/desktop/changelog-for-64/#b3380.0
diff --git a/network/opera-developer/doinst.sh b/network/opera-developer/doinst.sh
deleted file mode 100644
index aea0f894eb..0000000000
--- a/network/opera-developer/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/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/network/opera-developer/eula.html b/network/opera-developer/eula.html
deleted file mode 100644
index 339f72dd33..0000000000
--- a/network/opera-developer/eula.html
+++ /dev/null
@@ -1,287 +0,0 @@
-  <!DOCTYPE html>
-<html lang="en">
-  <head>
-    
-    
-    <meta http-equiv="content-type" content="text/html; charset=utf-8">
-    <meta name="viewport" content="initial-scale=1, width=device-width">
-    <meta name="msvalidate.01" content="070C6E8E67D398B03BD8D8E9408A7045">
-          <meta name="yandex-verification" content="780cc78194f8c462">
-    
-                  <meta name="robots" content="noyaca, noodp">
-        
-          <meta name="description" content="EULA Opera for computers">
-    
-    
-    <meta property="og:image" content="https://www-static.operacdn.com/static-heap/75/759b5d5a74e1be5fdfd0fd1fed338c9d1c6cbb33/opera-152.png">
-          <meta property="og:title" content="EULA Opera for computers | Opera">
-        <meta property="og:url" content="https://www.opera.com/eula/computers">
-          <meta property="og:description" content="EULA Opera for computers">
-        <meta property="og:type" content="website">
-
-    
-          <title>EULA Opera for computers | Opera</title>
-    
-    
-    <link rel="dns-prefetch" href="//www-static.operacdn.com">
-    <link rel="apple-touch-icon" href="https://www-static.operacdn.com/static-heap/91/91051bd6095b8484c359274af1ec222b6bd293d4/opera-57.png">
-    <link rel="apple-touch-icon" sizes="57x57" href="https://www-static.operacdn.com/static-heap/91/91051bd6095b8484c359274af1ec222b6bd293d4/opera-57.png">
-    <link rel="apple-touch-icon" sizes="72x72" href="https://www-static.operacdn.com/static-heap/1d/1db0d666779ad5dc2bde071f1e64223cbc898079/opera-72.png">
-    <link rel="apple-touch-icon" sizes="76x76" href="https://www-static.operacdn.com/static-heap/ca/cab9c89aeabd94f19da89e4aae5fac8077f40288/opera-76.png">
-    <link rel="apple-touch-icon" sizes="114x114" href="https://www-static.operacdn.com/static-heap/3e/3eb93f40546e3dd463deb58e5a5b59ace97d8cff/opera-114.png">
-    <link rel="apple-touch-icon" sizes="120x120" href="https://www-static.operacdn.com/static-heap/ab/ab7832e9d56e106488f110e871c46f774576b093/opera-120.png">
-    <link rel="apple-touch-icon" sizes="144x144" href="https://www-static.operacdn.com/static-heap/5e/5ed11b7f90d7abe5af33392636f1e1fd40f8d40f/opera-144.png">
-    <link rel="apple-touch-icon" sizes="152x152" href="https://www-static.operacdn.com/static-heap/75/759b5d5a74e1be5fdfd0fd1fed338c9d1c6cbb33/opera-152.png">
-
-    
-    <meta name="application-name" content="EULA Opera for computers - Opera">
-    <meta name="msapplication-TileColor" content="#FE1B2C">
-    <meta name="msapplication-TileImage" content="https://www-static.operacdn.com/static-heap/6a/6aa0021764af934c8431d64fbf508a90ef30846d/opera-windows-144.png">
-    <meta name="msapplication-square70x70logo" content="https://www-static.operacdn.com/static-heap/27/27d2de5f321780e481fcd3cf8e7a4800295ed5bd/opera-windows-70.png">
-    <meta name="msapplication-square150x150logo" content="https://www-static.operacdn.com/static-heap/05/0556dff691cc07304d9f12204548ab63c3142368/opera-windows-150.png">
-    <meta name="msapplication-wide310x150logo" content="https://www-static.operacdn.com/static-heap/42/42554ff6fabadcc22853c011b777923e56a2a94c/opera-windows-310-150.png">
-    <meta name="msapplication-square310x310logo" content="https://www-static.operacdn.com/static-heap/99/9938c6221aba7d87edf2ec2795206bf92d4c3d29/opera-windows-310.png">
-
-    
-                                                                                                  <link rel="alternate" hreflang="id" href="https://www.opera.com/id/eula/computers" />
-                                                                                                    <link rel="alternate" hreflang="ms" href="https://www.opera.com/ms/eula/computers" />
-                                                                                                    <link rel="alternate" hreflang="cs" href="https://www.opera.com/cs/eula/computers" />
-                                                                                                    <link rel="alternate" hreflang="da" href="https://www.opera.com/da/eula/computers" />
-                                                                                                    <link rel="alternate" hreflang="de" href="https://www.opera.com/de/eula/computers" />
-                                                                                  <link rel="canonical" hreflang="en" href="https://www.opera.com/eula/computers" />
-                                                                                                    <link rel="alternate" hreflang="es" href="https://www.opera.com/es/eula/computers" />
-                                                                                                    <link rel="alternate" hreflang="es-419" href="https://www.opera.com/es-419/eula/computers" />
-                                                                                                    <link rel="alternate" hreflang="tl" href="https://www.opera.com/tl/eula/computers" />
-                                                                                                    <link rel="alternate" hreflang="fr" href="https://www.opera.com/fr/eula/computers" />
-                                                                                                    <link rel="alternate" hreflang="it" href="https://www.opera.com/it/eula/computers" />
-                                                                                                    <link rel="alternate" hreflang="hu" href="https://www.opera.com/hu/eula/computers" />
-                                                                                                    <link rel="alternate" hreflang="nl" href="https://www.opera.com/nl/eula/computers" />
-                                                                                                    <link rel="alternate" hreflang="no" href="https://www.opera.com/no/eula/computers" />
-                                                                                                    <link rel="alternate" hreflang="pl" href="https://www.opera.com/pl/eula/computers" />
-                                                                                                    <link rel="alternate" hreflang="pt" href="https://www.opera.com/pt/eula/computers" />
-                                                                                                    <link rel="alternate" hreflang="pt-br" href="https://www.opera.com/pt-br/eula/computers" />
-                                                                                                    <link rel="alternate" hreflang="ro" href="https://www.opera.com/ro/eula/computers" />
-                                                                                                    <link rel="alternate" hreflang="sk" href="https://www.opera.com/sk/eula/computers" />
-                                                                                                    <link rel="alternate" hreflang="fi" href="https://www.opera.com/fi/eula/computers" />
-                                                                                                    <link rel="alternate" hreflang="sv" href="https://www.opera.com/sv/eula/computers" />
-                                                                                                    <link rel="alternate" hreflang="vi" href="https://www.opera.com/vi/eula/computers" />
-                                                                                                    <link rel="alternate" hreflang="tr" href="https://www.opera.com/tr/eula/computers" />
-                                                                                                    <link rel="alternate" hreflang="el" href="https://www.opera.com/el/eula/computers" />
-                                                                                                    <link rel="alternate" hreflang="bg" href="https://www.opera.com/bg/eula/computers" />
-                                                                                                    <link rel="alternate" hreflang="ru" href="https://www.opera.com/ru/eula/computers" />
-                                                                                                    <link rel="alternate" hreflang="uk" href="https://www.opera.com/uk/eula/computers" />
-                                                                                                    <link rel="alternate" hreflang="he" href="https://www.opera.com/he/eula/computers" />
-                                                                                                    <link rel="alternate" hreflang="ar" href="https://www.opera.com/ar/eula/computers" />
-                                                                                                    <link rel="alternate" hreflang="hi" href="https://www.opera.com/hi/eula/computers" />
-                                                                                                    <link rel="alternate" hreflang="th" href="https://www.opera.com/th/eula/computers" />
-                                                                                                    <link rel="alternate" hreflang="ko" href="https://www.opera.com/ko/eula/computers" />
-                                                                                                    <link rel="alternate" hreflang="zh-cn" href="https://www.opera.com/zh-cn/eula/computers" />
-                                                                                                    <link rel="alternate" hreflang="zh-tw" href="https://www.opera.com/zh-tw/eula/computers" />
-                                                                                                    <link rel="alternate" hreflang="ja" href="https://www.opera.com/ja/eula/computers" />
-              
-                        <link rel="stylesheet" type="text/css" media="all" href="https://www-static.operacdn.com/extension/opera/design/opera/static/css/latin_latinext-634dce27.css">
-        
-                  <link rel="stylesheet" type="text/css" media="all" href="https://www-static.operacdn.com/extension/opera/design/opera/static/css/header-footer-8618b3a3.css">
-                  <link rel="stylesheet" type="text/css" media="all" href="https://www-static.operacdn.com/extension/opera/design/opera/static/css/opera2-3353345c.css">
-                              
-    
-    
-    
-      </head>
-  <body>
-          <!-- Google Tag Manager -->
-
-  <noscript><iframe src="//www.googletagmanager.com/ns.html?id=GTM-Q5SW"
-  height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript>
-  <script>
-    (function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start':
-    new Date().getTime(),event:'gtm.js'});var f=d.getElementsByTagName(s)[0],
-            j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src=
-            '//www.googletagmanager.com/gtm.js?id='+i+dl;f.parentNode.insertBefore(j,f);
-            })(window,document,'script','dataLayer','GTM-Q5SW');
-  </script>
-
-<!-- End Google Tag Manager -->
-              
-    <header id="header" class="ns--hf">
-      <div class="hf--primary">
-        <div class="hf--width-holder">
-          <div class="hf--main-nav" role="navigation">
-            <a class="hf--brand" href="/">
-                              <img src="https://www-static.operacdn.com/static-heap/11/11bb20439edcccff33dbfa6df6f4c9ad564f91e4/logo-header-opera.png" srcset="https://www-static.operacdn.com/static-heap/11/11bb20439edcccff33dbfa6df6f4c9ad564f91e4/logo-header-opera.png 1x, https://www-static.operacdn.com/static-heap/28/2820d98042080cc51dea518980d80293bf732770/logo-header-opera2x.png 2x" alt="Opera">
-                          </a>
-            <div class="hf--menu">
-              <input id="hf--menu-switcher" class="hf--hide" type="checkbox">
-              <label class="hf--menu-switcher" for="hf--menu-switcher"></label>
-              <div>
-                <div>
-                  <ul class="hf--main-nav-items" role="menu">
-                                                                                                      
-                                                                                                          <li><a href="/computer" data-event-action="hf-main-nav-item" data-event-category="hf" role="menuitem">Computer browsers</a></li>
-                                                                                                            <li><a href="/mobile" data-event-action="hf-main-nav-item" data-event-category="hf" role="menuitem">Mobile apps</a></li>
-                                                              
-                                        
-                                        <li class="hf--menu-opposite">
-                                              <a href="//blogs.opera.com/" data-event-action="hf-main-nav-item" data-event-category="hf" role="menuitem">Blogs</a>
-                                          </li>
-                  </ul>
-                </div>
-              </div>
-            </div>
-          </div>
-        </div>
-      </div>
-
-      
-                                    
-      
-          </header>
-    
-    
-        
-    <main  class="page">
-      <div class="page--content">
-
-    
-      
-                    
-                
-    
-                  
-
-<section class="top-padding--oneline">
-  <div class="content-width"><h1>End User License Agreement</h1>
-<h2>Opera for Computers</h2>
-<p>Last Updated: December 8, 2017</p><p>This end user license agreement (“EULA”) governs your download and/or use of the executable code for the Opera for Computers desktop software application, including any update or upgrade thereto (“Software”). This EULA forms a binding contract between you and Opera Software AS, a Norwegian company with an address at P.O. Box 4214 Nydalen, NO-0401 Oslo, Norway (“Opera”).</p><h3>Terms &amp; Conditions</h3>
-<p><b>1. This is a contract.</b>&nbsp;This EULA constitutes a contract between you and Opera. You may not use the Software if you do not accept the terms in this EULA. By downloading and/or using the Software, you agree to be bound by all the terms and conditions set forth in this EULA. If you are under thirteen (13) years of age, or at least thirteen (13) years of age but a minor where you live, you must have your parent or legal guardian accept this EULA on your behalf and approve your use of the Software.</p><p><b>2. You are only granted a limited license to the Software.</b>&nbsp;Subject to the terms and conditions of this EULA, Opera hereby grants you a personal, limited, non-exclusive, non-transferable, non-sublicensable license to:</p><p>(A) use the executable code version of the Software solely as installed on your personal computer; and</p><p>(B) reproduce and distribute the Software solely as included in an application repository for a desktop open source operating system distribution PROVIDED THAT in all cases the Software is distributed: (i) without modification; (ii) free of charge to end-users; and (iii) with a copy of this EULA. Distribution for embedded open source operating systems is not permitted. For the avoidance of doubt, the Software must be distributed without modification (including as to the default search engine(s) in the Software settings), both at the time of distribution as well as after the Software is installed.</p><p>You may only use the Software as expressly authorized in this Section 2.</p><p><b>3. You must respect our rights in the Software.</b>&nbsp;Unless expressly permitted by law, you may not copy, decompile, reverse engineer, disassemble, attempt to derive the source code of, modify, or create derivative works of the Software. You may not remove, obscure, or alter any copyright notice or other proprietary rights notices affixed to or contained within the Software. You may not separate the component programs of the Software for use on different computers or sublicense, lease, rent, loan, or distribute the Software to any third party. You may not permit, direct or authorize any third party to take any action with respect to the Software which is inconsistent with the terms set forth in this EULA.</p><p><b>4. The Software contains our valuable intellectual property.</b>&nbsp;You acknowledge and agree that the Software, including its sequence, structure, organization, source code and applicable documentation, contains valuable trade secrets and other intellectual property of Opera and its suppliers. The Software is licensed and not sold to you, and no title or ownership to such Software or the intellectual property rights embodied therein is granted to you. The Software is the exclusive property of Opera and its suppliers, and all rights in and to the Software not expressly granted to you in this Agreement are reserved. Nothing in this EULA will be deemed to grant, by implication, estoppel or otherwise, a license under any existing or future patents of Opera, except to the extent necessary for you to use the Software as expressly permitted under this EULA. You acknowledge and agree that any actual or threatened breach of this EULA will constitute immediate, irreparable harm to Opera for which monetary damages would be an inadequate remedy, and that injunctive relief is an appropriate remedy for any such breach or violation.</p><p><b>5. Components from third parties may be delivered along with the Software.</b>&nbsp;The Software is delivered along with certain software components provide by third parties (“Third Party Software”). Opera shall not be responsible for any such Third-Party Software. Third-Party Software, particularly open source software, may be subject to separate license terms included with, or contained in the setup installation segments of such Third-Party Software. The terms set forth in this EULA do not apply to Third-Party Software to the extent they are inconsistent with such Third-Party Software licenses. This EULA governs your use of the Software in executable form. Source code for any open source Third-Party Software delivered along with the Software can be obtained at&nbsp;<a href="http://sourcecode.opera.com" target="_self">http://sourcecode.opera.com</a>&nbsp;or by sending an email message to&nbsp;<a href="mailto:opensource&#x0040;opera.com" target="_self">opensource&#x0040;opera.com</a>.</p><p><b>6. The Software may provide for access to additional services.</b> Various services may be offered where available via or as integrated into the Software (“Services”). By using any such Services, you agreed to the terms of service at&nbsp;<a href="https://www.opera.com/terms" target="_self">https://www.opera.com/terms</a> (“Terms of Service”). The Terms of Service are incorporated into this EULA by this reference. As is more fully explained in the Terms of Service, some Services are offered by Opera, others by third parties (which may be subject to separate terms – please refer to the Terms of Service for more information). Opera reserves the right at any time and from time to time to modify or discontinue, temporarily or permanently, the Services (or any part thereof) with or without notice. You agree that Opera shall not be liable to you or to any third party for any modification, suspension or discontinuance of the Services.</p><p><b>7. Your privacy is important to us.</b>&nbsp;Opera takes the matters of protection and security of its users’ information very seriously and will treat any and all such information in accordance with our privacy statement, which is currently posted at&nbsp;<a href="https://www.opera.com/privacy" target="_self">https://www.opera.com/privacy</a>&nbsp;(“Privacy Statement”). The Privacy Statement is incorporated into this EULA by this reference. You agree to the use of your data in accordance with Opera’s Privacy Statement.</p><p><b>8. Your license to use the Software terminates if you breach this EULA.</b>&nbsp;This EULA will commence upon your download of the Software and continue in perpetuity unless terminated earlier as provided herein. This EULA will immediately terminate upon your breach of any of the terms or conditions set forth herein. Upon the termination of the EULA, you will discontinue all use of the Software, promptly destroy or have destroyed the Software and any copies thereof, and, upon request by Opera, certify in writing that such destruction has taken place. These remedies are cumulative and in addition to any other remedies which may be available. Section 1, as well as Sections 3 through 14 of this EULA shall survive termination.</p><p><b>9. The Software is provided without any warranties or guarantees.</b>&nbsp;THE SOFTWARE IS PROVIDED “AS IS”, AND OPERA DISCLAIMS ALL WARRANTIES WITH REGARD TO THE SOFTWARE WHETHER EXPRESS, IMPLIED OR STATUTORY, INCLUDING WITHOUT LIMITATION THE IMPLIED WARRANTIES OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR USE, SATISFACTORY QUALITY, OR QUIET ENJOYMENT. OPERA DOES NOT WARRANT THAT THE USE OF THE SOFTWARE WILL BE UNINTERRUPTED OR ERROR FREE OR THAT THE SOFTWARE DOES NOT CONTAIN ANY VIRUSES. THIS WARRANTY DISCLAIMER IS A FUNDAMENTAL ELEMENT OF THE BASIS OF THE BARGAIN BETWEEN YOU AND OPERA. OPERA WOULD NOT PROVIDE THE SOFTWARE ABSENT SUCH DISCLAIMER. NO REPRESENTATIONS OR WARRANTIES ARE MADE BY ANY OF OPERA’S CUSTOMERS OR SUPPLIERS UNDER OR BY VIRTUE OF THIS AGREEMENT. IF YOU ARE DISSATISFIED WITH ANY PORTION OF THE SOFTWARE, OR WITH ANY OF THESE TERMS, YOUR SOLE AND EXCLUSIVE REMEDY IS TO DISCONTINUE USING THE SOFTWARE.</p><p><b>10. Opera is not liable for any damages you may incur.</b>&nbsp;IN NO EVENT SHALL OPERA, ITS AFFILIATES, OR THEIR RESPECTIVE SUPPLIERS OR CUSTOMERS BE LIABLE FOR ANY INCIDENTAL, SPECIAL, CONSEQUENTIAL, OR INDIRECT DAMAGES OF ANY KIND (INCLUDING WITHOUT LIMITATION DAMAGES FOR INTERRUPTION OF BUSINESS, LOST DATA, LOST PROFITS, OR THE LIKE) REGARDLESS OF THE FORM OF ACTION, WHETHER IN CONTRACT, TORT (INCLUDING WITHOUT LIMITATION NEGLIGENCE), PRODUCT LIABILITY, OR OTHER THEORY, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. IN NO EVENT WILL THE CUMULATIVE LIABILITY OF OPERA ARISING OUT OF OR RELATED TO THIS AGREEMENT EXCEED THE AMOUNT PAID TO OPERA IN RESPECT OF THE SOFTWARE GIVING RISE TO THE CLAIM OR, IF NO FEES WERE PAID, THEN FIVE HUNDRED EUROS. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO THE FOREGOING EXCLUSION AND LIMITATION MAY NOT APPLY TO YOU. THIS LIMITATION OF LIABILITY WILL APPLY NOTWITHSTANDING THE FAILURE OF ESSENTIAL PURPOSE OF ANY LIMITED REMEDY SET FORTH HEREIN. THIS LIMITATION OF LIABILITY IS A FUNDAMENTAL ELEMENT OF THE BASIS OF THE BARGAIN BETWEEN YOU AND OPERA. OPERA WOULD NOT PROVIDE THE SOFTWARE TO YOU ABSENT SUCH LIMITATION.</p><p><b>11. This contract is based on Norwegian law.</b>&nbsp;This EULA will be governed by the laws of Norway without giving effect to any conflicts of law principles that may require the application of the laws of a different country. The United Nations Convention on Contracts for the International Sale of Goods does not apply to this Agreement. All actions or proceedings arising under or related to this Agreement must be brought in the Oslo City Court, and you hereby agree to irrevocably submit to the exclusive jurisdiction and venue of any such court in all such actions or proceedings. Notwithstanding this, you agree that Opera shall still be allowed to apply for injunctive remedies (or an equivalent type of urgent legal relief) in any jurisdiction. If any provision of this EULA is determined by a court of competent jurisdiction to be invalid, illegal, or unenforceable, the remaining provisions of this EULA shall not be affected or impaired thereby.</p><p><b>12. Opera may modify these Terms.</b>&nbsp;Opera may update the terms of this EULA, the Privacy Statement or the Terms of Service. The current version of this EULA is posted at&nbsp;<a href="https://www.opera.com/eula/computers" target="_self">https://www.opera.com/eula/computers</a>, the latest version of the Privacy Statement is posted at&nbsp;<a href="https://www.opera.com/privacy" target="_self">https://www.opera.com/privacy</a>, and the Terms of Service are posted at&nbsp;<a href="https://www.opera.com/terms" target="_self">https://www.opera.com/terms</a>. It is your responsibility to remain informed of any changes as you are bound by the latest version of the EULA, Privacy Statement and Terms of Service.</p><p><b>13. General.</b>&nbsp;You acknowledge and agree that the Software may contain cryptographic functionality the export of which may be restricted under applicable export control law. You will comply with all applicable laws and regulations in your activities with regard to the Software. You will not export or re-export the Software in violation of such laws or regulations or without all required licenses and authorizations. You may not assign or transfer this contract without obtaining Opera’s prior written consent, and any purported assignment or transfer in violation of this restriction will be null and void.</p></div>
-</section>
-
-      </div>
-          </main>
-
-          
-    <footer class="ns--hf">
-      <div class="hf--top-side">
-        <div class="hf--width-holder">
-                                  <div class="hf--language">
-              <span class="hf--language-selector-icon"><span class="hf--hide">Select your language:</span></span>
-              <span>
-                <select class="hf--language-selector" onchange="location=this.options[this.selectedIndex].value;">
-                  <option data-name="id" value="/id/eula/computers">Bahasa Indonesia</option><option data-name="ms" value="/ms/eula/computers">Bahasa Melayu</option><option data-name="cs" value="/cs/eula/computers">Čeština</option><option data-name="da" value="/da/eula/computers">Dansk</option><option data-name="de" value="/de/eula/computers">Deutsch</option><option data-name="en" value="/eula/computers" selected>English</option><option data-name="es" value="/es/eula/computers">Español</option><option data-name="es-419" value="/es-419/eula/computers">Español (Latinoamérica)</option><option data-name="tl" value="/tl/eula/computers">Filipino</option><option data-name="fr" value="/fr/eula/computers">Français</option><option data-name="it" value="/it/eula/computers">Italiano</option><option data-name="hu" value="/hu/eula/computers">Magyar</option><option data-name="nl" value="/nl/eula/computers">Nederlands</option><option data-name="no" value="/no/eula/computers">Norsk (bokmål)</option><option data-name="pl" value="/pl/eula/computers">Polski</option><option data-name="pt" value="/pt/eula/computers">Português</option><option data-name="pt-br" value="/pt-br/eula/computers">Português (Brasil)</option><option data-name="ro" value="/ro/eula/computers">Română</option><option data-name="sk" value="/sk/eula/computers">Slovenčina</option><option data-name="fi" value="/fi/eula/computers">Suomi</option><option data-name="sv" value="/sv/eula/computers">Svenska</option><option data-name="vi" value="/vi/eula/computers">Tiếng Việt</option><option data-name="tr" value="/tr/eula/computers">Türkçe</option><option data-name="el" value="/el/eula/computers">Ελληνικά</option><option data-name="bg" value="/bg/eula/computers">Български</option><option data-name="ru" value="/ru/eula/computers">Русский</option><option data-name="uk" value="/uk/eula/computers">Українська</option><option data-name="he" value="/he/eula/computers">עברית</option><option data-name="ar" value="/ar/eula/computers">العربية</option><option data-name="hi" value="/hi/eula/computers">हिंदी</option><option data-name="th" value="/th/eula/computers">ไทย</option><option data-name="ko" value="/ko/eula/computers">한국어</option><option data-name="zh-cn" value="/zh-cn/eula/computers">中文（中国）</option><option data-name="zh-tw" value="/zh-tw/eula/computers">中文（台灣）</option><option data-name="ja" value="/ja/eula/computers">日本語</option>                </select>
-              </span>
-            </div>                                    <p class="hf--back">
-                  <a class="hf--text-uppercase back-to-top" href="#" onclick="return false;">Top</a>
-                </p>        </div>
-        <div class="hf--social">
-          <div class="hf--width-holder">
-            <p class="hf--social-headline hf--hide">Follow Opera</p>
-            
-            <div class="hf--social-icons">
-              <a class="facebook" href="https://facebook.com/opera" data-event-action="hf-footer-social-item" data-event-category="hf">
-                <span class="hf--hide">Facebook</span>
-              </a>
-                            <a class="twitter" href="https://twitter.com/opera" data-event-action="hf-footer-social-item" data-event-category="hf">
-                <span class="hf--hide">Twitter</span>
-              </a>
-              <a class="youtube" href="https://www.youtube.com/opera" data-event-action="hf-footer-social-item" data-event-category="hf">
-                <span class="hf--hide">Youtube</span>
-              </a>
-              <a class="linkedin" href="https://www.linkedin.com/company/opera-software" data-event-action="hf-footer-social-item" data-event-category="hf">
-                <span class="hf--hide">LinkedIn</span>
-              </a>
-                            <a class="instagram" href="https://instagram.com/operabrowser" data-event-action="hf-footer-social-item" data-event-category="hf">
-                <span class="hf--hide">Instagram</span>
-              </a>
-            </div>
-          </div>
-        </div>
-      </div>
-      <div class="hf--links">
-        <div class="hf--width-holder">
-          <ul class="hf--links-section">
-            <li><a class="hf--text-uppercase" href="https://www.opera.com/download">Download Opera</a></li>
-            <li><a class="hf--text-regular" href="//www.opera.com/computer">Computer browsers</a></li>
-            <li><a class="hf--text-regular" href="//www.opera.com/mobile">Mobile apps</a></li>
-            <li><span class="hf--links-sep"><span class="hf--hide">-</span></span></li>
-            <li><a class="hf--text-uppercase" href="//www.opera.com/help">Help &amp; support</a></li>
-            <li><a class="hf--text-uppercase" href="//blogs.opera.com/">Opera blogs</a></li>
-            <li><a class="hf--text-uppercase last-link" href="//forums.opera.com">Opera forums</a></li>
-          </ul>
-          <ul class="hf--links-section">
-            <li><a class="hf--text-uppercase" href="http://dev.opera.com/">Dev.Opera</a></li>
-            <li><a class="hf--text-regular" href="https://www.opera.com/computer/beta">Beta version</a></li>
-            <li><a class="hf--text-regular" href="https://www.opera.com/computer/neon">Opera Neon</a></li>
-            <li><span class="hf--links-sep"><span class="hf--hide">-</span></span></li>
-            <li><strong class="hf--text-uppercase">Services</strong></li>
-            <li><a class="hf--text-regular" href="https://addons.opera.com">Add-ons</a></li>
-            <li><a class="hf--text-regular" href="https://auth.opera.com/account/login">Opera account</a></li>
-          </ul>
-          <ul class="hf--links-section">
-            <li><a class="hf--text-uppercase" href="http://www.operasoftware.com">Opera B2B</a></li>
-            <li><a class="hf--text-regular" href="http://www.operasoftware.com/operators">Operator solutions</a></li>
-            <li><a class="hf--text-regular" href="http://www.operasoftware.com/mobile-oems">OEM solutions</a></li>
-            <li><a class="hf--text-regular" href="http://www.operasoftware.com/content-partners">Partner with Opera</a></li>
-            <li><a class="hf--text-regular" href="http://www.operasoftware.com/blog">Business blog</a></li>
-          </ul>
-          <ul class="hf--links-section">
-            <li><a class="hf--text-uppercase" href="https://www.opera.com/about">About Opera</a></li>
-            <li><a class="hf--text-regular" href="https://www.opera.com/jobs">Jobs</a></li>
-            <li><a class="hf--text-regular" href="http://www.operasoftware.com/company/investors">Investors</a></li>
-            <li><a class="hf--text-regular" href="http://www.operasoftware.com/press">Press info</a></li>
-            <li><a class="hf--text-regular" href="http://www.operasoftware.com/company/contact">Contact us</a></li>
-          </ul>
-        </div>
-      </div>
-      <div class="hf--bottom-side hf--width-holder">
-        <div class="hf--bottom-wrapper">
-          <div class="hf--social">
-            <p class="hf--social-headline hf--hide">Follow Opera</p>
-            
-            <div class="hf--social-icons">
-              <a class="facebook" href="https://facebook.com/opera" data-event-action="hf-footer-social-item" data-event-category="hf">
-                <span class="hf--hide">Facebook</span>
-              </a>
-                            <a class="twitter" href="https://twitter.com/opera" data-event-action="hf-footer-social-item" data-event-category="hf">
-                <span class="hf--hide">Twitter</span>
-              </a>
-              <a class="youtube" href="https://www.youtube.com/opera" data-event-action="hf-footer-social-item" data-event-category="hf">
-                <span class="hf--hide">Youtube</span>
-              </a>
-              <a class="linkedin" href="https://www.linkedin.com/company/opera-software" data-event-action="hf-footer-social-item" data-event-category="hf">
-                <span class="hf--hide">LinkedIn</span>
-              </a>
-                            <a class="instagram" href="https://instagram.com/operabrowser" data-event-action="hf-footer-social-item" data-event-category="hf">
-                <span class="hf--hide">Instagram</span>
-              </a>
-            </div>
-          </div>
-          <div class="hf--copyrights">
-            <ul class="hf--copyrights-items">
-              <li><strong>&copy; Opera Software</strong></li>
-              <li><a href="https://www.opera.com/privacy">Privacy</a></li>
-              <li><a href="https://www.opera.com/terms">Terms of Use</a></li>
-            </ul>
-          </div>
-          <div class="hf--controls">
-                                      <div class="hf--language">
-              <span class="hf--language-selector-icon"><span class="hf--hide">Select your language:</span></span>
-              <span>
-                <select class="hf--language-selector" onchange="location=this.options[this.selectedIndex].value;">
-                  <option data-name="id" value="/id/eula/computers">Bahasa Indonesia</option><option data-name="ms" value="/ms/eula/computers">Bahasa Melayu</option><option data-name="cs" value="/cs/eula/computers">Čeština</option><option data-name="da" value="/da/eula/computers">Dansk</option><option data-name="de" value="/de/eula/computers">Deutsch</option><option data-name="en" value="/eula/computers" selected>English</option><option data-name="es" value="/es/eula/computers">Español</option><option data-name="es-419" value="/es-419/eula/computers">Español (Latinoamérica)</option><option data-name="tl" value="/tl/eula/computers">Filipino</option><option data-name="fr" value="/fr/eula/computers">Français</option><option data-name="it" value="/it/eula/computers">Italiano</option><option data-name="hu" value="/hu/eula/computers">Magyar</option><option data-name="nl" value="/nl/eula/computers">Nederlands</option><option data-name="no" value="/no/eula/computers">Norsk (bokmål)</option><option data-name="pl" value="/pl/eula/computers">Polski</option><option data-name="pt" value="/pt/eula/computers">Português</option><option data-name="pt-br" value="/pt-br/eula/computers">Português (Brasil)</option><option data-name="ro" value="/ro/eula/computers">Română</option><option data-name="sk" value="/sk/eula/computers">Slovenčina</option><option data-name="fi" value="/fi/eula/computers">Suomi</option><option data-name="sv" value="/sv/eula/computers">Svenska</option><option data-name="vi" value="/vi/eula/computers">Tiếng Việt</option><option data-name="tr" value="/tr/eula/computers">Türkçe</option><option data-name="el" value="/el/eula/computers">Ελληνικά</option><option data-name="bg" value="/bg/eula/computers">Български</option><option data-name="ru" value="/ru/eula/computers">Русский</option><option data-name="uk" value="/uk/eula/computers">Українська</option><option data-name="he" value="/he/eula/computers">עברית</option><option data-name="ar" value="/ar/eula/computers">العربية</option><option data-name="hi" value="/hi/eula/computers">हिंदी</option><option data-name="th" value="/th/eula/computers">ไทย</option><option data-name="ko" value="/ko/eula/computers">한국어</option><option data-name="zh-cn" value="/zh-cn/eula/computers">中文（中国）</option><option data-name="zh-tw" value="/zh-tw/eula/computers">中文（台灣）</option><option data-name="ja" value="/ja/eula/computers">日本語</option>                </select>
-              </span>
-            </div>                        <div class="hf--nav">
-              <div class="hf--width-holder">
-                                <p class="hf--back">
-                  <a class="hf--text-uppercase back-to-top" href="#" onclick="return false;">Top</a>
-                </p>              </div>
-            </div>
-          </div>
-        </div>
-      </div>
-    </footer>
-                  <script src="https://www-static.operacdn.com/static-heap/4d/4d7f76c8987efba7e997c2cead49c858f7966ebb/linkfeedback.js"></script>
-      <script src="https://www-static.operacdn.com/static-heap/30/305ba43f6e26911dcc3a6c564473af33b85c804d/browserinfo.js"></script>
-      <script src="https://www-static.operacdn.com/static-heap/98/98f88227912fc67b44662e8392f3779e4e6ccab5/opera.js"></script>
-      <script src="https://www-static.operacdn.com/static-heap/3d/3d254f1aec48f4b9990a19c04c7355d29c995fd5/promoassets.js"></script>
-      </body>
-</html>
\ No newline at end of file
diff --git a/network/opera-developer/opera-developer.SlackBuild b/network/opera-developer/opera-developer.SlackBuild
deleted file mode 100644
index 8a39ab3df0..0000000000
--- a/network/opera-developer/opera-developer.SlackBuild
+++ /dev/null
@@ -1,101 +0,0 @@
-#!/bin/sh
-#
-# Slackware build script for opera-developer.
-#
-# Copyright 2016-2019  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=opera-developer
-VERSION=${VERSION:-64.0.3380.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}
-
-set -e
-
-if [ "$ARCH" = "i586" ]; then
-  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
-  LIBDIRSUFFIX=""
-  BITS="i386"
-  echo "This package is currently only available for 64bit."
-  exit 1
-elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-  LIBDIRSUFFIX=""
-  BITS="i386"
-  echo "This package is currently only available for 64bit."
-  exit 1
-elif [ "$ARCH" = "x86_64" ]; then
-  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
-rm -rf $PRGNAM-${VERSION}
-mkdir $PRGNAM-${VERSION}
-ar p $CWD/${PRGNAM}_${VERSION}_${BITS}.deb data.tar.xz | xz -d | tar -xvf- \
-   --transform="s,/lib/.*-linux-gnu,/lib$LIBDIRSUFFIX," \
-   --exclude="./usr/share/lintian" --exclude="./usr/share/menu" -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 {} \;
-
-mv usr $PKG
-
-mv $PKG/usr/share/doc $PKG/usr/
-mv $PKG/usr/doc/$PRGNAM $PKG/usr/doc/${PRGNAM}-$VERSION
-cd $PKG/usr/doc/${PRGNAM}-$VERSION/
-gzip -dc changelog.gz > ChangeLog; rm -f changelog.gz;
-
-install -Dm644 copyright $PKG/usr/share/licenses/$PRGNAM/copyright
-install -Dm644 $CWD/eula.html $PKG/usr/share/licenses/$PRGNAM/eula.html
-install -Dm644 $CWD/terms.html $PKG/usr/share/licenses/$PRGNAM/terms.html
-install -Dm644 $CWD/privacy.html $PKG/usr/share/licenses/$PRGNAM/privacy.html
-
-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/network/opera-developer/opera-developer.info b/network/opera-developer/opera-developer.info
deleted file mode 100644
index c48d5729c2..0000000000
--- a/network/opera-developer/opera-developer.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="opera-developer"
-VERSION="64.0.3380.0"
-HOMEPAGE="https://www.opera.com/"
-DOWNLOAD="UNSUPPORTED"
-MD5SUM=""
-DOWNLOAD_x86_64="https://download1.operacdn.com/pub/opera-developer/64.0.3380.0/linux/opera-developer_64.0.3380.0_amd64.deb"
-MD5SUM_x86_64="1cc2650d909a0cca3545c48b4583fd6d"
-REQUIRES=""
-MAINTAINER="Edinaldo P. Silva"
-EMAIL="edps.mundognu@gmail.com"
diff --git a/network/opera-developer/privacy.html b/network/opera-developer/privacy.html
deleted file mode 100644
index 2d4a2e52d7..0000000000
--- a/network/opera-developer/privacy.html
+++ /dev/null
@@ -1,353 +0,0 @@
-  <!DOCTYPE html>
-<html lang="it">
-  <head>
-    
-    
-    <meta http-equiv="content-type" content="text/html; charset=utf-8">
-    <meta name="viewport" content="initial-scale=1, width=device-width">
-    <meta name="msvalidate.01" content="070C6E8E67D398B03BD8D8E9408A7045">
-          <meta name="yandex-verification" content="780cc78194f8c462">
-    
-                  
-      <meta name="robots" content="noindex, noyaca, noodp">
-        
-          <meta name="description" content="Privacy Statement">
-    
-    
-    <meta property="og:image" content="https://www-static.operacdn.com/static-heap/75/759b5d5a74e1be5fdfd0fd1fed338c9d1c6cbb33/opera-152.png">
-          <meta property="og:title" content="Privacy Statement | Opera">
-        <meta property="og:url" content="https://www.opera.com/it/privacy">
-          <meta property="og:description" content="Privacy Statement">
-        <meta property="og:type" content="website">
-
-    
-          <title>Privacy Statement | Opera</title>
-    
-    
-    <link rel="dns-prefetch" href="//www-static.operacdn.com">
-    <link rel="apple-touch-icon" href="https://www-static.operacdn.com/static-heap/91/91051bd6095b8484c359274af1ec222b6bd293d4/opera-57.png">
-    <link rel="apple-touch-icon" sizes="57x57" href="https://www-static.operacdn.com/static-heap/91/91051bd6095b8484c359274af1ec222b6bd293d4/opera-57.png">
-    <link rel="apple-touch-icon" sizes="72x72" href="https://www-static.operacdn.com/static-heap/1d/1db0d666779ad5dc2bde071f1e64223cbc898079/opera-72.png">
-    <link rel="apple-touch-icon" sizes="76x76" href="https://www-static.operacdn.com/static-heap/ca/cab9c89aeabd94f19da89e4aae5fac8077f40288/opera-76.png">
-    <link rel="apple-touch-icon" sizes="114x114" href="https://www-static.operacdn.com/static-heap/3e/3eb93f40546e3dd463deb58e5a5b59ace97d8cff/opera-114.png">
-    <link rel="apple-touch-icon" sizes="120x120" href="https://www-static.operacdn.com/static-heap/ab/ab7832e9d56e106488f110e871c46f774576b093/opera-120.png">
-    <link rel="apple-touch-icon" sizes="144x144" href="https://www-static.operacdn.com/static-heap/5e/5ed11b7f90d7abe5af33392636f1e1fd40f8d40f/opera-144.png">
-    <link rel="apple-touch-icon" sizes="152x152" href="https://www-static.operacdn.com/static-heap/75/759b5d5a74e1be5fdfd0fd1fed338c9d1c6cbb33/opera-152.png">
-
-    
-    <meta name="application-name" content="Privacy Statement - Opera">
-    <meta name="msapplication-TileColor" content="#FE1B2C">
-    <meta name="msapplication-TileImage" content="https://www-static.operacdn.com/static-heap/6a/6aa0021764af934c8431d64fbf508a90ef30846d/opera-windows-144.png">
-    <meta name="msapplication-square70x70logo" content="https://www-static.operacdn.com/static-heap/27/27d2de5f321780e481fcd3cf8e7a4800295ed5bd/opera-windows-70.png">
-    <meta name="msapplication-square150x150logo" content="https://www-static.operacdn.com/static-heap/05/0556dff691cc07304d9f12204548ab63c3142368/opera-windows-150.png">
-    <meta name="msapplication-wide310x150logo" content="https://www-static.operacdn.com/static-heap/42/42554ff6fabadcc22853c011b777923e56a2a94c/opera-windows-310-150.png">
-    <meta name="msapplication-square310x310logo" content="https://www-static.operacdn.com/static-heap/99/9938c6221aba7d87edf2ec2795206bf92d4c3d29/opera-windows-310.png">
-
-    
-                                                                                                  <link rel="alternate" hreflang="id" href="https://www.opera.com/id/privacy" />
-                                                                                                    <link rel="alternate" hreflang="ms" href="https://www.opera.com/ms/privacy" />
-                                                                                                    <link rel="alternate" hreflang="cs" href="https://www.opera.com/cs/privacy" />
-                                                                                                    <link rel="alternate" hreflang="da" href="https://www.opera.com/da/privacy" />
-                                                                                                    <link rel="alternate" hreflang="de" href="https://www.opera.com/de/privacy" />
-                                                                                  <link rel="alternate" hreflang="en" href="https://www.opera.com/privacy" />
-                                                                                                    <link rel="alternate" hreflang="es" href="https://www.opera.com/es/privacy" />
-                                                                                                    <link rel="alternate" hreflang="es-419" href="https://www.opera.com/es-419/privacy" />
-                                                                                                    <link rel="alternate" hreflang="tl" href="https://www.opera.com/tl/privacy" />
-                                                                                                    <link rel="alternate" hreflang="fr" href="https://www.opera.com/fr/privacy" />
-                                                                                                    <link rel="canonical" hreflang="it" href="https://www.opera.com/it/privacy" />
-                                                                                                    <link rel="alternate" hreflang="hu" href="https://www.opera.com/hu/privacy" />
-                                                                                                    <link rel="alternate" hreflang="nl" href="https://www.opera.com/nl/privacy" />
-                                                                                                    <link rel="alternate" hreflang="no" href="https://www.opera.com/no/privacy" />
-                                                                                                    <link rel="alternate" hreflang="pl" href="https://www.opera.com/pl/privacy" />
-                                                                                                    <link rel="alternate" hreflang="pt" href="https://www.opera.com/pt/privacy" />
-                                                                                                    <link rel="alternate" hreflang="pt-br" href="https://www.opera.com/pt-br/privacy" />
-                                                                                                    <link rel="alternate" hreflang="ro" href="https://www.opera.com/ro/privacy" />
-                                                                                                    <link rel="alternate" hreflang="sk" href="https://www.opera.com/sk/privacy" />
-                                                                                                    <link rel="alternate" hreflang="fi" href="https://www.opera.com/fi/privacy" />
-                                                                                                    <link rel="alternate" hreflang="sv" href="https://www.opera.com/sv/privacy" />
-                                                                                                    <link rel="alternate" hreflang="vi" href="https://www.opera.com/vi/privacy" />
-                                                                                                    <link rel="alternate" hreflang="tr" href="https://www.opera.com/tr/privacy" />
-                                                                                                    <link rel="alternate" hreflang="el" href="https://www.opera.com/el/privacy" />
-                                                                                                    <link rel="alternate" hreflang="bg" href="https://www.opera.com/bg/privacy" />
-                                                                                                    <link rel="alternate" hreflang="ru" href="https://www.opera.com/ru/privacy" />
-                                                                                                    <link rel="alternate" hreflang="uk" href="https://www.opera.com/uk/privacy" />
-                                                                                                    <link rel="alternate" hreflang="he" href="https://www.opera.com/he/privacy" />
-                                                                                                    <link rel="alternate" hreflang="ar" href="https://www.opera.com/ar/privacy" />
-                                                                                                    <link rel="alternate" hreflang="hi" href="https://www.opera.com/hi/privacy" />
-                                                                                                    <link rel="alternate" hreflang="th" href="https://www.opera.com/th/privacy" />
-                                                                                                    <link rel="alternate" hreflang="ko" href="https://www.opera.com/ko/privacy" />
-                                                                                                    <link rel="alternate" hreflang="zh-cn" href="https://www.opera.com/zh-cn/privacy" />
-                                                                                                    <link rel="alternate" hreflang="zh-tw" href="https://www.opera.com/zh-tw/privacy" />
-                                                                                                    <link rel="alternate" hreflang="ja" href="https://www.opera.com/ja/privacy" />
-              
-                        <link rel="stylesheet" type="text/css" media="all" href="https://www-static.operacdn.com/extension/opera/design/opera/static/css/latin_latinext-634dce27.css">
-        
-                  <link rel="stylesheet" type="text/css" media="all" href="https://www-static.operacdn.com/extension/opera/design/opera/static/css/header-footer-8618b3a3.css">
-                  <link rel="stylesheet" type="text/css" media="all" href="https://www-static.operacdn.com/extension/opera/design/opera/static/css/opera2-3353345c.css">
-                              
-    
-    
-    
-      </head>
-  <body>
-          <!-- Google Tag Manager -->
-
-  <noscript><iframe src="//www.googletagmanager.com/ns.html?id=GTM-Q5SW"
-  height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript>
-  <script>
-    (function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start':
-    new Date().getTime(),event:'gtm.js'});var f=d.getElementsByTagName(s)[0],
-            j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src=
-            '//www.googletagmanager.com/gtm.js?id='+i+dl;f.parentNode.insertBefore(j,f);
-            })(window,document,'script','dataLayer','GTM-Q5SW');
-  </script>
-
-<!-- End Google Tag Manager -->
-              
-    <header id="header" class="ns--hf">
-      <div class="hf--primary">
-        <div class="hf--width-holder">
-          <div class="hf--main-nav" role="navigation">
-            <a class="hf--brand" href="/it">
-                              <img src="https://www-static.operacdn.com/static-heap/11/11bb20439edcccff33dbfa6df6f4c9ad564f91e4/logo-header-opera.png" srcset="https://www-static.operacdn.com/static-heap/11/11bb20439edcccff33dbfa6df6f4c9ad564f91e4/logo-header-opera.png 1x, https://www-static.operacdn.com/static-heap/28/2820d98042080cc51dea518980d80293bf732770/logo-header-opera2x.png 2x" alt="Opera">
-                          </a>
-            <div class="hf--menu">
-              <input id="hf--menu-switcher" class="hf--hide" type="checkbox">
-              <label class="hf--menu-switcher" for="hf--menu-switcher"></label>
-              <div>
-                <div>
-                  <ul class="hf--main-nav-items" role="menu">
-                                                                                                      
-                                                                                                          <li><a href="/it/computer" data-event-action="hf-main-nav-item" data-event-category="hf" role="menuitem">Browser per PC</a></li>
-                                                                                                            <li><a href="/it/mobile" data-event-action="hf-main-nav-item" data-event-category="hf" role="menuitem">App per dispositivi mobili</a></li>
-                                                              
-                                        
-                                        <li class="hf--menu-opposite">
-                                              <a href="//blogs.opera.com/" data-event-action="hf-main-nav-item" data-event-category="hf" role="menuitem">Blog</a>
-                                          </li>
-                  </ul>
-                </div>
-              </div>
-            </div>
-          </div>
-        </div>
-      </div>
-
-      
-                                    
-      
-          </header>
-    
-    
-                        
-    <main lang="en" class="page">
-      <div class="page--content">
-
-    
-      
-                    
-                
-    
-                  
-
-<section class="top-padding--none">
-  <div class="content-width"><h1>Privacy Statement</h1>
-<p><i>Updated May 6, 2016</i><a id="top"></a>
-</p><h3>Summary</h3>
-<p>We at Opera Software AS (&quot;Opera&quot;) take your privacy seriously. This privacy statement explains what data we collect, how we store and transfer it and how we use it. The exact set of the data we collect, its purpose and your opt-out choices depend on the product or service you use. Please refer to the relevant product or service sections of this privacy statement to learn more specific details.</p><p>Some of the data we collect, either individually or aggregated, may be considered personal. We treat this data in a special way, as required by law.</p><p>We'll always honor your decisions for how your data is used. We have safeguards in place to protect your data from loss, misuse, and unauthorized access, disclosure, alteration, or destruction.</p><p>When we post changes to this privacy statement, we will include the date when the statement was last updated. If we significantly change this statement or how we use your personal information, we will notify you either by prominently posting a notice prior to implementing the change or by sending you a notification directly. We encourage you to respect review this statement periodically.</p><h3>Why do we collect data?</h3>
-<p>We only process your data for purposes that are objectively justified by our products and services. We process this data with respect to your fundamental right to privacy, including the need to protect personal integrity and private life and to ensure that your personal data is of adequate quality. Unless otherwise stated, we determine the purposes for and manners in which your data is collected (in legalese, we act as a &quot;data controller&quot; regarding personal data).</p><p>We collect data to:</p>
-<ul>
-
-<li>Improve, debug, and maintain Opera products and services</li>
-
-<li>Study and personalize user experiences</li>
-
-<li>Fulfill legal requirements</li>
-
-<li>Conduct business analysis and research, and marketing campaigns</li>
-
-<li>Ensure better security and fraud protection</li>
-
-</ul>
-<p>We may also use your data to send personalized information regarding updates, upgrades, enhancements, surveys, recommendations and/or advertisements, if we believe these are relevant for you.</p><h3>What data do we collect?</h3>
-<p>The information we collect may include: personal data, for example your name, email, IP-address, location; and non-personal technical data, for example who manufactured your device, your screen's resolution, your mobile operator's region and code. A complete list of the data we collect and purpose of collection may vary between our products and services. You can find detailed descriptions in the product/service-related sections below.</p><h3>How do we collect data?</h3>
-<p>Generally, we collect data:</p>
-<ul>
-
-<li>When you provide it explicitly to us; for example, when you submit a form on our websites</li>
-
-<li>When you install and run our products, use our services, or visit our websites</li>
-
-<li>When third parties share information with us</li>
-
-</ul>
-<p>Some products may require your personal data to function properly. Wherever technically possible, we'll ask for your consent to collect your personal data and offer you the choice to opt-out. Please read product-specific information to learn how to opt-out.</p><p>When we collect your data, we associate it with a unique ID and a unique device ID that are generated when you install an Opera product or begin using one of our services. These identifiers are anonymized and cannot be linked to you as an individual person. We also take measures to remove any possible connections between these IDs and other types of personal data.</p><p>To collect information automatically, we may use <a href="https://en.wikipedia.org/wiki/HTTP_cookie" target="_self">cookies</a>, <a href="https://en.wikipedia.org/wiki/Web_beacon" target="_self">web beacons</a>, our own data-collection tools or various third-party services.</p><p>Some third-party sites may monitor data traffic from our products and services, such as numbers of hits and the search terms used. We do not make available any personally identifiable information to these services.</p><p>This privacy statement does not cover third-party apps you access and use through our products and services, nor does it cover links to other websites. We do not control the privacy and security practices and policies of these third parties and their sites. We encourage you to read the privacy statements of the third-party apps and websites you use.</p><h3>How do we protect your data?</h3>
-<p>We treat your personal data as required by law. We are a Norwegian company and we follow Norwegian data-security laws as well as other national legislation, as needed. We require that our suppliers successfully pass security assessments and prove their compliance with applicable laws and industry standards.</p><p>Only a limited number of Opera employees have access to the data we collect. We review and update our working procedures regularly to improve your privacy and ensure that our internal policies are followed. We immediately correct any non-conformance regarding these policies.</p><p>Our commitment to your privacy does not extend to third-party products and services you may access from Opera products and services. We encourage you to read the privacy statements of the third-party products and services you use.</p><h3>How do we share your data?</h3>
-<p>We may share your data:</p>
-<ul>
-
-<li>To government bodies and law enforcement agencies to comply with the law, for example in judicial proceedings, by court order or other legal process</li>
-
-<li>To third parties (including professional advisors) to enforce or defend our legal rights, including our terms and conditions</li>
-
-<li>To a third-party purchaser or seller (including professional advisors) in connection with a corporate event such as a merger, business acquisition or insolvency situation</li>
-
-<li>As described elsewhere in this statement</li>
-
-</ul>
-<p>Some of our products and services include third-party technology or code that may use the collected data. We may share anonymized and/or aggregated sets of data with our partners and other trusted third parties.</p><p>Because we are an international company with data-centers around the world, your data may be transferred to countries which do not have the same level of data protection laws as those in the country where you are located. We will ensure that your data is protected to a strict standard.</p><h3>What else should I know?</h3>
-<p>We aim to be transparent as to what data we collect and how we use it. Your rights are not limited to consent and opt-out choices only. If you've provided personal information to us, you may change or modify this information at any time.</p><p>We retain personal data only as long as necessary for processing it in accordance with the purposes described in this statement, or as otherwise necessary to comply with applicable laws. When your data is no longer necessary or relevant for our purposes, or required by applicable laws, we take steps to have it deleted, aggregated or made anonymous.</p><p>You can find out if we hold any personal data about you by contacting us. You may be asked to prove your identification so that we can verify who is making the request. If we hold information about you, you can ask us to correct any mistakes and delete any excessive information.</p><h3>Contact information</h3>
-<p>If you have any questions about this statement or any privacy issues regarding Opera and our products or services, we can be reached&nbsp;by post at:</p><p>
-Opera Software AS<br />
-P.O. Box 4214 Nydalen<br />
-NO-0401 OSLO<br />Norway</p><h1>Privacy policies</h1>
-<p>For privacy policies and questions specifically related to the Opera products and services, please see the appropriate section below:</p>
-<ul>
-
-<li><a href="/it/privacy/computers" target="_self">Opera for computers</a></li>
-
-<li><a href="/it/privacy/operaforandroid" target="_self">Opera for Android</a></li>
-
-<li><a href="/it/privacy/mini" target="_self">Opera Mini</a></li>
-
-<li><a href="/it/privacy/mini/android" target="_self">Opera Mini for Android</a></li>
-
-<li><a href="/it/privacy/mini/ios" target="_self">Opera Mini for iOS</a></li>
-
-<li><a href="/it/privacy/websites" target="_self">Opera websites</a></li>
-
-<li><a href="/it/privacy/services" target="_self">Opera services</a></li>
-
-</ul>
-</div>
-</section>
-
-      </div>
-          </main>
-
-          
-    <footer class="ns--hf">
-      <div class="hf--top-side">
-        <div class="hf--width-holder">
-                                  <div class="hf--language">
-              <span class="hf--language-selector-icon"><span class="hf--hide">Seleziona la lingua:</span></span>
-              <span>
-                <select class="hf--language-selector" onchange="location=this.options[this.selectedIndex].value;">
-                  <option data-name="id" value="/id/privacy">Bahasa Indonesia</option><option data-name="ms" value="/ms/privacy">Bahasa Melayu</option><option data-name="cs" value="/cs/privacy">Čeština</option><option data-name="da" value="/da/privacy">Dansk</option><option data-name="de" value="/de/privacy">Deutsch</option><option data-name="en" value="/privacy">English</option><option data-name="es" value="/es/privacy">Español</option><option data-name="es-419" value="/es-419/privacy">Español (Latinoamérica)</option><option data-name="tl" value="/tl/privacy">Filipino</option><option data-name="fr" value="/fr/privacy">Français</option><option data-name="it" value="/it/privacy" selected>Italiano</option><option data-name="hu" value="/hu/privacy">Magyar</option><option data-name="nl" value="/nl/privacy">Nederlands</option><option data-name="no" value="/no/privacy">Norsk (bokmål)</option><option data-name="pl" value="/pl/privacy">Polski</option><option data-name="pt" value="/pt/privacy">Português</option><option data-name="pt-br" value="/pt-br/privacy">Português (Brasil)</option><option data-name="ro" value="/ro/privacy">Română</option><option data-name="sk" value="/sk/privacy">Slovenčina</option><option data-name="fi" value="/fi/privacy">Suomi</option><option data-name="sv" value="/sv/privacy">Svenska</option><option data-name="vi" value="/vi/privacy">Tiếng Việt</option><option data-name="tr" value="/tr/privacy">Türkçe</option><option data-name="el" value="/el/privacy">Ελληνικά</option><option data-name="bg" value="/bg/privacy">Български</option><option data-name="ru" value="/ru/privacy">Русский</option><option data-name="uk" value="/uk/privacy">Українська</option><option data-name="he" value="/he/privacy">עברית</option><option data-name="ar" value="/ar/privacy">العربية</option><option data-name="hi" value="/hi/privacy">हिंदी</option><option data-name="th" value="/th/privacy">ไทย</option><option data-name="ko" value="/ko/privacy">한국어</option><option data-name="zh-cn" value="/zh-cn/privacy">中文（中国）</option><option data-name="zh-tw" value="/zh-tw/privacy">中文（台灣）</option><option data-name="ja" value="/ja/privacy">日本語</option>                </select>
-              </span>
-            </div>                                    <p class="hf--back">
-                  <a class="hf--text-uppercase back-to-top" href="#" onclick="return false;">In alto</a>
-                </p>        </div>
-        <div class="hf--social">
-          <div class="hf--width-holder">
-            <p class="hf--social-headline hf--hide">Segui Opera</p>
-            
-            <div class="hf--social-icons">
-              <a class="facebook" href="https://facebook.com/opera" data-event-action="hf-footer-social-item" data-event-category="hf">
-                <span class="hf--hide">Facebook</span>
-              </a>
-                            <a class="twitter" href="https://twitter.com/opera" data-event-action="hf-footer-social-item" data-event-category="hf">
-                <span class="hf--hide">Twitter</span>
-              </a>
-              <a class="youtube" href="https://www.youtube.com/opera" data-event-action="hf-footer-social-item" data-event-category="hf">
-                <span class="hf--hide">Youtube</span>
-              </a>
-              <a class="linkedin" href="https://www.linkedin.com/company/opera-software" data-event-action="hf-footer-social-item" data-event-category="hf">
-                <span class="hf--hide">LinkedIn</span>
-              </a>
-                            <a class="instagram" href="https://instagram.com/operabrowser" data-event-action="hf-footer-social-item" data-event-category="hf">
-                <span class="hf--hide">Instagram</span>
-              </a>
-            </div>
-          </div>
-        </div>
-      </div>
-      <div class="hf--links">
-        <div class="hf--width-holder">
-          <ul class="hf--links-section">
-            <li><a class="hf--text-uppercase" href="https://www.opera.com/download">Scarica Opera</a></li>
-            <li><a class="hf--text-regular" href="//www.opera.com/computer">Browser per PC</a></li>
-            <li><a class="hf--text-regular" href="//www.opera.com/mobile">App per dispositivi mobili</a></li>
-            <li><span class="hf--links-sep"><span class="hf--hide">-</span></span></li>
-            <li><a class="hf--text-uppercase" href="//www.opera.com/help">Guida e supporto</a></li>
-            <li><a class="hf--text-uppercase" href="//blogs.opera.com/">Blog di Opera</a></li>
-            <li><a class="hf--text-uppercase last-link" href="//forums.opera.com">Forum di Opera</a></li>
-          </ul>
-          <ul class="hf--links-section">
-            <li><a class="hf--text-uppercase" href="http://dev.opera.com/">Dev.Opera</a></li>
-            <li><a class="hf--text-regular" href="https://www.opera.com/computer/beta">Versione beta</a></li>
-            <li><a class="hf--text-regular" href="https://www.opera.com/computer/neon">Opera Neon</a></li>
-            <li><span class="hf--links-sep"><span class="hf--hide">-</span></span></li>
-            <li><strong class="hf--text-uppercase">Servizi</strong></li>
-            <li><a class="hf--text-regular" href="https://addons.opera.com">Componenti aggiuntivi</a></li>
-            <li><a class="hf--text-regular" href="https://auth.opera.com/account/login">Account Opera</a></li>
-          </ul>
-          <ul class="hf--links-section">
-            <li><a class="hf--text-uppercase" href="http://www.operasoftware.com">Opera B2B</a></li>
-            <li><a class="hf--text-regular" href="http://www.operasoftware.com/operators">Soluzioni per operatori</a></li>
-            <li><a class="hf--text-regular" href="http://www.operasoftware.com/mobile-oems">Soluzioni OEM</a></li>
-            <li><a class="hf--text-regular" href="http://www.operasoftware.com/content-partners">Collaborare con Opera</a></li>
-            <li><a class="hf--text-regular" href="http://www.operasoftware.com/blog">Aziende</a></li>
-          </ul>
-          <ul class="hf--links-section">
-            <li><a class="hf--text-uppercase" href="https://www.opera.com/about">Informazioni su Opera</a></li>
-            <li><a class="hf--text-regular" href="https://www.opera.com/jobs">Lavori</a></li>
-            <li><a class="hf--text-regular" href="http://www.operasoftware.com/company/investors">Investitori</a></li>
-            <li><a class="hf--text-regular" href="http://www.operasoftware.com/press">Info stampa</a></li>
-            <li><a class="hf--text-regular" href="http://www.operasoftware.com/company/contact">Contatti</a></li>
-          </ul>
-        </div>
-      </div>
-      <div class="hf--bottom-side hf--width-holder">
-        <div class="hf--bottom-wrapper">
-          <div class="hf--social">
-            <p class="hf--social-headline hf--hide">Segui Opera</p>
-            
-            <div class="hf--social-icons">
-              <a class="facebook" href="https://facebook.com/opera" data-event-action="hf-footer-social-item" data-event-category="hf">
-                <span class="hf--hide">Facebook</span>
-              </a>
-                            <a class="twitter" href="https://twitter.com/opera" data-event-action="hf-footer-social-item" data-event-category="hf">
-                <span class="hf--hide">Twitter</span>
-              </a>
-              <a class="youtube" href="https://www.youtube.com/opera" data-event-action="hf-footer-social-item" data-event-category="hf">
-                <span class="hf--hide">Youtube</span>
-              </a>
-              <a class="linkedin" href="https://www.linkedin.com/company/opera-software" data-event-action="hf-footer-social-item" data-event-category="hf">
-                <span class="hf--hide">LinkedIn</span>
-              </a>
-                            <a class="instagram" href="https://instagram.com/operabrowser" data-event-action="hf-footer-social-item" data-event-category="hf">
-                <span class="hf--hide">Instagram</span>
-              </a>
-            </div>
-          </div>
-          <div class="hf--copyrights">
-            <ul class="hf--copyrights-items">
-              <li><strong>&copy; Opera Software</strong></li>
-              <li><a href="https://www.opera.com/privacy">Riservatezza</a></li>
-              <li><a href="https://www.opera.com/terms">Termini d'utilizzo</a></li>
-            </ul>
-          </div>
-          <div class="hf--controls">
-                                      <div class="hf--language">
-              <span class="hf--language-selector-icon"><span class="hf--hide">Seleziona la lingua:</span></span>
-              <span>
-                <select class="hf--language-selector" onchange="location=this.options[this.selectedIndex].value;">
-                  <option data-name="id" value="/id/privacy">Bahasa Indonesia</option><option data-name="ms" value="/ms/privacy">Bahasa Melayu</option><option data-name="cs" value="/cs/privacy">Čeština</option><option data-name="da" value="/da/privacy">Dansk</option><option data-name="de" value="/de/privacy">Deutsch</option><option data-name="en" value="/privacy">English</option><option data-name="es" value="/es/privacy">Español</option><option data-name="es-419" value="/es-419/privacy">Español (Latinoamérica)</option><option data-name="tl" value="/tl/privacy">Filipino</option><option data-name="fr" value="/fr/privacy">Français</option><option data-name="it" value="/it/privacy" selected>Italiano</option><option data-name="hu" value="/hu/privacy">Magyar</option><option data-name="nl" value="/nl/privacy">Nederlands</option><option data-name="no" value="/no/privacy">Norsk (bokmål)</option><option data-name="pl" value="/pl/privacy">Polski</option><option data-name="pt" value="/pt/privacy">Português</option><option data-name="pt-br" value="/pt-br/privacy">Português (Brasil)</option><option data-name="ro" value="/ro/privacy">Română</option><option data-name="sk" value="/sk/privacy">Slovenčina</option><option data-name="fi" value="/fi/privacy">Suomi</option><option data-name="sv" value="/sv/privacy">Svenska</option><option data-name="vi" value="/vi/privacy">Tiếng Việt</option><option data-name="tr" value="/tr/privacy">Türkçe</option><option data-name="el" value="/el/privacy">Ελληνικά</option><option data-name="bg" value="/bg/privacy">Български</option><option data-name="ru" value="/ru/privacy">Русский</option><option data-name="uk" value="/uk/privacy">Українська</option><option data-name="he" value="/he/privacy">עברית</option><option data-name="ar" value="/ar/privacy">العربية</option><option data-name="hi" value="/hi/privacy">हिंदी</option><option data-name="th" value="/th/privacy">ไทย</option><option data-name="ko" value="/ko/privacy">한국어</option><option data-name="zh-cn" value="/zh-cn/privacy">中文（中国）</option><option data-name="zh-tw" value="/zh-tw/privacy">中文（台灣）</option><option data-name="ja" value="/ja/privacy">日本語</option>                </select>
-              </span>
-            </div>                        <div class="hf--nav">
-              <div class="hf--width-holder">
-                                <p class="hf--back">
-                  <a class="hf--text-uppercase back-to-top" href="#" onclick="return false;">In alto</a>
-                </p>              </div>
-            </div>
-          </div>
-        </div>
-      </div>
-    </footer>
-                  <script src="https://www-static.operacdn.com/static-heap/4d/4d7f76c8987efba7e997c2cead49c858f7966ebb/linkfeedback.js"></script>
-      <script src="https://www-static.operacdn.com/static-heap/30/305ba43f6e26911dcc3a6c564473af33b85c804d/browserinfo.js"></script>
-      <script src="https://www-static.operacdn.com/static-heap/98/98f88227912fc67b44662e8392f3779e4e6ccab5/opera.js"></script>
-      <script src="https://www-static.operacdn.com/static-heap/3d/3d254f1aec48f4b9990a19c04c7355d29c995fd5/promoassets.js"></script>
-      </body>
-</html>
\ No newline at end of file
diff --git a/network/opera-developer/slack-desc b/network/opera-developer/slack-desc
deleted file mode 100644
index 6615af0b28..0000000000
--- a/network/opera-developer/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------------------------------------------------------|
-opera-developer: opera-developer (A fast and secure web browser)
-opera-developer:
-opera-developer: Opera is a graphical Web browser available on several platforms.
-opera-developer: The desktop version runs on GNU/Linux and FreeBSD. Versions for
-opera-developer: Macintosh and Windows are also available.
-opera-developer:
-opera-developer: Home page: https://www.opera.com/
-opera-developer:
-opera-developer:
-opera-developer:
-opera-developer:
diff --git a/network/opera-developer/terms.html b/network/opera-developer/terms.html
deleted file mode 100644
index 38e4af0aaf..0000000000
--- a/network/opera-developer/terms.html
+++ /dev/null
@@ -1,285 +0,0 @@
-  <!DOCTYPE html>
-<html lang="en">
-  <head>
-    
-    
-    <meta http-equiv="content-type" content="text/html; charset=utf-8">
-    <meta name="viewport" content="initial-scale=1, width=device-width">
-    <meta name="msvalidate.01" content="070C6E8E67D398B03BD8D8E9408A7045">
-          <meta name="yandex-verification" content="780cc78194f8c462">
-    
-                  <meta name="robots" content="noyaca, noodp">
-        
-          <meta name="description" content="These terms of service (“Terms”), along with Opera’s privacy policy located at https://www.opera.com/privacy (“Privacy Policy”), form a binding contract between you and Opera Software AS">
-    
-    
-    <meta property="og:image" content="https://www-static.operacdn.com/static-heap/75/759b5d5a74e1be5fdfd0fd1fed338c9d1c6cbb33/opera-152.png">
-          <meta property="og:title" content="Terms of Service | Opera">
-        <meta property="og:url" content="https://www.opera.com/terms">
-          <meta property="og:description" content="These terms of service (“Terms”), along with Opera’s privacy policy located at https://www.opera.com/privacy (“Privacy Policy”), form a binding contract between you and Opera Software AS">
-        <meta property="og:type" content="website">
-
-    
-          <title>Terms of Service | Opera</title>
-    
-    
-    <link rel="dns-prefetch" href="//www-static.operacdn.com">
-    <link rel="apple-touch-icon" href="https://www-static.operacdn.com/static-heap/91/91051bd6095b8484c359274af1ec222b6bd293d4/opera-57.png">
-    <link rel="apple-touch-icon" sizes="57x57" href="https://www-static.operacdn.com/static-heap/91/91051bd6095b8484c359274af1ec222b6bd293d4/opera-57.png">
-    <link rel="apple-touch-icon" sizes="72x72" href="https://www-static.operacdn.com/static-heap/1d/1db0d666779ad5dc2bde071f1e64223cbc898079/opera-72.png">
-    <link rel="apple-touch-icon" sizes="76x76" href="https://www-static.operacdn.com/static-heap/ca/cab9c89aeabd94f19da89e4aae5fac8077f40288/opera-76.png">
-    <link rel="apple-touch-icon" sizes="114x114" href="https://www-static.operacdn.com/static-heap/3e/3eb93f40546e3dd463deb58e5a5b59ace97d8cff/opera-114.png">
-    <link rel="apple-touch-icon" sizes="120x120" href="https://www-static.operacdn.com/static-heap/ab/ab7832e9d56e106488f110e871c46f774576b093/opera-120.png">
-    <link rel="apple-touch-icon" sizes="144x144" href="https://www-static.operacdn.com/static-heap/5e/5ed11b7f90d7abe5af33392636f1e1fd40f8d40f/opera-144.png">
-    <link rel="apple-touch-icon" sizes="152x152" href="https://www-static.operacdn.com/static-heap/75/759b5d5a74e1be5fdfd0fd1fed338c9d1c6cbb33/opera-152.png">
-
-    
-    <meta name="application-name" content="Terms of Service - Opera">
-    <meta name="msapplication-TileColor" content="#FE1B2C">
-    <meta name="msapplication-TileImage" content="https://www-static.operacdn.com/static-heap/6a/6aa0021764af934c8431d64fbf508a90ef30846d/opera-windows-144.png">
-    <meta name="msapplication-square70x70logo" content="https://www-static.operacdn.com/static-heap/27/27d2de5f321780e481fcd3cf8e7a4800295ed5bd/opera-windows-70.png">
-    <meta name="msapplication-square150x150logo" content="https://www-static.operacdn.com/static-heap/05/0556dff691cc07304d9f12204548ab63c3142368/opera-windows-150.png">
-    <meta name="msapplication-wide310x150logo" content="https://www-static.operacdn.com/static-heap/42/42554ff6fabadcc22853c011b777923e56a2a94c/opera-windows-310-150.png">
-    <meta name="msapplication-square310x310logo" content="https://www-static.operacdn.com/static-heap/99/9938c6221aba7d87edf2ec2795206bf92d4c3d29/opera-windows-310.png">
-
-    
-                                                                                                  <link rel="alternate" hreflang="id" href="https://www.opera.com/id/terms" />
-                                                                                                    <link rel="alternate" hreflang="ms" href="https://www.opera.com/ms/terms" />
-                                                                                                    <link rel="alternate" hreflang="cs" href="https://www.opera.com/cs/terms" />
-                                                                                                    <link rel="alternate" hreflang="da" href="https://www.opera.com/da/terms" />
-                                                                                                    <link rel="alternate" hreflang="de" href="https://www.opera.com/de/terms" />
-                                                                                  <link rel="canonical" hreflang="en" href="https://www.opera.com/terms" />
-                                                                                                    <link rel="alternate" hreflang="es" href="https://www.opera.com/es/terms" />
-                                                                                                    <link rel="alternate" hreflang="es-419" href="https://www.opera.com/es-419/terms" />
-                                                                                                    <link rel="alternate" hreflang="tl" href="https://www.opera.com/tl/terms" />
-                                                                                                    <link rel="alternate" hreflang="fr" href="https://www.opera.com/fr/terms" />
-                                                                                                    <link rel="alternate" hreflang="it" href="https://www.opera.com/it/terms" />
-                                                                                                    <link rel="alternate" hreflang="hu" href="https://www.opera.com/hu/terms" />
-                                                                                                    <link rel="alternate" hreflang="nl" href="https://www.opera.com/nl/terms" />
-                                                                                                    <link rel="alternate" hreflang="no" href="https://www.opera.com/no/terms" />
-                                                                                                    <link rel="alternate" hreflang="pl" href="https://www.opera.com/pl/terms" />
-                                                                                                    <link rel="alternate" hreflang="pt" href="https://www.opera.com/pt/terms" />
-                                                                                                    <link rel="alternate" hreflang="pt-br" href="https://www.opera.com/pt-br/terms" />
-                                                                                                    <link rel="alternate" hreflang="ro" href="https://www.opera.com/ro/terms" />
-                                                                                                    <link rel="alternate" hreflang="sk" href="https://www.opera.com/sk/terms" />
-                                                                                                    <link rel="alternate" hreflang="fi" href="https://www.opera.com/fi/terms" />
-                                                                                                    <link rel="alternate" hreflang="sv" href="https://www.opera.com/sv/terms" />
-                                                                                                    <link rel="alternate" hreflang="vi" href="https://www.opera.com/vi/terms" />
-                                                                                                    <link rel="alternate" hreflang="tr" href="https://www.opera.com/tr/terms" />
-                                                                                                    <link rel="alternate" hreflang="el" href="https://www.opera.com/el/terms" />
-                                                                                                    <link rel="alternate" hreflang="bg" href="https://www.opera.com/bg/terms" />
-                                                                                                    <link rel="alternate" hreflang="ru" href="https://www.opera.com/ru/terms" />
-                                                                                                    <link rel="alternate" hreflang="uk" href="https://www.opera.com/uk/terms" />
-                                                                                                    <link rel="alternate" hreflang="he" href="https://www.opera.com/he/terms" />
-                                                                                                    <link rel="alternate" hreflang="ar" href="https://www.opera.com/ar/terms" />
-                                                                                                    <link rel="alternate" hreflang="hi" href="https://www.opera.com/hi/terms" />
-                                                                                                    <link rel="alternate" hreflang="th" href="https://www.opera.com/th/terms" />
-                                                                                                    <link rel="alternate" hreflang="ko" href="https://www.opera.com/ko/terms" />
-                                                                                                    <link rel="alternate" hreflang="zh-cn" href="https://www.opera.com/zh-cn/terms" />
-                                                                                                    <link rel="alternate" hreflang="zh-tw" href="https://www.opera.com/zh-tw/terms" />
-                                                                                                    <link rel="alternate" hreflang="ja" href="https://www.opera.com/ja/terms" />
-              
-                        <link rel="stylesheet" type="text/css" media="all" href="https://www-static.operacdn.com/extension/opera/design/opera/static/css/latin_latinext-634dce27.css">
-        
-                  <link rel="stylesheet" type="text/css" media="all" href="https://www-static.operacdn.com/extension/opera/design/opera/static/css/header-footer-8618b3a3.css">
-                  <link rel="stylesheet" type="text/css" media="all" href="https://www-static.operacdn.com/extension/opera/design/opera/static/css/opera2-3353345c.css">
-                              
-    
-    
-    
-      </head>
-  <body>
-          <!-- Google Tag Manager -->
-
-  <noscript><iframe src="//www.googletagmanager.com/ns.html?id=GTM-Q5SW"
-  height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript>
-  <script>
-    (function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start':
-    new Date().getTime(),event:'gtm.js'});var f=d.getElementsByTagName(s)[0],
-            j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src=
-            '//www.googletagmanager.com/gtm.js?id='+i+dl;f.parentNode.insertBefore(j,f);
-            })(window,document,'script','dataLayer','GTM-Q5SW');
-  </script>
-
-<!-- End Google Tag Manager -->
-              
-    <header id="header" class="ns--hf">
-      <div class="hf--primary">
-        <div class="hf--width-holder">
-          <div class="hf--main-nav" role="navigation">
-            <a class="hf--brand" href="/">
-                              <img src="https://www-static.operacdn.com/static-heap/11/11bb20439edcccff33dbfa6df6f4c9ad564f91e4/logo-header-opera.png" srcset="https://www-static.operacdn.com/static-heap/11/11bb20439edcccff33dbfa6df6f4c9ad564f91e4/logo-header-opera.png 1x, https://www-static.operacdn.com/static-heap/28/2820d98042080cc51dea518980d80293bf732770/logo-header-opera2x.png 2x" alt="Opera">
-                          </a>
-            <div class="hf--menu">
-              <input id="hf--menu-switcher" class="hf--hide" type="checkbox">
-              <label class="hf--menu-switcher" for="hf--menu-switcher"></label>
-              <div>
-                <div>
-                  <ul class="hf--main-nav-items" role="menu">
-                                                                                                      
-                                                                                                          <li><a href="/computer" data-event-action="hf-main-nav-item" data-event-category="hf" role="menuitem">Computer browsers</a></li>
-                                                                                                            <li><a href="/mobile" data-event-action="hf-main-nav-item" data-event-category="hf" role="menuitem">Mobile apps</a></li>
-                                                              
-                                        
-                                        <li class="hf--menu-opposite">
-                                              <a href="//blogs.opera.com/" data-event-action="hf-main-nav-item" data-event-category="hf" role="menuitem">Blogs</a>
-                                          </li>
-                  </ul>
-                </div>
-              </div>
-            </div>
-          </div>
-        </div>
-      </div>
-
-      
-                                    
-      
-          </header>
-    
-    
-        
-    <main  class="page">
-      <div class="page--content">
-
-    
-      
-                    
-                
-    
-                  
-
-<section class="top-padding--oneline bottom-padding--twolines">
-  <div class="content-width"><h1>Terms of Service</h1>
-<p><i>Last updated: December 5, 2017</i></p><p>Opera Software AS and its affiliates offer a number of different services through their respective websites and software. The terms of this document govern your use of those services. Please read this document carefully.</p><p><b>1. This is a contract.</b></p><p>a. These Terms of Service (“Terms”), along with Opera’s Privacy Statement, form a legally-binding contract between you and Opera Software AS a Norwegian company whose principal place of business is Gjerdrumsvei 19, 0484, Oslo, Norway, as well as its affiliates (“Opera” and “we,” “us” and “our”). By using the Services (as defined below), you are agreeing to be legally bound by these Terms. If you don’t agree with these Terms, you must discontinue using the Services.</p><p>b. As used in these Terms, the word “Services” applies to the services provided to you via Opera’s websites, user forums, your user account system, and software applications.</p><p><b>2. We expect you to be a responsible user.</b></p><p>a. You agree that you will not use the Services for any purpose that is unlawful or prohibited by these Terms. You agree to follow all applicable local, state, national, and international laws and regulations. You are solely responsible for all acts or omissions that occur while using any Services, including the content of any transmissions you send through the Services and any content you upload or publish using the Services.</p><p>b. We expect you to respect the rights of others. By using the Services, you agree that you will not upload, transfer, or otherwise make available files, images, code, materials, or other information or content (“Content”) that violates the rights of any third party, including their intellectual property rights, however defined.</p><p>c. You also agree not to upload, transfer, or otherwise make available any Content that is obscene, vulgar, sexually-oriented, hateful, or threatening. Opera strictly forbids unsolicited messaging and unauthorized advertisements while using the Services.</p><p>d. Opera has a zero-tolerance policy against child sexual abuse content and will terminate the access of any user who publishes or distributes child sexual abuse content. Furthermore, we will report such user to the appropriate authorities.</p><p>e. You are responsible for the security of your user account. Certain Services (including use of Opera’s forums) allow you to create a user account to access to certain Services. You are entirely responsible for maintaining the confidentiality of your user account and password. Additionally, you are also responsible for any and all activities that occur under your user account.</p><p>f. You acknowledge that information of any kind presented to you via the Services may be protected by copyright, trademark, patent and/or other proprietary rights and laws. You agree not to violate these laws or infringe these rights in any way.</p><p>g. Certain features of the Services may allow you to publish or send content that can be viewed by others (“User Generated Content”). You agree that Opera is not liable for User Generated Content that is provided by others. Opera has no duty to pre-screen User Generated Content, but Opera has the right to refuse to post, edit, or deliver User Generated Content. Opera reserves the right to remove User Generated Content for any reason, but Opera is not responsible for any failure or delay in removing such material. Opera reserves the right to block any user’s access to any content, website or webpage at our sole discretion.</p><p>h. Opera does not claim ownership of any User Generated Content. However, by submitting User Generated Content on any Service, including any ideas, concepts, know-how, or techniques described therein, you consent to Opera’s unrestricted use of those items.</p><p>i. If you upload any Content or User Generated Content to Opera’s sites, you warrant that you have the necessary rights and authority to do so, including the necessary consent to upload and distribute any personal information about third persons. You agree that you will not upload viruses or other forms of malware.</p><p><b>3. Details.</b> For clarity, and consistent with the rest of these Terms, here are further details on specific Services that may be available through the Opera websites or software applications.</p><p>a. Extension catalog: Opera may offer a portfolio of third party browser extensions and themes (“Add-Ons”) at <a href="https://addons.opera.com/extensions" target="_self">https://addons.opera.com/extensions</a>. Opera exercises no editorial control over the Add-Ons that you access through this Service.</p><p>b. Compression: Opera’s software applications include compression functionality to enable users to boost the download of web content such as webpages and/or videos. This functionality requests web content through Opera’s proxy or compression servers. Your browsing experience may change due to increased loading speeds. Certain webpages may not be available through proxy servers.</p><p>c. News recommendations: Opera’s software applications may include a current news feed feature to help you discover and access news content made available by third parties on the internet. Opera exercises no editorial control over any content that you access through this Service.</p><p>d. Synchronization: Opera allows you to enable synchronization of browser data such as your speed dials between Opera browsers on the devices you are using. This Service requires that you login to a social network service or create an Opera account.</p><p>e. Contextual hints: Opera’s browser for computers may include “Browser Assistant”, a component that provides contextual hints about certain Opera browser features and other useful information which you might be interested in. Browser Assistant is an optional component of the software.</p><p>f. Virtual Private Network: Through Opera’s browser for computers you may have access to a virtual private network (“VPN”). Consistent with other provisions of these terms, you agree not to use the VPN service in a manner that violates applicable law or otherwise infringes any third party’s rights. Opera does not guarantee that VPN service will always be available. The VPN feature is not an end-to-end service and it does not guarantee that any transmissions of information made while using VPN will be secure. Note that certain websites may not be accessible while using VPN.</p><p>g. Snapshot: Opera’s browser for computers may include functions that enable you to easily take screenshots of content viewed through the browser. This feature is for your personal, non-commercial use only. You agree never to use the feature in any way that violates applicable law, or the rights of any third party, including copyrights.</p><p>h. Virtual Reality functions: Opera’s browser for computers may include functions that facilitate access to virtual reality content using your virtual reality hardware. Your use of any virtual reality hardware and related services are governed by separate terms and conditions. Opera is not responsible for your use of your hardware, or for any virtual reality content produced by third parties.</p><p><b>4. The Services are provided without any warranties or guarantees.</b> Opera does not guarantee that your use of the Services will be problem free. Although we work hard to provide the highest quality software and services, we cannot and do not guarantee that they will work perfectly every time or in every respect.</p><p>a. The Services are provided “as is” without warranties of any kind. Opera and/or its respective suppliers hereby disclaim all warranties and conditions with regard to the Services, including all implied warranties and conditions of merchantability, fitness for a particular purpose, title, and non-infringement.</p><p>b. Opera does not represent or warrant that the Services will be uninterrupted or error free, that defects will be corrected, or that the Services or the server that makes them available are free of viruses or other harmful components.</p><p>c. In compliance with local law, certain Services and websites may not be available in some countries.</p><p><b>5. Certain Services are provided by third parties.</b> Some Services accessible through the Opera software applications are provided by other companies (“Third Party Services”). Third Party Services may be subject to separate terms and conditions. These Third Party Services may include the following:</p><p>a. WhatsApp: A messaging service provided by WhatsApp, Inc. Terms of use and other important legal information is available at <a href="https://www.whatsapp.com/legal" target="_blank">https://www.whatsapp.com/legal</a>; and</p><p>b. Messenger: A messaging service provided by Facebook, Inc. with Terms of use available at <a href="https://www.facebook.com/legal/terms" target="_blank">https://www.facebook.com/legal/terms</a>.</p><p><b>6. Your access to the Services is subject to change.</b> Opera reserves the right at any time to modify or discontinue the Services in whole or in part, and to terminate your access to the Services at any time, with or without notice. You agree that Opera shall not be liable to you or to any third party for any modification, suspension or discontinuance of the Services. Opera may also terminate or suspend your user account for inactivity, which is defined as failing to sign-in to the Services for an extended period of time, as determined by Opera. Opera reserves the right to assign its rights and responsibilities under these Terms to any third party.</p><p><b>7. Links to the Third Party Sites are available through the Services.</b> The Services may contain links to other websites (“Third Party Sites”), as well as articles, photographs, text, graphics, pictures, designs, music, sound, video, information, applications, software, and other content or items belonging to or originating from third parties (“Third Party Content”). Opera has no control over and no responsibility for Third Party Sites or Third Party Content. Inclusion of, linking to, or permitting the use or installation of any Third Party Site or any Third Party Content does not imply approval or endorsement thereof by Opera.</p><p><b>8. Opera is not responsible for any damages you may incur as a result of your use of the Services.</b></p><p>a. You agree that Opera shall not be responsible for unauthorized access to or alteration of your transmissions or data, any material or data sent or received or not sent or received, or any transactions entered into through the Services.</p><p>b. You agree that Opera is not responsible or liable for any threatening, defamatory, obscene, offensive, or illegal content or conduct of any other party or any infringement of another’s rights, including intellectual property rights. You specifically agree that Opera is not responsible for any content sent using and/or included in the Services by any third party.</p><p>c. In no event shall Opera and/or its suppliers be liable for any direct, indirect, punitive, incidental, special, consequential damages, or any damages whatsoever including, without limitation, damages for loss of use, data, or profits, arising out of or in any way connected with the use or performance of the Services, with the delay or inability to use the Services, the provision of or failure to provide any Services, or for any information, software, products, services, and related graphics obtained through the Services, or otherwise arising out of the use of the Services, whether based on contract, tort, negligence, strict liability, or otherwise, even if opera or any of its suppliers has been advised of the possibility of damages. Because some states/jurisdictions do not allow the exclusion or limitation of liability for consequential or incidental damages, the above limitation may not apply in every instance. If you are dissatisfied with any portion of the Services, or with any of these terms, your sole and exclusive remedy is to discontinue using the Services and related websites.</p><p>d. You agree to indemnify and hold Opera, its parents, subsidiaries, affiliates, officers, and employees, harmless from any claim, demand, or damage, including reasonable attorneys’ fees, asserted by any third party due to or arising out of your use of or conduct on the Services.</p><p><b>9. We need you to respect our trademarks.</b> The Opera word mark and the Opera and “O” logos are trademarks of Opera Software AS in Norway, the European Union and other countries. You agree that all of Opera’s trademarks, trade names, service marks and other Opera logos and brand features, and product and service names are trademarks and the property of Opera (the “Opera Marks”). Without Opera’s prior written permission, you agree not to display or use in any manner the Opera Marks.</p><p><b>10. These Terms are based on Norwegian law.</b> These Terms are governed by the laws of Norway without giving effect to any conflicts of law principles that may require the application of the laws of a different country. The United Nations Convention on Contracts for the International Sale of Goods does not apply to these Terms. All actions or proceedings arising under or related to these Terms must be brought in the Oslo City Court, and each party hereby agree to irrevocably submit to the jurisdiction and venue of any such court in all such actions or proceedings. If any provision of these Terms is determined by a court of competent jurisdiction to be invalid, illegal, or unenforceable, the remaining provisions of these Terms shall not be affected or impaired thereby. You may not assign or transfer your rights under these Terms without obtaining Opera’s prior written consent, and any purported assignment or transfer in violation of this section will be null and void.</p><p><b>11. Opera may modify these Terms.</b> Opera may update these Terms or the Privacy Statement from time to time. The current version of these Terms are posted at <a href="https://www.opera.com/terms" target="_self">https://www.opera.com/terms</a>. The Privacy Statement is posted at <a href="https://www.opera.com/privacy" target="_self">https://www.opera.com/privacy</a>. It is your responsibility to remain informed of any changes, because you are legally obligated to abide by the latest versions of these Terms and the Privacy Statement.</p><p><b>12. Notice to rights holders.</b> If you believe that any content accessible via the Services infringes your rights, you may submit a notification to Opera in which you provide the following information: (a) identification of the rights/works that are being infringed upon; (b) identification of the content that is infringing your rights (including URL(s) for the content); (c) your name, address, telephone number, and electronic mail address; (d) a statement that you have a good faith belief that use of the content in the manner complained of is not authorized by the rights holder, its agent, or the law; (e) a statement that the information in the notification is accurate and, under penalty of perjury, that you are authorized to act on behalf of the owner of an exclusive right that is allegedly infringed; and (f) your physical or electronic signature, or that of a person authorized to act on your behalf, of the owner of an exclusive right that is allegedly infringed. Notices may be sent to <a href="mailto:legal&#x0040;opera.com" target="_self">legal&#x0040;opera.com</a>, attention: Content Team.</p></div>
-</section>
-
-      </div>
-          </main>
-
-          
-    <footer class="ns--hf">
-      <div class="hf--top-side">
-        <div class="hf--width-holder">
-                                  <div class="hf--language">
-              <span class="hf--language-selector-icon"><span class="hf--hide">Select your language:</span></span>
-              <span>
-                <select class="hf--language-selector" onchange="location=this.options[this.selectedIndex].value;">
-                  <option data-name="id" value="/id/terms">Bahasa Indonesia</option><option data-name="ms" value="/ms/terms">Bahasa Melayu</option><option data-name="cs" value="/cs/terms">Čeština</option><option data-name="da" value="/da/terms">Dansk</option><option data-name="de" value="/de/terms">Deutsch</option><option data-name="en" value="/terms" selected>English</option><option data-name="es" value="/es/terms">Español</option><option data-name="es-419" value="/es-419/terms">Español (Latinoamérica)</option><option data-name="tl" value="/tl/terms">Filipino</option><option data-name="fr" value="/fr/terms">Français</option><option data-name="it" value="/it/terms">Italiano</option><option data-name="hu" value="/hu/terms">Magyar</option><option data-name="nl" value="/nl/terms">Nederlands</option><option data-name="no" value="/no/terms">Norsk (bokmål)</option><option data-name="pl" value="/pl/terms">Polski</option><option data-name="pt" value="/pt/terms">Português</option><option data-name="pt-br" value="/pt-br/terms">Português (Brasil)</option><option data-name="ro" value="/ro/terms">Română</option><option data-name="sk" value="/sk/terms">Slovenčina</option><option data-name="fi" value="/fi/terms">Suomi</option><option data-name="sv" value="/sv/terms">Svenska</option><option data-name="vi" value="/vi/terms">Tiếng Việt</option><option data-name="tr" value="/tr/terms">Türkçe</option><option data-name="el" value="/el/terms">Ελληνικά</option><option data-name="bg" value="/bg/terms">Български</option><option data-name="ru" value="/ru/terms">Русский</option><option data-name="uk" value="/uk/terms">Українська</option><option data-name="he" value="/he/terms">עברית</option><option data-name="ar" value="/ar/terms">العربية</option><option data-name="hi" value="/hi/terms">हिंदी</option><option data-name="th" value="/th/terms">ไทย</option><option data-name="ko" value="/ko/terms">한국어</option><option data-name="zh-cn" value="/zh-cn/terms">中文（中国）</option><option data-name="zh-tw" value="/zh-tw/terms">中文（台灣）</option><option data-name="ja" value="/ja/terms">日本語</option>                </select>
-              </span>
-            </div>                                    <p class="hf--back">
-                  <a class="hf--text-uppercase back-to-top" href="#" onclick="return false;">Top</a>
-                </p>        </div>
-        <div class="hf--social">
-          <div class="hf--width-holder">
-            <p class="hf--social-headline hf--hide">Follow Opera</p>
-            
-            <div class="hf--social-icons">
-              <a class="facebook" href="https://facebook.com/opera" data-event-action="hf-footer-social-item" data-event-category="hf">
-                <span class="hf--hide">Facebook</span>
-              </a>
-                            <a class="twitter" href="https://twitter.com/opera" data-event-action="hf-footer-social-item" data-event-category="hf">
-                <span class="hf--hide">Twitter</span>
-              </a>
-              <a class="youtube" href="https://www.youtube.com/opera" data-event-action="hf-footer-social-item" data-event-category="hf">
-                <span class="hf--hide">Youtube</span>
-              </a>
-              <a class="linkedin" href="https://www.linkedin.com/company/opera-software" data-event-action="hf-footer-social-item" data-event-category="hf">
-                <span class="hf--hide">LinkedIn</span>
-              </a>
-                            <a class="instagram" href="https://instagram.com/operabrowser" data-event-action="hf-footer-social-item" data-event-category="hf">
-                <span class="hf--hide">Instagram</span>
-              </a>
-            </div>
-          </div>
-        </div>
-      </div>
-      <div class="hf--links">
-        <div class="hf--width-holder">
-          <ul class="hf--links-section">
-            <li><a class="hf--text-uppercase" href="https://www.opera.com/download">Download Opera</a></li>
-            <li><a class="hf--text-regular" href="//www.opera.com/computer">Computer browsers</a></li>
-            <li><a class="hf--text-regular" href="//www.opera.com/mobile">Mobile apps</a></li>
-            <li><span class="hf--links-sep"><span class="hf--hide">-</span></span></li>
-            <li><a class="hf--text-uppercase" href="//www.opera.com/help">Help &amp; support</a></li>
-            <li><a class="hf--text-uppercase" href="//blogs.opera.com/">Opera blogs</a></li>
-            <li><a class="hf--text-uppercase last-link" href="//forums.opera.com">Opera forums</a></li>
-          </ul>
-          <ul class="hf--links-section">
-            <li><a class="hf--text-uppercase" href="http://dev.opera.com/">Dev.Opera</a></li>
-            <li><a class="hf--text-regular" href="https://www.opera.com/computer/beta">Beta version</a></li>
-            <li><a class="hf--text-regular" href="https://www.opera.com/computer/neon">Opera Neon</a></li>
-            <li><span class="hf--links-sep"><span class="hf--hide">-</span></span></li>
-            <li><strong class="hf--text-uppercase">Services</strong></li>
-            <li><a class="hf--text-regular" href="https://addons.opera.com">Add-ons</a></li>
-            <li><a class="hf--text-regular" href="https://auth.opera.com/account/login">Opera account</a></li>
-          </ul>
-          <ul class="hf--links-section">
-            <li><a class="hf--text-uppercase" href="http://www.operasoftware.com">Opera B2B</a></li>
-            <li><a class="hf--text-regular" href="http://www.operasoftware.com/operators">Operator solutions</a></li>
-            <li><a class="hf--text-regular" href="http://www.operasoftware.com/mobile-oems">OEM solutions</a></li>
-            <li><a class="hf--text-regular" href="http://www.operasoftware.com/content-partners">Partner with Opera</a></li>
-            <li><a class="hf--text-regular" href="http://www.operasoftware.com/blog">Business blog</a></li>
-          </ul>
-          <ul class="hf--links-section">
-            <li><a class="hf--text-uppercase" href="https://www.opera.com/about">About Opera</a></li>
-            <li><a class="hf--text-regular" href="https://www.opera.com/jobs">Jobs</a></li>
-            <li><a class="hf--text-regular" href="http://www.operasoftware.com/company/investors">Investors</a></li>
-            <li><a class="hf--text-regular" href="http://www.operasoftware.com/press">Press info</a></li>
-            <li><a class="hf--text-regular" href="http://www.operasoftware.com/company/contact">Contact us</a></li>
-          </ul>
-        </div>
-      </div>
-      <div class="hf--bottom-side hf--width-holder">
-        <div class="hf--bottom-wrapper">
-          <div class="hf--social">
-            <p class="hf--social-headline hf--hide">Follow Opera</p>
-            
-            <div class="hf--social-icons">
-              <a class="facebook" href="https://facebook.com/opera" data-event-action="hf-footer-social-item" data-event-category="hf">
-                <span class="hf--hide">Facebook</span>
-              </a>
-                            <a class="twitter" href="https://twitter.com/opera" data-event-action="hf-footer-social-item" data-event-category="hf">
-                <span class="hf--hide">Twitter</span>
-              </a>
-              <a class="youtube" href="https://www.youtube.com/opera" data-event-action="hf-footer-social-item" data-event-category="hf">
-                <span class="hf--hide">Youtube</span>
-              </a>
-              <a class="linkedin" href="https://www.linkedin.com/company/opera-software" data-event-action="hf-footer-social-item" data-event-category="hf">
-                <span class="hf--hide">LinkedIn</span>
-              </a>
-                            <a class="instagram" href="https://instagram.com/operabrowser" data-event-action="hf-footer-social-item" data-event-category="hf">
-                <span class="hf--hide">Instagram</span>
-              </a>
-            </div>
-          </div>
-          <div class="hf--copyrights">
-            <ul class="hf--copyrights-items">
-              <li><strong>&copy; Opera Software</strong></li>
-              <li><a href="https://www.opera.com/privacy">Privacy</a></li>
-              <li><a href="https://www.opera.com/terms">Terms of Use</a></li>
-            </ul>
-          </div>
-          <div class="hf--controls">
-                                      <div class="hf--language">
-              <span class="hf--language-selector-icon"><span class="hf--hide">Select your language:</span></span>
-              <span>
-                <select class="hf--language-selector" onchange="location=this.options[this.selectedIndex].value;">
-                  <option data-name="id" value="/id/terms">Bahasa Indonesia</option><option data-name="ms" value="/ms/terms">Bahasa Melayu</option><option data-name="cs" value="/cs/terms">Čeština</option><option data-name="da" value="/da/terms">Dansk</option><option data-name="de" value="/de/terms">Deutsch</option><option data-name="en" value="/terms" selected>English</option><option data-name="es" value="/es/terms">Español</option><option data-name="es-419" value="/es-419/terms">Español (Latinoamérica)</option><option data-name="tl" value="/tl/terms">Filipino</option><option data-name="fr" value="/fr/terms">Français</option><option data-name="it" value="/it/terms">Italiano</option><option data-name="hu" value="/hu/terms">Magyar</option><option data-name="nl" value="/nl/terms">Nederlands</option><option data-name="no" value="/no/terms">Norsk (bokmål)</option><option data-name="pl" value="/pl/terms">Polski</option><option data-name="pt" value="/pt/terms">Português</option><option data-name="pt-br" value="/pt-br/terms">Português (Brasil)</option><option data-name="ro" value="/ro/terms">Română</option><option data-name="sk" value="/sk/terms">Slovenčina</option><option data-name="fi" value="/fi/terms">Suomi</option><option data-name="sv" value="/sv/terms">Svenska</option><option data-name="vi" value="/vi/terms">Tiếng Việt</option><option data-name="tr" value="/tr/terms">Türkçe</option><option data-name="el" value="/el/terms">Ελληνικά</option><option data-name="bg" value="/bg/terms">Български</option><option data-name="ru" value="/ru/terms">Русский</option><option data-name="uk" value="/uk/terms">Українська</option><option data-name="he" value="/he/terms">עברית</option><option data-name="ar" value="/ar/terms">العربية</option><option data-name="hi" value="/hi/terms">हिंदी</option><option data-name="th" value="/th/terms">ไทย</option><option data-name="ko" value="/ko/terms">한국어</option><option data-name="zh-cn" value="/zh-cn/terms">中文（中国）</option><option data-name="zh-tw" value="/zh-tw/terms">中文（台灣）</option><option data-name="ja" value="/ja/terms">日本語</option>                </select>
-              </span>
-            </div>                        <div class="hf--nav">
-              <div class="hf--width-holder">
-                                <p class="hf--back">
-                  <a class="hf--text-uppercase back-to-top" href="#" onclick="return false;">Top</a>
-                </p>              </div>
-            </div>
-          </div>
-        </div>
-      </div>
-    </footer>
-                  <script src="https://www-static.operacdn.com/static-heap/4d/4d7f76c8987efba7e997c2cead49c858f7966ebb/linkfeedback.js"></script>
-      <script src="https://www-static.operacdn.com/static-heap/30/305ba43f6e26911dcc3a6c564473af33b85c804d/browserinfo.js"></script>
-      <script src="https://www-static.operacdn.com/static-heap/98/98f88227912fc67b44662e8392f3779e4e6ccab5/opera.js"></script>
-      <script src="https://www-static.operacdn.com/static-heap/3d/3d254f1aec48f4b9990a19c04c7355d29c995fd5/promoassets.js"></script>
-      </body>
-</html>
\ No newline at end of file
diff --git a/network/opera-legacy/README b/network/opera-legacy/README
deleted file mode 100644
index 35e2c788ed..0000000000
--- a/network/opera-legacy/README
+++ /dev/null
@@ -1,14 +0,0 @@
-opera-legacy (Fast and secure web browser and Internet suite)
-
-opera-legacy is a small, fast, customizable, powerful, and
-user-friendly web browser, as well as an Internet suite, including an
-email client, IRC client, BiTorrent client and web developer tools
-(Opera Dragonfly).
-
-This browser uses a old engine "Presto", for new engine "Blink please
-see "opera" or "opera-developer" SlackBuilds.
-
-This is a old (and unmaintained) version of Opera browser,
-USE AT YOUR OWN RISK!
-
-Optional dependencies: flashplayer-plugin, jdk or openjdk.
diff --git a/network/opera-legacy/doinst.sh b/network/opera-legacy/doinst.sh
deleted file mode 100644
index 0fb9c8b686..0000000000
--- a/network/opera-legacy/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 [ -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/network/opera-legacy/opera-legacy.SlackBuild b/network/opera-legacy/opera-legacy.SlackBuild
deleted file mode 100644
index 24d5218bf3..0000000000
--- a/network/opera-legacy/opera-legacy.SlackBuild
+++ /dev/null
@@ -1,97 +0,0 @@
-#!/bin/sh
-#
-# Slackware build script for opera-legacy.
-#
-# Copyright 2016-2017 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=opera-legacy
-VERSION=${VERSION:-12.16.1860}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-    i?86) ARCH=i686 ;;
-    arm*) ARCH=arm ;;
-       *) ARCH=$( uname -m ) ;;
-  esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-SRCNAM=${SRCNAM:-opera}
-SRCVER=${SRCVER:-12.16-1860}
-
-set -e
-
-if [ "$ARCH" = "x86_64" ]; then
-  LIBDIRSUFFIX="64"
-  OARCH=$ARCH
-elif [ "$ARCH" = "i686" ]; then
-  LIBDIRSUFFIX=""
-  OARCH=i386
-else
-  printf "\n\n$ARCH is not supported...\n"
-  exit 1
-fi
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-${VERSION}
-tar xf $CWD/$SRCNAM-${SRCVER}.${OARCH}.linux.tar.xz
-mv $SRCNAM-${SRCVER}.${OARCH}.linux $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 {} \;
-
-./install --name $PRGNAM \
-  --prefix /usr \
-  --repackage $PKG/usr
-
-if [ -n "$LIBDIRSUFFIX" ]; then
-  mv $PKG/usr/lib $PKG/usr/lib$LIBDIRSUFFIX
-  sed -i "s,/lib/,/lib$LIBDIRSUFFIX/," $PKG/usr/bin/$PRGNAM
-fi
-
-mv $PKG/usr/share/{man,doc} $PKG/usr
-mv $PKG/usr/doc/$PRGNAM $PKG/usr/doc/${PRGNAM}-$VERSION
-if [ -f "$PKG/usr/doc/${PRGNAM}-$VERSION/LICENSE" ]; then
-  find $PKG/usr/share/$PRGNAM/{defaults,locale/en*} -name license.txt -type l -delete
-  mv $PKG/usr/doc/${PRGNAM}-$VERSION/LICENSE $PKG/usr/share/$PRGNAM/defaults/license.txt
-  ( cd $PKG/usr/doc/${PRGNAM}-$VERSION/ ; ln -s ../../share/$PRGNAM/defaults/license.txt LICENSE )
-fi
-
-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 -p -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/network/opera-legacy/opera-legacy.info b/network/opera-legacy/opera-legacy.info
deleted file mode 100644
index 9870b53649..0000000000
--- a/network/opera-legacy/opera-legacy.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="opera-legacy"
-VERSION="12.16.1860"
-HOMEPAGE="https://www.opera.com"
-DOWNLOAD="http://ftp.opera.com/pub/opera/linux/1216/opera-12.16-1860.i386.linux.tar.xz"
-MD5SUM="08545c66ba00a568324b1a393c8782f7"
-DOWNLOAD_x86_64="http://ftp.opera.com/pub/opera/linux/1216/opera-12.16-1860.x86_64.linux.tar.xz"
-MD5SUM_x86_64="ead647964ace52f44ced98adbc568ae7"
-REQUIRES=""
-MAINTAINER="Edinaldo P. Silva"
-EMAIL="edps.mundognu@gmail.com"
diff --git a/network/opera-legacy/slack-desc b/network/opera-legacy/slack-desc
deleted file mode 100644
index 3c83c029ab..0000000000
--- a/network/opera-legacy/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------------------------------------------------------|
-opera-legacy: opera-legacy (Fast and secure web browser and Internet suite)
-opera-legacy:
-opera-legacy: opera-legacy is a small, fast, customizable, powerful, and
-opera-legacy: user-friendly web browser, as well as an Internet suite, including an
-opera-legacy: email client, IRC client, BitTorrent client, web developer tools
-opera-legacy: (Opera Dragonfly).
-opera-legacy:
-opera-legacy: Home page:  https://www.opera.com/browser/
-opera-legacy:
-opera-legacy:
-opera-legacy:
diff --git a/network/opera/README b/network/opera/README
index 1b0e678281..6a4894ae98 100644
--- a/network/opera/README
+++ b/network/opera/README
@@ -7,10 +7,3 @@ Macintosh and Windows are also available.
 This is a Stable version of Opera browser, for development version
 please see "opera-development" and for a old version based on
 Presto engine, please see a SlackBuild called "opera-legacy".
-
-NOTE: since version 46.0.2590.0 Opera's drops 32 bits support, for more:
-https://blogs.opera.com/desktop/2017/05/opera-developer-46-0-2590-0-update/
-
-This suggests: pepperflash-plugin, ffmpeg, opera-ffmpeg-codecs.
-
-Changelog: https://blogs.opera.com/desktop/changelog-for-62/#b3331.99
diff --git a/network/opera/opera.SlackBuild b/network/opera/opera.SlackBuild
index a4de4b06bf..23ef5941f3 100644
--- a/network/opera/opera.SlackBuild
+++ b/network/opera/opera.SlackBuild
@@ -1,8 +1,9 @@
-#!/bin/sh
+#!/bin/bash
 #
 # Slackware build script for opera.
 #
-# Copyright 2016-2019  Edinaldo P. Silva, Rio de Janeiro, Brazil.
+# Copyright 2023-2024  Dimitris Zlatanidis, Orestiada, Greece.
+# Copyright 2016-2022  Edinaldo P. Silva, Rio de Janeiro, Brazil.
 # 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=opera
-VERSION=${VERSION:-62.0.3331.99}
+VERSION=${VERSION:-109.0.5097.45}
 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}
@@ -96,6 +107,8 @@ install -Dm644 $CWD/eula.html $PKG/usr/share/licenses/$PRGNAM/eula.html
 install -Dm644 $CWD/terms.html $PKG/usr/share/licenses/$PRGNAM/terms.html
 install -Dm644 $CWD/privacy.html $PKG/usr/share/licenses/$PRGNAM/privacy.html
 
+sed -i '/^TargetEnvironment/d' $PKG/usr/share/applications/$PRGNAM.desktop 
+
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
@@ -103,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/network/opera/opera.info b/network/opera/opera.info
index 2c0559ff7a..302d6b2447 100644
--- a/network/opera/opera.info
+++ b/network/opera/opera.info
@@ -1,10 +1,10 @@
 PRGNAM="opera"
-VERSION="62.0.3331.99"
+VERSION="109.0.5097.45"
 HOMEPAGE="https://www.opera.com/"
 DOWNLOAD="UNSUPPORTED"
 MD5SUM=""
-DOWNLOAD_x86_64="https://download3.operacdn.com/pub/opera/desktop/62.0.3331.99/linux/opera-stable_62.0.3331.99_amd64.deb"
-MD5SUM_x86_64="00d5e28f5945fa6f1562580135d3b361"
+DOWNLOAD_x86_64="https://get.geo.opera.com/pub/opera/desktop/109.0.5097.45/linux/opera-stable_109.0.5097.45_amd64.deb"
+MD5SUM_x86_64="8f42e3889190c6ef7de87101dff70028"
 REQUIRES=""
-MAINTAINER="Edinaldo P. Silva"
-EMAIL="edps.mundognu@gmail.com"
+MAINTAINER="Dimitris Zlatanidis"
+EMAIL="dslackw@gmail.com"
diff --git a/network/otter/otter.SlackBuild b/network/otter/otter.SlackBuild
index 321d9c10d7..725d8e97c9 100644
--- a/network/otter/otter.SlackBuild
+++ b/network/otter/otter.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for otter
 
-# Copyright 2014-2019  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,11 +22,15 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-SRCNAM=otter-browser
-PRGNAM=$(echo $SRCNAM | cut -c1-5)
-VERSION=${VERSION:-1.0.01}
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=otter
+VERSION=${VERSION:-1.0.03}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+SRCNAM=otter-browser
 
 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}
@@ -87,6 +98,10 @@ 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
 
+# Fix otter desktop file
+mv $PKG/usr/share/applications/otter-browser.desktop \
+	$PKG/usr/share/applications/otter.desktop
+
 mkdir -p $PKG/usr/man/man1
 mv $PKG/usr/share/man/man1 $PKG/usr/man
 rm -rf $PKG/usr/share/man
@@ -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/network/otter/otter.info b/network/otter/otter.info
index 261e4f4d93..8c887e0e7f 100644
--- a/network/otter/otter.info
+++ b/network/otter/otter.info
@@ -1,10 +1,10 @@
 PRGNAM="otter"
-VERSION="1.0.01"
+VERSION="1.0.03"
 HOMEPAGE="https://otter-browser.org/"
-DOWNLOAD="https://github.com/OtterBrowser/otter-browser/archive/v1.0.01/otter-browser-1.0.01.tar.gz"
-MD5SUM="99601d0b230956dc542a04f0df912626"
+DOWNLOAD="https://github.com/OtterBrowser/otter-browser/archive/v1.0.03/otter-browser-1.0.03.tar.gz"
+MD5SUM="6c34113c7a35f810346d5cc2a3b9d66f"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="qt5"
+REQUIRES=""
 MAINTAINER="Dimitris Zlatanidis"
-EMAIL="d.zlatanidis@gmail.com"
+EMAIL="dslackw@gmail.com"
diff --git a/network/owncloud-client/README b/network/owncloud-client/README
index f33bd42c4b..6d1aeed860 100644
--- a/network/owncloud-client/README
+++ b/network/owncloud-client/README
@@ -1,18 +1,8 @@
-The ownCloud Sync Client is a desktop program you install on your computer.
-You specify one or more directories on the local machine to sync with your
-ownCloud server, and always have your latest files wherever you are. Make
-a change to the files on one computer, it will flow across the others using
-the desktop sync clients.
-
-This package optionally requires the Sphinx package in order to create its
-man pages.
-
-Note:  As of version 2.3.3, qt4 support was dropped and this package requires
-       qt5-webkit. You will also need to build qtkeychain with qt5.
-
-Note:  If you wish to try building this package against qt4 you will need to
-       build qtkeychain with qt4, and build this package with BUILD_WITH_QT4
-       set to 'yes'. There are no guarantees that this will work.
-       For example:
-
-         BUILD_WITH_QT4=yes ./owncloud-client.SlackBuild
+The ownCloud Sync Client is a desktop program you install on your
+computer. You specify one or more directories on the local machine
+to sync with your ownCloud server, and always have your latest files
+wherever you are. Make a change to the files on one computer, it will
+flow across the others using the desktop sync clients.
+
+This package optionally requires the Sphinx package in order to create
+its man pages.
diff --git a/network/owncloud-client/owncloud-client.SlackBuild b/network/owncloud-client/owncloud-client.SlackBuild
index 0ee0dd35aa..7a014c6a9d 100644
--- a/network/owncloud-client/owncloud-client.SlackBuild
+++ b/network/owncloud-client/owncloud-client.SlackBuild
@@ -1,8 +1,9 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for owncloud-client
 
 # Copyright 2013-2018 Christopher Walker Kempner, TX
+# Copyright 2020-2022 Isaac Yu <isaacyu1@isaacyu1.com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,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=owncloud-client
-VERSION=${VERSION:-2.4.2}
+VERSION=${VERSION:-2.11.1.8946}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
-SRCNAM=owncloudclient
+SRCNAM=ownCloud
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -37,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}
@@ -77,14 +85,11 @@ cd build
     -DCMAKE_C_FLAGS="$SLKCFLAGS" \
     -DCMAKE_CXX_FLAGS="$SLKCFLAGS" \
     -DCMAKE_INSTALL_PREFIX=/usr \
-    -DCMAKE_INSTALL_DOCDIR=/usr/doc/$PRGNAM-$VERSION \
     -DCMAKE_INSTALL_MANDIR=/usr/man \
-    -DCMAKE_INSTALL_SYSCONFDIR=/etc/$PRGNAM \
+    -DDATADIR=share \
     -DCMAKE_BUILD_TYPE="Release" \
-    -DBUILD_WITH_QT4=${BUILD_WITH_QT4:-"No"} \
     ..
   make VERBOSE=1
-  make doc
   make install DESTDIR=$PKG
 cd ..
 
@@ -92,7 +97,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 CONTRIBUTING.md COPYING COPYING.documentation ChangeLog README.md \
+cp -a CHANGELOG.md CONTRIBUTING.md COPYING COPYING.documentation README.md \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
@@ -106,4 +111,4 @@ cat $CWD/owncloud.desktop > $PKG/usr/share/applications/owncloud.desktop
 mv $PKG/etc/ownCloud/sync-exclude.lst $PKG/etc/ownCloud/sync-exclude.lst.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/network/owncloud-client/owncloud-client.info b/network/owncloud-client/owncloud-client.info
index 118f044e16..b2e1f344be 100644
--- a/network/owncloud-client/owncloud-client.info
+++ b/network/owncloud-client/owncloud-client.info
@@ -1,10 +1,10 @@
 PRGNAM="owncloud-client"
-VERSION="2.4.2"
+VERSION="2.11.1.8946"
 HOMEPAGE="https://owncloud.org/"
-DOWNLOAD="https://download.owncloud.com/desktop/stable/owncloudclient-2.4.2.tar.xz"
-MD5SUM="0f1d03650888864ffb045162ef9de49d"
+DOWNLOAD="https://download.owncloud.com/desktop/ownCloud/stable/2.11.1.8946/source/ownCloud-2.11.1.8946.tar.xz"
+MD5SUM="0143df7cea72bf29874ae429e7a5f6f9"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="qt5-webkit qtkeychain"
-MAINTAINER="Christopher Walker"
-EMAIL="kris240376@gmail.com"
+REQUIRES="libcloudproviders"
+MAINTAINER="orphaned (no maintainer)"
+EMAIL="nobody@domain.com"
diff --git a/network/owncloud-server/README b/network/owncloud-server/README
index 3e3e9ce0d6..89fde57bca 100644
--- a/network/owncloud-server/README
+++ b/network/owncloud-server/README
@@ -1,8 +1,7 @@
-ownCloud gives you universal access to your files through a web interface
-or WebDAV. It also provides a platform to easily view & sync your contacts,
-calendars and bookmarks across all your devices and enables basic editing
-right on the web.
-
+ownCloud gives you universal access to your files through a web
+interface or WebDAV. It also provides a platform to easily view & sync
+your contacts, calendars and bookmarks across all your devices and
+enables basic editing right on the web.
 
 SlackBuild defaults
 -------------------
@@ -34,13 +33,15 @@ Configuration
 "LoadModule rewrite_module ..." and "Include /etc/httpd/mod_php.conf",
 then restart httpd.
 
-(3) After installation, you must set up the names that clients will use to
-access the server as "trusted domains".
+(3) After installation, you must set up the names that clients will
+use to access the server as "trusted domains".
 
-You must also do this if you are upgrading an older owncloud installation.
+You must also do this if you are upgrading an older owncloud
+installation.
 
-To do this, you will need to edit /srv/httpd/htdocs/owncloud/config/config.php
-as follows (please use your own server name instead of myserver.local or
+To do this, you will need to edit
+/srv/httpd/htdocs/owncloud/config/config.php as follows
+(please use your own server name instead of myserver.local or
 owncloud.example.com):
 
     'trusted_domains' =>
@@ -50,7 +51,7 @@ owncloud.example.com):
       2 => 'owncloud.example.com',
     ),
 
-(4) After installation, **and after every upgrade**, you need to complete
-setup by visiting this page:
+(4) After installation, **and after every upgrade**, you need to
+complete setup by visiting this page:
 
   http://localhost/owncloud/
diff --git a/network/owncloud-server/owncloud-server.SlackBuild b/network/owncloud-server/owncloud-server.SlackBuild
index 49d2565176..bcb6c71e09 100644
--- a/network/owncloud-server/owncloud-server.SlackBuild
+++ b/network/owncloud-server/owncloud-server.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for Owncloud server
 
@@ -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=owncloud-server
 SRCNAM=owncloud
 VERSION=${VERSION:-8.2.11}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 ARCH=noarch
 
@@ -34,7 +37,14 @@ DOCROOT=${DOCROOT:-/srv/httpd/htdocs}
 PHPUSER=${PHPUSER:-root}
 PHPGROUP=${PHPGROUP:-apache}
 
-CWD=$(pwd)
+# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
+# the name of the created package would be, and then exit. This information
+# could be useful to other scripts.
+if [ ! -z "${PRINT_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/network/p0f/README b/network/p0f/README
index 446ebf940c..96b39ac486 100644
--- a/network/p0f/README
+++ b/network/p0f/README
@@ -1,10 +1,10 @@
 P0f is a tool that utilizes an array of sophisticated, purely passive
-traffic fingerprinting mechanisms to identify the players behind any
-incidental TCP/IP communications (often as little as a single normal SYN)
-without interfering in any way. Version 3 is a complete rewrite of the
-original codebase, incorporating a significant number of improvements
-to network-level fingerprinting, and introducing the ability to reason
-about application-level payloads (e.g., HTTP).
+traffic fingerprinting mechanisms to identify the players behind
+any incidental TCP/IP communications (often as little as a single
+normal SYN) without interfering in any way. Version 3 is a complete
+rewrite of the original codebase, incorporating a significant number
+of improvements to network-level fingerprinting, and introducing the
+ability to reason about application-level payloads (e.g., HTTP).
 
 To build and install the optional signature and API tools, specify
 TOOLS=yes to the SlackBuild, for example
diff --git a/network/p0f/p0f.SlackBuild b/network/p0f/p0f.SlackBuild
index 9478028668..710e016007 100644
--- a/network/p0f/p0f.SlackBuild
+++ b/network/p0f/p0f.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for p0f
 
@@ -24,26 +24,36 @@
 
 # Modified by the SlackBuilds.org project
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=p0f
 VERSION=${VERSION:-3.09b}
 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 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/network/pCloudDrive/README b/network/pCloudDrive/README
new file mode 100644
index 0000000000..1e55bbd985
--- /dev/null
+++ b/network/pCloudDrive/README
@@ -0,0 +1,45 @@
+pCloudDrive (pCloud client and drive mounter)
+
+pCloud Drive allows you to use your files in the cloud as if they are
+saved locally, but without taking hard disk space.
+
+pCloud is one of the most secure and easy-to-use cloud storage
+services. It's based in Switzerland giving the best level of privacy.
+Unlike Dropbox, pCloud gives 10 GB of free cloud storage.
+
+They have all the features you are familiar with like, download link
+sharing, folder sharing, giving special permissions to people you
+share with, setting passwords and expiration dates and even more.
+
+pCloud also put no restrictions on the uploading size so you can
+upload any type of file regardless of its size. There is no upload or
+download limit either, and you can enjoy very high speeds.
+
+Security is something for which pCloud is particularly famous. pCloud
+offers top-level cloud encryption with its Crypto service designed to
+secure the most sensitive information on any device of yours. All the
+data locked by pCloud Crypto can only be unlocked by the unique key
+which the account owner has, and no one else can even touch the secure
+data.
+
+pCloud features:
+ * File management tools available to search and filter the files and
+   folders
+ * TLS/SSL encryption to securely transfer the data to pCloud servers
+ * Automatic sync of all the files and folders across desktop and
+   mobile devices for a seamless transition
+ * Zero-knowledge privacy
+ * Client-side encryption to keep the data secure in case your device
+   gets lost
+ * Previous versions of data available with pCloud Rewind which keeps
+   everything for 30 days in case you remove anything accidentally
+ * App for Windows, macOS, Linux, iOS, and Android
+
+Finally, if we talk about the plans of pCloud, you have the freedom
+to choose between two different storage types — 500 GB and 2 TB —
+with either the annual or lifetime subscription.
+
+This script repackages an AppImage.
+
+The download link is dynamic, so you will need to download app image
+manually in your web browser.
diff --git a/network/kmess/doinst.sh b/network/pCloudDrive/doinst.sh
index 4a25de5e6f..4a25de5e6f 100644
--- a/network/kmess/doinst.sh
+++ b/network/pCloudDrive/doinst.sh
diff --git a/network/pCloudDrive/pCloudDrive.SlackBuild b/network/pCloudDrive/pCloudDrive.SlackBuild
new file mode 100644
index 0000000000..df58d5ae1c
--- /dev/null
+++ b/network/pCloudDrive/pCloudDrive.SlackBuild
@@ -0,0 +1,94 @@
+#!/bin/bash
+
+# Slackware build script for pCloudDrive
+
+# Copyright 2020 Igor Alexandrov <igor.alexandrov@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.
+
+# Modifid by slackbuilds.org
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=pCloudDrive
+VERSION=${VERSION:-1.8.2}
+BUILD=${BUILD:-2}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+if [ -z "$ARCH" ]; then
+  ARCH=$(uname -m)
+fi
+
+case "$ARCH" in
+  # do nothing and pass through
+  i?86|x86_64) ;;
+  *)
+    echo "$ARCH is not supported for $PRGNAM-$VERSION"
+    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}
+
+APPIMGNAM=pcloud
+
+rm -rf $PKG
+mkdir -p $TMP $OUTPUT $PKG/{install,opt,usr/{bin,doc/$PRGNAM-$VERSION}}
+cd $PKG/opt
+chmod 755 $CWD/$APPIMGNAM
+$CWD/$APPIMGNAM --appimage-extract
+mv squashfs-root $PRGNAM
+cd $PKG
+mv $PKG/opt/$PRGNAM/usr/share $PKG/usr
+rm -rf $PKG/opt/$PRGNAM/{usr,AppRun,pcloud.png,pcloud.desktop,resources/app/.vscode}
+install -D -m 644 -t $PKG/usr/share/applications $CWD/pclouddrive.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 {} \; -o \
+ \( -perm 700 \) -exec chmod 755 {} \;
+
+find . -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 ../../opt/$PRGNAM/$APPIMGNAM usr/bin/$PRGNAM
+ln -s ../../../opt/$PRGNAM/LICENSE.electron.txt usr/doc/$PRGNAM-$VERSION
+ln -s ../../../opt/$PRGNAM/LICENSES.chromium.html usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
+/sbin/makepkg -p -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/network/pCloudDrive/pCloudDrive.info b/network/pCloudDrive/pCloudDrive.info
new file mode 100644
index 0000000000..9fcaac6eaa
--- /dev/null
+++ b/network/pCloudDrive/pCloudDrive.info
@@ -0,0 +1,10 @@
+PRGNAM="pCloudDrive"
+VERSION="1.8.2"
+HOMEPAGE="https://www.pcloud.com"
+DOWNLOAD="https://www.pcloud.com/how-to-install-pcloud-drive-linux.html?download=electron-32"
+MD5SUM="f901d19762baa9f3c5fce9ed6c2b9fed"
+DOWNLOAD_x86_64="https://www.pcloud.com/how-to-install-pcloud-drive-linux.html?download=electron-64"
+MD5SUM_x86_64="62560154e26d5b848e7bc3e5c19cc649"
+REQUIRES=""
+MAINTAINER="Igor Alexandrov"
+EMAIL="igor.alexandrov@outlook.com"
diff --git a/network/pCloudDrive/pclouddrive.desktop b/network/pCloudDrive/pclouddrive.desktop
new file mode 100644
index 0000000000..a7272366b5
--- /dev/null
+++ b/network/pCloudDrive/pclouddrive.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=pCloudDrive
+Comment=pCloud Drive Client
+Type=Application
+Exec="pCloudDrive" %U
+Terminal=false
+Icon=pcloud
+Categories=Network;
+StartupWMClass=pcloud
diff --git a/network/pCloudDrive/slack-desc b/network/pCloudDrive/slack-desc
new file mode 100644
index 0000000000..2e0d5dac14
--- /dev/null
+++ b/network/pCloudDrive/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+           |-----handy-ruler------------------------------------------------------|
+pCloudDrive: pCloudDrive (pCloud client and drive mounter)
+pCloudDrive:
+pCloudDrive: pCloud Drive allows you to use your files in the cloud as if they are
+pCloudDrive: saved locally, but without taking hard disk space.
+pCloudDrive:
+pCloudDrive: pCloud is one of the most secure and easy-to-use cloud storage
+pCloudDrive: services. It's based in Switzerland giving the best level of privacy.
+pCloudDrive: Unlike Dropbox, pCloud gives 10 GB of free cloud storage.
+pCloudDrive:
+pCloudDrive: https://www.pcloud.com/
+pCloudDrive:
diff --git a/network/packETH/packETH.SlackBuild b/network/packETH/packETH.SlackBuild
index 13888a3401..596cb540e1 100644
--- a/network/packETH/packETH.SlackBuild
+++ b/network/packETH/packETH.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for packETH
 
@@ -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=packETH
-VERSION=${VERSION:-2.1}
-BUILD=${BUILD:-1}
+VERSION=${VERSION:-3.0}
+BUILD=${BUILD:-2}
 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,7 +68,7 @@ mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-cd $PRGNAM
+cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -69,10 +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 {} \;
 
+sed -i "s|\ -Werror||" cli/Makefile
+
 sed -i 's/^LIBS=/LIBS+=/' Makefile.am
 autoreconf -f -i
 
-CFLAGS="$SLKCFLAGS" \
+CFLAGS="$SLKCFLAGS -fcommon" \
 ./configure \
   --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
@@ -94,11 +103,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 COPYING CHANGELOG INSTALL 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/network/packETH/packETH.info b/network/packETH/packETH.info
index e61e66f3cd..35bdd80ecc 100644
--- a/network/packETH/packETH.info
+++ b/network/packETH/packETH.info
@@ -1,8 +1,8 @@
 PRGNAM="packETH"
-VERSION="2.1"
+VERSION="3.0"
 HOMEPAGE="https://github.com/jemcek/packETH"
-DOWNLOAD="https://github.com/jemcek/packETH/archive/2.1/packETH-2.1.tar.gz"
-MD5SUM="31f72ebe0ff6ae0398d4e0abc04eaa34"
+DOWNLOAD="https://github.com/jemcek/packETH/archive/3.0/packETH-3.0.tar.gz"
+MD5SUM="04cb7a1cff7e64e3dbcc8e050de6e030"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/network/packit/README b/network/packit/README
index 501d4a4be6..7a3e6ab06a 100644
--- a/network/packit/README
+++ b/network/packit/README
@@ -1,6 +1,7 @@
-Packit (Packet toolkit) is a network auditing tool. Its value is derived from
-its ability to customize, inject, monitor, and manipulate IP traffic. By
-allowing you to define (spoof) nearly all TCP, UDP, ICMP, IP, ARP, RARP, and
-Ethernet header options, Packit can be useful in testing firewalls, intrusion
-detection/prevention systems, port scanning, simulating network traffic, and
-general TCP/IP auditing. Packit is also an excellent tool for learning TCP/IP.
+Packit (Packet toolkit) is a network auditing tool. Its value
+is derived from its ability to customize, inject, monitor, and
+manipulate IP traffic. By allowing you to define (spoof) nearly all
+TCP, UDP, ICMP, IP, ARP, RARP, and Ethernet header options, Packit
+can be useful in testing firewalls, intrusion detection/prevention
+systems, port scanning, simulating network traffic, and general TCP/IP
+auditing. Packit is also an excellent tool for learning TCP/IP.
diff --git a/network/packit/packit.SlackBuild b/network/packit/packit.SlackBuild
index 98091915e4..c8ac330b13 100644
--- a/network/packit/packit.SlackBuild
+++ b/network/packit/packit.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for Packit (Packet toolkit)
 #
@@ -24,10 +24,13 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=packit
 VERSION=${VERSION:-1.0}
-BUILD=${BUILD:-3}
+BUILD=${BUILD:-4}
 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}
@@ -76,7 +86,7 @@ for i in $CWD/patches/*.patch; do
   patch -p1 --verbose < "$i"
 done
 
-CFLAGS="$SLKCFLAGS" \
+CFLAGS="$SLKCFLAGS -fcommon" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
@@ -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/network/paho-mqtt-c/README b/network/paho-mqtt-c/README
new file mode 100644
index 0000000000..86399f61a2
--- /dev/null
+++ b/network/paho-mqtt-c/README
@@ -0,0 +1,8 @@
+Eclipse Paho C Client Library for the MQTT Protocol
+
+The Paho C client comprises four variant libraries, shared or static:
+
+    paho-mqtt3a - asynchronous (MQTTAsync)
+    paho-mqtt3as - asynchronous with SSL (MQTTAsync)
+    paho-mqtt3c - "classic" / synchronous (MQTTClient)
+    paho-mqtt3cs - "classic" / synchronous with SSL (MQTTClient)
diff --git a/network/paho-mqtt-c/paho-mqtt-c.SlackBuild b/network/paho-mqtt-c/paho-mqtt-c.SlackBuild
new file mode 100644
index 0000000000..b79c2747b6
--- /dev/null
+++ b/network/paho-mqtt-c/paho-mqtt-c.SlackBuild
@@ -0,0 +1,121 @@
+#!/bin/bash
+
+# Slackware build script for the PAHO MQTT C Library
+
+# Copyright 2022 Wayne Cuddy wcuddyATgmailDOTcom
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+# 2022-06-11
+#   - Initial Slackbuild
+#
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=paho-mqtt-c
+SRCNAM=paho.mqtt.c
+VERSION=${VERSION:-1.3.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 the variable PRINT_PACKAGE_NAME is set, then this script will report what
+# the name of the created package would be, and then exit. This information
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; 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 {} \;
+
+# No autotools. Use the existing makfile to compile. We'll patch up a
+# few of the directory paths after compilation.
+
+make
+
+# The makefile doesn't create all the necessary directories.
+mkdir -p $PKG/usr $PKG/usr/bin $PKG/usr/lib $PKG/usr/include $PKG/usr/share/man/man1
+
+# override some parameters in the makefile
+prefix=/usr DESTDIR=$PKG LDCONFIG=echo make install-strip
+
+# Make the installed tree "Slackware friendly". I figured this was cleaner
+# than patching the Makefile.
+mv $PKG/usr/lib $PKG/usr/lib64
+mv $PKG/usr/share/man $PKG/usr/man
+rm -rf $PKG/usr/share
+
+mv $PKG/usr/include $PKG/usr/paho-mqtt
+mkdir $PKG/usr/include
+mv $PKG/usr/paho-mqtt $PKG/usr/include
+
+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 about.html notice.html edl-v10 epl-v20 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/network/paho-mqtt-c/paho-mqtt-c.info b/network/paho-mqtt-c/paho-mqtt-c.info
new file mode 100644
index 0000000000..64ea470ae0
--- /dev/null
+++ b/network/paho-mqtt-c/paho-mqtt-c.info
@@ -0,0 +1,10 @@
+PRGNAM="paho-mqtt-c"
+VERSION="1.3.10"
+HOMEPAGE="https://github.com/eclipse/paho.mqtt.c"
+DOWNLOAD="https://github.com/eclipse/paho.mqtt.c/archive/refs/tags/v1.3.10/paho.mqtt.c-1.3.10.tar.gz"
+MD5SUM="cf0900edfda8fd6214f9070e7f60905b"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Wayne Cuddy"
+EMAIL="wcuddyATgmailDOTcom"
diff --git a/network/paho-mqtt-c/slack-desc b/network/paho-mqtt-c/slack-desc
new file mode 100644
index 0000000000..b70ffe008b
--- /dev/null
+++ b/network/paho-mqtt-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------------------------------------------------------|
+paho-mqtt-c: paho-mqtt-c (C MQTT Client Library)
+paho-mqtt-c:
+paho-mqtt-c: This code builds libraries which enable applications to connect to an
+paho-mqtt-c: MQTT broker to publish messages, and to subscribe to topics and
+paho-mqtt-c: receive published messages.
+paho-mqtt-c:
+paho-mqtt-c: Synchronous and various asynchronous programming models are
+paho-mqtt-c: supported.
+paho-mqtt-c:
+paho-mqtt-c: https://github.com/eclipse/paho.mqtt.c
+paho-mqtt-c:
diff --git a/network/palemoon-bin/README b/network/palemoon-bin/README
index ee331b0de8..3f07fa23ec 100644
--- a/network/palemoon-bin/README
+++ b/network/palemoon-bin/README
@@ -2,12 +2,17 @@ Pale Moon is an Open Source, Goanna-based web browser forked from
 pre-Australis Mozilla Firefox aiming to be fast, efficient and easy to
 use.
 
-This SlackBuild just repackages the binary package provided by the project.
-It doesn't attempt to build the browser from source.
+This SlackBuild just repackages the binary package provided by the
+project.  It doesn't attempt to build the browser from source.
 
-You can force Pale Moon to use system-provided hunspell instead of its own
-dictionary by passing the USE_SYSTEM_SPELLCHECK=yes variable to the script.
+You can force Pale Moon to use system-provided hunspell instead of its
+own dictionary by passing the USE_SYSTEM_SPELLCHECK=yes variable to
+the script.
 
 If you need to change the GUI language, please visit
 https://www.palemoon.org/langpacks.shtml and follow the installation
 instructions.
+
+NOTE: 32 bit packages have been discontinued; and 64 bit binaries are
+now released in gtk2 and gtk3 variations. If you desire to use a gtk3
+variation, pass the variable GTK=gtk3 to the script.
diff --git a/network/palemoon-bin/palemoon-bin.SlackBuild b/network/palemoon-bin/palemoon-bin.SlackBuild
index bf9c8f7fe1..294ee0f2c8 100644
--- a/network/palemoon-bin/palemoon-bin.SlackBuild
+++ b/network/palemoon-bin/palemoon-bin.SlackBuild
@@ -1,10 +1,10 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for palemoon-bin
 
 # Copyright 2015 pomfland
 # Copyright 2017-2018 Skaendo <skaendo at excite dot com>
-# Copyright 2018 Vasily Sora USA
+# Copyright 2018,2022 Vasily Sora USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,11 +24,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=palemoon-bin
 SRCNAM=palemoon
-VERSION=${VERSION:-28.6.1}
+VERSION=${VERSION:-32.5.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
 case "$( uname -m )" in
@@ -38,11 +41,20 @@ case "$( uname -m )" in
 esac
 fi
 
-CWD=$(pwd)
+# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
+# the name of the created package would be, and then exit. This information
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
+GTK=${GTK:-gtk2}
+
 # We don't need cflags since nothing is being compiled here.
 # We do need to check the architecture though and abort when it's not
 # supported.
@@ -63,7 +75,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $SRCNAM
-tar xvf $CWD/$SRCNAM-$VERSION.linux-$ARCH.tar.bz2
+tar xvf $CWD/$SRCNAM-$VERSION.linux-$ARCH-$GTK.tar.xz
 cd $SRCNAM
 chown -R root:root .
 find -L . \
@@ -112,4 +124,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/network/palemoon-bin/palemoon-bin.info b/network/palemoon-bin/palemoon-bin.info
index a8eb588df1..0cc4e2cddd 100644
--- a/network/palemoon-bin/palemoon-bin.info
+++ b/network/palemoon-bin/palemoon-bin.info
@@ -1,10 +1,10 @@
 PRGNAM="palemoon-bin"
-VERSION="28.6.1"
+VERSION="32.5.0"
 HOMEPAGE="https://www.palemoon.org/"
-DOWNLOAD="http://linux.palemoon.org/datastore/release/palemoon-28.6.1.linux-i686.tar.bz2"
-MD5SUM="b2dcf40819be1e46be7be56d4e8399ef"
-DOWNLOAD_x86_64="http://linux.palemoon.org/datastore/release/palemoon-28.6.1.linux-x86_64.tar.bz2"
-MD5SUM_x86_64="1d677991b0b03d35403c35e7f5ca314f"
+DOWNLOAD="UNSUPPORTED"
+MD5SUM=""
+DOWNLOAD_x86_64="http://repo.schotynet.org/sources/palemoon-bin/palemoon-32.5.0.linux-x86_64-gtk2.tar.xz"
+MD5SUM_x86_64="433ae2d09c6e8ed2ef1a958eec484d02"
 REQUIRES=""
 MAINTAINER="khronosschoty"
 EMAIL="khronosschoty@posteo.org"
diff --git a/network/palemoon/README b/network/palemoon/README
index 72c8031fec..bc814b6490 100644
--- a/network/palemoon/README
+++ b/network/palemoon/README
@@ -11,40 +11,37 @@ This SlackBuild attempts to compile, build and package Pale Moon,
 Slackware style, in a manner that conforms to official Pale Moon Linux
 releases; while, at the same time, providing useful and easy ways to
 deviate if desired. This SlackBuild may conflict with the alternative
-SlackBuild known, here at SBo, as "palemoon-bin"; which repackages binaries
-offically released by the Pale Moon devs.
+SlackBuild known, here at SBo, as "palemoon-bin"; which repackages
+binaries offically released by the Pale Moon devs.
 
-----------------------------------------------------------------------------
+------------------------------------------------------------------------
 
-See http://docs.slackware.com/howtos:software:palemoon for additional tips and
-help resources.
+See http://docs.slackware.com/howtos:software:palemoon for additional
+tips and help resources.
 
 Using the Oxygen theme is known to cause Pale Moon to crash; if you are
-experiencing crashes, and segfaults, make sure you are not using this theme;
-or use Alienbob's patched oxygen-gtk2; which will fix this issue.
-http://www.slackware.com/~alien/slackbuilds/oxygen-gtk2/build/
-See the help doc link above for other creative tips and workarounds.
+experiencing crashes, and segfaults, make sure you are not using this
+theme; or use Alienbob's patched oxygen-gtk2; which will fix this issue.
+http://www.slackware.com/~alien/slackbuilds/oxygen-gtk2/build/ See the
+help doc link above for other creative tips and workarounds.
 
-A native fork of FireFox's developer tools exists as an external add-on or
-internally. Pale Moon by default ships with the developer tools internally;
-if this is undesirable, dev tools can be disabled by passing the script the
-parameter:
+A native fork of FireFox's developer tools exists as an external add-on
+or internally. Pale Moon by default ships with the developer tools
+internally; if this is undesirable, dev tools can be disabled by passing
+the script the parameter:
 
-    DEVTOOLS=no ./palemoon.SlackBuild
+  DEVTOOLS=no ./palemoon.SlackBuild
 
-Pale Moon's default is to build, ship, and use its own internal dictionary;
-if desired, however, do USE_SYSTEM_HUNSPELL=yes ./palemoon.SlackBuild, to
-use the Slackware system Hunspell instead. This assumes you have dictionaries
-such as hunspell-en or hunspell-es installed in /usr/share/hunspell -- the
-location that a few SlackBuilds at SBo install them.
+Pale Moon's default is to build, ship, and use its own internal
+dictionary; if desired, however, do USE_SYSTEM_HUNSPELL=yes
+./palemoon.SlackBuild, to use the Slackware system Hunspell instead.
+This assumes you have dictionaries such as hunspell-en or hunspell-es
+installed in /usr/share/hunspell -- the location that a few SlackBuilds
+at SBo install them.
 
-To remove the "AdNauseam" extension from the Pale Moon blocklist, do
-
-    ADNAUSEAM=unblock ./palemoon.SlackBuild
-
-If your processor doesn't support sse2 instructions or you get segfaults,
-try looking in the SlackBuild for the OPTIMIZE build option (eventually
-refer to the Pale Moon developers for help).
+If your processor doesn't support sse2 instructions or you get
+segfaults, try looking in the SlackBuild for the OPTIMIZE build option
+(eventually refer to the Pale Moon developers for help).
 
 jack-audio-connection-kit is an optional dependency and, if detected,
 automatically built. If this is undesirable you can blacklist jack, by
@@ -52,6 +49,10 @@ passing the variable:
 
   BLACKLIST_JACK=yes ./palemoon.SlackBuild
 
+ALSA=1 will disable pulse audio and build a pure alsa Pale Moon.
+GLIB-C-1PATCH=1 is a patch that will enable compiling on newer glibc 
+(such as is found in Slackware current).
+
 To enable debug information, pass the script the parameter
 
-    ENABLE_DEBUG=yes
+  ENABLE_DEBUG=yes
diff --git a/network/palemoon/adNauseam-unblock.patch b/network/palemoon/adNauseam-unblock.patch
deleted file mode 100644
index b1ff1b8bb4..0000000000
--- a/network/palemoon/adNauseam-unblock.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-*** a/application/palemoon/app/blocklist.xml	2018-05-19 19:02:40.285091999 -0700
---- b/application/palemoon/app/blocklist.xml	2018-05-19 19:32:36.468323646 -0700
-***************
-*** 2504,2514 ****
-        </versionRange>
-        <prefs></prefs>
-      </emItem>   
--     <emItem blockID="pm110" id="adnauseam@rednoise.org">
--       <versionRange minVersion="0" maxVersion="*" severity="2">
--       </versionRange>
--       <prefs></prefs>
--     </emItem>   
-      <emItem blockID="pm111" id="customtoolbarsplus@srazzano.com">
-        <versionRange minVersion="0" maxVersion="52.4.2" severity="3">
-        </versionRange>
---- 2504,2509 ----
diff --git a/network/palemoon/glib-c-arc4random.c.patch b/network/palemoon/glib-c-arc4random.c.patch
new file mode 100644
index 0000000000..467434614b
--- /dev/null
+++ b/network/palemoon/glib-c-arc4random.c.patch
@@ -0,0 +1,20 @@
+--- a/palemoon-31.3.0.1_Release/platform/ipc/chromium/src/third_party/libevent/arc4random.c	2022-09-27 20:12:40.000000000 -0000
++++ b/palemoon-31.3.0.1_Release/platform/ipc/chromium/src/third_party/libevent/arc4random.c	2022-10-03 10:09:16.859171354 -0000
+@@ -481,7 +481,8 @@
+ }
+ #endif
+ 
+-#ifndef HAVE_ARC4RANDOM_BUF
++#if defined(_we_have_arc4random_buf) || !defined(XP_SOLARIS)
++#if (__GLIBC__ <= 2 && __GLIBC_MINOR__ < 36) || !defined(XP_LINUX)
+ ARC4RANDOM_EXPORT void
+ arc4random_buf(void *_buf, size_t n)
+ {
+@@ -496,6 +497,7 @@
+ 	_ARC4_UNLOCK();
+ }
+ #endif
++#endif
+ 
+ #ifndef ARC4RANDOM_NOUNIFORM
+ /*
diff --git a/network/palemoon/palemoon.SlackBuild b/network/palemoon/palemoon.SlackBuild
index 289406ad1d..eddee9ec7a 100644
--- a/network/palemoon/palemoon.SlackBuild
+++ b/network/palemoon/palemoon.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for Pale Moon
 
-# Copyright 2018,2019 Vasily Sora USA
+# Copyright 2018,2019,2022,2023 Vasily Sora USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -25,11 +25,15 @@
 # Modified by SlackBuilds.org
 # Special thanks to Ponce
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=palemoon
-VERSION=${VERSION:-28.6.1}
-SRCNAM=${SRCNAM:-UXP-PM${VERSION}_Release}
+VERSION=${VERSION:-32.5.0}
+SRCNAM1=${SRCNAM1:-$PRGNAM-${VERSION}_Release}
+SRCNAM2=${SRCNAM2:-uxp-RB_20231030}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -39,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}
@@ -47,6 +55,8 @@ OUTPUT=${OUTPUT:-/tmp}
 OBJ=${OBJ:-obj-$PRGNAM}
 GTK=${GTK:-gtk2}
 
+DOCS="AUTHORS LICENSE README.md SECURITY.md"
+ALSA=${ALSA:-0}
 # You can try changing the optimization level to simply "-O2" if your processor
 # doesn't support sse2 instructions.
 # "-Os" might help if you experience segfaults.
@@ -58,18 +68,13 @@ elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
+  SLKCFLAGS="-O2 -fPIC -Wno-format-overflow"
   LIBDIRSUFFIX="64"
 else
   SLKCFLAGS="-O2"
   LIBDIRSUFFIX=""
 fi
 
-# look into adding this as an option:
-# elif [ "$ARCH" = "x86_64" ]; then
-#	  SLKCFLAGS="-O2 -D_FORTIFY_SOURCE=2 -fstack-protector --param ssp-buffer-size=4 -fPIE -pie -Wl,-z,relro,-z,now -mindirect-branch=th
-
-
 # The default is to build with official branding. This SlackBuild is used to
 # produce officially approved third party "contributed builds" of Pale Moon.
 # This SlackBuild can also be used to produce unapproved packages -- which
@@ -78,12 +83,11 @@ fi
 # master trunck of the Pale Moon github repository.
 BRANDING=${BRANDING:---enable-official-branding}
 if [ "$BRANDING" = "NewMoon" ]; then
-	BRANDING="--disable-official-branding --with-branding=application/palemoon/branding/unofficial"
+	BRANDING="--disable-official-branding --with-branding=palemoon/branding/unofficial"
 elif [ "$BRANDING" = "unstable" ]; then
-	BRANDING="--disable-official-branding --with-branding=application/palemoon/branding/unstable"
+	BRANDING="--disable-official-branding --with-branding=palemoon/branding/unstable"
 fi
 
-
 rm -rf $PKG $TMP/gold $TMP/$OBJ
 mkdir -p $TMP $PKG $OUTPUT $TMP/gold $TMP/$OBJ
 
@@ -142,12 +146,15 @@ PATH=$TMP/autoconf-tmp/usr/bin:$PATH
 
 # Build Pale Moon
 cd $TMP
-rm -rf $SRCNAM
-tar -xvf $CWD/$SRCNAM.tar.gz
-cd $SRCNAM
-
-if [ "${ADNAUSEAM:-block}" = "unblock" ]; then
-	patch -p1 < $CWD/adNauseam-unblock.patch
+rm -rf $SRCNAM1
+tar -xvzf $CWD/$SRCNAM1.tar.gz # --transform s/pale-moon/${SRCNAM1}/
+cd $SRCNAM1
+tar -xvzf $CWD/$SRCNAM2.tar.gz --transform s/${SRCNAM2}/platform/
+
+#patch -p1 < $CWD/basilisk-include-limits.patch
+GLIB_C_1PATCH=${GLIB_C_1PATCH:-0}
+if [ $GLIB_C_1PATCH = 1 ]; then
+  patch -p2 < $CWD/glib-c-arc4random.c.patch
 fi
 
 chown -R root:root .
@@ -161,7 +168,7 @@ find -L . \
 # "UnicodeDecodeError: 'ascii' codec can't decode byte 0xe2 in position 36: ordinal not in range(128)"
 export LANG=C
 
-export MOZCONFIG="$TMP/$SRCNAM/.mozconfig"
+export MOZCONFIG="$TMP/$SRCNAM1/.mozconfig"
 export MOZILLA_OFFICIAL=1
 export MOZ_MAKE_FLAGS=$MAKEFLAGS
 export CFLAGS="$SLKCFLAGS"
@@ -172,6 +179,8 @@ export MOZ_REQUIRE_SIGNING=
 export MOZ_TELEMETRY_REPORTING=
 export PYTHON=/usr/bin/python2
 
+# A stale DBUS_SESSION_BUS_ADDRESS var can cause build failures
+unset DBUS_SESSION_BUS_ADDRESS
 
 # Dev tools are enabled by default in the official binaries, so we should do the same here;
 # passing DEVTOOLS=no to the script, however, will disable them.
@@ -208,12 +217,16 @@ for option in $OPTIONS; do echo "ac_add_options $option" >> .mozconfig; done
 echo "ac_add_options --enable-optimize=\"$OPTIMIZE\"" >> .mozconfig
 
 if ! pkg-config --exists libpulse; then
-echo "ac_add_options --disable-pulseaudio" >> .mozconfig; fi
+  echo "ac_add_options --disable-pulseaudio" >> .mozconfig
+  TAG=${TAG}_alsa
+elif [ $ALSA = 1 ]; then
+  echo "ac_add_options --disable-pulseaudio" >> .mozconfig
+TAG=${TAG}_alsa; fi
 
 if pkg-config --exists jack && [ "${BLACKLIST_JACK:-no}" != "yes" ]; then
 echo "ac_add_options --enable-jack" >> .mozconfig; fi
 
-python2 mach build
+./mach build
 
 ## Clean up; and package Pale Moon.
 mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/mozilla/plugins
@@ -250,14 +263,15 @@ ln -s /usr/lib${LIBDIRSUFFIX}/$PRGNAM-$VERSION/browser/icons/mozicon128.png \
 mkdir -p $PKG/usr/share/applications
 cat $CWD/palemoon.desktop > $PKG/usr/share/applications/$PRGNAM.desktop
 
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
-  $TMP/$SRCNAM/LEGAL $TMP/$SRCNAM/LICENSE $TMP/$SRCNAM/README.md \
-  $PKG/usr/doc/$PRGNAM-$VERSION/
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/UXP
+for docs in $DOCS; do
+  cp $TMP/${SRCNAM1}/$docs $PKG/usr/doc/$PRGNAM-$VERSION/ || true
+  cp $TMP/${SRCNAM1}/platform/$docs $PKG/usr/doc/$PRGNAM-$VERSION/UXP/ || true
+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
 
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/network/palemoon/palemoon.info b/network/palemoon/palemoon.info
index b7e4150d25..7b472121b0 100644
--- a/network/palemoon/palemoon.info
+++ b/network/palemoon/palemoon.info
@@ -1,12 +1,14 @@
 PRGNAM="palemoon"
-VERSION="28.6.1"
+VERSION="32.5.0"
 HOMEPAGE="http://www.palemoon.org/"
-DOWNLOAD="https://github.com/MoonchildProductions/UXP/archive/PM28.6.1_Release/UXP-PM28.6.1_Release.tar.gz \
+DOWNLOAD="http://git.schotynet.org/palemoon/snapshot/palemoon-32.5.0_Release.tar.gz \
+          http://git.schotynet.org/uxp/snapshot/uxp-RB_20231030.tar.gz \
           http://ponce.cc/slackware/sources/repo/autoconf-2.13.tar.xz"
-MD5SUM="f28badb305a97e67a61bcc792bbb1b0a \
+MD5SUM="cddcee238979eaa9b9d945acff2b2ed5 \
+        0c8a09957c2617e128de391278397cd6 \
         f2994d302cf736e7e71974edfa51da3c"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="ffmpeg"
+REQUIRES=""
 MAINTAINER="khronosschoty"
 EMAIL="khronosschoty@posteo.org"
diff --git a/network/pastebincl/pastebincl.SlackBuild b/network/pastebincl/pastebincl.SlackBuild
index 4607370297..0e7e908cab 100644
--- a/network/pastebincl/pastebincl.SlackBuild
+++ b/network/pastebincl/pastebincl.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for pastebincl
 
@@ -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=pastebincl
 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}
@@ -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/network/pdns-recursor/pdns-recursor.SlackBuild b/network/pdns-recursor/pdns-recursor.SlackBuild
index 451d863920..c6aa52d187 100644
--- a/network/pdns-recursor/pdns-recursor.SlackBuild
+++ b/network/pdns-recursor/pdns-recursor.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 # Slackware build script for pdns-recursor
 
 # Copyright 2019 Dejan Strbac, Zurich, CH
@@ -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.
 
+# 20220320 bkw: Modified by SlackBuilds.org: fix 32-bit build.
+# It will break again in 2038.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=pdns-recursor
-VERSION=${VERSION:-4.1.13}
+VERSION=${VERSION:-4.6.0}
 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}
@@ -64,9 +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 {} \+
+
+# 20220320 bkw: configure script fails on 32-bit because
+# sizeof(time_t) is 4, (y2k38 bug). patch it to ignore this, since
+# it's only 2022 now and we can keep using this on 32-bit for another
+# 15-16 years.
+sed -i '/y2k38/s,as_fn_error,$as_echo,' configure
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
@@ -78,7 +94,8 @@ CXXFLAGS="$SLKCFLAGS" \
   --mandir=/usr/man \
   --docdir=/usr/doc/$PRGNAM-$VERSION \
   --enable-static=no \
-  --build=$ARCH-slackware-linux
+  --build=$ARCH-slackware-linux \
+  --enable-dns-over-tls
 
 make
 make install DESTDIR=$PKG
@@ -104,4 +121,4 @@ cat $CWD/rc.pdns-recursor > $PKG/etc/rc.d/rc.pdns-recursor.new
 mv $PKG/etc/recursor.conf-dist $PKG/etc/recursor.conf.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/network/pdns-recursor/pdns-recursor.info b/network/pdns-recursor/pdns-recursor.info
index e61c4f3baf..4cbb7e660e 100644
--- a/network/pdns-recursor/pdns-recursor.info
+++ b/network/pdns-recursor/pdns-recursor.info
@@ -1,8 +1,8 @@
 PRGNAM="pdns-recursor"
-VERSION="4.1.13"
+VERSION="4.6.0"
 HOMEPAGE="https://www.powerdns.com/recursor.html"
-DOWNLOAD="https://downloads.powerdns.com/releases/pdns-recursor-4.1.13.tar.bz2"
-MD5SUM="e0c711cb443cdca4b2c241966d2fb6ff"
+DOWNLOAD="https://downloads.powerdns.com/releases/pdns-recursor-4.6.0.tar.bz2"
+MD5SUM="ada31148b47231ac61ec504d2b8a5ece"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="lua"
diff --git a/network/pdns/README b/network/pdns/README
index e3e92326a9..777b9a7781 100644
--- a/network/pdns/README
+++ b/network/pdns/README
@@ -3,9 +3,9 @@ PowerDNS Authoritative Server is a versatile nameserver which
 supports a large number of backends.
 
 Docs are available at:
-	https://doc.powerdns.com/authoritative/index.html
+  https://doc.powerdns.com/authoritative/index.html
 
 By default, this PowerDNS SlackBuild includes support for BIND and
 SQLite3 backends only. To use other backends, set the modules
 variable before calling the build:
-	# MODULES="bind gpgsql" ./pdns.SlackBuild
+  # MODULES="bind gpgsql" ./pdns.SlackBuild
diff --git a/network/pdns/pdns.SlackBuild b/network/pdns/pdns.SlackBuild
index 64fab02d78..813d12fe77 100644
--- a/network/pdns/pdns.SlackBuild
+++ b/network/pdns/pdns.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh -e
+#!/bin/bash -e
 # Slackware build script for pdns
 
 # Copyright 2018  Dejan Strbac, Zurich, CH
@@ -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.
 
+# 20220320 bkw: Modified by SlackBuilds.org: fix 32-bit build.
+# It will break again in 2038.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=pdns
-VERSION=${VERSION:-4.1.8}
+VERSION=${VERSION:-4.6.0}
 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}
@@ -64,10 +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 {} \+
 
+# 20220320 bkw: configure script fails on 32-bit because
+# sizeof(time_t) is 4, (y2k38 bug). patch it to ignore this, since
+# it's only 2022 now and we can keep using this on 32-bit for another
+# 15-16 years.
+sed -i '/y2k38/s,as_fn_error,$as_echo,' configure
 
 # Build without database support by default
 DEFAULT_MODULES="bind gsqlite3"
@@ -98,10 +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 NEWS NOTICE COPYING README $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a NOTICE 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
@@ -111,4 +125,4 @@ cat $CWD/rc.pdns > $PKG/etc/rc.d/rc.pdns.new
 mv $PKG/etc/pdns.conf-dist $PKG/etc/pdns.conf.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/network/pdns/pdns.info b/network/pdns/pdns.info
index 72a025f55c..2084a8104f 100644
--- a/network/pdns/pdns.info
+++ b/network/pdns/pdns.info
@@ -1,10 +1,10 @@
 PRGNAM="pdns"
-VERSION="4.1.8"
+VERSION="4.6.0"
 HOMEPAGE="https://www.powerdns.com/auth.html"
-DOWNLOAD="https://downloads.powerdns.com/releases/pdns-4.1.8.tar.bz2"
-MD5SUM="27ae77c691e79a7eeef1ee54875fe3f7"
+DOWNLOAD="https://downloads.powerdns.com/releases/pdns-4.6.0.tar.bz2"
+MD5SUM="b8af22df3bc0e0d07e3b54e2a136265e"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES=""
+REQUIRES="lua"
 MAINTAINER="Dejan Strbac"
 EMAIL="me@dejanstrbac.com"
diff --git a/network/pdnsd/README b/network/pdnsd/README
deleted file mode 100644
index f11b7d39ea..0000000000
--- a/network/pdnsd/README
+++ /dev/null
@@ -1,13 +0,0 @@
-pdnsd is a proxy DNS server with permanent caching (the cache contents are
-written to hard disk on exit) that is designed to cope with unreachable or 
-down DNS servers (e.g., in dial-in networking).
-
-Add this to /etc/rc.d/rc.local:
-if [ -x /etc/rc.d/rc.pdnsd ]; then
-   /etc/rc.d/rc.pdnsd start
-fi
-
-Add this to /etc/rc.d/rc.local_shutdown
-if [ -x /etc/rc.d/rc.pdnsd ]; then
-   /etc/rc.d/rc.pdnsd stop
-fi
diff --git a/network/pdnsd/doinst.sh b/network/pdnsd/doinst.sh
deleted file mode 100644
index b09bee1dad..0000000000
--- a/network/pdnsd/doinst.sh
+++ /dev/null
@@ -1,23 +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.pdnsd.new:
-if [ -e etc/rc.d/rc.pdnsd ]; then
-  cp -a etc/rc.d/rc.pdnsd etc/rc.d/rc.pdnsd.new.incoming
-  cat etc/rc.d/rc.pdnsd.new > etc/rc.d/rc.pdnsd.new.incoming
-  mv etc/rc.d/rc.pdnsd.new.incoming etc/rc.d/rc.pdnsd.new
-fi
-
-config etc/rc.d/rc.pdnsd.new
-config etc/pdnsd.conf.new
-
diff --git a/network/pdnsd/pdnsd.SlackBuild b/network/pdnsd/pdnsd.SlackBuild
deleted file mode 100644
index 3e87862a85..0000000000
--- a/network/pdnsd/pdnsd.SlackBuild
+++ /dev/null
@@ -1,96 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for pdnsd
-
-# Written by André Geraldo Vieira <andre.geraldo@gmail.com>
-
-PRGNAM=pdnsd
-VERSION=${VERSION:-1.2.7}
-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"
-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-par.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 \
-  --enable-ipv6 \
-  --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
-
-( 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
-)
-
-# Install an init script
-mkdir -p $PKG/etc/rc.d/
-cat $CWD/rc.pdnsd > $PKG/etc/rc.d/rc.pdnsd.new
-chmod 0755 $PKG/etc/rc.d/rc.pdnsd.new
-
-# Rename pdnsd.conf.sample to pdnsd.conf.new
-mv $PKG/etc/pdnsd.conf.sample $PKG/etc/pdnsd.conf.new
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
-  AUTHORS ChangeLog* COPYING* INSTALL NEWS PKGBUILD README* THANKS TODO \
-  version doc/html 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}
diff --git a/network/pdnsd/pdnsd.info b/network/pdnsd/pdnsd.info
deleted file mode 100644
index a4f6844138..0000000000
--- a/network/pdnsd/pdnsd.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="pdnsd"
-VERSION="1.2.7"
-HOMEPAGE="http://members.home.nl/p.a.rombouts/pdnsd/"
-DOWNLOAD="http://members.home.nl/p.a.rombouts/pdnsd/releases/pdnsd-1.2.7-par.tar.gz"
-MD5SUM="114b3b21b09b43cbfcccdde726b84c12"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="André Geraldo Vieira"
-EMAIL="andre.geraldo@gmail.com"
diff --git a/network/pdnsd/rc.pdnsd b/network/pdnsd/rc.pdnsd
deleted file mode 100644
index 64115e1cb5..0000000000
--- a/network/pdnsd/rc.pdnsd
+++ /dev/null
@@ -1,78 +0,0 @@
-#!/bin/bash
-#
-# /etc/rc.d/rc.pdnsd
-#
-# Starts the Proxy DNS Daemon
-#
-# description: Proxy DNS Daemon
-# processname: pdnsd
-# config: /etc/pdnsd.conf
-# distribution: Slackware
-# author: André Geraldo Vieira <andre.geraldo@gmail.com>
-#
-# Additional info:
-# 1) put these lines in the /etc/rc.d/rc.local:
-# if [ -x /etc/rc.d/rc.pdnsd ]; then
-#    /etc/rc.d/rc.pdnsd start
-# fi
-#
-# 2) put these lines in the /etc/rc.d/rc.local_shutdown:
-# if [ -x /etc/rc.d/rc.pdnsd ]; then
-#    /etc/rc.d/rc.pdnsd stop
-# fi
-
-start() {
-    if ! [ -r /var/run/pdnsd.pid ]; then
-       echo -n 'Starting pdnsd...' 
-       /usr/sbin/pdnsd -d -p /var/run/pdnsd.pid
-       echo 'OK'
-    else
-       echo 'The PDNSD is already running!'
-   fi
-}
-
-stop() {
-   if [ -r /var/run/pdnsd.pid ]; then
-      echo -n "Shutting down pdnsd... "
-      kill -15 `cat /var/run/pdnsd.pid` && rm -f /var/run/pdnsd.pid 2> /dev/null
-      echo ' OK'
-   else
-      echo 'The PDNSD already stopped!'
-   fi
-}
-
-restart() {
-   stop
-   sleep 3
-   start
-}
-
-status() {
-   if [ -r /var/run/pdnsd.pid ]; then
-      pid=`cat /var/run/pdnsd.pid`
-      echo "PDNSD (pid $pid) is running."
-   else
-      echo 'PDNSD is stopped.'
-   fi
-}
-
-case "$1" in
-  start)
-   start
-   ;;
-  stop)
-   stop
-   ;;
-  reload|restart)
-   restart
-   ;;
-  status)
-   status
-   ;;
-  *)
-   echo "Usage: $0 {start|stop|restart|reload|status}"
-   exit 1
-   ;;
-esac
-exit 0
-#EOF
diff --git a/network/pdnsd/slack-desc b/network/pdnsd/slack-desc
deleted file mode 100644
index f9b33ef431..0000000000
--- a/network/pdnsd/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------------------------------------------------------|
-pdnsd: pdnsd (proxy dns server)
-pdnsd:
-pdnsd: pdnsd is a proxy DNS server with permanent caching (the cache contents
-pdnsd: are written to hard disk on exit) that is designed to cope with
-pdnsd: unreachable or down DNS servers (for example in dial-in networking).
-pdnsd: Since version 1.1.0, pdnsd supports negative caching.
-pdnsd:
-pdnsd: pdnsd is licensed under the GNU General Public License (GPL).
-pdnsd:
-pdnsd:
-pdnsd:
diff --git a/network/pebrot/pebrot.SlackBuild b/network/pebrot/pebrot.SlackBuild
index c113d3362e..1c58df432b 100644
--- a/network/pebrot/pebrot.SlackBuild
+++ b/network/pebrot/pebrot.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for pebrot
 
@@ -24,10 +24,13 @@
 
 # Modified by the SlackBuilds.org project
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=pebrot
 VERSION=${VERSION:-0.8.8}
 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}
@@ -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/network/pentadactyl/README b/network/pentadactyl/README
deleted file mode 100644
index 3f658ea1ce..0000000000
--- a/network/pentadactyl/README
+++ /dev/null
@@ -1,11 +0,0 @@
-Pentadactyl is a free browser add-on for Firefox, designed to make browsing
-more efficient and especially more keyboard accessible. Largely inspired by the
-Vim text editor, the appearance and finger feel should be familiar to Vim
-users.
-
-This package will install Pentadactyl for all users on the system. Users will
-be prompted to activate the extension when starting Firefox.
-
-To build the package for a Firefox version different from the installed one,
-start the script setting the FIREFOX variable as in
-        FIREFOX=33.0.0
diff --git a/network/pentadactyl/pentadactyl.SlackBuild b/network/pentadactyl/pentadactyl.SlackBuild
deleted file mode 100644
index d2ba85cb86..0000000000
--- a/network/pentadactyl/pentadactyl.SlackBuild
+++ /dev/null
@@ -1,86 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for pentadactyl
-
-# Copyright 2014 Benjamin Trigona-Harany <slackbuilds@jaxartes.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.
-
-SRCNAM=dactyl
-PRGNAM=pentadactyl
-SRCVER=1.2pre
-SRCREV=0986c4442f38c69043fac6c608a39ae54d838415
-VERSION=${VERSION:-20161203}
-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
-
-if [ "$ARCH" = "x86_64" ]; then
-  LIBDIRSUFFIX="64"
-else
-  LIBDIRSUFFIX=""
-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-$SRCREV
-unzip $CWD/$SRCNAM-$SRCREV.zip || unzip $CWD/$SRCREV.zip
-cd $SRCNAM-$SRCREV
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -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/maxVersion=\"41/maxVersion=\"43/g" pentadactyl/install.rdf
-make -C $PRGNAM xpi
-
-# Get the currently installed Firefox version (handle the case where multiple versions
-# are installed by taking the first).
-FIREFOX=`firefox --version | sed "s/[^0-9.]*//"`
-EXT_DIR=/usr/lib$LIBDIRSUFFIX/firefox-$FIREFOX/browser/extensions/pentadactyl\@dactyl.googlecode.com
-
-mkdir -p "$PKG/$EXT_DIR"
-unzip -d "$PKG/$EXT_DIR" downloads/$PRGNAM-$SRCVER.xpi
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a HACKING 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}_$FIREFOX-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/network/pentadactyl/pentadactyl.info b/network/pentadactyl/pentadactyl.info
deleted file mode 100644
index e94ccf6cff..0000000000
--- a/network/pentadactyl/pentadactyl.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="pentadactyl"
-VERSION="20161203"
-HOMEPAGE="https://web.archive.org/web/20171215070637/http://5digits.org/pentadactyl"
-DOWNLOAD="https://github.com/5digits/dactyl/archive/0986c4442f38c69043fac6c608a39ae54d838415.zip"
-MD5SUM="89003251c489eef8b717319a989cfd33"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Benjamin Trigona-Harany"
-EMAIL="slackbuilds@jaxartes.net"
diff --git a/network/pentadactyl/slack-desc b/network/pentadactyl/slack-desc
deleted file mode 100644
index e703b54a4d..0000000000
--- a/network/pentadactyl/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------------------------------------------------------|
-pentadactyl: pentadactyl (Vim keybindings for Firefox)
-pentadactyl:
-pentadactyl: Pentadactyl is a free browser add-on for Firefox, designed to make
-pentadactyl: browsing more efficient and especially more keyboard accessible.
-pentadactyl: Largely inspired by the Vim text editor, the appearance and finger
-pentadactyl: feel should be familiar to Vim users.
-pentadactyl:
-pentadactyl:
-pentadactyl:
-pentadactyl:
-pentadactyl:
diff --git a/network/periscope/README b/network/periscope/README
index 175f1bb863..b2237c528c 100644
--- a/network/periscope/README
+++ b/network/periscope/README
@@ -1,7 +1,7 @@
-Periscope is a subtitles searching module written in python that tries to
-find a correct match for a given video file.  The subtitles sites are
-handled as plugins and currently support OpenSubtitles, SubtitleSource,
-Podnapisi, Subscene and Subtitulos.
+Periscope is a subtitles searching module written in python that
+tries to find a correct match for a given video file. The subtitles
+sites are handled as plugins and currently support OpenSubtitles,
+SubtitleSource, Podnapisi, Subscene and Subtitulos.
 
 A python/nautilus integration script is copied to the doc directory.
 
diff --git a/network/periscope/periscope.SlackBuild b/network/periscope/periscope.SlackBuild
index a42bb5080b..92f0f3b75a 100644
--- a/network/periscope/periscope.SlackBuild
+++ b/network/periscope/periscope.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for periscope.
 
@@ -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=periscope
 VERSION=${VERSION:-0.2.4}
 SRCNAM=python-${PRGNAM}_${VERSION}.orig.tar.gz
 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}
@@ -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/network/persepolis/README b/network/persepolis/README
index c4e5d5c42f..c58911f78a 100644
--- a/network/persepolis/README
+++ b/network/persepolis/README
@@ -11,5 +11,3 @@ Features:
 * Scheduling downloads
 * Download queuing
 * Finding and downloading video from Youtube, Vimeo, DailyMotion, etc.
-
-Important: you will need to build all the dependencies with python3 support.
diff --git a/network/persepolis/persepolis.SlackBuild b/network/persepolis/persepolis.SlackBuild
index d499b1c620..5091a231f7 100644
--- a/network/persepolis/persepolis.SlackBuild
+++ b/network/persepolis/persepolis.SlackBuild
@@ -1,7 +1,7 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for persepolis
-# Copyright 2018 David Woodfall <dave@dawoodfall.net>
+# Copyright 2018 David Woodfall <dave@slackbuilds.org>
 # 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=persepolis
-VERSION=${VERSION:-3.1.0}
+VERSION=${VERSION:-3.2.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}
@@ -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/network/persepolis/persepolis.info b/network/persepolis/persepolis.info
index 073716b65b..957562e97d 100644
--- a/network/persepolis/persepolis.info
+++ b/network/persepolis/persepolis.info
@@ -1,10 +1,10 @@
 PRGNAM="persepolis"
-VERSION="3.1.0"
+VERSION="3.2.0"
 HOMEPAGE="https://persepolisdm.github.io"
-DOWNLOAD="https://github.com/persepolisdm/persepolis/archive/3.1.0/persepolis-3.1.0.tar.gz"
-MD5SUM="ade1aca47186df8a3521ac3d356c328d"
+DOWNLOAD="https://github.com/persepolisdm/persepolis/archive/3.2.0/persepolis-3.2.0.tar.gz"
+MD5SUM="9a3bf686da0385f78eadca457a9f43fe"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="python3-PyQt5 python-requests setproctitle psutil aria2 python-notify2 youtube-dl"
-MAINTAINER="David Woodfall"
-EMAIL="dave@dawoodfall.net"
+REQUIRES="setproctitle python3-psutil aria2 youtube-dl"
+MAINTAINER="D Woodfall"
+EMAIL="dave@slackbuilds.org"
diff --git a/network/pexip-infinity-connect/README b/network/pexip-infinity-connect/README
new file mode 100644
index 0000000000..c97ca78f6a
--- /dev/null
+++ b/network/pexip-infinity-connect/README
@@ -0,0 +1,7 @@
+pexip-infinity-connect (Video Communication Software)
+
+Pexip simplifies video communication across borders, businesses and
+platforms. It empowers your organization with face-to-face
+collaboration, no matter the location or technology.
+
+This SB script repackages archive to Slackware package
diff --git a/network/pexip-infinity-connect/doinst.sh b/network/pexip-infinity-connect/doinst.sh
new file mode 100644
index 0000000000..65c7e2eeb9
--- /dev/null
+++ b/network/pexip-infinity-connect/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/network/pexip-infinity-connect/pexip-infinity-connect.SlackBuild b/network/pexip-infinity-connect/pexip-infinity-connect.SlackBuild
new file mode 100644
index 0000000000..d19979ab6b
--- /dev/null
+++ b/network/pexip-infinity-connect/pexip-infinity-connect.SlackBuild
@@ -0,0 +1,89 @@
+#!/bin/bash
+
+# Slackware build script for pexip-infinity-connect
+
+# Copyright 2020-2021 Igor Alexandrov <igor.alexandrov@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=pexip-infinity-connect
+VERSION=${VERSION:-1.6.2}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+ARCNAM=${PRGNAM}_${VERSION}-53046.187.0_linux-x64.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
+  echo "$ARCH is not supported for $PRGNAM-$VERSION"
+  exit 1
+fi
+
+set -eu
+
+SRCNAM=$(tar -tf $ARCNAM | head -1)
+
+rm -rf $PKG
+mkdir -p $TMP $OUTPUT $PKG/{install,opt,usr/{bin,doc/$PRGNAM-$VERSION}}
+cd $PKG
+tar -xvf $CWD/$ARCNAM
+mv $SRCNAM opt/$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 {} \;
+
+find . -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 ../../opt/$PRGNAM/$PRGNAM usr/bin
+install -m 644 -D $CWD/$PRGNAM.desktop -t usr/share/applications
+install -m 644 -D $CWD/$PRGNAM.png -t usr/share/icons/hicolor/48x48/apps
+
+ln -s ../../../opt/$PRGNAM/LICENSE usr/doc/$PRGNAM-$VERSION
+ln -s ../../../opt/$PRGNAM/LICENSES.chromium.html usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
+/sbin/makepkg -p -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/network/pexip-infinity-connect/pexip-infinity-connect.desktop b/network/pexip-infinity-connect/pexip-infinity-connect.desktop
new file mode 100644
index 0000000000..4734956753
--- /dev/null
+++ b/network/pexip-infinity-connect/pexip-infinity-connect.desktop
@@ -0,0 +1,11 @@
+#!/usr/bin/env xdg-open
+[Desktop Entry]
+Name=Pexip Infinity Connect
+Exec=/usr/bin/pexip-infinity-connect %u
+Terminal=false
+Type=Application
+Icon=pexip-infinity-connect
+Categories=Network;
+StartupNotify=true
+StartupWMClass=pexip infinity connect
+MimeType=x-scheme-handler/pexip-provision;x-scheme-handler/pexip-auth;x-scheme-handler/pexip
diff --git a/network/pexip-infinity-connect/pexip-infinity-connect.info b/network/pexip-infinity-connect/pexip-infinity-connect.info
new file mode 100644
index 0000000000..3459906dcc
--- /dev/null
+++ b/network/pexip-infinity-connect/pexip-infinity-connect.info
@@ -0,0 +1,10 @@
+PRGNAM="pexip-infinity-connect"
+VERSION="1.6.2"
+HOMEPAGE="https://www.pexip.com"
+DOWNLOAD="UNSUPPORTED"
+MD5SUM=""
+DOWNLOAD_x86_64="https://dl.pexip.com/connect/nextgen/1.6.2/pexip-infinity-connect_1.6.2-53046.187.0_linux-x64.tgz"
+MD5SUM_x86_64="c297c6621048ad3725a9b685cdb78805"
+REQUIRES=""
+MAINTAINER="Igor Alexandrov"
+EMAIL="igor.alexandrov@outlook.com"
diff --git a/network/pexip-infinity-connect/pexip-infinity-connect.png b/network/pexip-infinity-connect/pexip-infinity-connect.png
new file mode 100644
index 0000000000..de24120fbe
--- /dev/null
+++ b/network/pexip-infinity-connect/pexip-infinity-connect.png
diff --git a/network/pexip-infinity-connect/slack-desc b/network/pexip-infinity-connect/slack-desc
new file mode 100644
index 0000000000..bd32577094
--- /dev/null
+++ b/network/pexip-infinity-connect/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+                      |-----handy-ruler------------------------------------------------------|
+pexip-infinity-connect: pexip-infinity-connect (Video Communication Software)
+pexip-infinity-connect:
+pexip-infinity-connect: Pexip simplifies video communication across borders, businesses and
+pexip-infinity-connect: platforms. It empowers your organization with face-to-face
+pexip-infinity-connect: collaboration, no matter the location or technology.
+pexip-infinity-connect:
+pexip-infinity-connect: For more details:
+pexip-infinity-connect: https://www.pexip.com/
+pexip-infinity-connect:
+pexip-infinity-connect:
+pexip-infinity-connect:
diff --git a/network/pflogsumm/README b/network/pflogsumm/README
index f24365b8ec..b066c78d1e 100644
--- a/network/pflogsumm/README
+++ b/network/pflogsumm/README
@@ -13,6 +13,6 @@ and pflogsumm.pl -help for a terse version.
 Please see included sample_cronjob.txt file and manpage for details
 on running pflogsumm via crontab and getting stats via email.
 
-BETA VERSION WARNING: version 1.1.5 is in beta testing right now.  If you
-are using postfix 2.9, you need this version as it contains fixes to
-logging changes incorporated in postfix 2.9.
+BETA VERSION WARNING: version 1.1.5 is in beta testing right now.
+If you are using postfix 2.9, you need this version as it contains
+fixes to logging changes incorporated in postfix 2.9.
diff --git a/network/pflogsumm/pflogsumm.SlackBuild b/network/pflogsumm/pflogsumm.SlackBuild
index 811304d098..90197b0864 100644
--- a/network/pflogsumm/pflogsumm.SlackBuild
+++ b/network/pflogsumm/pflogsumm.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware Package Build Script for pflogsumm
 # Home Page http://jimsun.linxnet.com/postfix_contrib.html
@@ -25,13 +25,23 @@
 # NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM="pflogsumm"
 VERSION=${VERSION:-1.1.5}
 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 @@ gzip -9 $PKG/usr/man/man1/pflogsumm.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:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/network/pfqueue/README b/network/pfqueue/README
index ccae30bfcb..5f680e46d9 100644
--- a/network/pfqueue/README
+++ b/network/pfqueue/README
@@ -7,6 +7,6 @@ It's a real-time queue scanner, that shows per-queue lists of existing
 messages; the messages can be shown, deleted, put on hold, released or
 requeued.
 
-Just for example, it may be useful to inspect a traffic jam at a given
-time, to see what is falling into and unexpectedly crowding your deferred
-queue.
+Just for example, it may be useful to inspect a traffic jam at a
+given time, to see what is falling into and unexpectedly crowding your
+deferred queue.
diff --git a/network/pfqueue/pfqueue.SlackBuild b/network/pfqueue/pfqueue.SlackBuild
index 3dd825399d..e0c4de2aed 100644
--- a/network/pfqueue/pfqueue.SlackBuild
+++ b/network/pfqueue/pfqueue.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for pfqueue
 
@@ -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=pfqueue
 VERSION=${VERSION:-0.5.6}
-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}
@@ -94,8 +104,10 @@ cp -a AUTHORS COPYING 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/network/pgbouncer/pgbouncer.SlackBuild b/network/pgbouncer/pgbouncer.SlackBuild
index 77369a62f3..76d2c1fa09 100644
--- a/network/pgbouncer/pgbouncer.SlackBuild
+++ b/network/pgbouncer/pgbouncer.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for pgbouncer
 
@@ -22,27 +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=pgbouncer
 VERSION=${VERSION:-1.5.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"
@@ -66,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 {} \+
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
@@ -130,4 +136,4 @@ do
 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/network/pgbouncer/pgbouncer.info b/network/pgbouncer/pgbouncer.info
index f5669a4bca..62dd5529e9 100644
--- a/network/pgbouncer/pgbouncer.info
+++ b/network/pgbouncer/pgbouncer.info
@@ -1,7 +1,7 @@
 PRGNAM="pgbouncer"
 VERSION="1.5.5"
 HOMEPAGE="https://pgbouncer.github.io"
-DOWNLOAD="https://pgbouncer.github.io/downloads/pgbouncer-1.5.5.tar.gz"
+DOWNLOAD="http://pkgs.fedoraproject.org/repo/pkgs/pgbouncer/pgbouncer-1.5.5.tar.gz/e332e41956f9a2d48c4b38fa96d6e0f0/pgbouncer-1.5.5.tar.gz"
 MD5SUM="e332e41956f9a2d48c4b38fa96d6e0f0"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/network/pgl/README b/network/pgl/README
deleted file mode 100644
index 10bf73bd97..0000000000
--- a/network/pgl/README
+++ /dev/null
@@ -1,4 +0,0 @@
-PeerGuardian is a privacy oriented firewall application. 
-It blocks connections to and from hosts specified in huge 
-blocklists (thousands or millions of IP ranges). Its origin 
-seeds in targeting aggressive IPs while you use P2P.
diff --git a/network/pgl/doinst.sh b/network/pgl/doinst.sh
deleted file mode 100644
index a526f2af13..0000000000
--- a/network/pgl/doinst.sh
+++ /dev/null
@@ -1,30 +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.pgl.new
-config etc/pgl/pglcmd.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/network/pgl/pgl.SlackBuild b/network/pgl/pgl.SlackBuild
deleted file mode 100644
index 60b6525a7a..0000000000
--- a/network/pgl/pgl.SlackBuild
+++ /dev/null
@@ -1,90 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for PeerGuardian
-
-#
-# Script created by Michael Connolly <connollymp3000@gmail.com>
-#
-
-PRGNAM=pgl
-VERSION=${VERSION:-2.2.2}
-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 # exit on most errors
-
-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 \
-  --with-initddir=/etc/rc.d \
-  --build=$ARCH-slackware-linux
-
-make
-make install DESTDIR=$PKG
-
-rmdir $PKG/tmp
-
-find $PKG -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/rc.d/pgl $PKG/etc/rc.d/rc.pgl.new
-mv $PKG/etc/pgl/pglcmd.conf $PKG/etc/pgl/pglcmd.conf.new
-
-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/network/pgl/pgl.info b/network/pgl/pgl.info
deleted file mode 100644
index cc3a34ffe6..0000000000
--- a/network/pgl/pgl.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="pgl"
-VERSION="2.2.2"
-HOMEPAGE="https://sourceforge.net/projects/peerguardian/"
-DOWNLOAD="https://downloads.sourceforge.net/peerguardian/pgl-2.2.2.tar.gz"
-MD5SUM="c623c92802281f69e51d140c8b1bb171"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Michael Connolly"
-EMAIL="connollymp3000@gmail.com"
diff --git a/network/pgl/slack-desc b/network/pgl/slack-desc
deleted file mode 100644
index 0fe7fd81dc..0000000000
--- a/network/pgl/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------------------------------------------------------|
-pgl: pgl (Privacy-oriented Firewall Application)
-pgl:
-pgl: PeerGuardian actively blocks connections to and from hosts specified
-pgl: in huge, frequently updated blocklists, spanning millions of IP
-pgl: ranges.  Its origin lays in targeting aggressive IPs while using
-pgl: P2P services.
-pgl:
-pgl: homepage: https://sourceforge.net/projects/peerguardian/
-pgl:
-pgl:
-pgl:
diff --git a/network/pgpool-II/README b/network/pgpool-II/README
index 53f8fba675..024cc74dae 100644
--- a/network/pgpool-II/README
+++ b/network/pgpool-II/README
@@ -8,5 +8,5 @@ PostgreSQL database client. It has support for:
 
 Docs are available at: http://www.pgpool.net/docs/latest/en/html/
 
-Note that this SlackBuild comes without a default configuration. Sample config
-files will be dropped in /etc/pgpool.conf.sample-*
+Note that this SlackBuild comes without a default configuration.
+Sample config files will be installed to "/etc/pgpool.conf.sample-*".
diff --git a/network/pgpool-II/pgpool-II.SlackBuild b/network/pgpool-II/pgpool-II.SlackBuild
index 18762c7c43..c7ce12e620 100644
--- a/network/pgpool-II/pgpool-II.SlackBuild
+++ b/network/pgpool-II/pgpool-II.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for pgpool-II
 
@@ -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=pgpool-II
-VERSION=${VERSION:-3.7.3}
-BUILD=${BUILD:-1}
+VERSION=${VERSION:-3.7.21}
+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}
@@ -93,9 +103,11 @@ mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a AUTHORS COPYING ChangeLog INSTALL NEWS README TODO doc/ src/sql/ $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/network/pgpool-II/pgpool-II.info b/network/pgpool-II/pgpool-II.info
index dac27fce06..8287b03899 100644
--- a/network/pgpool-II/pgpool-II.info
+++ b/network/pgpool-II/pgpool-II.info
@@ -1,8 +1,8 @@
 PRGNAM="pgpool-II"
-VERSION="3.7.3"
-HOMEPAGE="http://www.pgpool.net"
-DOWNLOAD="http://www.pgpool.net/download.php?f=pgpool-II-3.7.3.tar.gz"
-MD5SUM="622aca1698b29f735042da52a374afed"
+VERSION="3.7.21"
+HOMEPAGE="https://www.pgpool.net/mediawiki/index.php/Main_Page"
+DOWNLOAD="https://www.pgpool.net/mediawiki/download.php?f=pgpool-II-3.7.21.tar.gz"
+MD5SUM="2326727471f6fd390a7a1d7ec92e4c04"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="postgresql"
diff --git a/network/pgpool-II/slack-desc b/network/pgpool-II/slack-desc
index de51400650..195ba5d4e4 100644
--- a/network/pgpool-II/slack-desc
+++ b/network/pgpool-II/slack-desc
@@ -15,5 +15,5 @@ pgpool-II: Load Balance, Limiting Exceeding Connections and Parallel Query.
 pgpool-II:
 pgpool-II:
 pgpool-II:
-pgpool-II: http://www.pgpool.net
+pgpool-II: https://www.pgpool.net/mediawiki/index.php/Main_Page
 pgpool-II:
diff --git a/network/phodav/phodav.SlackBuild b/network/phodav/phodav.SlackBuild
index 1b3c1bcebc..d4652f6c61 100644
--- a/network/phodav/phodav.SlackBuild
+++ b/network/phodav/phodav.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for phodav
 
-# Copyright 2016-2018 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy
+# Copyright 2016-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=phodav
-VERSION=${VERSION:-2.2}
+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}
@@ -54,7 +64,7 @@ else
   LIBDIRSUFFIX=""
 fi
 
-DOCS="COPYING NEWS README TODO"
+DOCS="COPYING NEWS README.md TODO"
 
 set -e
 
@@ -73,21 +83,14 @@ find -L . \
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
-./configure \
+meson \
   --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
+  build
 
-mkdir $PKG/lib
-mv $PKG/usr/lib/udev $PKG/lib/
+DESTDIR=$PKG "${NINJA:=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
@@ -103,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/network/phodav/phodav.info b/network/phodav/phodav.info
index 7b7b8d7050..0ff45a9a36 100644
--- a/network/phodav/phodav.info
+++ b/network/phodav/phodav.info
@@ -1,10 +1,10 @@
 PRGNAM="phodav"
-VERSION="2.2"
+VERSION="3.0"
 HOMEPAGE="https://wiki.gnome.org/phodav"
-DOWNLOAD="http://ftp.gnome.org/pub/GNOME/sources/phodav/2.2/phodav-2.2.tar.xz"
-MD5SUM="18dc8890ef3606f2a053054658dbf016"
+DOWNLOAD="http://ftp.gnome.org/pub/GNOME/sources/phodav/3.0/phodav-3.0.tar.xz"
+MD5SUM="33081519b273385976360bf3047fa704"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES=""
+REQUIRES="libsoup3"
 MAINTAINER="Matteo Bernardini"
 EMAIL="ponce@slackbuilds.org"
diff --git a/network/phpmyadmin/README b/network/phpmyadmin/README
index 94a2e36d07..0aa2fa996f 100644
--- a/network/phpmyadmin/README
+++ b/network/phpmyadmin/README
@@ -5,11 +5,12 @@ are supported by the user interface (managing databases, tables, fields,
 relations, indexes, users, permissions, etc), while you still have the
 ability to directly execute any SQL statement.
 
-By default, there is only a sample config file included with the package.
-You can either copy that file and edit it according to your taste or you
-can do a graphical setup.  Both processes are detailed in the docs.
+By default, there is only a sample config file included with the
+package.  You can either copy that file and edit it according to your
+taste or you can do a graphical setup.  Both processes are detailed in
+the docs.
 
 You can override DOCROOT, PHPUSER, and PHPGROUP at build time.
 They default to DOCROOT=/var/www/htdocs, PHPUSER=root, PHPGROUP=apache.
 
-For configuration help, you can visit: http://wiki.phpmyadmin.net/pma/Config
+For configuration help, see: http://wiki.phpmyadmin.net/pma/Config
diff --git a/network/phpmyadmin/phpmyadmin.SlackBuild b/network/phpmyadmin/phpmyadmin.SlackBuild
index 2777d43942..0d537fb885 100644
--- a/network/phpmyadmin/phpmyadmin.SlackBuild
+++ b/network/phpmyadmin/phpmyadmin.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware Package Build Script for phpmyadmin
 # Home Page http://www.phpmyadmin.net/
@@ -27,11 +27,14 @@
 
 # Modified by the SlackBuilds.org project.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM="phpmyadmin"
-VERSION=${VERSION:-4.8.5}
+VERSION=${VERSION:-5.2.0}
 ARCH="noarch" 	# hardcode ARCH
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 DOCROOT=${DOCROOT:-/var/www/htdocs}
 
@@ -40,7 +43,14 @@ PHPGROUP=${PHPGROUP:-apache}
 
 SRCNAM="phpMyAdmin-${VERSION}-all-languages"
 
-CWD=$(pwd)
+# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
+# the name of the created package would be, and then exit. This information
+# could be useful to other scripts.
+if [ ! -z "${PRINT_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/network/phpmyadmin/phpmyadmin.info b/network/phpmyadmin/phpmyadmin.info
index b9ab6b6f44..659020277b 100644
--- a/network/phpmyadmin/phpmyadmin.info
+++ b/network/phpmyadmin/phpmyadmin.info
@@ -1,10 +1,10 @@
 PRGNAM="phpmyadmin"
-VERSION="4.8.5"
+VERSION="5.2.0"
 HOMEPAGE="http://www.phpmyadmin.net/home_page/index.php"
-DOWNLOAD="https://files.phpmyadmin.net/phpMyAdmin/4.8.5/phpMyAdmin-4.8.5-all-languages.tar.xz"
-MD5SUM="e3737a28fff076003e56a83fe1920d04"
+DOWNLOAD="https://files.phpmyadmin.net/phpMyAdmin/5.2.0/phpMyAdmin-5.2.0-all-languages.tar.xz"
+MD5SUM="38ef03fdf4d9ea3608c053a4efed1a9e"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
 MAINTAINER="Nishant Limbachia"
-EMAIL="nishant@mnspace.net"
+EMAIL="nlimbachia@gmail.com"
diff --git a/network/phppgadmin/README b/network/phppgadmin/README
new file mode 100644
index 0000000000..e081f4f0ac
--- /dev/null
+++ b/network/phppgadmin/README
@@ -0,0 +1,12 @@
+PhpPgAdmin is a Web-based application written in PHP that can manage one
+or more PostgreSQL databases. It is 100% compatible with PostgreSQL. It
+performs all the standard Data Definition Language (DDL) and Data 
+Manipulation Language (DML) statements. It can back up and restore an
+entire cluster, and can manage a Slony replication cluster, all in an
+easy-to-understand interface.
+
+Of course a Postgresql server must be accessible, mod_php enabled and
+package 'php-pgsql' installed.
+
+Please adapt 'config.inc.php', 'phppgadmin.conf' for apache, ...
+to your needs.
diff --git a/network/phppgadmin/doinst.sh b/network/phppgadmin/doinst.sh
new file mode 100644
index 0000000000..9e17dcbecd
--- /dev/null
+++ b/network/phppgadmin/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/httpd/conf.d/phppgadmin.conf.new
diff --git a/network/phppgadmin/http-pgadmin.conf b/network/phppgadmin/http-pgadmin.conf
new file mode 100644
index 0000000000..1bd0381933
--- /dev/null
+++ b/network/phppgadmin/http-pgadmin.conf
@@ -0,0 +1,17 @@
+Alias /phppgadmin /usr/share/phppgadmin/
+
+<Directory /usr/share/phppgadmin>
+#    SSLRequireSSL
+    Options FollowSymlinks 
+    AllowOverride None
+    DirectoryIndex index.php
+    Require ip 127.0.0.1
+</Directory>
+
+<Directory /usr/share/phppgadmin/conf>
+    Require all denied
+</Directory>
+
+<Directory /usr/share/phppgadmin/libraries>
+    Require all denied
+</Directory>
diff --git a/network/phppgadmin/phppgadmin.SlackBuild b/network/phppgadmin/phppgadmin.SlackBuild
new file mode 100644
index 0000000000..86bd57a71b
--- /dev/null
+++ b/network/phppgadmin/phppgadmin.SlackBuild
@@ -0,0 +1,91 @@
+#!/bin/bash
+
+# Slackware build script for phppgadmin
+
+# Copyright 2023 Michel A. Begue <mab974@misouk.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='phppgadmin'
+VERSION=${VERSION:-7.13.0}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+SRCNAM=phpPgAdmin
+
+DOCROOT=${DOCROOT:-/usr/share}
+PHPUSER=${PHPUSER:-root}
+PHPGROUP=${PHPGROUP:-apache}
+
+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 $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$DOCROOT
+cp -a $TMP/$SRCNAM-$VERSION $PKG$DOCROOT
+( cd $PKG$DOCROOT; ln -s ./$SRCNAM-$VERSION ./$PRGNAM )
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+  [A-Z]* \
+  $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/etc/httpd/conf.d
+cp -a $CWD/http-pgadmin.conf $PKG/etc/httpd/conf.d/phppgadmin.conf.new
+
+chown -R $PHPUSER:$PHPGROUP $PKG$DOCROOT/$SRCNAM-$VERSION
+chmod -R o-rwx $PKG$DOCROOT/$SRCNAM-$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/network/phppgadmin/phppgadmin.info b/network/phppgadmin/phppgadmin.info
new file mode 100644
index 0000000000..73bfd5f275
--- /dev/null
+++ b/network/phppgadmin/phppgadmin.info
@@ -0,0 +1,10 @@
+PRGNAM="phppgadmin"
+VERSION="7.13.0"
+HOMEPAGE="https://github.com/phppgadmin/phppgadmin"
+DOWNLOAD="https://github.com/phppgadmin/phppgadmin/releases/download/REL_7-13-0/phpPgAdmin-7.13.0.tar.gz"
+MD5SUM="8a38dca6bd0bcdc9481c88f1ac0c0f80"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="php-pgsql"
+MAINTAINER="Michel A. Begue"
+EMAIL="mab974@misouk.com"
diff --git a/network/phppgadmin/slack-desc b/network/phppgadmin/slack-desc
new file mode 100644
index 0000000000..9c1fb25d46
--- /dev/null
+++ b/network/phppgadmin/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+          |-----handy-ruler------------------------------------------------------|
+phppgadmin: phppgadmin (a php webapp for Postgresql)
+phppgadmin:
+phppgadmin: phpPgAdmin is a Web-based application written in PHP that can manage
+phppgadmin: one or more PostgreSQL databases. It is 100% compatible with
+phppgadmin: PostgreSQL. It performs all the standard Data Definition Language
+phppgadmin: (DDL) and Data Manipulation Language (DML) statements. It can back up
+phppgadmin: and restore an entire cluster, and can manage a Slony replication
+phppgadmin: cluster, all in an easy-to-understand interface. 
+phppgadmin:
+phppgadmin:
+phppgadmin:
diff --git a/network/pidgin-authorization-blocker/pidgin-authorization-blocker.SlackBuild b/network/pidgin-authorization-blocker/pidgin-authorization-blocker.SlackBuild
index ee78e4323c..9cd8a2cd82 100644
--- a/network/pidgin-authorization-blocker/pidgin-authorization-blocker.SlackBuild
+++ b/network/pidgin-authorization-blocker/pidgin-authorization-blocker.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for pidgin-authorization-blocker
 
@@ -6,26 +6,36 @@
 
 # Based on http://slackbuilds.org/template.SlackBuild
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=pidgin-authorization-blocker
 VERSION=${VERSION:-1.1}
 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}
 
-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"
@@ -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/network/pidgin-birthday-reminder/pidgin-birthday-reminder.SlackBuild b/network/pidgin-birthday-reminder/pidgin-birthday-reminder.SlackBuild
index ee74fdc4dc..7160f124cd 100644
--- a/network/pidgin-birthday-reminder/pidgin-birthday-reminder.SlackBuild
+++ b/network/pidgin-birthday-reminder/pidgin-birthday-reminder.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for pidgin-birthday-reminder
 
@@ -6,26 +6,36 @@
 
 # Based on http://slackbuilds.org/template.SlackBuild
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=pidgin-birthday-reminder
 VERSION=${VERSION:-1.7}
 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}
 
-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"
@@ -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/network/pidgin-extprefs/pidgin-extprefs.SlackBuild b/network/pidgin-extprefs/pidgin-extprefs.SlackBuild
index 25fe22518b..f2f5b4c998 100644
--- a/network/pidgin-extprefs/pidgin-extprefs.SlackBuild
+++ b/network/pidgin-extprefs/pidgin-extprefs.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for pidgin-extprefs
 
@@ -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=pidgin-extprefs
 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}
@@ -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/network/pidgin-gfire/pidgin-gfire.SlackBuild b/network/pidgin-gfire/pidgin-gfire.SlackBuild
index a14ec878c0..14d62dafd0 100644
--- a/network/pidgin-gfire/pidgin-gfire.SlackBuild
+++ b/network/pidgin-gfire/pidgin-gfire.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for pidgin-gfire
 
@@ -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=pidgin-gfire
 VERSION=${VERSION:-0.9.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}
@@ -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/network/pidgin-musictracker/pidgin-musictracker.SlackBuild b/network/pidgin-musictracker/pidgin-musictracker.SlackBuild
index 2307eb44cc..a220494b4c 100644
--- a/network/pidgin-musictracker/pidgin-musictracker.SlackBuild
+++ b/network/pidgin-musictracker/pidgin-musictracker.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for pidgin-musictracker
 
@@ -21,28 +21,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.
 
+# 20220323 bkw: Modified by SlackBuilds.org: fix 32-bit build (it needs
+# --disable-werror).
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=pidgin-musictracker
 VERSION=${VERSION:-0.4.22}
-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}
 
 DOCS="ABOUT-NLS AUTHORS COPYING ChangeLog INSTALL NEWS README THANKS"
 
-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,13 +76,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 \
+ -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 -Wno-error=deprecated-declarations" \
-CXXFLAGS="$SLKCFLAGS" \
+CFLAGS="$SLKCFLAGS -fcommon" \
 ./configure \
+  --disable-werror \
   --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
   --sysconfdir=/etc \
@@ -83,6 +93,9 @@ CXXFLAGS="$SLKCFLAGS" \
 make
 make install DESTDIR=$PKG
 
+# cleaup libtool stuff
+rm -f $PKG/usr/lib64/pidgin/musictracker.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
 
@@ -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/network/pidgin-nudge/README b/network/pidgin-nudge/README
index f9b8e7ff6d..2618e8503d 100644
--- a/network/pidgin-nudge/README
+++ b/network/pidgin-nudge/README
@@ -1,5 +1,5 @@
 pidgin-nudge (Shakes Pidgin conversation windows on certain events)
 
-A gtk pidgin plugin that shakes your conversation window when you receive
-a nudge/buzz/shake/zap/etc. This plugin is developed to shake your
-window similar to the MSN (Windows Live) Messenger client.
+A gtk pidgin plugin that shakes your conversation window when you
+receive a nudge/buzz/shake/zap/etc. This plugin is developed to shake
+your window similar to the MSN (Windows Live) Messenger client.
diff --git a/network/pidgin-nudge/pidgin-nudge.SlackBuild b/network/pidgin-nudge/pidgin-nudge.SlackBuild
index a73f0df8f1..9f0da681c5 100644
--- a/network/pidgin-nudge/pidgin-nudge.SlackBuild
+++ b/network/pidgin-nudge/pidgin-nudge.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for pidgin-nudge
 
@@ -6,25 +6,35 @@
 
 # Based on http://slackbuilds.org/template.SlackBuild
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=pidgin-nudge
 VERSION=${VERSION:-0.1}
 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}
 
-if [ "$ARCH" = "i486" ]; then
+if [ "$ARCH" = "i586" ]; then
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   LIBDIRSUFFIX=""
@@ -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/network/pidgin-opensteamworks/pidgin-opensteamworks.SlackBuild b/network/pidgin-opensteamworks/pidgin-opensteamworks.SlackBuild
index a73d131ef2..6b4b096bc7 100644
--- a/network/pidgin-opensteamworks/pidgin-opensteamworks.SlackBuild
+++ b/network/pidgin-opensteamworks/pidgin-opensteamworks.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for pidgin-opensteamworks
 
@@ -6,25 +6,35 @@
 
 # Based on http://slackbuilds.org/template.SlackBuild
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=pidgin-opensteamworks
 VERSION=${VERSION:-1.6.1}
 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}
 
-if [ "$ARCH" = "i486" ]; then
+if [ "$ARCH" = "i586" ]; then
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   LIBDIRSUFFIX=""
@@ -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/network/pidgin-opensteamworks/pidgin-opensteamworks.info b/network/pidgin-opensteamworks/pidgin-opensteamworks.info
index bc607aab77..ae83f8a441 100644
--- a/network/pidgin-opensteamworks/pidgin-opensteamworks.info
+++ b/network/pidgin-opensteamworks/pidgin-opensteamworks.info
@@ -1,10 +1,10 @@
 PRGNAM="pidgin-opensteamworks"
 VERSION="1.6.1"
 HOMEPAGE="https://github.com/EionRobb/pidgin-opensteamworks"
-DOWNLOAD="https://github.com/EionRobb/pidgin-opensteamworks/archive/1.6.1.tar.gz"
+DOWNLOAD="https://github.com/EionRobb/pidgin-opensteamworks/archive/1.6.1/pidgin-opensteamworks-1.6.1.tar.gz"
 MD5SUM="a397dbb2fd1d58769506567bd2aa6f1b"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="json-glib"
+REQUIRES=""
 MAINTAINER="Ronny Schmatzler"
 EMAIL="schmatzler@hirnschwund.net"
diff --git a/network/pidgin-otr/README b/network/pidgin-otr/README
index 73b1d4024c..8cf6a7dda4 100644
--- a/network/pidgin-otr/README
+++ b/network/pidgin-otr/README
@@ -3,8 +3,9 @@ Off-the-Record (OTR) Messaging for Pidgin
 Allows you to have private conversations over instant messaging when 
 talking on Pidgin by providing:
 - Encryption: No one else can read your instant messages.
-- Authentication: You are assured the correspondent is who you think it is.
-- Deniability: The messages you send do not have digital signatures that 
-  are checkable by a third party.
+- Authentication: You are assured the correspondent is who you think
+  it is.
+- Deniability: The messages you send do not have digital signatures
+  that are checkable by a third party.
 - Perfect forward secrecy: If you lose control of your private keys,
   no previous conversation is compromised.
diff --git a/network/pidgin-otr/pidgin-otr.SlackBuild b/network/pidgin-otr/pidgin-otr.SlackBuild
index 9f8956f084..41e1ecff5f 100644
--- a/network/pidgin-otr/pidgin-otr.SlackBuild
+++ b/network/pidgin-otr/pidgin-otr.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for pidgin-otr
 
@@ -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=pidgin-otr
 VERSION=${VERSION:-4.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 the variable PRINT_PACKAGE_NAME is set, then this script will report what
+# the name of the created package would be, and then exit. This information
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; 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/network/pidgin-privacy-please/README b/network/pidgin-privacy-please/README
index f0caf1b04b..b59638f211 100644
--- a/network/pidgin-privacy-please/README
+++ b/network/pidgin-privacy-please/README
@@ -1 +1,2 @@
-pidgin privacy please is a pidgin plugin to stop spammers from annoying you.
+pidgin privacy please is a pidgin plugin to stop spammers from
+annoying you.
diff --git a/network/pidgin-privacy-please/pidgin-privacy-please.SlackBuild b/network/pidgin-privacy-please/pidgin-privacy-please.SlackBuild
index 625401eb49..063382693d 100644
--- a/network/pidgin-privacy-please/pidgin-privacy-please.SlackBuild
+++ b/network/pidgin-privacy-please/pidgin-privacy-please.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for pidgin-privacy-please
 
@@ -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=pidgin-privacy-please
 VERSION=${VERSION:-0.7.1}
 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 [ "$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"
@@ -88,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/network/pidgin-sipe/README b/network/pidgin-sipe/README
index a6fa874151..39ed142dd9 100644
--- a/network/pidgin-sipe/README
+++ b/network/pidgin-sipe/README
@@ -1,6 +1,6 @@
-This project develops a third-party plugin for the Pidgin  multi-protocol
-instant messenger. It implements the extended version of SIP/SIMPLE used by
-various products:
+This project develops a third-party plugin for the Pidgin
+multi-protocol instant messenger. It implements the extended version of
+SIP/SIMPLE used by various products:
 
 * Microsoft Office Communications Server (OCS 2007/2007 R2 and newer)
 * Microsoft Live Communications Server (LCS 2003/2005)
diff --git a/network/pidgin-sipe/pidgin-sipe.SlackBuild b/network/pidgin-sipe/pidgin-sipe.SlackBuild
index e59c906f6e..19b3cd155f 100644
--- a/network/pidgin-sipe/pidgin-sipe.SlackBuild
+++ b/network/pidgin-sipe/pidgin-sipe.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for pidgin-sipe.
 
@@ -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=pidgin-sipe
-VERSION=${VERSION:-1.23.0}
+VERSION=${VERSION:-1.25.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}
@@ -79,6 +89,7 @@ CXXFLAGS="$SLKCFLAGS" \
   --localstatedir=/var \
   --mandir=/usr/man \
   --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --enable-quality-check=no \
   --build=$ARCH-slackware-linux
 
 make
@@ -89,7 +100,7 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
-  AUTHORS COPYING ChangeLog HACKING INSTALL NEWS README TODO \
+  ChangeLog NEWS COPYING README ABOUT-NLS TODO AUTHORS \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
@@ -97,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/network/pidgin-sipe/pidgin-sipe.info b/network/pidgin-sipe/pidgin-sipe.info
index a2cc1045d7..860749b323 100644
--- a/network/pidgin-sipe/pidgin-sipe.info
+++ b/network/pidgin-sipe/pidgin-sipe.info
@@ -1,8 +1,8 @@
 PRGNAM="pidgin-sipe"
-VERSION="1.23.0"
+VERSION="1.25.0"
 HOMEPAGE="http://sipe.sourceforge.net/"
-DOWNLOAD="http://downloads.sourceforge.net/sipe/pidgin-sipe-1.23.0.tar.xz"
-MD5SUM="75fb9417834bc78114786d78a41bcd37"
+DOWNLOAD="http://downloads.sourceforge.net/sipe/pidgin-sipe-1.25.0.tar.xz"
+MD5SUM="0e742f021dc8c3f17435aea05c3e0314"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/network/pidgin-sound/README b/network/pidgin-sound/README
index 2b70b52f7d..f4fd62bc73 100644
--- a/network/pidgin-sound/README
+++ b/network/pidgin-sound/README
@@ -1,2 +1,2 @@
-pidgin-sound is a plugin that adds sounds for some sound notifications to 
-pidgin (e.g. 'Incoming Filetransfer' or 'Authentication requested')
+pidgin-sound is a plugin that adds sounds for some sound notifications
+to pidgin (e.g. 'Incoming Filetransfer' or 'Authentication requested')
diff --git a/network/pidgin-sound/pidgin-sound.SlackBuild b/network/pidgin-sound/pidgin-sound.SlackBuild
index 2bc4401e62..432f8b5616 100644
--- a/network/pidgin-sound/pidgin-sound.SlackBuild
+++ b/network/pidgin-sound/pidgin-sound.SlackBuild
@@ -1,31 +1,41 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for pidgin-sound
 
 # Written by JokerBoy ( mynameisbogdan at yahoo.com)
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=pidgin-sound
 VERSION=${VERSION:-1.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 SRCNAM=pidgin-advanced-sound-notification
 
 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/network/pidgin-toobars/pidgin-toobars.SlackBuild b/network/pidgin-toobars/pidgin-toobars.SlackBuild
index 5154b8489c..606218615f 100644
--- a/network/pidgin-toobars/pidgin-toobars.SlackBuild
+++ b/network/pidgin-toobars/pidgin-toobars.SlackBuild
@@ -1,13 +1,16 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for pidgin-toobars
 
 # Written by Larry Hajali <larryhaja[at]gmail[dot]com>
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=pidgin-toobars
 VERSION=${VERSION:-1.14}
 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}
@@ -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/network/pidgin-toolbar-shrink/pidgin-toolbar-shrink.SlackBuild b/network/pidgin-toolbar-shrink/pidgin-toolbar-shrink.SlackBuild
index 3e35ad7f17..402d252d79 100644
--- a/network/pidgin-toolbar-shrink/pidgin-toolbar-shrink.SlackBuild
+++ b/network/pidgin-toolbar-shrink/pidgin-toolbar-shrink.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for pidgin-toolbar-shrink
 
@@ -6,26 +6,36 @@
 
 # Based on http://slackbuilds.org/template.SlackBuild
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=pidgin-toolbar-shrink
 VERSION=${VERSION:-1.1.1}
 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}
 
-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"
@@ -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/network/pidgin-visnotes/pidgin-visnotes.SlackBuild b/network/pidgin-visnotes/pidgin-visnotes.SlackBuild
index 43bbe7c75a..3768f06f2c 100644
--- a/network/pidgin-visnotes/pidgin-visnotes.SlackBuild
+++ b/network/pidgin-visnotes/pidgin-visnotes.SlackBuild
@@ -1,29 +1,39 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for pidgin-visnotes
 
 # Written by otzy_007 (oz@oprod.net)
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=pidgin-visnotes
 VERSION=${VERSION:-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 the variable PRINT_PACKAGE_NAME is set, then this script will report what
+# the name of the created package would be, and then exit. This information
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; 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,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/network/pidgin-whatsapp/pidgin-whatsapp.SlackBuild b/network/pidgin-whatsapp/pidgin-whatsapp.SlackBuild
index bebd38de44..eafb9d544d 100644
--- a/network/pidgin-whatsapp/pidgin-whatsapp.SlackBuild
+++ b/network/pidgin-whatsapp/pidgin-whatsapp.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for whatsapp-purple
 
@@ -6,26 +6,36 @@
 
 # Based on http://slackbuilds.org/template.SlackBuild
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=pidgin-whatsapp
 VERSION=${VERSION:-0.8.6}
 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}
 
-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/network/pidgin-whatsapp/pidgin-whatsapp.info b/network/pidgin-whatsapp/pidgin-whatsapp.info
index e442c22075..ef52c5163d 100644
--- a/network/pidgin-whatsapp/pidgin-whatsapp.info
+++ b/network/pidgin-whatsapp/pidgin-whatsapp.info
@@ -1,7 +1,7 @@
 PRGNAM="pidgin-whatsapp"
 VERSION="0.8.6"
 HOMEPAGE="https://github.com/davidgfnet/whatsapp-purple"
-DOWNLOAD="https://github.com/davidgfnet/whatsapp-purple/archive/v0.8.6.tar.gz"
+DOWNLOAD="https://github.com/davidgfnet/whatsapp-purple/archive/v0.8.6/whatsapp-purple-0.8.6.tar.gz"
 MD5SUM="1aff0445ec9960b67082c0992ce21b45"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/network/pirate-get/README b/network/pirate-get/README
index d7f1d087bd..72dc98b7c4 100644
--- a/network/pirate-get/README
+++ b/network/pirate-get/README
@@ -1,6 +1,3 @@
 pirate-get is a convenient command line tool (inspired by APT)
 to speed up your trip to the Pirate Bay and get your completely
 legal torrents more quickly.
-
-NOTE:
-Please install python3 first before installing all other requirements.
diff --git a/network/pirate-get/pirate-get.SlackBuild b/network/pirate-get/pirate-get.SlackBuild
index c268725027..6cae707b39 100644
--- a/network/pirate-get/pirate-get.SlackBuild
+++ b/network/pirate-get/pirate-get.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for pirate-get
 
-# Copyright 2017-2018  Dimitris Zlatanidis  Orestiada, Greece
+# Copyright 2017-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=pirate-get
-VERSION=${VERSION:-0.2.13}
+VERSION=${VERSION:-0.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}
@@ -75,11 +85,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 README.md PKG-INFO $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
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/network/pirate-get/pirate-get.info b/network/pirate-get/pirate-get.info
index d3a0f13b8e..d31219670c 100644
--- a/network/pirate-get/pirate-get.info
+++ b/network/pirate-get/pirate-get.info
@@ -1,10 +1,10 @@
 PRGNAM="pirate-get"
-VERSION="0.2.13"
+VERSION="0.4.0"
 HOMEPAGE="https://github.com/vikstrous/pirate-get"
-DOWNLOAD="https://files.pythonhosted.org/packages/d2/2f/550e85816cadfb1f9073f5766a671da293894983c9d5a9b602ae99d82dbc/pirate-get-0.2.13.tar.gz"
-MD5SUM="96fd112a8c96856abb4e9cb8bd440fbd"
+DOWNLOAD="https://files.pythonhosted.org/packages/c3/e2/735e12e1d0aabcc20dd68cd809e3ed7ccd9e063f03a6edf4406bd520fd21/pirate-get-0.4.0.tar.gz"
+MD5SUM="f1bd3e0d209586d076db3cc01e522158"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="python3 BeautifulSoup4 veryprettytable"
+REQUIRES="veryprettytable pyperclip"
 MAINTAINER="Dimitris Zlatanidis"
 EMAIL="d.zlatanidis@gmail.com"
diff --git a/network/plasma-nm-openconnect/README b/network/plasma-nm-openconnect/README
deleted file mode 100644
index 73d9ce36a9..0000000000
--- a/network/plasma-nm-openconnect/README
+++ /dev/null
@@ -1,4 +0,0 @@
-plasma-nm-openconnect (OpenConnect support for plasma-nm)
-
-This package contains the OpenConnect support for KDE's plasma-nm
-networking applet.
diff --git a/network/plasma-nm-openconnect/plasma-nm-openconnect.SlackBuild b/network/plasma-nm-openconnect/plasma-nm-openconnect.SlackBuild
deleted file mode 100644
index 621b554b93..0000000000
--- a/network/plasma-nm-openconnect/plasma-nm-openconnect.SlackBuild
+++ /dev/null
@@ -1,117 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for plasma-nm-openconnect
-
-# Copyright 2015  Robby Workman, Tuscaloosa, Alabama, 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=plasma-nm-openconnect
-VERSION=${VERSION:-0.9.3.6}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-SRCNAM=plasma-nm
-
-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}
-
-# We'll need a place to put things temporarily
-NOPKG=$PKG/NOPKG
-
-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-$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 {} \;
-
-mkdir build
-cd build
-  cmake \
-    -DKDE_PLATFORM_FEATURE_DISABLE_DEPRECATED=TRUE \
-    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
-    -DCMAKE_C_FLAGS_RELEASE:STRING="$SLKCFLAGS" \
-    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
-    -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS" \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DMAN_INSTALL_DIR=/usr/man \
-    -DSYSCONF_INSTALL_DIR=/etc/kde \
-    -DLIB_SUFFIX=${LIBDIRSUFFIX} \
-    -DKDE4_BUILD_TESTS=OFF \
-    -DSITE=\"slackbuilds.org\" \
-    ..
-  make
-  make install DESTDIR=$NOPKG
-cd ..
-
-# This is probably overkill, because we only need a couple of files, but...
-for file in $(find $NOPKG -name "*openconnect*") ; do
-  mkdir -p $PKG/$(dirname $file | sed "s,^$NOPKG,,")
-  cp -a $file $PKG/$(dirname $file | sed "s,^$NOPKG,,")
-done
-
-# We don't need this any more
-rm -rf $NOPKG $PKG/usr/share/locale
-
-find $PKG -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 $PKG/usr/doc/$PRGNAM-$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/network/plasma-nm-openconnect/plasma-nm-openconnect.info b/network/plasma-nm-openconnect/plasma-nm-openconnect.info
deleted file mode 100644
index a802df6280..0000000000
--- a/network/plasma-nm-openconnect/plasma-nm-openconnect.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="plasma-nm-openconnect"
-VERSION="0.9.3.6"
-HOMEPAGE="https://quickgit.kde.org/?p=plasma-nm.git"
-DOWNLOAD="http://download.kde.org/stable/plasma-nm/plasma-nm-0.9.3.6.tar.xz"
-MD5SUM="ab94be59919eca6bf89fc1930cf3dd39"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="openconnect"
-MAINTAINER="Robby Workman"
-EMAIL="rworkman@slackbuilds.org"
diff --git a/network/plasma-nm-openconnect/slack-desc b/network/plasma-nm-openconnect/slack-desc
deleted file mode 100644
index 625f0dcf45..0000000000
--- a/network/plasma-nm-openconnect/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------------------------------------------------------|
-plasma-nm-openconnect: plasma-nm-openconnect (OpenConnect support for plasma-nm)
-plasma-nm-openconnect:
-plasma-nm-openconnect: This package contains the OpenConnect support for KDE's plasma-nm
-plasma-nm-openconnect: networking applet.
-plasma-nm-openconnect:
-plasma-nm-openconnect:
-plasma-nm-openconnect:
-plasma-nm-openconnect:
-plasma-nm-openconnect:
-plasma-nm-openconnect:
-plasma-nm-openconnect:
diff --git a/network/plowshare-modules/plowshare-modules.SlackBuild b/network/plowshare-modules/plowshare-modules.SlackBuild
index 4f9854d34b..c72438e6ea 100644
--- a/network/plowshare-modules/plowshare-modules.SlackBuild
+++ b/network/plowshare-modules/plowshare-modules.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for plowshare-modules
 
-# Copyright 2017-2018 Jeremy Hansen <jebrhansen+SBo -at- gmail.com>
+# Copyright 2017-2022 Jeremy Hansen <jebrhansen+SBo -at- gmail.com>
 # Copyright 2010 Mikhail Cuddy <mikhailcuddy@gmail.com>
 # All rights reserved.
 #
@@ -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=plowshare-modules
-VERSION=${VERSION:-e94a905}
+VERSION=${VERSION:-c22e296}
 SRCNAM=${PRGNAM}-legacy
-SRCVER=${MODVER:-e94a9051f54abb66fd3963933587b2d4057a1614}
+SRCVER=${MODVER:-c22e2962e26c1fcc539b41a37eaab448828842de}
 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/network/plowshare-modules/plowshare-modules.info b/network/plowshare-modules/plowshare-modules.info
index 628166de28..4d2623424a 100644
--- a/network/plowshare-modules/plowshare-modules.info
+++ b/network/plowshare-modules/plowshare-modules.info
@@ -1,8 +1,8 @@
 PRGNAM="plowshare-modules"
-VERSION="e94a905"
+VERSION="c22e296"
 HOMEPAGE="https://github.com/mcrapet/plowshare-modules-legacy"
-DOWNLOAD="https://github.com/mcrapet/plowshare-modules-legacy/archive/e94a905/plowshare-modules-legacy-e94a9051f54abb66fd3963933587b2d4057a1614.tar.gz"
-MD5SUM="d68a47b14ecd201c6f3e4c24c6c30554"
+DOWNLOAD="https://github.com/mcrapet/plowshare-modules-legacy/archive/c22e296/plowshare-modules-legacy-c22e2962e26c1fcc539b41a37eaab448828842de.tar.gz"
+MD5SUM="4f8b20183bac08d041303340f5b61e51"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="plowshare"
diff --git a/network/plowshare/README b/network/plowshare/README
index ed11f60376..bbb97ce486 100644
--- a/network/plowshare/README
+++ b/network/plowshare/README
@@ -1,19 +1,20 @@
 Plowshare is a set of command-line tools (written entirely in Bash shell
 script) designed for managing file-sharing websites (aka Hosters).
 
-Plowshare itself doesn't support any websites. It's just the core engine.
-Support for websites are added via modules. They are available separately
-and it's recommended to be installed by the user rather than system-wide.
-It can be installed/updated by the user to ~/.config/plowshare/modules.d/
-directory using:
+Plowshare itself doesn't support any websites. It's just the
+core engine. Support for websites are added via modules. They are
+available separately and it's recommended to be installed by the user
+rather than system-wide. It can be installed/updated by the user to
+~/.config/plowshare/modules.d/ directory using:
 
 $ plowmod --install
 $ plowmod --update
 
-However, if you'd like them system-wide, please see the plowshare-modules
-SBo package. Modules will be installed to /usr/share/plowshare/modules/
+However, if you'd like them system-wide, please see the
+plowshare-modules SBo package. Modules will be installed to
+/usr/share/plowshare/modules/
 
-Per INSTALL, either rhino or sunspider (the latter is not available on SBo)
-are optional runtime dependencies. It is stated they are required for some
-sites. However, I have not come across any that didn't work. Let me know
-if it should become a required dependency.
+Per INSTALL, either rhino or sunspider (the latter is not available on
+SBo) are optional runtime dependencies. It is stated they are required
+for some sites. However, I have not come across any that didn't
+work. Let me know if it should become a required dependency.
diff --git a/network/plowshare/plowshare.SlackBuild b/network/plowshare/plowshare.SlackBuild
index 3e7a9aa624..11d0ece151 100644
--- a/network/plowshare/plowshare.SlackBuild
+++ b/network/plowshare/plowshare.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for plowshare
 
@@ -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=plowshare
 VERSION=${VERSION:-2.1.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}
@@ -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/network/pmacct/README b/network/pmacct/README
index 4b088cb71c..9ca7b8da28 100644
--- a/network/pmacct/README
+++ b/network/pmacct/README
@@ -1,7 +1,8 @@
-Pmacct is a small set of multi-purpose passive network monitoring tools.
-It can account, classify, aggregate, replicate and export forwarding-plane
-data, ie. IPv4 and IPv6 traffic; collect and correlate control-plane data via
-BGP and BMP; collect infrastructure data via Streaming Telemetry.
+Pmacct is a small set of multi-purpose passive network monitoring
+tools. It can account, classify, aggregate, replicate and export
+forwarding-plane data, ie. IPv4 and IPv6 traffic; collect and
+correlate control-plane data via BGP and BMP; collect infrastructure
+data via Streaming Telemetry.
 
-Each component works both as a standalone daemon and as a thread of execution
-for correlation purposes (ie. enrich NetFlow with BGP data).
+Each component works both as a standalone daemon and as a thread of
+execution for correlation purposes (ie. enrich NetFlow with BGP data).
diff --git a/network/pmacct/pmacct.SlackBuild b/network/pmacct/pmacct.SlackBuild
index 24a0add466..1ed93b8cb4 100644
--- a/network/pmacct/pmacct.SlackBuild
+++ b/network/pmacct/pmacct.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for PMACCT
 
@@ -24,10 +24,13 @@
 
 # 02/Apr/2018 * First version
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=pmacct
 VERSION=${VERSION:-1.7.0}
-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}
@@ -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 {} \;
 
-CFLAGS="$SLKCFLAGS" \
+CFLAGS="$SLKCFLAGS -fcommon" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
@@ -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-$(echo $VERSION | tr - _)-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/network/pmacct/slack-desc b/network/pmacct/slack-desc
index ecd8584dae..90cd4b56cb 100644
--- a/network/pmacct/slack-desc
+++ b/network/pmacct/slack-desc
@@ -17,4 +17,3 @@ pmacct:
 pmacct: Each component works both as a standalone daemon and as a thread of
 pmacct: execution for correlation purposes (ie. enrich NetFlow with BGP
 pmacct: data).
-pmacct:
diff --git a/network/policyd/policyd.SlackBuild b/network/policyd/policyd.SlackBuild
index 2d80befc9d..4f906e0818 100644
--- a/network/policyd/policyd.SlackBuild
+++ b/network/policyd/policyd.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware Package Build Script for policyd
 
@@ -25,10 +25,13 @@
 
 # Modified by Robby Workman <rworkman@slackbuilds.org>
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=policyd
 VERSION=${VERSION:-1.82}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
 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,7 +82,7 @@ find -L . \
   \( -perm 666 -o -perm 664 -o -perm 644 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
   -exec chmod 644 {} \;
 
-make CFLAGS+="$SLKCFLAGS" build
+make CFLAGS+="$SLKCFLAGS -fcommon" build
 strip --strip-unneeded cleanup stats policyd 2> /dev/null
 
 mkdir -p $PKG/usr/bin
@@ -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/network/policyd2/README b/network/policyd2/README
index a3ad2e7144..64104d2ad0 100644
--- a/network/policyd2/README
+++ b/network/policyd2/README
@@ -1,5 +1,5 @@
-Policyd v2 (codenamed "cluebringer") is a multi-platform policy server for 
-popular MTAs.  This policy daemon is designed mostly for large scale mail 
-hosting environments.  The main goal is to implement as many spam combating 
-and email compliance features as possible while at the same time maintaining 
-the portability, stability and performance.  
+Policyd v2 (codenamed "cluebringer") is a multi-platform policy server
+for popular MTAs. This policy daemon is designed mostly for large
+scale mail hosting environments. The main goal is to implement as many
+spam combating and email compliance features as possible while at the
+same time maintaining the portability, stability and performance.
diff --git a/network/policyd2/policyd2.SlackBuild b/network/policyd2/policyd2.SlackBuild
index d0839b2ea6..56e90a62d2 100644
--- a/network/policyd2/policyd2.SlackBuild
+++ b/network/policyd2/policyd2.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware Package Build Script for policyd2 (a.k.a cluebringer)
 # Home Page http://www.policyd.org/
@@ -25,28 +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.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM="policyd2"
 VERSION=${VERSION:-2.0.14}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 SRCNAM="cluebringer"
 
 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"
@@ -156,4 +166,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 sed s:@DOCROOT@:$(echo $DOCROOT | sed s:/::): $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/network/policyd2/policyd2.info b/network/policyd2/policyd2.info
index f5680fd28b..4d32a1233f 100644
--- a/network/policyd2/policyd2.info
+++ b/network/policyd2/policyd2.info
@@ -1,7 +1,7 @@
 PRGNAM="policyd2"
 VERSION="2.0.14"
 HOMEPAGE="http://www.policyd.org/"
-DOWNLOAD="http://urchlay.naptime.net/~urchlay/src/cluebringer-v2.0.14.tar.xz"
+DOWNLOAD="https://slackware.uk/~urchlay/src/cluebringer-v2.0.14.tar.xz"
 MD5SUM="e75cd25a836b316846f5ad8bf09a69a2"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/network/polipo/README b/network/polipo/README
index f9c4c2f41b..33007a22ea 100644
--- a/network/polipo/README
+++ b/network/polipo/README
@@ -1,23 +1,25 @@
-Polipo is a small and fast caching web proxy (a web cache, an HTTP proxy, a
-proxy server). While Polipo was designed to be used by one person or a small
-group of people, there is nothing that prevents it from being used by a larger
-group.
+Polipo is a small and fast caching web proxy (a web cache, an HTTP
+proxy, a proxy server). While Polipo was designed to be used by one
+person or a small group of people, there is nothing that prevents it
+from being used by a larger group.
 
-Polipo has some features that are, as far as I know, unique among currently
-available proxies:
-  * Polipo will use HTTP/1.1 pipelining if it believes that the remote server
-    supports it, whether the incoming requests are pipelined or come in
-    simultaneously on multiple connections (this is more than the simple usage
-    of persistent connections, which is done by e.g. Squid); Polipo will cache
-    the initial segment of an instance if the download has been interrupted,
-    and, if necessary, complete it later using Range requests;
-  * Polipo will upgrade client requests to HTTP/1.1 even if they come in as
-    HTTP/1.0, and up- or downgrade server replies to the client's capabilities
-    (this may involve conversion to or from the HTTP/1.1 chunked encoding);
-  * Polipo has complete support for IPv6 (except for scoped (link-local)
-    addresses).
-  * Polipo can optionally use a technique known as Poor Man's Multiplexing to
-    reduce latency even further.
+Polipo has some features that are, as far as I know, unique among
+currently available proxies:
+  * Polipo will use HTTP/1.1 pipelining if it believes that the remote
+    server supports it, whether the incoming requests are pipelined
+    or come in simultaneously on multiple connections (this is more
+    than the simple usage of persistent connections, which is done by
+    e.g. Squid); Polipo will cache the initial segment of an instance
+    if the download has been interrupted, and, if necessary, complete
+    it later using Range requests;
+  * Polipo will upgrade client requests to HTTP/1.1 even if they
+    come in as HTTP/1.0, and up- or downgrade server replies to the
+    client's capabilities (this may involve conversion to or from the
+    HTTP/1.1 chunked encoding);
+  * Polipo has complete support for IPv6 (except for scoped
+    (link-local) addresses).
+  * Polipo can optionally use a technique known as Poor Man's
+    Multiplexing to reduce latency even further.
 
-In short, Polipo uses a plethora of techniques to make web browsing (seem)
-faster.
+In short, Polipo uses a plethora of techniques to make web browsing
+(seem) faster.
diff --git a/network/polipo/doinst.sh b/network/polipo/doinst.sh
index 22e39ecac9..a3be83cfe3 100644
--- a/network/polipo/doinst.sh
+++ b/network/polipo/doinst.sh
@@ -18,8 +18,11 @@ if [ -e etc/rc.d/rc.polipo ]; then
   mv etc/rc.d/rc.polipo.new.incoming etc/rc.d/rc.polipo.new
 fi
 
-if [ -x /usr/bin/install-info ]; then
-  chroot . /usr/bin/install-info --info-dir=/usr/info /usr/info/polipo.info.gz 2> /dev/null
+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
 
 config etc/rc.d/rc.polipo.new
diff --git a/network/polipo/douninst.sh b/network/polipo/douninst.sh
new file mode 100644
index 0000000000..1bef502028
--- /dev/null
+++ b/network/polipo/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/network/polipo/polipo.SlackBuild b/network/polipo/polipo.SlackBuild
index 59c96b34b9..0f9e399932 100644
--- a/network/polipo/polipo.SlackBuild
+++ b/network/polipo/polipo.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for Polipo
 
@@ -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.
 
+# 20240331 bkw: Modified by SlackBuilds.org, BUILD=2:
+# - handle /usr/info properly in doinst.sh, add douninst.sh
+
+cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=polipo
 VERSION=${VERSION:-1.1.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}
@@ -73,9 +82,9 @@ patch -p1 < $CWD/makefile.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 {} +
 
 make CDEBUGFLAGS="$SLKCFLAGS"
 make install DESTDIR=$PKG
@@ -100,6 +109,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
+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/network/polipo/polipo.info b/network/polipo/polipo.info
index 7f8de43505..86c583f827 100644
--- a/network/polipo/polipo.info
+++ b/network/polipo/polipo.info
@@ -1,7 +1,7 @@
 PRGNAM="polipo"
 VERSION="1.1.1"
 HOMEPAGE="http://www.pps.jussieu.fr/~jch/software/polipo/"
-DOWNLOAD="https://github.com/jech/polipo/archive/polipo-1.1.1.tar.gz"
+DOWNLOAD="https://github.com/jech/polipo/archive/polipo-1.1.1/polipo-polipo-1.1.1.tar.gz"
 MD5SUM="bfbe3222a517d7c4153c4dc7cd9fd2ef"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/network/postfix-pgsql/README b/network/postfix-pgsql/README
new file mode 100644
index 0000000000..59211a1702
--- /dev/null
+++ b/network/postfix-pgsql/README
@@ -0,0 +1,7 @@
+Postfix is Wietse Venema's mailer that started life as an alternative to
+the widely-used Sendmail program. It attempts to be fast, easy to
+administer, and secure, while at the same time, being sendmail
+compatible enough to not upset existing users. Thus, the outside has a
+sendmail-ish flavor, but the inside is completely different.
+
+This script adds PostgreSQL support to postfix.
diff --git a/network/postfix-pgsql/doinst.sh b/network/postfix-pgsql/doinst.sh
new file mode 100644
index 0000000000..91aaad7e22
--- /dev/null
+++ b/network/postfix-pgsql/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/postfix/dynamicmaps.cf.d/pgsql.cf.new
diff --git a/network/postfix-pgsql/postfix-pgsql.SlackBuild b/network/postfix-pgsql/postfix-pgsql.SlackBuild
new file mode 100644
index 0000000000..770b52557e
--- /dev/null
+++ b/network/postfix-pgsql/postfix-pgsql.SlackBuild
@@ -0,0 +1,118 @@
+#!/bin/bash
+#
+# Copyright 2006, 2011  Alan Hicks, Lizella, GA
+# Copyright 2010, 2011, 2013, 2014, 2015, 2016, 2017  Mario Preksavec, Zagreb, Croatia
+# Copyright 2017, 2018  Patrick J. Volkerding, Sebeka, MN USA
+# Copyright 2020, 2021, 2022, 2023, 2024  Eugen Wissner, Mannheim, 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.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=postfix-pgsql
+VERSION=${VERSION:-3.6.15}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+SRCNAM=postfix
+
+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 {} \+
+
+PGSQLARGS="-I/usr/include/postgresql -DHAS_PGSQL"
+
+### CHANGING BUILT-IN DOCUMENTATION PATH SETTINGS
+#
+# If we try to use postfix-$VERSION in any of these paths, we'll get a compile
+# failure: "error: too many decimal points in number"
+# So we're pretty much forced to leave things as postfix expects them.
+PATHARGS="'-DDEF_HTML_DIR=\"/usr/doc/postfix/html\"' \
+  '-DDEF_MANPAGE_DIR=\"/usr/man\"' \
+  '-DDEF_README_DIR=\"/usr/doc/postfix/readme\"'"
+
+make makefiles dynamicmaps=yes pie=yes shared=yes \
+  shlib_directory=/usr/lib${LIBDIRSUFFIX}/postfix/MAIL_VERSION \
+  CCARGS="$PGSQLARGS $PATHARGS" \
+  AUXLIBS_PGSQL="-lpq -lz -lm" \
+  OPT="$SLKCFLAGS" DEBUG=""
+make
+
+mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/postfix/$VERSION
+cp -a lib/postfix-pgsql.so $PKG/usr/lib${LIBDIRSUFFIX}/postfix/$VERSION/
+
+strip --strip-unneeded $PKG/usr/lib${LIBDIRSUFFIX}/postfix/$VERSION/postfix-pgsql.so
+
+mkdir -p $PKG/etc/postfix/dynamicmaps.cf.d
+echo "pgsql	postfix-pgsql.so	dict_pgsql_open" > $PKG/etc/postfix/dynamicmaps.cf.d/pgsql.cf.new
+
+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/network/postfix-pgsql/postfix-pgsql.info b/network/postfix-pgsql/postfix-pgsql.info
new file mode 100644
index 0000000000..63998fb4ee
--- /dev/null
+++ b/network/postfix-pgsql/postfix-pgsql.info
@@ -0,0 +1,10 @@
+PRGNAM="postfix-pgsql"
+VERSION="3.6.15"
+HOMEPAGE="https://www.postfix.org/"
+DOWNLOAD="http://ftp.porcupine.org/mirrors/postfix-release/official/postfix-3.6.15.tar.gz"
+MD5SUM="88471ed95d8f779d16e5c77c000367d5"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="postgresql"
+MAINTAINER="Eugene Wissner"
+EMAIL="belka@caraus.de"
diff --git a/network/postfix-pgsql/slack-desc b/network/postfix-pgsql/slack-desc
new file mode 100644
index 0000000000..47ad32def0
--- /dev/null
+++ b/network/postfix-pgsql/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct. It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+             |-----handy-ruler------------------------------------------------------|
+postfix-pgsql: postfix-pgsql (postfix with support for PostgreSQL)
+postfix-pgsql:
+postfix-pgsql: Postfix attempts to be fast, easy to administer, and secure, while at
+postfix-pgsql: the same time being sendmail compatible enough to not upset existing
+postfix-pgsql: users. Thus, the outside has a sendmail-ish flavor, but the inside is
+postfix-pgsql: completely different.
+postfix-pgsql:
+postfix-pgsql: This script adds PostgreSQL support to postfix.
+postfix-pgsql:
+postfix-pgsql: Homepage: http://www.postfix.org
+postfix-pgsql:
diff --git a/network/postfix/README b/network/postfix/README
deleted file mode 100644
index 80840d5668..0000000000
--- a/network/postfix/README
+++ /dev/null
@@ -1,39 +0,0 @@
-Postfix is Wietse Venema's mailer that started life as an alternative to the
-widely-used Sendmail program. It attempts to be fast, easy to administer, and
-secure, while at the same time, being sendmail compatible enough to not upset
-existing users. Thus, the outside has a sendmail-ish flavor, but the inside is
-completely different.
-
-This script builds postfix with optional support for Dovecot SASL, Cyrus SASL
-can be enabled with:
-
-  SASL=cyrus ./postfix.SlackBuild
-
-You can also enable support for MySQL:
-
-  DATABASE=mysql ./postfix.SlackBuild
-
-PostgreSQL support can be enabled with:
-
-  DATABASE=pgsql ./postfix.SlackBuild
-
-On systems with multiple instances, add major version, eg: DATABASE=pgsql-9.5
-
-This script will find support for BerkleyDB and PCRE automagically; TLS support
-requires openssl package, openssl-solibs alone is not enough. Additionally, this
-script doesn't add postfix user and groups, instead it offers sane defaults that
-won't conflict with system users and groups, and other scripts from the SBo.
-
-Package created with this script will conflict with stock sendmail package, you
-*should* remove sendmail before installing postfix, otherwise sendmail updates
-could break your postfix instance.
-
-When upgrading from an older postfix version, make sure the variables such as
-html_directory and readme_directory in /etc/postfix/main.cf point to the new
-location. These can also be fixed later, afterwards make sure to run:
-
-  postfix set-permissions
-
-Furthermore, many of the utilities in postfix have multiple manpages such as
-postconf(5) and postconf(8). Use man -k to find them, and don't forget to
-subscribe to the postfix-users mailing list!
diff --git a/network/postfix/doinst.sh b/network/postfix/doinst.sh
deleted file mode 100644
index 97e6510432..0000000000
--- a/network/postfix/doinst.sh
+++ /dev/null
@@ -1,40 +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...
-}
-
-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
-}
-
-find etc/postfix -type f -name '*.new' \
-  | while read new ; do config $new ; done
-
-preserve_perms etc/rc.d/rc.postfix.new
-
-# This is an incompatability with the sendmail package
-( cd usr/lib; rm -f sendmail )
-( cd usr/lib; ln -s /usr/sbin/sendmail sendmail)
-
-# This will set the permissions on all postfix files correctly
-postfix set-permissions
-
-# Symlinks added by makepkg(8)
-
diff --git a/network/postfix/patches/postconf.diff b/network/postfix/patches/postconf.diff
deleted file mode 100644
index c51c1822fe..0000000000
--- a/network/postfix/patches/postconf.diff
+++ /dev/null
@@ -1,31 +0,0 @@
---- postfix-3.0.3/postfix-install.orig	2015-01-29 23:15:30.000000000 +0100
-+++ postfix-3.0.3/postfix-install	2015-10-17 03:57:42.269896095 +0200
-@@ -248,7 +248,7 @@
-     case "$junk" in
-     *MAIL_VERSION*) 
- 	case "$mail_version" in
--	"") mail_version="`bin/postconf -dhx mail_version`" || exit 1
-+	"") mail_version="`bin/postconf -c conf -dhx mail_version`" || exit 1
- 	esac
- 	val=`echo "$junk" | sed 's/MAIL_VERSION$/'"$mail_version/g"` || exit 1
- 	case "$val" in
-@@ -810,7 +810,7 @@
- # the wrong place when Postfix is being upgraded.
- 
- case "$mail_version" in
--"") mail_version="`bin/postconf -dhx mail_version`" || exit 1
-+"") mail_version="`bin/postconf -c conf -dhx mail_version`" || exit 1
- esac
- 
- # Undo MAIL_VERSION expansion at the end of a parameter value. If
---- postfix-3.0.3/Makefile.in.orig	2014-09-25 21:16:29.000000000 +0200
-+++ postfix-3.0.3/Makefile.in	2015-10-17 04:01:27.170920308 +0200
-@@ -20,7 +20,7 @@
- EXPAND	= sed -e "s;\$${LIB_PREFIX};$(LIB_PREFIX);" \
- 	    -e "s;\$${LIB_SUFFIX};$(LIB_SUFFIX);"
- SHLIB_DIR_OVERRIDE = \
--	$${shlib_directory:-`$(SHLIB_ENV) bin/postconf -dhx shlib_directory`}
-+	$${shlib_directory:-`$(SHLIB_ENV) bin/postconf -c conf -dhx shlib_directory`}
- 
- default: update
- 
diff --git a/network/postfix/postfix.SlackBuild b/network/postfix/postfix.SlackBuild
deleted file mode 100644
index 6bf3f38e2d..0000000000
--- a/network/postfix/postfix.SlackBuild
+++ /dev/null
@@ -1,199 +0,0 @@
-#!/bin/sh
-#
-# Copyright 2006, 2011  Alan Hicks, Lizella, GA
-# Copyright 2010, 2011, 2013, 2014, 2015, 2016, 2017, 2018, 2019  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=postfix
-VERSION=${VERSION:-3.3.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=""5
-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
-
-# Build with dovecot sasl support by default
-SASL=${SASL:-dovecot}
-case "$SASL" in
-     dovecot) SASLARGS="-DDEF_SERVER_SASL_TYPE=\\\"dovecot\\\""
-              SASLLIBS="" ;;
-       cyrus) SASLARGS="-I/usr/include/sasl -DUSE_CYRUS_SASL"
-              SASLLIBS="-L/usr/lib${LIBDIRSUFFIX}/sasl2 -lsasl2" ;;
-           *) SASLARGS=""
-              SASLLIBS="" ;;
-esac
-
-# Build without database support by default
-DATABASE=${DATABASE:-none}
-case "$DATABASE" in
-       mysql) DBARGS="-I/usr/include/mysql -DHAS_MYSQL"
-              DBLIBS="-L/usr/lib${LIBDIRSUFFIX}/mysql -lmysqlclient -lz -lm" ;;
-      pgsql*) PGVER=${DATABASE/pgsql-}
-              [ "$PGVER" = "pgsql" ] && PGVER=$(ls /usr/lib${LIBDIRSUFFIX}/postgresql/)
-              [ -d "/usr/lib${LIBDIRSUFFIX}/postgresql/$PGVER/lib" ] && {
-                DBARGS="-I/usr/include/postgresql -DHAS_PGSQL"
-                DBLIBS="-L/usr/lib${LIBDIRSUFFIX}/postgresql/$PGVER/lib -lpq -lz -lm"
-              } || echo "PostgreSQL not found" ;;
-           *) DBARGS=""
-              DBLIBS="" ;;
-esac
-
-# Build without ldap support by default
-LDAP=${LDAP:-no}
-case "$LDAP" in
-         yes) LDAPARGS="-DUSE_LDAP_SASL -DHAS_LDAP"
-              LDAPLIBS="-lldap -llber" ;;
-           *) LDAPARGS=""
-              LDAPLIBS="" ;;
-esac
-
-# MySQL compile hack
-if [ $DATABASE == "mysql" ] && [ -f /usr/include/mysql/events.h ]; then
-
-cat << EOF
-
-  Postfix will fail to compile with mysql support if a system-wide
-  events.h file is not removed (postfix has its own events.h).
-  Either disable mysql support or (re)move events.h, eg:
-
-  # mv /usr/include/mysql/events.h /usr/include/mysql/events.h.bak
-
-EOF
-
-  exit
-fi
-
-# Bail if user or group isn't valid on your system
-if ! grep ^postfix: /etc/passwd 2>&1 > /dev/null; then
-
-cat << EOF
-
-  You must have a postfix user to run this script
-
-  # groupadd -g 200 postfix
-  # useradd -u 200 -d /dev/null -s /bin/false -g postfix postfix
-
-EOF
-
-  exit
-elif ! grep ^postdrop: /etc/group 2>&1 > /dev/null; then
-
-cat << EOF
-
-  You must have a postdrop group to run this script
-
-  # groupadd -g 201 postdrop
-
-EOF
-
-  exit
-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 config files from build tree, not system ones
-# This should probably go to upstream...
-patch -p1 <$CWD/patches/postconf.diff
-
-# Postfix does not use a ./configure script
-
-make makefiles shared=yes \
-  CCARGS="-DUSE_SASL_AUTH -DUSE_TLS $SASLARGS $DBARGS $LDAPARGS" \
-  AUXLIBS="-lssl -lcrypto $SASLLIBS $DBLIBS $LDAPLIBS" \
-  OPT="$SLKCFLAGS" DEBUG=""
-
-make non-interactive-package \
-  install_root=$PKG \
-  tempdir=$TMP/$PRGNAM-temp \
-  config_directory=/etc/postfix \
-  daemon_directory=/usr/libexec/postfix \
-  command_directory=/usr/sbin \
-  queue_directory=/var/spool/postfix \
-  sendmail_path=/usr/sbin/sendmail \
-  newaliases_path=/usr/bin/newaliases \
-  mailq_path=/usr/bin/mailq \
-  mail_owner=postfix \
-  setgid_group=postdrop \
-  html_directory=/usr/doc/$PRGNAM-$VERSION/html \
-  manpage_directory=/usr/man \
-  readme_directory=/usr/doc/$PRGNAM-$VERSION/README_FILES
-
-install -D -m 0644 -oroot -groot $CWD/rc.postfix $PKG/etc/rc.d/rc.postfix.new
-find $PKG/etc/postfix -type f ! -name "*.default" ! -name "*.proto" ! -name "*.out" \
-  ! -name "postfix-files" -exec mv {} {}.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
-
-sed -i 's#\($manpage_directory/man[158]/.\+\.[158]\)\(:.*\)#\1.gz\2#' \
-  $PKG/etc/postfix/postfix-files
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AAAREADME COMPATIBILITY COPYRIGHT HISTORY IPv6-ChangeLog LICENSE PORTING \
-  RELEASE_NOTES TLS_ACKNOWLEDGEMENTS TLS_CHANGES TLS_LICENSE US_PATENT_6321267 \
-  examples implementation-notes $PKG/usr/doc/$PRGNAM-$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/network/postfix/postfix.info b/network/postfix/postfix.info
deleted file mode 100644
index 9809f40eb0..0000000000
--- a/network/postfix/postfix.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="postfix"
-VERSION="3.3.2"
-HOMEPAGE="http://www.postfix.org/"
-DOWNLOAD="http://cdn.postfix.johnriley.me/mirrors/postfix-release/official/postfix-3.3.2.tar.gz"
-MD5SUM="4e6ed7056576e0c54cfce6040a0bb0ad"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Mario Preksavec"
-EMAIL="mario at slackware dot hr"
diff --git a/network/postfix/rc.postfix b/network/postfix/rc.postfix
deleted file mode 100644
index 6e133ad9ec..0000000000
--- a/network/postfix/rc.postfix
+++ /dev/null
@@ -1,67 +0,0 @@
-#!/bin/bash
-# Copyright 2006, Alan Hicks, Lizella, GA
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
-#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
-#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
-
-postfix_start()
-{
-  /usr/sbin/postfix start
-}
-
-postfix_stop()
-{
-  /usr/sbin/postfix stop
-}
-
-postfix_restart()
-{
-  postfix_stop
-  postfix_start
-}
-
-postfix_reload()
-{
-  /usr/sbin/postfix reload
-}
-
-postfix_status()
-{
-  /usr/sbin/postfix status
-}
-
-case $1 in
-'start')
-  postfix_start
-  ;;
-'stop')
-  postfix_stop
-  ;;
-'restart')
-  postfix_restart
-  ;;
-'reload')
-  postfix_reload
-  ;;
-'status')
-  postfix_status
-  ;;
-*)
-  echo "usage $0 start|stop|restart|reload|status"
-esac
diff --git a/network/postfix/slack-desc b/network/postfix/slack-desc
deleted file mode 100644
index 0e8c796afc..0000000000
--- a/network/postfix/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------------------------------------------------------|
-postfix: postfix (alternative to the widely-used Sendmail program)
-postfix:
-postfix: Postfix attempts to be fast, easy to administer, and secure, while at
-postfix: the same time being sendmail compatible enough to not upset existing
-postfix: users. Thus, the outside has a sendmail-ish flavor, but the inside is
-postfix: completely different.
-postfix:
-postfix: Packaging script written by Alan Hicks <alan@lizella.net>
-postfix: and the SlackBuilds.org Team <http://www.slackbuilds.org>
-postfix:
-postfix:
diff --git a/network/postgrey/README b/network/postgrey/README
index 6a29bdc92f..036295e194 100644
--- a/network/postgrey/README
+++ b/network/postgrey/README
@@ -1,2 +1,2 @@
-Postgrey is a Postfix policy server implementing greylisting developed by
-David Schweikert.
+Postgrey is a Postfix policy server implementing greylisting developed
+by David Schweikert.
diff --git a/network/postgrey/doinst.sh b/network/postgrey/doinst.sh
index e935335cd0..5bf85c6667 100644
--- a/network/postgrey/doinst.sh
+++ b/network/postgrey/doinst.sh
@@ -21,5 +21,6 @@ preserve_perms() {
 
 config etc/postfix/postgrey_whitelist_clients.new
 config etc/postfix/postgrey_whitelist_recipients.new
+config etc/postgrey.conf.new
 preserve_perms etc/rc.d/rc.postgrey.new
 
diff --git a/network/postgrey/postgrey.SlackBuild b/network/postgrey/postgrey.SlackBuild
index 71fa28387f..4d03f715b2 100644
--- a/network/postgrey/postgrey.SlackBuild
+++ b/network/postgrey/postgrey.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for postgrey
 
@@ -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=postgrey
-VERSION=${VERSION:-1.34}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-1.37}
+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}
@@ -47,8 +57,8 @@ POSTGREYGRP=${POSTGREYGRP:-nogroup}
 POSTGREYUID=${POSTGREYUID:-98}
 POSTGREYGID=${POSTGREYGID:-99}
 
-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,10 +108,13 @@ cp -a policy-test postgrey contrib/postgreyreport $PKG/usr/bin
 mkdir -p $PKG/etc/rc.d
 sed -e s/%POSTGREYUSR%/$POSTGREYUSR/g \
     -e s/%POSTGREYGRP%/$POSTGREYGRP/g \
+    $CWD/postgrey.conf > $PKG/etc/postgrey.conf.new
+sed -e s/%POSTGREYUSR%/$POSTGREYUSR/g \
+    -e s/%POSTGREYGRP%/$POSTGREYGRP/g \
     $CWD/rc.postgrey > $PKG/etc/rc.d/rc.postgrey.new
 
-mkdir -p $PKG/var/{lib,run}/postgrey
-chown $POSTGREYUSR.$POSTGREYGRP $PKG/var/lib/postgrey $PKG/var/run/postgrey
+mkdir -p $PKG/var/lib/postgrey
+chown ${POSTGREYUSR}:${POSTGREYGRP} $PKG/var/lib/postgrey
 
 mkdir -p $PKG/etc/postfix
 cp -a postgrey_whitelist_clients $PKG/etc/postfix/postgrey_whitelist_clients.new
@@ -116,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/network/postgrey/postgrey.conf b/network/postgrey/postgrey.conf
new file mode 100644
index 0000000000..db34cb398c
--- /dev/null
+++ b/network/postgrey/postgrey.conf
@@ -0,0 +1,10 @@
+# /etc/postgrey.conf
+#
+# This file will be sourced from /etc/rc.d/rc.postgrey
+#
+PORT=10025
+PIDFILE=/var/run/postgrey/postgrey.pid
+USER=%POSTGREYUSR%
+GROUP=%POSTGREYGRP%
+HOST=mail.example.com
+
diff --git a/network/postgrey/postgrey.info b/network/postgrey/postgrey.info
index 802b44f23a..140612fab0 100644
--- a/network/postgrey/postgrey.info
+++ b/network/postgrey/postgrey.info
@@ -1,8 +1,8 @@
 PRGNAM="postgrey"
-VERSION="1.34"
+VERSION="1.37"
 HOMEPAGE="http://postgrey.schweikert.ch/"
-DOWNLOAD="http://postgrey.schweikert.ch/pub/old/postgrey-1.34.tar.gz"
-MD5SUM="f736a7be1094593f1a66cd13f32b39ef"
+DOWNLOAD="http://postgrey.schweikert.ch/pub/postgrey-1.37.tar.gz"
+MD5SUM="2ef30f42ad84f00caf41c49b593b8e2a"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="perl-Net-Server perl-IO-Multiplex perl-BerkeleyDB perl-net-dns"
diff --git a/network/postgrey/rc.postgrey b/network/postgrey/rc.postgrey
index d763884bfa..5c33151085 100644
--- a/network/postgrey/rc.postgrey
+++ b/network/postgrey/rc.postgrey
@@ -1,17 +1,15 @@
 #!/bin/bash
 
-PORT=10025
-PIDFILE=/var/run/postgrey/postgrey.pid
-USER=%POSTGREYUSR%
-GROUP=%POSTGREYGRP%
-HOST=mail.example.com
+. /etc/postgrey.conf || exit 1
 
 postgrey_start() {
   echo "Starting postgrey milter:  /usr/bin/postgrey -d --inet=$PORT --pidfile=$PIDFILE --user=$USER --group=$GROUP --dbdir=/var/lib/postgrey --hostname=$HOST"
-  mkdir -p /var/run/postgrey
+  mkdir -p $(dirname $PIDFILE)
+  chown ${USER}:${GROUP} $(dirname $PIDFILE)
+
   /usr/bin/postgrey -d \
                     --inet=$PORT \
-                    --pidfile=/var/run/postgrey/postgrey.pid \
+                    --pidfile=$PIDFILE \
                     --user=$USER --group=$GROUP \
                     --dbdir=/var/lib/postgrey \
                     --hostname=$HOST
diff --git a/network/pounce/README b/network/pounce/README
new file mode 100644
index 0000000000..5e62e85d38
--- /dev/null
+++ b/network/pounce/README
@@ -0,0 +1,19 @@
+pounce(1) is a multi-client, TLS-only IRC bouncer. It maintains a
+persistent connection to an IRC server, acting as a proxy and buffer for
+a number of clients.  When a client connects, any messages received
+since it last disconnected will be relayed to it. Unlike some other
+bouncers, pounce uses a single buffer for all IRC messages, which acts
+as a queue from which each client reads messages independently.
+
+pounce speaks regular modern IRC to both servers and clients, using the
+server-time extension to indicate when messages originally occurred.
+Clients identify themselves to pounce by their IRC usernames. See
+QUIRKS(7) for notes on connecting pounce with particular networks and
+clients.
+
+Also included are pounce-notify(1) and pounce-palaver(1)
+
+DEPENDENCIES
+
+pounce requires either libtls or libressl.  libtls is the smaller,
+faster build of the two.
diff --git a/network/pounce/pounce.SlackBuild b/network/pounce/pounce.SlackBuild
new file mode 100644
index 0000000000..0da6dc5a65
--- /dev/null
+++ b/network/pounce/pounce.SlackBuild
@@ -0,0 +1,92 @@
+#!/bin/bash
+
+# slackbuild script for pounce
+# By D Woodfall <dave@slackbuilds.org>
+# Licensed under the WTFPL (http://www.wtfpl.net)
+#
+# 2023-05-10 11:38:55 +0100 Added rpath. DW.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=pounce
+VERSION=${VERSION:-3.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 . -perm /111 -a \! -perm 755 -a -exec chmod 755 {} + \
+ -o \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} +
+
+# NOTE in case libressl is installed instead of libtls
+export PKG_CONFIG_PATH=/usr/lib${LIBDIRSUFFIX}/libressl/pkgconfig:$PKG_CONFIG_PATH
+export CFLAGS="$SLKCFLAGS -L/usr/lib${LIBDIRSUFFIX}/libressl"
+export LDFLAGS="-Wl,-rpath=/usr/lib${LIBDIRSUFFIX}/libressl"
+
+./configure \
+  --prefix=/usr \
+  --mandir=/usr/man \
+  --enable-notify \
+  --enable-palaver
+
+make all
+make install DESTDIR=$PKG
+
+rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la
+
+strip --strip-unneeded $PKG/usr/bin/$PRGNAM
+
+gzip -9 $PKG/usr/man/man1/*.1
+gzip -9 -c pounce-palaver.1 > $PKG/usr/man/man1/pounce-palaver.1.gz
+gzip -9 -c pounce-notify.1 > $PKG/usr/man/man1/pounce-notify.1.gz
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+  LICENSE README.7 QUIRKS.7 \
+  $PKG/usr/doc/$PRGNAM-$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/network/pounce/pounce.info b/network/pounce/pounce.info
new file mode 100644
index 0000000000..e31f88a0d5
--- /dev/null
+++ b/network/pounce/pounce.info
@@ -0,0 +1,10 @@
+PRGNAM="pounce"
+VERSION="3.1"
+HOMEPAGE="https://git.causal.agency/pounce/about/"
+DOWNLOAD="https://git.causal.agency/pounce/snapshot/pounce-3.1.tar.gz"
+MD5SUM="db31cc00c084bb803f21615f6ac899c8"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="libtls"
+MAINTAINER="D Woodfall"
+EMAIL="dave@slackbuilds.org"
diff --git a/network/pounce/slack-desc b/network/pounce/slack-desc
new file mode 100644
index 0000000000..f869d4ff6c
--- /dev/null
+++ b/network/pounce/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+      |-----handy-ruler------------------------------------------------------|
+pounce: pounce (multi-client, TLS-only IRC bouncer)
+pounce:
+pounce: pounce(1) is a multi-client, TLS-only IRC bouncer. It maintains a
+pounce: persistent connection to an IRC server, acting as a proxy and
+pounce: buffer for a number of clients.
+pounce:
+pounce: https://git.causal.agency/pounce/about/
+pounce:
+pounce:
+pounce:
+pounce:
diff --git a/network/pound/README b/network/pound/README
deleted file mode 100644
index 36580138df..0000000000
--- a/network/pound/README
+++ /dev/null
@@ -1,10 +0,0 @@
-The Pound program is a reverse proxy, load balancer and HTTPS front-
-end for Web server(s). Pound was developed to enable distributing the
-the load among several Web-servers supporting FTP, gopher, and HTTP
-data objects, and to allow for a convenient SSL wrapper for those web
-servers that do not offer it natively.  Pound is distributed under 
-the GPL license.
-
-Be sure to see the README.SLACKWARE file in this directory before
-using pound (it's also installed into the standard documentation
-directory by the build script).
diff --git a/network/pound/README.SLACKWARE b/network/pound/README.SLACKWARE
deleted file mode 100644
index cd4a32f04b..0000000000
--- a/network/pound/README.SLACKWARE
+++ /dev/null
@@ -1,12 +0,0 @@
-README.SLACKWARE
-
-Adding something like this to your /etc/syslog.conf file, and then 
-restarting syslogd should enable pound logging to its own files.
-
-# Redirect pound logs 
-local6.=info		                         -/var/log/pound/access.log 
-local6.notice					 -/var/log/pound/error.log 
-
-You might want to add "local6.none" to the excludes as well, but that's
-your call.
-
diff --git a/network/pound/doinst.sh b/network/pound/doinst.sh
deleted file mode 100644
index cd17973e1e..0000000000
--- a/network/pound/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...
-}
-
-# Keep same permissions on rc.pound.new:
-if [ -e etc/rc.d/rc.pound ]; then
-  cp -a etc/rc.d/rc.pound etc/rc.d/rc.pound.new.incoming
-  cat etc/rc.d/rc.pound.new > etc/rc.d/rc.pound.new.incoming
-  mv etc/rc.d/rc.pound.new.incoming etc/rc.d/rc.pound.new
-else
-  # Install executable otherwise - irrelevant unless user starts in rc.local
-  chmod 0755 etc/rc.d/rc.pound.new
-fi
-
-config etc/logrotate.d/pound.new
-config etc/pound/pound.cfg.new
-config etc/rc.d/rc.pound.new
-
diff --git a/network/pound/pound.SlackBuild b/network/pound/pound.SlackBuild
deleted file mode 100644
index ba94da6935..0000000000
--- a/network/pound/pound.SlackBuild
+++ /dev/null
@@ -1,122 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for Pound
-
-# Copyright 2008  Thales A. Tsailas (ttsailas@enforcingit.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=pound
-VERSION=${VERSION:-2.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}
-
-POUNDUSER=${POUNDUSER:-nobody}
-POUNDGROUP=${POUNDGROUP:-nobody}
-
-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/Pound-$VERSION.tgz
-mv Pound-$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 {} \;
-
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
-  --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --sysconfdir=/etc/pound \
-  --localstatedir=/var \
-  --mandir=/usr/man \
-  --docdir=/usr/doc/$PRGNAM-$VERSION \
-  --build=$ARCH-slackware-linux
-
-make all
-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
-
-# Fix up some ownership and permissions
-chown -R root:root $PKG
-find $PKG/usr/sbin -type f -exec chmod 0755 {} \;
-
-( 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 README GPL.txt FAQ CHANGELOG $CWD/README.SLACKWARE \
-    $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-chown root:root $PKG/usr/doc/$PRGNAM-$VERSION/*
-
-mkdir -p $PKG/var/log/pound
-touch $PKG/var/log/pound/{access,error}.log
-chown -R $POUNDUSER:$POUNDGROUP $PKG/var/log/pound
-
-mkdir -p $PKG/etc/{logrotate.d,pound,rc.d}
-cat $CWD/pound.logrotate > $PKG/etc/logrotate.d/pound.new
-cat $CWD/pound.cfg.new > $PKG/etc/pound/pound.cfg.new
-cat $CWD/rc.pound.new > $PKG/etc/rc.d/rc.pound.new
-
-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/network/pound/pound.cfg.new b/network/pound/pound.cfg.new
deleted file mode 100644
index de171740fa..0000000000
--- a/network/pound/pound.cfg.new
+++ /dev/null
@@ -1,60 +0,0 @@
-User        "nobody"
-Group       "nobody"
-#RootJail    "/var/pound/jail"
-#Alive       60
-
-## Main listening ports
-#ListenHTTP
-#    Address 1.2.3.4
-#    Port    80
-#    Client  10
-#End
-#ListenHTTPS
-#    Address 1.2.3.4
-#    Port    443
-#    Cert    "/etc/pound/pound.pem"
-#    Client  20
-#End
-
-## Image server
-#Service
-#    URL ".*.(jpg|gif)"
-#    BackEnd
-#        Address 192.168.0.10
-#        Port    80
-#    End
-#End
-## Virtual host www.myserver.com
-#Service
-#    URL         ".*sessid=.*"
-#    HeadRequire "Host:.*www.myserver.com.*"
-#    BackEnd
-#        Address 192.168.0.11
-#        Port    80
-#    End
-#    Session
-#        Type    URL
-#        ID      "sessid"
-#        TTL     120
-#    End
-#End
-
-## Everybody else
-#Service
-#    BackEnd
-#        Address 192.168.0.20
-#        Port    80
-#        Priority 5
-#    End
-#    BackEnd
-#        Address 192.168.0.21
-#        Port    80
-#        Priority 4
-#    End
-#    Session
-#        Type    COOKIE
-#        ID      "userid"
-#        TTL     180
-#    End
-#End
-
diff --git a/network/pound/pound.info b/network/pound/pound.info
deleted file mode 100644
index e98227acde..0000000000
--- a/network/pound/pound.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="pound"
-VERSION="2.6"
-HOMEPAGE="http://www.apsis.ch/pound/"
-DOWNLOAD="http://www.apsis.ch/pound/Pound-2.6.tgz"
-MD5SUM="8c913b527332694943c4c67c8f152071"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Thales A. Tsailas"
-EMAIL="ttsailas@enforcingit.com"
diff --git a/network/pound/pound.logrotate b/network/pound/pound.logrotate
deleted file mode 100644
index 17f3cf3306..0000000000
--- a/network/pound/pound.logrotate
+++ /dev/null
@@ -1,23 +0,0 @@
-
-/var/pound/access.log {
-    weekly
-    rotate 4
-    compress
-    notifempty
-    postrotate
-        /bin/kill -HUP $(cat /var/run/syslogd.pid 2> /dev/null) 2> /dev/null || true
-    endscript
-}
-
-/var/pound/error.log {
-    weekly
-    rotate 4
-    compress
-    notifempty
-    missingok
-    postrotate
-        /bin/kill -HUP $(cat /var/run/syslogd.pid 2> /dev/null) 2> /dev/null || true
-    endscript
-}
-
-
diff --git a/network/pound/rc.pound.new b/network/pound/rc.pound.new
deleted file mode 100644
index 82809221bb..0000000000
--- a/network/pound/rc.pound.new
+++ /dev/null
@@ -1,103 +0,0 @@
-#!/bin/sh
-#
-# V 1.1 by Thales A. Tsailas (Modified the fedora Startup Scripts to Slackware Needs)
-# description: Pound is a reverse proxy, load balancer and HTTPS front-end
-# processname: pound
-# config: /etc/pound/pound.cfg
-# pidfile: /var/run/pound_pid.nnn
-
-if [ -f /var/run/pound.pid ]; then
-  pid=`cat /var/run/pound.pid`
-else
-  pid=-1;
-fi
-
-. /etc/init.d/functions
-
-# This is our service name
-BASENAME=pound
-if [ -L $0 ]; then
-  BASENAME=`find $0 -name $BASENAME -printf %l`
-  BASENAME=`basename $BASENAME`
-fi
-
-[ -f /etc/pound/pound.cfg ] || exit 1
-
-ROOTJAIL=$(grep -si "^RootJail" /etc/${BASENAME}/${BASENAME}.cfg | cut -d " " -f 2)
-[ "$ROOTJAIL" = "/" ] && ROOTJAIL=""
-
-RETVAL=0
-
-start() {
-  echo -n $"Starting $BASENAME: "
-  if [ -n "$ROOTJAIL" ]; then
-    [ -d $ROOTJAIL/dev ] || mkdir -p $ROOTJAIL/dev
-    mount --bind /dev $ROOTJAIL/dev
-  fi
-  /usr/sbin/$BASENAME
-  RETVAL=$?
-  echo
-  [ $RETVAL -eq 0 ] 
-  return $RETVAL
-}
-
-stop() {
-  echo -n $"Shutting down $BASENAME: "
-  (cat /var/run/pound*pid* | \
-    while read pid; do kill $pid; done) 2> /dev/null
-    rm -f /var/run/pound*pid*
-    if [ -n "$ROOTJAIL" ]; then
-      mount | awk '{ if ($6 ~ /bind/ ) print $3}' | grep "^$ROOTJAIL/dev" | while read i; do
-        umount $ROOTJAIL/dev 2> /dev/null
-      done
-    fi
-  usleep 100000
-  ! pidof -s $BASENAME > /dev/null
-  RETVAL=$?
-  [ $RETVAL -eq 0 ] && success
-  [ $RETVAL -ne 0 ] && failure
-  echo
-  [ $RETVAL -eq 0 ] && rm -f /var/run/pound_pid.*
-  return $RETVAL
-}
-
-restart() {
-  stop
-  start
-}
-
-
-condrestart() {
-  [ -e /var/lock/subsys/$BASENAME ] && restart || :
-}
-
-# See how we were called.
-case "$1" in
-  start)
-    start
-    ;;
-  stop)
-    stop
-    ;;
-  restart)
-    restart
-    ;;
-  reload)
-    restart
-    ;;
-  condrestart)
-    condrestart
-    ;;
-  status)
-    if [ -f /var/run/pound.pid ]; then
-           echo -en "pound is running with pid : $pid \n";
-    else
-           echo -en "pound is not running\n";
-    fi
-    ;;
-  *)
-    echo $"Usage: $BASENAME {start|stop|restart|reload|condrestart|status}"
-    RETVAL=1
-
-esac
-exit $RETVAL
diff --git a/network/pound/slack-desc b/network/pound/slack-desc
deleted file mode 100644
index d713b85fdf..0000000000
--- a/network/pound/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------------------------------------------------------|
-pound: pound (reverse proxy and load balancer for http servers)
-pound:
-pound: The Pound program is a reverse proxy, load balancer and HTTPS front-
-pound: end for Web server(s). Pound was developed to enable distributing the
-pound: the load among several Web-servers supporting FTP, gopher, and HTTP
-pound: data objects, and to allow for a convenient SSL wrapper for those web
-pound: servers that do not offer it natively.  Pound is distributed under
-pound: the GPL license.
-pound:
-pound: Homepage: http://www.apsis.ch/pound/
-pound:
diff --git a/network/pptp/pptp.SlackBuild b/network/pptp/pptp.SlackBuild
index 0ea1de4b74..6627a0b410 100644
--- a/network/pptp/pptp.SlackBuild
+++ b/network/pptp/pptp.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for pptp
 
@@ -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=pptp
-VERSION=${VERSION:-1.8.0}
+VERSION=${VERSION:-1.10.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"
@@ -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/network/pptp/pptp.info b/network/pptp/pptp.info
index ce3efc5d79..c676283935 100644
--- a/network/pptp/pptp.info
+++ b/network/pptp/pptp.info
@@ -1,10 +1,10 @@
 PRGNAM="pptp"
-VERSION="1.8.0"
+VERSION="1.10.0"
 HOMEPAGE="http://pptpclient.sourceforge.net/"
-DOWNLOAD="http://downloads.sourceforge.net/pptpclient/pptp-1.8.0.tar.gz"
-MD5SUM="4efce9f263e2c3f38d79d9df222476de"
+DOWNLOAD="http://downloads.sourceforge.net/pptpclient/pptp-1.10.0.tar.gz"
+MD5SUM="8d25341352fdae5ad5b36b9f18254908"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="AbortRetryFail"
-EMAIL="abortretryfail@gmail.com"
+MAINTAINER="Mario Preksavec"
+EMAIL="mario at slackware dot hr"
diff --git a/network/pptpd/README b/network/pptpd/README
index b22265f73b..97a3fa0e16 100644
--- a/network/pptpd/README
+++ b/network/pptpd/README
@@ -1,2 +1,3 @@
-pptpd (PoPToP) is a Point to Point Tunneling Server that provides a Virtual 
-Private Networking (VPN) server which is compatible with Microsoft VPN clients.
+pptpd (PoPToP) is a Point to Point Tunneling Server that provides
+a Virtual Private Networking (VPN) server which is compatible with
+Microsoft VPN clients.
diff --git a/network/pptpd/patches/fix_plugins_patchlevel_h.diff b/network/pptpd/patches/fix_plugins_patchlevel_h.diff
index 9dc2edcaaf..c9d240045e 100644
--- a/network/pptpd/patches/fix_plugins_patchlevel_h.diff
+++ b/network/pptpd/patches/fix_plugins_patchlevel_h.diff
@@ -7,5 +7,5 @@ diff -Nur pptpd-1.4.0.orig/plugins/patchlevel.h pptpd-1.4.0/plugins/patchlevel.h
  
 -#define VERSION		"2.4.3"
 -#define DATE		"13 Jan 2004"
-+#define VERSION		"2.4.7"
-+#define DATE		"9 Nov 2014"
++#define VERSION		"2.4.9"
++#define DATE		"4 Jan 2021"
diff --git a/network/pptpd/pptpd.SlackBuild b/network/pptpd/pptpd.SlackBuild
index 9b1bc16774..c6def71ece 100644
--- a/network/pptpd/pptpd.SlackBuild
+++ b/network/pptpd/pptpd.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for pptpd
 
-# Copyright 2007-2016  Robby Workman, Tuscaloosa, Alabama, USA
+# Copyright 2007-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=pptpd
 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=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"
@@ -115,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/network/prettyping/README b/network/prettyping/README
new file mode 100644
index 0000000000..c16bdf65fc
--- /dev/null
+++ b/network/prettyping/README
@@ -0,0 +1,7 @@
+Prettyping is a wrapper around the standard ping tool with the
+objective of making the output prettier, more colorful, more compact,
+and easier to read.
+
+Prettyping runs the standard ping in the background and parses its
+output, showing the ping responses in a graphical way at the terminal
+(by using colors and Unicode characters).
diff --git a/network/prettyping/prettyping.SlackBuild b/network/prettyping/prettyping.SlackBuild
new file mode 100644
index 0000000000..9ff09f4896
--- /dev/null
+++ b/network/prettyping/prettyping.SlackBuild
@@ -0,0 +1,73 @@
+#!/bin/bash
+
+# Slackware build script for prettyping
+
+# Copyright 2021 Thibaut Notteboom, 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.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=prettyping
+VERSION=${VERSION:-1.0.1}
+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
+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 -Dm755 prettyping $PKG/usr/bin/prettyping
+
+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/network/prettyping/prettyping.info b/network/prettyping/prettyping.info
new file mode 100644
index 0000000000..7aeaf8c18e
--- /dev/null
+++ b/network/prettyping/prettyping.info
@@ -0,0 +1,10 @@
+PRGNAM="prettyping"
+VERSION="1.0.1"
+HOMEPAGE="https://github.com/denilsonsa/prettyping"
+DOWNLOAD="https://github.com/denilsonsa/prettyping/archive/v1.0.1/prettyping-1.0.1.tar.gz"
+MD5SUM="264a496f40b13d81cb0dbb000b06a288"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Thibaut Notteboom"
+EMAIL="thibaut.notteboom@gmail.com"
diff --git a/network/prettyping/slack-desc b/network/prettyping/slack-desc
new file mode 100644
index 0000000000..9d09221979
--- /dev/null
+++ b/network/prettyping/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+          |-----handy-ruler------------------------------------------------------|
+prettyping: prettyping (Ping wrapper for pretty output)
+prettyping:
+prettyping: Prettyping is a wrapper around the standard ping tool with the
+prettyping: objective of making the output prettier, more colorful, more compact,
+prettyping: and easier to read.
+prettyping:
+prettyping: Prettyping runs the standard ping in the background and parses its
+prettyping: output, showing the ping responses in a graphical way at the terminal
+prettyping: (by using colors and Unicode characters).
+prettyping:
+prettyping:
diff --git a/network/privoxy/privoxy.SlackBuild b/network/privoxy/privoxy.SlackBuild
index 576e2a5184..8ebfd726b4 100644
--- a/network/privoxy/privoxy.SlackBuild
+++ b/network/privoxy/privoxy.SlackBuild
@@ -1,9 +1,9 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for privoxy
 
 # Copyright (c) 2007  alkos333 <me@alkos333.net>
-# Copyright 2014-2019 Kyle Guinn <elyk03@gmail.com>
+# Copyright 2014-2023 Kyle Guinn <elyk03@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=privoxy
-VERSION=${VERSION:-3.0.28}
+VERSION=${VERSION:-3.0.34}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$(uname -m)" in
@@ -36,15 +39,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-$VERSION
+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
@@ -89,17 +93,14 @@ chmod -R u+w,go-w,a+rX-st .
 # Put the docs where we tell them to go.
 sed -i "/^DOC_DEST/s/= .*/= @docdir@/" GNUmakefile.in
 
-# The Makefile checks if certain config files exist, and if so, adds a
-# .new suffix.  Turn this behavior off.  We will do it below.
-sed -i "s/\[ -s \"\$(CONF_DEST)\/\$\$i\" \]/false/" GNUmakefile.in
-
 # rc.privoxy generation doesn't work well with $(DESTDIR).  Help it along.
 sed -i "s/ \/etc\/rc.d\// \$(DESTDIR)\/etc\/rc.d\//g" GNUmakefile.in
 mkdir -p $PKG/etc/rc.d
 
-autoheader
-autoconf
-CFLAGS="$SLKCFLAGS" \
+# Let AC_CHECK_LIB do the brotli autodetection, don't link to it if missing.
+sed -i "/-lbrotlidec/d" configure.in
+
+autoreconf -vif
 ./configure \
   --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
@@ -112,9 +113,14 @@ CFLAGS="$SLKCFLAGS" \
   --with-docbook=no \
   --with-user=$PRIVOXY_USER \
   --with-group=$PRIVOXY_GROUP \
+  --with-openssl \
+  --with-brotli \
   --enable-no-gifs \
   --enable-compression \
-  --enable-large-file-support
+  --enable-large-file-support \
+  --enable-extended-statistics \
+  --enable-pcre-host-patterns \
+  CFLAGS="$SLKCFLAGS" \
 
 make
 make install-strip DESTDIR=$PKG
@@ -144,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/network/privoxy/privoxy.info b/network/privoxy/privoxy.info
index 07259d8c44..846feeeb0b 100644
--- a/network/privoxy/privoxy.info
+++ b/network/privoxy/privoxy.info
@@ -1,8 +1,8 @@
 PRGNAM="privoxy"
-VERSION="3.0.28"
+VERSION="3.0.34"
 HOMEPAGE="https://www.privoxy.org/"
-DOWNLOAD="https://sourceforge.net/projects/ijbswa/files/Sources/3.0.28%20%28stable%29/privoxy-3.0.28-stable-src.tar.gz"
-MD5SUM="c7e8900d5aff33d9a5fc37ac28154f21"
+DOWNLOAD="https://sourceforge.net/projects/ijbswa/files/Sources/3.0.34%20%28stable%29/privoxy-3.0.34-stable-src.tar.gz"
+MD5SUM="08fba0352666820c8ffbe8a25e76c2c0"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/network/profanity/README b/network/profanity/README
index 706f979469..025a283eb3 100644
--- a/network/profanity/README
+++ b/network/profanity/README
@@ -3,3 +3,5 @@ and libstrophe, inspired by Irssi.
 
 libotr (https://otr.cypherpunks.ca/) is an optional dependency for
 verifiable end-to-end encryption.
+
+libsignal-protocol-c is an optional dependency for OMEMO support.
diff --git a/network/profanity/profanity.SlackBuild b/network/profanity/profanity.SlackBuild
index 708a1879f8..9e458a875a 100644
--- a/network/profanity/profanity.SlackBuild
+++ b/network/profanity/profanity.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for profanity
 
@@ -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=profanity
-VERSION=${VERSION:-0.5.1}
+VERSION=${VERSION:-0.14.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 {} \;
 
-CFLAGS="$SLKCFLAGS" \
+CFLAGS="$SLKCFLAGS -fcommon" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
@@ -93,8 +103,10 @@ mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a LICENSE.txt 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/network/profanity/profanity.info b/network/profanity/profanity.info
index 5d8479bb2e..129fd03a60 100644
--- a/network/profanity/profanity.info
+++ b/network/profanity/profanity.info
@@ -1,8 +1,8 @@
 PRGNAM="profanity"
-VERSION="0.5.1"
+VERSION="0.14.0"
 HOMEPAGE="http://www.profanity.im/"
-DOWNLOAD="http://www.profanity.im/profanity-0.5.1.tar.gz"
-MD5SUM="1a955de0bd55c111c46838a215866bb8"
+DOWNLOAD="https://github.com/profanity-im/profanity/releases/download/0.14.0/profanity-0.14.0.tar.gz"
+MD5SUM="ecadfd67f43d96841b68781a7254552a"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="libstrophe"
diff --git a/network/prosody-mod-block-strangers/prosody-mod-block-strangers.SlackBuild b/network/prosody-mod-block-strangers/prosody-mod-block-strangers.SlackBuild
index 88e836d01f..1280f38b36 100644
--- a/network/prosody-mod-block-strangers/prosody-mod-block-strangers.SlackBuild
+++ b/network/prosody-mod-block-strangers/prosody-mod-block-strangers.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for prosody-mod-block-strangers
 
@@ -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=prosody-mod-block-strangers
 VERSION=${VERSION:-hg3023}
 REVISION=${REVISION:-38365c1f1fe4}
 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}
@@ -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/network/prosody-mod-block-strangers/prosody-mod-block-strangers.info b/network/prosody-mod-block-strangers/prosody-mod-block-strangers.info
index 1c38926b39..47984f06ce 100644
--- a/network/prosody-mod-block-strangers/prosody-mod-block-strangers.info
+++ b/network/prosody-mod-block-strangers/prosody-mod-block-strangers.info
@@ -2,9 +2,9 @@ PRGNAM="prosody-mod-block-strangers"
 VERSION="hg3023"
 HOMEPAGE="https://modules.prosody.im/mod_block_strangers.html"
 DOWNLOAD="https://hg.prosody.im/prosody-modules/archive/38365c1f1fe4.tar.gz"
-MD5SUM="d2932e966d188bd9b884b501104ad7dc"
+MD5SUM="37a1e61479b0f625cd10ed1046dde1a1"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="prosody"
-MAINTAINER="Alexander Verbovetsky"
-EMAIL="alik@ejik.org"
+MAINTAINER="Andrew Clemons"
+EMAIL="andrew.clemons@gmail.com"
diff --git a/network/prosody-mod-cloud-notify/prosody-mod-cloud-notify.SlackBuild b/network/prosody-mod-cloud-notify/prosody-mod-cloud-notify.SlackBuild
index af6b8e33f2..64c9edf271 100644
--- a/network/prosody-mod-cloud-notify/prosody-mod-cloud-notify.SlackBuild
+++ b/network/prosody-mod-cloud-notify/prosody-mod-cloud-notify.SlackBuild
@@ -1,8 +1,9 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for prosody-mod-cloud-notify
 
-# Copyright 2016-2018 Andrew Clemons, Wellington, New Zealand
+# Copyright 2016-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
@@ -22,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=prosody-mod-cloud-notify
 MDLNAM=$(echo $PRGNAM | sed 's/prosody-//' | tr '-' '_')
-VERSION=${VERSION:-hg3627}
-REVISION=${REVISION:-9639c493f4b9}
+VERSION=${VERSION:-hg5216}
+REVISION=${REVISION:-1d9dbe84b6e8}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -37,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}
@@ -80,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/network/prosody-mod-cloud-notify/prosody-mod-cloud-notify.info b/network/prosody-mod-cloud-notify/prosody-mod-cloud-notify.info
index fbe1d74933..2942b3b99b 100644
--- a/network/prosody-mod-cloud-notify/prosody-mod-cloud-notify.info
+++ b/network/prosody-mod-cloud-notify/prosody-mod-cloud-notify.info
@@ -1,8 +1,8 @@
 PRGNAM="prosody-mod-cloud-notify"
-VERSION="hg3627"
+VERSION="hg5216"
 HOMEPAGE="https://modules.prosody.im/mod_cloud_notify.html"
-DOWNLOAD="https://hg.prosody.im/prosody-modules/archive/9639c493f4b9.tar.gz"
-MD5SUM="c52d0735637830b5621c60f448e4f7db"
+DOWNLOAD="https://hg.prosody.im/prosody-modules/archive/1d9dbe84b6e8.tar.gz"
+MD5SUM="1e71af1e02d2d94d42a41a204ad692cb"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="prosody"
diff --git a/network/prosody-mod-csi/README b/network/prosody-mod-csi/README
deleted file mode 100644
index de0f96f4bc..0000000000
--- a/network/prosody-mod-csi/README
+++ /dev/null
@@ -1,5 +0,0 @@
-prosody-mod-csi (XEP-0352: Client State Indication)
-
-This module implements Client State Indication, a way for mobile
-clients to tell the server that they are sitting in someone's pocket
-and would rather not get some less urgent things pushed to it.
diff --git a/network/prosody-mod-csi/prosody-mod-csi.SlackBuild b/network/prosody-mod-csi/prosody-mod-csi.SlackBuild
deleted file mode 100644
index 56255c2e4d..0000000000
--- a/network/prosody-mod-csi/prosody-mod-csi.SlackBuild
+++ /dev/null
@@ -1,83 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for prosody-mod-csi
-
-# Copyright 2016-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=prosody-mod-csi
-MDLNAM=$(echo $PRGNAM | sed 's/prosody-//' | tr '-' '_')
-VERSION=${VERSION:-hg3396}
-REVISION=${REVISION:-3bf847dbb063}
-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
-  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 Community-Modules-$REVISION
-tar xvf $CWD/Community-Modules-$REVISION.tar.gz || tar xvf $CWD/$REVISION.tar.gz
-cd Community-Modules-$REVISION
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -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/prosody/modules/
-cp -a $MDLNAM $PKG/usr/lib$LIBDIRSUFFIX/prosody/modules/
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-mv \
-  $PKG/usr/lib$LIBDIRSUFFIX/prosody/modules/$MDLNAM/README.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:-tgz}
diff --git a/network/prosody-mod-csi/prosody-mod-csi.info b/network/prosody-mod-csi/prosody-mod-csi.info
deleted file mode 100644
index 1023cbbef6..0000000000
--- a/network/prosody-mod-csi/prosody-mod-csi.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="prosody-mod-csi"
-VERSION="hg3396"
-HOMEPAGE="https://modules.prosody.im/mod_csi.html"
-DOWNLOAD="https://hg.prosody.im/prosody-modules/archive/3bf847dbb063.tar.gz"
-MD5SUM="05cc757451254dc5fa27abd04dd8c15c"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="prosody"
-MAINTAINER="Andrew Clemons"
-EMAIL="andrew.clemons@gmail.com"
diff --git a/network/prosody-mod-csi/slack-desc b/network/prosody-mod-csi/slack-desc
deleted file mode 100644
index d9779e78af..0000000000
--- a/network/prosody-mod-csi/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------------------------------------------------------|
-prosody-mod-csi: prosody-mod-csi (XEP-0352: Client State Indication)
-prosody-mod-csi:
-prosody-mod-csi: This module implements Client State Indication, a way for mobile
-prosody-mod-csi: clients to tell the server that they are sitting in someones pocket
-prosody-mod-csi: and would rather not get some less urgent things pushed to it.
-prosody-mod-csi:
-prosody-mod-csi:
-prosody-mod-csi:
-prosody-mod-csi:
-prosody-mod-csi: https://modules.prosody.im/mod_csi.html
-prosody-mod-csi:
diff --git a/network/prosody-mod-filter-chatstates/prosody-mod-filter-chatstates.SlackBuild b/network/prosody-mod-filter-chatstates/prosody-mod-filter-chatstates.SlackBuild
index 54f3925743..9ad34f4e10 100644
--- a/network/prosody-mod-filter-chatstates/prosody-mod-filter-chatstates.SlackBuild
+++ b/network/prosody-mod-filter-chatstates/prosody-mod-filter-chatstates.SlackBuild
@@ -1,8 +1,9 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for prosody-mod-filter-chatstates
 
 # Copyright 2016-2018 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,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=prosody-mod-filter-chatstates
 MDLNAM=$(echo $PRGNAM | sed 's/prosody-//' | tr '-' '_')
 VERSION=${VERSION:-hg1873}
 REVISION=${REVISION:-9283a6bcf512}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -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}
@@ -80,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/network/prosody-mod-filter-chatstates/prosody-mod-filter-chatstates.info b/network/prosody-mod-filter-chatstates/prosody-mod-filter-chatstates.info
index 829ca9ef32..16f40c07b3 100644
--- a/network/prosody-mod-filter-chatstates/prosody-mod-filter-chatstates.info
+++ b/network/prosody-mod-filter-chatstates/prosody-mod-filter-chatstates.info
@@ -2,9 +2,9 @@ PRGNAM="prosody-mod-filter-chatstates"
 VERSION="hg1873"
 HOMEPAGE="https://modules.prosody.im/mod_filter_chatstates.html"
 DOWNLOAD="https://hg.prosody.im/prosody-modules/archive/9283a6bcf512.tar.gz"
-MD5SUM="4cc5c574c1c3db6f2ec6b0ae626c69c9"
+MD5SUM="e178bd314060037ddd44dd1b7dcc7330"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="prosody-mod-csi"
+REQUIRES="prosody"
 MAINTAINER="Andrew Clemons"
 EMAIL="andrew.clemons@gmail.com"
diff --git a/network/prosody-mod-http-upload/prosody-mod-http-upload.SlackBuild b/network/prosody-mod-http-upload/prosody-mod-http-upload.SlackBuild
index 772f4502ab..d2b6f5496d 100644
--- a/network/prosody-mod-http-upload/prosody-mod-http-upload.SlackBuild
+++ b/network/prosody-mod-http-upload/prosody-mod-http-upload.SlackBuild
@@ -1,8 +1,9 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for prosody-mod-http-upload
 
-# Copyright 2016-2018 Andrew Clemons, Wellington, New Zealand
+# Copyright 2016-2021 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,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=prosody-mod-http-upload
 MDLNAM=$(echo $PRGNAM | sed 's/prosody-//' | tr '-' '_')
-VERSION=${VERSION:-hg3625}
-REVISION=${REVISION:-a578b4977bb0}
+VERSION=${VERSION:-hg4976}
+REVISION=${REVISION:-75b6e5df65f9}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -37,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}
@@ -80,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/network/prosody-mod-http-upload/prosody-mod-http-upload.info b/network/prosody-mod-http-upload/prosody-mod-http-upload.info
index 09ea3db81a..30def8352a 100644
--- a/network/prosody-mod-http-upload/prosody-mod-http-upload.info
+++ b/network/prosody-mod-http-upload/prosody-mod-http-upload.info
@@ -1,8 +1,8 @@
 PRGNAM="prosody-mod-http-upload"
-VERSION="hg3625"
+VERSION="hg4976"
 HOMEPAGE="https://modules.prosody.im/mod_http_upload.html"
-DOWNLOAD="https://hg.prosody.im/prosody-modules/archive/a578b4977bb0.tar.gz"
-MD5SUM="b13a288c4e9c4904a21a02d0366bbe9c"
+DOWNLOAD="https://hg.prosody.im/prosody-modules/archive/75b6e5df65f9.tar.gz"
+MD5SUM="404293dd5b134ece98f95f2e4c7e682b"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="prosody"
diff --git a/network/prosody-mod-smacks-offline/README b/network/prosody-mod-smacks-offline/README
deleted file mode 100644
index c0501f9b0d..0000000000
--- a/network/prosody-mod-smacks-offline/README
+++ /dev/null
@@ -1 +0,0 @@
-prosody-mod-smacks-offline (XEP-0198: Stream Management)
diff --git a/network/prosody-mod-smacks-offline/prosody-mod-smacks-offline.SlackBuild b/network/prosody-mod-smacks-offline/prosody-mod-smacks-offline.SlackBuild
deleted file mode 100644
index dd8dc9398b..0000000000
--- a/network/prosody-mod-smacks-offline/prosody-mod-smacks-offline.SlackBuild
+++ /dev/null
@@ -1,80 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for prosody-mod-smacks-offline
-
-# 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=prosody-mod-smacks-offline
-MDLNAM=$(echo $PRGNAM | sed 's/prosody-//' | tr '-' '_')
-VERSION=${VERSION:-hg1731}
-REVISION=${REVISION:-b912cb8e0b3c}
-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
-  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 prosody-modules-$REVISION
-tar xvf $CWD/Community-Modules-$REVISION.tar.gz || tar xvf $CWD/$REVISION.tar.gz
-cd Community-Modules-$REVISION
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -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/prosody/modules/
-cp -a $MDLNAM $PKG/usr/lib$LIBDIRSUFFIX/prosody/modules/
-
-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/network/prosody-mod-smacks-offline/prosody-mod-smacks-offline.info b/network/prosody-mod-smacks-offline/prosody-mod-smacks-offline.info
deleted file mode 100644
index 10d313ae0b..0000000000
--- a/network/prosody-mod-smacks-offline/prosody-mod-smacks-offline.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="prosody-mod-smacks-offline"
-VERSION="hg1731"
-HOMEPAGE="https://modules.prosody.im/mod_smacks_offline.html"
-DOWNLOAD="https://hg.prosody.im/prosody-modules/archive/b912cb8e0b3c.tar.gz"
-MD5SUM="baf3b6674cb42039de6813e4a7fa340f"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="prosody"
-MAINTAINER="Andrew Clemons"
-EMAIL="andrew.clemons@gmail.com"
diff --git a/network/prosody-mod-smacks-offline/slack-desc b/network/prosody-mod-smacks-offline/slack-desc
deleted file mode 100644
index 7c5b5c877a..0000000000
--- a/network/prosody-mod-smacks-offline/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------------------------------------------------------|
-prosody-mod-smacks-offline: prosody-mod-smacks-offline (XEP-0198: Stream Management)
-prosody-mod-smacks-offline:
-prosody-mod-smacks-offline:
-prosody-mod-smacks-offline:
-prosody-mod-smacks-offline:
-prosody-mod-smacks-offline: 
-prosody-mod-smacks-offline:
-prosody-mod-smacks-offline:
-prosody-mod-smacks-offline:
-prosody-mod-smacks-offline: https://modules.prosody.im/mod_smacks_offline.html
-prosody-mod-smacks-offline:
diff --git a/network/prosody-mod-smacks/README b/network/prosody-mod-smacks/README
deleted file mode 100644
index 504fff1bde..0000000000
--- a/network/prosody-mod-smacks/README
+++ /dev/null
@@ -1,5 +0,0 @@
-prosody-mod-smacks (XEP-0198: Stream Management)
-
-When using XEP-0198 both the client and the server keep a queue of
-the most recently sent stanzas - this is cleared when the other end
-acknowledges they have received the stanzas.
diff --git a/network/prosody-mod-smacks/prosody-mod-smacks.SlackBuild b/network/prosody-mod-smacks/prosody-mod-smacks.SlackBuild
deleted file mode 100644
index 279c442436..0000000000
--- a/network/prosody-mod-smacks/prosody-mod-smacks.SlackBuild
+++ /dev/null
@@ -1,83 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for prosody-mod-smacks
-
-# Copyright 2016-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=prosody-mod-smacks
-MDLNAM=$(echo $PRGNAM | sed 's/prosody-//' | tr '-' '_')
-VERSION=${VERSION:-hg3640}
-REVISION=${REVISION:-b2f32b3c6ec1}
-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
-  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 Community-Modules-$REVISION
-tar xvf $CWD/Community-Modules-$REVISION.tar.gz || tar xvf $CWD/$REVISION.tar.gz
-cd Community-Modules-$REVISION
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -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/prosody/modules/
-cp -a $MDLNAM $PKG/usr/lib$LIBDIRSUFFIX/prosody/modules/
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-mv \
-  $PKG/usr/lib$LIBDIRSUFFIX/prosody/modules/$MDLNAM/README.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:-tgz}
diff --git a/network/prosody-mod-smacks/prosody-mod-smacks.info b/network/prosody-mod-smacks/prosody-mod-smacks.info
deleted file mode 100644
index f0a30ce3c4..0000000000
--- a/network/prosody-mod-smacks/prosody-mod-smacks.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="prosody-mod-smacks"
-VERSION="hg3640"
-HOMEPAGE="https://modules.prosody.im/mod_smacks.html"
-DOWNLOAD="https://hg.prosody.im/prosody-modules/archive/b2f32b3c6ec1.tar.gz"
-MD5SUM="e35a140fc327f1e9c7e7dd3de0e3fd4f"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="prosody"
-MAINTAINER="Andrew Clemons"
-EMAIL="andrew.clemons@gmail.com"
diff --git a/network/prosody-mod-smacks/slack-desc b/network/prosody-mod-smacks/slack-desc
deleted file mode 100644
index 869daa56a4..0000000000
--- a/network/prosody-mod-smacks/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------------------------------------------------------|
-prosody-mod-smacks: prosody-mod-smacks (XEP-0198: Stream Management)
-prosody-mod-smacks:
-prosody-mod-smacks: When using XEP-0198 both the client and the server keep a queue of
-prosody-mod-smacks: the most recently sent stanzas - this is cleared when the other end
-prosody-mod-smacks: acknowledges they have received the stanzas.
-prosody-mod-smacks: 
-prosody-mod-smacks:
-prosody-mod-smacks:
-prosody-mod-smacks:
-prosody-mod-smacks: https://modules.prosody.im/mod_smacks.html
-prosody-mod-smacks:
diff --git a/network/prosody-mod-throttle-presence/prosody-mod-throttle-presence.SlackBuild b/network/prosody-mod-throttle-presence/prosody-mod-throttle-presence.SlackBuild
index 39c218ac3e..8de0f01060 100644
--- a/network/prosody-mod-throttle-presence/prosody-mod-throttle-presence.SlackBuild
+++ b/network/prosody-mod-throttle-presence/prosody-mod-throttle-presence.SlackBuild
@@ -1,8 +1,9 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for prosody-mod-throttle-presence
 
 # Copyright 2016-2018 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,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=prosody-mod-throttle-presence
 MDLNAM=$(echo $PRGNAM | sed 's/prosody-//' | tr '-' '_')
 VERSION=${VERSION:-hg1925}
 REVISION=${REVISION:-552faee596b7}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -37,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}
@@ -80,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/network/prosody-mod-throttle-presence/prosody-mod-throttle-presence.info b/network/prosody-mod-throttle-presence/prosody-mod-throttle-presence.info
index 79f4221da3..68f9b3f136 100644
--- a/network/prosody-mod-throttle-presence/prosody-mod-throttle-presence.info
+++ b/network/prosody-mod-throttle-presence/prosody-mod-throttle-presence.info
@@ -2,9 +2,9 @@ PRGNAM="prosody-mod-throttle-presence"
 VERSION="hg1925"
 HOMEPAGE="https://modules.prosody.im/mod_throttle_presence.html"
 DOWNLOAD="https://hg.prosody.im/prosody-modules/archive/552faee596b7.tar.gz"
-MD5SUM="94987f1464834bf1f4b076579be1a16d"
+MD5SUM="abd61c3cd1b26a2d78c23c46e3cbad34"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="prosody-mod-csi"
+REQUIRES="prosody"
 MAINTAINER="Andrew Clemons"
 EMAIL="andrew.clemons@gmail.com"
diff --git a/network/prosody-mod-turncredentials/README b/network/prosody-mod-turncredentials/README
new file mode 100644
index 0000000000..6a32b744d5
--- /dev/null
+++ b/network/prosody-mod-turncredentials/README
@@ -0,0 +1,4 @@
+prosody-mod-turncredentials (XEP-0215: impl for TURN credentials)
+
+This module provides an implementation for time-limited TURN
+credentials.
diff --git a/network/prosody-mod-turncredentials/prosody-mod-turncredentials.SlackBuild b/network/prosody-mod-turncredentials/prosody-mod-turncredentials.SlackBuild
new file mode 100644
index 0000000000..24b219b110
--- /dev/null
+++ b/network/prosody-mod-turncredentials/prosody-mod-turncredentials.SlackBuild
@@ -0,0 +1,93 @@
+#!/bin/bash
+
+# Slackware build script for prosody-mod-turncredentials
+
+# Copyright 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.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=prosody-mod-turncredentials
+MDLNAM=$(echo $PRGNAM | sed 's/prosody-//' | tr '-' '_')
+VERSION=${VERSION:-hg4055}
+REVISION=${REVISION:-cf1304ad2336}
+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
+  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 Community-Modules-$REVISION
+tar xvf $CWD/Community-Modules-$REVISION.tar.gz || tar xvf $CWD/$REVISION.tar.gz
+cd Community-Modules-$REVISION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -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}/prosody/modules/
+cp -a $MDLNAM $PKG/usr/lib${LIBDIRSUFFIX}/prosody/modules/
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+mv \
+  $PKG/usr/lib${LIBDIRSUFFIX}/prosody/modules/$MDLNAM/README.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/network/prosody-mod-turncredentials/prosody-mod-turncredentials.info b/network/prosody-mod-turncredentials/prosody-mod-turncredentials.info
new file mode 100644
index 0000000000..209363ee05
--- /dev/null
+++ b/network/prosody-mod-turncredentials/prosody-mod-turncredentials.info
@@ -0,0 +1,10 @@
+PRGNAM="prosody-mod-turncredentials"
+VERSION="hg4055"
+HOMEPAGE="https://modules.prosody.im/mod_turncredentials.html"
+DOWNLOAD="https://hg.prosody.im/prosody-modules/archive/cf1304ad2336.tar.gz"
+MD5SUM="eb89df678299b6a29fe4ba0b5c2dcc24"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="prosody"
+MAINTAINER="Andrew Clemons"
+EMAIL="andrew.clemons@gmail.com"
diff --git a/network/prosody-mod-turncredentials/slack-desc b/network/prosody-mod-turncredentials/slack-desc
new file mode 100644
index 0000000000..a7169445c9
--- /dev/null
+++ b/network/prosody-mod-turncredentials/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+                           |-----handy-ruler------------------------------------------------------|
+prosody-mod-turncredentials: prosody-mod-turncredentials (XEP-0215: time-limited TURN credentials)
+prosody-mod-turncredentials:
+prosody-mod-turncredentials: This module provides an implementation for time-limited TURN
+prosody-mod-turncredentials: credentials.
+prosody-mod-turncredentials:
+prosody-mod-turncredentials:
+prosody-mod-turncredentials:
+prosody-mod-turncredentials:
+prosody-mod-turncredentials:
+prosody-mod-turncredentials: https://modules.prosody.im/mod_turncredentials.html
+prosody-mod-turncredentials:
diff --git a/network/prosody-mod-vcard-muc/README b/network/prosody-mod-vcard-muc/README
new file mode 100644
index 0000000000..05060bffeb
--- /dev/null
+++ b/network/prosody-mod-vcard-muc/README
@@ -0,0 +1,5 @@
+prosody-mod-vcard-muc (vCard for MUC rooms)
+
+This module adds the ability to set vCard for MUC rooms. One of the
+most common use cases is to be able to define an avatar for your own
+MUC room.
diff --git a/network/prosody-mod-vcard-muc/prosody-mod-vcard-muc.SlackBuild b/network/prosody-mod-vcard-muc/prosody-mod-vcard-muc.SlackBuild
new file mode 100644
index 0000000000..0b201f8167
--- /dev/null
+++ b/network/prosody-mod-vcard-muc/prosody-mod-vcard-muc.SlackBuild
@@ -0,0 +1,94 @@
+#!/bin/bash
+
+# Slackware build script for prosody-mod-vcard-muc
+
+# Copyright 2019-2022 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
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=prosody-mod-vcard-muc
+MDLNAM=$(echo $PRGNAM | sed 's/prosody-//' | tr '-' '_')
+VERSION=${VERSION:-hg5290}
+REVISION=${REVISION:-dddac5a3f447}
+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
+  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 Community-Modules-$REVISION
+tar xvf $CWD/Community-Modules-$REVISION.tar.gz || tar xvf $CWD/$REVISION.tar.gz
+cd Community-Modules-$REVISION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -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/prosody/modules/
+cp -a $MDLNAM $PKG/usr/lib$LIBDIRSUFFIX/prosody/modules/
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+mv \
+  $PKG/usr/lib$LIBDIRSUFFIX/prosody/modules/$MDLNAM/README.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/network/prosody-mod-vcard-muc/prosody-mod-vcard-muc.info b/network/prosody-mod-vcard-muc/prosody-mod-vcard-muc.info
new file mode 100644
index 0000000000..5fcc7a8363
--- /dev/null
+++ b/network/prosody-mod-vcard-muc/prosody-mod-vcard-muc.info
@@ -0,0 +1,10 @@
+PRGNAM="prosody-mod-vcard-muc"
+VERSION="hg5290"
+HOMEPAGE="https://modules.prosody.im/mod_vcard_muc.html"
+DOWNLOAD="https://hg.prosody.im/prosody-modules/archive/dddac5a3f447.tar.gz"
+MD5SUM="325626de81a8b2a6f250b02611b27cb1"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="prosody"
+MAINTAINER="Andrew Clemons"
+EMAIL="andrew.clemons@gmail.com"
diff --git a/network/prosody-mod-vcard-muc/slack-desc b/network/prosody-mod-vcard-muc/slack-desc
new file mode 100644
index 0000000000..77f64aac91
--- /dev/null
+++ b/network/prosody-mod-vcard-muc/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+                     |-----handy-ruler------------------------------------------------------|
+prosody-mod-vcard-muc: prosody-mod-vcard-muc (vCard for MUC rooms)
+prosody-mod-vcard-muc:
+prosody-mod-vcard-muc: This module adds the ability to set vCard for MUC rooms. One of the
+prosody-mod-vcard-muc: most common use cases is to be able to define an avatar for your own
+prosody-mod-vcard-muc: MUC room.
+prosody-mod-vcard-muc:
+prosody-mod-vcard-muc:
+prosody-mod-vcard-muc:
+prosody-mod-vcard-muc:
+prosody-mod-vcard-muc: https://modules.prosody.im/mod_vcard_muc.html
+prosody-mod-vcard-muc:
diff --git a/network/prosody/prosody.SlackBuild b/network/prosody/prosody.SlackBuild
index b85a09dae5..00fc0bc3e4 100644
--- a/network/prosody/prosody.SlackBuild
+++ b/network/prosody/prosody.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for prosody
 
@@ -24,10 +24,13 @@
 #
 # Maintained by Gerardo Zamudio <gerardo.zamudio@linux.com>
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=prosody
-VERSION=${VERSION:-0.11.2}
+VERSION=${VERSION:-0.12.3}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 PROSODY_UID=${PROSODY_UID:-274}
 PROSODY_GID=${PROSODY_GID:-274}
@@ -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}
@@ -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/network/prosody/prosody.info b/network/prosody/prosody.info
index 508fb40820..7844b0f097 100644
--- a/network/prosody/prosody.info
+++ b/network/prosody/prosody.info
@@ -1,8 +1,8 @@
 PRGNAM="prosody"
-VERSION="0.11.2"
+VERSION="0.12.3"
 HOMEPAGE="http://prosody.im/"
-DOWNLOAD="https://prosody.im/downloads/source/prosody-0.11.2.tar.gz"
-MD5SUM="b4529e0cf8e0ee82a2f677e404c3df35"
+DOWNLOAD="https://prosody.im/downloads/source/prosody-0.12.3.tar.gz"
+MD5SUM="264d51cffd9e1d9c1a02352786eabfca"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="luasec luasocket luaexpat lua-filesystem"
diff --git a/network/protonmail-bridge/README b/network/protonmail-bridge/README
new file mode 100644
index 0000000000..fc62c44680
--- /dev/null
+++ b/network/protonmail-bridge/README
@@ -0,0 +1,12 @@
+Proton Mail Bridge is a desktop application for paid users that runs in
+the background, encrypting and decrypting messages as they enter and
+leave your computer. It allows for full integration of your ProtonMail
+account with any program that supports IMAP and SMTP such as Microsoft
+Outlook, Mozilla Thunderbird and Apple Mail.
+
+Once you've installed and adder your account(s) to the Bridge you will
+need to configure your email client.  The setup guide for Thunderbird
+can be found here:
+https://proton.me/support/protonmail-bridge-clients-windows-thunderbird
+
+This script repackages the Debian binary provided by Proton AG.
diff --git a/network/protonmail-bridge/doinst.sh b/network/protonmail-bridge/doinst.sh
new file mode 100644
index 0000000000..65c7e2eeb9
--- /dev/null
+++ b/network/protonmail-bridge/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/network/protonmail-bridge/protonmail-bridge.SlackBuild b/network/protonmail-bridge/protonmail-bridge.SlackBuild
new file mode 100644
index 0000000000..ea72f736ab
--- /dev/null
+++ b/network/protonmail-bridge/protonmail-bridge.SlackBuild
@@ -0,0 +1,94 @@
+#!/bin/bash
+
+# Slackware build script for protonmail-bridge
+
+# Copyright 2018-2024 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=protonmail-bridge
+VERSION=${VERSION:-3.9.1}
+DEBVERSION=${DEBVERSION:--1}
+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
+
+# Upstream only has binary support for x86_64 at present.
+if [ "$ARCH" = "x86_64" ]; then
+    DEBARCH="amd64"
+else
+    echo "Sorry, the ProtonMail Bridge binary is currently available for x86_64 only."
+    exit 1
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $PKG
+ar p $CWD/${PRGNAM}_${VERSION}${DEBVERSION}_$DEBARCH.deb data.tar.gz | tar xzv
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+# Upstream claims "not a bug" https://github.com/ProtonMail/proton-bridge/issues/436
+# so remove SGID bit here. Thanks to sbopkglint for catching it.
+chmod -R g-s .
+
+mv $PKG/usr/lib $PKG/usr/lib64
+find $PKG -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 chmod 755 2> /dev/null || true
+rm $PKG/usr/bin/protonmail-bridge
+ln -s /usr/lib64/protonmail/bridge/proton-bridge $PKG/usr/bin/protonmail-bridge
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+mv $PKG/usr/share/doc/protonmail/bridge/* $PKG/usr/doc/$PRGNAM-$VERSION/
+mv $PKG/usr/share/doc/protonmail-bridge/* $PKG/usr/doc/$PRGNAM-$VERSION/
+rm -rf $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/network/protonmail-bridge/protonmail-bridge.info b/network/protonmail-bridge/protonmail-bridge.info
new file mode 100644
index 0000000000..9170052f77
--- /dev/null
+++ b/network/protonmail-bridge/protonmail-bridge.info
@@ -0,0 +1,10 @@
+PRGNAM="protonmail-bridge"
+VERSION="3.9.1"
+HOMEPAGE="https://proton.me/mail/bridge"
+DOWNLOAD="UNSUPPORTED"
+MD5SUM=""
+DOWNLOAD_x86_64="https://proton.me/download/bridge/protonmail-bridge_3.9.1-1_amd64.deb"
+MD5SUM_x86_64="36c49610eeab7a4d7c15f2871a52b414"
+REQUIRES=""
+MAINTAINER="Erich Ritz"
+EMAIL="erich.public@protonmail.com"
diff --git a/network/protonmail-bridge/slack-desc b/network/protonmail-bridge/slack-desc
new file mode 100644
index 0000000000..925705b4fa
--- /dev/null
+++ b/network/protonmail-bridge/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+                 |-----handy-ruler------------------------------------------------------|
+protonmail-bridge: protonmail-bridge (ProtonMail Bridge)
+protonmail-bridge:
+protonmail-bridge: The Bridge is an application that runs on your computer in the
+protonmail-bridge: background and seamlessly encrypts and decrypts your mail as it
+protonmail-bridge: enters and leaves your computer.
+protonmail-bridge:
+protonmail-bridge: Proton AG (ProtonMail Bridge developers)
+protonmail-bridge: <bridge@protonmail.ch>
+protonmail-bridge:
+protonmail-bridge:
+protonmail-bridge:
diff --git a/network/protonmail-import-export-app/README b/network/protonmail-import-export-app/README
new file mode 100644
index 0000000000..cbb9a85e09
--- /dev/null
+++ b/network/protonmail-import-export-app/README
@@ -0,0 +1,11 @@
+The ProtonMail Import-Export app is an application for paid users that
+imports emails to your ProtonMail inbox or makes offline backups.
+
+You can import messages from Gmail, Outlook, Yahoo, or any other email
+provider that supports the IMAP protocol. Importing from local EML and
+MBOX files is also supported. You can use the Import-Export app to
+download important messages as MBOX or EML files so that you always have
+a backup on your device.
+
+This script repackages the Debian binary provided by Proton
+Technologies.
diff --git a/network/protonmail-import-export-app/doinst.sh b/network/protonmail-import-export-app/doinst.sh
new file mode 100644
index 0000000000..65c7e2eeb9
--- /dev/null
+++ b/network/protonmail-import-export-app/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/network/protonmail-import-export-app/protonmail-import-export-app.SlackBuild b/network/protonmail-import-export-app/protonmail-import-export-app.SlackBuild
new file mode 100644
index 0000000000..50ae0ff1be
--- /dev/null
+++ b/network/protonmail-import-export-app/protonmail-import-export-app.SlackBuild
@@ -0,0 +1,88 @@
+#!/bin/bash
+
+# Slackware build script for protonmail-import-export-app
+
+# Copyright 2020-2021 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=protonmail-import-export-app
+VERSION=${VERSION:-1.3.3}
+DEBVERSION=${DEBVERSION:--1}
+BUILD=${BUILD:-2}
+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
+
+# Upstream only has binary support for x86_64 at present.
+if [ "$ARCH" = "x86_64" ]; then
+    DEBARCH="amd64"
+else
+    echo "Sorry, the ProtonMail Import-Export app binary is currently available for x86_64 only."
+    exit 1
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $PKG
+ar p $CWD/${PRGNAM}_${VERSION}${DEBVERSION}_$DEBARCH.deb data.tar.gz | tar xzv
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+mv $PKG/usr/lib $PKG/usr/lib64
+strip --strip-unneeded $PKG/usr/lib64/protonmail/import-export/proton-ie-launcher
+rm $PKG/usr/bin/protonmail-import-export-app
+ln -s /usr/lib64/protonmail/import-export/proton-ie-launcher $PKG/usr/bin/protonmail-import-export-app
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+mv $PKG/usr/share/doc/protonmail/import-export/* $PKG/usr/doc/$PRGNAM-$VERSION/
+mv $PKG/usr/share/doc/protonmail-import-export-app/* $PKG/usr/doc/$PRGNAM-$VERSION/
+rm -rf $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/network/protonmail-import-export-app/protonmail-import-export-app.info b/network/protonmail-import-export-app/protonmail-import-export-app.info
new file mode 100644
index 0000000000..69a8c69be1
--- /dev/null
+++ b/network/protonmail-import-export-app/protonmail-import-export-app.info
@@ -0,0 +1,10 @@
+PRGNAM="protonmail-import-export-app"
+VERSION="1.3.3"
+HOMEPAGE="https://proton.me/support/import-emails-import-export-app"
+DOWNLOAD="UNSUPPORTED"
+MD5SUM=""
+DOWNLOAD_x86_64="https://proton.me/download/ie/protonmail-import-export-app_1.3.3-1_amd64.deb"
+MD5SUM_x86_64="0963ded165d36e4a289f9ba3fa0a613a"
+REQUIRES=""
+MAINTAINER="Erich Ritz"
+EMAIL="erich.public@protonmail.com"
diff --git a/network/protonmail-import-export-app/slack-desc b/network/protonmail-import-export-app/slack-desc
new file mode 100644
index 0000000000..7c54b8366e
--- /dev/null
+++ b/network/protonmail-import-export-app/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+                            |-----handy-ruler------------------------------------------------------|
+protonmail-import-export-app: protonmail-import-export-app (ProtonMail Import-Export app)
+protonmail-import-export-app:
+protonmail-import-export-app: The Import-Export app helps you to migrate your emails from local
+protonmail-import-export-app: files or remote IMAP servers to ProtonMail or simply export emails to
+protonmail-import-export-app: local folder.
+protonmail-import-export-app:
+protonmail-import-export-app: Proton Technologies AG (ProtonMail Bridge developers)
+protonmail-import-export-app: <bridge@protonmail.ch>
+protonmail-import-export-app:
+protonmail-import-export-app:
+protonmail-import-export-app:
diff --git a/network/protonvpn-cli/README b/network/protonvpn-cli/README
new file mode 100644
index 0000000000..39b64af12f
--- /dev/null
+++ b/network/protonvpn-cli/README
@@ -0,0 +1,24 @@
+protonvpn-cli is the community Linux command line tool for connecting to
+the ProtonVPN.  It is a full rewrite of the original bash protonvpn-cli
+in Python, which adds more features and functionality with the purpose
+of improving readability, speed, and reliability.
+
+Before using protonvpn-cli, it must be initialized. Run (as root)
+
+  protonvpn init
+
+and follow the prompts on the screen. Your OpenVPN username and password
+can be found at https://account.protonvpn.com/account. Note that both
+free and paid accounts are supported.
+
+After protonvpn-cli is configured, run (as root)
+
+  protonvpn connect -f
+
+to connect to ProtonVPN using the fastest available server.
+
+Before uninstalling, run
+
+  protonvpn configure
+
+to purge the configuration files.
diff --git a/network/protonvpn-cli/protonvpn-cli.SlackBuild b/network/protonvpn-cli/protonvpn-cli.SlackBuild
new file mode 100644
index 0000000000..66d4182521
--- /dev/null
+++ b/network/protonvpn-cli/protonvpn-cli.SlackBuild
@@ -0,0 +1,78 @@
+#!/bin/bash
+
+# Slackware build script for protonvpn-cli
+
+# Copyright 2019-2024 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=protonvpn-cli
+SRCNAM=linux-cli-community
+VERSION=${VERSION:-2.2.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}
+
+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
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+  AUTHORS CHANGELOG.md LICENSE README.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
diff --git a/network/protonvpn-cli/protonvpn-cli.info b/network/protonvpn-cli/protonvpn-cli.info
new file mode 100644
index 0000000000..f112b73fa1
--- /dev/null
+++ b/network/protonvpn-cli/protonvpn-cli.info
@@ -0,0 +1,10 @@
+PRGNAM="protonvpn-cli"
+VERSION="2.2.12"
+HOMEPAGE="https://github.com/Rafficer/linux-cli-community"
+DOWNLOAD="https://github.com/Rafficer/linux-cli-community/archive/refs/tags/v2.2.12/linux-cli-community-2.2.12.tar.gz"
+MD5SUM="cd9ebf7d3767b8df2156fcbe325c5cae"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="python3-docopt python3-pythondialog"
+MAINTAINER="Erich Ritz"
+EMAIL="erich.public@protonmail.com"
diff --git a/network/protonvpn-cli/slack-desc b/network/protonvpn-cli/slack-desc
new file mode 100644
index 0000000000..7ad3361d51
--- /dev/null
+++ b/network/protonvpn-cli/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+             |-----handy-ruler------------------------------------------------------|
+protonvpn-cli: protonvpn-cli (ProtonVPN's Linux Command-Line Interface)
+protonvpn-cli:
+protonvpn-cli: Community Linux command line tool for connection to the ProtonVPN. It
+protonvpn-cli: is a full rewrite of the original bash protonvpn-cli in Python, which
+protonvpn-cli: adds more features and functionality with the purpose of improving
+protonvpn-cli: readability, speed, and reliability.
+protonvpn-cli:
+protonvpn-cli: Homepage: https://github.com/Rafficer/linux-cli-community
+protonvpn-cli:
+protonvpn-cli:
+protonvpn-cli:
diff --git a/network/proxychains/proxychains.SlackBuild b/network/proxychains/proxychains.SlackBuild
index 285c032375..be3f2df062 100644
--- a/network/proxychains/proxychains.SlackBuild
+++ b/network/proxychains/proxychains.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for "proxychains".
 
@@ -25,27 +25,37 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=proxychains
 SRCNAM=proxychains-ng
-VERSION=${VERSION:-4.14}
+VERSION=${VERSION:-4.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"
@@ -64,7 +74,7 @@ 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
+tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
 cd $SRCNAM-$VERSION
 chown -R root:root .
 find -L . \
@@ -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/network/proxychains/proxychains.info b/network/proxychains/proxychains.info
index af5975ffd8..d5f44eac86 100644
--- a/network/proxychains/proxychains.info
+++ b/network/proxychains/proxychains.info
@@ -1,10 +1,10 @@
 PRGNAM="proxychains"
-VERSION="4.14"
+VERSION="4.16"
 HOMEPAGE="https://github.com/rofl0r/proxychains-ng/"
-DOWNLOAD="https://github.com/rofl0r/proxychains-ng/archive/v4.14.tar.gz"
-MD5SUM="3232630140fe39d53796775285bb6652"
+DOWNLOAD="https://github.com/rofl0r/proxychains-ng/archive/v4.16/proxychains-ng-4.16.tar.gz"
+MD5SUM="acd5807e89df4cca70270260e85e9373"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Dave Woodfall"
-EMAIL="dave@tty1.uk"
+MAINTAINER="D Woodfall"
+EMAIL="dave@slackbuilds.org"
diff --git a/network/proxymini/README b/network/proxymini/README
index fb4892db17..654abc8b21 100644
--- a/network/proxymini/README
+++ b/network/proxymini/README
@@ -1,4 +1,5 @@
-proxymini is a proxy server that fully supports HTTP, HTTP CONNECT (for HTTPS 
-and so on), SOCKS4 (TCP and TCP bind) and SOCKS5 (TCP, TCP bind and UDP). 
-It's designed to be small and for being used in trusted environments where 
-there is no need of complex or advanced options.
+proxymini is a proxy server that fully supports HTTP, HTTP CONNECT
+(for HTTPS and so on), SOCKS4 (TCP and TCP bind) and SOCKS5 (TCP,
+TCP bind and UDP). It's designed to be small and for being used in
+trusted environments where there is no need of complex or advanced
+options.
diff --git a/network/proxymini/proxymini.SlackBuild b/network/proxymini/proxymini.SlackBuild
index 0447f4c153..7d343837b4 100644
--- a/network/proxymini/proxymini.SlackBuild
+++ b/network/proxymini/proxymini.SlackBuild
@@ -1,28 +1,38 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for proxymini
 # Written by Thomas Morper <thomas@beingboiled.info>
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=proxymini
 VERSION=${VERSION:-0.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"
@@ -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/network/proxytunnel/README b/network/proxytunnel/README
index 0e13b1644c..5077135b3c 100644
--- a/network/proxytunnel/README
+++ b/network/proxytunnel/README
@@ -1,4 +1,4 @@
-ProxyTunnel is a program that connects stdin and stdout to a server somewhere 
-on the network, through a standard HTTPS proxy. We mostly use it to tunnel 
-SSH sessions through HTTP(S) proxies, allowing us to do many things that 
-wouldn't be possible without ProxyTunnel.
+ProxyTunnel is a program that connects stdin and stdout to a server
+somewhere on the network, through a standard HTTPS proxy. We mostly
+use it to tunnel SSH sessions through HTTP(S) proxies, allowing us to
+do many things that wouldn't be possible without ProxyTunnel.
diff --git a/network/proxytunnel/proxytunnel.SlackBuild b/network/proxytunnel/proxytunnel.SlackBuild
index 2db3742cf5..1a1a50f8a0 100644
--- a/network/proxytunnel/proxytunnel.SlackBuild
+++ b/network/proxytunnel/proxytunnel.SlackBuild
@@ -1,29 +1,39 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for proxytunnel
 
 # Written by Michael Bueker (m.bueker@berlin.de)
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=proxytunnel
 VERSION=${VERSION:-1.9.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 the variable PRINT_PACKAGE_NAME is set, then this script will report what
+# the name of the created package would be, and then exit. This information
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; 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,7 +61,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" LDFLAGS+="-lcrypto -lssl"
+make CFLAGS+="$SLKCFLAGS -fcommon" LDFLAGS+="-lcrypto -lssl"
 make install PREFIX=/usr MANDIR=/usr/man DESTDIR=$PKG
 
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
@@ -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/network/psad/README b/network/psad/README
index 190eb57fcf..c4490f2c0b 100644
--- a/network/psad/README
+++ b/network/psad/README
@@ -2,9 +2,9 @@ psad (Intrusion Detection and Log Analysis with iptables)
 
 psad is a collection of three lightweight system daemons (two main
 daemons and one helper daemon) that run on Linux machines and analyze
-iptables log messages to detect port scans and other suspicious traffic.
-A typical deployment is to run psad on the iptables firewall where it has
-the fastest access to log data.
+iptables log messages to detect port scans and other suspicious
+traffic.  A typical deployment is to run psad on the iptables firewall
+where it has the fastest access to log data.
 
 You can set email for alerts by setting ALERTSEMAIL:
 
@@ -44,5 +44,6 @@ on SlackBuilds.
 NOTE:
 The default option is NOT to download signatures.
 We provide a signature file, but may be outdated as time goes by.
-You can download them manually from http://www.cipherdyne.org/psad/signatures
-and place them in /etc/psad
+You can download them manually from:
+http://www.cipherdyne.org/psad/signatures
+...and place them in /etc/psad
diff --git a/network/psad/psad.SlackBuild b/network/psad/psad.SlackBuild
index 61da7bcfc7..6f22528483 100644
--- a/network/psad/psad.SlackBuild
+++ b/network/psad/psad.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for psad
 
@@ -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=psad
 VERSION=${VERSION:-2.4.5}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 ALERTSEMAIL=${ALERTSEMAIL:-root@localhost}
 
 SRCNAM="$(printf $PRGNAM | cut -d- -f2-)"
@@ -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}
@@ -121,4 +131,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/network/psi-plus/README b/network/psi-plus/README
index 0990030d70..d3b8765a6e 100644
--- a/network/psi-plus/README
+++ b/network/psi-plus/README
@@ -3,22 +3,14 @@ Development branch of Psi XMPP client by psi-dev@conference.jabber.ru
 NOTE This is intended for advanced users and developers.
 NOTE This can coexist with the stable psi package.
 
-In 2009 a Psi fork named Psi+ was started. Project purposes are: implementation
-of new features, writing of patches and plugins for transferring them to
-upstream. As of 2017 the most of active Psi+ developers have become official
-Psi developers, but Psi+ still has a number of unique features. From developers
-point of view Psi+ is just a development branch of Psi IM client which is
-hosted at separate git repositories and for which rolling release development
-model is used.
+In 2009 a Psi fork named Psi+ was started. Project purposes are:
+implementation of new features, writing of patches and plugins for
+transferring them to upstream. As of 2017 the most of active Psi+
+developers have become official Psi developers, but Psi+ still has a
+number of unique features. From developers point of view Psi+ is just a
+development branch of Psi IM client which is hosted at separate git
+repositories and for which rolling release development model is used.
 
-LATEST COMMIT INFO
-
-Current version of Psi+ is 1.4.409
-
-It is based on:
-* psi: dc3e59ec
-* patches: 770f144
-* plugins: 8792bc3
-* resources: d623f57
-
-https://github.com/psi-plus/psi-plus-snapshots/commit/272f39
+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/network/psi-plus/psi-plus.SlackBuild b/network/psi-plus/psi-plus.SlackBuild
index 4f2af2f51b..5afe5acb2a 100644
--- a/network/psi-plus/psi-plus.SlackBuild
+++ b/network/psi-plus/psi-plus.SlackBuild
@@ -1,9 +1,9 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for psi-plus
 
 # Copyright 2010-2017 Eugene Wissner, Dachau, Germany
-# Modifications for psi-plus copyright 2018 Dave Woodfall <dave@dawoodfall.net>
+# Modifications for psi-plus copyright 2018 Dave Woodfall <dave@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=psi-plus
-VERSION=${VERSION:-1.4.650}
+VERSION=${VERSION:-1.5.1600}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -36,8 +39,15 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
-TMP=${TMP:-/tmp/$TAG}
+# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
+# the name of the created package would be, and then exit. This information
+# could be useful to other scripts.
+if [ ! -z "${PRINT_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,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 {} \;
 
-./configure \
-  --prefix=/usr \
-  --qtdir=/usr/lib$LIBDIRSUFFIX/qt5
-
-QMAKE_CFLAGS="$SLKCFLAGS" \
-QMAKE_CXXFLAGS="$SLKCFLAGS" \
-make
-make install INSTALL_ROOT=$PKG
+mkdir -p build
+cd build
+  cmake \
+    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DLIB_SUFFIX=${LIBDIRSUFFIX} \
+    -DBUNDLED_USRSCTP=ON \
+    -DBUNDLED_QCA=ON \
+    -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 COPYING INSTALL README $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a CHANGELOG COPYING README $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
@@ -91,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/network/psi-plus/psi-plus.info b/network/psi-plus/psi-plus.info
index f4621b0b20..1183d57ba6 100644
--- a/network/psi-plus/psi-plus.info
+++ b/network/psi-plus/psi-plus.info
@@ -1,10 +1,10 @@
 PRGNAM="psi-plus"
-VERSION="1.4.650"
+VERSION="1.5.1600"
 HOMEPAGE="https://psi-plus.com"
-DOWNLOAD="https://github.com/psi-plus/psi-plus-snapshots/archive/1.4.650/psi-plus-snapshots-1.4.650.tar.gz"
-MD5SUM="c54d2143149d5dd112445072da67cded"
+DOWNLOAD="https://github.com/psi-plus/psi-plus-snapshots/archive/1.5.1600/psi-plus-snapshots-1.5.1600.tar.gz"
+MD5SUM="0ec48977544d9f69375b946b2a012505"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="qca-qt5"
-MAINTAINER="Dave Woodfall"
-EMAIL="dave@tty1.uk"
+REQUIRES=""
+MAINTAINER="D Woodfall"
+EMAIL="dave@slackbuilds.org"
diff --git a/network/psi/README b/network/psi/README
index 291061cf53..1e204e2e53 100644
--- a/network/psi/README
+++ b/network/psi/README
@@ -1,6 +1,6 @@
-Psi is a free instant messaging application designed for the XMPP network
-(including Google Talk). Fast and lightweight, Psi is fully open-source
-and compatible with Windows, Linux, and Mac OS X.
+Psi is a free instant messaging application designed for the XMPP
+network (including Google Talk). Fast and lightweight, Psi is fully
+open-source and compatible with Windows, Linux, and Mac OS X.
 
 With Psi's full Unicode support and localizations, easy file transfers,
 customizable iconsets, and many other great features, you'll learn why
diff --git a/network/psi/psi.SlackBuild b/network/psi/psi.SlackBuild
index bc8b9c2660..6f7f05c0c4 100644
--- a/network/psi/psi.SlackBuild
+++ b/network/psi/psi.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for psi
 
@@ -22,32 +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=psi
-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
-    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="-march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
-    SLKCFLAGS="-march=i686 -mtune=i686"
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "x86_64" ]; then
-    SLKCFLAGS=""
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
 else
-    SLKCFLAGS=""
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
 fi
 
 set -e
@@ -66,7 +80,9 @@ find -L . \
  -exec chmod 644 {} \;
 
 ./configure \
-  --prefix=/usr
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --qtselect=5
 
 # Apply c++ flags
 if [ -n "$SLKCFLAGS" ]; then
@@ -91,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/network/psi/psi.info b/network/psi/psi.info
index 56287321db..1539635931 100644
--- a/network/psi/psi.info
+++ b/network/psi/psi.info
@@ -1,10 +1,10 @@
 PRGNAM="psi"
-VERSION="1.3"
+VERSION="1.5"
 HOMEPAGE="http://psi-im.org/"
-DOWNLOAD="https://sourceforge.net/projects/psi/files/Psi/1.3/psi-1.3.tar.xz"
-MD5SUM="473c13da3238d72d469d4d1ce1d85466"
+DOWNLOAD="https://sourceforge.net/projects/psi/files/Psi/1.5/psi-1.5.tar.xz"
+MD5SUM="7c89b9140dd667db45523a2a14eb15c4"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Eugene Wissner"
-EMAIL="belka@caraus.de"
+MAINTAINER="D Woodfall"
+EMAIL="dave@slackbuilds.org"
diff --git a/network/ptokax/ptokax.SlackBuild b/network/ptokax/ptokax.SlackBuild
index 7739204390..f7a1aff093 100644
--- a/network/ptokax/ptokax.SlackBuild
+++ b/network/ptokax/ptokax.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for ptokax
 
@@ -6,26 +6,36 @@
 # Script created by mara <mara@fail.pp.ua>
 #
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=ptokax
 VERSION=${VERSION:-0.5.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"
@@ -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/network/pubnub-curses/pubnub-curses.SlackBuild b/network/pubnub-curses/pubnub-curses.SlackBuild
index fe6b307c0a..f0725f2563 100644
--- a/network/pubnub-curses/pubnub-curses.SlackBuild
+++ b/network/pubnub-curses/pubnub-curses.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for pubnub-curses
 
@@ -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=pubnub-curses
 SRCNAM=pubnub_curses
 VERSION=${VERSION:-1.5.2}
 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,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/network/pulse-sms/README b/network/pulse-sms/README
new file mode 100644
index 0000000000..92232b1ce9
--- /dev/null
+++ b/network/pulse-sms/README
@@ -0,0 +1,7 @@
+pulse-sms (SMS messaging for Desktop)
+
+All phones come with SMS, and anyone can use it. Pulse adds a powerful
+web platform, so that you can stay on top of your conversations.
+
+This is a repackaging of the official binary .deb file
+distributed by Klinker Apps.
diff --git a/network/pulse-sms/doinst.sh b/network/pulse-sms/doinst.sh
new file mode 100644
index 0000000000..65c7e2eeb9
--- /dev/null
+++ b/network/pulse-sms/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/network/pulse-sms/pulse-sms.SlackBuild b/network/pulse-sms/pulse-sms.SlackBuild
new file mode 100644
index 0000000000..a7b99df6f1
--- /dev/null
+++ b/network/pulse-sms/pulse-sms.SlackBuild
@@ -0,0 +1,81 @@
+#!/bin/bash
+
+# Slackware build script for Pulse SMS
+
+# Copyright 2020-2023 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=pulse-sms
+VERSION=${VERSION:-4.5.3}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ -z "$ARCH" ]; then
+    ARCH=$( uname -m )
+fi
+
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+# Upstream only has binary support for x86_64 at present.
+if [ "$ARCH" = "x86_64" ]; then
+    DEBARCH="amd64"
+else
+    echo "Sorry, the Pulse SMS binary is currently available for x86_64 only."
+    exit 1
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $PKG
+ar p $CWD/${PRGNAM}-${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 {} \;
+
+# create soft link for launcher
+mkdir -p $PKG/usr/bin
+ln -sf /opt/Pulse\ SMS/$PRGNAM $PKG/usr/bin/$PRGNAM
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp $PKG/usr/share/doc/$PRGNAM/* $PKG/opt/Pulse\ SMS/LICENSE* $PKG/usr/doc/$PRGNAM-$VERSION
+rm -rf $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/network/pulse-sms/pulse-sms.info b/network/pulse-sms/pulse-sms.info
new file mode 100644
index 0000000000..2649fe8728
--- /dev/null
+++ b/network/pulse-sms/pulse-sms.info
@@ -0,0 +1,10 @@
+PRGNAM="pulse-sms"
+VERSION="4.5.3"
+HOMEPAGE="https://messenger.klinkerapps.com/overview/"
+DOWNLOAD="UNSUPPORTED"
+MD5SUM=""
+DOWNLOAD_x86_64="https://github.com/klinker-apps/pulse-sms-desktop/releases/download/v4.5.3/pulse-sms-4.5.3-amd64.deb"
+MD5SUM_x86_64="55612d99de3dc72946ef2a17c5a63880"
+REQUIRES=""
+MAINTAINER="Ebben Aries"
+EMAIL="slackbuilds@dscp.org"
diff --git a/network/pulse-sms/slack-desc b/network/pulse-sms/slack-desc
new file mode 100644
index 0000000000..2e3f116432
--- /dev/null
+++ b/network/pulse-sms/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+         |-----handy-ruler------------------------------------------------------|
+pulse-sms: pulse-sms (SMS messaging for Desktop)
+pulse-sms:
+pulse-sms: All phones come with SMS, and anyone can use it. Pulse adds a powerful
+pulse-sms: web platform, so that you can stay on top of your conversations.
+pulse-sms:
+pulse-sms: This is a repackaging of the official binary .deb file
+pulse-sms: distributed by Klinker Apps.
+pulse-sms:
+pulse-sms: Home-Page: https://messenger.klinkerapps.com/overview
+pulse-sms:
+pulse-sms:
diff --git a/network/pure-ftpd/pure-ftpd.SlackBuild b/network/pure-ftpd/pure-ftpd.SlackBuild
index 15f1133262..2263ce1277 100644
--- a/network/pure-ftpd/pure-ftpd.SlackBuild
+++ b/network/pure-ftpd/pure-ftpd.SlackBuild
@@ -1,9 +1,10 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for pure-ftpd
 
 # Copyright (c) 2017, Christophe Trussardi, Paris, France
 # All rights reserved.
+# Modified to v1.0.51 by glennmcc 2023-09-16
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
@@ -21,10 +22,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=pure-ftpd
-VERSION=${VERSION:-1.0.47}
+VERSION=${VERSION:-1.0.51}
 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}
@@ -105,7 +113,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
 install -m 0644 \
-  AUTHORS CONTACT COPYING ChangeLog FAQ HISTORY INSTALL NEWS README* THANKS pureftpd* \
+  AUTHORS COPYING ChangeLog FAQ HISTORY NEWS README* THANKS pureftpd* \
   $PKG/usr/doc/$PRGNAM-$VERSION/
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
@@ -114,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/network/pure-ftpd/pure-ftpd.info b/network/pure-ftpd/pure-ftpd.info
index 709d6528aa..37601bbd16 100644
--- a/network/pure-ftpd/pure-ftpd.info
+++ b/network/pure-ftpd/pure-ftpd.info
@@ -1,10 +1,10 @@
 PRGNAM="pure-ftpd"
-VERSION="1.0.47"
+VERSION="1.0.51"
 HOMEPAGE="http://www.pureftpd.org/"
-DOWNLOAD="https://download.pureftpd.org/pub/pure-ftpd/releases/pure-ftpd-1.0.47.tar.gz"
-MD5SUM="f000e519918682ee6b65090352177d4a"
+DOWNLOAD="https://download.pureftpd.org/pub/pure-ftpd/releases/pure-ftpd-1.0.51.tar.gz"
+MD5SUM="b5199142482d64fbd288adc79b98a5c5"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Christophe Trussardi"
-EMAIL="chris@teria.org"
+MAINTAINER="Glenn McCorkle"
+EMAIL="glennmcc@glennmcc.org"
diff --git a/network/purple-facebook/purple-facebook.SlackBuild b/network/purple-facebook/purple-facebook.SlackBuild
index 03bc1eb18a..ad1bf802a7 100644
--- a/network/purple-facebook/purple-facebook.SlackBuild
+++ b/network/purple-facebook/purple-facebook.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for purple-facebook
 # Copyright 2015 Gethyn ThomasQuail <gethyn@bloodbathsoftworks.com>
-# Copyright 2018 David Woodfall <dave@dawoodfall.net>
+# Copyright 2018 David Woodfall <dave@slackbuilds.org>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -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=purple-facebook
-VERSION=${VERSION:-0.9.5_9ff9acf9fa14}
-SRCVERSION=${VERSION/_/-}
+VERSION=${VERSION:-0.9.6}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -36,13 +38,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" = "i586" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -60,9 +69,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 \
@@ -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/network/purple-facebook/purple-facebook.info b/network/purple-facebook/purple-facebook.info
index 42672ee61e..6766df85bb 100644
--- a/network/purple-facebook/purple-facebook.info
+++ b/network/purple-facebook/purple-facebook.info
@@ -1,10 +1,10 @@
 PRGNAM="purple-facebook"
-VERSION="0.9.5_9ff9acf9fa14"
+VERSION="0.9.6"
 HOMEPAGE="https://github.com/dequis/purple-facebook"
-DOWNLOAD="http://unrealize.co.uk/source/purple-facebook-0.9.5-9ff9acf9fa14.tar.gz"
-MD5SUM="9122bd8de731a24b0011a93db62d809b"
+DOWNLOAD="https://github.com/dequis/purple-facebook/releases/download/v0.9.6/purple-facebook-0.9.6.tar.gz"
+MD5SUM="fe58b39f835fac3e7616c34364d869a9"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="json-glib"
-MAINTAINER="David Woodfall"
-EMAIL="dave@dawoodfall.net"
+REQUIRES=""
+MAINTAINER="D Woodfall"
+EMAIL="dave@slackbuilds.org"
diff --git a/network/purple-googlechat/README b/network/purple-googlechat/README
new file mode 100644
index 0000000000..fd164e0f46
--- /dev/null
+++ b/network/purple-googlechat/README
@@ -0,0 +1,6 @@
+Google Chat Plugin for libpurple
+
+A replacement prpl for Google Chat in Pidgin/libpurple to support the
+proprietary protocol that Google uses for its "Google Chat" service.
+This plugin is written by Eion Robb based on the old Hangouts plugin
+written by Eion Robb and Mike 'Maiku' Ruprecht.
diff --git a/network/purple-googlechat/purple-googlechat.SlackBuild b/network/purple-googlechat/purple-googlechat.SlackBuild
new file mode 100644
index 0000000000..dcddbe48b5
--- /dev/null
+++ b/network/purple-googlechat/purple-googlechat.SlackBuild
@@ -0,0 +1,98 @@
+#!/bin/bash
+
+# Slackware build script for purple-googlechat
+
+# Copyright 2022 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=purple-googlechat
+VERSION=${VERSION:-b6b824a4764b}
+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
+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
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+echo $PKG
+find $PKG/ -type f -name '*.png' -exec chmod 644 {} +
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/network/purple-googlechat/purple-googlechat.info b/network/purple-googlechat/purple-googlechat.info
new file mode 100644
index 0000000000..597e2a0788
--- /dev/null
+++ b/network/purple-googlechat/purple-googlechat.info
@@ -0,0 +1,10 @@
+PRGNAM="purple-googlechat"
+VERSION="b6b824a4764b"
+HOMEPAGE="https://github.com/EionRobb/purple-googlechat"
+DOWNLOAD="https://ihacksh.it/slackbuilds/src/purple-googlechat-b6b824a4764b.tar.gz"
+MD5SUM="3d0fb3551095a45acdc54853ff20f1a5"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="protobuf-c"
+MAINTAINER="Dustin Metcalf"
+EMAIL="metcalf.nerd+SBo@gmail.com"
diff --git a/network/purple-googlechat/slack-desc b/network/purple-googlechat/slack-desc
new file mode 100644
index 0000000000..07adcfe650
--- /dev/null
+++ b/network/purple-googlechat/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+                 |-----handy-ruler------------------------------------------------------|
+purple-googlechat: purple-googlechat (googlechat plugin for libpurple)
+purple-googlechat:
+purple-googlechat: A replacement prpl for Google Chat in Pidgin/libpurple to support the
+purple-googlechat: proprietary protocol that Google uses for its "Google Chat" service.
+purple-googlechat: This plugin is written by Eion Robb based on the old Hangouts plugin
+purple-googlechat: written by Eion Robb and Mike 'Maiku' Ruprecht.
+purple-googlechat:
+purple-googlechat: Homepage: https://github.com/EionRobb/purple-googlechat
+purple-googlechat:
+purple-googlechat:
+purple-googlechat:
diff --git a/network/purple-gowhatsapp/README b/network/purple-gowhatsapp/README
new file mode 100644
index 0000000000..6a06bda984
--- /dev/null
+++ b/network/purple-gowhatsapp/README
@@ -0,0 +1,2 @@
+This package implements the WhatsApp Web API to provide a
+clean interface for developers.
diff --git a/network/purple-gowhatsapp/purple-gowhatsapp.SlackBuild b/network/purple-gowhatsapp/purple-gowhatsapp.SlackBuild
new file mode 100644
index 0000000000..bed91b684d
--- /dev/null
+++ b/network/purple-gowhatsapp/purple-gowhatsapp.SlackBuild
@@ -0,0 +1,77 @@
+#!/bin/bash
+
+# Slackware build script for purple-gowhatsapp
+
+# Copyright 2020 Alan Aversa U.S.A
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=purple-gowhatsapp
+VERSION=${VERSION:-0.4.1}
+LIBGOGIT=${LIBGOGIT:-gitb84fdd7}
+GOWHATSGIT=${GOWHATSGIT:-git64cc8cf}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    x86_64) ARCH=x86_64 ;;
+       *) echo "Only x86_64 supported"; exit 1 ;;
+  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}
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+mkdir $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/lib64/pidgin
+mv -v $CWD/'libgowhatsapp_'$VERSION'~'$LIBGOGIT'+gowhatsapp~'$GOWHATSGIT'_amd64_ubuntu18.04.so' $PKG/usr/lib64/pidgin/libgowhatsapp.so
+
+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/network/purple-gowhatsapp/purple-gowhatsapp.info b/network/purple-gowhatsapp/purple-gowhatsapp.info
new file mode 100644
index 0000000000..32fc12d904
--- /dev/null
+++ b/network/purple-gowhatsapp/purple-gowhatsapp.info
@@ -0,0 +1,10 @@
+PRGNAM="purple-gowhatsapp"
+VERSION="0.4.1"
+HOMEPAGE="https://github.com/hoehermann/purple-gowhatsapp"
+DOWNLOAD="UNSUPPORTED"
+MD5SUM=""
+DOWNLOAD_x86_64="https://buildbot.hehoe.de/purple-gowhatsapp/builds/libgowhatsapp_0.4.1~gitb84fdd7+gowhatsapp~git64cc8cf_amd64_ubuntu18.04.so"
+MD5SUM_x86_64="a6072fffe693d1599573c9abd451b2cb"
+REQUIRES=""
+MAINTAINER="Alan Aversa"
+EMAIL="alan.NOaversa@coSPAM.net (remove NO and SPAM)"
diff --git a/network/purple-gowhatsapp/slack-desc b/network/purple-gowhatsapp/slack-desc
new file mode 100644
index 0000000000..b027c2e789
--- /dev/null
+++ b/network/purple-gowhatsapp/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+                 |-----handy-ruler------------------------------------------------------|
+purple-gowhatsapp: purple-gowhatsapp (libpurple/Pidgin plugin for WhatsApp Web)
+purple-gowhatsapp:
+purple-gowhatsapp: * Receive text messages.
+purple-gowhatsapp: * Sending text messages.
+purple-gowhatsapp: * Download files from image, audio, media, and document messages.
+purple-gowhatsapp: * Library installed in global plugins directory: /usr/lib64/pidgin/
+purple-gowhatsapp: * Under the hood: Reasonable callback mechanism thanks to Eiron Robb.
+purple-gowhatsapp: * Fetch contacts from phone, keep track of time last seen, download of
+purple-gowhatsapp:   user profile pictures courtesy of Markus Gothe.
+purple-gowhatsapp:
+purple-gowhatsapp: purple-gowhatsapp is actively-maintained analogue of whatsapp-purple.
diff --git a/network/purple-hangouts/purple-hangouts.SlackBuild b/network/purple-hangouts/purple-hangouts.SlackBuild
index 83a9d6bfe8..edeb75dac1 100644
--- a/network/purple-hangouts/purple-hangouts.SlackBuild
+++ b/network/purple-hangouts/purple-hangouts.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for python-certifi
 
@@ -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=purple-hangouts
 SRCNAM=EionRobb-$PRGNAM
 VERSION=${VERSION:-effc9b41df8c}
 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 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/network/purple-hangouts/purple-hangouts.info b/network/purple-hangouts/purple-hangouts.info
index d49a7c8b5e..def421fa90 100644
--- a/network/purple-hangouts/purple-hangouts.info
+++ b/network/purple-hangouts/purple-hangouts.info
@@ -1,10 +1,10 @@
 PRGNAM="purple-hangouts"
-VERSION="0.9.4"
+VERSION="effc9b41df8c"
 HOMEPAGE="https://bitbucket.org/EionRobb/purple-hangouts"
-DOWNLOAD="https://bitbucket.org/EionRobb/purple-hangouts/get/effc9b41df8c.zip"
+DOWNLOAD="https://slackware.uk/~urchlay/src/effc9b41df8c.zip"
 MD5SUM="35cc2a7bf8ae191c04d630783b0f6e55"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="protobuf protobuf-c json-glib"
+REQUIRES="protobuf-c"
 MAINTAINER="Marian Marinov"
 EMAIL="mm@yuhu.biz"
diff --git a/network/purple-plugin-pack/README b/network/purple-plugin-pack/README
index 5f7d4824f9..fc2ba1b5c7 100644
--- a/network/purple-plugin-pack/README
+++ b/network/purple-plugin-pack/README
@@ -5,13 +5,14 @@ The Purple Plugin Pack was originally created by
 Gary Kramelich and Stu Tomlinson as a way to distribute
 their ever growing lists of simple Pidgin plugins.
 
-This includes an optional patch to change the default nickserv identify command
-in the irchelp plugin to:
+This includes an optional patch to change the default nickserv identify
+command in the irchelp plugin to:
 
 /msg nickserv identify <password>
 
-rather than the '/identify <password>' command that it defaults to, which fails
-on some IRCd's such as e.g. ngircd (also available on slackbuilds.org).
+rather than the '/identify <password>' command that it defaults to,
+which fails on some IRCd's such as e.g. ngircd (also available on
+slackbuilds.org).
 
 To use the patch do:
 
diff --git a/network/purple-plugin-pack/purple-plugin-pack.SlackBuild b/network/purple-plugin-pack/purple-plugin-pack.SlackBuild
index 87a94d921c..0e3167fd5d 100644
--- a/network/purple-plugin-pack/purple-plugin-pack.SlackBuild
+++ b/network/purple-plugin-pack/purple-plugin-pack.SlackBuild
@@ -1,7 +1,7 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for purple-plugin-pack
-# Copyright 2018 Dave Woodfall <dave@dawoodfall.net>
+# Copyright 2018 Dave Woodfall <dave@slackbuilds.org>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,10 +23,13 @@
 
 # Heavily modified by Robby Workman of the SlackBuilds.org project
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=purple-plugin-pack
 VERSION=${VERSION:-2.7.0}
 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}
@@ -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/network/purple-plugin-pack/purple-plugin-pack.info b/network/purple-plugin-pack/purple-plugin-pack.info
index 71443bc90b..3679ac7953 100644
--- a/network/purple-plugin-pack/purple-plugin-pack.info
+++ b/network/purple-plugin-pack/purple-plugin-pack.info
@@ -1,10 +1,10 @@
 PRGNAM="purple-plugin-pack"
 VERSION="2.7.0"
-HOMEPAGE="https://bitbucket.org/rekkanoryo/purple-plugin-pack"
-DOWNLOAD="https://bitbucket.org/rekkanoryo/purple-plugin-pack/downloads/purple-plugin-pack-2.7.0.tar.bz2"
+HOMEPAGE="https://sourceforge.net/projects/pidgin/files/purple%20plugin%20pack/"
+DOWNLOAD="https://downloads.sourceforge.net/project/pidgin/purple%20plugin%20pack/2.7.0/purple-plugin-pack-2.7.0.tar.bz2"
 MD5SUM="a1ee405e81ad955798af7b2a6a8564fb"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Dave Woodfall"
-EMAIL="dave@dawoodfall.net"
+MAINTAINER="D Woodfall"
+EMAIL="dave@slackbuilds.org"
diff --git a/network/purple-teams/README b/network/purple-teams/README
new file mode 100644
index 0000000000..b0effb67a8
--- /dev/null
+++ b/network/purple-teams/README
@@ -0,0 +1,9 @@
+purple-teams (Microsoft Teams plugin for libpurple)
+
+A replacement prpl for Microsoft Teams in Pidgin/libpurple. At the 
+moment it's primarily focused at "Teams for Work/School", but let me 
+know in an issue if you're interested in "Teams for Personal" Totally 
+a work in progress, but it's sending and receiving messages, so good 
+enough to ship!
+
+At this time the plugin does not support audio or video calls.
diff --git a/network/purple-teams/purple-teams.SlackBuild b/network/purple-teams/purple-teams.SlackBuild
new file mode 100644
index 0000000000..6a185e4e61
--- /dev/null
+++ b/network/purple-teams/purple-teams.SlackBuild
@@ -0,0 +1,98 @@
+#!/bin/bash
+
+# Slackware build script for purple-teams
+
+# Copyright 2022 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=purple-teams
+VERSION=${VERSION:-20230625_9065c077}
+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
+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
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+echo $PKG
+find $PKG/ -type f -name '*.png' -exec chmod 644 {} +
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/network/purple-teams/purple-teams.info b/network/purple-teams/purple-teams.info
new file mode 100644
index 0000000000..3e1a0f07c8
--- /dev/null
+++ b/network/purple-teams/purple-teams.info
@@ -0,0 +1,10 @@
+PRGNAM="purple-teams"
+VERSION="20230625_9065c077"
+HOMEPAGE="https://github.com/EionRobb/purple-teams"
+DOWNLOAD="https://ihacksh.it/slackbuilds/src/purple-teams-20230625_9065c077.tar.gz"
+MD5SUM="6b5b5d332f1c4f1c205597e2dd46b88e"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Dustin Metcalf"
+EMAIL="metcalf.nerd+SBo@gmail.com"
diff --git a/network/purple-teams/slack-desc b/network/purple-teams/slack-desc
new file mode 100644
index 0000000000..d47363914b
--- /dev/null
+++ b/network/purple-teams/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+            |-----handy-ruler------------------------------------------------------|
+purple-teams: purple-teams (Microsoft Teams plugin for libpurple)
+purple-teams:
+purple-teams: A replacement prpl for Microsoft Teams in Pidgin/libpurple. At the
+purple-teams: moment it's primarily focused at "Teams for Work/School", but let me
+purple-teams: know in an issue if you're interested in "Teams for Personal" Totally
+purple-teams: a work in progress, but it's sending and receiving messages, so good
+purple-teams: enough to ship!
+purple-teams:
+purple-teams: Homepage: https://github.com/EionRobb/purple-teams
+purple-teams:
+purple-teams:
diff --git a/network/purple-telegram/purple-telegram.SlackBuild b/network/purple-telegram/purple-telegram.SlackBuild
index ba9cc9385c..1a5d40216c 100644
--- a/network/purple-telegram/purple-telegram.SlackBuild
+++ b/network/purple-telegram/purple-telegram.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for purple-telegram
 
@@ -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=purple-telegram
 VERSION=${VERSION:-1.4.1}
 SRCNAM=${PRGNAM/*-/}-${PRGNAM/-*}
 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}
@@ -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/network/purple-telegram/purple-telegram.info b/network/purple-telegram/purple-telegram.info
index 94bf3aa467..af3acfdf35 100644
--- a/network/purple-telegram/purple-telegram.info
+++ b/network/purple-telegram/purple-telegram.info
@@ -5,6 +5,6 @@ DOWNLOAD="https://github.com/majn/telegram-purple/releases/download/v1.4.1/teleg
 MD5SUM="b6e968643f1f5cb5af2f6315ac8aa513"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="libwebp"
+REQUIRES=""
 MAINTAINER="Marian Marinov"
 EMAIL="mm@yuhu.biz"
diff --git a/network/putty/putty.SlackBuild b/network/putty/putty.SlackBuild
index f6176a4b34..24d9679fb9 100644
--- a/network/putty/putty.SlackBuild
+++ b/network/putty/putty.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for PuTTY
 
@@ -30,10 +30,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=putty
-VERSION=${VERSION:-0.72}
+VERSION=${VERSION:-0.80}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -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}
@@ -86,19 +93,15 @@ find -L . \
 # Create $PKG tree.
 mkdir -p $PKG/usr/{bin,man/man1,doc/$PRGNAM-$VERSION/html,share/applications,share/pixmaps}
 
-cd unix
-  CFLAGS="$SLKCFLAGS -Wno-strict-aliasing" \
-  ./configure \
-    --prefix=/usr \
-    --libdir=/usr/lib${LIBDIRSUFFIX} \
-    --mandir=/usr/man \
-    --build=$ARCH-slackware-linux
-
-  # Don't treat all warnings as errors
-  sed -i 's/-Werror//' Makefile*
-
+mkdir -p build
+cd build
+  cmake \
+    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_INSTALL_MANDIR=/usr/man \
+    -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 \
@@ -111,11 +114,10 @@ cp $CWD/putty.desktop $PKG/usr/share/applications/putty.desktop
 cp $CWD/putty.png $PKG/usr/share/pixmaps/putty.png
 
 cp -a README LICENCE doc/puttydoc.txt $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a doc/*.html $PKG/usr/doc/$PRGNAM-$VERSION/html
 
 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/network/putty/putty.info b/network/putty/putty.info
index 96894848ec..1e3cfc70fa 100644
--- a/network/putty/putty.info
+++ b/network/putty/putty.info
@@ -1,8 +1,8 @@
 PRGNAM="putty"
-VERSION="0.72"
+VERSION="0.80"
 HOMEPAGE="https://www.chiark.greenend.org.uk/~sgtatham/putty/"
-DOWNLOAD="https://the.earth.li/~sgtatham/putty/latest/putty-0.72.tar.gz"
-MD5SUM="e18a2a700f1304265bc028a0703653c8"
+DOWNLOAD="https://the.earth.li/~sgtatham/putty/latest/putty-0.80.tar.gz"
+MD5SUM="faa7065c01e7fb22c970c4b114128210"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="%README%"
diff --git a/network/pyNeighborhood/pyNeighborhood.SlackBuild b/network/pyNeighborhood/pyNeighborhood.SlackBuild
index a4459259c3..69491226d0 100644
--- a/network/pyNeighborhood/pyNeighborhood.SlackBuild
+++ b/network/pyNeighborhood/pyNeighborhood.SlackBuild
@@ -1,7 +1,7 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for pyneighborhood
-# Copyright 2011 David Woodfall <dave@dawoodfall.net>
+# Copyright 2011 David Woodfall <dave@slackbuilds.org>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -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=pyNeighborhood
 SRCNAM=${PRGNAM/N/n}
 VERSION=${VERSION:-0.5.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}
@@ -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/network/pyNeighborhood/pyNeighborhood.info b/network/pyNeighborhood/pyNeighborhood.info
index fb3f0eae6b..72458c26ea 100644
--- a/network/pyNeighborhood/pyNeighborhood.info
+++ b/network/pyNeighborhood/pyNeighborhood.info
@@ -6,5 +6,5 @@ MD5SUM="32e2c0c5a3cb0fa750922088a18f4c01"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="David Woodfall"
-EMAIL="dave@dawoodfall.net"
+MAINTAINER="D Woodfall"
+EMAIL="dave@slackbuilds.org"
diff --git a/network/pydio-agent/pydio-agent.SlackBuild b/network/pydio-agent/pydio-agent.SlackBuild
index 9098dafaac..231cb8eef6 100644
--- a/network/pydio-agent/pydio-agent.SlackBuild
+++ b/network/pydio-agent/pydio-agent.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for "pydio-agent".
 
@@ -24,20 +24,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=pydio-agent
 VERSION=${VERSION:-1.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}
@@ -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/network/pydio-sync/pydio-sync.SlackBuild b/network/pydio-sync/pydio-sync.SlackBuild
index 4d8f2dfa88..02752a4c09 100644
--- a/network/pydio-sync/pydio-sync.SlackBuild
+++ b/network/pydio-sync/pydio-sync.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for "pydio-sync".
 
@@ -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=pydio-sync
 VERSION=${VERSION:-1.2.6}
 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}
@@ -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/network/pydio-sync/pydio-sync.info b/network/pydio-sync/pydio-sync.info
index 87d0e4e1d8..ae386660dc 100644
--- a/network/pydio-sync/pydio-sync.info
+++ b/network/pydio-sync/pydio-sync.info
@@ -5,6 +5,6 @@ DOWNLOAD="UNSUPPORTED"
 MD5SUM=""
 DOWNLOAD_x86_64="https://s.mos6581.de/static/slackbuilds.org/sources/pydio-sync/pydio-sync-1.2.6.tar.xz"
 MD5SUM_x86_64="02ad5bcd2b5c7127b26a4f494473f70b"
-REQUIRES="pydio-agent qt5-webkit"
+REQUIRES="pydio-agent"
 MAINTAINER="Marcel Saegebarth"
 EMAIL="marc@mos6581.de"
diff --git a/network/pysub-dl/pysub-dl.SlackBuild b/network/pysub-dl/pysub-dl.SlackBuild
index 2eed570959..d9fb4ec925 100644
--- a/network/pysub-dl/pysub-dl.SlackBuild
+++ b/network/pysub-dl/pysub-dl.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for pysub-dl
 
@@ -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=pysub-dl
 VERSION=${VERSION:-0.3.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}
@@ -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/network/pysub-dl/pysub-dl.info b/network/pysub-dl/pysub-dl.info
index f136d04c9b..c9829f15df 100644
--- a/network/pysub-dl/pysub-dl.info
+++ b/network/pysub-dl/pysub-dl.info
@@ -5,6 +5,6 @@ DOWNLOAD="https://pypi.python.org/packages/b6/32/1acd2adf994db1d66b95ec1ee4415cd
 MD5SUM="9f65dacadddf21185d38ebac9573466c"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="python-requests BeautifulSoup"
+REQUIRES="BeautifulSoup"
 MAINTAINER="Dimitris Zlatanidis"
 EMAIL="d.zlatanidis@gmail.com"
diff --git a/network/python-onedrive/README b/network/python-onedrive/README
index ae3e28af4c..fb7445992f 100644
--- a/network/python-onedrive/README
+++ b/network/python-onedrive/README
@@ -3,4 +3,4 @@ python-onedrive (CLI interface for MS OneDrive)
 Python and command-line interface for MS OneDrive (formerly known as
 SkyDrive) API v5.0.
 
-Optional dependencies: PyYAML, python-requests
+Optional dependency: PyYAML
diff --git a/network/python-onedrive/python-onedrive.SlackBuild b/network/python-onedrive/python-onedrive.SlackBuild
index 961b425c98..e47254ab5e 100644
--- a/network/python-onedrive/python-onedrive.SlackBuild
+++ b/network/python-onedrive/python-onedrive.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for python-onedrive
 
@@ -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=python-onedrive
 VERSION=${VERSION:-15.10.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/network/python3-CherryMusic/README b/network/python3-CherryMusic/README
new file mode 100644
index 0000000000..40ce2016fc
--- /dev/null
+++ b/network/python3-CherryMusic/README
@@ -0,0 +1,16 @@
+python3-CherryMusic is a music streaming server based on CherryPy
+and jPlayer.  It can be run remotely or on a single computer and is
+designed to handle huge music libraries of 3 TB and more; it also
+works well with small collections. In contrast to MPD, Icecast and
+the like, python3-CherryMusic allows multiple users to log in via
+HTTP/HTTPS using a web browser, browse and search the music database,
+manage playlists and stream music to the browser.
+
+The python3-CherryMusic server runs on Linux, Windows and OS X,
+as long as Python and SQLite are available. To use the web client,
+any device with a modern browser will do.
+
+Optional dependencies are:
+
+    Live transcoding: faad2 For special character search terms:
+    python-unidecode
diff --git a/network/EarthReader-Web/doinst.sh b/network/python3-CherryMusic/doinst.sh
index 5fb28930db..5fb28930db 100644
--- a/network/EarthReader-Web/doinst.sh
+++ b/network/python3-CherryMusic/doinst.sh
diff --git a/network/python3-CherryMusic/python3-CherryMusic.SlackBuild b/network/python3-CherryMusic/python3-CherryMusic.SlackBuild
new file mode 100644
index 0000000000..ac249c1577
--- /dev/null
+++ b/network/python3-CherryMusic/python3-CherryMusic.SlackBuild
@@ -0,0 +1,104 @@
+#!/bin/bash
+
+# Slackware build script for python3-CherryMusic
+
+# 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-CherryMusic
+SRCNAM=${PRGNAM#python3-*}
+VERSION=${VERSION:-0.41.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 $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
+
+install -D -m644 doc/man/cherrymusic.1 $PKG/usr/man/man1/cherrymusic.1
+install -D -m644 doc/man/cherrymusic.conf.5 $PKG/usr/man/man5/cherrymusic.conf.5
+install -D -m644 doc/man/cherrymusicd.8 $PKG/usr/man/man8/cherrymusicd.8
+
+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 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/network/python3-CherryMusic/python3-CherryMusic.info b/network/python3-CherryMusic/python3-CherryMusic.info
new file mode 100644
index 0000000000..9a219db633
--- /dev/null
+++ b/network/python3-CherryMusic/python3-CherryMusic.info
@@ -0,0 +1,10 @@
+PRGNAM="python3-CherryMusic"
+VERSION="0.41.3"
+HOMEPAGE="http://www.fomori.org/cherrymusic/"
+DOWNLOAD="https://files.pythonhosted.org/packages/source/c/cherrymusic/CherryMusic-0.41.3.tar.gz"
+MD5SUM="ffb13ab17905d1c806a7e4a1bb1508af"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="python3-CherryPy"
+MAINTAINER="fourtysixandtwo"
+EMAIL="fourtysixandtwo@sliderr.net"
diff --git a/network/python3-CherryMusic/slack-desc b/network/python3-CherryMusic/slack-desc
new file mode 100644
index 0000000000..b243654fff
--- /dev/null
+++ b/network/python3-CherryMusic/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 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-CherryMusic: python3-CherryMusic (music streaming server)
+python3-CherryMusic:
+python3-CherryMusic: CherryMusic is a music streaming server based on CherryPy and
+python3-CherryMusic: jPlayer. It can be run remotely or on a single computer and is
+python3-CherryMusic: designed to handle huge music libraries of 3 TB and more; it also
+python3-CherryMusic: works well with small collections. In contrast to MPD, Icecast
+python3-CherryMusic: and the like, CherryMusic allows multiple users to log in via
+python3-CherryMusic: HTTP/HTTPS using a web browser, browse and search the music
+python3-CherryMusic: database, manage playlists and stream music to the browser.
+python3-CherryMusic:
+python3-CherryMusic: Homepage: http://www.fomori.org/cherrymusic/
diff --git a/network/python3-PyRSS2Gen/README b/network/python3-PyRSS2Gen/README
new file mode 100644
index 0000000000..1c7eecca4a
--- /dev/null
+++ b/network/python3-PyRSS2Gen/README
@@ -0,0 +1,6 @@
+python3-PyRSS2Gen is a Python module that makes it easy to generate
+valid RSS feeds. You can use it to generate RSS feeds for web pages
+that don't have them.
+
+There is also RSSLib which looks like it does the same thing in a
+slightly different way.
diff --git a/network/python3-PyRSS2Gen/python3-PyRSS2Gen.SlackBuild b/network/python3-PyRSS2Gen/python3-PyRSS2Gen.SlackBuild
new file mode 100644
index 0000000000..32ee67daea
--- /dev/null
+++ b/network/python3-PyRSS2Gen/python3-PyRSS2Gen.SlackBuild
@@ -0,0 +1,100 @@
+#!/bin/bash
+
+# Slackware build script for python3-PyRSS2Gen
+
+# Generated by Alien's SlackBuild Toolkit: http://slackware.com/~alien/AST
+# Copyright 2022  fourtysixandtwo <fourtysixandtwo@sliderr.net>
+# Copyright 2009-2010  Eric Hameleers, Eindhoven, Netherlands
+# Written by Lionel Young <redtricycle@gmail.com>
+# Based on http://slackbuilds.org/template.SlackBuild
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN 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-PyRSS2Gen
+SRCNAM=${PRGNAM#python3-*}
+VERSION=${VERSION:-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"
+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 build || exit 1
+python3 setup.py install --root=$PKG || exit 1
+
+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/network/python3-PyRSS2Gen/python3-PyRSS2Gen.info b/network/python3-PyRSS2Gen/python3-PyRSS2Gen.info
new file mode 100644
index 0000000000..bab7959823
--- /dev/null
+++ b/network/python3-PyRSS2Gen/python3-PyRSS2Gen.info
@@ -0,0 +1,10 @@
+PRGNAM="python3-PyRSS2Gen"
+VERSION="1.1"
+HOMEPAGE="http://www.dalkescientific.com/Python/PyRSS2Gen.html"
+DOWNLOAD="http://www.dalkescientific.com/Python/PyRSS2Gen-1.1.tar.gz"
+MD5SUM="c56b9453d52b0a70be4f3e95112058aa"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="fourtysixandtwo"
+EMAIL="fourtysixandtwo@sliderr.net"
diff --git a/network/python3-PyRSS2Gen/slack-desc b/network/python3-PyRSS2Gen/slack-desc
new file mode 100644
index 0000000000..11573eb970
--- /dev/null
+++ b/network/python3-PyRSS2Gen/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 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-PyRSS2Gen: python3-PyRSS2Gen (python RSS feed generator)
+python3-PyRSS2Gen:
+python3-PyRSS2Gen: PyRSS2Gen is a Python module that makes it easy to generate valid
+python3-PyRSS2Gen: RSS feeds.  You can use it to generate RSS feeds for web pages that
+python3-PyRSS2Gen: don't have them.
+python3-PyRSS2Gen:
+python3-PyRSS2Gen: Home: http://www.dalkescientific.com/Python/PyRSS2Gen.html
+python3-PyRSS2Gen:
+python3-PyRSS2Gen:
+python3-PyRSS2Gen:
+python3-PyRSS2Gen:
diff --git a/network/pyzor/pyzor.SlackBuild b/network/pyzor/pyzor.SlackBuild
index d58444fd2d..d5171cca8b 100644
--- a/network/pyzor/pyzor.SlackBuild
+++ b/network/pyzor/pyzor.SlackBuild
@@ -1,10 +1,12 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for pyzor
 
 # Copyright 2009-2015 LukenShiro, Italy
 # All rights reserved.
 #
+# Maintained by Gerardo Zamudio <gerardo.zamudio@linux.com>
+#
 # Redistribution and use of this script, with or without modification, is
 # permitted provided that the following conditions are met:
 #
@@ -24,20 +26,30 @@
 
 # Thanks to Carlos Xavier for a patch with better compatibility against Python 2.7
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=pyzor
 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=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}
@@ -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-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/network/pyzor/pyzor.info b/network/pyzor/pyzor.info
index 7218bb1268..5049194ecb 100644
--- a/network/pyzor/pyzor.info
+++ b/network/pyzor/pyzor.info
@@ -6,5 +6,5 @@ MD5SUM="e77b1cd0afd3884e6f2aa585cb423b46"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="LukenShiro"
-EMAIL="lukenshiro@ngi.it"
+MAINTAINER="Gerardo Zamudio"
+EMAIL="gerardo.zamudio@linux.com"
diff --git a/network/qTox/README b/network/qTox/README
index 0c2c41d1a7..c76aec374d 100644
--- a/network/qTox/README
+++ b/network/qTox/README
@@ -1,4 +1,4 @@
-qTox is a powerful Tox client that tries to follow the Tox design guidelines
-while running on all major platforms.
+qTox is a powerful Tox client that tries to follow the Tox design
+guidelines while running on all major platforms.
 
 qTox upstream switched toxcore library for the new c-toxcore fork.
diff --git a/network/qTox/qTox.SlackBuild b/network/qTox/qTox.SlackBuild
index 94c04c577d..dba0b5861a 100644
--- a/network/qTox/qTox.SlackBuild
+++ b/network/qTox/qTox.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for qTox
 
-# Copyright 2015, 2016, 2017, 2018  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,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=qTox
-VERSION=${VERSION:-1.14.1}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-1.17.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"
@@ -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.gz || tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
@@ -70,7 +80,9 @@ find -L . \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 # gcc-7 fix
-patch -p1 <$CWD/rawdatabase.h.diff
+#patch -p1 <$CWD/rawdatabase.h.diff
+
+sed -e 's|-Werror||' -i CMakeLists.txt
 
 mkdir -p build
 cd build
@@ -80,7 +92,7 @@ cd build
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DENABLE_STATUSNOTIFIER=False \
     -DENABLE_APPINDICATOR=False \
-    -DENABLE_GTK_SYSTRAY=True \
+    -DENABLE_GTK_SYSTRAY=False \
     -DCMAKE_BUILD_TYPE=Release ..
   make
   make install DESTDIR=$PKG
@@ -98,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/network/qTox/qTox.info b/network/qTox/qTox.info
index a405035f86..067e399b27 100644
--- a/network/qTox/qTox.info
+++ b/network/qTox/qTox.info
@@ -1,10 +1,10 @@
 PRGNAM="qTox"
-VERSION="1.14.1"
-HOMEPAGE="https://github.com/tux3/qTox"
-DOWNLOAD="https://github.com/qTox/qTox/archive/v1.14.1/qTox-1.14.1.tar.gz"
-MD5SUM="2e3c15d15ac2a4ebafcfb1287fe2eae4"
+VERSION="1.17.3"
+HOMEPAGE="https://github.com/qTox/qTox"
+DOWNLOAD="https://github.com/qTox/qTox/archive/v1.17.3/qTox-1.17.3.tar.gz"
+MD5SUM="90a3a03d146ea9656909a4d8dd360c47"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="c-toxcore libfilteraudio qt5 ffmpeg qrencode libxkbcommon sqlcipher"
+REQUIRES="c-toxcore libfilteraudio sqlcipher"
 MAINTAINER="Mario Preksavec"
 EMAIL="mario at slackware dot hr"
diff --git a/network/qTox/slack-desc b/network/qTox/slack-desc
index d93685fd55..b8947a2234 100644
--- a/network/qTox/slack-desc
+++ b/network/qTox/slack-desc
@@ -11,7 +11,7 @@ qTox:
 qTox: qTox is a powerful Tox client that tries to follow the Tox design
 qTox: guidelines while running on all major platforms.
 qTox:
-qTox: Homepage: https://github.com/tux3/qTox
+qTox: Homepage: https://github.com/qTox/qTox
 qTox:
 qTox:
 qTox:
diff --git a/network/qbittorrent-qt5/README b/network/qbittorrent-qt5/README
deleted file mode 100644
index 367cfb49bc..0000000000
--- a/network/qbittorrent-qt5/README
+++ /dev/null
@@ -1,10 +0,0 @@
-qBittorrent is an easy to use, good looking, and featureful
-but lightweight C++ / Qt5 Bittorrent Client.
-
-Note that from version 3.3.15 you will get a warning on startup that
-qbittorrent has a new way of saving things. If you want to backup
-your old config directory first, you will find it here:
-
-~/.config/qBittorrent
-
-You can return to an older version by swapping directories around.
diff --git a/network/qbittorrent-qt5/README.SBo b/network/qbittorrent-qt5/README.SBo
deleted file mode 100644
index 56683cfced..0000000000
--- a/network/qbittorrent-qt5/README.SBo
+++ /dev/null
@@ -1,17 +0,0 @@
-An rc init script is provided and has the following features:
-
-Runs qbittorrent-nox webui under user who started the script.
-
-Usage:
-/etc/rc.d/rc.qbittorrent-nox start [PORT]|stop|restart [PORT]|status
-Port defaults to 8080 if not provided.
-
-To run this script from rc.local you must run it as a non-root user.
-
-Example:
-/bin/su - david -c "/etc/rc.d/rc.qbittorrent-nox start 9000"
-
-Program output is sent to /tmp/qbittorrent-nox-$USER
-
-The status command can be run as root, in which case you should see
-all process of qbittorrent-nox, otherwise you will just see $USER's.
diff --git a/network/qbittorrent-qt5/] b/network/qbittorrent-qt5/]
deleted file mode 100644
index 7bd5a15890..0000000000
--- a/network/qbittorrent-qt5/]
+++ /dev/null
@@ -1,126 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for qbittorrent-qt5
-
-# Copyright 2009-2010 David Woodfall <dave@dawoodfall.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.
-
-PRGNAM=qbittorrent-qt5
-SRCNAM=qBittorrent
-VERSION=${VERSION:-4.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 $SRCNAM-release-$VERSION
-tar xvf $CWD/$SRCNAM-release-$VERSION.tar.?z*
-cd $SRCNAM-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 {} \;
-
-#patch -p1 --verbose <$CWD/desktop-fix.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 \
-  --build=$ARCH-slackware-linux
-
-make
-make install INSTALL_ROOT=$PKG
-make clean
-
-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 \
-  --disable-gui \
-  --build=$ARCH-slackware-linux
-
-make
-mv src/qbittorrent-nox $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
-
-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/rc.d
-cp $CWD/rc.qbittorrent-nox.new $PKG/etc/rc.d/.
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS Changelog NEWS TODO COPYING INSTALL README.md \
-    $CWD/README.SBo $PKG/usr/doc/$PRGNAM-$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/network/qbittorrent-qt5/doinst.sh b/network/qbittorrent-qt5/doinst.sh
deleted file mode 100644
index d3350f3157..0000000000
--- a/network/qbittorrent-qt5/doinst.sh
+++ /dev/null
@@ -1,24 +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/rc.d/rc.qbittorrent-nox.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/network/qbittorrent-qt5/qbittorrent-qt5.SlackBuild b/network/qbittorrent-qt5/qbittorrent-qt5.SlackBuild
deleted file mode 100644
index a898a52faf..0000000000
--- a/network/qbittorrent-qt5/qbittorrent-qt5.SlackBuild
+++ /dev/null
@@ -1,124 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for qbittorrent-qt5
-
-# Copyright 2009-2010 David Woodfall <dave@dawoodfall.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.
-
-PRGNAM=qbittorrent-qt5
-SRCNAM=qBittorrent
-VERSION=${VERSION:-4.1.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 $SRCNAM-release-$VERSION
-tar xvf $CWD/$SRCNAM-release-$VERSION.tar.?z*
-cd $SRCNAM-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=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --sysconfdir=/etc \
-  --localstatedir=/var \
-  --mandir=/usr/man \
-  --infodir=/usr/info \
-  --docdir=/usr/doc/$PRGNAM-$VERSION \
-  --build=$ARCH-slackware-linux
-
-make
-make install INSTALL_ROOT=$PKG
-make clean
-
-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 \
-  --disable-gui \
-  --build=$ARCH-slackware-linux
-
-make
-mv src/qbittorrent-nox $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
-
-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/rc.d
-cp $CWD/rc.qbittorrent-nox.new $PKG/etc/rc.d/.
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS Changelog NEWS TODO COPYING INSTALL README.md \
-    $CWD/README.SBo $PKG/usr/doc/$PRGNAM-$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/network/qbittorrent-qt5/qbittorrent-qt5.info b/network/qbittorrent-qt5/qbittorrent-qt5.info
deleted file mode 100644
index d409152286..0000000000
--- a/network/qbittorrent-qt5/qbittorrent-qt5.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="qbittorrent-qt5"
-VERSION="4.1.5"
-HOMEPAGE="http://qbittorrent.sourceforge.net"
-DOWNLOAD="https://github.com/qbittorrent/qBittorrent/archive/release-4.1.5/qBittorrent-release-4.1.5.tar.gz"
-MD5SUM="b85f16a333b8d110650f72bd53e20538"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="libtorrent-rasterbar qt5"
-MAINTAINER="Dave Woodfall"
-EMAIL="dave@tty1.uk"
diff --git a/network/qbittorrent-qt5/rc.qbittorrent-nox.new b/network/qbittorrent-qt5/rc.qbittorrent-nox.new
deleted file mode 100644
index aa916d8096..0000000000
--- a/network/qbittorrent-qt5/rc.qbittorrent-nox.new
+++ /dev/null
@@ -1,82 +0,0 @@
-#!/bin/sh
-
-# /etc/rc.d/rc.qbittorrent-nox
-# Runs qbittorrent webui under user who started the script.
-# Usage: /etc/rc.d/rc.qbittorrent-nox start <PORT>|stop|restart <PORT>|status
-# Port defaults to 8080 if not provided.
-#
-# To run this script from rc.local you must run it as a non-root user.
-#
-# Example:
-# /bin/su - david -c "/etc/rc.d/rc.qbittorrent-nox start 9000"
-# Program output is sent to /tmp/qbittorrent-nox-$USER
-
-# First some checks to see what's what.
-
-if [ "$USER" = "root" ] && [[ "$1" =~ start ]]; then
-    echo "Do not start the daemon as root." >/dev/stderr
-    exit 1
-fi
-
-
-if [ -n "$2" ]; then
-    UIPORT="$2"
-else
-    UIPORT="8080"
-fi
-
-LOG="/tmp/qbittorrent-nox-$USER"
-APP="/usr/bin/qbittorrent-nox"
-
-do_start()
-{
-    if [ -n "$(/bin/netstat -nta | awk '{print $4}' \
-         | cut -d: -f2 | grep $UIPORT | grep 0.0.0.0)" ]; then
-
-        echo "Port $UIPORT is already in use." >/dev/stderr
-        exit 1
-    fi
-
-    $APP --webui-port=$UIPORT 1>$LOG 2>&1 &
-}
-
-do_stop()
-{
-    PID="$(pgrep -u $USER qbittorrent-nox)"
-
-    if [ -n "$PID" ]; then
-        echo "Killing PID $PID"
-        kill $PID
-    else
-        echo "No process found." >/dev/stderr
-    fi
-}
-
-do_status()
-{
-    echo "Local Address	Foreign Address	State	PID/Program name"
-    /bin/netstat -pntl 2>&1 | grep qbittorrent-n \
-    | awk '{print $4 "	" $5 "	" $6 "	" $7}'
-}
-
-case "$1" in
-    'start')
-        do_start
-    ;;
-
-    'stop')
-        do_stop
-    ;;
-    'restart')
-        do_stop
-        sleep 1
-        do_start
-    ;;
-    'status')
-        do_status
-    ;;
-    *)
-        echo "Usage: $0 {start <PORT>|stop|restart <PORT>|status}"
-        exit 1
-    ;;
-esac
diff --git a/network/qbittorrent-qt5/slack-desc b/network/qbittorrent-qt5/slack-desc
deleted file mode 100644
index 2214d59757..0000000000
--- a/network/qbittorrent-qt5/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------------------------------------------------------|
-qbittorrent-qt5: qbittorrent-qt5 (a C++ / Qt5 Bittorrent Client)
-qbittorrent-qt5:
-qbittorrent-qt5: The qBittorrent project was created in March 2006 with the idea
-qbittorrent-qt5: of developing a new Bittorrent client for Linux (and possibly
-qbittorrent-qt5: other systems) that would be easy to use, good looking, and
-qbittorrent-qt5: featureful but lightweight.
-qbittorrent-qt5: qBittorrent is a Free Software released under the GNU GPL license.
-qbittorrent-qt5: The author is Christophe Dumez, a French student in an engineer
-qbittorrent-qt5: school (UTBM), in IT departement.
-qbittorrent-qt5:
-qbittorrent-qt5: Homepage: http://qbittorrent.sourceforge.net
diff --git a/network/qbittorrent/README b/network/qbittorrent/README
index 731c51c61f..d95396d99f 100644
--- a/network/qbittorrent/README
+++ b/network/qbittorrent/README
@@ -1,11 +1,14 @@
-qBittorrent is an easy to use, good looking, and featureful
-but lightweight C++ / Qt4 Bittorrent Client.
+qBittorrent is a bittorrent client programmed in C++ / Qt5 that uses
+libtorrent (sometimes called libtorrent-rasterbar) by Arvid Norberg.
+
+It aims to be a good alternative to all other bittorrent clients out
+there. qBittorrent is fast, stable, and provides unicode supports as
+well as many features.
 
 Note that from version 3.3.15 you will get a warning on startup that
-qbittorrent has a new way of saving things. If you want to backup
-your old config directory first, you will find it here:
+qbittorrent has a new way of saving things. If you want to backup your
+old config directory first, you will find it here:
 
 ~/.config/qBittorrent
 
-That way you can return to an older version by swapping directories
-around.
+You can return to an older version by swapping directories around.
diff --git a/network/qbittorrent/README.SBo b/network/qbittorrent/README.SBo
new file mode 100644
index 0000000000..04fd92c833
--- /dev/null
+++ b/network/qbittorrent/README.SBo
@@ -0,0 +1,23 @@
+An rc init script is provided and has the following features:
+
+Runs qbittorrent-nox webui under user who started the script.
+
+Usage:
+/etc/rc.d/rc.qbittorrent-nox start [PORT]|stop|restart [PORT]|status
+Port defaults to 8080 if not provided.
+
+To run this script from rc.local you must run it as a non-root user.
+
+Example:
+/bin/su - david -c "/etc/rc.d/rc.qbittorrent-nox start 9000"
+
+Program output is sent to /tmp/qbittorrent-nox-$USER
+
+The status command can be run as root, in which case you should see
+all process of qbittorrent-nox, otherwise you will just see $USER's.
+
+** UPDATE **
+
+An alternative way to run this is with the daemon program (included in
+Slackware since 15.0). Check `man daemon` for details, but you can
+avoid root completely with the daemon approach.
diff --git a/network/qbittorrent/README.nox b/network/qbittorrent/README.nox
deleted file mode 100644
index 15193a85ab..0000000000
--- a/network/qbittorrent/README.nox
+++ /dev/null
@@ -1,17 +0,0 @@
-An rc init script is provided and has the following features:
-
-Runs qbittorrent-nox webui under user who started the script.
-
-Usage:
-/etc/rc.d/rc.qbittorrent-nox start [PORT]|stop|restart [PORT]|status
-Port defaults to 8080 if not provided.
-
-To run this script from rc.local you must run it as a non-root user.
-
-Example:
-/bin/su - david -c /etc/rc.d/rc.qbittorrent-nox start 9000
-
-Program output is sent to /tmp/qbittorrent-nox-$USER
-
-The status command can be run as root, in which case you should see
-all process of qbittorrent-nox, otherwise you will just see $USER's.
diff --git a/network/qbittorrent/qbittorrent.SlackBuild b/network/qbittorrent/qbittorrent.SlackBuild
index 5584a8df0c..e6a61244d4 100644
--- a/network/qbittorrent/qbittorrent.SlackBuild
+++ b/network/qbittorrent/qbittorrent.SlackBuild
@@ -1,8 +1,9 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for qbittorrent
 
-# Copyright 2009-2010 David Woodfall <dave@dawoodfall.net>
+# Copyright 2022 David O'Shaughnessy
+# Copyright 2019-2021 Donald Cooley South Haven, Indiana USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,11 +23,18 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20230630 bkw: Modified by SlackBuilds.org, BUILD=2:
+# - BUILD needed to be bumped due to the .desktop file change.
+# - Install README.SBo with correct ownership.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=qbittorrent
-SRCNAM=qBittorrent-release
-VERSION=${VERSION:-3.3.16}
+#SRCNAM=qBittorrent
+VERSION=${VERSION:-4.6.4}
 BUILD=${BUILD:-1}
 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}
@@ -60,56 +72,60 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $SRCNAM-$VERSION
-tar xvf $CWD/release-$VERSION.tar.?z*
-cd $SRCNAM-$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 {} \;
-
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
-  --prefix=/usr \
-  --with-qt4
-
-make
-make install INSTALL_ROOT=$PKG
-make clean
-
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
-  --prefix=/usr \
-  --with-qt4 \
-  --disable-gui
-
-make
-mv src/qbittorrent-nox $PKG/usr/bin
-
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} + -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 graphical version by default
+gui="-DGUI=ON"; [[ "${GUI:-yes}" != "yes" ]] && gui="-DGUI=OFF"
+
+cmake -B build -G "Ninja" \
+  -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+  -DCMAKE_INSTALL_PREFIX=/usr \
+  -DCMAKE_INSTALL_LIBDIR:PATH=lib${LIBDIRSUFFIX} \
+  -DCMAKE_INSTALL_MANDIR=/usr/man \
+  -DCMAKE_INSTALL_DOCDIR=/usr/doc/$PRGNAM-$VERSION \
+  -DCMAKE_BUILD_TYPE=Release \
+  $gui \
+  -DSYSTEMD=OFF
+cmake --build build
+DESTDIR=$PKG cmake --install build --strip
+
+# adjust .desktop file to be compliant with Slackware 15.0 supported
+# version of desktop spec (1.4) (SingleMainWindow was added to version
+# 1.5 Desktop Entry Specification).
+# https://specifications.freedesktop.org/desktop-entry-spec/desktop-entry-spec-latest.html
+[[ "${GUI:-yes}" != "yes" ]] || sed -i '/^SingleMainWindow/d' $PKG/usr/share/applications/*.desktop
+
+# 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 $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/etc/rc.d
 cp $CWD/rc.qbittorrent-nox.new $PKG/etc/rc.d/.
 
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS Changelog NEWS TODO COPYING INSTALL README.md \
-    $CWD/README.nox \
-  $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 Changelog COPYING COPYING.GPLv? README.md $PKGDOC
+# 20230630 bkw: use cat instead of "cp -a" to install files from $CWD,
+# there's no way to tell what the $CWD ownership/permission is.
+cat $CWD/README.SBo > $PKGDOC/README.SBo
+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/network/qbittorrent/qbittorrent.info b/network/qbittorrent/qbittorrent.info
index 106024f321..06c0e31186 100644
--- a/network/qbittorrent/qbittorrent.info
+++ b/network/qbittorrent/qbittorrent.info
@@ -1,10 +1,10 @@
 PRGNAM="qbittorrent"
-VERSION="3.3.16"
-HOMEPAGE="http://qbittorrent.sourceforge.net"
-DOWNLOAD="https://github.com/qbittorrent/qBittorrent/archive/release-3.3.16.tar.gz"
-MD5SUM="28852012dbd3f3bbec400279935b88d1"
+VERSION="4.6.4"
+HOMEPAGE="https://www.qbittorrent.org/"
+DOWNLOAD="https://sourceforge.net/projects/qbittorrent/files/qbittorrent/qbittorrent-4.6.4/qbittorrent-4.6.4.tar.xz"
+MD5SUM="ffc528cbdf1ab4ff40a51753e5e9b030"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="libtorrent-rasterbar"
-MAINTAINER="Dave Woodfall"
-EMAIL="dave@tty1.uk"
+REQUIRES="libtorrent2"
+MAINTAINER="David O'Shaughnessy"
+EMAIL="dev@osh.id.au"
diff --git a/network/qbittorrent/rc.qbittorrent-nox.new b/network/qbittorrent/rc.qbittorrent-nox.new
index 9b78744ba4..aa916d8096 100644
--- a/network/qbittorrent/rc.qbittorrent-nox.new
+++ b/network/qbittorrent/rc.qbittorrent-nox.new
@@ -8,12 +8,12 @@
 # To run this script from rc.local you must run it as a non-root user.
 #
 # Example:
-# /bin/su - david -c /etc/rc.d/rc.qbittorrent-nox start 9000
+# /bin/su - david -c "/etc/rc.d/rc.qbittorrent-nox start 9000"
 # Program output is sent to /tmp/qbittorrent-nox-$USER
 
 # First some checks to see what's what.
 
-if [ "$USER" = "root" ] && [ "$1" = "start" ]; then
+if [ "$USER" = "root" ] && [[ "$1" =~ start ]]; then
     echo "Do not start the daemon as root." >/dev/stderr
     exit 1
 fi
diff --git a/network/qbittorrent/slack-desc b/network/qbittorrent/slack-desc
index 2a54c14312..ed330143c3 100644
--- a/network/qbittorrent/slack-desc
+++ b/network/qbittorrent/slack-desc
@@ -6,14 +6,14 @@
 # customary to leave one space after the ':' except on otherwise blank lines.
 
            |-----handy-ruler------------------------------------------------------|
-qbittorrent: qbittorrent (a C++ / Qt4 Bittorrent Client)
+qbittorrent: qbittorrent (a C++ / Qt5 Bittorrent Client)
 qbittorrent:
-qbittorrent: The qBittorrent project was created in March 2006 with the idea
-qbittorrent: of developing a new Bittorrent client for Linux (and possibly
-qbittorrent: other systems) that would be easy to use, good looking, and
-qbittorrent: featureful but lightweight.
-qbittorrent: qBittorrent is a Free Software released under the GNU GPL license.
-qbittorrent: The author is Christophe Dumez, a French student in an engineer
-qbittorrent: school (UTBM), in IT departement.
+qbittorrent: qBittorrent is a bittorrent client programmed in C++ / Qt5 that uses
+qbittorrent: libtorrent (sometimes called libtorrent-rasterbar) by Arvid Norberg.
 qbittorrent:
-qbittorrent: Homepage: http://qbittorrent.sourceforge.net
+qbittorrent: It aims to be a good alternative to all other bittorrent clients out
+qbittorrent: there. qBittorrent is fast, stable, and provides unicode support as
+qbittorrent: well as many features.
+qbittorrent:
+qbittorrent:
+qbittorrent: Homepage: https://www.qbittorrent.org/
diff --git a/network/qodem/README b/network/qodem/README
new file mode 100644
index 0000000000..577222ae81
--- /dev/null
+++ b/network/qodem/README
@@ -0,0 +1,20 @@
+qodem (BBS-oriented terminal emulator)
+
+qodem is a from-scratch clone implementation of the Qmodem
+communications program made popular in the days when Bulletin Board
+Systems ruled the night. Qodem emulates the dialing directory and
+the terminal screen features of Qmodem over both modem and Internet
+connections.
+
+qodem also emulates ATASCII (Atari 8-bit) and PETSCII (Commodore
+8-bit), and can be used to run a local shell.
+
+Note: qodem-x11 doesn't handle PETSCII correctly. Instead, launch
+qodem in a terminal with the PETSCII font (adjust the size= to your
+taste):
+
+$ urxvt -fn "xft:C64 Pro Mono:size=13" -e qodem
+
+More information on BBSes can be found here, along with an up-to-date
+list of telnet BBSes:
+https://www.telnetbbsguide.com/
diff --git a/network/qodem/doinst.sh b/network/qodem/doinst.sh
new file mode 100644
index 0000000000..12b14570f0
--- /dev/null
+++ b/network/qodem/doinst.sh
@@ -0,0 +1,17 @@
+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 /usr/bin/mkfontdir -a -x /usr/bin/mkfontscale ]; then
+  ( cd usr/share/fonts/TTF
+    /usr/bin/mkfontscale .
+    /usr/bin/mkfontdir . )
+fi
+
+[ -x /usr/bin/fc-cache ] && /usr/bin/fc-cache -f
diff --git a/network/qodem/qodem-convert.1 b/network/qodem/qodem-convert.1
new file mode 100644
index 0000000000..e92a4d9bfa
--- /dev/null
+++ b/network/qodem/qodem-convert.1
@@ -0,0 +1,101 @@
+.\" 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 "QODEM-CONVERT" 1 "2023-07-29" "1.0.1" "SlackBuilds.org"
+.SH NAME
+qodem-convert \- convert BBS dialing lists to qodem format
+.\" RST source for qodem-convert(1) man page. Convert with:
+.
+.\" rst2man.py qodem-convert.rst > qodem-convert.1
+.
+.SH SYNOPSIS
+.sp
+qodem\-convert\-syncterm \fBinput.lst\fP \fBoutput.txt\fP
+.sp
+qodem\-convert\-ibbs \fBinput.txt\fP \fBoutput.txt\fP
+.SH DESCRIPTION
+.sp
+These utilities convert BBS dialing lists to the \fBfonebook.txt\fP
+format used by \fBqodem\fP(1).
+.sp
+To convert a \fBsyncterm\fP(1) list, use a command like:
+.INDENT 0.0
+.INDENT 3.5
+.sp
+.nf
+.ft C
+qodem\-convert\-syncterm ~/.syncterm/syncterm.lst ~/.qodem/fonebook.txt
+.ft P
+.fi
+.UNINDENT
+.UNINDENT
+.sp
+To convert the telnetbbsguide list, first download it from:
+.INDENT 0.0
+.INDENT 3.5
+.sp
+.nf
+.ft C
+https://www.telnetbbsguide.com/lists/download\-list/
+.ft P
+.fi
+.UNINDENT
+.UNINDENT
+.sp
+Get either the Monthly or Daily zip file. Extract it, and find the
+"short form" list, which will have a filename like \fBshort_Jul_23.txt\fP\&.
+Use a command like:
+.INDENT 0.0
+.INDENT 3.5
+.sp
+.nf
+.ft C
+qodem\-convert\-ibbs short_Jul_23.txt ~/.qodem/fonebook.txt
+.ft P
+.fi
+.UNINDENT
+.UNINDENT
+.SH COPYRIGHT
+.sp
+Public Domain, or CC0 License in jurisdictions that do not recognize
+the public domain.
+.SH AUTHORS
+.sp
+\fBqodem\fP, \fBqodem\-convert\-syncterm\fP, and \fBqodem\-convert\-ibbs\fP were
+written by Autumn Lamonte.
+.sp
+This man page written for the SlackBuilds.org project
+by B. Watson, and is licensed under the WTFPL.
+.SH SEE ALSO
+.sp
+\fBqodem\fP(1), \fBqodem\-x11\fP(1), \fBsyncterm\fP(1)
+.sp
+The qodem homepage: \fI\%https://qodem.sourceforge.io/\fP
+.\" Generated by docutils manpage writer.
+.
diff --git a/network/qodem/qodem-convert.rst b/network/qodem/qodem-convert.rst
new file mode 100644
index 0000000000..e51935eee0
--- /dev/null
+++ b/network/qodem/qodem-convert.rst
@@ -0,0 +1,67 @@
+.. RST source for qodem-convert(1) man page. Convert with:
+..   rst2man.py qodem-convert.rst > qodem-convert.1
+
+.. |version| replace:: 1.0.1
+.. |date| date::
+
+=============
+qodem-convert
+=============
+
+-----------------------------------------
+convert BBS dialing lists to qodem format
+-----------------------------------------
+
+:Manual section: 1
+:Manual group: SlackBuilds.org
+:Date: |date|
+:Version: |version|
+
+SYNOPSIS
+========
+
+qodem-convert-syncterm **input.lst** **output.txt**
+
+qodem-convert-ibbs **input.txt** **output.txt**
+
+DESCRIPTION
+===========
+
+These utilities convert BBS dialing lists to the **fonebook.txt**
+format used by **qodem**\(1).
+
+To convert a **syncterm**\(1) list, use a command like::
+
+  qodem-convert-syncterm ~/.syncterm/syncterm.lst ~/.qodem/fonebook.txt
+
+To convert the telnetbbsguide list, first download it from::
+
+  https://www.telnetbbsguide.com/lists/download-list/
+
+Get either the Monthly or Daily zip file. Extract it, and find the
+"short form" list, which will have a filename like **short_Jul_23.txt**.
+Use a command like::
+
+  qodem-convert-ibbs short_Jul_23.txt ~/.qodem/fonebook.txt
+
+COPYRIGHT
+=========
+
+Public Domain, or CC0 License in jurisdictions that do not recognize
+the public domain.
+
+AUTHORS
+=======
+
+**qodem**, **qodem-convert-syncterm**, and **qodem-convert-ibbs** were
+written by Autumn Lamonte.
+
+This man page written for the SlackBuilds.org project
+by B. Watson, and is licensed under the WTFPL.
+
+SEE ALSO
+========
+
+**qodem**\(1), **qodem-x11**\(1), **syncterm**\(1)
+
+The qodem homepage: https://qodem.sourceforge.io/
diff --git a/network/qodem/qodem-x11.desktop b/network/qodem/qodem-x11.desktop
new file mode 100644
index 0000000000..e1cdcadca8
--- /dev/null
+++ b/network/qodem/qodem-x11.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Type=Application
+Name=Qodem (X11)
+Comment=ANSI-BBS Terminal
+Comment[es]=Emulador de Terminal ANSI-BBS
+Icon=qodem
+Exec=qodem-x11 %u
+Terminal=false
+Categories=TerminalEmulator;Network;Dialup;
+Keywords=BBS;Terminal;Ansi;
diff --git a/network/qodem/qodem.SlackBuild b/network/qodem/qodem.SlackBuild
new file mode 100644
index 0000000000..87c818eec3
--- /dev/null
+++ b/network/qodem/qodem.SlackBuild
@@ -0,0 +1,172 @@
+#!/bin/bash
+
+# Slackware build script for qodem
+
+# Written by B. Watson (urchlay@slackware.uk)
+
+# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
+
+# Notes:
+# - Package includes both terminal (qodem) and X11 (qodem-x11) binaries.
+# - qodem-x11 always builds with its bundled copy of pdcurses, regardless of
+#   whether our PDCurses package is installed. Perfectly OK, just worth
+#   mentioning why PDCurses isn't a dependency.
+# - Two choices for ssh support: build with bundled cryptlib (like syncterm
+#   does), or run an external ssh command. Upstream's default is the latter,
+#   I won't change it. Plus, using the ssh binary has the useful side effect
+#   of respecting your ~/.ssh/config.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=qodem
+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
+
+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 /111 -a \! -perm 755 -a -exec chmod 755 {} + -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} +
+
+# There's no configure option to override use of the system miniupnp
+# library; it'll fall back to its own bundled version if not found.
+# This makes it always use the bundled one, for a reproducible build
+# and to avoid a hidden dependency.
+sed -i '/Q_USE_SYSTEM_UPNP="yes"/s,yes,no,' configure
+
+# Use our flags for sub-makes.
+sed -i -e 's,-ggdb,,' \
+       -e "s,-O0,$SLKCFLAGS," \
+       lib/pdcurses/Makefile \
+       lib/upnp/Makefile
+
+# The X11 build runs external commands in a separate terminal. Change
+# the default terminal to something that actually exists on Slackware.
+# This is just the default (can still be changed in ~/.qodem/qodemrc).
+sed -i 's,x-terminal-emulator,xterm,g' source/{options,help}.c
+
+# Don't repeat myself (much, anyway):
+buildit() {
+  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
+}
+
+### this builds the terminal binary (qodem):
+buildit
+
+### now start over, prepare to build the x11 binary (qodem-x11):
+make distclean
+
+# we have to build these separately, for parallel builds (-jN, N>1):
+make -C lib/pdcurses
+make -C lib/upnp
+
+# sub-projects built, now we can build qodem-x11:
+buildit --enable-x11
+
+### everything else:
+
+# This script isn't useful. All it would ever do is "exec qodem-x11", since
+# our package includes that.
+rm -f $PKG/usr/bin/x$PRGNAM $PKG/usr/man/man1/x$PRGNAM.1
+
+# There was no documentation for the conversion scripts, so I wrote some:
+cat $CWD/qodem-convert.1 > $PKG/usr/man/man1/qodem-convert.1
+
+# All man pages in place, so:
+gzip -9 $PKG/usr/man/man*/*
+
+# useful-looking stuff in misc/, include in package:
+for i in ibbs syncterm; do
+  cp -a misc/convert_${i}.pl $PKG/usr/bin/qodem-convert-$i
+  ln -s qodem-convert.1.gz $PKG/usr/man/man1/qodem-convert-$i.1.gz
+done
+
+# qodem-x11 doesn't seem to use this font when in PETSCII mode, but
+# it works OK if you run qodem in a terminal using the font:
+mkdir -p $PKG/usr/share/fonts/TTF
+cp -a misc/fonts/C64_Pro_Mono-STYLE.ttf $PKG/usr/share/fonts/TTF
+
+# .desktop files written by SlackBuild author:
+mkdir -p $PKG/usr/share/applications
+install -oroot -groot -m0644 $CWD/$PRGNAM*.desktop $PKG/usr/share/applications
+
+# Upstream provided icons at various sizes:
+cp build/icons/qodem.png build/osx/icons/qodem-64.png
+for png in build/osx/icons/qodem-*.png; do
+  px="$( basename $png .png | cut -d- -f2 )"
+  size=${px}x${px}
+  dir=$PKG/usr/share/icons/hicolor/$size/apps
+  mkdir -p $dir
+  cat $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
+
+# Most of what's in docs/ is developer-oriented, but the PD
+# announcement is the closest thing we've got to a license...
+PKGDOC=$PKG/usr/doc/$PRGNAM-$VERSION
+mkdir -p $PKGDOC
+cp -a C* README* docs/pd_announcement2.txt $PKGDOC
+cat $CWD/$PRGNAM.SlackBuild > $PKGDOC/$PRGNAM.SlackBuild
+
+# It works out OK to use the same script for doinst.sh and douninst.sh.
+# Result is that it truly does clean up after itself.
+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
diff --git a/network/qodem/qodem.desktop b/network/qodem/qodem.desktop
new file mode 100644
index 0000000000..523db54cde
--- /dev/null
+++ b/network/qodem/qodem.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Type=Application
+Name=Qodem (curses)
+Comment=ANSI-BBS Terminal
+Comment[es]=Emulador de Terminal ANSI-BBS
+Icon=qodem
+Exec=qodem %u
+Terminal=true
+Categories=TerminalEmulator;Network;Dialup;
+Keywords=BBS;Terminal;Ansi;
diff --git a/network/qodem/qodem.info b/network/qodem/qodem.info
new file mode 100644
index 0000000000..b542a46e41
--- /dev/null
+++ b/network/qodem/qodem.info
@@ -0,0 +1,10 @@
+PRGNAM="qodem"
+VERSION="1.0.1"
+HOMEPAGE="https://qodem.sourceforge.net/"
+DOWNLOAD="https://gitlab.com/AutumnMeowMeow/qodem/-/archive/v1.0.1/qodem-v1.0.1.tar.gz"
+MD5SUM="57d58342377a7232e7bf66246d6a18e6"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="B. Watson"
+EMAIL="urchlay@slackware.uk"
diff --git a/network/qodem/slack-desc b/network/qodem/slack-desc
new file mode 100644
index 0000000000..12885b8c96
--- /dev/null
+++ b/network/qodem/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+     |-----handy-ruler------------------------------------------------------|
+qodem: qodem (BBS-oriented terminal emulator)
+qodem:
+qodem: qodem is a from-scratch clone implementation of the Qmodem
+qodem: communications program made popular in the days when Bulletin Board
+qodem: Systems ruled the night. Qodem emulates the dialing directory and
+qodem: the terminal screen features of Qmodem over both modem and Internet
+qodem: connections.
+qodem:
+qodem: qodem also emulates ATASCII (Atari 8-bit) and PETSCII (Commodore
+qodem: 8-bit), and can be used to run a local shell.
+qodem:
diff --git a/network/qtmib/README b/network/qtmib/README
index 99453f2198..938df0ebb0 100644
--- a/network/qtmib/README
+++ b/network/qtmib/README
@@ -1,8 +1,10 @@
-qtmib is an easy-to-use SNMP MIB Browser based on QT4 library. It is build as
-a front-end for net-snmp, and it allows the user to query any SNMP-enabled
-device. It implements SNMPv1 and SNMPv2c, and it is released under GPL v2
-license.
+qtmib (graphical SNMP MIB Browser)
 
-qtmib supports out of the box a large number of MIBs. We are currently
-tracking netdisco MIB archive. You can also install private MIBs by dropping
-them in ~/.config/qtmib/mibs directory.
+qtmib is an easy-to-use SNMP MIB Browser based on the Qt library. It
+is a front-end for net-snmp, and it allows the user to query any
+SNMP-enabled device. It implements SNMPv1 and SNMPv2c, and it is
+released under the GPLv2 license.
+
+qtmib supports a large number of MIBs out of the box. It currently
+tracks the netdisco MIB archive. You can also install private MIBs by
+dropping them in the ~/.config/qtmib/mibs directory.
diff --git a/network/qtmib/doinst.sh b/network/qtmib/doinst.sh
index 5fb28930db..3e5691a052 100644
--- a/network/qtmib/doinst.sh
+++ b/network/qtmib/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/network/qtmib/git2tarxz.sh b/network/qtmib/git2tarxz.sh
new file mode 100644
index 0000000000..ad0d4eaa07
--- /dev/null
+++ b/network/qtmib/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=qtmib
+CLONE_URL=https://github.com/ac0ra/qtmib
+
+# Upstream is a fork from this version. They don't use tags...
+HARDCODED_VER=1.1.1
+
+set -e
+
+GITDIR=$( mktemp -dt $PRGNAM.git.XXXXXX )
+rm -rf $GITDIR
+git clone $CLONE_URL $GITDIR --depth 1
+
+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=1.1.1+${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/network/qtmib/qtmib.SlackBuild b/network/qtmib/qtmib.SlackBuild
index 4a46a07f17..5fe40fe72b 100644
--- a/network/qtmib/qtmib.SlackBuild
+++ b/network/qtmib/qtmib.SlackBuild
@@ -1,8 +1,9 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for qtmib
 
 # Copyright (c) 2017 LEVAI Daniel
+# Copyright (c) 2020 B. Watson
 # All rights reserved.
 #
 # * Redistribution and use in source and binary forms, with or without
@@ -25,10 +26,26 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20230103 bkw: BUILD=2
+# - one of upstream's icons is the wrong size...
+# - slack-desc, s/Qt4/Qt/ to match the README.
+
+# 20211210 bkw:
+# - update for 1.1.1+20190827_e62ab95 (latest git, supports qt5).
+# - new-style icons.
+
+# 20200129 bkw:
+# - take over maintenance
+# - actually use SLKCFLAGS
+# - grammar nitpicks in README, slack-desc
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=qtmib
-VERSION=${VERSION:-1.1.1}
-BUILD=${BUILD:-1}
+VERSION=${VERSION:-1.1.1+20190827_e62ab95}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -38,7 +55,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,15 +84,16 @@ 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 \
- \( -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 {} \+
 
+# Yes, we really do have to do this.
+autoreconf -if
+
+CFLAGS="$SLKCFLAGS" CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
   --mandir=/usr/man \
@@ -81,9 +103,29 @@ find -L . \
 sed -i "s|share/man|man|g" Makefile
 make
 make install DESTDIR=$PKG
+strip $PKG/usr/bin/*
+
+# 20230103 bkw: this icon is 256x257 (huh?)
+convert -resize 256x256! src/art/$PRGNAM-256.png x.png
+mv x.png src/art/$PRGNAM-256.png
+
+HICOLOR=$PKG/usr/share/icons/hicolor/
+PIXMAPS=$PKG/usr/share/pixmaps
+for png in src/art/$PRGNAM-*.png; do
+  px="$( basename $png .png | cut -d- -f2 )"
+  size=${px}x${px}
+  dir=$HICOLOR/$size/apps
+  mkdir -p $dir
+  cp -a $png $dir/$PRGNAM.png
+done
+
+# don't install qtmib.svg in scalable/, it looks weird.
+
+mkdir -p $HICOLOR/48x48/apps
+convert -resize 48x48 src/art/$PRGNAM-256.png $HICOLOR/48x48/apps/$PRGNAM.png
 
-find $PKG -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 -f $PIXMAPS/*
+ln -s ../icons/hicolor/48x48/apps/$PRGNAM.png $PKG/usr/share/pixmaps/$PRGNAM.png
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a COPYING README RELNOTES $PKG/usr/doc/$PRGNAM-$VERSION
@@ -94,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/network/qtmib/qtmib.info b/network/qtmib/qtmib.info
index a831307154..e935f804d2 100644
--- a/network/qtmib/qtmib.info
+++ b/network/qtmib/qtmib.info
@@ -1,10 +1,10 @@
 PRGNAM="qtmib"
-VERSION="1.1.1"
-HOMEPAGE="http://qtmib.sourceforge.net/"
-DOWNLOAD="https://sourceforge.net/projects/qtmib/files/qtmib/qtmib-1.1.1.tar.bz2"
-MD5SUM="1715ae9c88e1f0d355f9a93b3248455e"
+VERSION="1.1.1+20190827_e62ab95"
+HOMEPAGE="https://github.com/ac0ra/qtmib"
+DOWNLOAD="https://slackware.uk/~urchlay/src/qtmib-1.1.1+20190827_e62ab95.tar.xz"
+MD5SUM="8b84f7a5c069ef012d54ef41d27477f1"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="LEVAI Daniel"
-EMAIL="leva@ecentrum.hu"
+MAINTAINER="B. Watson"
+EMAIL="urchlay@slackware.uk"
diff --git a/network/qtmib/slack-desc b/network/qtmib/slack-desc
index 3272299757..bc4720a14a 100644
--- a/network/qtmib/slack-desc
+++ b/network/qtmib/slack-desc
@@ -6,12 +6,12 @@
 # customary to leave one space after the ':' except on otherwise blank lines.
 
      |-----handy-ruler------------------------------------------------------|
-qtmib: qtmib (an easy-to-use SNMP MIB Browser)
+qtmib: qtmib (graphical SNMP MIB Browser)
 qtmib:
-qtmib: qtmib is an easy-to-use SNMP MIB Browser based on QT4 library. It is
-qtmib: build as a front-end for net-snmp, and it allows the user to query any
+qtmib: qtmib is an easy-to-use SNMP MIB Browser based on the Qt library. It
+qtmib: is a front-end for net-snmp, and it allows the user to query any
 qtmib: SNMP-enabled device. It implements SNMPv1 and SNMPv2c, and it is
-qtmib: released under GPL v2 license.
+qtmib: released under the GPLv2 license.
 qtmib:
 qtmib: Homepage: http://qtmib.sourceforge.net/
 qtmib:
diff --git a/network/quagga/quagga.SlackBuild b/network/quagga/quagga.SlackBuild
index c6e44fe5b5..b22f97c2ff 100644
--- a/network/quagga/quagga.SlackBuild
+++ b/network/quagga/quagga.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for Quagga routing suite
 # Written by zhilla2_at_gm@il.kkom (spamprotected, figure domain out)
@@ -7,10 +7,13 @@
 
 # Don't forget to set USE_PAM if you use it.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=quagga
 VERSION=${VERSION:-1.2.4}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 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}
@@ -88,7 +98,7 @@ USE_PAM=${USE_PAM:-NO}
 
 if [ "$USE_PAM" == 'YES' ]; then
     DO_PAM="--with-libpam"
-    zcat $CWD/vtysh_user.c.diff.gz | patch -p1
+    cat $CWD/vtysh_user.c.diff.gz | patch -p1
     mkdir -p $PKG/etc/pam.d
     cat $CWD/quagga.pam > $PKG/etc/pam.d/quagga
 else
@@ -96,8 +106,9 @@ else
 fi
 
 #./bootstrap.sh
+autoreconf -fi
 
-CFLAGS="$SLKCFLAGS" \
+CFLAGS="$SLKCFLAGS -fcommon" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
     --prefix=/usr \
@@ -143,6 +154,8 @@ cp -a \
   AUTHORS ChangeLog COPYING* README INSTALL REPORTING-BUGS TODO SERVICES \
   $PKG/usr/doc/$PRGNAM-$VERSION
 
+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
@@ -155,4 +168,4 @@ mkdir -p $PKG/etc/logrotate.d
 cat $CWD/quagga.logrotate > $PKG/etc/logrotate.d/quagga.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/network/quagga/quagga.info b/network/quagga/quagga.info
index 442f6f6a18..21efebc7ba 100644
--- a/network/quagga/quagga.info
+++ b/network/quagga/quagga.info
@@ -1,10 +1,10 @@
 PRGNAM="quagga"
 VERSION="1.2.4"
 HOMEPAGE="http://www.nongnu.org/quagga/"
-DOWNLOAD="http://download.savannah.gnu.org/releases/quagga/quagga-1.2.4.tar.gz"
+DOWNLOAD="http://distcache.freebsd.org/ports-distfiles/quagga-1.2.4.tar.gz"
 MD5SUM="eced21b054d71c9e1b7c6ac43286a166"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="c-ares"
+REQUIRES=""
 MAINTAINER="Wayne Cuddy"
 EMAIL="wcuddy@gmail.com"
diff --git a/network/quagga/vtysh_user.c.diff b/network/quagga/vtysh_user.c.diff
new file mode 100644
index 0000000000..7dfad30861
--- /dev/null
+++ b/network/quagga/vtysh_user.c.diff
@@ -0,0 +1,7 @@
+--- old/vtysh/vtysh_user.c.orig	2006-11-03 01:53:58.000000000 +0100
++++ new/vtysh/vtysh_user.c	2006-11-03 01:59:02.000000000 +0100
+@@ -60,2 +60,4 @@ vtysh_pam (const char *user)
+     ret = pam_authenticate (pamh, 0);
++  if (ret != PAM_SUCCESS)
++    printf("Not authenticated. Check /etc/pam.d/quagga.\n");
+   /* printf ("ret %d\n", ret); */
diff --git a/network/quagga/vtysh_user.c.diff.gz b/network/quagga/vtysh_user.c.diff.gz
deleted file mode 100644
index 4bdc3d8455..0000000000
--- a/network/quagga/vtysh_user.c.diff.gz
+++ /dev/null
diff --git a/network/quassel-qt5/README b/network/quassel-qt5/README
deleted file mode 100644
index d89249ddc3..0000000000
--- a/network/quassel-qt5/README
+++ /dev/null
@@ -1,9 +0,0 @@
-Quassel IRC with Qt5 support is a modern, cross-platform, distributed
-IRC client, meaning that one (or multiple) client(s) can attach to and
-detach from a central core - much like the popular combination of screen
-and a text-based IRC client such as WeeChat, but graphical.
-
-This build creates three binaries - quassel, quasselclient, and
-quasselcore.
-
-Please see the README.SBo file for a fuller description.
diff --git a/network/quassel-qt5/README.SBo b/network/quassel-qt5/README.SBo
deleted file mode 100644
index 205e9cf90e..0000000000
--- a/network/quassel-qt5/README.SBo
+++ /dev/null
@@ -1,19 +0,0 @@
-From the Quassel wiki at:
-http://bugs.quassel-irc.org/projects/quassel-irc/wiki
-
-Quassel is a program to connect to an IRC network. It has the unique
-ability to split the graphical component (quasselclient) from the part
-that handles the IRC connection (quasselcore). This means that you can
-have a remote core permanently connected to one or more IRC networks and
-attach a client from wherever you are without moving around any
-information or settings. However, Quassel can easily behave like any
-other client by combining them into one binary which is referred to as
-"Quassel Mono".
-
-In simpler terms, the "monolithic" client is a response to requests for
-a client that behaves like every other IRC client. The monolithic client
-(GUI) is what makes the connections to the IRC networks. In normal
-operation, the client (GUI) connects to a core, it is completely
-incapable of connecting to anything else. The core receives connections
-from clients, and makes connections to the IRC networks, it also handles
-logging (currently everything gets put in the database).
diff --git a/network/quassel-qt5/quassel-qt5.SlackBuild b/network/quassel-qt5/quassel-qt5.SlackBuild
deleted file mode 100644
index c136a341d9..0000000000
--- a/network/quassel-qt5/quassel-qt5.SlackBuild
+++ /dev/null
@@ -1,111 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for quassel
-
-# Written by crocket (crockabiscuit@gmail.com)
-# Copyright 2017-2019 Donald Cooley South Haven, IN 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=quassel-qt5
-SRCNAM=quassel
-VERSION=${VERSION:-0.13.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.?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 {} \;
-
-mkdir -p build
-cd build
-  cmake \
-    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
-    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DWANT_CORE=ON \
-    -DWANT_MONO=ON \
-    -DWANT_QTCLIENT=ON \
-    -DUSE_QT4=OFF \
-    -DWITH_KDE=OFF \
-    -DWITH_BUNDLED_ICONS=ON \
-    -DWITH_OXYGEN_ICONS=OFF \
-    -DWITH_WEBENGINE=ON \
-    -DWITH_WEBKIT=OFF \
-    -DSTATIC=OFF \
-    -DEMBED_DATA=OFF \
-    -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 -name perllocal.pod -o -name ".packlist" -o -name "*.bs" | xargs rm -f || true
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS COPYING INSTALL README* ChangeLog gpl-2.0.txt gpl-3.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/network/quassel-qt5/quassel-qt5.info b/network/quassel-qt5/quassel-qt5.info
deleted file mode 100644
index fb2b563490..0000000000
--- a/network/quassel-qt5/quassel-qt5.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="quassel-qt5"
-VERSION="0.13.1"
-HOMEPAGE="https://quassel-irc.org/"
-DOWNLOAD="https://quassel-irc.org/pub/quassel-0.13.1.tar.bz2"
-MD5SUM="7f9b8074632262a392c1d00936808d03"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="qca-qt5"
-MAINTAINER="Donald Cooley"
-EMAIL="chytraeu@sdf.org"
diff --git a/network/quassel-qt5/slack-desc b/network/quassel-qt5/slack-desc
deleted file mode 100644
index 84017f9688..0000000000
--- a/network/quassel-qt5/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------------------------------------------------------|
-quassel-qt5: quassel-qt5 (A modern, cross-platform, distributed IRC client)
-quassel-qt5:
-quassel-qt5: Quassel IRC with Qt5 support is a modern, cross-platform, distributed
-quassel-qt5: IRC client, meaning that one (or multiple) client(s) can attach to and
-quassel-qt5: detach from a central core - much like the popular combination of
-quassel-qt5: screen and a text-based IRC client such as WeeChat, but graphical.
-quassel-qt5:
-quassel-qt5:
-quassel-qt5: https://quassel-irc.org
-quassel-qt5:
-quassel-qt5:
diff --git a/network/quassel/README b/network/quassel/README
index 1d76bcd7e2..7700480c6d 100644
--- a/network/quassel/README
+++ b/network/quassel/README
@@ -1,3 +1,5 @@
+quassel (A modern, cross-platform, distributed IRC client)
+
 Quassel IRC is a modern, cross-platform, distributed IRC client, meaning
 that one (or multiple) client(s) can attach to and detach from a central
 core - much like the popular combination of screen and a text-based IRC
diff --git a/network/quassel/quassel.SlackBuild b/network/quassel/quassel.SlackBuild
index be311d6826..86fa02e958 100644
--- a/network/quassel/quassel.SlackBuild
+++ b/network/quassel/quassel.SlackBuild
@@ -1,32 +1,25 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for quassel
 
 # Written by crocket (crockabiscuit@gmail.com)
 # Copyright 2017-2019 Donald Cooley South Haven, IN 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.
+# Copyright 2022 B. Watson <urchlay@slackware.uk>
+
+# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
+
+# 20220425 bkw: BUILD=2
+# - take over maintenance.
+# - remove useless INSTALL from doc dir.
+# - use .tar.xz download.
+
+cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=quassel
-VERSION=${VERSION:-0.13.1}
-BUILD=${BUILD:-1}
+VERSION=${VERSION:-0.14.0}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -36,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}
@@ -61,14 +58,17 @@ 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 {} \+
+
+# 20220425 bkw: note to self: the -DWITH_WEBKIT=ON is for QtWebKit,
+# part of Slackware's qt5 package. It has nothing to do with webkit2gtk.
 
 mkdir -p build
 cd build
@@ -80,7 +80,7 @@ cd build
     -DWANT_CORE=ON \
     -DWANT_MONO=ON \
     -DWANT_QTCLIENT=ON \
-    -DUSE_QT4=ON \
+    -DUSE_QT4=OFF \
     -DWITH_KDE=ON \
     -DWITH_BUNDLED_ICONS=ON \
     -DWITH_OXYGEN_ICONS=ON \
@@ -90,16 +90,11 @@ cd build
     -DEMBED_DATA=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
-
-find $PKG -name perllocal.pod -o -name ".packlist" -o -name "*.bs" | xargs rm -f || true
-
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS COPYING INSTALL README* ChangeLog gpl-2.0.txt gpl-3.0.txt  \
+cp -a AUTHORS COPYING README* ChangeLog gpl-2.0.txt gpl-3.0.txt  \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
@@ -108,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/network/quassel/quassel.info b/network/quassel/quassel.info
index a4e583423a..0367f4e6a8 100644
--- a/network/quassel/quassel.info
+++ b/network/quassel/quassel.info
@@ -1,10 +1,10 @@
 PRGNAM="quassel"
-VERSION="0.13.1"
+VERSION="0.14.0"
 HOMEPAGE="https://quassel-irc.org/"
-DOWNLOAD="https://quassel-irc.org/pub/quassel-0.13.1.tar.bz2"
-MD5SUM="7f9b8074632262a392c1d00936808d03"
+DOWNLOAD="https://quassel-irc.org/pub/quassel-0.14.0.tar.xz"
+MD5SUM="92b3e9dc27f5d9692445292e83ee728d"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Donald Cooley"
-EMAIL="chytraeu@sdf.org"
+MAINTAINER="B. Watson"
+EMAIL="urchlay@slackware.uk"
diff --git a/network/quassel/slack-desc b/network/quassel/slack-desc
index dbb7dda9c1..659711f138 100644
--- a/network/quassel/slack-desc
+++ b/network/quassel/slack-desc
@@ -13,7 +13,7 @@ quassel: meaning that one (or multiple) client(s) can attach to and detach
 quassel: from a central core - much like the popular combination of screen and
 quassel: a text-based IRC client such as WeeChat, but graphical.
 quassel:
+quassel: https://quassel-irc.org
 quassel:
 quassel:
-quassel: https://quassel-irc.org
 quassel:
diff --git a/network/qutebrowser-bin/README b/network/qutebrowser-bin/README
new file mode 100644
index 0000000000..49fca7d063
--- /dev/null
+++ b/network/qutebrowser-bin/README
@@ -0,0 +1,19 @@
+Qutebrowser is a keyboard-focused browser with a minimal GUI. It's based
+on Python and Qt and free software, licensed under the GPL.
+
+It was inspired by other browsers/addons like dwb and
+Vimperator/Pentadactyl.
+
+This SlackBuild installs all needed dependencies in a virtual
+environment subfolder. This comes with an up-to-date Qt/PyQt including a
+pre-compiled QtWebEngine binary, but has a couple of caveats:
+* It only works on 64-bit x86 systems.
+* It comes with a QtWebEngine compiled without proprietary codec support
+  (such as h.264).
+
+qt6 needed for this script can be built without webengine to speed up
+compilation. If such an option is not available, just replace the line
+tar xvf $CWD/$SRCNAM-$VERSION.tar.xz
+with
+tar xvf $CWD/$SRCNAM-$VERSION.tar.xz --exclude=qtwebengine
+in qt6.SlackBuild.
diff --git a/network/qutebrowser-bin/README.SBo b/network/qutebrowser-bin/README.SBo
new file mode 100644
index 0000000000..b097c0de19
--- /dev/null
+++ b/network/qutebrowser-bin/README.SBo
@@ -0,0 +1,37 @@
+Qutebrowser crashes
+===================
+
+If qutebrowser starts to crash, its cache may be corrupt. This often
+happens after an upgrade. To remove the cache run:
+rm -rf ~/.cache/qutebrowser/
+rm -rf ~/.local/share/qutebrowser/webengine/Application\ Cache/
+rm -rf ~/.local/share/qutebrowser/webengine/GPUCache
+rm -rf ~/.local/share/qutebrowser/webengine/Service\ Worker/CacheStorage
+rm -rf ~/.local/share/qutebrowser/webengine/Service\ Worker/ScriptCache
+
+Widevine support
+================
+
+Widevine DRM support requires libwidevinecdm.so plugin. Qutebrowser
+searches for it in the following directories:
+
+/opt/google/chrome
+/usr/lib/chromium
+/usr/lib64/chromium
+/usr/lib/chromium-browser
+
+Also the path to libwidevinecdm.so can be passed via qt.args setting:
+:set qt.args "['widevine-path=/path/to/libwidevinecdm.so']"
+
+libwidevinecdm.so can be download at
+https://dl.google.com/widevine-cdm/X.X.X.X-linux-x64.zip
+and manually put to one of the above directories. The version "X.X.X.X"
+to download can be found at
+https://dl.google.com/widevine-cdm/versions.txt
+
+libwidevinecdm.so provided by google-chrome from /extra, Alien Bob's
+chromium-widevine-plugin, etc. can be used as well.
+
+To test the Widevine DRM support, go to
+https://shaka-player-demo.appspot.com/demo/
+and play the Sintel video.
diff --git a/network/qutebrowser-bin/doinst.sh b/network/qutebrowser-bin/doinst.sh
new file mode 100644
index 0000000000..65c7e2eeb9
--- /dev/null
+++ b/network/qutebrowser-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 -f usr/share/icons/hicolor >/dev/null 2>&1
+  fi
+fi
diff --git a/network/qutebrowser-bin/qutebrowser-bin.SlackBuild b/network/qutebrowser-bin/qutebrowser-bin.SlackBuild
new file mode 100644
index 0000000000..81c434bd9f
--- /dev/null
+++ b/network/qutebrowser-bin/qutebrowser-bin.SlackBuild
@@ -0,0 +1,168 @@
+#!/bin/bash
+
+# Slackware build script for qutebrowser-bin
+
+# Copyright 2019-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=qutebrowser-bin
+VERSION=${VERSION:-3.1.0}
+SSLVERSION=${SSLVERSION:-3.2.1}
+BUILD=${BUILD:-4}
+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" ]; then
+  echo "Only x86_64 is supported."
+  exit 1
+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/opt $OUTPUT
+cd $PKG/opt
+tar xvf $CWD/qutebrowser-$VERSION.tar.gz
+mv qutebrowser-$VERSION qutebrowser
+cd qutebrowser
+sed -i.bak "s|\(run_venv(venv_dir, 'python', '-m', 'pip', 'install',\)|\1 \
+'--no-index', '--find-links=$CWD/',|" scripts/mkvenv.py
+
+sed -i "/env\['PATH'\] = str(bin_path) + os.pathsep + env\['PATH'\]/d" \
+  scripts/asciidoc2html.py
+
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -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 scripts/mkvenv.py --skip-smoke-test
+
+mv scripts/mkvenv.py.bak scripts/mkvenv.py
+
+find ./ -type f -name '*.pyc' -delete
+find ./ -type d -name '__pycache__' -delete
+find ./ -type f -exec sed -i -e "s|$PKG||" {} \;
+find ./ -type f -exec sed -i -e \
+  '1,2 s|^#!/usr/bin/env python.*$|#!/opt/qutebrowser/.venv/bin/python3|' {} \;
+.venv/bin/python3 -m compileall scripts/__init__.py \
+  scripts/setupcommon.py scripts/utils.py -fq
+.venv/bin/python3 -m compileall .venv/lib -fq
+
+find -L .venv/lib -type f -name "*.so" -exec chmod 755 {} \;
+
+.venv/bin/python3 scripts/asciidoc2html.py
+a2x -f manpage doc/qutebrowser.1.asciidoc
+gzip -9 doc/qutebrowser.1
+mkdir -p $PKG/usr/man/man1
+mv doc/qutebrowser.1.gz $PKG/usr/man/man1
+
+mkdir -p $PKG/usr/share/{metainfo,applications,icons/hicolor/scalable/apps,pixmaps,qutebrowser/pdf.js}
+install -m 0644 misc/org.qutebrowser.qutebrowser.appdata.xml \
+  $PKG/usr/share/metainfo/
+install -m 0644 misc/org.qutebrowser.qutebrowser.desktop \
+  $PKG/usr/share/applications
+for res in 16 24 32 48 64 96 128 256 512; do
+  mkdir -p $PKG/usr/share/icons/hicolor/${res}x${res}/apps/;
+  install -m 0644 "qutebrowser/icons/qutebrowser-${res}x${res}.png" \
+"$PKG/usr/share/icons/hicolor/${res}x${res}/apps/qutebrowser.png"
+done
+install -m 0644 "qutebrowser/icons/qutebrowser.svg" \
+  $PKG/usr/share/icons/hicolor/scalable/apps/
+install -m 0644 "qutebrowser/icons/qutebrowser.xpm" $PKG/usr/share/pixmaps/
+
+cp -a misc/userscripts $PKG/usr/share/qutebrowser
+cp -a scripts $PKG/usr/share/qutebrowser
+rm -rf $PKG/usr/share/qutebrowser/scripts/{__pycache__,dev,testbrowser,__init__.py,asciidoc2html.py,setupcommon.py,link_pyqt.py}
+
+mkdir -p $PKG/usr/bin
+install -m 0755 -o root -g root $CWD/wrapper.qutebrowser \
+  $PKG/usr/bin/qutebrowser
+
+find ./ -type f -exec sed -i -e \
+  's|/usr/share/pdf.js|/usr/share/qutebrowser/pdf.js|' {} \;
+cd $PKG/usr/share/qutebrowser/pdf.js
+unzip $CWD/pdfjs-*-dist.zip
+chown -R root:root $PKG/usr/share/qutebrowser/pdf.js
+find ./ -type f -exec chmod 644 {} \;
+
+cd $TMP
+rm -rf openssl-$SSLVERSION
+tar xvf $CWD/openssl-$SSLVERSION.tar.gz
+cd openssl-$SSLVERSION
+./config \
+ zlib \
+ enable-camellia \
+ enable-seed \
+ enable-rfc3779 \
+ enable-cms \
+ enable-md2 \
+ enable-rc5 \
+ enable-ssl3 \
+ enable-ssl3-method \
+ no-weak-ssl-ciphers \
+ no-mdc2 \
+ no-ec2m \
+ no-sm2 \
+ no-sm4 \
+ no-sse2 \
+ shared
+
+make
+
+mv libcrypto.so.3 libssl.so.3 $PKG/opt/qutebrowser
+cd $PKG/opt/qutebrowser
+ln -s libssl.so.3 libssl.so
+ln -s libcrypto.so.3 libcrypto.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
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+mv $PKG/opt/qutebrowser/README.asciidoc $PKG/usr/doc/$PRGNAM-$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/network/qutebrowser-bin/qutebrowser-bin.info b/network/qutebrowser-bin/qutebrowser-bin.info
new file mode 100644
index 0000000000..61e6f74757
--- /dev/null
+++ b/network/qutebrowser-bin/qutebrowser-bin.info
@@ -0,0 +1,46 @@
+PRGNAM="qutebrowser-bin"
+VERSION="3.1.0"
+HOMEPAGE="https://qutebrowser.org"
+DOWNLOAD="UNSUPPORTED"
+MD5SUM=""
+DOWNLOAD_x86_64="https://github.com/qutebrowser/qutebrowser/archive/v3.1.0/qutebrowser-3.1.0.tar.gz \
+                 https://files.pythonhosted.org/packages/47/6a/453160888fab7c6a432a6e25f8afe6256d0d9f2cbd25971021da6491d899/pip-23.3.1-py3-none-any.whl \
+                 https://files.pythonhosted.org/packages/bb/e1/ed2dd0850446b8697ad28d118df885ad04140c64ace06c4bd559f7c8a94f/setuptools-69.0.2-py3-none-any.whl \
+                 https://files.pythonhosted.org/packages/c7/c3/55076fc728723ef927521abaa1955213d094933dc36d4a2008d5101e1af5/wheel-0.42.0-py3-none-any.whl \
+                 https://files.pythonhosted.org/packages/0b/5a/51f4762b9f314b5577d17704bc1280532a725ba359d6cc177ab6de692035/PyQt6-6.6.1-cp38-abi3-manylinux_2_28_x86_64.whl \
+                 https://files.pythonhosted.org/packages/d5/64/7b8983341e4f8748f0d76ebc69c2740cb0d19a49f14f7d83db3b079c4abe/PyQt6_Qt6-6.6.1-py3-none-manylinux_2_28_x86_64.whl \
+                 https://files.pythonhosted.org/packages/e2/21/be11813fb40cce933afa2a3e523aa998ca1089f1678bdb5ab11d19b305e2/PyQt6_sip-13.6.0-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.whl \
+                 https://files.pythonhosted.org/packages/36/91/50982f28730c893a8c68b0e92debc761e8a475cf1df686dee22a4c255316/PyQt6_WebEngine-6.6.0-cp37-abi3-manylinux_2_28_x86_64.whl \
+                 https://files.pythonhosted.org/packages/45/56/ac52d42ad9949714dffbbaee29717a79273fbeb2ea1f8a0b63a7b6b75f40/PyQt6_WebEngine_Qt6-6.6.1-py3-none-manylinux_2_28_x86_64.whl \
+                 https://files.pythonhosted.org/packages/06/26/39fad77ba6fe8bd5b1c5ebe411ea84a768075f40caa5400e889678de39b3/adblock-0.6.0-cp37-abi3-manylinux_2_12_x86_64.manylinux2010_x86_64.whl \
+                 https://files.pythonhosted.org/packages/d1/d6/3965ed04c63042e047cb6a3e6ed1a63a35087b6a609aa3a15ed8ac56c221/colorama-0.4.6-py2.py3-none-any.whl \
+                 https://files.pythonhosted.org/packages/bc/c3/f068337a370801f372f2f8f6bad74a5c140f6fda3d9de154052708dd3c65/Jinja2-3.1.2-py3-none-any.whl \
+                 https://files.pythonhosted.org/packages/de/63/cb7e71984e9159ec5f45b5e81e896c8bdd0e45fe3fc6ce02ab497f0d790e/MarkupSafe-2.1.3-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl \
+                 https://files.pythonhosted.org/packages/97/9c/372fef8377a6e340b1704768d20daaded98bf13282b5327beb2e2fe2c7ef/pygments-2.17.2-py3-none-any.whl \
+                 https://files.pythonhosted.org/packages/7d/39/472f2554a0f1e825bd7c5afc11c817cd7a2f3657460f7159f691fbb37c51/PyYAML-6.0.1-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl \
+                 https://files.pythonhosted.org/packages/d9/66/48866fc6b158c81cc2bfecc04c480f105c6040e8b077bc54c634b4a67926/zipp-3.17.0-py3-none-any.whl \
+                 https://files.pythonhosted.org/packages/ff/1d/8f96eb0ce05f20e5d0722a3e910627a26a382c81f40c7292faa91545e43f/asciidoc-10.2.0-py2.py3-none-any.whl \
+                 https://www.openssl.org/source/openssl-3.2.1.tar.gz \
+                 https://github.com/mozilla/pdf.js/releases/download/v4.0.379/pdfjs-4.0.379-dist.zip"
+MD5SUM_x86_64="a4613158902f61af23c2b38f1ad427aa \
+               5d2d058044a3ae2800d18e358ddc72ca \
+               f096ed836f4036a11aa277fa16dc09ff \
+               779d91395ceb12e15e3a585b30b53f9f \
+               8e724abf93f1861c98705a1eaaf2eabf \
+               bde446baa891d9c22a3ddb1496476aea \
+               260fb515820b6dc4878df9288a8eea55 \
+               5086b644a2e12f110878aee8d3282a2b \
+               d8d0d2f0c6ec1dafefac241836a0712b \
+               c8653c10db5900c22054b27a03924988 \
+               3fc7a89530d68d7ea231ebe779c0db9c \
+               00ccdb509d3592cc2163b286177d75c8 \
+               c2388278e7f7c4bb11ae830da5a071cc \
+               05bab8cd38860c62d6e146ec2949fefe \
+               4d6e421811f9057f61344a07257dbc26 \
+               d93f0b8485000b37800a6de09ed6c1cb \
+               d47ea986a8945257f0f54e92455d198f \
+               c239213887804ba00654884918b37441 \
+               0e74e78c467097afeb1ddafbc290a05a"
+REQUIRES="qt6"
+MAINTAINER="Alexander Verbovetsky"
+EMAIL="alik@ejik.org"
diff --git a/network/qutebrowser-bin/slack-desc b/network/qutebrowser-bin/slack-desc
new file mode 100644
index 0000000000..44be0b27b1
--- /dev/null
+++ b/network/qutebrowser-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------------------------------------------------------|
+qutebrowser-bin: qutebrowser-bin (keyboard-focused browser)
+qutebrowser-bin:
+qutebrowser-bin: Qutebrowser is a keyboard-focused browser with a minimal GUI. It's
+qutebrowser-bin: based on Python and Qt and free software, licensed under the GPL.
+qutebrowser-bin:
+qutebrowser-bin: It was inspired by other browsers/addons like dwb and
+qutebrowser-bin: Vimperator/Pentadactyl.
+qutebrowser-bin:
+qutebrowser-bin: This script installs all needed dependencies in a .venv subfolder.
+qutebrowser-bin:
+qutebrowser-bin: Homepage: https://www.qutebrowser.org
diff --git a/network/qutebrowser-bin/wrapper.qutebrowser b/network/qutebrowser-bin/wrapper.qutebrowser
new file mode 100644
index 0000000000..179325561c
--- /dev/null
+++ b/network/qutebrowser-bin/wrapper.qutebrowser
@@ -0,0 +1,3 @@
+#!/bin/bash
+LD_LIBRARY_PATH="/opt/qutebrowser" \
+setsid /opt/qutebrowser/.venv/bin/python3 -m qutebrowser "$@"
diff --git a/network/qutebrowser/README b/network/qutebrowser/README
index 7eb57d6d16..f5269d0514 100644
--- a/network/qutebrowser/README
+++ b/network/qutebrowser/README
@@ -1,30 +1,53 @@
-qutebrowser (qt5 keyboard driven webbrowser)
+Qutebrowser (qt5 keyboard driven web browser)
 
-qutebrowser is a keyboard-focused browser with a minimal
+Qutebrowser is a keyboard-focused browser with a minimal
 GUI. It's based on Python and PyQt5 and free software,
 licensed under the GPL.  It was inspired by other
 browsers/addons like dwb and Vimperator/Pentadactyl.
 
+ADBLOCK NOTE:
 
-Optional dependency:
+If the Python `adblock' library is available, it is now used to
+integrate Brave's Rust adblocker library for improved adblocking based
+on ABP-like filter lists (such as EasyList).  If it is unavailable,
+Qutebrowser falls back to host-blocking.
 
-qt5-webkit-annulen (for the webkit backend)
+There are 36 rust requirements for python-adblock, and they aren't
+available on SBo yet, so the easiest way to install it is with pip3,
+which requires a working network connection.
 
+Instructions to install it into ~/.local/lib with pip3:
 
-NOTE:
+1. Update llvm to the package in extra/
 
-pyPEG2 and MarkupSafe both need building for python3:
+To update with slackpkg:
 
-PYTHON3=yes ./pyPEG2.SlackBuild
-PYTHON3=yes ./MarkupSafe.SlackBuild
+Edit /etc/slackpkg/slackpkg.conf and change the order of PRIORITY so
+that `extra' is before `%PKGMAIN' in the list:
 
-If you are using sbopkg you can add those as options on
-their pages before starting the build queue.
+  PRIORITY=( extra patches %PKGMAIN pasture testing )
 
+Run `slackpkg upgrade llvm'
 
-NOTE 2:
+Reset PRIORITY back to the default order.  The pip3 commands should be
+run as your normal user:
 
-There is a list of changes and fixes for versions on the
-release page:
+2. Update pip3 to the latest version: pip3 install --user --upgrade pip
 
-https://github.com/qutebrowser/qutebrowser/releases
+3. Install adblock: pip3 install --user adblock
+
+Now start Qutebrowser and check `:version;'.  It should list adblock
+with the version number, e.g.:
+
+adblock: 0.4.2
+
+Next, run the update command:
+
+:adblock-update
+
+To see what options there are:
+
+:set content.blocking<TAB>
+
+llvm can be added to /etc/slackpkg/blacklist to keep this version, or
+run the slackpkg command again to revert back to the stock version.
diff --git a/network/qutebrowser/qutebrowser.SlackBuild b/network/qutebrowser/qutebrowser.SlackBuild
index c2eba1f9ea..66a1688230 100644
--- a/network/qutebrowser/qutebrowser.SlackBuild
+++ b/network/qutebrowser/qutebrowser.SlackBuild
@@ -1,30 +1,16 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for qutebrowser
-# Copyright 2017 Dave Woodfall <dave@tty1.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.
+# written by Dave Woodfall <dave@slackbuilds.org>
+# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/
+
+cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=qutebrowser
-VERSION=${VERSION:-1.6.3}
-BUILD=${BUILD:-1}
+VERSION=${VERSION:-2.5.4}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -34,25 +20,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}
 
-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
@@ -68,20 +47,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 {} \;
 
-make -f misc/Makefile install DESTDIR=$PKG PREFIX=/usr
-
-find $PKG -name \*\.opt-1.pyc -exec rm -f {} \;
+make -f misc/Makefile install DESTDIR=$PKG PREFIX=/usr MANDIR=/usr/man
 
-mkdir -p $PKG/usr/share/pixmaps
-cp icons/qutebrowser.xpm $PKG/usr/share/pixmaps/
+# shouldn't be executable
+chmod -x $PKG/usr/share/$PRGNAM/userscripts/README.md
 
-find $PKG -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 \*\.opt-1.pyc -exec rm -f {} \;
 
-mv $PKG/usr/share/man $PKG/usr
+install -D -m 0644 icons/qutebrowser.xpm \
+   $PKG/usr/share/pixmaps/qutebrowser.xpm
 
-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/man1/qutebrowser.1
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a LICENSE README.asciidoc $PKG/usr/doc/$PRGNAM-$VERSION
@@ -92,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/network/qutebrowser/qutebrowser.info b/network/qutebrowser/qutebrowser.info
index a0e5b1cf29..6e55f18a6f 100644
--- a/network/qutebrowser/qutebrowser.info
+++ b/network/qutebrowser/qutebrowser.info
@@ -1,10 +1,10 @@
 PRGNAM="qutebrowser"
-VERSION="1.6.3"
-HOMEPAGE="http://qutebrowser.org/"
-DOWNLOAD="https://github.com/qutebrowser/qutebrowser/releases/download/v1.6.3/qutebrowser-1.6.3.tar.gz"
-MD5SUM="c4c2ecd16a7e41597d806351d5fac386"
+VERSION="2.5.4"
+HOMEPAGE="https://qutebrowser.org/"
+DOWNLOAD="https://github.com/qutebrowser/qutebrowser/releases/download/v2.5.4/qutebrowser-2.5.4.tar.gz"
+MD5SUM="121f4329ec6b36604da73f7563cea384"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="python3-attrs python3-PyYAML Pygments Jinja2 pyPEG2 python3-PyQt5"
-MAINTAINER="Dave Woodfall"
+REQUIRES="python3-PyQtWebEngine"
+MAINTAINER="D Woodfall"
 EMAIL="dave@slackbuilds.org"
diff --git a/network/qutebrowser/slack-desc b/network/qutebrowser/slack-desc
index 52812e7293..1c39aaee95 100644
--- a/network/qutebrowser/slack-desc
+++ b/network/qutebrowser/slack-desc
@@ -10,10 +10,10 @@ qutebrowser: qutebrowser (qt5 keyboard driven webbrowser)
 qutebrowser:
 qutebrowser: qutebrowser is a keyboard-focused browser with a minimal GUI. It's
 qutebrowser: based on Python and PyQt5 and free software, licensed under the GPL.
-qutebrowser: It was inspired by other browsers/addons like dwb and
-qutebrowser: Vimperator/Pentadactyl.
 qutebrowser:
-qutebrowser: qt5-webkit-annulen is an optional dependency for the webkit backend.
+qutebrowser: It was inspired by other browsers/addons like Vimperator/Pentadactyl
+qutebrowser: and dwb.
 qutebrowser:
 qutebrowser: https://qutebrowser.org
 qutebrowser:
+qutebrowser:
diff --git a/network/quvi/README b/network/quvi/README
deleted file mode 100644
index 5fea4d587a..0000000000
--- a/network/quvi/README
+++ /dev/null
@@ -1,4 +0,0 @@
-quvi is a command line tool for parsing video download links. It
-supports Youtube and other video websites. libquvi is a library for
-parsing video download links with C API. It is written in C, and
-intended to be a cross-platform library.
diff --git a/network/quvi/quvi.SlackBuild b/network/quvi/quvi.SlackBuild
deleted file mode 100644
index 57c3f4a19e..0000000000
--- a/network/quvi/quvi.SlackBuild
+++ /dev/null
@@ -1,89 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for quvi
-
-# Made by trebol 2012/12/13
-# Modified by crocket <crockabiscuit@gmail.com
-# Modified by Marek Srejma <sam_web@yahoo.de> 2017/05/03
-
-PRGNAM=quvi
-VERSION=${VERSION:-0.9.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
-
-DOCS="AUTHORS COPYING ChangeLog INSTALL NEWS README ABOUT-NLS VERSION"
-
-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 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 $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/network/quvi/quvi.info b/network/quvi/quvi.info
deleted file mode 100644
index 268c916084..0000000000
--- a/network/quvi/quvi.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="quvi"
-VERSION="0.9.5"
-HOMEPAGE="http://quvi.sourceforge.net"
-DOWNLOAD="http://downloads.sourceforge.net/quvi/quvi-0.9.5.tar.xz"
-MD5SUM="baa1d7b25e9fd173e952e27d4aa4b933"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="libquvi"
-MAINTAINER="Marek Srejma"
-EMAIL="sam_web@yahoo.de"
diff --git a/network/quvi/slack-desc b/network/quvi/slack-desc
deleted file mode 100644
index 3a5085a4f6..0000000000
--- a/network/quvi/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------------------------------------------------------|
-quvi: quvi (video download link parser)
-quvi:
-quvi: quvi is a command line tool for parsing video download links. It
-quvi: supports Youtube and other video websites. libquvi is a library for
-quvi: parsing video download links with C API. It is written in C, and
-quvi: intended to be a cross-platform library.
-quvi:
-quvi: homepage: http://quvi.sourceforge.net
-quvi:
-quvi:
-quvi:
diff --git a/network/r2e/README b/network/r2e/README
deleted file mode 100644
index 267f5b87e8..0000000000
--- a/network/r2e/README
+++ /dev/null
@@ -1,15 +0,0 @@
-rss2email is a free tool for delivering news from RSS feeds to your
-email program.  This allows you to view RSS feeds in an interface you
-are already familiar with and to apply filters to incoming feeds.
-
-NOTE:
-rss2email has no option for disabling HTTPS certificate verification,
-because Python requires this.
-
-But it is possible to monkeypatch the ssl module to disable
-verification globally for all feeds.
-
-If you want the verification to be disabled pass CERTVER=no to the
-script: CERTVER=no ./r2e.SlackBuild
-
-See README.Slackware for post-installation configuration.
diff --git a/network/r2e/README.Slackware b/network/r2e/README.Slackware
deleted file mode 100644
index 2d0503a968..0000000000
--- a/network/r2e/README.Slackware
+++ /dev/null
@@ -1,14 +0,0 @@
-After installing this package please do the following:
-
-        mkdir ~/.rss2email
-        r2e new you@yourdomain.com
-        r2e add http://yourfeed.yourdomain.com
-        r2e run --no-send
-
-To customize rss2email copy /usr/doc/config.py.example to ~/.rss2email
-and edit it to taste.
-
-You will probably want to create a cron job to periodically execute
-"r2e run".
-
-See http://www.allthingsrss.com/rss2email/ for additional information.
diff --git a/network/r2e/doinst.sh b/network/r2e/doinst.sh
deleted file mode 100644
index b8ba97c4b3..0000000000
--- a/network/r2e/doinst.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-if [ -d /etc/r2e ]; then
-  cat << EOF > /etc/r2e/README.config
-Starting version 2.71 to customize r2e please edit config.py in your
-user directory ~/.rss2email
-
-File /etc/r2e/config.py is not used anymore.  The directory /etc/r2e
-can safely be removed.
-
-See /usr/doc/config.py.example for a full list of available
-configuration variables.
-EOF
-fi
diff --git a/network/r2e/fix-email-header-injection.patch b/network/r2e/fix-email-header-injection.patch
deleted file mode 100644
index 8407d5d0ee..0000000000
--- a/network/r2e/fix-email-header-injection.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From: Etienne Millon <etienne.millon@gmail.com>
-Date: Fri, 25 May 2012 18:04:08 +0200
-Subject: Fix email header injection
-
-Bug: http://bugs.python.org/issue5871
-Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=526064
----
- rss2email.py |   11 +++++++++--
- 1 file changed, 9 insertions(+), 2 deletions(-)
-
-diff --git a/rss2email.py b/rss2email.py
-index 69998db..a6c3cbe 100755
---- a/rss2email.py
-+++ b/rss2email.py
-@@ -111,9 +111,16 @@ PROXY=""
- CHARSET_LIST='US-ASCII', 'ISO-8859-1', 'UTF-8', 'BIG5', 'ISO-2022-JP'
- 
- from email.MIMEText import MIMEText
--from email.Header import Header
-+from email.Header import Header as _Header
- from email.Utils import parseaddr, formataddr
--			 
-+
-+class Header(_Header):
-+    # Work-around for <http://bugs.python.org/issue5871>
-+    def append(self, s=None, *args, **kwargs):
-+        if s is not None:
-+            s = s.replace('\n', ' ').replace('\r', ' ')
-+        _Header.append(self, s, *args, **kwargs)
-+
- # Note: You can also override the send function.
- 
- def send(sender, recipient, subject, body, contenttype, extraheaders=None, smtpserver=None):
diff --git a/network/r2e/r2e.SlackBuild b/network/r2e/r2e.SlackBuild
deleted file mode 100644
index 4811e8e369..0000000000
--- a/network/r2e/r2e.SlackBuild
+++ /dev/null
@@ -1,79 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for r2e
-
-# Written by Tom Canich <tcanich@canich.net>
-# Released under the BSD
-# Modified by Robby Workman <rworkman@slackbuilds.org>
-# Copyright (c) 2009, Tom Canich, State College, Pennsylvania, USA
-# Copyright 2016, 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=r2e
-PRGNAMLONG=rss2email
-VERSION=${VERSION:-2.71}
-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 $PRGNAMLONG-$VERSION
-tar xvf $CWD/$PRGNAMLONG-$VERSION.tar.gz
-chmod -R a=r,a+X,u+w $PRGNAMLONG-$VERSION
-cd $PRGNAMLONG-$VERSION
-chown -R root:root .
-
-patch -p1 < $CWD/remove-newlines.patch
-patch -p1 < $CWD/fix-email-header-injection.patch
-sed --in-place \
-  -e 's/http:\/\/rss2email.infogami.com/http:\/\/www.allthingsrss.com\/rss2email\//g' \
-  -e 's/__version__ = "2.70"/__version__ = "2.71"/' \
-  rss2email.py
-[ "${CERTVER:-yes}" = "no" ] && patch < $CWD/rss2email.certver.patch
-
-mkdir -p $PKG/usr/share/$PRGNAM
-install -m 0644 -o root -g root feedparser.py $PKG/usr/share/$PRGNAM
-install -m 0644 -o root -g root html2text.py $PKG/usr/share/$PRGNAM
-install -m 0644 -o root -g root rss2email.py $PKG/usr/share/$PRGNAM
-
-mkdir -p $PKG/usr/bin
-install -m 0755 -o root -g root $CWD/wrapper.r2e $PKG/usr/bin/r2e
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a CHANGELOG config.py.example readme.html $PKG/usr/doc/$PRGNAM-$VERSION
-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
-sed "s%@VERSION@%$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-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/network/r2e/r2e.info b/network/r2e/r2e.info
deleted file mode 100644
index 13c53aeefa..0000000000
--- a/network/r2e/r2e.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="r2e"
-VERSION="2.71"
-HOMEPAGE="http://www.allthingsrss.com/rss2email/"
-DOWNLOAD="http://www.allthingsrss.com/rss2email/rss2email-2.71.tar.gz"
-MD5SUM="7d7dbac5aa181b07261516213a312f39"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Alexander Verbovetsky"
-EMAIL="alik@ejik.org"
diff --git a/network/r2e/remove-newlines.patch b/network/r2e/remove-newlines.patch
deleted file mode 100644
index 7ae7751633..0000000000
--- a/network/r2e/remove-newlines.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-From: David Watson <dwatson@debian.org>
-Date: Mon, 18 Apr 2011 10:41:04 +0200
-Subject: remove-newlines
-
----
- html2text.py |    1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/html2text.py b/html2text.py
-index 0ed4cec..1cd5194 100755
---- a/html2text.py
-+++ b/html2text.py
-@@ -305,6 +305,7 @@ class _html2text(HTMLParser.HTMLParser):
-             if has_key(attrs, 'src'):
-                 attrs['href'] = attrs['src']
-                 alt = attrs.get('alt', '')
-+                alt = re.sub('\n', ' ', alt)
-                 i = self.previousIndex(attrs)
-                 if i is not None:
-                     attrs = self.a[i]
diff --git a/network/r2e/rss2email.certver.patch b/network/r2e/rss2email.certver.patch
deleted file mode 100644
index b56ce4bcd7..0000000000
--- a/network/r2e/rss2email.certver.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- rss2email.py.orig	2016-09-28 01:57:12.929900342 +0200
-+++ rss2email.py	2016-09-28 01:57:36.316685746 +0200
-@@ -25,6 +25,8 @@
- 
- import urllib2
- urllib2.install_opener(urllib2.build_opener())
-+import ssl
-+ssl._create_default_https_context = ssl._create_unverified_context
- 
- ### Vaguely Customizable Options ###
- 
diff --git a/network/r2e/slack-desc b/network/r2e/slack-desc
deleted file mode 100644
index 9d66917f32..0000000000
--- a/network/r2e/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------------------------------------------------------|
-r2e: r2e (rss to email gateway)
-r2e:
-r2e: rss2email is a free tool for delivering news from RSS feeds to your
-r2e: email program.  This allows you to view RSS feeds in an interface you
-r2e: are already familiar with and to apply filters to incoming feeds.
-r2e:
-r2e: See /usr/doc/r2e-@VERSION@/README.Slackware for post-installation
-r2e: configuration.
-r2e:
-r2e: Homepage: http://www.allthingsrss.com/rss2email/
-r2e:
diff --git a/network/r2e/wrapper.r2e b/network/r2e/wrapper.r2e
deleted file mode 100644
index 5dca09f80f..0000000000
--- a/network/r2e/wrapper.r2e
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-mkdir -p ~/.rss2email
-cd ~/.rss2email
-exec python /usr/share/r2e/rss2email.py feeds.dat $*
diff --git a/network/r8168/r8168.SlackBuild b/network/r8168/r8168.SlackBuild
index dec720636d..59274c56fb 100644
--- a/network/r8168/r8168.SlackBuild
+++ b/network/r8168/r8168.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for r8168
 
-# Copyright 2016-2019 Hunter Sezen California, USA
+# Copyright 2016-2020 Hunter Sezen California, USA
 # 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=r8168
-VERSION=${VERSION:-8.047.02}
+VERSION=${VERSION:-8.048.03}
 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
@@ -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,15 +82,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 {} \;
 
-KERNEL="${KERNEL:-"$(uname -r)"}"
-PKGVER="$(printf %s "${VERSION}_$KERNEL" | tr - _)"
-
 (
   unset ARCH
   cd /lib/modules/$KERNEL/build
 
   make \
-    SUBDIRS="$TMP/$PRGNAM-$VERSION/src" \
+    M="$TMP/$PRGNAM-$VERSION/src" \
     EXTRA_CFLAGS="$SLKCFLAGS" \
     modules
 )
@@ -97,4 +107,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/network/r8168/r8168.info b/network/r8168/r8168.info
index 5832b08f60..506ee476d6 100644
--- a/network/r8168/r8168.info
+++ b/network/r8168/r8168.info
@@ -1,8 +1,8 @@
 PRGNAM="r8168"
-VERSION="8.047.02"
+VERSION="8.048.03"
 HOMEPAGE="https://github.com/mtorromeo/r8168"
-DOWNLOAD="https://github.com/mtorromeo/r8168/archive/8.047.02/r8168-8.047.02.tar.gz"
-MD5SUM="7f2ad4703e0ed1c9076a3b3cdbf106e1"
+DOWNLOAD="https://github.com/mtorromeo/r8168/archive/8.048.03/r8168-8.048.03.tar.gz"
+MD5SUM="e8a989c5f21718cc48e07ec350abdf12"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/network/radicale/README b/network/radicale/README
index be71661fe3..662b6b0f99 100644
--- a/network/radicale/README
+++ b/network/radicale/README
@@ -5,3 +5,9 @@ distant accessess for reading, creating, modifying and deleting
 multiple calendars through a simplified CalDAV protocol. Data can be
 encrypted by SSL, and their access can be restricted thanks to
 different authentication methods.
+
+You need a "radicale" user and group prior to building radicale.
+Something like this will suffice for most systems:
+
+  groupadd -g 375 radicale
+  useradd -u 375 -d /var/lib/radicale -s /bin/false -g radicale radicale
diff --git a/network/radicale/doinst.sh b/network/radicale/doinst.sh
index 969cf1a0f8..219f5d0692 100644
--- a/network/radicale/doinst.sh
+++ b/network/radicale/doinst.sh
@@ -22,6 +22,6 @@ preserve_perms() {
   config $NEW
 }
 
-for i in etc/radicale/config.new etc/radicale/logging.new; do
-  preserve_perms $i
-done
+preserve_perms etc/rc.d/rc.radicale.new
+config etc/radicale/config.new
+config etc/radicale/rights.new
diff --git a/network/radicale/radicale.SlackBuild b/network/radicale/radicale.SlackBuild
index 21eee9ee44..a08dc21dfe 100644
--- a/network/radicale/radicale.SlackBuild
+++ b/network/radicale/radicale.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for radicale
 
-# Copyright 2016-2017  Johannes Schoepfer, Germany
+# Copyright 2022 Ruben Schuller
 # 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=radicale
-VERSION=${VERSION:-1.1.6}
+VERSION=${VERSION:-3.1.8}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,11 +38,21 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
+# the name of the created package would be, and then exit. This information
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
+RADICALE_GID=${RADICALE_GID:-375}
+RADICALE_UID=${RADICALE_UID:-375}
+
 if [ "$ARCH" = "i586" ]; then
   SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
@@ -56,11 +69,28 @@ fi
 
 set -e
 
+if ! getent passwd radicale 1>/dev/null 2>/dev/null; then
+cat << EOF
+  You must have a radicale user to run this script
+
+  # groupadd -g $RADICALE_GID radicale
+  # useradd -u $RADICALE_UID -d /var/lib/$PRGNAM -s /bin/false -g radicale radicale
+EOF
+  exit 1
+elif ! getent group radicale 1>/dev/null 2>/dev/null; then
+cat << EOF
+  You must have a radicale group to run this script
+
+  # groupadd -g $RADICALE_GID radicale
+EOF
+  exit 1
+fi
+
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf Radicale-$VERSION
-tar vxf $CWD/Radicale-$VERSION.tar.gz
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz || tar xvf $CWD/Radicale-$VERSION.tar.gz || tar xvf v$VERSION.tar.gz
 cd Radicale-$VERSION
 chown -R root:root .
 find -L . \
@@ -69,35 +99,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 {} \;
 
-python setup.py install --prefix=/usr --root=$PKG
-install -m0644 -D config $PKG/etc/radicale/config.new
-install -m0644 logging $PKG/etc/radicale/logging.new
-install -m0644 -D radicale.wsgi $PKG/var/lib/radicale/radicale.wsgi
-install -m0644 radicale.fcgi $PKG/var/lib/radicale/radicale.fcgi
-
-# docs
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp COPYING README schema.sql config logging $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-# logrotate
-mkdir -p $PKG/etc/logrotate.d
-cat << EOF > $PKG/etc/logrotate.d/radicale
-/var/log/radicale {
-  rotate 10
-  notifempty
-  size=1M
-  compress
-  delaycompress
-}
-EOF
+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
 
+install -v -m 0755 -g radicale -o radicale -d $PKG/etc/radicale
+install -v -m 0755 -g radicale -o radicale -d $PKG/var/lib/radicale
+install -v -m 0644 -g radicale -o radicale config $PKG/etc/radicale/config.new
+install -v -m 0644 -g radicale -o radicale rights $PKG/etc/radicale/rights.new
+install -v -m 0755 -g root -o root -d $PKG/etc/rc.d
+install -g root -o root -m 0644 $CWD/rc.radicale $PKG/etc/rc.d/rc.radicale.new
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+  radicale.wsgi \
+  Dockerfile \
+  DOCUMENTATION.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/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 -p -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/network/radicale/radicale.info b/network/radicale/radicale.info
index b9086eeb22..7f1ce74341 100644
--- a/network/radicale/radicale.info
+++ b/network/radicale/radicale.info
@@ -1,10 +1,10 @@
 PRGNAM="radicale"
-VERSION="1.1.6"
+VERSION="3.1.8"
 HOMEPAGE="https://radicale.org/"
-DOWNLOAD="https://files.pythonhosted.org/packages/source/R/Radicale/Radicale-1.1.6.tar.gz"
-MD5SUM="ab2c00771d5bfaab218ce6e930d3a113"
+DOWNLOAD="https://github.com/Kozea/Radicale/archive/refs/tags/v3.1.8/radicale-3.1.8.tar.gz"
+MD5SUM="4c886b54c6926c5c463bbb80cf555998"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="mod_wsgi"
-MAINTAINER="Johannes Schoepfer"
-EMAIL="slackbuilds[at]schoepfer[dot]info"
+REQUIRES="python3-passlib python3-bcrypt python3-build python3-defusedxml pytz vobject python3-wheel"
+MAINTAINER="Ruben Schuller"
+EMAIL="sb@rbn.im"
diff --git a/network/radicale/rc.radicale b/network/radicale/rc.radicale
new file mode 100644
index 0000000000..3fb0515ec2
--- /dev/null
+++ b/network/radicale/rc.radicale
@@ -0,0 +1,31 @@
+#!/bin/sh
+
+# start/stop/restart radicale
+
+radicale_start() {
+	daemon -n radicale -u radicale -o local1.warning -e "HOME=/var/lib/radicale" -D /var/lib/radicale -- python3 -m radicale
+}
+
+radicale_stop() {
+	daemon -n radicale -u radicale --stop
+}
+
+radicale_restart() {
+  radicale_stop
+  sleep 1
+  radicale_start
+}
+
+case "$1" in
+'start')
+  radicale_start
+  ;;
+'stop')
+  radicale_stop
+  ;;
+'restart')
+  radicale_restart
+  ;;
+*)
+  echo "usage $0 start|stop|restart"
+esac
diff --git a/network/radiusplugin/radiusplugin.SlackBuild b/network/radiusplugin/radiusplugin.SlackBuild
index 3a446c2599..67547e9055 100644
--- a/network/radiusplugin/radiusplugin.SlackBuild
+++ b/network/radiusplugin/radiusplugin.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for radiusplugin
 
@@ -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=radiusplugin
 VERSION=${VERSION:-2.1a_beta1}
 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/network/radvd/README b/network/radvd/README
index 42966f1d6c..0623e3ec2d 100644
--- a/network/radvd/README
+++ b/network/radvd/README
@@ -1,18 +1,18 @@
 The router advertisement daemon (radvd) is run by Linux or BSD systems
-acting as IPv6 routers.  It sends Router Advertisement messages, specified 
-by RFC 2461, to a local Ethernet LAN periodically and when requested by a 
-node sending a Router Solicitation message.  These messages are required 
-for IPv6 stateless autoconfiguration.
+acting as IPv6 routers. It sends Router Advertisement messages,
+specified by RFC 2461, to a local Ethernet LAN periodically and
+when requested by a node sending a Router Solicitation message.
+These messages are required for IPv6 stateless autoconfiguration.
 
-Radvd is dependent upon IPv6 support in the Linux kernel; this comes enabled 
-by default with Slackware 14's generic and huge kernels.  To enable IPv6 
-support manually, you must set the following entry in your custom kernel's 
-.config file and recompile: CONFIG_IPV6=m
+Radvd is dependent upon IPv6 support in the Linux kernel; this comes
+enabled by default with Slackware 14's generic and huge kernels.
+To enable IPv6 support manually, you must set the following entry in
+your custom kernel's .config file and recompile: CONFIG_IPV6=m
 
-Once the slackware package is installed, edit /etc/radvd.conf to reflect 
-your current IPv6 configuration. An init script has been provided at 
-/etc/rc.d/rc.radvd.  To have this start upon each boot, add the following 
-lines to your /etc/rc.d/rc.local file:
+Once the slackware package is installed, edit /etc/radvd.conf to
+reflect your current IPv6 configuration. An init script has been
+provided at /etc/rc.d/rc.radvd. To have this start upon each boot, add
+the following lines to your /etc/rc.d/rc.local file:
   ## Start the radvd daemon:
   if [ -x /etc/rc.d/rc.radvd ]; then
      /etc/rc.d/rc.radvd start
diff --git a/network/radvd/radvd.SlackBuild b/network/radvd/radvd.SlackBuild
index d456b00a5c..bf68cc6da0 100644
--- a/network/radvd/radvd.SlackBuild
+++ b/network/radvd/radvd.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for radvd
 
@@ -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=radvd
-VERSION=${VERSION:-2.15}
+VERSION=${VERSION:-2.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}
@@ -101,9 +111,6 @@ mkdir -p $PKG/etc/rc.d
 install -D -m 0644 $CWD/rc.radvd.new  $PKG/etc/rc.d
 install -D -m 0644 $TMP/$PRGNAM-$VERSION/radvd.conf.example $PKG/etc
 
-mkdir -p $PKG/var/run/radvd
-chown -R daemon:daemon $PKG/var/run/radvd
-
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a CHANGES COPYRIGHT INTRO.html README TODO $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
@@ -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/network/radvd/radvd.info b/network/radvd/radvd.info
index 247592f568..b9308cdeb1 100644
--- a/network/radvd/radvd.info
+++ b/network/radvd/radvd.info
@@ -1,8 +1,8 @@
 PRGNAM="radvd"
-VERSION="2.15"
+VERSION="2.19"
 HOMEPAGE="http://www.litech.org/radvd"
-DOWNLOAD="http://www.litech.org/radvd/dist/radvd-2.15.tar.xz"
-MD5SUM="9793484f124caee88d48384360ef041e"
+DOWNLOAD="https://radvd.litech.org/dist/radvd-2.19.tar.xz"
+MD5SUM="5e84f9df1f1ef517260c68ccfe496d25"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/network/rclone/README b/network/rclone/README
index 77de1242a6..ac2ba2936e 100644
--- a/network/rclone/README
+++ b/network/rclone/README
@@ -1,26 +1,10 @@
-Rclone is a command line program to sync files and directories to and from
+Rclone is a command-line program to manage files on cloud storage.
+It is a feature-rich alternative to cloud vendors' web storage
+interfaces. Over 40 cloud storage products support rclone including
+S3 object stores, business & consumer file storage services, as well
+as standard transfer protocols.
 
-    Google Drive
-    Amazon S3
-    Openstack Swift / Rackspace cloud files / Memset Memstore
-    Dropbox
-    Google Cloud Storage
-    Amazon Drive
-    Microsoft One Drive
-    Hubic
-    Backblaze B2
-    Yandex Disk
-    SFTP
-    The local filesystem
-
-Features
-
-    MD5/SHA1 hashes checked at all times for file integrity
-    Timestamps preserved on files
-    Partial syncs supported on a whole file basis
-    Copy mode to just copy new/changed files
-    Sync (one way) mode to make a directory identical
-    Check mode to check for file hash equality
-    Can sync to and from network, eg two different cloud accounts
-    Optional encryption (Crypt)
-    Optional FUSE mount
+Rclone has powerful cloud equivalents to the unix commands rsync,
+cp, mv, mount, ls, ncdu, tree, rm, and cat. Rclone's familiar syntax
+includes shell pipeline support, and --dry-run protection. It is
+used at the command line, in scripts or via its API.
diff --git a/network/rclone/rclone.SlackBuild b/network/rclone/rclone.SlackBuild
index 8cb280b95d..4855d2c199 100644
--- a/network/rclone/rclone.SlackBuild
+++ b/network/rclone/rclone.SlackBuild
@@ -1,7 +1,6 @@
-#!/bin/sh
-
-# Slackware build script for rclone
+#!/bin/bash
 
+# Copyright 2019-2024 Andrew Payne <phalange@komputermatrix.com>
 # Copyright 2017-2018 Rodrigo Gimenez <estrod[at]zoho[dot]com>
 # All rights reserved.
 #
@@ -22,11 +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=rclone
-VERSION=${VERSION:-1.42}
+VERSION=${VERSION:-1.66.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+set -e
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -36,55 +39,54 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i586" ] || [ "$ARCH" = "i686" ]; then
-  SUFFIX="linux-386"
-elif [ "$ARCH" = "x86_64" ]; then
-  SUFFIX="linux-amd64"
-elif [ "$ARCH" = "arm" ]; then
-  SUFFIX="linux-arm"
+if [ "$ARCH" = "x86_64" ]; then
+  BIT="64bit"
 else
-  echo "$ARCH is not supported." >&2
+  echo "$ARCH is not supported."
   exit 1
 fi
 
-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
 
-rm -rf $PKG
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-v$VERSION-$SUFFIX
-unzip $CWD/$PRGNAM-v$VERSION-$SUFFIX.zip
-cd $PRGNAM-v$VERSION-$SUFFIX
+rm -rf $PRGNAM-$VERSION
+unzip -o $CWD/$PRGNAM-v$VERSION-linux-amd64.zip
+cd $PRGNAM-v$VERSION-linux-amd64
 chown -R root:root .
+
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
   -o -perm 511 \) -exec chmod 755 {} \; -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 -Ddm755 $PKG/usr/bin
-install -m 775 rclone $PKG/usr/bin
+rm -rf $PKG
+mkdir -p $PKG/{usr/bin,opt/$PRGNAM}
+  cp -a rclone $PKG/opt/$PRGNAM
+  ln -s /opt/$PRGNAM/rclone $PKG/usr/bin/$PRGNAM
 
-install -Ddm 755 $PKG/usr/man/man1
-cp rclone.1 $PKG/usr/man/man1
+mkdir -p $PKG/usr/man/man1/
+cp rclone.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.txt \
-  $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}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/network/rclone/rclone.info b/network/rclone/rclone.info
index 9d55eef852..7ce95fbbcc 100644
--- a/network/rclone/rclone.info
+++ b/network/rclone/rclone.info
@@ -1,10 +1,10 @@
 PRGNAM="rclone"
-VERSION="1.42"
+VERSION="1.66.0"
 HOMEPAGE="https://rclone.org"
-DOWNLOAD="https://downloads.rclone.org/v1.42/rclone-v1.42-linux-386.zip"
-MD5SUM="a7cb1d96382d010f8bc2b19e237f917e"
-DOWNLOAD_x86_64="https://downloads.rclone.org/v1.42/rclone-v1.42-linux-amd64.zip"
-MD5SUM_x86_64="f9892658a2c311ef288261095a0d3377"
+DOWNLOAD="UNSUPPORTED"
+MD5SUM=""
+DOWNLOAD_x86_64="https://github.com/rclone/rclone/releases/download/v1.66.0/rclone-v1.66.0-linux-amd64.zip"
+MD5SUM_x86_64="59a19a5f31c258aacf99970ae7d028cd"
 REQUIRES=""
-MAINTAINER="Rodrigo Gimenez"
-EMAIL="estrod[at]zoho[dot]com"
+MAINTAINER="Andrew Payne"
+EMAIL="phalange@komputermatrix.com"
diff --git a/network/rclone/slack-desc b/network/rclone/slack-desc
index a7e2b07cc2..a21c250f16 100644
--- a/network/rclone/slack-desc
+++ b/network/rclone/slack-desc
@@ -8,11 +8,11 @@
       |-----handy-ruler------------------------------------------------------|
 rclone: rclone (rsync for cloud storage)
 rclone:
-rclone: Rclone is a command line program to sync files and directories to
-rclone: and from Google Drive, Amazon S3, Openstack Swift / Rackspace
-rclone: cloud files / Memset Memstore, Dropbox, Google Cloud Storage,
-rclone: Amazon Drive, Microsoft One Drive, Hubic, Backblaze B2, Yandex Disk,
-rclone: SFTP and the local filesystem.
+rclone: Rclone ("rsync for cloud storage") is a command line program to sync
+rclone: files and directories to and from different cloud storage providers.
+rclone:
+rclone: Homepage: https://rclone.org/
+rclone:
 rclone:
 rclone:
 rclone:
diff --git a/network/rdma-core/optional_pandoc.patch b/network/rdma-core/optional_pandoc.patch
index 1e435a94b2..fdc0c5c189 100644
--- a/network/rdma-core/optional_pandoc.patch
+++ b/network/rdma-core/optional_pandoc.patch
@@ -1,10 +1,7 @@
-The master "CMakeLists.txt" listed "pandoc" as an optional dependency,
-but subsequent "make install" fails if "pandoc" is missing.
-This patch makes "pandoc" really optional.
-diff -ru rdma-core-25.0.orig/CMakeLists.txt rdma-core-25.0/CMakeLists.txt
---- rdma-core-25.0.orig/CMakeLists.txt	2019-07-26 02:17:21.000000000 +0800
-+++ rdma-core-25.0/CMakeLists.txt	2019-07-31 00:08:41.485085990 +0800
-@@ -602,11 +602,17 @@
+diff -ru rdma-core-48.0.orig/CMakeLists.txt rdma-core-48.0/CMakeLists.txt
+--- rdma-core-48.0.orig/CMakeLists.txt	2023-09-18 13:24:24.000000000 +0800
++++ rdma-core-48.0/CMakeLists.txt	2023-09-18 14:59:56.134525340 +0800
+@@ -708,27 +708,41 @@
  add_subdirectory(kernel-headers)
  # Libraries
  add_subdirectory(libibumad)
@@ -22,15 +19,19 @@ diff -ru rdma-core-25.0.orig/CMakeLists.txt rdma-core-25.0/CMakeLists.txt
  
  # Providers
  if (HAVE_COHERENT_DMA)
-@@ -614,13 +620,19 @@
- add_subdirectory(providers/cxgb3) # NO SPARSE
+ add_subdirectory(providers/bnxt_re)
  add_subdirectory(providers/cxgb4) # NO SPARSE
  add_subdirectory(providers/efa)
 +if (PANDOC_FOUND)
  add_subdirectory(providers/efa/man)
 +endif()
+ add_subdirectory(providers/erdma)
  add_subdirectory(providers/hns)
- add_subdirectory(providers/i40iw) # NO SPARSE
+ add_subdirectory(providers/irdma)
+ add_subdirectory(providers/mana)
++if (PANDOC_FOUND)
+ add_subdirectory(providers/mana/man)
++endif()
  add_subdirectory(providers/mlx4)
 +if (PANDOC_FOUND)
  add_subdirectory(providers/mlx4/man)
@@ -40,10 +41,22 @@ diff -ru rdma-core-25.0.orig/CMakeLists.txt rdma-core-25.0/CMakeLists.txt
  add_subdirectory(providers/mlx5/man)
 +endif()
  add_subdirectory(providers/mthca)
- add_subdirectory(providers/nes) # NO SPARSE
  add_subdirectory(providers/ocrdma)
-@@ -639,7 +651,9 @@
+ add_subdirectory(providers/qedr)
+@@ -738,15 +752,21 @@
+ add_subdirectory(providers/hfi1verbs)
+ add_subdirectory(providers/ipathverbs)
+ add_subdirectory(providers/rxe)
++if (PANDOC_FOUND)
+ add_subdirectory(providers/rxe/man)
++endif()
+ add_subdirectory(providers/siw)
+ 
+ add_subdirectory(libibmad)
+ add_subdirectory(libibnetdisc)
++if (PANDOC_FOUND)
  add_subdirectory(libibnetdisc/man)
++endif()
  add_subdirectory(infiniband-diags)
  add_subdirectory(infiniband-diags/scripts)
 +if (PANDOC_FOUND)
diff --git a/network/rdma-core/rdma-core.SlackBuild b/network/rdma-core/rdma-core.SlackBuild
index c89fbcdf18..22158fdfce 100644
--- a/network/rdma-core/rdma-core.SlackBuild
+++ b/network/rdma-core/rdma-core.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for rdma-core
 
-# Copyright 2019 GUAN Xin from Beijing
+# Copyright 2019-2023 GUAN Xin from Beijing
 # 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=rdma-core
-VERSION=${VERSION:-25.0}
-BUILD=${BUILD:-1}
+VERSION=${VERSION:-48.0}
+BUILD=${BUILD:-2}
 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}
@@ -88,6 +95,9 @@ cd build
   make install DESTDIR=$PKG
 cd ..
 
+# Remove systemd stuff
+(cd $PKG/usr/lib && rm -r udev/rules.d/60-srp_daemon.rules systemd)
+
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
@@ -111,4 +121,4 @@ cat $CWD/doinst.sh > $PKG/install/doinst.sh
 )
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/network/rdma-core/rdma-core.info b/network/rdma-core/rdma-core.info
index d212158b1d..2f7e7a100f 100644
--- a/network/rdma-core/rdma-core.info
+++ b/network/rdma-core/rdma-core.info
@@ -1,8 +1,8 @@
 PRGNAM="rdma-core"
-VERSION="25.0"
+VERSION="48.0"
 HOMEPAGE="https://github.com/linux-rdma"
-DOWNLOAD="https://github.com/linux-rdma/rdma-core/archive/v25.0/rdma-core-25.0.tar.gz"
-MD5SUM="48b2bec693fec7d1755a5e99a5d3678b"
+DOWNLOAD="https://github.com/linux-rdma/rdma-core/releases/download/v48.0/rdma-core-48.0.tar.gz"
+MD5SUM="f8901665b2fbf03b4ffb6bf7f6207ac4"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/network/reaver/README b/network/reaver/README
index c7d75af9ef..10d92d96d1 100644
--- a/network/reaver/README
+++ b/network/reaver/README
@@ -1,11 +1,13 @@
-Reaver implements a brute force attack against Wifi Protected Setup (WPS)
-registrar PINs in order to recover WPA/WPA2 passphrases, as described in
+Reaver implements a brute force attack against Wifi Protected Setup
+(WPS) registrar PINs in order to recover WPA/WPA2 passphrases, as
+described in:
 http://sviehb.files.wordpress.com/2011/12/viehboeck_wps.pdf.
 
-Reaver has been designed to be a robust and practical attack against WPS, and
-has been tested against a wide variety of access points and WPS
-implementations.
+Reaver has been designed to be a robust and practical attack against
+WPS, and has been tested against a wide variety of access points and
+WPS implementations.
 
-On average Reaver will recover the target AP's plain text WPA/WPA2 passphrase
-in 4-10 hours, depending on the AP. In practice, it will generally take half
-this time to guess the correct WPS pin and recover the passphrase.
+On average Reaver will recover the target AP's plain text WPA/WPA2
+passphrase in 4-10 hours, depending on the AP. In practice, it will
+generally take half this time to guess the correct WPS pin and recover
+the passphrase.
diff --git a/network/reaver/reaver.SlackBuild b/network/reaver/reaver.SlackBuild
index ae402a63fe..d9a2f2d818 100644
--- a/network/reaver/reaver.SlackBuild
+++ b/network/reaver/reaver.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for reaver.
 
@@ -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=reaver
 SRCNAM=reaver-wps-fork-t6x
 VERSION=${VERSION:-1.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}
@@ -79,7 +89,7 @@ find -L . \
 # one more directory
 cd src
 
-CFLAGS="$SLKCFLAGS" \
+CFLAGS="$SLKCFLAGS -fcommon" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
@@ -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/network/redir/README b/network/redir/README
index 21a66f706f..eb83153b9e 100644
--- a/network/redir/README
+++ b/network/redir/README
@@ -1,3 +1,6 @@
 redir is all you need to redirect traffic across firewalls.
 The functionality of inetd/tcpd and "redir" will allow you to
 do everything you need without screwy telnet/ftp etc gateways.
+
+Have a look at the man page or at /usr/doc/redir-*/README.md
+for usage examples.
diff --git a/network/redir/redir.SlackBuild b/network/redir/redir.SlackBuild
index 74c1345ac0..2db60b3afb 100644
--- a/network/redir/redir.SlackBuild
+++ b/network/redir/redir.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for redir
 
-# Copyright 2013 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy
+# Copyright 2013-2019 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy
 # 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=redir
-VERSION=${VERSION:-2.2.1}
+VERSION=${VERSION:-3.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"
@@ -54,7 +64,7 @@ else
   LIBDIRSUFFIX=""
 fi
 
-DOCS="CHANGES COPYING README contrib transproxy.txt"
+DOCS="AUTHORS COPYING *.md transproxy.txt"
 
 set -e
 
@@ -65,26 +75,33 @@ rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.?z*
 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 {} \;
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-for i in $CWD/patches/* ; do patch -p1 < $i ; done
-
-sed -i "s|^EXTRA_LIBS.*|EXTRA_LIBS = -lnsl|" Makefile
+./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
-install -D -m 0755 $PRGNAM $PKG/usr/bin/$PRGNAM
+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/man/man1
-gzip -9c $PRGNAM.man > $PKG/usr/man/man1/$PRGNAM.1.gz
+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
@@ -94,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/network/redir/redir.info b/network/redir/redir.info
index 3280819247..215471b82a 100644
--- a/network/redir/redir.info
+++ b/network/redir/redir.info
@@ -1,8 +1,8 @@
 PRGNAM="redir"
-VERSION="2.2.1"
-HOMEPAGE="http://sammy.net/~sammy/hacks/"
-DOWNLOAD="http://sammy.net/~sammy/hacks/redir-2.2.1.tar.gz"
-MD5SUM="4342fadac30504c86c8db7beefe01995"
+VERSION="3.3"
+HOMEPAGE="https://github.com/troglobit/redir"
+DOWNLOAD="https://github.com/troglobit/redir/archive/v3.3/redir-3.3.tar.gz"
+MD5SUM="cdecd8a0b77bc64911dc882681b8157c"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/network/redir/slack-desc b/network/redir/slack-desc
index b201e42c75..5ed6303ec1 100644
--- a/network/redir/slack-desc
+++ b/network/redir/slack-desc
@@ -12,7 +12,7 @@ redir: redir is all you need to redirect traffic across firewalls.
 redir: The functionality of inetd/tcpd and "redir" will allow you to
 redir: do everything you need without screwy telnet/ftp etc gateways.
 redir:
-redir: homepage: http://sammy.net/~sammy/hacks/
+redir: homepage: https://github.com/troglobit/redir
 redir:
 redir:
 redir:
diff --git a/network/rejik/README b/network/rejik/README
index 26fa692f19..e280034d69 100644
--- a/network/rejik/README
+++ b/network/rejik/README
@@ -1,8 +1,8 @@
 rejik (squid redirector)
 
-Rejik is redirector for SQUID, based on DBL filters. It is aimed to block:
-ads, porno, warez, banners etc. Primarily targeted for RU-speaking zone
-of internet.
+Rejik is redirector for SQUID, based on DBL filters. It is aimed
+to block: ads, porno, warez, banners etc. Primarily targeted for
+RU-speaking zone of internet.
 
 Add this line to squid.conf to activate redirection:
 redirect_program /var/lib/rejik/redirector /etc/squid/redirector.conf
diff --git a/network/rejik/rejik.SlackBuild b/network/rejik/rejik.SlackBuild
index d15d69cbe6..a81891bde4 100644
--- a/network/rejik/rejik.SlackBuild
+++ b/network/rejik/rejik.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for Rejik
 
@@ -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=rejik
 TARNAME=redirector
 VERSION=${VERSION:-3.2.11}
-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"
@@ -75,6 +85,8 @@ patch -p 0 < $CWD/fixdestdir.patch
 # Fix config file for new location
 patch -p 0 < $CWD/fixconf.patch
 
+sed -i "s,CC=gcc ,&$SLKCFLAGS -fcommon ," Makefile
+
 DSTDIR=$PKG make
 DSTDIR=$PKG make install
 
@@ -95,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/network/rekonq/README b/network/rekonq/README
deleted file mode 100644
index 372769c8ec..0000000000
--- a/network/rekonq/README
+++ /dev/null
@@ -1 +0,0 @@
-rekonq is a KDE browser based on Webkit.
diff --git a/network/rekonq/rekonq.SlackBuild b/network/rekonq/rekonq.SlackBuild
deleted file mode 100644
index 3fbcbc83b6..0000000000
--- a/network/rekonq/rekonq.SlackBuild
+++ /dev/null
@@ -1,77 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for "rekonq"
-
-# Written by Branko Grubic <branko.grubic@gmail.com>
-
-PRGNAM=rekonq
-VERSION=${VERSION:-2.4.2}
-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.?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 {} \;
-
-mkdir -p build
-cd build
-  cmake .. \
-    -DCMAKE_C_FLAGS_RELEASE:STRING="$SLKCFLAGS" \
-    -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS" \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DLIB_SUFFIX=${LIBDIRSUFFIX} \
-    -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
-
-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/network/rekonq/rekonq.info b/network/rekonq/rekonq.info
deleted file mode 100644
index b52f6d82b1..0000000000
--- a/network/rekonq/rekonq.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="rekonq"
-VERSION="2.4.2"
-HOMEPAGE="https://rekonq.kde.org/"
-DOWNLOAD="https://downloads.sourceforge.net/rekonq/rekonq-2.4.2.tar.xz"
-MD5SUM="5d2a5ce7817813f68144203c14419669"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Branko Grubic"
-EMAIL="branko.grubic@gmail.com"
diff --git a/network/rekonq/slack-desc b/network/rekonq/slack-desc
deleted file mode 100644
index b418873c95..0000000000
--- a/network/rekonq/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------------------------------------------------------|
-rekonq: rekonq (KDE browser based on Webkit)
-rekonq:
-rekonq: rekonq is a KDE browser based on Webkit.  Its code is based on
-rekonq: Nokia QtDemoBrowser, just like Arora.  Its implementation is going
-rekonq: to embrace KDE technologies to have a full-featured KDE web browser.
-rekonq:
-rekonq:
-rekonq:
-rekonq:
-rekonq:
-rekonq:
diff --git a/network/remmina/README b/network/remmina/README
index 91a78f4416..0f479dbd78 100644
--- a/network/remmina/README
+++ b/network/remmina/README
@@ -2,9 +2,10 @@ Remmina is a remote desktop client written in GTK+, aiming to be
 useful for system administrators and travellers, who need to work
 with lots of remote computers in front of either large monitors or
 tiny netbooks. Remmina supports multiple network protocols in an
-integrated and consistant user interface. Currently RDP, VNC, NX,
-XDMCP and SSH are supported.
+integrated and consistant user interface. Currently RDP, VNC, SPICE,
+and SSH are supported.
 
 Optional support for extra features can be enabled with some switches:
 AVAHI=ON     (Avahi/Zeroconf, requires avahi, default OFF)
+KWALLET=ON   (Use KWallet instead of GNOME Keyring, default ON)
 TELEPATHY=ON (Telepathy, default OFF)
diff --git a/network/remmina/remmina.SlackBuild b/network/remmina/remmina.SlackBuild
index 94e4e67f62..7100e30948 100644
--- a/network/remmina/remmina.SlackBuild
+++ b/network/remmina/remmina.SlackBuild
@@ -1,10 +1,11 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for remmina
 
 # Copyright 2013 Luis Henrique
 # Copyright 2013 Niels Horn, Rio de Janeiro, RJ, Brazil
 # Copyright 2015-2018 Philip van der Hoeven, Almere, The Netherlands
+# Copyright 2019-2023 Tim Danforth, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,15 +25,18 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=remmina
-VERSION=${VERSION:-next20180405}
-COMMIT=${COMMIT:-71cb7a156065d65d7b5465596ab9bc5aeb8b84ec}
+VERSION=${VERSION:-1.4.33}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
-DIRNAME=Remmina-$COMMIT
+DIRNAME=Remmina-v.$VERSION
 
 AVAHI=${AVAHI:-OFF}
+KWALLET=${KWALLET:-ON}
 TELEPATHY=${TELEPATHY:-OFF}
 
 if [ -z "$ARCH" ]; then
@@ -43,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}
@@ -68,7 +79,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $DIRNAME
-tar xvf $CWD/$COMMIT.tar.gz
+tar xvf $CWD/$DIRNAME.tar.bz2
 cd $DIRNAME
 chown -R root:root .
 find -L . \
@@ -80,13 +91,15 @@ find -L . \
 mkdir -p build
 cd build
   cmake \
-    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS -lz -lssl -lcrypto" \
+    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DCMAKE_INSTALL_LIBDIR=/usr/lib${LIBDIRSUFFIX} \
     -DWITH_AVAHI=${AVAHI} \
     -DWITH_TELEPATHY=${TELEPATHY} \
     -DWITH_VTE=ON \
     -DWITH_APPINDICATOR=OFF \
+    -DWITH_WWW=OFF \
+    -DWITH_KF5WALLET=${KWALLET} \
     -DCMAKE_BUILD_TYPE=Release ..
   make VERBOSE=1
   make install DESTDIR=$PKG
@@ -110,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/network/remmina/remmina.info b/network/remmina/remmina.info
index 1cbdb73025..8fa24fb064 100644
--- a/network/remmina/remmina.info
+++ b/network/remmina/remmina.info
@@ -1,10 +1,10 @@
 PRGNAM="remmina"
-VERSION="next20180405"
-HOMEPAGE="http://www.remmina.org"
-DOWNLOAD="https://sourceforge.net/projects/slackbuildsdirectlinks/files/remmina/71cb7a156065d65d7b5465596ab9bc5aeb8b84ec.tar.gz"
-MD5SUM="c0bc8160d9a6804f088b543d47f8822e"
+VERSION="1.4.33"
+HOMEPAGE="https://www.remmina.org"
+DOWNLOAD="https://gitlab.com/Remmina/Remmina/-/archive/v.1.4.33/Remmina-v.1.4.33.tar.bz2"
+MD5SUM="e3f0be9198e826938223c0e0ef402837"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="freerdp vte3 json-glib spice-protocol spice-gtk"
-MAINTAINER="Philip van der Hoeven"
-EMAIL="philip@vd-hoeven.nl"
+REQUIRES="spice-gtk"
+MAINTAINER="Tim Danforth"
+EMAIL="timdanforth@protonmail.com"
diff --git a/network/remmina/slack-desc b/network/remmina/slack-desc
index 9fe64dadc1..264ad6129c 100644
--- a/network/remmina/slack-desc
+++ b/network/remmina/slack-desc
@@ -12,8 +12,8 @@ remmina: Remmina is a remote desktop client written in GTK+, aiming to be
 remmina: useful for system administrators and travellers, who need to work
 remmina: with lots of remote computers in front of either large monitors or
 remmina: tiny netbooks. Remmina supports multiple network protocols in an
-remmina: integrated and consistant user interface. Currently RDP, VNC, NX,
-remmina: XDMCP and SSH are supported.
+remmina: integrated and consistant user interface. Currently RDP, VNC, SPICE,
+remmina: and SSH are supported.
 remmina:
-remmina: homepage: http://remmina.sourceforge.net
+remmina: homepage: https://remmina.org/
 remmina:
diff --git a/network/remotebox/README b/network/remotebox/README
new file mode 100644
index 0000000000..801d9eb894
--- /dev/null
+++ b/network/remotebox/README
@@ -0,0 +1,8 @@
+RemoteBox is an open-source VirtualBox client which means you can
+remotely administer (ie over the network) an installation of
+VirtualBox on a server, including its guests and interact with them
+as if they were running locally. VirtualBox is installed on the
+server machine and RemoteBox runs on the client machine. RemoteBox
+provides a complete Gtk 3 graphical interface with a look and feel
+similar to that of VirtualBox's native GUI and supports the vast
+majority of features.
diff --git a/network/remotebox/doinst.sh b/network/remotebox/doinst.sh
new file mode 100644
index 0000000000..00dd0228da
--- /dev/null
+++ b/network/remotebox/doinst.sh
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+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/network/remotebox/remotebox.SlackBuild b/network/remotebox/remotebox.SlackBuild
new file mode 100644
index 0000000000..e7fb09d0f1
--- /dev/null
+++ b/network/remotebox/remotebox.SlackBuild
@@ -0,0 +1,86 @@
+#!/bin/bash
+
+# Slackware build script for remotebox
+
+# Copyright 2023 Charadon 
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=remotebox
+SRCNAM=RemoteBox
+VERSION=${VERSION:-3.2}
+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-$VERSION
+tar xvf $CWD/$SRCNAM-$VERSION.tar.bz2
+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 {} \;
+
+# Set the locations of Remotebox's files.
+sed -i 's|$Bin/share/remotebox|/usr/share/remotebox|g' remotebox
+
+mkdir -p $PKG/usr/share
+cp -r share/remotebox $PKG/usr/share
+
+install -Dm755 remotebox $PKG/usr/bin/remotebox
+install -Dm644 packagers-readme/$PRGNAM.desktop $PKG/usr/share/applications/$PRGNAM.desktop
+install -Dm644 share/$PRGNAM/icons/$PRGNAM.png $PKG/usr/share/pixmaps/$PRGNAM.png
+install -Dm644 packagers-readme/$PRGNAM.appdata.xml \
+  $PKG/usr/share/appdata/$PRGNAM.appdata.xml
+
+find $PKG -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/COPYING docs/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/network/remotebox/remotebox.info b/network/remotebox/remotebox.info
new file mode 100644
index 0000000000..67a2ace890
--- /dev/null
+++ b/network/remotebox/remotebox.info
@@ -0,0 +1,10 @@
+PRGNAM="remotebox"
+VERSION="3.2"
+HOMEPAGE="https://remotebox.knobgoblin.org.uk/"
+DOWNLOAD="https://remotebox.knobgoblin.org.uk/downloads/RemoteBox-3.2.tar.bz2"
+MD5SUM="04a4c2be0802aea1fcae7d14bca0fc71"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="perl-SOAP-Lite perl-Gtk3"
+MAINTAINER="Charadon"
+EMAIL="dev@iotib.net"
diff --git a/network/remotebox/slack-desc b/network/remotebox/slack-desc
new file mode 100644
index 0000000000..d6d6c2a42f
--- /dev/null
+++ b/network/remotebox/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+         |-----handy-ruler------------------------------------------------------|
+remotebox: remotebox (An open-source VirtualBox client)
+remotebox:
+remotebox: RemoteBox is an open-source VirtualBox client which means you can
+remotebox: remotely administer (ie over the network) an installation of
+remotebox: VirtualBox on a server, including its guests and interact with them
+remotebox: as if they were running locally. VirtualBox is installed on the
+remotebox: server machine and RemoteBox runs on the client machine. RemoteBox
+remotebox: provides a complete Gtk 3 graphical interface with a look and feel
+remotebox: similar to that of VirtualBox's native GUI and supports the vast
+remotebox: majority of features.
+remotebox:
diff --git a/network/republicanywhere/README b/network/republicanywhere/README
index 0175acc815..fa868466f2 100644
--- a/network/republicanywhere/README
+++ b/network/republicanywhere/README
@@ -1,8 +1,10 @@
-Republic Anywhere is an integrated technology platform that syncs your phone
-number to all your devices and allows you to send and receive text messages from
-your computer. You need a Republic Wireless account to use this.
+Republic Anywhere is an integrated technology platform that syncs your
+phone number to all your devices and allows you to send and receive
+text messages from your computer. You need a Republic Wireless account
+to use this.
 
-Note: during startup, it looks for /var/lib/dbus/machine-id' (note trailing
-single quote). I'm not sure if that is a bug, but it will work after copying
-/var/lib/dbus/machine-id to /var/lib/dbus/machine-id'. (You will need to escape
-the quote in the cp command.)
+Note: during startup, it looks for /var/lib/dbus/machine-id'
+(note trailing single quote). I'm not sure if that is a bug,
+but it will work after copying /var/lib/dbus/machine-id to
+/var/lib/dbus/machine-id'. (You will need to escape the quote in the
+cp command.)
diff --git a/network/republicanywhere/republicanywhere.SlackBuild b/network/republicanywhere/republicanywhere.SlackBuild
index e13930b9f2..aa6fb65e35 100644
--- a/network/republicanywhere/republicanywhere.SlackBuild
+++ b/network/republicanywhere/republicanywhere.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 #
 # Slackware build script for republicanywhere.
 #
@@ -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=republicanywhere
 VERSION=${VERSION:-1.5.9}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -41,7 +44,14 @@ case "$ARCH" in
           exit 1 ;;
 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}
@@ -78,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/network/republicanywhere/republicanywhere.info b/network/republicanywhere/republicanywhere.info
index edb7a88440..b086d68c9f 100644
--- a/network/republicanywhere/republicanywhere.info
+++ b/network/republicanywhere/republicanywhere.info
@@ -2,7 +2,7 @@ PRGNAM="republicanywhere"
 VERSION="1.5.9"
 HOMEPAGE="https://republicwireless.com/republic-anywhere"
 DOWNLOAD="UNSUPPORTED"
-MD5SUM="UNSUPPORTED"
+MD5SUM=""
 DOWNLOAD_x86_64="http://files.republicwireless.com/public/apps/anywhere/debian/pool/main/r/republicanywhere/republicanywhere_1.5.9_amd64.deb"
 MD5SUM_x86_64="b14abfb808831ee613117fed5d51bc71"
 REQUIRES=""
diff --git a/network/resilio-sync/README b/network/resilio-sync/README
new file mode 100644
index 0000000000..ea38d34a4c
--- /dev/null
+++ b/network/resilio-sync/README
@@ -0,0 +1,17 @@
+Resilio Sync (formerly BitTorrent Sync) by Resilio, Inc. is a
+proprietary peer-to-peer file synchronization tool available for
+Windows, Mac, Linux, Android, iOS, Windows Phone, Amazon Kindle Fire
+and BSD. It can sync files between devices on a local network, or
+between remote devices over the Internet via a modified version of
+the BitTorrent protocol. 
+
+If you want to run Resilio Sync as a service, you need to have an
+rslsync user and group prior to running the service.
+Something like this will suffice for most systems:
+
+groupadd -g 364 rslsync
+useradd -u 364 -g rslsync -d /dev/null -s /bin/false rslsync
+
+If you want to run rslsync as a regular user, you do not need an
+extra system user. You can conveniently start rslsync in user mode
+by using the provided rslsync-usermode script.
diff --git a/network/resilio-sync/resilio-sync.SlackBuild b/network/resilio-sync/resilio-sync.SlackBuild
new file mode 100644
index 0000000000..ce136ff42e
--- /dev/null
+++ b/network/resilio-sync/resilio-sync.SlackBuild
@@ -0,0 +1,95 @@
+#!/bin/bash
+
+# Slackware build script for resilio-sync
+
+# Copyright 2020
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=resilio-sync
+VERSION=${VERSION:-2.6.4.1344}
+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
+  LIBDIRSUFFIX=""
+  SRCSUFFIX="i386"
+elif [ "$ARCH" = "i686" ]; then
+  LIBDIRSUFFIX=""
+  SRCSUFFIX="i386"
+elif [ "$ARCH" = "x86_64" ]; then
+  LIBDIRSUFFIX="64"
+  SRCSUFFIX="amd64"
+else
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+mkdir -p $PRGNAM-$VERSION
+cd $PKG
+ar p $CWD/$PRGNAM\_$VERSION-$BUILD\_$SRCSUFFIX.deb data.tar.xz | tar xJv
+
+# Delete unnecessary systemd service-files
+rm -r $PKG/lib $PKG/usr/lib
+
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+cat $CWD/rslsync-usermode > $PKG/usr/bin/rslsync-usermode
+chmod 755 $PKG/usr/bin/rslsync-usermode
+
+mv $PKG/usr/share/man $PKG/usr/man
+
+mkdir -p $PKG/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/network/resilio-sync/resilio-sync.info b/network/resilio-sync/resilio-sync.info
new file mode 100644
index 0000000000..19eec7ff58
--- /dev/null
+++ b/network/resilio-sync/resilio-sync.info
@@ -0,0 +1,10 @@
+PRGNAM="resilio-sync"
+VERSION="2.6.4.1344"
+HOMEPAGE="https://www.resilio.com/individuals/"
+DOWNLOAD="https://download-cdn.resilio.com/2.6.4.1344/Debian/resilio-sync_2.6.4.1344-1_i386.deb"
+MD5SUM="88c772375315a0682bff5376da96bb95"
+DOWNLOAD_x86_64="https://download-cdn.resilio.com/2.6.4.1344/Debian/resilio-sync_2.6.4.1344-1_amd64.deb"
+MD5SUM_x86_64="ddc3facc1ac96842264d510d6ff632cc"
+REQUIRES=""
+MAINTAINER="Spycrowsoft"
+EMAIL="spycrowsoft [ at ] gmail [ dot ] com"
diff --git a/network/resilio-sync/rslsync-usermode b/network/resilio-sync/rslsync-usermode
new file mode 100644
index 0000000000..c3f7b96d7a
--- /dev/null
+++ b/network/resilio-sync/rslsync-usermode
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+# This script conveniently starts Resilio-Sync in user-mode.
+
+/etc/resilio-sync/init_user_config.sh
+
+rslsync --config $HOME/.config/resilio-sync/config.json
diff --git a/network/resilio-sync/slack-desc b/network/resilio-sync/slack-desc
new file mode 100644
index 0000000000..0652c16225
--- /dev/null
+++ b/network/resilio-sync/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+            |-----handy-ruler------------------------------------------------------|
+resilio-sync: resilio-sync (Sync All Your Data Across All Your Devices)
+resilio-sync:
+resilio-sync: Resilio Sync Home is a simple yet full featured solution for file sync
+resilio-sync: and sharing that's powered by P2P technology for fast and secure
+resilio-sync: transfers.
+resilio-sync:
+resilio-sync: https://www.resilio.com/individuals/
+resilio-sync:
+resilio-sync:
+resilio-sync:
+resilio-sync:
diff --git a/network/retroshare/README b/network/retroshare/README
index 051d64fea0..34f39d7bb9 100644
--- a/network/retroshare/README
+++ b/network/retroshare/README
@@ -7,6 +7,6 @@ web-of-trust to authenticate peers and OpenSSL to encrypt all
 communication. RetroShare provides filesharing, chat, messages,
 forums and channels.
 
-To build the "Tor Only" version, use the build option "RETROTOR=yes", e.g.
+To build the "Tor Only" version, use the build option "RETROTOR=yes":
 
   RETROTOR=yes ./retroshare.SlackBuild
diff --git a/network/retroshare/retroshare.SlackBuild b/network/retroshare/retroshare.SlackBuild
index 1861c03e25..870b673b28 100644
--- a/network/retroshare/retroshare.SlackBuild
+++ b/network/retroshare/retroshare.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for retroshare
 
@@ -17,12 +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=retroshare
-VERSION=${VERSION:-0.6.4}
+VERSION=${VERSION:-20220216_3dfcb58}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
-
-SRCNAM=RetroShare
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -32,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}
@@ -47,13 +55,14 @@ else
   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
-
+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 \
@@ -70,11 +79,14 @@ fi
 make
 make INSTALL_ROOT=${PKG} install
 
+mkdir -p $PKG/usr/share/retroshare
+mv $PKG/{qss,sounds,stylesheets} $PKG/usr/share/retroshare/
+
 find $PKG -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.md TODO.txt $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a LICENSES README* $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
@@ -82,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/network/retroshare/retroshare.info b/network/retroshare/retroshare.info
index 307a748169..65ab2d2f08 100644
--- a/network/retroshare/retroshare.info
+++ b/network/retroshare/retroshare.info
@@ -1,10 +1,10 @@
 PRGNAM="retroshare"
-VERSION="0.6.4"
-HOMEPAGE="http://retroshare.net"
-DOWNLOAD="https://github.com/RetroShare/RetroShare/archive/v0.6.4/RetroShare-0.6.4.tar.gz"
-MD5SUM="392c36bb3171fa26b8702e0a984d5bd6"
+VERSION="20220216_3dfcb58"
+HOMEPAGE="http://retroshare.cc"
+DOWNLOAD="https://ponce.cc/slackware/sources/repo/retroshare-20220216_3dfcb58.tar.xz"
+MD5SUM="9e71721b705df11ff3f3c0a0a31493f2"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="qt5 libmicrohttpd libupnp-legacy speex protobuf sqlcipher"
+REQUIRES="libmicrohttpd miniupnpc protobuf3 sqlcipher"
 MAINTAINER="Alan Aversa"
 EMAIL="aveNOrsa@email.ariSPAMzona.edu"
diff --git a/network/retroshare/slack-desc b/network/retroshare/slack-desc
index 6b69fdd79d..2bcc67a0fb 100644
--- a/network/retroshare/slack-desc
+++ b/network/retroshare/slack-desc
@@ -15,5 +15,5 @@ retroshare: a web-of-trust to authenticate peers and OpenSSL to encrypt all
 retroshare: communication. RetroShare provides filesharing, chat, messages,
 retroshare: forums and channels.
 retroshare:
-retroshare: Project URL: http://retroshare.net
+retroshare: Project URL: http://retroshare.cc
 retroshare:
diff --git a/network/rhapsody/README b/network/rhapsody/README
index a3e174d539..fde0ab3bad 100644
--- a/network/rhapsody/README
+++ b/network/rhapsody/README
@@ -1,3 +1,5 @@
+rhapsody (text console IRC client for Unix operating systems)
+
 Rhapsody is small, fast, portable and easy to use, yet it is full
 featured. The thing that separates it from the crowd is its intuitive
 menu driven user interface.
diff --git a/network/rhapsody/rhapsody.SlackBuild b/network/rhapsody/rhapsody.SlackBuild
index 59ea6394d8..f23ad5dce9 100644
--- a/network/rhapsody/rhapsody.SlackBuild
+++ b/network/rhapsody/rhapsody.SlackBuild
@@ -1,15 +1,34 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for rhapsody
 
-# 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.
 
+# 20230103 bkw: BUILD=3
+# - use https URL for homepage in info file.
+# - remove useless INSTALL from doc dir.
+
+# 20210923 bkw: fix build on -current, mitigate buffer overflow.
+
+# TODO: see if there's anything to these:
+# https://www.cvedetails.com/cve/CVE-2007-1502/
+# https://www.cvedetails.com/cve/CVE-2007-1503/
+# ...these appear to be the same CVE. Huh.
+# It looks autogenerated, and there's no POC. Pretty much all the
+# buffer overflows would depend on the user typing >1024 characters.
+# The patch below prevents that, at least. There are a bunch of
+# format string warnings from gcc that deserve looking at, but I
+# don't have the time right now.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=rhapsody
 VERSION=${VERSION:-0.28b}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-3}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -19,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}
@@ -48,21 +71,27 @@ 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 {} \+
+
+PKGDOC=$PKG/usr/doc/$PRGNAM-$VERSION
+
+# This patch does:
+# - prevent input buffer overflow if user types/pastes > 1023 chars
+#   into the input window.
+# - ignore incoming DCC files, if their names contain a /
+patch -p1 < $CWD/securityfix.diff
 
 ./configure -i /usr/bin -d /usr/doc/$PRGNAM-$VERSION
-make LOCALFLAGS="$SLKCFLAGS"
+make LOCALFLAGS="$SLKCFLAGS -fcommon"
 strip $PRGNAM
 make install \
   INSTALLPATH=$PKG/usr/bin \
-  INSTDOCSPATH=$PKG/usr/doc/$PRGNAM-$VERSION
+  INSTDOCSPATH=$PKGDOC
 
-cp README $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+cp README $PKGDOC
+rm -f $PKGDOC/INSTALL
+cat $CWD/$PRGNAM.SlackBuild > $PKGDOC/$PRGNAM.SlackBuild
 
 # Man page borrowed from Ubuntu and modified a bit.
 # rhapsody doesn't really need a man page,
@@ -75,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/network/rhapsody/rhapsody.info b/network/rhapsody/rhapsody.info
index 5decd05926..ad0deab6f9 100644
--- a/network/rhapsody/rhapsody.info
+++ b/network/rhapsody/rhapsody.info
@@ -1,10 +1,10 @@
 PRGNAM="rhapsody"
 VERSION="0.28b"
-HOMEPAGE="http://rhapsody.sourceforge.net/"
-DOWNLOAD="http://downloads.sourceforge.net/rhapsody/rhapsody_0.28b.tgz"
+HOMEPAGE="https://rhapsody.sourceforge.net/"
+DOWNLOAD="https://downloads.sourceforge.net/rhapsody/rhapsody_0.28b.tgz"
 MD5SUM="0792de636a2625a826491e387fcb1305"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
 MAINTAINER="B. Watson"
-EMAIL="yalhcru@gmail.com"
+EMAIL="urchlay@slackware.uk"
diff --git a/network/rhapsody/securityfix.diff b/network/rhapsody/securityfix.diff
new file mode 100644
index 0000000000..bb9db0d646
--- /dev/null
+++ b/network/rhapsody/securityfix.diff
@@ -0,0 +1,54 @@
+diff -Naur rhapsody-0.28b/src/dcc.c rhapsody-0.28b.patched/src/dcc.c
+--- rhapsody-0.28b/src/dcc.c	2006-02-24 01:46:19.000000000 -0500
++++ rhapsody-0.28b.patched/src/dcc.c	2021-09-16 15:46:52.830186229 -0400
+@@ -702,7 +702,11 @@
+ 	FILE *fp;
+ 	int fd;
+ 
+-	sprintf(filepath, "%s/%s", configuration.dccdlpath, filename);
++	if(strchr(filename, "/")) {
++		vprint_all_attrib(ERROR_COLOR, "DCC File: Filename %s has directory separators, not allowed\n", filename);
++	}
++
++	snprintf(filepath, 1023, "%s/%s", configuration.dccdlpath, filename);
+ 
+ 	/* check if the file exists, and if it does, append a timestamp extension */
+ 	fp = fopen(filepath, "rb");
+@@ -710,13 +714,13 @@
+ 	if (fp != NULL && configuration.dccduplicates == 1){
+ 		ct = time(NULL);
+ 		t = localtime(&ct);
+-		sprintf(filestamp, "%s.%04d%02d%02d%02d%02d%02d", filename, t->tm_year + 1900, t->tm_mon, t->tm_mday, t->tm_hour, t->tm_min, t->tm_sec);
++		snprintf(filestamp, 1023, "%s.%04d%02d%02d%02d%02d%02d", filename, t->tm_year + 1900, t->tm_mon, t->tm_mday, t->tm_hour, t->tm_min, t->tm_sec);
+ 		vprint_all_attrib(DCC_COLOR, "DCC file %s exists, saving as %s\n", filename, filestamp);
+-		sprintf(filepath, "%s/%s", configuration.dccdlpath, filestamp);
++		snprintf(filepath, 1023, "%s/%s", configuration.dccdlpath, filestamp);
+ 		fclose(fp);
+ 		strcpy(filenamex, filestamp);
+ 	}
+-	else strcpy(filenamex, filename);
++	else strncpy(filenamex, filename, 1023);
+ 
+ 	//fp = fopen(filepath, "wb");
+ 	//if (fp == NULL){
+diff -Naur rhapsody-0.28b/src/screen.c rhapsody-0.28b.patched/src/screen.c
+--- rhapsody-0.28b/src/screen.c	2006-02-24 01:46:19.000000000 -0500
++++ rhapsody-0.28b.patched/src/screen.c	2021-09-16 15:39:03.142240866 -0400
+@@ -2294,7 +2294,7 @@
+ void add_input_buffer(inputwin *I, int value){
+ 	char scratch[MAXDATASIZE];
+ 
+-	if (I->cursorpos < MAXDATASIZE){
++	if (I->cursorpos < MAXDATASIZE - 1){
+ 		strcpy(scratch, &(I->inputbuffer)[I->cursorpos]);
+ 	        (I->inputbuffer)[I->cursorpos] = value;
+ 	        strcpy(&(I->inputbuffer)[I->cursorpos+1], scratch);
+@@ -2306,7 +2306,7 @@
+ void append_input_buffer(inputwin *I, char *string){
+ 	char scratch[MAXDATASIZE];
+ 
+-	if (I->cursorpos + strlen(string) < MAXDATASIZE){
++	if (I->cursorpos + strlen(string) < MAXDATASIZE - 1){
+ 		strcpy(scratch, &(I->inputbuffer)[I->cursorpos]);
+ 	        strcpy(&(I->inputbuffer)[I->cursorpos], string);
+ 	        strcpy(&(I->inputbuffer)[I->cursorpos + strlen(string)], scratch);
diff --git a/network/riot-web/README b/network/riot-web/README
deleted file mode 100644
index 20d910bc48..0000000000
--- a/network/riot-web/README
+++ /dev/null
@@ -1,25 +0,0 @@
-riot-web (Riot.im for web)
-
-Riot (formerly known as Vector) is a Matrix web client built using the Matrix
-protocol.
-
-Riot gathers all your conversations and app integrations (e.g. GitHub, Slack)
-into one single app.
-
-Built around group chatrooms, Riot lets you share messages, images, videos
-and files - interact with your tools and access all your different communities
-under one roof.
-
-Another great feature of Riot/Matrix is the federated or decentralised structure.
-Everyone can set up a Matrix server to serve rooms and users can communicate with
-other users on other Matrix servers around the World.
-
-Now with end-to-end encryption using the Olm and Megolm cryptographic ratchets
-, and ensuring that only explicitly authorized devices can participate in a
-conversation.
-
-This is a packaging of the pre-built released version of Riot (on Github).
-You should use your favourite web browser to enjoy it. Type your browser name
-before before run this script:
-
-	BROWSER=firefox ./riot-web.Slackbuild
diff --git a/network/riot-web/riot-web.SlackBuild b/network/riot-web/riot-web.SlackBuild
deleted file mode 100644
index ef5f0a3b22..0000000000
--- a/network/riot-web/riot-web.SlackBuild
+++ /dev/null
@@ -1,103 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for riot-web
-
-# Copyright 2018 David O'Shaughnessy
-# Copyright 2018-2019 MDrights <psychi2009@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=riot-web
-PKGNAM=riot
-VERSION=${VERSION:-1.2.1}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-# which browser to launch the app. default as Firefox if not defined.
-BROWSER=${BROWSER:-firefox}
-
-if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-    i?86) ARCH=i586 ;;
-    arm*) ARCH=arm ;;
-       *) ARCH=$( uname -m ) ;;
-  esac
-fi
-
-# Upstream has binary support for i386 and x86_64.
-if [ "$ARCH" = "x86_64" ]; then
-    DEBARCH="amd64"
-elif [ "$ARCH" = "i586" ]; then
-    DEBARCH="i386"
-else
-    echo "Sorry, the riot-web binary is currently available for i386/x86_64 only."
-    exit 1
-fi
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $PKG
-tar xzvf $CWD/${PKGNAM}-v${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 \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-# Move it.
-mkdir -p $PKG/opt
-mv ${PKGNAM}-v${VERSION} $PKG/opt/${PRGNAM}
-
-# Create a script to let the browser to launch the app.
-mkdir -p $PKG/usr/bin
-echo -e "#!/bin/bash
-$BROWSER /opt/${PRGNAM}/index.html" \
-	> $PKG/usr/bin/riot-web
-
-chmod a+x $PKG/usr/bin/riot-web
-
-# Distribute its desktop file and its icon pics to icon dirs.
-mkdir -p $PKG/usr/share/applications/
-cp $CWD/riot-web.desktop ${PKG}/usr/share/applications/
-
-for dpi in 128 16 24 256 48 64 96 512; do
-        PNG="$PKG/usr/share/icons/hicolor/${dpi}x${dpi}/apps/"
-        mkdir -p $PNG
-        cp $CWD/riot-web.png.${dpi} ${PNG}/riot-web.png
-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:-tgz}
diff --git a/network/riot-web/riot-web.desktop b/network/riot-web/riot-web.desktop
deleted file mode 100644
index 5aac9a79a7..0000000000
--- a/network/riot-web/riot-web.desktop
+++ /dev/null
@@ -1,15 +0,0 @@
-[Desktop Entry]
-Name=Riot.im
-Name[zh_CN]=Riot.im 加密聊天室
-Name[zh_HK]=Riot.im 加密聊天室
-Name[zh_TW]=Riot.im 加密聊天室
-Comment=A feature-rich client for Matrix.org
-Comment[zh_CN]=一个基于 Matrix.org （邦联化）的端对端加密群聊工具
-Comment[zh_HK]=一个基于 Matrix.org （邦联化）的端对端加密群聊工具
-Comment[zh_TW]=一个基于 Matrix.org （邦联化）的端对端加密群聊工具
-Exec=/usr/bin/riot-web
-Terminal=false
-Type=Application
-Icon=riot-web
-StartupWMClass=riot
-Categories=Network;X-Antigfw
diff --git a/network/riot-web/riot-web.info b/network/riot-web/riot-web.info
deleted file mode 100644
index 54c730ca88..0000000000
--- a/network/riot-web/riot-web.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="riot-web"
-VERSION="1.2.1"
-HOMEPAGE="https://riot.im/"
-DOWNLOAD="https://github.com/vector-im/riot-web/releases/download/v1.2.1/riot-v1.2.1.tar.gz"
-MD5SUM="391793b36e176a626e78b30b9e70256c"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="MDrights"
-EMAIL="psychi2009@gmail.com"
diff --git a/network/riot-web/riot-web.png.128 b/network/riot-web/riot-web.png.128
deleted file mode 100644
index 54149b1ae2..0000000000
--- a/network/riot-web/riot-web.png.128
+++ /dev/null
diff --git a/network/riot-web/riot-web.png.16 b/network/riot-web/riot-web.png.16
deleted file mode 100644
index def4ec5eee..0000000000
--- a/network/riot-web/riot-web.png.16
+++ /dev/null
diff --git a/network/riot-web/riot-web.png.24 b/network/riot-web/riot-web.png.24
deleted file mode 100644
index 6fe144ea13..0000000000
--- a/network/riot-web/riot-web.png.24
+++ /dev/null
diff --git a/network/riot-web/riot-web.png.256 b/network/riot-web/riot-web.png.256
deleted file mode 100644
index 563e6d5edc..0000000000
--- a/network/riot-web/riot-web.png.256
+++ /dev/null
diff --git a/network/riot-web/riot-web.png.48 b/network/riot-web/riot-web.png.48
deleted file mode 100644
index 9cd225d402..0000000000
--- a/network/riot-web/riot-web.png.48
+++ /dev/null
diff --git a/network/riot-web/riot-web.png.512 b/network/riot-web/riot-web.png.512
deleted file mode 100644
index 328a723c97..0000000000
--- a/network/riot-web/riot-web.png.512
+++ /dev/null
diff --git a/network/riot-web/riot-web.png.64 b/network/riot-web/riot-web.png.64
deleted file mode 100644
index 20a7a6cff3..0000000000
--- a/network/riot-web/riot-web.png.64
+++ /dev/null
diff --git a/network/riot-web/riot-web.png.96 b/network/riot-web/riot-web.png.96
deleted file mode 100644
index eb48c2c91e..0000000000
--- a/network/riot-web/riot-web.png.96
+++ /dev/null
diff --git a/network/riot-web/slack-desc b/network/riot-web/slack-desc
deleted file mode 100644
index 0db4eb3401..0000000000
--- a/network/riot-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------------------------------------------------------|
-riot-web: riot-web (Riot for Desktop)
-riot-web:
-riot-web: Built around group chatrooms, Riot lets you share messages, images,
-riot-web: videos and files - interact with your tools and access all your
-riot-web: different communities under one roof. One single identity and place
-riot-web: for all your teams: no need to switch accounts, work and chat with
-riot-web: people from different organisations in public or private rooms:
-riot-web: from professional projects to school trips, Riot will become the
-riot-web: center of all your discussions!
-riot-web:
-riot-web: This is a repackaging of the pre-built released version of Riot.
diff --git a/network/roger-router/README b/network/roger-router/README
deleted file mode 100644
index fddd2add07..0000000000
--- a/network/roger-router/README
+++ /dev/null
@@ -1,31 +0,0 @@
-Roger-Router (former FFGTK Router Manager)
-
-Fax-Software and Call-Monitor for AVM FRITZ!Box or compatible
-
-
-To install a Fax-printer you can use (as root-user):
-
-  sh /usr/share/roger/install-fax.sh
-
-
-Optional Dependencies
-
-There is an optional firefox-plugin "roger-dial". It can be installed by
-calling https://www.tabos.org/wp-content/uploads/tabos/roger-dial-1.8.1.xpi
-from your firefox browser.
-
-
-Groupname and Username
-
-You must have the group 'fax' to run this script, for example:
-
-  groupadd -g 273 fax
-
-In order to enable fax transfers, your user must be a member of the
-'fax' group.  Use
-
-  gpasswd -a <username> fax
-
-as the root user to add the user <username> to the group fax,
-and then log out and log in again as <username>.  (Replace <username>
-with the real user name on your system.)
diff --git a/network/roger-router/doinst.sh b/network/roger-router/doinst.sh
deleted file mode 100644
index 401d987795..0000000000
--- a/network/roger-router/doinst.sh
+++ /dev/null
@@ -1,15 +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
-
-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/network/roger-router/roger-router.SlackBuild b/network/roger-router/roger-router.SlackBuild
deleted file mode 100644
index 76b2461d81..0000000000
--- a/network/roger-router/roger-router.SlackBuild
+++ /dev/null
@@ -1,132 +0,0 @@
-#!/bin/sh
-#
-# Slackware build script for roger-router
-#
-# Copyright 2015 Marek Srejma (sam_web@yahoo.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=roger-router
-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
-
-bailout() {
-  echo "  You must have fax group:"
-  echo "    # groupadd -g 273 fax"
-  exit 1
-}
-
-# Bail if group isn't valid on your system
-if ! getent group fax 1>/dev/null 2>/dev/null ; then
-  bailout
-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 {} \;
-
-./autogen.sh
-CXXFLAGS="$SLKCFLAGS" \
-CFLAGS="$SLKCFLAGS" \
-./configure \
-  --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --build=$ARCH-slackware-linux
-
-for d in "." "doc" "roger" "roger-cli"
-do
-    sed \
-        -e '/^SPANDSP_LIBS\s*=/ s|-L.*/|-L/usr/|' \
-        -i ${d}/Makefile
-done
-
-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
-
-sed \
-    -e 's|/lib|/lib'${LIBDIRSUFFIX}'|' \
-    -e '/^cp\s*/ s|roger-cups|/usr/share/roger/roger-cups|' \
-    -e '/^lpadmin/ s|roger-fax.ppd|/usr/share/roger/roger-fax.ppd|' \
-    -i $PKG/usr/share/roger/install-fax.sh
-
-# content of /usr/share/roger/install-fax.sh
-mkdir -p $PKG/var/spool/roger/ $PKG/usr/lib${LIBDIRSUFFIX}/cups/backend/
-chown lp:fax $PKG/var/spool/roger
-chmod 2770 $PKG/var/spool/roger/
-cp $PKG/usr/share/roger/roger-cups $PKG/usr/lib${LIBDIRSUFFIX}/cups/backend/
-chown root:root $PKG/usr/lib${LIBDIRSUFFIX}/cups/backend/roger-cups
-chmod 0755 $PKG/usr/lib${LIBDIRSUFFIX}/cups/backend/roger-cups
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS COPYING 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
-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/network/roger-router/roger-router.info b/network/roger-router/roger-router.info
deleted file mode 100644
index 6b67177d7e..0000000000
--- a/network/roger-router/roger-router.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="roger-router"
-VERSION="1.9.3"
-HOMEPAGE="https://www.tabos.org/"
-DOWNLOAD="https://www.tabos.org/wp-content/uploads/tabos/roger-router-1.9.3.tar.xz"
-MD5SUM="78c4b41b2c3dceb41cb15215f51b0bb8"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="speex libpeas spandsp libcapi20 gupnp json-glib"
-MAINTAINER="Marek Srejma"
-EMAIL="sam_web@yahoo.de"
diff --git a/network/roger-router/slack-desc b/network/roger-router/slack-desc
deleted file mode 100644
index 961d48d036..0000000000
--- a/network/roger-router/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------------------------------------------------------|
-roger-router: roger-router (former FFGTK Router Manager)
-roger-router:
-roger-router: Fax-Software and Call-Monitor for AVM FRITZ!Box or compatible
-roger-router:
-roger-router:
-roger-router: https://www.tabos.org/
-roger-router:
-roger-router:
-roger-router:
-roger-router:
-roger-router:
diff --git a/network/roundcubemail/README b/network/roundcubemail/README
new file mode 100644
index 0000000000..813f90e1aa
--- /dev/null
+++ b/network/roundcubemail/README
@@ -0,0 +1,24 @@
+Roundcube webmail is a browser-based multilingual IMAP client with an
+application-like user interface. It provides full functionality you
+expect from an email client. It is fast and only needs a basic
+php capable server and sqlite, mysql or postgresql.
+Use roundcubemail-apache.conf from the doc directory as starting point.
+
+Features:
+    Drag-&-drop message management
+    Full support for MIME and HTML messages
+    Multiple sender identities
+    Full featured address book with groups and LDAP connectors
+    Find-as-you-type address book integration
+    Threaded message listing
+    IDNA and SMTPUTF8 support
+    Spell checking
+    Responsive skin (multi-device support)
+    Shared/global IMAP folders
+    Support for access control lists (ACL)
+    Built-in caching for fast mailbox access
+    Unlimited users and messages
+    Import/export functions
+    Plug-in API for flexible extensions
+    XSS attack protection
+    Support for PGP encryption
diff --git a/network/roundcubemail/doinst.sh b/network/roundcubemail/doinst.sh
new file mode 100644
index 0000000000..11737d58af
--- /dev/null
+++ b/network/roundcubemail/doinst.sh
@@ -0,0 +1,26 @@
+printf "\n" | chroot . /usr/share/roundcubemail/bin/update.sh 1>/dev/null
+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/cron.daily/roundcubemail.new
diff --git a/network/roundcubemail/roundcubemail.SlackBuild b/network/roundcubemail/roundcubemail.SlackBuild
new file mode 100644
index 0000000000..81857a2de5
--- /dev/null
+++ b/network/roundcubemail/roundcubemail.SlackBuild
@@ -0,0 +1,112 @@
+#!/bin/bash
+
+# Slackware build script for roundcube
+
+# Copyright 2022-2023 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.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=roundcubemail
+VERSION=${VERSION:-1.4.15}
+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 vxf $CWD/$PRGNAM-$VERSION-complete.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/share/$PRGNAM
+cp -R \
+  index.php .htaccess SQL bin program installer config skins \
+  public_html plugins vendor temp logs \
+  $PKG/usr/share/$PRGNAM
+chown -R apache $PKG/usr/share/$PRGNAM/{temp,logs}
+# Remove cruft
+find $PKG -type f -name '.gitignore' -delete
+find $PKG -empty -delete
+# cronjob
+mkdir -p $PKG/etc/cron.daily
+cat << EOF > $PKG/etc/cron.daily/$PRGNAM.new
+#!/bin/bash
+/usr/share/$PRGNAM/bin/cleandb.sh 1>/dev/null
+EOF
+chmod 755 $PKG/etc/cron.daily/$PRGNAM.new
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+  README.md LICENSE UPGRADING CHANGELOG \
+  $PKG/usr/doc/$PRGNAM-$VERSION
+# apache example config
+cat << EOF > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM-apache.conf
+#<VirtualHost *:443>
+<VirtualHost *:80>
+
+    DocumentRoot /usr/share/$PRGNAM/public_html/
+    ServerName mail.example.org
+
+    <Directory /usr/share/$PRGNAM/>
+        Options None
+        AllowOverride All
+        Require all granted
+        
+        #php_value upload_max_filesize 50M
+        #php_value post_max_size 52M
+        #php_value memory_limit 256M
+        #php_value date.timezone "Europe/Berlin"
+    </Directory>
+
+#    SSLEngine on
+#    SSLCertificateFile    /var/lib/dehydrated/certs/mail.example.org/fullchain.pem
+#    SSLCertificateKeyFile /var/lib/dehydrated/certs/mail.example.org/privkey.pem
+
+</VirtualHost>
+EOF
+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/network/roundcubemail/roundcubemail.info b/network/roundcubemail/roundcubemail.info
new file mode 100644
index 0000000000..490db962be
--- /dev/null
+++ b/network/roundcubemail/roundcubemail.info
@@ -0,0 +1,10 @@
+PRGNAM="roundcubemail"
+VERSION="1.4.15"
+HOMEPAGE="https://roundcube.net/"
+DOWNLOAD="https://github.com/roundcube/roundcubemail/releases/download/1.4.15/roundcubemail-1.4.15-complete.tar.gz"
+MD5SUM="70da491b8b16514bc39e4c76174f93b4"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Johannes Schoepfer"
+EMAIL="slackbuilds@schoepfer.info"
diff --git a/network/roundcubemail/slack-desc b/network/roundcubemail/slack-desc
new file mode 100644
index 0000000000..0ecf59c545
--- /dev/null
+++ b/network/roundcubemail/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+             |-----handy-ruler------------------------------------------------------|
+roundcubemail: roundcubemail (open source webmail software)
+roundcubemail:
+roundcubemail: Roundcube webmail is a browser-based multilingual IMAP client with an
+roundcubemail: application-like user interface. It provides full functionality you
+roundcubemail: expect from an email client. It is fast and only needs a basic
+roundcubemail: php capable server and sqlite, mysql or postgresql.
+roundcubemail:
+roundcubemail:
+roundcubemail: https://roundcube.net/
+roundcubemail:
+roundcubemail:
diff --git a/network/rspamd/README b/network/rspamd/README
index 705ffd1689..ea65f2a21e 100644
--- a/network/rspamd/README
+++ b/network/rspamd/README
@@ -13,7 +13,8 @@ available.
 
 Groupname and Username
 
-You must have the "rspamd" group and user to run this script, for example:
+You must have the "rspamd" group and user to run this script, for
+example:
 
   groupadd -g 359 rspamd
   useradd -u 359 -s /bin/false -d /dev/null -g rspamd rspamd
diff --git a/network/rspamd/doinst.sh b/network/rspamd/doinst.sh
index 533485ecf5..116a6481e5 100644
--- a/network/rspamd/doinst.sh
+++ b/network/rspamd/doinst.sh
@@ -22,5 +22,7 @@ preserve_perms() {
   config $NEW
 }
 
-config etc/rspamd/rspamd.conf.new
+find etc/rspamd -type f -name '*.new' \
+ | while read new ; do config $new ; done
+
 preserve_perms etc/rc.d/rc.rspamd.new
diff --git a/network/rspamd/rc.rspamd.new b/network/rspamd/rc.rspamd.new
index 8c3e78f908..f68b62cb91 100644
--- a/network/rspamd/rc.rspamd.new
+++ b/network/rspamd/rc.rspamd.new
@@ -10,6 +10,11 @@ CONF=/etc/rspamd/rspamd.conf
 DAEMON_ARGS="-c $CONF -u $NAME -g $NAME"
 
 rspamd_start() {
+  if [ ! -d $(dirname $PIDFILE) ]; then
+	  mkdir $(dirname $PIDFILE)
+	  chown rspamd:rspamd $(dirname $PIDFILE)
+  fi
+
   if [ ! -r $CONF ]; then
     echo "$CONF does not appear to exist.  Abort."
     exit 1
@@ -21,7 +26,7 @@ rspamd_start() {
   fi
 
   echo "Starting rspamd ..."
-  $DAEMON $DAEMON_ARGS
+  $DAEMON $DAEMON_ARGS &
 }
 
 rspamd_stop() {
diff --git a/network/rspamd/rspamd.SlackBuild b/network/rspamd/rspamd.SlackBuild
index 1821c2026b..071fadc54f 100644
--- a/network/rspamd/rspamd.SlackBuild
+++ b/network/rspamd/rspamd.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for Rspamd
 
-# Copyright 2018, 2019 Ebben Aries <e@dscp.org>
+# Copyright 2018-2024 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.
 
+# 20220320 bkw: Modified by SlackBuilds.org: fix 32-bit build.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=rspamd
-VERSION=${VERSION:-1.9.4}
+VERSION=${VERSION:-3.8.4}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,18 +40,24 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-UIDGID=359
-if ! getent group $PRGNAM; then
-  echo "  You must have the \"$PRGNAM\" group to run this script."
+# 20220320 bkw: please don't make me run the script twice to see
+# both commands: show them both if either is missing.
+group_user_error() {
+  echo "  You must have the \"$PRGNAM\" group and user to run this script."
   echo "    # groupadd -g $UIDGID $PRGNAM"
-  exit 1
-elif ! getent passwd $PRGNAM; then
-  echo "  You must have the \"$PRGNAM\" user to run this script."
   echo "    # useradd -u $UIDGID -s /bin/false -d /dev/null -g $PRGNAM $PRGNAM"
   exit 1
+}
+
+UIDGID=359
+getent group  $PRGNAM || group_user_error
+getent passwd $PRGNAM || group_user_error
+
+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}
@@ -76,12 +87,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 {} \+
 
-mkdir -p build
-cd build
+mkdir -p rspamd.build
+cd rspamd.build
   cmake \
     -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
     -DCMAKE_INSTALL_PREFIX=/usr \
@@ -91,30 +102,19 @@ cd build
     -DENABLE_STATIC=OFF \
     -DENABLE_HYPERSCAN=ON \
     -DENABLE_JEMALLOC=ON \
+    -DENABLE_LUAJIT=ON \
     -DENABLE_OPTIMIZATION=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
-
-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 empty directory tree
-rmdir -p --ignore-fail-on-non-empty $PKG/usr/share/examples/rspamd
+gzip $PKG/usr/man/man*/*
 
 mkdir -p $PKG/var/log/rspamd
 chown rspamd:rspamd $PKG/var/log/rspamd
 chmod 0755 $PKG/var/log/rspamd
 
-mkdir -p $PKG/var/run/rspamd
-chown rspamd:rspamd $PKG/var/run/rspamd
-chmod 0750 $PKG/var/run/rspamd
-
 mkdir -p $PKG/var/lib/rspamd
 chown rspamd:rspamd $PKG/var/lib/rspamd
 chmod 0750 $PKG/var/lib/rspamd
@@ -132,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/network/rspamd/rspamd.info b/network/rspamd/rspamd.info
index 0fd4280c31..a533c96955 100644
--- a/network/rspamd/rspamd.info
+++ b/network/rspamd/rspamd.info
@@ -1,10 +1,10 @@
 PRGNAM="rspamd"
-VERSION="1.9.4"
+VERSION="3.8.4"
 HOMEPAGE="https://rspamd.com"
-DOWNLOAD="https://github.com/rspamd/rspamd/archive/1.9.4/rspamd-1.9.4.tar.gz"
-MD5SUM="930b07b1f55dfc9c46abbe266eae9856"
+DOWNLOAD="https://github.com/rspamd/rspamd/archive/3.8.4/rspamd-3.8.4.tar.gz"
+MD5SUM="b0277cbdcca54bd6873b1fd2ea7e61de"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="ragel luajit redis hyperscan"
+REQUIRES="luajit redis hyperscan"
 MAINTAINER="Ebben Aries"
-EMAIL="e@dscp.org"
+EMAIL="slackbuilds@dscp.org"
diff --git a/network/rspamd/slack-desc b/network/rspamd/slack-desc
index f020c73be4..5fd336b92a 100644
--- a/network/rspamd/slack-desc
+++ b/network/rspamd/slack-desc
@@ -13,12 +13,7 @@ rspamd: messages by a number of rules including regular expressions,
 rspamd: statistical analysis and custom services such as URL black lists.
 rspamd: Each message is analysed by Rspamd and given a spam score.
 rspamd:
-rspamd: According to this spam score and the user’s settings Rspamd recommends
-rspamd: an action for the MTA to apply to the message: for example, to pass,
-rspamd: to reject or to add a header. Rspamd is designed to process hundreds
-rspamd: of messages per second simultaneously and has a number of features
-rspamd: available.
-rspamd:
 rspamd: Home-Page: https://rspamd.com
 rspamd:
 rspamd:
+rspamd:
diff --git a/network/rss2email/README b/network/rss2email/README
new file mode 100644
index 0000000000..d21b699b77
--- /dev/null
+++ b/network/rss2email/README
@@ -0,0 +1,6 @@
+A python script that forward RSS feeds to your email address. This
+allows you to view RSS feeds in an interface you are already familiar
+with and to apply filters to incoming feeds.
+
+It is the community maintained successor to the rss2email by Aaron
+Swartz.
diff --git a/network/rss2email/rss2email.SlackBuild b/network/rss2email/rss2email.SlackBuild
new file mode 100644
index 0000000000..e5aa792998
--- /dev/null
+++ b/network/rss2email/rss2email.SlackBuild
@@ -0,0 +1,98 @@
+#!/bin/bash
+
+# Slackware build script for rss2email
+
+# Copyright 2020-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=rss2email
+VERSION=${VERSION:-3.14}
+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 {} \;
+
+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/man/man1
+gzip -c9 r2e.1 > $PKG/usr/man/man1/r2e.1.gz
+
+install -m 0644 -T -D completion/r2e.zsh $PKG/usr/share/zsh/site-functions/_r2e
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS CHANGELOG HACKING.md 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
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/network/rss2email/rss2email.info b/network/rss2email/rss2email.info
new file mode 100644
index 0000000000..8d14e4d856
--- /dev/null
+++ b/network/rss2email/rss2email.info
@@ -0,0 +1,10 @@
+PRGNAM="rss2email"
+VERSION="3.14"
+HOMEPAGE="https://github.com/rss2email/rss2email"
+DOWNLOAD="https://github.com/rss2email/rss2email/archive/v3.14/rss2email-3.14.tar.gz"
+MD5SUM="68ed27825b1a7fb7fa7c3396954ed654"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="feedparser html2text"
+MAINTAINER="Alexander Verbovetsky"
+EMAIL="alik@ejik.org"
diff --git a/network/rss2email/slack-desc b/network/rss2email/slack-desc
new file mode 100644
index 0000000000..63a31dbb53
--- /dev/null
+++ b/network/rss2email/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+         |-----handy-ruler------------------------------------------------------|
+rss2email: rss2email (rss to email gateway)
+rss2email:
+rss2email: A python script that forward RSS feeds to your email address.
+rss2email:
+rss2email:
+rss2email:
+rss2email: Homepage: https://github.com/rss2email/rss2email
+rss2email:
+rss2email:
+rss2email:
+rss2email:
diff --git a/network/rssh/rssh.SlackBuild b/network/rssh/rssh.SlackBuild
index 9cb44f7123..1860038bb8 100644
--- a/network/rssh/rssh.SlackBuild
+++ b/network/rssh/rssh.SlackBuild
@@ -1,12 +1,15 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for rssh
 # Written by Michal Bialozor <bialyy@o2.pl>
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=rssh
 VERSION=${VERSION:-2.3.4}
 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 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/network/rtl8188eu/git2tarxz.sh b/network/rtl8188eu/git2tarxz.sh
new file mode 100644
index 0000000000..268cda111f
--- /dev/null
+++ b/network/rtl8188eu/git2tarxz.sh
@@ -0,0 +1,64 @@
+#!/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: 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.
+
+# WARNING: this is a nonstandard git2tarxz.sh.
+# The Makefile for rtl8188eu *insists* on being run from an
+# actual git checkout (with .git/ dir), so I'm leaving that
+# stuff in the tarball.
+
+PRGNAM=rtl8188eu
+CLONE_URL=https://github.com/lwfinger/rtl8188eu
+
+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\""
+echo "MD5SUM=\"$( md5sum $PRGNAM-$VERSION.tar.xz | cut -d' ' -f1 )\""
diff --git a/network/rtl8188eu/rtl8188eu.SlackBuild b/network/rtl8188eu/rtl8188eu.SlackBuild
index 6de8f25f65..d7ccb5fd63 100644
--- a/network/rtl8188eu/rtl8188eu.SlackBuild
+++ b/network/rtl8188eu/rtl8188eu.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 # Slackware build script for rtl8188eu
 #
 # Copyright (c) 2015 m.budiman <mbembi@operamail.com>
@@ -23,29 +23,36 @@
 #   SUCH DAMAGE.
 # -----------------------------------------------------------------------------
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=rtl8188eu
-VERSION=${VERSION:-5e6362f3}
+VERSION=${VERSION:-20220203_775137f}
 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=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   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}
 
-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,16 +70,17 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-master
-unzip $CWD/$PRGNAM-$VERSION.zip
-cd $PRGNAM-master
+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 \
+  -o -perm 511 \) -exec chmod 755 {} \+ -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 {} \+
 
+export KVER=$KERNEL
 env -u ARCH make
 
 install -D -m 0644 rtl8188eufw.bin $PKG/lib/firmware/rtlwifi/rtl8188eufw.bin
@@ -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-$PKGVER-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$PKGVER-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/network/rtl8188eu/rtl8188eu.info b/network/rtl8188eu/rtl8188eu.info
index d1b32ea33f..7feefa4373 100644
--- a/network/rtl8188eu/rtl8188eu.info
+++ b/network/rtl8188eu/rtl8188eu.info
@@ -1,8 +1,8 @@
 PRGNAM="rtl8188eu"
-VERSION="5e6362f3"
-HOMEPAGE="https://github.com/lwfinger/"
-DOWNLOAD="http://sourceforge.net/projects/slackbuildsdirectlinks/files/rtl8188eu/rtl8188eu-5e6362f3.zip"
-MD5SUM="dcb6af10103a3d90bb5ce9f254843ba6"
+VERSION="20220203_775137f"
+HOMEPAGE="https://github.com/lwfinger/rtl8188eu"
+DOWNLOAD="https://slackware.uk/~urchlay/src/rtl8188eu-20220203_775137f.tar.xz"
+MD5SUM="44d6c4f53e23dd981487c93c63887ebe"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/network/rtl8188fu/README b/network/rtl8188fu/README
new file mode 100644
index 0000000000..06296a3485
--- /dev/null
+++ b/network/rtl8188fu/README
@@ -0,0 +1,4 @@
+rtl8188fu (rtl8188fu / rtl8188ftv wireless network adaptors driver)
+
+Driver for Realtek wireless adaptors using the rtl8188fu chipset,
+including the rtl8188ftv
diff --git a/network/rtl8188fu/conf/disable-random-mac.conf b/network/rtl8188fu/conf/disable-random-mac.conf
new file mode 100644
index 0000000000..0763348bdb
--- /dev/null
+++ b/network/rtl8188fu/conf/disable-random-mac.conf
@@ -0,0 +1,2 @@
+[device]
+wifi.scan-rand-mac-address=no
diff --git a/network/rtl8188fu/conf/r8188eu-blacklist.conf b/network/rtl8188fu/conf/r8188eu-blacklist.conf
new file mode 100644
index 0000000000..483e3418c8
--- /dev/null
+++ b/network/rtl8188fu/conf/r8188eu-blacklist.conf
@@ -0,0 +1 @@
+alias usb:v0BDApF179d*dc*dsc*dp*icFFiscFFipFFin* rtl8188fu
diff --git a/network/rtl8188fu/conf/rtl8188fu.conf b/network/rtl8188fu/conf/rtl8188fu.conf
new file mode 100644
index 0000000000..7f3e13b8d3
--- /dev/null
+++ b/network/rtl8188fu/conf/rtl8188fu.conf
@@ -0,0 +1 @@
+options rtl8188fu rtw_power_mgnt=0 rtw_enusbss=0 rtw_ips_mode=0
diff --git a/network/rtl8188fu/conf/rtl8xxxu-blacklist.conf b/network/rtl8188fu/conf/rtl8xxxu-blacklist.conf
new file mode 100644
index 0000000000..483e3418c8
--- /dev/null
+++ b/network/rtl8188fu/conf/rtl8xxxu-blacklist.conf
@@ -0,0 +1 @@
+alias usb:v0BDApF179d*dc*dsc*dp*icFFiscFFipFFin* rtl8188fu
diff --git a/network/rtl8188fu/doinst.sh b/network/rtl8188fu/doinst.sh
new file mode 100644
index 0000000000..b17f2a6739
--- /dev/null
+++ b/network/rtl8188fu/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/network/rtl8188fu/rtl8188fu.SlackBuild b/network/rtl8188fu/rtl8188fu.SlackBuild
new file mode 100644
index 0000000000..5d7afce3e2
--- /dev/null
+++ b/network/rtl8188fu/rtl8188fu.SlackBuild
@@ -0,0 +1,80 @@
+#!/bin/bash
+
+# Slackware build script for rtl8188fu
+# Written by Juan M. Lasca <juanmlasca@gmail.com>
+# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
+# Based on rtl8812bu.SlackBuild
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=rtl8188fu
+VERSION=${VERSION:-1.0+20231018_68ced40}
+COMMIT=68ced40d862d13663294496bac2e9a91ffa0e5c7
+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}
+
+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
+
+install -D -m0644 rtl8188fu.ko \
+        $PKG/lib/modules/$KERNEL/kernel/drivers/net/wireless/rtl8188fu.ko
+
+mkdir -p $PKG/lib/modprobe.d/
+mkdir -p $PKG/etc/NetworkManager/conf.d/
+
+# disable power management
+cp $CWD/conf/rtl8188fu.conf $PKG/lib/modprobe.d/
+
+# disable MAC address spoofing
+cp $CWD/conf/disable-random-mac.conf $PKG/etc/NetworkManager/conf.d/
+
+# blacklist (alias) for kernel 5.15 and 5.16
+cp $CWD/conf/r8188eu-blacklist.conf $PKG/lib/modprobe.d/
+
+# blacklist (alias) for kernel 6.2 and up
+cp $CWD/conf/rtl8xxxu-blacklist.conf $PKG/lib/modprobe.d/
+
+PKGDOC=$PKG/usr/doc/$PRGNAM-$PKGVER
+mkdir -p $PKGDOC
+cp -a LICENSE README.md $PKGDOC
+cat $CWD/README > $PKGDOC/README
+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/network/rtl8188fu/rtl8188fu.info b/network/rtl8188fu/rtl8188fu.info
new file mode 100644
index 0000000000..d171f807c5
--- /dev/null
+++ b/network/rtl8188fu/rtl8188fu.info
@@ -0,0 +1,10 @@
+PRGNAM="rtl8188fu"
+VERSION="1.0+20231018_68ced40"
+HOMEPAGE="https://github.com/kelebek333/rtl8188fu"
+DOWNLOAD="https://github.com/kelebek333/rtl8188fu/archive/68ced40/rtl8188fu-68ced40d862d13663294496bac2e9a91ffa0e5c7.tar.gz"
+MD5SUM="5d80f8aa03b281ef759499dd9448ceea"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Juan M. Lasca"
+EMAIL="juanmlasca@gmail.com"
diff --git a/network/rtl8188fu/slack-desc b/network/rtl8188fu/slack-desc
new file mode 100644
index 0000000000..8895bfc993
--- /dev/null
+++ b/network/rtl8188fu/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+         |-----handy-ruler------------------------------------------------------|
+rtl8188fu: rtl8188fu (rtl8188fu / rtl8188ftv wireless network adaptors driver)
+rtl8188fu:
+rtl8188fu: Driver for Realtek wireless adaptors using the rtl8188fu or the
+rtl8188fu: rtl8188ftv chipset.
+rtl8188fu:
+rtl8188fu: For more information, see: https://github.com/kelebek333/rtl8188fu 
+rtl8188fu:
+rtl8188fu:
+rtl8188fu:
+rtl8188fu:
+rtl8188fu:
diff --git a/network/rtl8812bu/README b/network/rtl8812bu/README
new file mode 100644
index 0000000000..2b614552c5
--- /dev/null
+++ b/network/rtl8812bu/README
@@ -0,0 +1,15 @@
+rtl8812bu (driver for rtl8812bu wireless network adaptors)
+
+Driver for Realtek wireless adaptors using the rtl8812bu chipset,
+including:
+
+* Cudy WU1200 AC1200 High Gain USB Wi-Fi Adapter
+* TP-Link Archer T3U
+* TP-Link Archer T3U Plus
+* TP-Link Archer T4U V3
+* Linksys WUSB6400M
+* Dlink DWA-181
+* Dlink DWA-182
+
+For more information, visit the project's home page at:
+https://github.com/fastoe/RTL8812BU
diff --git a/network/rtl8812bu/README.md b/network/rtl8812bu/README.md
new file mode 100644
index 0000000000..10533ba069
--- /dev/null
+++ b/network/rtl8812bu/README.md
@@ -0,0 +1,72 @@
+# Realtek RTL8812BU Driver for Linux
+
+[![Build Status](https://github.com/fastoe/RTL8812BU/actions/workflows/rtl8812bu.yml/badge.svg)](https://github.com/fastoe/RTL8812BU/actions)
+
+Driver for 802.11ac USB adapter with RTL8812BU chipset, only STA/Monitor mode is supported, no AP mode.
+
+A few known wireless cards that use this driver include:
+* [Fastoe AC1200 USB Wi-Fi Adapter](https://www.amazon.com/1200Mbps-ChromeBook-802-11ac-Compatible-Raspbian/dp/B081TGWCVB/ref=as_li_ss_tl?m=A9879GOT1YWJ2&marketplaceID=ATVPDKIKX0DER&qid=1581225299&s=merchant-items&sr=1-3&linkCode=ll1&tag=fastoe-20&linkId=5648949a51280f0323dd599dc27dbae4&language=en_US)
+* Cudy WU1200 AC1200 High Gain USB Wi-Fi Adapter
+* TP-Link Archer T3U
+* TP-Link Archer T3U Plus
+* TP-Link Archer T4U V3
+* Linksys WUSB6400M
+* Dlink DWA-181
+* Dlink DWA-182
+
+Currently tested with Linux kernel 4.12.14/4.15.0/5.3.0/5.15.0 on X86_64 platform **only**.
+
+### For Raspberry Pi
+* https://github.com/fastoe/RTL8812BU_for_Raspbian
+
+
+### For kernel 5.11 or later, please clone the v5.13.1 branch:
+```bash
+sudo apt update
+sudo apt install -y build-essential dkms git bc
+git clone -b v5.13.1 https://github.com/fastoe/RTL8812BU.git
+cd RTL8812BU
+make
+sudo make install
+sudo reboot
+```
+
+### For 5.10 kernel, please clone the v5.6.1 branch:
+```bash
+sudo apt update
+sudo apt install -y build-essential dkms git bc
+git clone -b v5.6.1 https://github.com/fastoe/RTL8812BU.git
+cd RTL8812BU
+make
+sudo make install
+sudo reboot
+```
+
+### For 5.9 and previous versions:
+```bash
+sudo apt update
+sudo apt install -y build-essential dkms git bc
+git clone https://github.com/fastoe/RTL8812BU.git
+cd RTL8812BU
+make
+sudo make install
+sudo reboot
+```
+
+For setting monitor mode:
+
+```bash
+# configure for monitor mode
+sed -i 's/CONFIG_80211W = n/CONFIG_80211W = y/' Makefile
+sed -i 's/CONFIG_WIFI_MONITOR = n/CONFIG_WIFI_MONITOR = y/' Makefile
+
+make
+sudo make install
+sudo ip link set wlx1cbfcea97791 down
+sudo iw wlx1cbfcea97791 set monitor none
+sudo ip link set wlx1cbfcea97791 up
+```
+
+![image](https://www.fastoe.com/images/2020/05/8812bu-monitor-mode.png)
+
+Enjoy!
diff --git a/network/rtl8812bu/doinst.sh b/network/rtl8812bu/doinst.sh
new file mode 100644
index 0000000000..b17f2a6739
--- /dev/null
+++ b/network/rtl8812bu/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/network/rtl8812bu/git2tarxz.sh b/network/rtl8812bu/git2tarxz.sh
new file mode 100644
index 0000000000..fab3f79ae8
--- /dev/null
+++ b/network/rtl8812bu/git2tarxz.sh
@@ -0,0 +1,44 @@
+#!/bin/sh
+
+# Create source tarball from git repo. Takes a branch (not a commit or tag)
+# as an argument! Warning, this is different from all the other git2tarxz
+# scripts on SBo!
+
+# 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 *branch* to create a
+# tarball of. With no arg, this is used:
+BRANCH=${1:-v5.13.1}
+
+PRGNAM=rtl8812bu
+CLONE_URL=https://github.com/fastoe/RTL8812BU
+
+set -e
+
+GITDIR=$( mktemp -dt $PRGNAM.git.XXXXXX )
+rm -rf $GITDIR
+git clone -b $BRANCH $CLONE_URL $GITDIR
+
+CWD="$( pwd )"
+cd $GITDIR
+
+GIT_SHA=$( git rev-parse --short HEAD )
+
+DATE=$( git log --date=format:%Y%m%d --format=%cd | head -1 )
+
+# don't want our tarball's version number to start with "v":
+VERTAG=$( echo $BRANCH | sed 's,^v,,' )
+
+VERSION=${VERTAG}+${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/network/rtl8812bu/rtl8812bu.SlackBuild b/network/rtl8812bu/rtl8812bu.SlackBuild
new file mode 100644
index 0000000000..3993198d61
--- /dev/null
+++ b/network/rtl8812bu/rtl8812bu.SlackBuild
@@ -0,0 +1,79 @@
+#!/bin/bash
+
+# Slackware build script for rtl8812bu
+
+# Written by B. Watson (urchlay@slackware.uk)
+
+# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
+
+# 20230124 bkw: Just bought one of these devices today, shocked there
+# was no driver in Slackware or SBo already. So here it is.
+
+# Based on rtl8188eu.SlackBuild and rtl8821ce.SlackBuild.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=rtl8812bu
+VERSION=${VERSION:-5.13.1+20230115_36deb90}
+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}
+
+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 {} \+
+
+export KVER=$KERNEL
+if [ "$ARCH" = "i586" ] || [ "$ARCH" = "i686" ] ; then
+  # auto detect in the Makefile does not work and sets ARCH to `uname -m`, but
+  # it only builds if it is set to i386
+  ARCH=i386 make
+else
+  env -u ARCH make
+fi
+install -D -m0644 88x2bu.ko \
+  $PKG/lib/modules/$KERNEL/kernel/drivers/net/wireless/88x2bu.ko
+
+# No docs other than the license, so include our own README.
+# Note: don't use $VERSION here, use $PKGVER. The rtl8188eu slackbuild
+# doesn't do this (but it should), the rtl8821ce one does.
+PKGDOC=$PKG/usr/doc/$PRGNAM-$PKGVER
+mkdir -p $PKGDOC
+cp -a LICENSE $PKGDOC
+cat $CWD/README > $PKGDOC/README
+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/network/rtl8812bu/rtl8812bu.info b/network/rtl8812bu/rtl8812bu.info
new file mode 100644
index 0000000000..9651127653
--- /dev/null
+++ b/network/rtl8812bu/rtl8812bu.info
@@ -0,0 +1,10 @@
+PRGNAM="rtl8812bu"
+VERSION="5.13.1+20230115_36deb90"
+HOMEPAGE="https://github.com/fastoe/RTL8812BU"
+DOWNLOAD="https://slackware.uk/~urchlay/src/rtl8812bu-5.13.1+20230115_36deb90.tar.xz"
+MD5SUM="2d6832b9925682f111d7b3c0a7e9cf93"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="B. Watson"
+EMAIL="urchlay@slackware.uk"
diff --git a/network/rtl8812bu/slack-desc b/network/rtl8812bu/slack-desc
new file mode 100644
index 0000000000..638e3b5afe
--- /dev/null
+++ b/network/rtl8812bu/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+         |-----handy-ruler------------------------------------------------------|
+rtl8812bu: rtl8812bu (driver for rtl8812bu wireless network adaptors)
+rtl8812bu:
+rtl8812bu: Driver for Realtek wireless adaptors using the rtl8812bu chipset.
+rtl8812bu:
+rtl8812bu: For more information, visit the project's home page at:
+rtl8812bu: https://github.com/fastoe/RTL8812BU
+rtl8812bu:
+rtl8812bu:
+rtl8812bu:
+rtl8812bu:
+rtl8812bu:
diff --git a/network/rtl8821ce/README b/network/rtl8821ce/README
new file mode 100644
index 0000000000..0c7cf68af3
--- /dev/null
+++ b/network/rtl8821ce/README
@@ -0,0 +1,24 @@
+Realtek RTL8821CE Driver maintained by Tomás Pinho for Arch Linux.
+Still, can serve Slackers as well!
+
+NOTE:
+
+  Although the driver builds for kernel 4.4.x as found in -14.2,
+  I only tested it in the field on kernel 5.4.x as found in -current.
+  Also, upstream warns that the source is targeting kernels > 4.14.
+
+To build the package for a kernel different from the running one,
+start the script setting the KERNEL variable as in:
+
+  KERNEL=4.4.14 ./rtl8821ce.SlackBuild
+
+NOTE:
+
+1. If you experience problems using this driver (e.g. a non-working
+   WiFi or Bluetooth), visit project's homepage to learn about possible
+   solutions.
+2. If you want to use this driver on -14.2, but with the kernel from
+   -current, you will need to compile the kernel yourself on -14.2.
+   Otherwise, you will run into compilation errors while building
+   the driver. I have no intent of fixing that, unless you provide me
+   with a working patch. ;-)
diff --git a/network/rtl8821ce/allow-kver-ksrc.patch b/network/rtl8821ce/allow-kver-ksrc.patch
new file mode 100644
index 0000000000..0629f749ee
--- /dev/null
+++ b/network/rtl8821ce/allow-kver-ksrc.patch
@@ -0,0 +1,15 @@
+diff --git a/Makefile b/Makefile
+index 5b5dc9a..da26fdd 100755
+--- a/Makefile
++++ b/Makefile
+@@ -1218,8 +1218,8 @@ EXTRA_CFLAGS += -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT
+ SUBARCH := $(shell uname -m | sed -e s/i.86/i386/)
+ ARCH ?= $(SUBARCH)
+ CROSS_COMPILE ?=
+-KVER  := $(shell uname -r)
+-KSRC := /lib/modules/$(KVER)/build
++KVER  ?= $(shell uname -r)
++KSRC ?= /lib/modules/$(KVER)/build
+ MODDESTDIR := /lib/modules/$(KVER)/kernel/drivers/net/wireless/
+ INSTALL_PREFIX :=
+ STAGINGMODDIR := /lib/modules/$(KVER)/kernel/drivers/staging
diff --git a/network/rtl8821ce/doinst.sh b/network/rtl8821ce/doinst.sh
new file mode 100644
index 0000000000..766ff48186
--- /dev/null
+++ b/network/rtl8821ce/doinst.sh
@@ -0,0 +1 @@
+chroot . /sbin/depmod -a @KERNEL@
diff --git a/network/rtl8821ce/opt-for-performance.patch b/network/rtl8821ce/opt-for-performance.patch
new file mode 100644
index 0000000000..636bab7f52
--- /dev/null
+++ b/network/rtl8821ce/opt-for-performance.patch
@@ -0,0 +1,11 @@
+diff --git a/Makefile b/Makefile
+index 5b5dc9a..4cfa841 100755
+--- a/Makefile
++++ b/Makefile
+@@ -1,5 +1,5 @@
+ EXTRA_CFLAGS += $(USER_EXTRA_CFLAGS)
+-EXTRA_CFLAGS += -O1
++EXTRA_CFLAGS += -O2
+ #EXTRA_CFLAGS += -O3
+ #EXTRA_CFLAGS += -Wall
+ #EXTRA_CFLAGS += -Wextra
diff --git a/network/rtl8821ce/rtl8821ce.SlackBuild b/network/rtl8821ce/rtl8821ce.SlackBuild
new file mode 100644
index 0000000000..628260a5ac
--- /dev/null
+++ b/network/rtl8821ce/rtl8821ce.SlackBuild
@@ -0,0 +1,89 @@
+#!/bin/bash
+
+# Slackware build script for Realtek RTL8821CE Driver
+
+# Copyright 2022 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=rtl8821ce
+VERSION=${VERSION:-20211119_ca204c6}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+KERNEL=${KERNEL:-$(uname -r)}
+KERNELPATH=${KERNELPATH:-/lib/modules/${KERNEL}/build}
+PKG_VERS=${VERSION}_$(printf "%s" "${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-$PKG_VERS-$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 -R a-st,u+rwX,go-w+rX .
+
+# Optimize with -O2, inline with Slackware.
+
+patch -p1 < $CWD/opt-for-performance.patch
+
+# Allow building for kernels other than the running one.
+
+patch -p1 < $CWD/allow-kver-ksrc.patch
+
+make KVER=${KERNEL} KSRC=${KERNELPATH}
+
+mkdir -p $PKG/lib/modules/$KERNEL/kernel/drivers/net/wireless/realtek/rtlwifi/$PRGNAM
+install -m 0644 8821ce.ko $PKG/lib/modules/$KERNEL/kernel/drivers/net/wireless/realtek/rtlwifi/$PRGNAM
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$PKG_VERS
+cp -a COPYING README.md $PKG/usr/doc/$PRGNAM-$PKG_VERS
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$PKG_VERS/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+sed $CWD/doinst.sh -e "s%@KERNEL@%$KERNEL%" > $PKG/install/doinst.sh
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$PKG_VERS-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/network/rtl8821ce/rtl8821ce.info b/network/rtl8821ce/rtl8821ce.info
new file mode 100644
index 0000000000..8f074f9019
--- /dev/null
+++ b/network/rtl8821ce/rtl8821ce.info
@@ -0,0 +1,10 @@
+PRGNAM="rtl8821ce"
+VERSION="20211119_ca204c6"
+HOMEPAGE="https://github.com/tomaspinho/rtl8821ce/"
+DOWNLOAD="https://sourceforge.net/projects/slackbuildsdirectlinks/files/rtl8821ce/rtl8821ce-20211119_ca204c6.tar.gz"
+MD5SUM="d40fb08c28810d00a26ed3498a85f2f3"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Andrzej Telszewski"
+EMAIL="andrzej@telszewski.com"
diff --git a/network/rtl8821ce/slack-desc b/network/rtl8821ce/slack-desc
new file mode 100644
index 0000000000..186d9369c1
--- /dev/null
+++ b/network/rtl8821ce/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+         |-----handy-ruler------------------------------------------------------|
+rtl8821ce: rtl8821ce (Realtek RTL8821CE Driver)
+rtl8821ce:
+rtl8821ce: Realtek RTL8821CE Driver maintained by Tomas Pinho for Arch Linux.
+rtl8821ce: Still, can serve Slackers as well!
+rtl8821ce:
+rtl8821ce: If you experience problems using this driver, please visit
+rtl8821ce: project's homepage to learn about possible solutions.
+rtl8821ce:
+rtl8821ce: Homepage: https://github.com/tomaspinho/rtl8821ce/
+rtl8821ce:
+rtl8821ce:
diff --git a/network/rtorrent/README b/network/rtorrent/README
index 6c05b5620f..74e8064101 100644
--- a/network/rtorrent/README
+++ b/network/rtorrent/README
@@ -2,3 +2,5 @@ rtorrent is a BitTorrent client for ncurses, using the libtorrent
 library. The client and library is written in C++ with emphasis on speed
 and efficiency, while delivering equivalent features to those found in
 GUI based clients in an ncurses client.
+
+Optional dependency: xmlrpc-c
diff --git a/network/rtorrent/rtorrent.SlackBuild b/network/rtorrent/rtorrent.SlackBuild
index f5ee018aff..f341ad10bf 100644
--- a/network/rtorrent/rtorrent.SlackBuild
+++ b/network/rtorrent/rtorrent.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for rtorrent
 # Written by Brian Kysela <brian.kysela@gmail.com> 2009-11-04
@@ -10,26 +10,36 @@
 # Updated to 0.8.9 by Brian Kysela 2011-06-22
 # Updated to 0.9.0 by Brian Kysela 2011-12-12
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=rtorrent
 VERSION=${VERSION:-0.9.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=i686 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -42,6 +52,8 @@ else
   LIBDIRSUFFIX=""
 fi
 
+xmlrpcc="" ; [ -x /usr/bin/xmlrpc-c-config ] && xmlrpcc="--with-xmlrpc-c"
+
 set -e
 
 rm -rf $PKG
@@ -66,6 +78,8 @@ CXXFLAGS="$SLKCFLAGS" \
   --sysconfdir=/etc \
   --localstatedir=/var \
   --mandir=/usr/man \
+  $xmlrpcc \
+  --disable-debug \
   --build=$ARCH-slackware-linux
 
 make
@@ -83,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/network/rtorrent/rtorrent.info b/network/rtorrent/rtorrent.info
index 90c5124f2a..0ea94d858f 100644
--- a/network/rtorrent/rtorrent.info
+++ b/network/rtorrent/rtorrent.info
@@ -1,7 +1,7 @@
 PRGNAM="rtorrent"
 VERSION="0.9.7"
 HOMEPAGE="https://github.com/rakshasa/rtorrent"
-DOWNLOAD="http://rtorrent.net/downloads/rtorrent-0.9.7.tar.gz"
+DOWNLOAD="https://github.com/rakshasa/rtorrent/releases/download/v0.9.7/rtorrent-0.9.7.tar.gz"
 MD5SUM="284b833794ce3ab4ddc62cf1a20edeb1"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/network/rubygem-showterm/rubygem-showterm.SlackBuild b/network/rubygem-showterm/rubygem-showterm.SlackBuild
index 79a8ce1197..950ddb982e 100644
--- a/network/rubygem-showterm/rubygem-showterm.SlackBuild
+++ b/network/rubygem-showterm/rubygem-showterm.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for showterm
 
-# Copyright 2015-2016  Dimitris Zlatanidis  Orestiada, Greece
+# Copyright 2015-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=rubygem-showterm
-VERSION=${VERSION:-0.5.0}
+VERSION=${VERSION:-0.6.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 SRCNAM=showterm
 
@@ -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}
@@ -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/network/rubygem-showterm/rubygem-showterm.info b/network/rubygem-showterm/rubygem-showterm.info
index 99bfce1806..920f42ea43 100644
--- a/network/rubygem-showterm/rubygem-showterm.info
+++ b/network/rubygem-showterm/rubygem-showterm.info
@@ -1,8 +1,8 @@
 PRGNAM="rubygem-showterm"
-VERSION="0.5.0"
+VERSION="0.6.0"
 HOMEPAGE="http://showterm.io/"
-DOWNLOAD="https://rubygems.org/downloads/showterm-0.5.0.gem"
-MD5SUM="b35d010772bdb6ec7e5f12e1625fcb99"
+DOWNLOAD="https://rubygems.org/downloads/showterm-0.6.0.gem"
+MD5SUM="0b89128d74655590f1c1db8b98abb0c6"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/network/s-nail/README b/network/s-nail/README
deleted file mode 100644
index c18e83c0f2..0000000000
--- a/network/s-nail/README
+++ /dev/null
@@ -1,16 +0,0 @@
-S-nail (mail sending and receiving utility)
-
-S-nail provides a simple and friendly environment for sending and
-receiving mail. It is intended to provide the functionality of the
-POSIX mailx command, but is MIME capable and optionally offers
-extensions for line editing, S/MIME, SMTP and POP3, among others. It
-divides incoming mail into its constituent messages and allows the
-user to deal with them in any order. It offers many COMMANDS and
-INTERNAL VARIABLES for manipulating messages and sending mail. It
-offers simple editing capabilities, and increasingly powerful and
-reliable non-interactive scripting capabilities.
-
-NOTE
-
-This package conflicts with Slackware's mailx package. You should
-remove mailx before installing this package.
diff --git a/network/s-nail/doinst.sh b/network/s-nail/doinst.sh
deleted file mode 100644
index b541fb201d..0000000000
--- a/network/s-nail/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/nail.rc.new
diff --git a/network/s-nail/s-nail.SlackBuild b/network/s-nail/s-nail.SlackBuild
deleted file mode 100644
index b81e29ced6..0000000000
--- a/network/s-nail/s-nail.SlackBuild
+++ /dev/null
@@ -1,135 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for S-nail
-
-# Copyright 2008, 2009, 2010, 2016  Patrick J. Volkerding, Sebeka, MN, USA
-# Copyright 2018 - 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=s-nail
-VERSION=${VERSION:-14.9.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-$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" \
-make \
-  VAL_PREFIX=/usr \
-  VAL_SYSCONFDIR=/etc \
-  VAL_MANDIR=/usr/man \
-  VAL_MAIL=/var/spool/mail \
-  VAL_MTA=/usr/sbin/sendmail \
-  OPT_AUTOCC=0 \
-  VAL_SID= \
-  VAL_MAILX=mailx \
-  VAL_SYSCONFRC=nail.rc \
-  VAL_RANDOM="libgetrandom,sysgetrandom,urandom" \
-  config
-
-make build
-make test
-make install DESTDIR=$PKG
-
-# Tighten up the perms a bit:
-chmod 4711 $PKG/usr/libexec/mailx-dotlock
-
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-# We put symlinks in /bin since some things still expect '/bin/mail' or '/bin/Mail':
-mkdir -p $PKG/bin
-( cd $PKG/bin
-  ln -sf /usr/bin/mailx Mail
-  ln -sf /usr/bin/mailx mail
-  ln -sf /usr/bin/mailx nail
-)
-
-# Likewise, we make some compat symlinks in /usr/bin:
-( cd $PKG/usr/bin
-  ln -sf mailx Mail
-  ln -sf mailx mail
-  ln -sf mailx nail
-)
-
-mv $PKG/etc/nail.rc $PKG/etc/nail.rc.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
-
-# Manpage links:
-( cd $PKG/usr/man/man1
-  ln -sf mailx.1.gz mail.1.gz
-  ln -sf mailx.1.gz nail.1.gz
-  ln -sf mailx.1.gz Mail.1.gz
-)
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
-  COPYING* INSTALL* 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}
diff --git a/network/s-nail/s-nail.info b/network/s-nail/s-nail.info
deleted file mode 100644
index d7824d73fe..0000000000
--- a/network/s-nail/s-nail.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="s-nail"
-VERSION="14.9.13"
-HOMEPAGE="https://www.sdaoden.eu/code.html"
-DOWNLOAD="https://www.sdaoden.eu/downloads/s-nail-14.9.13.tar.xz"
-MD5SUM="ecd7ab5b52f0ea03608fd2c4cb327964"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="%README%"
-MAINTAINER="Johannes Schoepfer"
-EMAIL="slackbuilds@schoepfer.info"
diff --git a/network/s-nail/slack-desc b/network/s-nail/slack-desc
deleted file mode 100644
index ab63a8e702..0000000000
--- a/network/s-nail/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------------------------------------------------------|
-s-nail: s-nail (mail sending and receiving utility)
-s-nail:
-s-nail: S-nail provides a simple and friendly environment for sending and
-s-nail: receiving mail. It is intended to provide the functionality of the
-s-nail: POSIX mailx command, but is MIME capable and optionally offers
-s-nail: extensions for line editing, S/MIME, SMTP and POP3, among others. It
-s-nail: divides incoming mail into its constituent messages and allows the
-s-nail: user to deal with them in any order. It offers many COMMANDS and
-s-nail: INTERNAL VARIABLES for manipulating messages and sending mail. It
-s-nail: offers simple editing capabilities, and increasingly powerful and
-s-nail: reliable non-interactive scripting capabilities.
diff --git a/network/sabnzbd/README b/network/sabnzbd/README
index fc4c345322..4318d10bf1 100644
--- a/network/sabnzbd/README
+++ b/network/sabnzbd/README
@@ -4,9 +4,9 @@ This requires a sabnzbd user and group which can be created like so:
 # groupadd -g 296 sabnzbd
 # useradd -d /opt/sabnzbd -s /bin/false -u 296 -g 296 sabnzbd
 
-SABnzbd can be started with the script /etc/rc.d/rc.sabnzbd at boot.
-It will then run as user sabnzbd. This is intended for server without X usage.
-SABnzbd can be configured by pointing your browser to:
+SABnzbd can be started with the script /etc/rc.d/rc.sabnzbd at boot.  It
+will then run as user sabnzbd. This is intended for server without X
+usage.  SABnzbd can be configured by pointing your browser to:
 http://<hostname>:8080
 
 It can also be started from the application menu/launcher or from the
diff --git a/network/sabnzbd/sabnzbd.SlackBuild b/network/sabnzbd/sabnzbd.SlackBuild
index f9f61183b6..563398bf16 100644
--- a/network/sabnzbd/sabnzbd.SlackBuild
+++ b/network/sabnzbd/sabnzbd.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for sabnzbd
 
@@ -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=sabnzbd
-VERSION=${VERSION:-2.3.6}
+VERSION=${VERSION:-2.3.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}
@@ -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/network/sabnzbd/sabnzbd.info b/network/sabnzbd/sabnzbd.info
index d635bae835..5dd27e47fa 100644
--- a/network/sabnzbd/sabnzbd.info
+++ b/network/sabnzbd/sabnzbd.info
@@ -1,10 +1,10 @@
 PRGNAM="sabnzbd"
-VERSION="2.3.6"
+VERSION="2.3.9"
 HOMEPAGE="http://sabnzbd.org"
-DOWNLOAD="https://github.com/sabnzbd/sabnzbd/releases/download/2.3.6/SABnzbd-2.3.6-src.tar.gz"
-MD5SUM="8ebdf61ae058209704619f5aa637bdee"
+DOWNLOAD="https://github.com/sabnzbd/sabnzbd/releases/download/2.3.9/SABnzbd-2.3.9-src.tar.gz"
+MD5SUM="6845962498a6c3629818e28b32edeac6"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="python-cheetah python-yenc pyOpenSSL unrar par2cmdline"
+REQUIRES="python2-cheetah python2-yenc pyOpenSSL unrar par2cmdline"
 MAINTAINER="Kevin Matthew"
 EMAIL="kevin@kevinmatthew.com"
diff --git a/network/scapy/scapy.SlackBuild b/network/scapy/scapy.SlackBuild
index 61888c7449..44a2db956e 100644
--- a/network/scapy/scapy.SlackBuild
+++ b/network/scapy/scapy.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 #
 # Slackware build script for scapy (http://www.secdev.org/projects/scapy/)
 #
-# Copyright 2008-2019 Corrado Franco (http://conraid.net)
+# Copyright 2008-2023 Corrado Franco (http://conraid.net)
 # All rights reserved.
 #
 # This program is free software: you can redistribute it and/or modify
@@ -23,10 +23,13 @@
 # with this program (most likely, a file named COPYING).  If not, see
 # <http://www.gnu.org/licenses/>.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=scapy
-VERSION=${VERSION:-2.4.3}
+VERSION=${VERSION:-2.5.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}
 OUTPUT=${OUTPUT:-/tmp}
 PKG=$TMP/package-$PRGNAM
@@ -58,8 +68,13 @@ find -L . \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 sed "s|share/man/man1|man/man1|g" -i setup.py
-python setup.py build
-python setup.py install --root=$PKG
+python2 setup.py build
+python2 setup.py install --root=$PKG
+
+if [ -d $PKG/usr/man ]; then
+  find $PKG/usr/man -type f -exec chmod 644 {} \; -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
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
@@ -68,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/network/scapy/scapy.info b/network/scapy/scapy.info
index 9c53507ecd..417e962fca 100644
--- a/network/scapy/scapy.info
+++ b/network/scapy/scapy.info
@@ -1,8 +1,8 @@
 PRGNAM="scapy"
-VERSION="2.4.3"
+VERSION="2.5.0"
 HOMEPAGE="http://www.secdev.org/projects/scapy/"
-DOWNLOAD="https://github.com/secdev/scapy/archive/v2.4.3/scapy-2.4.3.tar.gz"
-MD5SUM="c94f3825391c102ca9740e41f4ed2ec0"
+DOWNLOAD="https://github.com/secdev/scapy/archive/v2.5.0/scapy-2.5.0.tar.gz"
+MD5SUM="953cd03bde6fe31e361a83487d75dbcf"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/network/scrcpy/README b/network/scrcpy/README
new file mode 100644
index 0000000000..e46a4c9985
--- /dev/null
+++ b/network/scrcpy/README
@@ -0,0 +1,22 @@
+scrcpy is a tool that allows to display and control an Android device
+connected on USB (or over TCP/IP). It does not require any root access.
+
+scrcpy requires adb as runtime dependency. adb is part of the package
+android-tools on slackbuilds.org .
+
+scrcpy requires the Android device to be switched to Developer Mode
+and have a few options switched on (tested on a Redmi 9C NFC phone):
+
+- USB debugging
+
+On some devices it also requires:
+
+- USB debugging (Security settings)
+
+See https://github.com/Genymobile/scrcpy#requirements for additional
+details.
+
+This SlackBuild uses the prebuilt server instead of compiling it from
+source, to minimize dependencies.
+
+Note: the SlackBuild was tested on Slackware64-15.0 only
diff --git a/network/scrcpy/doinst.sh b/network/scrcpy/doinst.sh
new file mode 100644
index 0000000000..65c7e2eeb9
--- /dev/null
+++ b/network/scrcpy/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/network/scrcpy/scrcpy.SlackBuild b/network/scrcpy/scrcpy.SlackBuild
new file mode 100644
index 0000000000..428f363037
--- /dev/null
+++ b/network/scrcpy/scrcpy.SlackBuild
@@ -0,0 +1,115 @@
+#!/bin/bash
+
+# Slackware build script for scrcpy
+
+# Copyright 2021-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=scrcpy
+VERSION=${VERSION:-1.24}
+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 \
+    --strip \
+    -Db_lto=true \
+    -Dprebuilt_server=$CWD/scrcpy-server-v$VERSION
+  "${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
+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/network/scrcpy/scrcpy.info b/network/scrcpy/scrcpy.info
new file mode 100644
index 0000000000..9e9be261dc
--- /dev/null
+++ b/network/scrcpy/scrcpy.info
@@ -0,0 +1,12 @@
+PRGNAM="scrcpy"
+VERSION="1.24"
+HOMEPAGE="https://github.com/Genymobile/scrcpy"
+DOWNLOAD="https://github.com/Genymobile/scrcpy/archive/v1.24/scrcpy-1.24.tar.gz \
+          https://github.com/Genymobile/scrcpy/releases/download/v1.24/scrcpy-server-v1.24"
+MD5SUM="a06005d880ca863181266820d91ac396 \
+        23032394c932e4de6a98aaec096fe9c4"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="toolonely"
+EMAIL="lonely_@tutanota.com"
diff --git a/network/scrcpy/slack-desc b/network/scrcpy/slack-desc
new file mode 100644
index 0000000000..57efb9463d
--- /dev/null
+++ b/network/scrcpy/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+      |-----handy-ruler------------------------------------------------------|
+scrcpy: scrcpy (display and control your Android device)
+scrcpy:
+scrcpy: This application provides display and control of Android devices
+scrcpy: connected on USB (or over TCP/IP). It does not require any
+scrcpy: root access.
+scrcpy:
+scrcpy: https://github.com/Genymobile/scrcpy
+scrcpy:
+scrcpy:
+scrcpy:
+scrcpy:
diff --git a/network/seadrive-fuse/README b/network/seadrive-fuse/README
new file mode 100644
index 0000000000..033d287c8f
--- /dev/null
+++ b/network/seadrive-fuse/README
@@ -0,0 +1,6 @@
+SeaDrive daemon with FUSE interface.
+
+The Drive client enables you to access files on the server without 
+syncing to local disk. It works like a network drive. 
+
+Requires libsearpc.
diff --git a/network/seadrive-fuse/seadrive-fuse.SlackBuild b/network/seadrive-fuse/seadrive-fuse.SlackBuild
new file mode 100644
index 0000000000..0c73e5acb5
--- /dev/null
+++ b/network/seadrive-fuse/seadrive-fuse.SlackBuild
@@ -0,0 +1,114 @@
+#!/bin/bash
+
+# Slackware build script for seadrive-fuse
+
+# Copyright 2022 Fabien Soulier 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.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=seadrive-fuse
+VERSION=${VERSION:-2.0.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 the variable PRINT_PACKAGE_NAME is set, then this script will report what
+# the name of the created package would be, and then exit. This information
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; 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 \
+  --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
+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/network/seadrive-fuse/seadrive-fuse.info b/network/seadrive-fuse/seadrive-fuse.info
new file mode 100644
index 0000000000..9902edc6e7
--- /dev/null
+++ b/network/seadrive-fuse/seadrive-fuse.info
@@ -0,0 +1,10 @@
+PRGNAM="seadrive-fuse"
+VERSION="2.0.22"
+HOMEPAGE="https://www.seafile.com"
+DOWNLOAD="https://github.com/haiwen/seadrive-fuse/archive/v2.0.22/seadrive-fuse-2.0.22.tar.gz"
+MD5SUM="fba497bf6ae0b55943768979eec7446f"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="libsearpc"
+MAINTAINER="Fabien Soulier"
+EMAIL="fabien.soulier@libertysurf.fr"
diff --git a/network/seadrive-fuse/slack-desc b/network/seadrive-fuse/slack-desc
new file mode 100644
index 0000000000..196e5f8791
--- /dev/null
+++ b/network/seadrive-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------------------------------------------------------|
+seadrive-fuse: seadrive-fuse (SeaDrive daemon with FUSE interface)
+seadrive-fuse:
+seadrive-fuse: The Drive client enables you to access files on the server without
+seadrive-fuse: syncing to local disk. It works like a network drive.
+seadrive-fuse:
+seadrive-fuse:
+seadrive-fuse:
+seadrive-fuse:
+seadrive-fuse:
+seadrive-fuse:
+seadrive-fuse:
diff --git a/network/seafile-client/seafile-client.SlackBuild b/network/seafile-client/seafile-client.SlackBuild
deleted file mode 100644
index 205c0af148..0000000000
--- a/network/seafile-client/seafile-client.SlackBuild
+++ /dev/null
@@ -1,103 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for "seafile-client".
-
-# Copyright 2015 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=seafile-client
-SRCNAM=seafile
-VERSION=${VERSION:-4.4.6}
-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-$VERSION
-tar xvf $CWD/v$VERSION-server.tar.gz || tar xvf $CWD/$SRCNAM-$VERSION-server.tar.gz
-cd $SRCNAM-$VERSION-server
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -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 \
-  --enable-client \
-  --enable-static=no \
-  --build=$ARCH-slackware-linux
-
-make
-make install-strip DESTDIR=$PKG
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a LICENSE.txt README.markdown $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 {} \;
-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
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/network/seafile-client/seafile-client.info b/network/seafile-client/seafile-client.info
deleted file mode 100644
index ef875c1f8f..0000000000
--- a/network/seafile-client/seafile-client.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="seafile-client"
-VERSION="4.4.6"
-HOMEPAGE="http://seafile.com/"
-DOWNLOAD="https://github.com/haiwen/seafile/archive/v4.4.6-server.tar.gz"
-MD5SUM="753db8ec00c8f4e43270afff097a23af"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="ccnet libevhtp"
-MAINTAINER="Marcel Saegebarth"
-EMAIL="marc@mos6581.de"
diff --git a/network/seafile-client/slack-desc b/network/seafile-client/slack-desc
deleted file mode 100644
index e41d278faa..0000000000
--- a/network/seafile-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------------------------------------------------------|
-seafile-client: seafile-client (Cloud Storage System)
-seafile-client:
-seafile-client: Seafile is a next-generation open source cloud storage system with
-seafile-client: advanced support for file syncing, privacy protection and teamwork.
-seafile-client:
-seafile-client: Homepage: http://seafile.com/
-seafile-client:
-seafile-client:
-seafile-client:
-seafile-client:
-seafile-client:
diff --git a/network/seafile-server/patch-seafile-controller-pid-path.diff b/network/seafile-server/patch-seafile-controller-pid-path.diff
deleted file mode 100644
index b9698206ea..0000000000
--- a/network/seafile-server/patch-seafile-controller-pid-path.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- controller/seafile-controller.c.orig	2015-02-05 13:00:40.096813074 +0100
-+++ controller/seafile-controller.c	2015-02-05 13:03:44.628487779 +0100
-@@ -576,7 +576,7 @@
- static void
- init_pidfile_path (SeafileController *ctl)
- {
--    char *pid_dir = g_build_filename (topdir, "pids", NULL);
-+    char *pid_dir = g_build_filename (ctl->seafile_dir, "pids", NULL);
-     if (!g_file_test(pid_dir, G_FILE_TEST_EXISTS)) {
-         if (g_mkdir(pid_dir, 0777) < 0) {
-             seaf_warning("failed to create pid dir %s: %s", pid_dir, strerror(errno));
diff --git a/network/seafile-server/seafile-server.SlackBuild b/network/seafile-server/seafile-server.SlackBuild
index 959cbc15c4..a2e8c8c7db 100644
--- a/network/seafile-server/seafile-server.SlackBuild
+++ b/network/seafile-server/seafile-server.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for "seafile-server".
 
@@ -24,27 +24,37 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=seafile-server
 SRCNAM=seafile
-VERSION=${VERSION:-4.4.6}
-BUILD=${BUILD:-1}
+VERSION=${VERSION:-8.0.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"
@@ -76,9 +86,8 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $SRCNAM-$VERSION
-tar xvf $CWD/v$VERSION-server.tar.gz || \
-  tar xvf $CWD/$SRCNAM-$VERSION-server.tar.gz
-cd $SRCNAM-$VERSION-server
+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 \
@@ -86,8 +95,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 {} \;
 
-cat $CWD/patch-seafile-controller-pid-path.diff | patch -p0
-
 sh autogen.sh
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
@@ -109,6 +116,9 @@ CXXFLAGS="$SLKCFLAGS" \
 make
 make install-strip DESTDIR=$PKG
 
+# rm libtool file
+rm -f $PKG/usr/lib${LIBDIRSUFFIX}/libseafile.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
 
@@ -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/network/seafile-server/seafile-server.info b/network/seafile-server/seafile-server.info
index 568008a660..26440aea91 100644
--- a/network/seafile-server/seafile-server.info
+++ b/network/seafile-server/seafile-server.info
@@ -1,8 +1,8 @@
 PRGNAM="seafile-server"
-VERSION="4.4.6"
+VERSION="8.0.6"
 HOMEPAGE="http://seafile.com/"
-DOWNLOAD="https://github.com/haiwen/seafile/archive/v4.4.6-server.tar.gz"
-MD5SUM="753db8ec00c8f4e43270afff097a23af"
+DOWNLOAD="https://github.com/haiwen/seafile/archive/v8.0.6/seafile-8.0.6.tar.gz"
+MD5SUM="cb23a1b7bcd2a89f5efec87867c5eabb"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="ccnet libevhtp seahub"
diff --git a/network/seafile-client/README b/network/seafile/README
index 937324eae1..937324eae1 100644
--- a/network/seafile-client/README
+++ b/network/seafile/README
diff --git a/network/seafile/seafile.SlackBuild b/network/seafile/seafile.SlackBuild
new file mode 100644
index 0000000000..0c538f8782
--- /dev/null
+++ b/network/seafile/seafile.SlackBuild
@@ -0,0 +1,116 @@
+#!/bin/bash
+
+# Slackware build script for seafile
+
+# Copyright 2015 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.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=seafile
+VERSION=${VERSION:-8.0.4}
+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 $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 PYTHON=python3
+
+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 \
+  --enable-client \
+  --enable-static=no \
+  --build=$ARCH-slackware-linux
+
+make
+make install-strip DESTDIR=$PKG
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a LICENSE.txt README.markdown $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 {} \;
+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*/*.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/network/seafile/seafile.info b/network/seafile/seafile.info
new file mode 100644
index 0000000000..90c3ecad50
--- /dev/null
+++ b/network/seafile/seafile.info
@@ -0,0 +1,10 @@
+PRGNAM="seafile"
+VERSION="8.0.4"
+HOMEPAGE="https://seafile.com"
+DOWNLOAD="https://github.com/haiwen/seafile/archive/v8.0.4/seafile-8.0.4.tar.gz"
+MD5SUM="3ed13d669c657ce1c3a02a11c511606e"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="libevhtp libsearpc"
+MAINTAINER="Marcel Saegebarth"
+EMAIL="marc@mos6581.de"
diff --git a/network/seafile/slack-desc b/network/seafile/slack-desc
new file mode 100644
index 0000000000..cad22d1bb6
--- /dev/null
+++ b/network/seafile/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+       |-----handy-ruler------------------------------------------------------|
+seafile: seafile (Cloud Storage System)
+seafile:
+seafile: Seafile is a next-generation open source cloud storage system with
+seafile: advanced support for file syncing, privacy protection and teamwork.
+seafile:
+seafile: Homepage: http://seafile.com/
+seafile:
+seafile:
+seafile:
+seafile:
+seafile:
diff --git a/network/seahub/README b/network/seahub/README
index 9b15cfdd39..1ba72e0083 100644
--- a/network/seahub/README
+++ b/network/seahub/README
@@ -1,11 +1,11 @@
 Seahub is the web frontend for Seafile.
 
-Note:
-This isn't the official "source" tarball, but `seahub' extracted from the binary
-tarball, due to its very weird, and old dependencies.
+Note: This isn't the official "source" tarball, but `seahub' extracted
+from the binary tarball, due to its very weird, and old dependencies.
 
-Due to the nature of Slackware pkgtools no seafile data from the users is
-removed, but just in case, create a backup before upgrading this package!
+Due to the nature of Slackware pkgtools no seafile data from the users
+is removed, but just in case, create a backup before upgrading this
+package!
 
 This package does not update/upgrade Seafile internal stuff.
 Refer to the Seafile manual:
diff --git a/network/seahub/seahub.SlackBuild b/network/seahub/seahub.SlackBuild
index 086d44c1c1..847f145ef4 100644
--- a/network/seahub/seahub.SlackBuild
+++ b/network/seahub/seahub.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for "seahub".
 
@@ -24,26 +24,37 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=seahub
 SRCNAM=seafile-server
 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 the variable PRINT_PACKAGE_NAME is set, then this script will report what
+# the name of the created package would be, and then exit. This information
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; 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" ] || [ "$ARCH" = "i686" ]; then
+if [ "$ARCH" = "i586" ] || [ "$ARCH" = "i686" ]; then
+  #source is i386, do not change
   SRCARCH="i386"
 elif [ "$ARCH" = "x86_64" ]; then
   SRCARCH="x86-64"
@@ -104,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/network/secpanel/secpanel.SlackBuild b/network/secpanel/secpanel.SlackBuild
index d5020c0949..cfb4933e27 100644
--- a/network/secpanel/secpanel.SlackBuild
+++ b/network/secpanel/secpanel.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for Secpanel
 
@@ -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=secpanel
 VERSION=${VERSION:-0.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}
@@ -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/network/sendxmpp/README b/network/sendxmpp/README
deleted file mode 100644
index 0424290288..0000000000
--- a/network/sendxmpp/README
+++ /dev/null
@@ -1,5 +0,0 @@
-sendxmpp is a program to send XMPP (Jabber) messages from the command
-line, not unlike mail(1). Messages can be sent both to individual
-recipients and chatrooms.
-
-XMPP is an open, non-proprietary protocol for instant messaging.
diff --git a/network/sendxmpp/patches/01.patch b/network/sendxmpp/patches/01.patch
deleted file mode 100644
index 59b85c0bb0..0000000000
--- a/network/sendxmpp/patches/01.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-Restore the ability to send normal messages.
-By Helmut Grohne <helmut@subdivi.de>, 2013-05-29
-
-Normal messages are like headline messages except they are not discarded
-when the contact is unavailable but queued instead.
-
-See https://bugs.debian.org/710285
-
---- a/sendxmpp
-+++ b/sendxmpp
-@@ -49,7 +49,7 @@
- my $VERBOSE  = 0;
- my $DEBUG    = 0;
- # http://tools.ietf.org/html/rfc3921#section-2  section 2.1.1 - Types of Message
--my @suppported_message_types	= qw( chat error groupchat headline );
-+my @suppported_message_types	= qw( chat error groupchat headline normal);
- my $message_type				= 'chat'; # default message type
- 
- # start!
-@@ -642,9 +642,9 @@
- 
- Backward compatibility option. You should use B<--message-type=headline> instead. Send a headline type message (not stored in offline messages)
- 
--=item B<--messages-type>
-+=item B<--message-type>
- 
--Set type of message. Supported types are: B<message chat headline>. Default message type is B<message>. Headline type message can be set also with B<--headline> option, see B<--headline>
-+Set type of message. Supported types are: B<chat error groupchat headline normal>. Default message type is B<chat>. Headline type message can be set also with B<--headline> option, see B<--headline>
- 
- =item B<-c>,B<--chatroom>
- 
diff --git a/network/sendxmpp/patches/02.patch b/network/sendxmpp/patches/02.patch
deleted file mode 100644
index 1c0dd70210..0000000000
--- a/network/sendxmpp/patches/02.patch
+++ /dev/null
@@ -1,277 +0,0 @@
-From 48f6fe83589b04b77dd4fe52b810f1415aa2835c Mon Sep 17 00:00:00 2001
-From: Lubomir Host <lubomir.host@gmail.com>
-Date: Tue, 7 Oct 2014 19:38:00 +0200
-Subject: [PATCH] Add spaces after comma.
-
----
- sendxmpp | 78 ++++++++++++++++++++++++++++----------------------------
- 1 file changed, 39 insertions(+), 39 deletions(-)
-
-diff --git a/sendxmpp b/sendxmpp
-index 91ae1ef..74d95c0 100755
---- a/sendxmpp
-+++ b/sendxmpp
-@@ -102,7 +102,7 @@ sub main () { # {{{
- 			$txt .= $_ while (<STDIN>);
- 		}
- 
--		xmpp_send ($cnx,$cmdline,$config,$txt);
-+		xmpp_send ($cnx, $cmdline, $config, $txt);
- 
-     }
- 	else {
-@@ -115,7 +115,7 @@ sub main () { # {{{
- 		# line by line...
- 		while (<STDIN>) {
- 			chomp;
--			xmpp_send ($cnx,$cmdline,$config,$_);
-+			xmpp_send ($cnx, $cmdline, $config, $_);
- 		}
- 	}
- 
-@@ -141,7 +141,7 @@ sub read_config_file ($) { # {{{
-     error_exit ("$cfg_file must not be accessible by others")
-       if ($mode & 0077);
- 
--    open (CFG,"<$cfg_file")
-+    open (CFG, "<$cfg_file")
-       or error_exit("cannot open $cfg_file for reading: $!");
- 
-     my %config;
-@@ -193,7 +193,7 @@ sub read_config_file ($) { # {{{
-       unless (scalar(%config));
- 
- 	  if ($DEBUG || $VERBOSE) {
--		  while (my ($key,$val) = each %config) {
-+		  while (my ($key, $val) = each %config) {
- 			  debug_print ("config: '$key' => '$val'");
- 		  }
- 	  }
-@@ -309,7 +309,7 @@ sub parse_cmdline () { # {{{
- 	);
- 
-    if ($DEBUG || $VERBOSE) {
--       while (my ($key,$val) = each %dict) {
-+       while (my ($key, $val) = each %dict) {
- 	   debug_print ("cmdline: '$key' => '$val'");
-        }
-    }
-@@ -319,7 +319,7 @@ sub parse_cmdline () { # {{{
- 
- #
- # xmpp_login: login to the xmpp (jabber) server
--# input: hostname,port,username,password,resource,tls,ssl,debug
-+# input: hostname, port, username, password, resource, tls, ssl, debug
- # output: an XMPP connection object
- #
- sub xmpp_login ($$$$$$$$$$$$) { # {{{
-@@ -374,7 +374,7 @@ sub xmpp_login ($$$$$$$$$$$$) { # {{{
- 		error_exit ("Could not connect to server '$host': ".($cnx->GetErrorCode()||$@)) unless @res;
- 	}
- 
--    xmpp_check_result("Connect",\@res,$cnx);
-+    xmpp_check_result("Connect", \@res, $cnx);
- 
- 	if ($comp) {
- 		my $sid = $cnx->{SESSION}->{id};
-@@ -385,7 +385,7 @@ sub xmpp_login ($$$$$$$$$$$$) { # {{{
- 			  'username' => $user,
- 			  'password' => $pw,
- 			  'resource' => $res);
--    xmpp_check_result('AuthSend',\@res,$cnx);
-+    xmpp_check_result('AuthSend', \@res, $cnx);
- 
-     return $cnx;
- } # }}}
-@@ -426,20 +426,20 @@ sub xmpp_send ($$$$) { # {{{
- 
- #
- # xmpp_send_raw_xml: send a raw XML packet
--# input: connection,packet
-+# input: connection, packet
- #
- sub xmpp_send_raw_xml ($$) { # {{{
- 
--    my ($cnx,$packet) = @_;
-+    my ($cnx, $packet) = @_;
- 
-     # for some reason, Send does not return anything
-     $cnx->Send($packet);
--    xmpp_check_result('Send',0,$cnx);
-+    xmpp_check_result('Send', 0, $cnx);
- } # }}}
- 
- #
- # xmpp_send_message: send a message to some xmpp user
--# input: connection,recipient,subject,msg
-+# input: connection, recipient, subject, msg
- #
- sub xmpp_send_message ($$$$$$) { # {{{
- 
-@@ -452,16 +452,16 @@ sub xmpp_send_message ($$$$$$) { # {{{
- 		'subject'	=> $subject,
- 		'body'		=> $msg);
- 
--    xmpp_check_result('MessageSend',0,$cnx);
-+    xmpp_check_result('MessageSend', 0, $cnx);
- } # }}}
- 
- #
- # xmpp_send_chatroom_message: send a message to a chatroom
--# input: connection,resource,subject,recipient,message
-+# input: connection, resource, subject, recipient, message
- #
- sub xmpp_send_chatroom_message ($$$$$) { # {{{
- 
--    my ($cnx,$resource,$subject,$rcpt,$msg) =  @_;
-+    my ($cnx, $resource, $subject, $rcpt, $msg) =  @_;
- 
-     # set the presence
-     my $pres = new Net::XMPP::Presence;
-@@ -476,10 +476,10 @@ sub xmpp_send_chatroom_message ($$$$$) { # {{{
- 			  type    => 'groupchat');
- 
-     $res = $cnx->Send($groupmsg);
--    xmpp_check_result ('Send',$res,$cnx);
-+    xmpp_check_result ('Send', $res, $cnx);
- 
-     # leave the group
--    $pres->SetPresence (Type=>'unavailable',To=>$rcpt);
-+    $pres->SetPresence (Type=>'unavailable', To=>$rcpt);
- } # }}}
- 
- #
-@@ -494,7 +494,7 @@ sub xmpp_logout($) { # {{{
- 
-     my $cnx = shift;
-     $cnx->Disconnect();
--    xmpp_check_result ('Disconnect',0); # well, nothing to check, really
-+    xmpp_check_result ('Disconnect', 0); # well, nothing to check, really
- } # }}}
- 
- #
-@@ -518,7 +518,7 @@ sub xmpp_check_result { # {{{
- 	}
- 	else {
- 		my $errmsg = $cnx->GetErrorCode() || '?';
--		error_exit ("Error '$txt': " . join (': ',@$res) . "[$errmsg]", $cnx);
-+		error_exit ("Error '$txt': " . join (': ', @$res) . "[$errmsg]", $cnx);
- 	}
- } # }}}
- 
-@@ -547,7 +547,7 @@ sub debug_print { # {{{
- #
- sub error_exit { # {{{
- 
--    my ($err,$cnx) = @_;
-+    my ($err, $cnx) = @_;
-     print STDERR "$err\n";
-     xmpp_logout ($cnx)
- 	if ($cnx);
-@@ -594,15 +594,15 @@ unlike L<mail(1)>. Messages can be sent both to individual recipients and chatro
- 
- =over
- 
--=item B<-f>,B<--file> I<file>
-+=item B<-f>, B<--file> I<file>
- 
- Use I<file> configuration file instead of F<~/.sendxmpprc>
- 
--=item B<-u>,B<--username> I<user>
-+=item B<-u>, B<--username> I<user>
- 
- Use I<user> instead of the one in the configuration file
- 
--=item B<-p>,B<--password> I<password>
-+=item B<-p>, B<--password> I<password>
- 
- Use I<password> instead of the one in the configuration file
- 
-@@ -610,35 +610,35 @@ Use I<password> instead of the one in the configuration file
- 
- Instead of specifying username or password, attempt to use system level SSO (e.g. kerberos) if supported.
- 
--=item B<-j>,B<--jserver> I<server>
-+=item B<-j>, B<--jserver> I<server>
- 
- Use jabber I<server> instead of the one in the configuration file.
- 
--=item B<-o>,B<--component> I<componentname>
-+=item B<-o>, B<--component> I<componentname>
- 
- Use componentname in connect call. Seems needed for Google talk.
- 
--=item B<-r>,B<--resource> I<res>
-+=item B<-r>, B<--resource> I<res>
- 
- Use resource I<res> for the sender [default: 'sendxmpp']; when sending to a chatroom, this determines the 'alias'
- 
--=item B<-t>,B<--tls>
-+=item B<-t>, B<--tls>
- 
- Connect securely, using TLS
- 
--=item B<-e>,B<--ssl>
-+=item B<-e>, B<--ssl>
- 
- Connect securely, using SSL
- 
--=item B<-n>,B<--no-tls-verify>
-+=item B<-n>, B<--no-tls-verify>
- 
- Deactivate the verification of SSL certificates. Better way is to use parameter B<--tls-ca-path> with the needed path to CA certificates.
- 
--=item B<-a>,B<--tls-ca-path>
-+=item B<-a>, B<--tls-ca-path>
- 
- Path to your custom CA certificates, so you can verificate SSL certificates during connecting.
- 
--=item B<-l>,B<--headline>
-+=item B<-l>, B<--headline>
- 
- Backward compatibility option. You should use B<--message-type=headline> instead. Send a headline type message (not stored in offline messages)
- 
-@@ -646,35 +646,35 @@ Backward compatibility option. You should use B<--message-type=headline> instead
- 
- Set type of message. Supported types are: B<message chat headline>. Default message type is B<message>. Headline type message can be set also with B<--headline> option, see B<--headline>
- 
--=item B<-c>,B<--chatroom>
-+=item B<-c>, B<--chatroom>
- 
- Send the message to a chatroom
- 
--=item B<-s>,B<--subject> I<subject>
-+=item B<-s>, B<--subject> I<subject>
- 
- Set the subject for the message to I<subject> [default: '']; when sending to a chatroom, this will set the subject for the chatroom
- 
--=item B<-m>,B<--message> I<message>
-+=item B<-m>, B<--message> I<message>
- 
- Read the message from I<message> (a file) instead of stdin
- 
--=item B<-i>,B<--interactive>
-+=item B<-i>, B<--interactive>
- 
- Work in interactive mode, reading lines from stdin and sending the one-at-time
- 
--=item B<-w>,B<--raw>
-+=item B<-w>, B<--raw>
- 
- Send raw XML message to jabber server
- 
--=item B<-v>,B<--verbose>
-+=item B<-v>, B<--verbose>
- 
- Give verbose output about what is happening
- 
--=item B<-h>,B<--help>,B<--usage>
-+=item B<-h>, B<--help>, B<--usage>
- 
- Show a 'Usage' message
- 
--=item B<-d>,B<--debug>
-+=item B<-d>, B<--debug>
- 
- Show debugging info while running. B<WARNING>: This will include passwords etc. so be careful with the output! Specify multiple times to increase debug level.
- 
diff --git a/network/sendxmpp/patches/03.patch b/network/sendxmpp/patches/03.patch
deleted file mode 100644
index aefabbf41d..0000000000
--- a/network/sendxmpp/patches/03.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From 92af6b9bf4a583f6cec00a38d2fd3948654a64bc Mon Sep 17 00:00:00 2001
-From: Lubomir Host <lubomir.host@gmail.com>
-Date: Fri, 23 Jan 2015 00:22:02 +0100
-Subject: [PATCH] Enable SRV record lookup by default
-
----
- sendxmpp | 27 ++++++++++++++-------------
- 1 file changed, 14 insertions(+), 13 deletions(-)
-
-diff --git a/sendxmpp b/sendxmpp
-index 74d95c0..0d7c4ff 100755
---- a/sendxmpp
-+++ b/sendxmpp
-@@ -344,26 +344,27 @@ sub xmpp_login ($$$$$$$$$$$$) { # {{{
- 		ssl_ca_path		=> $tls_ca_path,
- 		ssl             => $ssl,
- 		connectiontype	=> 'tcpip',
--		componentname	=> $comp
-+		componentname	=> $comp,
-+		srv				=> 1, # enable SRV lookups
- 	};
- 
-     if ($sso) {
--	$user = join('@', scalar getpwuid($<), Net::Domain::hostdomain());
--	debug_print "using SSO user $user";
-+		$user = join('@', scalar getpwuid($<), Net::Domain::hostdomain());
-+		debug_print "using SSO user $user";
-     }
- 
-     # use the xmpp domain as the host and enable SRV lookups
--    if (!$host) {
--	if ($user =~ /@(.*)/) {
--	    $arghash->{hostname} = $host = $1;
--	    $arghash->{srv} = 1;
--	    debug_print "enabling SRV lookups";
--	    
--	} else {
--	    error_exit "unable to determine a host to connect to (no cmdline, no config, no SRV possible)";
--	}	    
-+	if (!$host) {
-+		if ($user =~ /@(.*)/) {
-+			$arghash->{hostname} = $host = $1;
-+			$arghash->{srv} = 1;
-+			debug_print "enabling SRV lookups";
- 
--    }
-+		} else {
-+			error_exit "unable to determine a host to connect to (no cmdline, no config, no SRV possible)";
-+		}	    
-+
-+	}
- 
- 	delete $arghash->{port} unless $port; 
- 	if ($arghash->{port}) {
diff --git a/network/sendxmpp/patches/04.patch b/network/sendxmpp/patches/04.patch
deleted file mode 100644
index b980247794..0000000000
--- a/network/sendxmpp/patches/04.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 17fa8783527fcbfb7624889cdf5de12375517924 Mon Sep 17 00:00:00 2001
-From: Andrey Shertsinger <andrey@shertsinger.ru>
-Date: Thu, 14 May 2015 14:18:46 +0600
-Subject: [PATCH] Fix for support virtual domain user names
-
----
- sendxmpp | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/sendxmpp b/sendxmpp
-index 0d7c4ff..7045c16 100755
---- a/sendxmpp
-+++ b/sendxmpp
-@@ -355,8 +355,10 @@ sub xmpp_login ($$$$$$$$$$$$) { # {{{
- 
-     # use the xmpp domain as the host and enable SRV lookups
- 	if (!$host) {
--		if ($user =~ /@(.*)/) {
--			$arghash->{hostname} = $host = $1;
-+		if ($user =~ /([\.\w_#-]+)@(.*)/) {
-+			$arghash->{hostname} = $host = $2;
-+			$arghash->{componentname} = $2;
-+			$user = $1;
- 			$arghash->{srv} = 1;
- 			debug_print "enabling SRV lookups";
- 
diff --git a/network/sendxmpp/patches/05.patch b/network/sendxmpp/patches/05.patch
deleted file mode 100644
index 363a56017f..0000000000
--- a/network/sendxmpp/patches/05.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From a2f9265d49dc000d5becf65da0ec42a92eac19cb Mon Sep 17 00:00:00 2001
-From: Martin Stefany <martinstefany@users.noreply.github.com>
-Date: Sun, 7 Jun 2015 15:39:12 +0200
-Subject: [PATCH] support '-' (dash) in config file
-
-support options like 'no-tls-verify', 'tls-ca-path' in config file
----
- sendxmpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/sendxmpp b/sendxmpp
-index 0d7c4ff..8b2bebe 100755
---- a/sendxmpp
-+++ b/sendxmpp
-@@ -155,7 +155,7 @@ sub read_config_file ($) { # {{{
- 
- 		#s/\#.*$//; # ignore comments in lines
- 
--		if (/^([a-z]+):\s*(.*)$/) {
-+		if (/^([a-z-]+):\s*(.*)$/) {
- 			$config{$1} = $2;
- 		}
- 		# Hugo van der Kooij <hvdkooij AT vanderkooij.org> has account with '#' as username
diff --git a/network/sendxmpp/patches/06.patch b/network/sendxmpp/patches/06.patch
deleted file mode 100644
index 70325685d3..0000000000
--- a/network/sendxmpp/patches/06.patch
+++ /dev/null
@@ -1,92 +0,0 @@
-From 8f8a15614f0dfddc349c101ce4f5d4edb5133815 Mon Sep 17 00:00:00 2001
-From: James Le Cuirot <james.le-cuirot@yakara.com>
-Date: Tue, 17 May 2016 12:05:29 +0100
-Subject: [PATCH] Add --http option for connecting over HTTP
-
-This allows the use of HTTP proxies.
----
- sendxmpp | 19 +++++++++++++------
- 1 file changed, 13 insertions(+), 6 deletions(-)
-
-diff --git a/sendxmpp b/sendxmpp
-index fafb0a5..8a9758e 100755
---- a/sendxmpp
-+++ b/sendxmpp
-@@ -28,7 +28,7 @@ use open ':utf8';
- use open ':std';
- 
- # subroutines decls
--sub xmpp_login($$$$$$$$$$$$);
-+sub xmpp_login($$$$$$$$$$$$$);
- sub xmpp_send ($$$$);
- sub xmpp_send_raw_xml($$);
- sub xmpp_send_message($$$$$$);
-@@ -82,6 +82,7 @@ sub main () { # {{{
- 		$$cmdline{'no-tls-verify'} || $$config{'no-tls-verify'},
- 		$$cmdline{'tls-ca-path'} || $$config{'tls-ca-path'} || '',
- 		$$cmdline{'ssl'},
-+		$$cmdline{'http'} || $$config{'http'} || 0,
- 		$$cmdline{'debug'},
- 		$$cmdline{'sso'}
- 	) or error_exit("cannot login: $!");
-@@ -211,7 +212,7 @@ sub parse_cmdline () { # {{{
- 
- 	my ($subject, $file, $resource, $jserver, $port, $username, $password, $sso, $component, 
- 		$message, $chatroom, $headline, $debug, $tls, $ssl,
--		$no_tls_verify, $tls_ca_path,
-+		$no_tls_verify, $tls_ca_path, $http,
- 		$interactive, $help, $raw, $verbose
- 	);
-     $debug = 0;
-@@ -232,6 +233,7 @@ sub parse_cmdline () { # {{{
- 		'no-tls-verify|n'	=> \$no_tls_verify,
- 		'tls-ca-path|a=s'	=> \$tls_ca_path,
- 		'ssl|e'				=> \$ssl,
-+		'http'				=> \$http,
- 		'interactive|i'		=> \$interactive,
- 		'help|usage|h'		=> \$help,
- 		'debug|d:i'			=> sub { $debug = $_[1] ? $_[1] : $debug + 1 },
-@@ -301,6 +303,7 @@ sub parse_cmdline () { # {{{
- 		'no-tls-verify'	=> ($no_tls_verify or 0),
- 		'tls-ca-path'	=> ($tls_ca_path or ''),
- 		'ssl'			=> ($ssl or 0),
-+		'http'			=> ($http or 0),
- 		'debug'			=> ($debug or 0),
- 		'verbose'		=> ($verbose or 0),
- 		'raw'			=> ($raw or 0),
-@@ -319,12 +322,12 @@ sub parse_cmdline () { # {{{
- 
- #
- # xmpp_login: login to the xmpp (jabber) server
--# input: hostname, port, username, password, resource, tls, ssl, debug
-+# input: hostname, port, username, password, resource, tls, ssl, http, debug
- # output: an XMPP connection object
- #
--sub xmpp_login ($$$$$$$$$$$$) { # {{{
-+sub xmpp_login ($$$$$$$$$$$$$) { # {{{
- 
--    my ($host, $port, $user, $pw, $comp, $res, $tls, $no_tls_verify, $tls_ca_path, $ssl, $debug, $sso) = @_;
-+    my ($host, $port, $user, $pw, $comp, $res, $tls, $no_tls_verify, $tls_ca_path, $ssl, $http, $debug, $sso) = @_;
-     my $cnx = new Net::XMPP::Client(debuglevel=>$debug);
-     error_exit "could not create XMPP client object: $!"
- 	unless ($cnx);
-@@ -343,7 +346,7 @@ sub xmpp_login ($$$$$$$$$$$$) { # {{{
- 		ssl_verify		=> $ssl_verify,
- 		ssl_ca_path		=> $tls_ca_path,
- 		ssl             => $ssl,
--		connectiontype	=> 'tcpip',
-+		connectiontype	=> $http ? 'http' : 'tcpip',
- 		componentname	=> $comp,
- 		srv				=> 1, # enable SRV lookups
- 	};
-@@ -641,6 +644,10 @@ Deactivate the verification of SSL certificates. Better way is to use parameter
- 
- Path to your custom CA certificates, so you can verificate SSL certificates during connecting.
- 
-+=item B<--http>
-+
-+Connect over HTTP, allowing the use of a proxy.
-+
- =item B<-l>, B<--headline>
- 
- Backward compatibility option. You should use B<--message-type=headline> instead. Send a headline type message (not stored in offline messages)
diff --git a/network/sendxmpp/patches/07.patch b/network/sendxmpp/patches/07.patch
deleted file mode 100644
index 600e8a89fc..0000000000
--- a/network/sendxmpp/patches/07.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 9186b8c49e54cf59ace4e5ddf52aa10b1a386fa5 Mon Sep 17 00:00:00 2001
-From: Lubomir Host <lubomir.host@gmail.com>
-Date: Sun, 13 Nov 2016 18:25:44 +0100
-Subject: [PATCH] Remove 'I<something>' markers from configuration example.
-
----
- sendxmpp | 18 +++++++++---------
- 1 file changed, 9 insertions(+), 9 deletions(-)
-
-diff --git a/sendxmpp b/sendxmpp
-index 8a9758e..4d06ab9 100755
---- a/sendxmpp
-+++ b/sendxmpp
-@@ -695,19 +695,19 @@ Show debugging info while running. B<WARNING>: This will include passwords etc.
- You may define a 'F<~/.sendxmpprc>' file with the necessary data for your
- xmpp-account. Since version 1.24 the following format is supported:
- 
--    username: I<your_username>
--    jserver: I<jabber_server>
--    port: I<jabber_port>
--    password: I<your_jabber_password>
--    component: I<optional_component_name>
-+    username: <your_username>
-+    jserver: <jabber_server>
-+    port: <jabber_port>
-+    password: <your_jabber_password>
-+    component: <optional_component_name>
- 
- 
- Example for Google Talk servers:
- 
--    username: I<lubomir.host>
--    jserver: I<talk.google.com>
--    password: I<my-secure-password>
--    component: I<gmail.com>
-+    username: <lubomir.host>
-+    jserver: <talk.google.com>
-+    password: <my-secure-password>
-+    component: <gmail.com>
- 
- With version 1.23 and older only one-line format is supported:
- 
diff --git a/network/sendxmpp/patches/08.patch b/network/sendxmpp/patches/08.patch
deleted file mode 100644
index ca78d3f0d4..0000000000
--- a/network/sendxmpp/patches/08.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-See https://bugs.debian.org/854210
---- a/sendxmpp
-+++ b/sendxmpp
-@@ -299,7 +299,7 @@
- 		'interactive'	=> ($interactive or 0),
- 		'tls'			=> ($tls or 0),
- 		'no-tls-verify'	=> ($no_tls_verify or 0),
--		'tls-ca-path'	=> ($tls_ca_path or ''),
-+		'tls-ca-path'	=> ($tls_ca_path or '/etc/ssl/certs'),
- 		'ssl'			=> ($ssl or 0),
- 		'debug'			=> ($debug or 0),
- 		'verbose'		=> ($verbose or 0),
diff --git a/network/sendxmpp/sendxmpp.SlackBuild b/network/sendxmpp/sendxmpp.SlackBuild
deleted file mode 100644
index 71e1e1a872..0000000000
--- a/network/sendxmpp/sendxmpp.SlackBuild
+++ /dev/null
@@ -1,81 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for sendxmpp
-
-# Copyright 2019, 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=sendxmpp
-VERSION=${VERSION:-1.24}
-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
-
-for p in $CWD/patches/*.patch; do patch -p1 < $p; 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 {} \;
-
-perl Makefile.PL PREFIX=/usr
-make
-make install DESTDIR=$PKG
-
-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 || true
-
-find $PKG -depth -type d -empty -delete || true
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a examples Changes 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/network/sendxmpp/sendxmpp.info b/network/sendxmpp/sendxmpp.info
deleted file mode 100644
index 788f7a2d2f..0000000000
--- a/network/sendxmpp/sendxmpp.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="sendxmpp"
-VERSION="1.24"
-HOMEPAGE="https://sendxmpp.hostname.sk"
-DOWNLOAD="https://github.com/lhost/sendxmpp/archive/1.24/sendxmpp-1.24.tar.gz"
-MD5SUM="7145fb0d05f4c774b0ecec78bc787117"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="perl-Net-XMPP perl-IO-Socket-SSL perl-net-dns"
-MAINTAINER="Alexander Verbovetsky"
-EMAIL="alik@ejik.org"
diff --git a/network/sendxmpp/slack-desc b/network/sendxmpp/slack-desc
deleted file mode 100644
index 23ef92eae0..0000000000
--- a/network/sendxmpp/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------------------------------------------------------|
-sendxmpp: sendxmpp (send xmpp messages from the command line)
-sendxmpp:
-sendxmpp: sendxmpp is a program to send XMPP (Jabber) messages from the
-sendxmpp: command line, not unlike mail(1). Messages can be sent both to
-sendxmpp: individual recipients and chatrooms.
-sendxmpp:
-sendxmpp: XMPP is an open, non-proprietary protocol for instant messaging.
-sendxmpp:
-sendxmpp: Homepage: https://sendxmpp.hostname.sk
-sendxmpp:
-sendxmpp:
diff --git a/network/serialmail/serialmail.SlackBuild b/network/serialmail/serialmail.SlackBuild
index f560c11b17..e341309b6a 100644
--- a/network/serialmail/serialmail.SlackBuild
+++ b/network/serialmail/serialmail.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for serialmail
 
@@ -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=serialmail
 VERSION=${VERSION:-0.75}
 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}
@@ -115,4 +125,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/network/session/README b/network/session/README
new file mode 100644
index 0000000000..cb5d34b24f
--- /dev/null
+++ b/network/session/README
@@ -0,0 +1,19 @@
+Session is an end-to-end encrypted messenger that minimises sensitive
+metadata, designed and built for people who want absolute privacy
+and freedom from any form of surveillance.
+
+* No Phone Numbers
+
+* No Data Breaches
+
+* No Footprints
+
+* Open Source
+
+* Censorship Resistant
+
+Session has also undergone a security audit by Quarkslab
+
+------------------------------------------------------------------------
+This SlackBuild downloads and installs the official AppImage under
+'/opt'.
diff --git a/network/session/doinst.sh b/network/session/doinst.sh
new file mode 100644
index 0000000000..65c7e2eeb9
--- /dev/null
+++ b/network/session/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/network/session/session-desktop.desktop b/network/session/session-desktop.desktop
new file mode 100644
index 0000000000..3beaeef9f0
--- /dev/null
+++ b/network/session/session-desktop.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Name=Session
+Exec=session-desktop
+Terminal=false
+Type=Application
+Icon=session-desktop
+StartupWMClass=Session
+X-AppImage-Version=1.10.3
+Comment=Private messaging from your desktop
+Categories=Network;
diff --git a/network/session/session.SlackBuild b/network/session/session.SlackBuild
new file mode 100644
index 0000000000..bdca396271
--- /dev/null
+++ b/network/session/session.SlackBuild
@@ -0,0 +1,92 @@
+#!/bin/bash
+# Slackware build script for Session Messenger
+
+# Copyright 2023 Slackjeff <slackjeff@riseup.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.
+
+#########################################################################
+# ChangeLog
+#
+# IMPORTANT: update this if you change this script!)
+#########################################################################
+# 2.0   04-JULY-2023 UPGRADE (Version: 1.10.8)
+# 2.1   01-AGO-2023 UPGRADE (Version: 1.11.0)
+
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=session
+VERSION=${VERSION:-1.11.0}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+ARCH=${ARCH:-$(uname -m)}
+
+if [ "$ARCH" != "x86_64" ]; then
+  echo "$ARCH is not supported for $PRGNAM-$VERSION."
+  exit 1
+fi
+
+if [ -n "${PRINT_PACKAGE_NAME}" ]; then
+  echo $PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+APPIMGNAM=$PRGNAM-desktop-linux-$ARCH-$VERSION.AppImage
+
+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/share/$PRGNAM-$VERSION
+mkdir -p $PKG/usr/share/applications
+mkdir -p $PKG/usr/share/pixmaps
+mkdir -p $PKG/usr/bin
+mkdir -p $PKG/opt
+
+cd $PKG/opt
+install -m 0755 $CWD/$APPIMGNAM .
+./$APPIMGNAM --appimage-extract
+mv squashfs-root $PRGNAM-$VERSION
+rm -f $APPIMGNAM
+
+chown -R root:root .
+find .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} + -o \
+     \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} +
+
+ln -s "/opt/$PRGNAM-$VERSION/session-desktop-bin" "$PKG/usr/bin/${PRGNAM}-desktop"
+ln -s "/opt/$PRGNAM-$VERSION/session-desktop.png" "$PKG/usr/share/pixmaps/$PRGNAM-desktop.png"
+
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+cat $CWD/README > $PKG/usr/doc/$PRGNAM-$VERSION/README
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+cat $CWD/$PRGNAM-desktop.desktop > $PKG/usr/share/applications/$PRGNAM-desktop.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
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/network/session/session.info b/network/session/session.info
new file mode 100644
index 0000000000..d36a082e8e
--- /dev/null
+++ b/network/session/session.info
@@ -0,0 +1,10 @@
+PRGNAM="session"
+VERSION="1.11.0"
+HOMEPAGE="https://getsession.org/"
+DOWNLOAD="UNSUPPORTED"
+MD5SUM=""
+DOWNLOAD_x86_64="https://github.com/oxen-io/session-desktop/releases/download/v1.11.0/session-desktop-linux-x86_64-1.11.0.AppImage"
+MD5SUM_x86_64="423f3fb9d0f60617d9983d14749f9c61"
+REQUIRES=""
+MAINTAINER="slackjeff"
+EMAIL="slackjeff@riseup.net"
diff --git a/network/session/slack-desc b/network/session/slack-desc
new file mode 100644
index 0000000000..d96bfe3186
--- /dev/null
+++ b/network/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 ':'.
+
+       |-----handy-ruler------------------------------------------------------|
+session: session (Send Messages,Not Metadata.)
+session:
+session: Session is an end-to-end encrypted messenger that minimises sensitive
+session: metadata, designed and built for people who want absolute privacy and
+session: freedom from any form of surveillance.
+session:
+session:
+session:
+session:
+session: https://getsession.org/
+session:
diff --git a/network/sfeed/README b/network/sfeed/README
index 4572deddc4..b1d49f1024 100644
--- a/network/sfeed/README
+++ b/network/sfeed/README
@@ -1,5 +1,5 @@
-SFeed is a simple RSS and Atom parser.
+Sfeed is a simple RSS and Atom parser.
 
 README.SLACKWARE contains starter tips.
-/usr/doc/sfeed-0.9.13/README contains detailed post-install
+/usr/doc/sfeed-*/README contains detailed post-install
 instructions.
diff --git a/network/sfeed/README.SLACKWARE b/network/sfeed/README.SLACKWARE
index 2d91164fa9..8b2309ed20 100644
--- a/network/sfeed/README.SLACKWARE
+++ b/network/sfeed/README.SLACKWARE
@@ -1,17 +1,15 @@
-The following instructions are taken from /usr/doc/sfeed-0.9.13/README
-Note that the slackbuild removes /usr/share/doc/sfeed; thus, please
-copy necessary files from /usr/doc/sfeed-0.9.13
+The following instructions are taken from /usr/doc/sfeed-*/README
 
 - Initialize sfeed folders: 
 mkdir -p "$HOME/.sfeed/feeds"
 
 - Initialize sfeedrc, such as by copying and editing the example file:
-cp /usr/doc/sfeed-0.9.13/sfeedrc.example "$HOME/.sfeed/sfeedrc"
+cp /usr/doc/sfeed-*/sfeedrc.example "$HOME/.sfeed/sfeedrc"
 $EDITOR "$HOME/.sfeed/sfeedrc"
 
 - Update feeds:
 sfeed_update
 
 - Format feeds. For example, view feeds in HTML (no frames).
-cp /usr/doc/sfeed-0.9.13/style.css "$HOME/.sfeed/style.css"
+cp /usr/doc/sfeed-*/style.css "$HOME/.sfeed/style.css"
 sfeed_html $HOME/.sfeed/feeds/* > "$HOME/.sfeed/feeds.html"
diff --git a/network/sfeed/sfeed.SlackBuild b/network/sfeed/sfeed.SlackBuild
index 9d7a367b75..2dac8c1bd4 100644
--- a/network/sfeed/sfeed.SlackBuild
+++ b/network/sfeed/sfeed.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for sfeed
 
-# 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,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=sfeed
-VERSION=${VERSION:-0.9.13}
+VERSION=${VERSION:-2.0}
 BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
+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}
@@ -70,19 +77,16 @@ find -L . \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 make
-make install PREFIX=/usr DESTDIR=$PKG
+make install PREFIX=/usr MANPREFIX=/usr/man DOCPREFIX=/usr/doc/sfeed-$VERSION 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/sfeed
-
 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 README.xml sfeedrc.example style.css $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a LICENSE $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
 
@@ -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/network/sfeed/sfeed.info b/network/sfeed/sfeed.info
index 35287cbd55..37a9bc739e 100644
--- a/network/sfeed/sfeed.info
+++ b/network/sfeed/sfeed.info
@@ -1,10 +1,10 @@
 PRGNAM="sfeed"
-VERSION="0.9.13"
-HOMEPAGE="https://codemadness.org/releases/sfeed/"
-DOWNLOAD="https://codemadness.org/releases/sfeed/sfeed-0.9.13.tar.gz"
-MD5SUM="339c170c26bb3e751b424040528bb01a"
+VERSION="2.0"
+HOMEPAGE="https://codemadness.org/sfeed-simple-feed-parser.html"
+DOWNLOAD="https://codemadness.org/releases/sfeed/sfeed-2.0.tar.gz"
+MD5SUM="02f0af9a09782d3b5a66c34d3e7b0a7b"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Isaac Yu"
-EMAIL="isaacyu1@isaacyu1.com"
+MAINTAINER="Hiltjo Posthuma"
+EMAIL="hiltjo@codemadness.org"
diff --git a/network/sflowtool/sflowtool.SlackBuild b/network/sflowtool/sflowtool.SlackBuild
index 8145e16423..71273e3594 100644
--- a/network/sflowtool/sflowtool.SlackBuild
+++ b/network/sflowtool/sflowtool.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for sFlowtool
 
@@ -24,10 +24,13 @@
 
 # 02/Apr/2018 * First version
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=sflowtool
 VERSION=${VERSION:-3.41}
 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-$(echo $VERSION | tr - _)-$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-$(echo $VERSION | tr - _)-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$(echo $VERSION | tr - _)-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/network/sftp-cloudfs/sftp-cloudfs.SlackBuild b/network/sftp-cloudfs/sftp-cloudfs.SlackBuild
index dbbbb7d010..a75ee2da5a 100644
--- a/network/sftp-cloudfs/sftp-cloudfs.SlackBuild
+++ b/network/sftp-cloudfs/sftp-cloudfs.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for "sftp-cloudfs".
 
@@ -24,11 +24,14 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=sftp-cloudfs
 SRCNAM=sftpcloudfs
 VERSION=${VERSION:-0.19}
 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}
@@ -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/network/sftp-cloudfs/sftp-cloudfs.info b/network/sftp-cloudfs/sftp-cloudfs.info
index 3cbaef2b6e..5f4e6e4735 100644
--- a/network/sftp-cloudfs/sftp-cloudfs.info
+++ b/network/sftp-cloudfs/sftp-cloudfs.info
@@ -1,10 +1,10 @@
 PRGNAM="sftp-cloudfs"
 VERSION="0.19"
 HOMEPAGE="https://github.com/Memset/sftpcloudfs/"
-DOWNLOAD="https://github.com/Memset/sftpcloudfs/archive/0.19.tar.gz"
+DOWNLOAD="https://github.com/Memset/sftpcloudfs/archive/0.19/sftpcloudfs-0.19.tar.gz"
 MD5SUM="e772f8b114725720f428b4e7e7f19b2a"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="ftp-cloudfs paramiko"
+REQUIRES="ftp-cloudfs python2-paramiko"
 MAINTAINER="Marcel Saegebarth"
 EMAIL="marc@mos6581.de"
diff --git a/network/shadowsocks-libev/shadowsocks-libev.SlackBuild b/network/shadowsocks-libev/shadowsocks-libev.SlackBuild
index 41e512955c..4e6a6e0477 100644
--- a/network/shadowsocks-libev/shadowsocks-libev.SlackBuild
+++ b/network/shadowsocks-libev/shadowsocks-libev.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for shadowsocks-libev
 
-# Copyright 2018 Cheng Bao (awabimakoto@gmail.com) Beijing, China
+# Copyright 2020 Cheng Bao (awabimakoto@gmail.com) Beijing, China
 # 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=shadowsocks-libev
-VERSION=${VERSION:-3.2.5}
-BUILD=${BUILD:-1}
+VERSION=${VERSION:-3.3.5}
+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}
@@ -95,8 +105,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/network/shadowsocks-libev/shadowsocks-libev.info b/network/shadowsocks-libev/shadowsocks-libev.info
index 9d3be7d7fd..e76ef1cc20 100644
--- a/network/shadowsocks-libev/shadowsocks-libev.info
+++ b/network/shadowsocks-libev/shadowsocks-libev.info
@@ -1,10 +1,10 @@
 PRGNAM="shadowsocks-libev"
-VERSION="3.2.5"
+VERSION="3.3.5"
 HOMEPAGE="https://github.com/shadowsocks/shadowsocks-libev"
-DOWNLOAD="https://github.com/shadowsocks/shadowsocks-libev/releases/download/v3.2.5/shadowsocks-libev-3.2.5.tar.gz"
-MD5SUM="cd01dcd67946d4a536269a4e0384ad1c"
+DOWNLOAD="https://github.com/shadowsocks/shadowsocks-libev/releases/download/v3.3.5/shadowsocks-libev-3.3.5.tar.gz"
+MD5SUM="891392c245ab4702b70f0053bd3eec6b"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="mbedtls libsodium libev c-ares"
+REQUIRES="mbedtls libev"
 MAINTAINER="Cheng Bao"
 EMAIL="awabimakoto@gmail.com"
diff --git a/network/shibboleth-sp/README b/network/shibboleth-sp/README
index d52fbb8bd0..dac23a4913 100644
--- a/network/shibboleth-sp/README
+++ b/network/shibboleth-sp/README
@@ -5,4 +5,4 @@ exchange of rich attributes subject to privacy controls.
 This package contains the Shibboleth Service Provider runtime libraries,
 daemon, default plugins, and Apache module.
 
-For some basic setup instructions, check the included 'README.SLACKWARE'.
+For some basic setup instructions, check the included README.SLACKWARE.
diff --git a/network/shibboleth-sp/shibboleth-sp.SlackBuild b/network/shibboleth-sp/shibboleth-sp.SlackBuild
index 97dda0ac5e..655ce51e01 100644
--- a/network/shibboleth-sp/shibboleth-sp.SlackBuild
+++ b/network/shibboleth-sp/shibboleth-sp.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for Shibboleth Service Provider.
 
-# Copyright 2013-2018 Thibaut Notteboom, Paris, FRANCE
+# Copyright 2013-2023 Thibaut Notteboom, Paris, 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=shibboleth-sp
-VERSION=${VERSION:-3.0.4}
+VERSION=${VERSION:-3.4.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}
@@ -49,6 +56,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=""
@@ -77,7 +87,7 @@ find -L . \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS -std=c++14" \
 ./configure \
   --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
@@ -107,6 +117,8 @@ find $PKG/etc/shibboleth/ -name *.pem | while read cfg ; do mv $cfg $cfg.new ; d
 
 chown shibd:shibd $PKG/etc/shibboleth/sp-*.pem.new
 
+rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/{,shibboleth/}*.la
+
 mv $PKG/usr/share/doc $PKG/usr
 mv $PKG/usr/doc/shibboleth-$VERSION $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
@@ -117,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/network/shibboleth-sp/shibboleth-sp.info b/network/shibboleth-sp/shibboleth-sp.info
index ab57441716..90147f8d59 100644
--- a/network/shibboleth-sp/shibboleth-sp.info
+++ b/network/shibboleth-sp/shibboleth-sp.info
@@ -1,8 +1,8 @@
 PRGNAM="shibboleth-sp"
-VERSION="3.0.4"
+VERSION="3.4.1"
 HOMEPAGE="http://shibboleth.net/"
-DOWNLOAD="http://shibboleth.net/downloads/service-provider/3.0.4/shibboleth-sp-3.0.4.tar.gz"
-MD5SUM="dd7fbff4de495197ffeb834df6cebf05"
+DOWNLOAD="https://shibboleth.net/downloads/service-provider/3.4.1/shibboleth-sp-3.4.1.tar.gz"
+MD5SUM="e6bd05784653057b18340de8c4517ce4"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="opensaml"
diff --git a/network/shorewall-core/README b/network/shorewall-core/README
index ef3127a790..1c5b62089a 100644
--- a/network/shorewall-core/README
+++ b/network/shorewall-core/README
@@ -1,15 +1,19 @@
 Shorewall-core (Iptables Made Easy)
 
-The Shoreline Firewall, more commonly known as "Shorewall", is a Netfilter
-(iptables) based firewall that can be used on a dedicated firewall system, a
-multi-function gateway/router/server or on a standalone GNU/Linux system.
+The Shoreline Firewall, more commonly known as "Shorewall", is a
+Netfilter (iptables) based firewall that can be used on a dedicated
+firewall system, a multi-function gateway/router/server or on a
+standalone GNU/Linux system.
 
 As of version 4.5, shorewall consists of 3 packages:
-* shorewall-core, containing the common elements to both IPv4 and IPv6 components
+* shorewall-core, containing the common elements to both IPv4 and IPv6
+  components
 * shorewall, the IPv4 component
 * shorewall6, the IPv6 component
 
-The shorewall-core package is needed for both but now you can install the IPv6
-packages without needing the IPv4 one if you are on aIV6 network only.
+The shorewall-core package is needed for both but now you can install
+the IPv6 packages without needing the IPv4 one if you are on aIV6
+network only.
 
-xtables-addons is an optional dependency to use the new per-IP accounting feature.
+xtables-addons is an optional dependency to use the new per-IP
+accounting feature.
diff --git a/network/shorewall-core/shorewall-core.SlackBuild b/network/shorewall-core/shorewall-core.SlackBuild
index 77466eaaf1..3bc30222d5 100644
--- a/network/shorewall-core/shorewall-core.SlackBuild
+++ b/network/shorewall-core/shorewall-core.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for shorewall-core
 
@@ -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=shorewall-core
-VERSION=${VERSION:-5.2.3.3}
+VERSION=${VERSION:-5.2.8}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 BASEVERS=$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}
@@ -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/network/shorewall-core/shorewall-core.info b/network/shorewall-core/shorewall-core.info
index 1cc0fbfa36..3fd281738a 100644
--- a/network/shorewall-core/shorewall-core.info
+++ b/network/shorewall-core/shorewall-core.info
@@ -1,8 +1,8 @@
 PRGNAM="shorewall-core"
-VERSION="5.2.3.3"
-HOMEPAGE="http://www.shorewall.net"
-DOWNLOAD="http://www.shorewall.net/pub/shorewall/5.2/shorewall-5.2.3/shorewall-core-5.2.3.3.tar.bz2"
-MD5SUM="cfc4fccd200fa14188444bedb9e6fe3d"
+VERSION="5.2.8"
+HOMEPAGE="https://shorewall.org"
+DOWNLOAD="https://shorewall.org/pub/shorewall/5.2/shorewall-5.2.8/shorewall-core-5.2.8.tar.bz2"
+MD5SUM="07c7371fd2896e87f373b760561e41a8"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/network/shorewall/README b/network/shorewall/README
index 4586b6a7d0..abb04663cf 100644
--- a/network/shorewall/README
+++ b/network/shorewall/README
@@ -1,13 +1,16 @@
 Shorewall (IPv4 support package for shorewall)
 
-The Shoreline Firewall, more commonly known as "Shorewall", is a Netfilter
-(iptables) based firewall that can be used on a dedicated firewall system, a
-multi-function gateway/router/server or on a standalone GNU/Linux system.
+The Shoreline Firewall, more commonly known as "Shorewall", is a
+Netfilter (iptables) based firewall that can be used on a dedicated
+firewall system, a multi-function gateway/router/server or on a
+standalone GNU/Linux system.
 
 As of version 4.5, shorewall consists of 3 packages:
-* shorewall-core, containing the common elements to both IPv4 and IPv6 components
+* shorewall-core, containing the common elements to both IPv4 and IPv6
+  components
 * shorewall, the IPv4 component
 * shorewall6, the IPv6 component
 
-The shorewall-core package is needed for both but now you can install the IPv6
-packages without needing the IPv4 one if you are on aIV6 network only.
+The shorewall-core package is needed for both but now you can install
+the IPv6 packages without needing the IPv4 one if you are on aIV6
+network only.
diff --git a/network/shorewall/shorewall.SlackBuild b/network/shorewall/shorewall.SlackBuild
index 5cc55e13a0..d8becb43c8 100644
--- a/network/shorewall/shorewall.SlackBuild
+++ b/network/shorewall/shorewall.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for shorewall
 
@@ -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=shorewall
-VERSION=${VERSION:-5.2.3.3}
+VERSION=${VERSION:-5.2.8}
 ARCH=noarch
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 BASEVERS=$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-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -77,7 +87,7 @@ do
 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
 
 # Clean up the extra stuff:
 if [ "$1" = "--cleanup" ]; then
diff --git a/network/shorewall/shorewall.info b/network/shorewall/shorewall.info
index 83a59be05d..9cd69afffc 100644
--- a/network/shorewall/shorewall.info
+++ b/network/shorewall/shorewall.info
@@ -1,8 +1,8 @@
 PRGNAM="shorewall"
-VERSION="5.2.3.3"
-HOMEPAGE="http://www.shorewall.net"
-DOWNLOAD="http://www.shorewall.net/pub/shorewall/5.2/shorewall-5.2.3/shorewall-5.2.3.3.tar.bz2"
-MD5SUM="3e6665a432be6ad0c5bd611710b0c70f"
+VERSION="5.2.8"
+HOMEPAGE="https://shorewall.org"
+DOWNLOAD="https://shorewall.org/pub/shorewall/5.2/shorewall-5.2.8/shorewall-5.2.8.tar.bz2"
+MD5SUM="0e4041810f066deef40bf9e57fa79e96"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="shorewall-core"
diff --git a/network/shorewall6/README b/network/shorewall6/README
index 20e94d57ad..0a0309db2c 100644
--- a/network/shorewall6/README
+++ b/network/shorewall6/README
@@ -1,13 +1,16 @@
 Shorewall (IPv6 support package for shorewall)
 
-The Shoreline Firewall, more commonly known as "Shorewall", is a Netfilter
-(iptables) based firewall that can be used on a dedicated firewall system, a
-multi-function gateway/router/server or on a standalone GNU/Linux system.
+The Shoreline Firewall, more commonly known as "Shorewall", is a
+Netfilter (iptables) based firewall that can be used on a dedicated
+firewall system, a multi-function gateway/router/server or on a
+standalone GNU/Linux system.
 
 As of version 4.5, shorewall consists of 3 packages:
-* shorewall-core, containing the common elements to both IPv4 and IPv6 components
+* shorewall-core, containing the common elements to both IPv4 and IPv6
+  components
 * shorewall, the IPv4 component
 * shorewall6, the IPv6 component
 
-The shorewall-core package is needed for both but now you can install the IPv6
-packages without needing the IPv4 one if you are on aIV6 network only.
+The shorewall-core package is needed for both but now you can install
+the IPv6 packages without needing the IPv4 one if you are on aIV6
+network only.
diff --git a/network/shorewall6/shorewall6.SlackBuild b/network/shorewall6/shorewall6.SlackBuild
index 8ce233e4ba..d79a09f8b0 100644
--- a/network/shorewall6/shorewall6.SlackBuild
+++ b/network/shorewall6/shorewall6.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for shorewall6
 
@@ -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=shorewall6
-VERSION=${VERSION:-5.2.3.3}
+VERSION=${VERSION:-5.2.8}
 ARCH=noarch
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 BASEVERS=$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-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -81,7 +91,7 @@ do
 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
 
 # Clean up the extra stuff:
 if [ "$1" = "--cleanup" ]; then
diff --git a/network/shorewall6/shorewall6.info b/network/shorewall6/shorewall6.info
index 7f711fc6be..eca8a9b2a9 100644
--- a/network/shorewall6/shorewall6.info
+++ b/network/shorewall6/shorewall6.info
@@ -1,8 +1,8 @@
 PRGNAM="shorewall6"
-VERSION="5.2.3.3"
-HOMEPAGE="http://www.shorewall.net"
-DOWNLOAD="http://www.shorewall.net/pub/shorewall/5.2/shorewall-5.2.3/shorewall6-5.2.3.3.tar.bz2"
-MD5SUM="7ab222b22fe5b8c97efdeb57c063cabe"
+VERSION="5.2.8"
+HOMEPAGE="https://shorewall.org"
+DOWNLOAD="https://shorewall.org/pub/shorewall/5.2/shorewall-5.2.8/shorewall6-5.2.8.tar.bz2"
+MD5SUM="4a9a2f55cd40bb2cc17dae0227350c4d"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="shorewall-core"
diff --git a/network/sic/README b/network/sic/README
index e721f1205d..842025a1bf 100644
--- a/network/sic/README
+++ b/network/sic/README
@@ -1 +1,18 @@
-sic is an extremely simple IRC client.
+sic (simple irc client from suckless.org)
+
+sic is an extremely simple IRC client. It consists of less than 250
+lines of code.
+
+You can control the build via environment variables:
+
+IRCHOST - sets the default IRC server (default: irc.oftc.net).
+IRCPORT - sets the default port (default: 6667).
+SLASH - set SLASH=yes to change the command prefix from a colon (:) to
+        a slash (/), to make sic work more like other IRC clients.
+
+For even finer-grained control, you can copy config.def.h from the
+sic source to config.h in the SlackBuild directory, and edit it before
+building.
+
+If you want to apply any patches to the sic source, see patches/README
+for instructions.
diff --git a/network/sic/git2tarxz.sh b/network/sic/git2tarxz.sh
new file mode 100644
index 0000000000..c169301276
--- /dev/null
+++ b/network/sic/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=sic
+CLONE_URL=https://git.suckless.org/sic
+
+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 )
+TAG=$( git tag | tail -1 )
+
+VERSION=$TAG+${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/network/sic/patches/README b/network/sic/patches/README
new file mode 100644
index 0000000000..a9c9ce960d
--- /dev/null
+++ b/network/sic/patches/README
@@ -0,0 +1,10 @@
+This directory is for optional patches. Any *.diff files found here
+will be applied to the sic source in ASCIIbetical order, when the
+SlackBuild is run.
+
+If the order of patches matters (if later ones depend on earlier
+ones), name them e.g. 001-foo.diff, 002-bar.diff, etc.
+
+Upstream provides a few patches here:
+
+http://tools.suckless.org/sic/patches/
diff --git a/network/sic/sic.SlackBuild b/network/sic/sic.SlackBuild
index 33638e6832..cc4b1bf885 100644
--- a/network/sic/sic.SlackBuild
+++ b/network/sic/sic.SlackBuild
@@ -1,7 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 #
 # Slackware build script for sic
-# Copyright 2011  Haroldo F. Jardim <hfjardim@gmail.com>
+# Copyright 2011  Haroldo F. Jardim <email removed>
+# Now maintained by B. Watson <urchlay@slackware.uk>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -21,26 +22,52 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20230103 bkw: update for v1.3, strip binary.
+
+# 20210924 bkw:
+# - update for latest git.
+# - add support for SLASH=yes.
+# - add support for user config.h.
+# - add support for patches.
+# - update README to reflect the above.
+
+# 20201113 bkw: The original author of this script hasn't been heard
+# from since 2011, and it needs some attention (still mentions i486)
+# so I'm taking it.
+# - new maintainer
+# - i486 => i586
+# - fix that => than typo in slack-desc
+# - expand README a bit
+# - add env vars for default host and port
+# - simplify script
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=sic
-VERSION=${VERSION:-1.1}
+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}
 
-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,37 +86,65 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvzf $CWD/$PRGNAM-$VERSION.tar.gz
+tar xvf $CWD/$PRGNAM-$VERSION.tar.[xg]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 {} \;
+chmod 644 *
+
+# this is more complex than it has to be: upstream released a a mix
+# of -p0 and -p1 patches.
+for i in $CWD/patches/*.diff; do
+  if [ -e "$i" ]; then
+    P=1
+    patch --dry-run -p0 < $i &>/dev/null && P=0
+    echo "=== Applying $( basename $i ) with -p$P"
+    patch -p$P < $i
+  fi
+done
+
+if [ -e "$CWD/config.h" ]; then
+  # if the user's got his own config.h, use it
+  cat "$CWD/config.h" > config.h
+else
+  # if not, use the upstream default
+  cat config.def.h > config.h
+fi
+
+# IRCHOST IRCPORT SLASH modify the config.h, even overriding what's
+# in the user's custom one. Also fixup the man page.
+if [ -n "$IRCHOST" ]; then
+  sed -i "/DEFAULT_HOST/s,\".*\"\$,\"$IRCHOST\"," config.h
+  sed -i "/default host/s,(.*) *$,($IRCHOST)," $PRGNAM.1
+fi
 
-sed -i "s/CFLAGS =/CFLAGS +=/" config.mk
+if [ -n "$IRCPORT" ]; then
+  sed -i "/DEFAULT_PORT/s,\".*\"\$,\"$IRCPORT\"," config.h
+  sed -i "/default port/s,(.*) *$,($IRCPORT)," $PRGNAM.1
+fi
+
+if [ "${SLASH:-no}" = "yes" ]; then
+  sed -i "s|':'|'/'|" config.h
+  sed -i '/^\.BI :/s,:,/,' $PRGNAM.1
+fi
 
 CFLAGS="$SLKCFLAGS" \
 DESTDIR=$PKG \
 make \
+  VERSION="$VERSION" \
+  CFLAGS="$SLKCFLAGS" \
   PREFIX=/usr \
   MANPREFIX=/usr/man \
   install
 
-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
+strip $PKG/usr/bin/$PRGNAM
+gzip -9 $PKG/usr/man/man1/$PRGNAM.1
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a LICENSE README $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a LICENSE README config.h $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
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/network/sic/sic.info b/network/sic/sic.info
index 1aeede0c85..d48f3c4b93 100644
--- a/network/sic/sic.info
+++ b/network/sic/sic.info
@@ -1,10 +1,10 @@
 PRGNAM="sic"
-VERSION="1.1"
+VERSION="1.3"
 HOMEPAGE="http://tools.suckless.org/sic"
-DOWNLOAD="http://dl.suckless.org/tools/sic-1.1.tar.gz"
-MD5SUM="856d0e5faa151ae9602713ee7d34a2d5"
+DOWNLOAD="http://dl.suckless.org/tools/sic-1.3.tar.gz"
+MD5SUM="be0a6fd28738d3c626d70f1b1f33adb5"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Haroldo F. Jardim"
-EMAIL="hfjardim@gmail.com"
+MAINTAINER="B. Watson"
+EMAIL="urchlay@slackware.uk"
diff --git a/network/sic/slack-desc b/network/sic/slack-desc
index a5f706b903..bc34e76761 100644
--- a/network/sic/slack-desc
+++ b/network/sic/slack-desc
@@ -6,9 +6,9 @@
 # customary to leave one space after the ':' except on otherwise blank lines.
 
    |-----handy-ruler------------------------------------------------------|
-sic: sic (simple irc client)
+sic: sic (simple irc client from suckless.org)
 sic:
-sic: sic is an extremely simple IRC client. It consists of less that 250
+sic: sic is an extremely simple IRC client. It consists of less than 250
 sic: lines of code.
 sic:
 sic: http://tools.suckless.org/sic
diff --git a/network/sickrage/README b/network/sickrage/README
deleted file mode 100644
index c8bda973ce..0000000000
--- a/network/sickrage/README
+++ /dev/null
@@ -1,11 +0,0 @@
-sickrage (Automatic Video Library Manager for TV Shows.)
-
-SickRage is an automatic Video Library Manager for TV Shows. It watches for
-new episodes of your favorite shows, and when they are posted it does its
-magic: automatic torrent/nzb searching, downloading, and processing at the
-qualities you want.
-
-NOTE: Requires sickrage user and group.
-(uid/gid assigned by SBo -- see https://slackbuilds.org/uid_gid.txt)
- groupadd -g 324 sickrage
- useradd -u 324 -g sickrage -d /var/lib/sickrage -s /bin/false sickrage
diff --git a/network/sickrage/config.ini b/network/sickrage/config.ini
deleted file mode 100644
index acd3227551..0000000000
--- a/network/sickrage/config.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[General]
-log_dir = /var/log/sickrage
-version_notify = 0
diff --git a/network/sickrage/doinst.sh b/network/sickrage/doinst.sh
deleted file mode 100644
index 3aafce21d5..0000000000
--- a/network/sickrage/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.sickrage.new
-config etc/sickrage.conf.new
-config var/lib/sickrage/config.ini.new
diff --git a/network/sickrage/rc.sickrage b/network/sickrage/rc.sickrage
deleted file mode 100644
index a5aa2e5fe2..0000000000
--- a/network/sickrage/rc.sickrage
+++ /dev/null
@@ -1,107 +0,0 @@
-#!/bin/sh
-# Start/stop/restart sickrage.
-
-# rc.sickrage created by Jeremy Brent Hansen for Slackware
-
-# Set program name in case you want to run sick{beard|rage|gear|etc}
-PROG=${PROG:-sickrage}
-
-# Source SickRage configuration
-if [ -f /etc/${PROG}.conf ]; then
-        . /etc/${PROG}.conf
-fi
-
-# Ensure all required variables are set in conf file
-# Edit conf file in /etc/sickrage.conf for any changes
-for var in USERNAME HOMEDIR DATADIR PIDFILE PORT; do
-  if [ -z "${!var}" ]; then
-    echo "/etc/${PROG}.conf is missing some or all required variables ($var)."
-    echo "Please check the file and try again."
-    exit 1
-  fi
-done
-
-# Check if the pid file exists
-check() {
-  STATUS=stopped
-  if [ -e $PIDFILE ]; then
-    if ps -p $(cat $PIDFILE); then
-      STATUS=running
-    else
-      STATUS=stopped
-    fi
-  fi
-}
-
-status() {
-  if [ $STATUS == "running" ]; then
-    echo "${PROG} currently running or not shut down properly."
-    echo "PIDfile: $PIDFILE already exists."
-  elif [ $STATUS == "stopped" ]; then
-    echo "${PROG} not started."
-    echo "PIDfile: $PIDFILE does not exist."
-  else
-    echo "Status unknown."
-  fi
-}
-
-start() {
-  if [ $STATUS == "running" ]; then
-    echo "$PROG already running or not shut down properly."
-  else
-    echo -n "Starting ${PROG}: "
-    su $USERNAME -s /bin/sh -c "python ${HOMEDIR}/SickBeard.py --daemon --pidfile=${PIDFILE} --datadir=${DATADIR} --port=${PORT} &> /dev/null"
-    if (( $? == 0 )); then
-      echo "Startup Successful"
-    else
-      echo "Startup Failed. Please try running the following to see the errors."
-      echo "su $USERNAME -s /bin/sh -c \"python ${HOMEDIR}/SickBeard.py --daemon --pidfile=${PIDFILE} --datadir=${DATADIR} --port=${PORT}\""
-    fi
-  fi
-}
-
-stop() {
-  if [ $STATUS == "stopped" ]; then
-    echo "${PROG} doesn't seem to be running. Please try running"
-    echo "$0 start"
-  else
-    if [ "$EUID" -ne 0 ];then
-      echo "Please run as root"
-      exit 1
-    fi
-    PID=$(cat $PIDFILE)
-    echo -n $"Shutting down ${PROG}: "
-    curl -f http://localhost:${PORT}/home/shutdown/?pid=${PID} &> /dev/null
-    if [ $? -gt 0 ]; then
-      echo "Normal Shutdown Failed - Attempting to kill the process."
-      echo $?
-      sleep 7
-      kill -9 $PID
-    else
-      echo "Shutdown Successful"
-    fi
-  fi
-}
-
-case "$1" in
-  start)
-        check
-        start
-        ;;
-  stop)
-        check
-        stop
-        ;;
-  restart)
-        check
-        stop
-        start
-        ;;
-  status)
-        check
-        status
-        ;;
-  *)
-        echo "Usage: $0 {start|stop|restart|status}"
-        exit 1
-esac
diff --git a/network/sickrage/sickrage.SlackBuild b/network/sickrage/sickrage.SlackBuild
deleted file mode 100644
index ce499c7080..0000000000
--- a/network/sickrage/sickrage.SlackBuild
+++ /dev/null
@@ -1,97 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for sickrage
-# Copyright 2016-2018 Jeremy Hansen <jebrhansen+SBo -at- 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=sickrage
-SRCNAM=SickRage
-VERSION=${VERSION:-2018.09.17_1}
-SRCVER=$(echo $VERSION | tr _ -)
-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
-
-SICKUSER=${SICKUSER:-sickrage}
-SICKGROUP=${SICKGROUP:-sickrage}
-
-# The user and group accounts need to be created manually.
-# For slackbuilds.org, assigned sickrage uid/gid are 324/324.
-# See http://slackbuilds.org/uid_gid.txt
-if ! grep ^$SICKGROUP: /etc/group 2>&1 > /dev/null; then
- echo "  You must have a \"$SICKGROUP\" group to run this script."
- echo "    # groupadd -g 324 $SICKGROUP"
- exit 1
-elif ! grep ^$SICKUSER: /etc/passwd 2>&1 > /dev/null; then
- echo "  You must have a \"$SICKUSER\" user to run this script."
- echo "    # useradd -u 324 -g $SICKGROUP -d /var/lib/sickrage -s /bin/false $SICKUSER"
- 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-$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 {} \;
-
-# "Install" sickrage
-echo "Installing sickrage"
-mkdir -p $PKG/usr/share/sickrage
-cp -r ./* $PKG/usr/share/sickrage
-
-# Copy documentation to correct folder
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a COPYING.txt readme.md $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/etc/rc.d/
-install -m 0644 $CWD/rc.sickrage $PKG/etc/rc.d/rc.sickrage.new
-install -m 0644 $CWD/sickrage.conf $PKG/etc/sickrage.conf.new
-install -dm 0755 --owner=$SICKUSER $PKG/var/lib/sickrage/
-install -m 0644 --owner=$SICKUSER $CWD/config.ini $PKG/var/lib/sickrage/config.ini.new
-install -dm 0755 --owner=$SICKUSER $PKG/var/log/sickrage/
-
-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/network/sickrage/sickrage.conf b/network/sickrage/sickrage.conf
deleted file mode 100644
index 1b99f0b756..0000000000
--- a/network/sickrage/sickrage.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-USERNAME=sickrage
-HOMEDIR=/usr/share/sickrage
-DATADIR=/var/lib/sickrage
-PIDFILE=${DATADIR}/sickrage.pid
-PORT=8081
-LOGDIR=/var/log/sickrage
\ No newline at end of file
diff --git a/network/sickrage/sickrage.info b/network/sickrage/sickrage.info
deleted file mode 100644
index 203098ff7c..0000000000
--- a/network/sickrage/sickrage.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="sickrage"
-VERSION="2018.09.17_1"
-HOMEPAGE="https://sickrage.github.io/"
-DOWNLOAD="https://github.com/SickRage/SickRage/archive/v2018.09.17-1/SickRage-v2018.09.17-1.tar.gz"
-MD5SUM="0a8531dabb84712bd703a06069c11d85"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Kevin Matthew"
-EMAIL="kevin@kevinmatthew.com"
diff --git a/network/sickrage/slack-desc b/network/sickrage/slack-desc
deleted file mode 100644
index 929bbadb3d..0000000000
--- a/network/sickrage/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------------------------------------------------------|
-sickrage: sickrage (Automatic Video Library Manager for TV Shows.)
-sickrage:
-sickrage: SickRage is an automatic Video Library Manager for TV Shows. It
-sickrage: watches for new episodes of your favorite shows, and when they are
-sickrage: posted it does its magic: automatic torrent/nzb searching,
-sickrage: downloading, and processing at the qualities you want.
-sickrage:
-sickrage: Homepage: https://sickrage.github.io/
-sickrage:
-sickrage:
-sickrage:
diff --git a/network/siege/README b/network/siege/README
index 5ec3a5fccf..0123ce68c9 100644
--- a/network/siege/README
+++ b/network/siege/README
@@ -1,6 +1,7 @@
-Siege is an http regression testing and benchmarking utility.  It was designed
-to let web developers measure the performance of their code under duress,
-to see how it will stand up to load on the internet.  Siege supports basic
-authentication, cookies, HTTP and HTTPS protocols.  It allows the user to hit
-a web server with a configurable number of concurrent simulated users.  Those
-users place the webserver "under siege."
+Siege is an http regression testing and benchmarking utility.  It was
+designed to let web developers measure the performance of their code
+under duress, to see how it will stand up to load on the internet.
+Siege supports basic authentication, cookies, HTTP and HTTPS
+protocols. It allows the user to hit a web server with a configurable
+number of concurrent simulated users. Those users place the webserver
+"under siege."
diff --git a/network/siege/siege-verbosity.patch b/network/siege/siege-verbosity.patch
new file mode 100644
index 0000000000..fec188f1b2
--- /dev/null
+++ b/network/siege/siege-verbosity.patch
@@ -0,0 +1,28 @@
+From b7900fbc0e929f2f340a44ed2881018a29a9a86f Mon Sep 17 00:00:00 2001
+From: Josue Abarca <jmaslibre@gmail.com>
+Date: Sun, 9 Aug 2020 15:48:15 -0600
+Subject: [PATCH] Allow the command line verbose option to override the
+ configuration file
+
+Since the default configuration file has json_output set to true and
+the json_output monopolizes stdout, superceding verbose, this change
+allows the user to activate the verbose mode using the command line
+parameter even when json_output is set to true in the configuration
+file.
+---
+ src/main.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/main.c b/src/main.c
+index 4bad685..2541cee 100644
+--- a/src/main.c
++++ b/src/main.c
+@@ -256,6 +256,8 @@ parse_cmdline(int argc, char *argv[])
+         break;
+       case 'v':
+         my.verbose = TRUE;
++        my.json_output = FALSE;
++        my.quiet   = FALSE;
+         break;
+       case 'r':
+         if(strmatch(optarg, "once")){
diff --git a/network/siege/siege.SlackBuild b/network/siege/siege.SlackBuild
index ad9c26d709..1173fc115a 100644
--- a/network/siege/siege.SlackBuild
+++ b/network/siege/siege.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for Siege
 
-# Copyright 2011-2018 Heinz Wiesinger, Amsterdam, The Netherlands
+# Copyright 2011-2021  Heinz Wiesinger, Amsterdam, The Netherlands
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -11,39 +11,49 @@
 # 1. Redistributions of this script must retain the above copyright
 #    notice, this list of conditions and the following disclaimer.
 #
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (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.
 
 # Originally written by Menno Duursma <druiloor@zonnet.nl>
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=siege
-VERSION=${VERSION:-4.0.4}
+VERSION=${VERSION:-4.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}
 
-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,6 +81,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 {} \;
 
+# Allow the command line verbose option to override the configuration file
+# https://github.com/JoeDog/siege/pull/182
+patch -p1 -i $CWD/siege-verbosity.patch
+
+utils/bootstrap
+
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
@@ -103,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/network/siege/siege.info b/network/siege/siege.info
index 48e21fb9fb..f0c4bee6fc 100644
--- a/network/siege/siege.info
+++ b/network/siege/siege.info
@@ -1,10 +1,10 @@
 PRGNAM="siege"
-VERSION="4.0.4"
+VERSION="4.1.1"
 HOMEPAGE="http://www.joedog.org/index/siege-home"
-DOWNLOAD="http://download.joedog.org/siege/siege-4.0.4.tar.gz"
-MD5SUM="aed6db62c4bf199f86218bd7b2fda14f"
+DOWNLOAD="https://github.com/JoeDog/siege/archive/v4.1.1/siege-4.1.1.tar.gz"
+MD5SUM="375a584bc1c1085613854c45e6b3ae99"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
 MAINTAINER="Heinz Wiesinger"
-EMAIL="pprkut@liwjatan.at"
+EMAIL="pprkut@slackbuilds.org"
diff --git a/network/sieve-connect/sieve-connect.SlackBuild b/network/sieve-connect/sieve-connect.SlackBuild
index fd0f53b022..013d5a0303 100644
--- a/network/sieve-connect/sieve-connect.SlackBuild
+++ b/network/sieve-connect/sieve-connect.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Copyright (c) 2010-2017 LEVAI Daniel
 # All rights reserved.
@@ -27,14 +27,24 @@
 
 # Build script for sieve-connect
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=sieve-connect
 VERSION=${VERSION:-0.89}
 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/network/sieve-connect/sieve-connect.info b/network/sieve-connect/sieve-connect.info
index 7502929a30..5111b4a02f 100644
--- a/network/sieve-connect/sieve-connect.info
+++ b/network/sieve-connect/sieve-connect.info
@@ -5,6 +5,6 @@ DOWNLOAD="https://github.com/philpennock/sieve-connect/releases/download/v0.89/s
 MD5SUM="f74cdfbe5d22e2b310f63010d5b57257"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="perl-Authen-SASL perl-IO-Socket-INET6 perl-IO-Socket-SSL perl-net-dns"
+REQUIRES="perl-IO-Socket-INET6 perl-net-dns"
 MAINTAINER="LEVAI Daniel"
 EMAIL="leva@ecentrum.hu"
diff --git a/network/signal-desktop/signal-desktop.SlackBuild b/network/signal-desktop/signal-desktop.SlackBuild
index b21eae7a19..935ba82bf3 100644
--- a/network/signal-desktop/signal-desktop.SlackBuild
+++ b/network/signal-desktop/signal-desktop.SlackBuild
@@ -1,8 +1,9 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for signal-desktop
 
 # Copyright 2018 David O'Shaughnessy
+# Copyright 2022-2024 Gregory J. L. Tourte <artourter@gmail.com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,12 +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=signal-desktop
-VERSION=${VERSION:-1.26.2}
+VERSION=${VERSION:-7.4.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
-CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -40,6 +43,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
+
 # Upstream only has binary support for x86_64 at present.
 if [ "$ARCH" = "x86_64" ]; then
     DEBARCH="amd64"
@@ -56,14 +67,15 @@ cd $PKG
 ar p $CWD/${PRGNAM}_${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 {} \;
+  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} + -o \
+  \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} +
 
 # create soft link for launcher
 mkdir -p $PKG/usr/bin
-ln -sf /opt/Signal/$PRGNAM $PKG/usr/bin/$PRGNAM
+ln -sf ../../opt/Signal/$PRGNAM $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 $PKG/usr/share/doc/$PRGNAM/* $PKG/opt/Signal/LICENSE* $PKG/usr/doc/$PRGNAM-$VERSION
@@ -75,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/network/signal-desktop/signal-desktop.info b/network/signal-desktop/signal-desktop.info
index b51172d8c1..c828a99176 100644
--- a/network/signal-desktop/signal-desktop.info
+++ b/network/signal-desktop/signal-desktop.info
@@ -1,10 +1,10 @@
 PRGNAM="signal-desktop"
-VERSION="1.26.2"
+VERSION="7.4.0"
 HOMEPAGE="https://signal.org/"
 DOWNLOAD="UNSUPPORTED"
 MD5SUM=""
-DOWNLOAD_x86_64="https://sourceforge.net/projects/slackbuildsdirectlinks/files/signal-desktop/signal-desktop_1.26.2_amd64.deb"
-MD5SUM_x86_64="c097682d171ba4d8ae9151bf8ac7c9db"
+DOWNLOAD_x86_64="https://updates.signal.org/desktop/apt/pool/s/signal-desktop/signal-desktop_7.4.0_amd64.deb"
+MD5SUM_x86_64="6bf4be996883f361d25bdff81ffc3120"
 REQUIRES=""
-MAINTAINER="David O'Shaughnessy"
-EMAIL="dev@osh.id.au"
+MAINTAINER="ArTourter"
+EMAIL="artourter@gmail.com"
diff --git a/network/silc-toolkit/README b/network/silc-toolkit/README
index ffd678a9da..d5cd7ae5ef 100644
--- a/network/silc-toolkit/README
+++ b/network/silc-toolkit/README
@@ -1,6 +1,6 @@
 SILC Toolkit is a package intended for software developers who would
 like to develope their own SILC based applications or help in the
-development of the SILC. The Toolkit includes SILC Protocol Core library,
-SILC Crypto library, SILC Key Exchange (SKE) library, SILC Math library,
-SILC Modules (SIM) library, SILC Utility library, SILC Client library and few
-other libraries. 
+development of the SILC. The Toolkit includes SILC Protocol Core
+library, SILC Crypto library, SILC Key Exchange (SKE) library, SILC
+Math library, SILC Modules (SIM) library, SILC Utility library, SILC
+Client library and few other libraries.
diff --git a/network/silc-toolkit/silc-toolkit.SlackBuild b/network/silc-toolkit/silc-toolkit.SlackBuild
index 9f8d842836..1649242a25 100644
--- a/network/silc-toolkit/silc-toolkit.SlackBuild
+++ b/network/silc-toolkit/silc-toolkit.SlackBuild
@@ -1,28 +1,38 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for silc-toolkit
 # Written by pyllyukko - pyllyukko AT maimed dot org - http://void.maimed.org/~pyllyukko/
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM="silc-toolkit"
 VERSION=${VERSION:-1.1.12}
-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"
@@ -72,8 +82,10 @@ cp -a BSD COPYING CREDITS ChangeLog GPL INSTALL README \
   README.MACOSX README.SYMBIAN README.WIN32 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/network/sipcalc/sipcalc.SlackBuild b/network/sipcalc/sipcalc.SlackBuild
index 299bdb0252..83e05610f2 100644
--- a/network/sipcalc/sipcalc.SlackBuild
+++ b/network/sipcalc/sipcalc.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for sipcalc
 
@@ -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=sipcalc
 VERSION=${VERSION:-1.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}
@@ -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/network/sipp/sipp.SlackBuild b/network/sipp/sipp.SlackBuild
index 06edad04f4..5fc0c32175 100644
--- a/network/sipp/sipp.SlackBuild
+++ b/network/sipp/sipp.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for SIPp
 
-# Copyright 2013-2019 Kent Fritz Mountain View, California, USA
+# Copyright 2013-2020 Kent Fritz Mountain View, 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=sipp
-VERSION=${VERSION:-3.5.2}
+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}
@@ -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 \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --sysconfdir=/etc \
-  --localstatedir=/var \
-  --mandir=/usr/man \
-  --docdir=/usr/doc/$PRGNAM-$VERSION \
-  --build=$ARCH-slackware-linux \
-  --with-gsl \
-  --with-openssl \
-  --with-pcap \
-  --with-rtpstream
-
-make
-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_BUILD_TYPE=Release \
+    -DUSE_SSL=1 \
+    -DUSE_PCAP=1 \
+    -DUSE_GSL=1 ..
+  make
+  make install/strip DESTDIR=$PKG
+cd ..
+mkdir -p $PKG/usr/man/man1
+cp -a sipp.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
@@ -97,11 +105,11 @@ mkdir -p $PKG/usr/share/$PRGNAM/pcap
 cp -a pcap/* $PKG/usr/share/$PRGNAM/pcap
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a README.md LICENSE.txt THANKS CHANGES.md FAQ.md $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a README.md LICENSE.txt THANKS CHANGES.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/network/sipp/sipp.info b/network/sipp/sipp.info
index 79b08686dd..d67a67bcae 100644
--- a/network/sipp/sipp.info
+++ b/network/sipp/sipp.info
@@ -1,8 +1,8 @@
 PRGNAM="sipp"
-VERSION="3.5.2"
+VERSION="3.7.1"
 HOMEPAGE="http://sipp.sourceforge.net"
-DOWNLOAD="https://github.com/SIPp/sipp/releases/download/v3.5.2/sipp-3.5.2.tar.gz"
-MD5SUM="604df972c6ed3ddc598b2b83d7a8ddad"
+DOWNLOAD="https://github.com/SIPp/sipp/releases/download/v3.7.1/sipp-3.7.1.tar.gz"
+MD5SUM="518fec9bc71602a0e858f07b1192df1c"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/network/sks-keyserver/README b/network/sks-keyserver/README
deleted file mode 100644
index a6311c1b90..0000000000
--- a/network/sks-keyserver/README
+++ /dev/null
@@ -1,26 +0,0 @@
-sks-keyserver (OpenPGP keyserver)
-
-SKS is an OpenPGP keyserver whose goal is to provide easy to deploy,
-decentralized, and highly reliable synchronization. That means that a
-key submitted to one SKS server will quickly be distributed to all key
-servers, and even wildly out-of-date servers, or servers that experience
-spotty connectivity, can fully synchronize with rest of the system.
-
-This SlackBuild will also verify the PGP signature of the package if
-the following conditions are met:
-
-- You have GnuPG installed
-- You have the appropriate public PGP key (0x41259773973A612A)
-  in your trustedkeys.gpg keyring
-- You have downloaded the sig file from
-  https://bitbucket.org/skskeyserver/sks-keyserver/downloads/sks-${VERSION}.tgz.asc
-
-
-Groupname and username
-
-You must have the 'sks' group and user to run this script,
-for example:
-
-  groupadd -r sks -g 295
-  useradd -u 295 -g 295 -c "SKS keyserver" -d /var/lib/sks -r -M \
-    -e 1970-01-02 -s /sbin/nologin sks
diff --git a/network/sks-keyserver/doinst.sh b/network/sks-keyserver/doinst.sh
deleted file mode 100644
index 63a9093e1c..0000000000
--- a/network/sks-keyserver/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.sks.new
diff --git a/network/sks-keyserver/rc.sks b/network/sks-keyserver/rc.sks
deleted file mode 100644
index 9869de049e..0000000000
--- a/network/sks-keyserver/rc.sks
+++ /dev/null
@@ -1,60 +0,0 @@
-#************************************************************************#
-#* rc.sks - sample script to start and stop the SKS processes           *#
-#*                                                                      *#
-#* Copyright (C) 2011, 2012, 2013  John Clizbe                         *#
-#*                                                                      *#
-#* This file is part of SKS.  SKS 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307  *#
-#* USA or see <http://www.gnu.org/licenses/>.                           *#
-#************************************************************************#
-#
-#! /bin/sh
-#
-CLIENT=/usr/bin/sks
-DIR=/var/lib/sks
-STARTOPTS=
-#STARTOPTS will need to be in quotes if it has white space in it
-
-test -e $CLIENT || exit 0
-
-test -d $DIR || exit 0
-
-case "$1" in
-        start)
-		cd $DIR
-                echo -n "Starting SKS:"
-                echo -n \ sks_db
-                /bin/su -c "$CLIENT db" -s /bin/bash sks &
-                echo -n \ sks_recon
-                /bin/su -c "$CLIENT recon" -s /bin/bash sks &
-                echo "."
-        ;;
-        stop)
-                echo -n "Stopping SKS:"
-		killall sks
-		while [ "`pidof sks`" ]; do sleep 1; done # wait until SKS processes have exited
-                echo "."
-        ;;
-        restart|force-reload)
-		$0 stop
-		sleep 1
-		$0 start
-   	;;
-    	*)
-		echo "Usage: $0 {start|stop|reload|restart|force-reload}"
-		exit 1
-	;;
-esac
-
-exit 0
diff --git a/network/sks-keyserver/sks-keyserver.SlackBuild b/network/sks-keyserver/sks-keyserver.SlackBuild
deleted file mode 100644
index ddebc275ad..0000000000
--- a/network/sks-keyserver/sks-keyserver.SlackBuild
+++ /dev/null
@@ -1,134 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for sks-keyserver
-
-# Copyright 2014 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=sks-keyserver
-VERSION=${VERSION:-1.1.5}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-SKS_USER="sks"
-SKS_GROUP="sks"
-
-if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
-    arm*) ARCH=arm ;;
-       *) ARCH=$( uname -m ) ;;
-  esac
-fi
-
-bailout() {
-  echo "  You must have a ${SKS_USER} user and ${SKS_GROUP} group to run this script."
-  echo "  Something like this should suffice for most systems:"
-  echo "    # groupadd -r ${SKS_GROUP} -g 295"
-  echo "    # useradd -u 295 -g 295 -c \"SKS keyserver\" -d /var/lib/sks -r -M -e 1970-01-02 -s /sbin/nologin ${SKS_USER}"
-  exit 1
-}
-
-# Bail if user or group isn't valid on your system
-if ! getent passwd $SKS_USER 1>/dev/null 2>/dev/null; then
-   bailout;
-elif ! getent group $SKS_GROUP 1>/dev/null 2>/dev/null; then
-   bailout;
-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
-
-# The package can be verified with SKS Keyserver Signing Key (0x41259773973A612A)
-# If we have GPG installed, we try to verify the signature.
-if [ -x "/usr/bin/gpg" -a -x "/usr/bin/gpgv" ]
-then
-  set +e
-  # This will check if we have the correct key in our keyring.
-  # For the trustedkeys.gpg, see "man 1 gpgv".
-  /usr/bin/gpg --keyring trustedkeys.gpg --no-default-keyring --list-keys 0x41259773973A612A &>/dev/null
-  GPG_RET=${?}
-  # 2 means we don't have his key, 0 means we do.
-  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}/sks-${VERSION}.tgz.asc" ]
-  then
-    /usr/bin/gpgv "${CWD}/sks-${VERSION}.tgz.asc"
-  fi
-fi
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf sks-$VERSION
-tar xvf $CWD/sks-$VERSION.tgz
-cd sks-$VERSION
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-cp -v Makefile.local.unused Makefile.local
-
-sed -i -e '/tar xmvfz/a\\tsed -i -e s:uint32:uint32_t: cryptokit-1.7/src/stubs-md5.c' Makefile
-
-make -j1 dep
-make -j1 all
-make install PREFIX=$PKG/usr MANDIR=$PKG/usr/man
-install -D -m 0644 ${CWD}/rc.sks $PKG/etc/rc.d/rc.sks.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 ANNOUNCEMENT BUGS CHANGELOG FILES LICENSE README.md TODO UPGRADING 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
-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/network/sks-keyserver/sks-keyserver.info b/network/sks-keyserver/sks-keyserver.info
deleted file mode 100644
index 079c5d571a..0000000000
--- a/network/sks-keyserver/sks-keyserver.info
+++ /dev/null
@@ -1,12 +0,0 @@
-PRGNAM="sks-keyserver"
-VERSION="1.1.5"
-HOMEPAGE="https://bitbucket.org/skskeyserver/sks-keyserver"
-DOWNLOAD="https://bitbucket.org/skskeyserver/sks-keyserver/downloads/sks-1.1.5.tgz \
-          https://bitbucket.org/skskeyserver/sks-keyserver/downloads/sks-1.1.5.tgz.asc"
-MD5SUM="60bb0ce429e5d223fd4662c286f46e7b \
- 	0975cabda0fd36034db8bfc143b23afe"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="camlp4 db46"
-MAINTAINER="pyllyukko"
-EMAIL="pyllyukko AT maimed dot org"
diff --git a/network/sks-keyserver/slack-desc b/network/sks-keyserver/slack-desc
deleted file mode 100644
index 22deef947f..0000000000
--- a/network/sks-keyserver/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------------------------------------------------------|
-sks-keyserver: sks-keyserver (OpenPGP keyserver)
-sks-keyserver:
-sks-keyserver: SKS is an OpenPGP keyserver whose goal is to provide easy to deploy,
-sks-keyserver: decentralized, and highly reliable synchronization.
-sks-keyserver:
-sks-keyserver:
-sks-keyserver:
-sks-keyserver:
-sks-keyserver:
-sks-keyserver: Homepage: https://bitbucket.org/skskeyserver/sks-keyserver
-sks-keyserver:
diff --git a/network/skype4pidgin/skype4pidgin.SlackBuild b/network/skype4pidgin/skype4pidgin.SlackBuild
index cbd3911f97..49f9daba45 100644
--- a/network/skype4pidgin/skype4pidgin.SlackBuild
+++ b/network/skype4pidgin/skype4pidgin.SlackBuild
@@ -1,48 +1,57 @@
-#!/bin/sh
+#!/bin/bash
 
-# Slackware build script for SkypeWeb Chat for Pidgin
+# Slackware build script for skype4pidgin
 #
-# Copyright 2018 Ekin Akoglu <ekinakoglu@gmail.com>
 # Copyright 2015 Gethyn ThomasQuail <gethyn@bloodbathsoftworks.com>
+# Copyright 2018 Ekin Akoglu <ekinakoglu@gmail.com>
+# Copyright 2020 Dominik Drobek <dominik.drobek (at) o2.pl>
 # All rights reserved.
 #
-# Based on:
-# SBo's cmake-template
-#
-# Previously used chunks from Erik W. Hanson's FaceBook SlackBuild.
-#
 # Redistribution and use of this script, with or without modification, is
 # permitted provided that the following conditions are met:
 #
 # 1. Redistributions of this script must retain the above copyright
 #    notice, this list of conditions and the following disclaimer.
 #
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (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=skype4pidgin
-VERSION=${VERSION:-1.5}
+VERSION=${VERSION:-1.7}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
-MARCH=$( uname -m )
 if [ -z "$ARCH" ]; then
-  case "$MARCH" in
-    i?86)    export ARCH=i586   ;;
-    armv7hl) export ARCH=$MARCH ;;
-    arm*)    export ARCH=arm    ;;
-    *)       export ARCH=$MARCH ;;
+  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=""
@@ -52,9 +61,6 @@ elif [ "$ARCH" = "i686" ]; then
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
-elif [ "$ARCH" = "armv7hl" ]; then
-  SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16"
-  LIBDIRSUFFIX=""
 else
   SLKCFLAGS="-O2"
   LIBDIRSUFFIX=""
@@ -62,11 +68,6 @@ fi
 
 set -e
 
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
@@ -80,13 +81,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 {} \;
 
-# Go to skypeweb folder, since there are two plugins in this archive
 cd skypeweb
-
-# Let's compile!
 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 gpl3.txt $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
@@ -95,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/network/skype4pidgin/skype4pidgin.info b/network/skype4pidgin/skype4pidgin.info
index 51f94b4ff0..f8c1f0232f 100644
--- a/network/skype4pidgin/skype4pidgin.info
+++ b/network/skype4pidgin/skype4pidgin.info
@@ -1,10 +1,10 @@
 PRGNAM="skype4pidgin"
-VERSION="1.5"
+VERSION="1.7"
 HOMEPAGE="https://github.com/EionRobb/skype4pidgin"
-DOWNLOAD="https://github.com/EionRobb/skype4pidgin/archive/1.5/skype4pidgin-1.5.tar.gz"
-MD5SUM="8f524b4090b0d2c2fc4878477c61140f"
+DOWNLOAD="https://github.com/EionRobb/skype4pidgin/archive/1.7/skype4pidgin-1.7.tar.gz"
+MD5SUM="6af9359c55f4644fc8848389df582848"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="json-glib"
-MAINTAINER="Ekin Akoglu"
-EMAIL="ekinakoglu@gmail.com"
+REQUIRES=""
+MAINTAINER="Dominik Drobek"
+EMAIL="dominik.drobek (at) o2.pl"
diff --git a/network/skype4pidgin/slack-desc b/network/skype4pidgin/slack-desc
index 1c774a97bd..d1d7a51476 100644
--- a/network/skype4pidgin/slack-desc
+++ b/network/skype4pidgin/slack-desc
@@ -11,8 +11,8 @@ skype4pidgin:
 skype4pidgin: Adds Skype client-less chat (text only) to Pidgin using the SkypeWeb
 skype4pidgin: protocol. Has many features already, such as group chat.
 skype4pidgin:
-skype4pidgin: Homepage:
-skype4pidgin: https://github.com/EionRobb/skype4pidgin
+skype4pidgin: Homepage: https://github.com/EionRobb/skype4pidgin
+skype4pidgin:
 skype4pidgin:
 skype4pidgin:
 skype4pidgin:
diff --git a/network/skypeforlinux/README b/network/skypeforlinux/README
index f44b58ce67..ca41f8983c 100644
--- a/network/skypeforlinux/README
+++ b/network/skypeforlinux/README
@@ -1,11 +1,11 @@
-Skype is an instant messaging app that provides online text message and
-video chat services. Users may transmit both text and video messages and
-may exchange digital documents such as images, text, and video. Skype allows
-video conference calls.
+Skype is an instant messaging app that provides online text message
+and video chat services. Users may transmit both text and video
+messages and may exchange digital documents such as images, text, and
+video. Skype allows video conference calls.
 
 This script repackages the Debian package provided by Microsoft.
 
 Currently, only the 64bit version is available.
 
-Note: At the time of writing, the last version known to correctly support
-gksu/sudo method is: 8.18.0.6
+Note: At the time of writing, the last version known to correctly
+support the gksu/sudo method is: 8.18.0.6
diff --git a/network/skypeforlinux/skype-dbus-mock/org.freedesktop.login1.service b/network/skypeforlinux/skype-dbus-mock/org.freedesktop.login1.service
deleted file mode 100644
index 74a520e572..0000000000
--- a/network/skypeforlinux/skype-dbus-mock/org.freedesktop.login1.service
+++ /dev/null
@@ -1,4 +0,0 @@
-[D-BUS Service]
-Name=org.freedesktop.login1
-Exec=/usr/bin/skype-dbus-mock
-User=root
diff --git a/network/skypeforlinux/skype-dbus-mock/skype-dbus-mock.conf b/network/skypeforlinux/skype-dbus-mock/skype-dbus-mock.conf
deleted file mode 100644
index 4d8287a7a9..0000000000
--- a/network/skypeforlinux/skype-dbus-mock/skype-dbus-mock.conf
+++ /dev/null
@@ -1,12 +0,0 @@
-<!DOCTYPE busconfig PUBLIC
- "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
- "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
-<busconfig>
-    <policy user="root">
-        <allow own="org.freedesktop.login1"/>
-    </policy>
-    <policy context="default">
-        <allow send_destination="org.freedesktop.login1"/>
-        <allow send_interface="org.freedesktop.login1.Manager"/>
-    </policy>
-</busconfig>
diff --git a/network/skypeforlinux/skype-dbus-mock/skype-dbus-mock.py b/network/skypeforlinux/skype-dbus-mock/skype-dbus-mock.py
deleted file mode 100644
index cc220844b4..0000000000
--- a/network/skypeforlinux/skype-dbus-mock/skype-dbus-mock.py
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/usr/bin/env python
-import os
-from gi.repository import GLib
-import dbus
-import dbus.service
-import dbus.types
-import dbus.mainloop.glib
-
-
-class FakeLoginManager(dbus.service.Object):
-
-    @dbus.service.method("org.freedesktop.login1.Manager",
-                         in_signature='ssss', out_signature='h')
-    def Inhibit(self, what, who, why, mode):
-        r, w = os.pipe()
-        return dbus.types.UnixFd(w)
-
-
-if __name__ == '__main__':
-    dbus.mainloop.glib.DBusGMainLoop(set_as_default=True)
-
-    system_bus = dbus.SystemBus()
-    bus_name = dbus.service.BusName("org.freedesktop.login1", system_bus)
-    obj = FakeLoginManager(system_bus, '/org/freedesktop/login1')
-
-    mainloop = GLib.MainLoop()
-    mainloop.run()
diff --git a/network/skypeforlinux/skypeforlinux.SlackBuild b/network/skypeforlinux/skypeforlinux.SlackBuild
index f6ccc33dbc..8172e0fb75 100644
--- a/network/skypeforlinux/skypeforlinux.SlackBuild
+++ b/network/skypeforlinux/skypeforlinux.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for skypeforlinux
 
-# Copyright 2017, 2018, 2019  Mario Preksavec, Zagreb, Croatia
+# Copyright 2017, 2024  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=skypeforlinux
-VERSION=${VERSION:-8.34.0.78}
+VERSION=${VERSION:-8.109.0.209}
 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}
@@ -51,10 +61,10 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $PKG
 if [ -f $CWD/${PRGNAM}_${VERSION}_amd64.deb ]; then
-  ar p $CWD/${PRGNAM}_${VERSION}_amd64.deb data.tar.xz | tar -xvJ
+  ar p $CWD/${PRGNAM}_${VERSION}_amd64.deb data.tar.gz | tar -xvz
 elif [ -f $CWD/${PRGNAM}-64.deb ]; then
   # Support the website download
-  ar p $CWD/${PRGNAM}-64.deb data.tar.xz | tar -xvJ
+  ar p $CWD/${PRGNAM}-64.deb data.tar.gz | tar -xvz
   VERSION=$(ar p $CWD/${PRGNAM}-64.deb control.tar.gz \
             | tar -Ozxf - ./control | awk '/^Version:/{print $NF}')
 fi
@@ -67,14 +77,6 @@ find -L . \
 
 rm -rf $PKG/opt
 
-# https://github.com/maelnor/skype-dbus-mock
-install -Dm 644 $CWD/skype-dbus-mock/skype-dbus-mock.conf \
-  $PKG/usr/share/dbus-1/system.d/skype-dbus-mock.conf
-install -Dm 644 $CWD/skype-dbus-mock/org.freedesktop.login1.service \
-  $PKG/usr/share/dbus-1/system-services/org.freedesktop.login1.service
-install -Dm 755 $CWD/skype-dbus-mock/skype-dbus-mock.py \
-  $PKG/usr/bin/skype-dbus-mock
-
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 mv $PKG/usr/share/$PRGNAM/LICENSE* $PKG/usr/doc/$PRGNAM-$VERSION
 mv $PKG/usr/share/doc/$PRGNAM/* $PKG/usr/doc/$PRGNAM-$VERSION
@@ -88,4 +90,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/network/skypeforlinux/skypeforlinux.info b/network/skypeforlinux/skypeforlinux.info
index 9b1e95f7c9..e7fc326e6f 100644
--- a/network/skypeforlinux/skypeforlinux.info
+++ b/network/skypeforlinux/skypeforlinux.info
@@ -1,10 +1,10 @@
 PRGNAM="skypeforlinux"
-VERSION="8.34.0.78"
+VERSION="8.109.0.209"
 HOMEPAGE="https://www.skype.com/"
 DOWNLOAD="UNSUPPORTED"
 MD5SUM=""
-DOWNLOAD_x86_64="https://repo.skype.com/deb/pool/main/s/skypeforlinux/skypeforlinux_8.34.0.78_amd64.deb"
-MD5SUM_x86_64="4ffdb0258c2dd4eff53d6f317bd69932"
+DOWNLOAD_x86_64="https://repo.skype.com/deb/pool/main/s/skypeforlinux/skypeforlinux_8.109.0.209_amd64.deb"
+MD5SUM_x86_64="0b44e0494b00b337e7e31f72c3d826c1"
 REQUIRES="%README%"
 MAINTAINER="Mario Preksavec"
 EMAIL="mario at slackware dot hr"
diff --git a/network/slack/slack.SlackBuild b/network/slack/slack.SlackBuild
index af371c524e..90c0e97523 100644
--- a/network/slack/slack.SlackBuild
+++ b/network/slack/slack.SlackBuild
@@ -1,10 +1,11 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for slack
 
 # Ryan P.C. McQuen | Everett, WA | ryanpcmcquen@member.fsf.org
 # Harald Achitz | Stockholm/Sweden | harald.achitz@gmail.com
-
+# Pedro R.M. Júnior | Campinas, SP, Brazil | pedrormjunior@gmail.com
+# Ruari Oedegaard | Oslo, Norway | sbo@ruari.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
@@ -25,47 +26,37 @@
 # <https://www.gnu.org/licenses/>.
 
 
+cd $(dirname $0) ; CWD=$(pwd)
+
+# A trick to find the latest slack package details, using snap meta data
+# curl -sH Snap-Device-Series:\ 16 https://api.snapcraft.io/v2/snaps/info/slack | json_pp
 PRGNAM=slack
-VERSION=${VERSION:-3.1.1}
+VERSION=${VERSION:-4.37.101}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+SNAPREVISION=${SNAPREVISION:-142}
+SNAPPKG=JUJH91Ved74jd4ZgJCpzMBtYbPOzTlsD_$SNAPREVISION.snap
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) export ARCH=i586 ;;
-    arm*) export ARCH=arm ;;
-       *) export ARCH=$( uname -m ) ;;
+    x86_64) ARCH=x86_64 ;;
+         *) echo "Package for $(uname -m) architecture is not available." ; exit 1 ;;
   esac
 fi
 
-DEBARCH=${DEBARCH:-$(uname -m)}
-
-case "$DEBARCH" in
-  i?86) DEBARCH="i386" ;;
-  x86_64) DEBARCH="amd64" ;;
-  *) echo "Package for $(uname -m) architecture is not available." ; 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
 
-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
@@ -74,7 +65,11 @@ cd $TMP
 rm -rf $PRGNAM-$VERSION
 mkdir -p $PRGNAM-$VERSION
 cd $PRGNAM-$VERSION
-ar p $CWD/${PRGNAM}-desktop-${VERSION}-${DEBARCH}.deb data.tar.xz | tar xJv
+unsquashfs -q -f -d . $CWD/$SNAPPKG usr/lib/slack usr/share/pixmaps/slack.png meta/gui/slack.desktop
+mkdir -p usr/bin usr/share/applications
+ln -s ../../usr/lib/slack/slack usr/bin/slack
+sed 's,\${SNAP},,' meta/gui/slack.desktop > usr/share/applications/slack.desktop
+
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -82,12 +77,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 {} \;
 
-mv * $PKG/
-
-## we do not need a debian cron job :^)
-rm -rf $PKG/etc/
-## nor lintian stuff and another copy of LICENSE
-rm -rf $PKG/usr/share/{doc,lintian}
+mv usr $PKG/
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/
 cp -a $PKG/usr/lib/slack/LICENSE $PKG/usr/doc/$PRGNAM-$VERSION/
@@ -98,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/network/slack/slack.info b/network/slack/slack.info
index 9aba452666..5fa332568b 100644
--- a/network/slack/slack.info
+++ b/network/slack/slack.info
@@ -1,10 +1,10 @@
 PRGNAM="slack"
-VERSION="3.1.1"
+VERSION="4.37.101"
 HOMEPAGE="https://slack.com"
 DOWNLOAD="UNSUPPORTED"
 MD5SUM=""
-DOWNLOAD_x86_64="https://downloads.slack-edge.com/linux_releases/slack-desktop-3.1.1-amd64.deb"
-MD5SUM_x86_64="3da6ef3d34547542191223718d46839e"
+DOWNLOAD_x86_64="https://api.snapcraft.io/api/v1/snaps/download/JUJH91Ved74jd4ZgJCpzMBtYbPOzTlsD_142.snap"
+MD5SUM_x86_64="14567aa40b8d3db83cae4e2af4e89a96"
 REQUIRES=""
-MAINTAINER="Harald Achitz"
-EMAIL="harald.achitz@gmail.com"
+MAINTAINER="Ruari Oedegaard"
+EMAIL="sbo@ruari.com"
diff --git a/network/slimjet/README b/network/slimjet/README
deleted file mode 100644
index 3741d6eeca..0000000000
--- a/network/slimjet/README
+++ /dev/null
@@ -1,24 +0,0 @@
-slimjet (Chromium based web browser)
-
-Slimjet is built on top of the Chromium open-source project on which
-Google Chrome is also based. It enjoys the same speed and reliablity
-provided by the underlying blink engine as Google Chrome. However, many
-additional features and options have been added in Slimjet to make it
-more powerful, intelligent and customizable than Chrome. In addition to
-that, Slimjet DOES NOT send any usage statistics back to Google's server
-like Google Chrome, which is a growing concern for many Chrome users due
-to the ubiquitous presence and reach of the advertising empire.
-
-Slimjet is compatible with all extensions and plugins designed for
-Google Chrome available from the Chrome web store.
-
-This SlackBuild does NOT attempt to compile slimjet from source, it
-only repackages the binaries that are provided by the developers.
-
-The MD5SUM and VERSION numbers may be incorrect from time to time due
-to the developers' release scheme. If this occurs, you will have the
-latest release, but it will be numbered incorrectly.
-
-NOTE: Run the wrapper script "flashpeak-slimjet" from the terminal for
-the first time to enable the sand box (admin access required). After
-that, you can run the wrapper script from a desktop shortcut.
diff --git a/network/slimjet/slack-desc b/network/slimjet/slack-desc
deleted file mode 100644
index 280629da7c..0000000000
--- a/network/slimjet/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------------------------------------------------------|
-slimjet: slimjet (Chromium based web browser)
-slimjet:
-slimjet: Slimjet is built on top of the Chromium open-source project. It
-slimjet: enjoys the same speed and reliablity provided by the underlying blink
-slimjet: engine as Google Chrome. However, many additional features and options
-slimjet: have been added in Slimjet to make it more powerful, intelligent and
-slimjet: customizable than Chrome. In addition to that, Slimjet DOES NOT send
-slimjet: any usage statistics back to Google's server like Google Chrome.
-slimjet:
-slimjet: Homepage: https://www.slimjet.com
-slimjet:
diff --git a/network/slimjet/slimjet.SlackBuild b/network/slimjet/slimjet.SlackBuild
deleted file mode 100644
index d8a54b9fb9..0000000000
--- a/network/slimjet/slimjet.SlackBuild
+++ /dev/null
@@ -1,99 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for slimjet
-
-# Copyright 2017-2018 Skaendo <skaendo@linuxmail.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=slimjet
-VERSION=${VERSION:-20.0.4.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" ] || [ "$ARCH" = "i686" ]; then
-  SRCARCH=i386
-elif [ "$ARCH" = "x86_64" ]; then
-  SRCARCH=amd64
-else
-  echo "$ARCH is not supported."
-  exit 1
-fi
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM
-tar xvf $CWD/${PRGNAM}_${SRCARCH}.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 {} \;
-
-# Install Slimjet Into /opt
-mkdir -p $PKG/opt
-cp -vr ../slimjet $PKG/opt
-
-# Link Binary
-mkdir -p $PKG/usr/bin
-ln -s /opt/slimjet/flashpeak-slimjet $PKG/usr/bin/flashpeak-slimjet
-
-# Link Icons
-mkdir -p $PKG/usr/share/icons/hicolor/{48x48,128x128}/apps
-ln -s /opt/slimjet/product_logo_48.png \
-  $PKG/usr/share/icons/hicolor/48x48/apps/slimjet.png
-ln -s /opt/slimjet/product_logo_128.png \
-  $PKG/usr/share/icons/hicolor/128x128/apps/slimjet.png
-
-# Install .desktop File
-mkdir -p $PKG/usr/share/applications/apps
-cp $CWD/$PRGNAM.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
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a license.txt $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/README > $PKG/install/README
-cat $CWD/slack-desc > $PKG/install/slack-desc
-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/network/slimjet/slimjet.desktop b/network/slimjet/slimjet.desktop
deleted file mode 100644
index 49a73ad3d2..0000000000
--- a/network/slimjet/slimjet.desktop
+++ /dev/null
@@ -1,224 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Name=Slimjet Web Browser
-# Only KDE 4 seems to use GenericName, so we reuse the KDE strings.
-# From Ubuntu's language-pack-kde-XX-base packages, version 9.04-20090413.
-GenericName=Web Browser
-GenericName[ar]=متصفح الشبكة
-GenericName[bg]=Уеб браузър
-GenericName[ca]=Navegador web
-GenericName[cs]=WWW prohlížeč
-GenericName[da]=Browser
-GenericName[de]=Web-Browser
-GenericName[el]=Περιηγητής ιστού
-GenericName[en_GB]=Web Browser
-GenericName[es]=Navegador web
-GenericName[et]=Veebibrauser
-GenericName[fi]=WWW-selain
-GenericName[fr]=Navigateur Web
-GenericName[gu]=વેબ બ્રાઉઝર
-GenericName[he]=דפדפן אינטרנט
-GenericName[hi]=वेब ब्राउज़र
-GenericName[hu]=Webböngésző
-GenericName[it]=Browser Web
-GenericName[ja]=ウェブブラウザ
-GenericName[kn]=ಜಾಲ ವೀಕ್ಷಕ
-GenericName[ko]=웹 브라우저
-GenericName[lt]=Žiniatinklio naršyklė
-GenericName[lv]=Tīmekļa pārlūks
-GenericName[ml]=വെബ് ബ്രൌസര്‍
-GenericName[mr]=वेब ब्राऊजर
-GenericName[nb]=Nettleser
-GenericName[nl]=Webbrowser
-GenericName[pl]=Przeglądarka WWW
-GenericName[pt]=Navegador Web
-GenericName[pt_BR]=Navegador da Internet
-GenericName[ro]=Navigator de Internet
-GenericName[ru]=Веб-браузер
-GenericName[sl]=Spletni brskalnik
-GenericName[sv]=Webbläsare
-GenericName[ta]=இணைய உலாவி
-GenericName[th]=เว็บเบราว์เซอร์
-GenericName[tr]=Web Tarayıcı
-GenericName[uk]=Навігатор Тенет
-GenericName[zh_CN]=网页浏览器
-GenericName[zh_HK]=網頁瀏覽器
-GenericName[zh_TW]=網頁瀏覽器
-# Not translated in KDE, from Epiphany 2.26.1-0ubuntu1.
-GenericName[bn]=ওয়েব ব্রাউজার
-GenericName[fil]=Web Browser
-GenericName[hr]=Web preglednik
-GenericName[id]=Browser Web
-GenericName[or]=ଓ୍ବେବ ବ୍ରାଉଜର
-GenericName[sk]=WWW prehliadač
-GenericName[sr]=Интернет прегледник
-GenericName[te]=మహాతల అన్వేషి
-GenericName[vi]=Bộ duyệt Web
-# Gnome and KDE 3 uses Comment.
-Comment=Access the Internet
-Comment[ar]=الدخول إلى الإنترنت
-Comment[bg]=Достъп до интернет
-Comment[bn]=ইন্টারনেটটি অ্যাক্সেস করুন
-Comment[ca]=Accedeix a Internet
-Comment[cs]=Přístup k internetu
-Comment[da]=Få adgang til internettet
-Comment[de]=Internetzugriff
-Comment[el]=Πρόσβαση στο Διαδίκτυο
-Comment[en_GB]=Access the Internet
-Comment[es]=Accede a Internet.
-Comment[et]=Pääs Internetti
-Comment[fi]=Käytä internetiä
-Comment[fil]=I-access ang Internet
-Comment[fr]=Accéder à Internet
-Comment[gu]=ઇંટરનેટ ઍક્સેસ કરો
-Comment[he]=גישה אל האינטרנט
-Comment[hi]=इंटरनेट तक पहुंच स्थापित करें
-Comment[hr]=Pristup Internetu
-Comment[hu]=Internetelérés
-Comment[id]=Akses Internet
-Comment[it]=Accesso a Internet
-Comment[ja]=インターネットにアクセス
-Comment[kn]=ಇಂಟರ್ನೆಟ್ ಅನ್ನು ಪ್ರವೇಶಿಸಿ
-Comment[ko]=인터넷 연결
-Comment[lt]=Interneto prieiga
-Comment[lv]=Piekļūt internetam
-Comment[ml]=ഇന്റര്‍‌നെറ്റ് ആക്‌സസ് ചെയ്യുക
-Comment[mr]=इंटरनेटमध्ये प्रवेश करा
-Comment[nb]=Gå til Internett
-Comment[nl]=Verbinding maken met internet
-Comment[or]=ଇଣ୍ଟର୍ନେଟ୍ ପ୍ରବେଶ କରନ୍ତୁ
-Comment[pl]=Skorzystaj z internetu
-Comment[pt]=Aceder à Internet
-Comment[pt_BR]=Acessar a internet
-Comment[ro]=Accesaţi Internetul
-Comment[ru]=Доступ в Интернет
-Comment[sk]=Prístup do siete Internet
-Comment[sl]=Dostop do interneta
-Comment[sr]=Приступите Интернету
-Comment[sv]=Gå ut på Internet
-Comment[ta]=இணையத்தை அணுகுதல்
-Comment[te]=ఇంటర్నెట్‌ను ఆక్సెస్ చెయ్యండి
-Comment[th]=เข้าถึงอินเทอร์เน็ต
-Comment[tr]=İnternet'e erişin
-Comment[uk]=Доступ до Інтернету
-Comment[vi]=Truy cập Internet
-Comment[zh_CN]=访问互联网
-Comment[zh_HK]=連線到網際網路
-Comment[zh_TW]=連線到網際網路
-Exec=/usr/bin/flashpeak-slimjet %U
-Terminal=false
-Icon=slimjet
-Type=Application
-Categories=Network;WebBrowser;
-MimeType=text/html;text/xml;application/xhtml_xml;image/webp;x-scheme-handler/http;x-scheme-handler/https;x-scheme-handler/ftp;
-X-Ayatana-Desktop-Shortcuts=NewWindow;NewIncognito
-
-Name[en_US]=Slimjet Web Browser
-
-[X-NewWindow Shortcut Group]
-Name=New Window
-Name[am]=አዲስ መስኮት
-Name[ar]=نافذة جديدة
-Name[bg]=Нов прозорец
-Name[bn]=নতুন উইন্ডো
-Name[ca]=Finestra nova
-Name[cs]=Nové okno
-Name[da]=Nyt vindue
-Name[de]=Neues Fenster
-Name[el]=Νέο Παράθυρο
-Name[en_GB]=New Window
-Name[es]=Nueva ventana
-Name[et]=Uus aken
-Name[fa]=پنجره جدید
-Name[fi]=Uusi ikkuna
-Name[fil]=New Window
-Name[fr]=Nouvelle fenêtre
-Name[gu]=નવી વિંડો
-Name[hi]=नई विंडो
-Name[hr]=Novi prozor
-Name[hu]=Új ablak
-Name[id]=Jendela Baru
-Name[it]=Nuova finestra
-Name[iw]=חלון חדש
-Name[ja]=新規ウインドウ
-Name[kn]=ಹೊಸ ವಿಂಡೊ
-Name[ko]=새 창
-Name[lt]=Naujas langas
-Name[lv]=Jauns logs
-Name[ml]=പുതിയ വിന്‍ഡോ
-Name[mr]=नवीन विंडो
-Name[nl]=Nieuw venster
-Name[no]=Nytt vindu
-Name[pl]=Nowe okno
-Name[pt]=Nova janela
-Name[pt_BR]=Nova janela
-Name[ro]=Fereastră nouă
-Name[ru]=Новое окно
-Name[sk]=Nové okno
-Name[sl]=Novo okno
-Name[sr]=Нови прозор
-Name[sv]=Nytt fönster
-Name[sw]=Dirisha Jipya
-Name[ta]=புதிய சாளரம்
-Name[te]=క్రొత్త విండో
-Name[th]=หน้าต่างใหม่
-Name[tr]=Yeni Pencere
-Name[uk]=Нове вікно
-Name[vi]=Cửa sổ Mới
-Name[zh_CN]=新建窗口
-Name[zh_TW]=開新視窗
-Exec=/usr/bin/flashpeak-slimjet
-TargetEnvironment=Unity
-
-[X-NewIncognito Shortcut Group]
-Name=New Incognito Window
-Name[ar]=نافذة جديدة للتصفح المتخفي
-Name[bg]=Нов прозорец „инкогнито“
-Name[bn]=নতুন ছদ্মবেশী উইন্ডো
-Name[ca]=Finestra d'incògnit nova
-Name[cs]=Nové anonymní okno
-Name[da]=Nyt inkognitovindue
-Name[de]=Neues Inkognito-Fenster
-Name[el]=Νέο παράθυρο για ανώνυμη περιήγηση
-Name[en_GB]=New Incognito window
-Name[es]=Nueva ventana de incógnito
-Name[et]=Uus inkognito aken
-Name[fa]=پنجره جدید حالت ناشناس
-Name[fi]=Uusi incognito-ikkuna
-Name[fil]=Bagong Incognito window
-Name[fr]=Nouvelle fenêtre de navigation privée
-Name[gu]=નવી છુપી વિંડો
-Name[hi]=नई गुप्त विंडो
-Name[hr]=Novi anoniman prozor
-Name[hu]=Új Inkognitóablak
-Name[id]=Jendela Penyamaran baru
-Name[it]=Nuova finestra di navigazione in incognito
-Name[iw]=חלון חדש לגלישה בסתר
-Name[ja]=新しいシークレット ウィンドウ
-Name[kn]=ಹೊಸ ಅಜ್ಞಾತ ವಿಂಡೋ
-Name[ko]=새 시크릿 창
-Name[lt]=Naujas inkognito langas
-Name[lv]=Jauns inkognito režīma logs
-Name[ml]=പുതിയ വേഷ പ്രച്ഛന്ന വിന്‍ഡോ
-Name[mr]=नवीन गुप्त विंडो
-Name[nl]=Nieuw incognitovenster
-Name[no]=Nytt inkognitovindu
-Name[pl]=Nowe okno incognito
-Name[pt]=Nova janela de navegação anónima
-Name[pt_BR]=Nova janela anônima
-Name[ro]=Fereastră nouă incognito
-Name[ru]=Новое окно в режиме инкогнито
-Name[sk]=Nové okno inkognito
-Name[sl]=Novo okno brez beleženja zgodovine
-Name[sr]=Нови прозор за прегледање без архивирања
-Name[sv]=Nytt inkognitofönster
-Name[ta]=புதிய மறைநிலைச் சாளரம்
-Name[te]=క్రొత్త అజ్ఞాత విండో
-Name[th]=หน้าต่างใหม่ที่ไม่ระบุตัวตน
-Name[tr]=Yeni Gizli pencere
-Name[uk]=Нове вікно в режимі анонімного перегляду
-Name[vi]=Cửa sổ ẩn danh mới
-Name[zh_CN]=新建隐身窗口
-Name[zh_TW]=新增無痕式視窗
-Exec=/usr/bin/flashpeak-slimjet --incognito
-TargetEnvironment=Unity
diff --git a/network/slimjet/slimjet.info b/network/slimjet/slimjet.info
deleted file mode 100644
index 261e2ccb2d..0000000000
--- a/network/slimjet/slimjet.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="slimjet"
-VERSION="20.0.4.0"
-HOMEPAGE="https://www.slimjet.com"
-DOWNLOAD="https://www.slimjetbrowser.com/release/slimjet_i386.tar.xz"
-MD5SUM="3b0b2042246519befa6c3b5297a6d63e"
-DOWNLOAD_x86_64="https://www.slimjetbrowser.com/release/slimjet_amd64.tar.xz"
-MD5SUM_x86_64="7b1aa79545c3671488294f639cf600bc"
-REQUIRES=""
-MAINTAINER="Skaendo"
-EMAIL="skaendo@linuxmail.org"
diff --git a/network/slirp4netns/README b/network/slirp4netns/README
index 88d35cf3bf..2fe0582157 100644
--- a/network/slirp4netns/README
+++ b/network/slirp4netns/README
@@ -1,14 +1,14 @@
 slirp4netns
 
-slirp4netns provides user-mode networking ("slirp") for unprivileged network
-namespaces.
+slirp4netns provides user-mode networking ("slirp") for unprivileged
+network namespaces.
 
-Starting with Linux 3.8, unprivileged users can create network_namespaces(7)
-along with user_namespaces(7). However, unprivileged network namespaces had
-not been very useful, because creating veth(4) pairs across the host and
-network namespaces still requires the root privileges. (i.e. No internet
-connection)
+Starting with Linux 3.8, unprivileged users can create
+network_namespaces(7) along with user_namespaces(7). However,
+unprivileged network namespaces had not been very useful, because
+creating veth(4) pairs across the host and network namespaces still
+requires the root privileges. (i.e. No internet connection)
 
-slirp4netns allows connecting a network namespace to the Internet in a
-completely unprivileged way, by connecting a TAP device in a network namespace
-to the usermode TCP/IP stack ("slirp").
+slirp4netns allows connecting a network namespace to the Internet in
+a completely unprivileged way, by connecting a TAP device in a network
+namespace to the usermode TCP/IP stack ("slirp").
diff --git a/network/slirp4netns/slirp4netns.SlackBuild b/network/slirp4netns/slirp4netns.SlackBuild
index 7d4683b0a0..3ebb9aa588 100644
--- a/network/slirp4netns/slirp4netns.SlackBuild
+++ b/network/slirp4netns/slirp4netns.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for slirp4netns
 
@@ -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=slirp4netns
-VERSION=${VERSION:-0.2.0}
+VERSION=${VERSION:-1.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}
@@ -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/network/slirp4netns/slirp4netns.info b/network/slirp4netns/slirp4netns.info
index 0a13d4330b..93a68914d9 100644
--- a/network/slirp4netns/slirp4netns.info
+++ b/network/slirp4netns/slirp4netns.info
@@ -1,10 +1,10 @@
 PRGNAM="slirp4netns"
-VERSION="0.2.0"
+VERSION="1.2.2"
 HOMEPAGE="https://github.com/rootless-containers/slirp4netns"
-DOWNLOAD="https://github.com/rootless-containers/slirp4netns/archive/v0.2.0/slirp4netns-0.2.0.tar.gz"
-MD5SUM="ecf1f07df723ab04bc84d2d45251f407"
+DOWNLOAD="https://github.com/rootless-containers/slirp4netns/archive/v1.2.2/slirp4netns-1.2.2.tar.gz"
+MD5SUM="c18a686e1bd34042c08cc8861bcad869"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES=""
+REQUIRES="libslirp"
 MAINTAINER="Vincent Batts"
 EMAIL="vbatts@hashbangbash.com"
diff --git a/network/slowhttptest/README b/network/slowhttptest/README
index 61eaf15d50..95f408733a 100644
--- a/network/slowhttptest/README
+++ b/network/slowhttptest/README
@@ -1,15 +1,15 @@
 slowhttptest (stress testing tool/DoS simulator)
 
-SlowHTTPTest is a highly configurable tool that simulates some Application
-Layer Denial of Service attacks. It works on majority of Linux platforms,
-OSX and Cygwin - a Unix-like environment and command-line interface for
-Microsoft Windows.
+SlowHTTPTest is a highly configurable tool that simulates some
+Application Layer Denial of Service attacks. It works on majority
+of Linux platforms, OSX and Cygwin - a Unix-like environment and
+command-line interface for Microsoft Windows.
 
 It implements most common low-bandwidth Application Layer DoS attacks,
-such as slowloris, Slow HTTP POST, Slow Read attack (based on TCP persist
-timer exploit) by draining concurrent connections pool, as well as Apache
-Range Header attack by causing very significant memory and CPU usage on
-the server.
+such as slowloris, Slow HTTP POST, Slow Read attack (based on TCP
+persist timer exploit) by draining concurrent connections pool, as
+well as Apache Range Header attack by causing very significant memory
+and CPU usage on the server.
 
 Slowloris and Slow HTTP POST DoS attacks rely on the fact that the HTTP
 protocol, by design, requires requests to be completely received by the
@@ -27,7 +27,7 @@ and reads the response slowly.
 
 DISCLAIMER: Keep in mind that slowhttptest is of little use as a
 script kiddie tool. It cannot be pointed blindly at arbitrary targets,
-like e.g. LOIC.  Rather, where it excels is in its breadth of attack
+like e.g. LOIC. Rather, where it excels is in its breadth of attack
 options, high customizability and its in-depth analytics. As such, it
 will be mostly useful for server administrators trying to stress test
 their systems.
diff --git a/network/slowhttptest/slowhttptest.SlackBuild b/network/slowhttptest/slowhttptest.SlackBuild
index b9f4d61921..6975600d5d 100644
--- a/network/slowhttptest/slowhttptest.SlackBuild
+++ b/network/slowhttptest/slowhttptest.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for slowhttptest
 
@@ -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=slowhttptest
-VERSION=${VERSION:-1.7}
+VERSION=${VERSION:-1.8.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/network/slowhttptest/slowhttptest.info b/network/slowhttptest/slowhttptest.info
index afead4af3a..85f1a4b1b7 100644
--- a/network/slowhttptest/slowhttptest.info
+++ b/network/slowhttptest/slowhttptest.info
@@ -1,8 +1,8 @@
 PRGNAM="slowhttptest"
-VERSION="1.7"
+VERSION="1.8.2"
 HOMEPAGE="https://github.com/shekyan/slowhttptest"
-DOWNLOAD="https://github.com/shekyan/slowhttptest/archive/v1.7/slowhttptest-1.7.tar.gz"
-MD5SUM="2771a439c4f6d2a750fa884526dda58c"
+DOWNLOAD="https://github.com/shekyan/slowhttptest/archive/v1.8.2/slowhttptest-1.8.2.tar.gz"
+MD5SUM="561fc6ba1bc2ffc478b63d4a122b0486"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/network/slurm/README b/network/slurm/README
index d12ef6cdeb..df2c788c60 100644
--- a/network/slurm/README
+++ b/network/slurm/README
@@ -22,3 +22,6 @@ Optional dependencies:
 HWLOC=yes|no (default: no), requires hwloc
 RRDTOOL=yes|no (default: no), requires rrdtool
 NUMA auto-detected, requires numactl
+
+Warning for 32-bit users: according to slurm's developers: 32-bit
+support is deprecated, and not tested regularly. Use at your own risk.
diff --git a/network/slurm/slurm.SlackBuild b/network/slurm/slurm.SlackBuild
index e573c29192..00acbd481c 100644
--- a/network/slurm/slurm.SlackBuild
+++ b/network/slurm/slurm.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for Slurm
 
-# 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,13 +22,19 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20220320 bkw: Modified by SlackBuilds.org, BUILD=3:
+# - fix 32-bit build.
+# - do not install useless INSTALL in doc dir.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=slurm
-VERSION=${VERSION:-18.08.6_2}
-SRCVER=$(echo $VERSION | tr _ -)
+VERSION=${VERSION:-22.05.6}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
-DOCS="AUTHORS COPYING DISCLAIMER INSTALL LICENSE.OpenSSL \
+DOCS="AUTHORS COPYING DISCLAIMER LICENSE.OpenSSL \
       META NEWS README.rst RELEASE_NOTES"
 
 if [ -z "$ARCH" ]; then
@@ -39,17 +45,25 @@ 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}
 
+# 20220320 bkw: 32-bit is deprecated but may still work.
+DEPRECATED=""
 if [ "$ARCH" = "i586" ]; then
   SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
+  DEPRECATED="--enable-deprecated"
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
   LIBDIRSUFFIX=""
+  DEPRECATED="--enable-deprecated"
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
@@ -71,15 +85,15 @@ RRDTOOL_SUPPORT=""
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$SRCVER
-tar xvf $CWD/$PRGNAM-$SRCVER.tar.?z*
-cd $PRGNAM-$SRCVER
+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 \
+  -o -perm 511 \) -exec chmod 755 {} \+ -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" \
@@ -91,6 +105,7 @@ CXXFLAGS="$SLKCFLAGS" \
   --mandir=/usr/man \
   --sysconfdir=/etc \
   --enable-static=no \
+  $DEPRECATED \
   $HWLOC_SUPPORT \
   $RRDTOOL_SUPPORT \
   --build=$ARCH-slackware-linux \
@@ -116,9 +131,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/network/slurm/slurm.info b/network/slurm/slurm.info
index 06b2dd1a59..934e2ad78d 100644
--- a/network/slurm/slurm.info
+++ b/network/slurm/slurm.info
@@ -1,10 +1,10 @@
 PRGNAM="slurm"
-VERSION="18.08.6_2"
+VERSION="22.05.6"
 HOMEPAGE="https://slurm.schedmd.com/"
-DOWNLOAD="https://download.schedmd.com/slurm/slurm-18.08.6-2.tar.bz2"
-MD5SUM="ed25ac0613b6c6dc2490fa613a36c7ab"
+DOWNLOAD="https://download.schedmd.com/slurm/slurm-22.05.6.tar.bz2"
+MD5SUM="0405f2b68601c33b60362cbc0cbc5bc5"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="munge"
 MAINTAINER="Emmanuel N. Millan"
-EMAIL="emmanueln[at]gmail[dot]com"
+EMAIL="emmanueln@gmail.com"
diff --git a/network/smb4k/README b/network/smb4k/README
deleted file mode 100644
index a47fd61932..0000000000
--- a/network/smb4k/README
+++ /dev/null
@@ -1,3 +0,0 @@
-Smb4K is an advanced network neighborhood browser for KDE and a frontend
-to the programs of the Samba software suite.  Its purpose is to provide
-a program that's easy to use and has as many features as possible.
diff --git a/network/smb4k/doinst.sh b/network/smb4k/doinst.sh
deleted file mode 100644
index a48fbcfa98..0000000000
--- a/network/smb4k/doinst.sh
+++ /dev/null
@@ -1,30 +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/dbus-1/system.d/net.sourceforge.smb4k.mounthelper.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
-
-# Reload messagebus service
-if [ -x etc/rc.d/rc.messagebus ]; then
-  chroot . /etc/rc.d/rc.messagebus reload
-fi
-
diff --git a/network/smb4k/find_mount_umount.patch b/network/smb4k/find_mount_umount.patch
deleted file mode 100644
index 35151180d7..0000000000
--- a/network/smb4k/find_mount_umount.patch
+++ /dev/null
@@ -1,366 +0,0 @@
-From 71554140bdaede27b95dbe4c9b5a028a83c83cce Mon Sep 17 00:00:00 2001
-From: Alexander Reinholdt <alexander.reinholdt@kdemail.net>
-Date: Wed, 10 May 2017 10:23:34 +0200
-Subject: Find the mount/umount commands in the helper
-
-Instead of trusting what we get passed in
-CVE-2017-8849
----
- core/smb4kglobal.cpp         | 65 +++++++++++++++++++++++++++++++++++-
- core/smb4kglobal.h           | 16 ++++++++-
- core/smb4kmounter_p.cpp      | 78 ++++----------------------------------------
- helpers/CMakeLists.txt       |  6 +++-
- helpers/smb4kmounthelper.cpp | 51 +++++++++++++++++++++++++++--
- 5 files changed, 139 insertions(+), 77 deletions(-)
-
-diff --git a/core/smb4kglobal.cpp b/core/smb4kglobal.cpp
-index 172016f..818a78a 100644
---- a/core/smb4kglobal.cpp
-+++ b/core/smb4kglobal.cpp
-@@ -2,7 +2,7 @@
-     smb4kglobal  -  This is the global namespace for Smb4K.
-                              -------------------
-     begin                : Sa Apr 2 2005
--    copyright            : (C) 2005-2014 by Alexander Reinholdt
-+    copyright            : (C) 2005-2017 by Alexander Reinholdt
-     email                : alexander.reinholdt@kdemail.net
-  ***************************************************************************/
- 
-@@ -851,3 +851,66 @@ QStringList Smb4KGlobal::whitelistedMountArguments()
- #endif
- 
- 
-+const QString Smb4KGlobal::findMountExecutable()
-+{
-+  QString mount;
-+  QStringList paths;
-+  paths << "/bin";
-+  paths << "/sbin";
-+  paths << "/usr/bin";
-+  paths << "/usr/sbin";
-+  paths << "/usr/local/bin";
-+  paths << "/usr/local/sbin";
-+
-+  for (int i = 0; i < paths.size(); ++i)
-+  {
-+#if defined(Q_OS_LINUX)
-+    mount = KGlobal::dirs()->findExe("mount.cifs", paths.at(i));
-+#elif defined(Q_OS_FREEBSD) || defined(Q_OS_NETBSD)
-+    mount = KGlobal::dirs()->findExe("mount_smbfs", paths.at(i));
-+#endif
-+
-+    if (!mount.isEmpty())
-+    {
-+      break;
-+    }
-+    else
-+    {
-+      continue;
-+    }
-+  }
-+  
-+  return mount;
-+}
-+
-+
-+const QString Smb4KGlobal::findUmountExecutable()
-+{
-+  // Find the umount program.
-+  QString umount;
-+  QStringList paths;
-+  paths << "/bin";
-+  paths << "/sbin";
-+  paths << "/usr/bin";
-+  paths << "/usr/sbin";
-+  paths << "/usr/local/bin";
-+  paths << "/usr/local/sbin";
-+
-+  for ( int i = 0; i < paths.size(); ++i )
-+  {
-+    umount = KGlobal::dirs()->findExe("umount", paths.at(i));
-+
-+    if (!umount.isEmpty())
-+    {
-+      break;
-+    }
-+    else
-+    {
-+      continue;
-+    }
-+  }
-+  
-+  return umount;
-+}
-+
-+
-diff --git a/core/smb4kglobal.h b/core/smb4kglobal.h
-index db1805b..0ef377d 100644
---- a/core/smb4kglobal.h
-+++ b/core/smb4kglobal.h
-@@ -2,7 +2,7 @@
-     smb4kglobal  -  This is the global namespace for Smb4K.
-                              -------------------
-     begin                : Sa Apr 2 2005
--    copyright            : (C) 2005-2014 by Alexander Reinholdt
-+    copyright            : (C) 2005-2017 by Alexander Reinholdt
-     email                : alexander.reinholdt@kdemail.net
-  ***************************************************************************/
- 
-@@ -455,6 +455,20 @@ namespace Smb4KGlobal
-    */
-   KDE_EXPORT QStringList whitelistedMountArguments();
- #endif
-+  
-+  /**
-+   * Find the mount executable on the system.
-+   * 
-+   * @returns the path of the mount executable.
-+   */
-+  KDE_EXPORT const QString findMountExecutable();
-+  
-+  /**
-+   * Find the umount executable on the system.
-+   * 
-+   * @returns the path of the umount executable.
-+   */
-+  KDE_EXPORT const QString findUmountExecutable();
- };
- 
- #endif
-diff --git a/core/smb4kmounter_p.cpp b/core/smb4kmounter_p.cpp
-index 63a87ed..342052a 100644
---- a/core/smb4kmounter_p.cpp
-+++ b/core/smb4kmounter_p.cpp
-@@ -207,30 +207,7 @@ bool Smb4KMountJob::createMountAction(Smb4KShare *share, Action *action)
- //
- bool Smb4KMountJob::fillArgs(Smb4KShare *share, QMap<QString, QVariant>& map)
- {
--  // Find the mount program.
--  QString mount;
--  QStringList paths;
--  paths << "/bin";
--  paths << "/sbin";
--  paths << "/usr/bin";
--  paths << "/usr/sbin";
--  paths << "/usr/local/bin";
--  paths << "/usr/local/sbin";
--
--  for (int i = 0; i < paths.size(); ++i)
--  {
--    mount = KGlobal::dirs()->findExe("mount.cifs", paths.at(i));
--
--    if (!mount.isEmpty())
--    {
--      map.insert("mh_command", mount);
--      break;
--    }
--    else
--    {
--      continue;
--    }
--  }
-+  const QString mount = findMountExecutable();
- 
-   if (mount.isEmpty())
-   {
-@@ -242,6 +219,8 @@ bool Smb4KMountJob::fillArgs(Smb4KShare *share, QMap<QString, QVariant>& map)
-     // Do nothing
-   }
-   
-+  map.insert("mh_command", mount);
-+  
-   // Mount arguments.
-   QMap<QString, QString> global_options = globalSambaOptions();
-   Smb4KCustomOptions *options  = Smb4KCustomOptionsManager::self()->findOptions(share);
-@@ -729,30 +708,7 @@ bool Smb4KMountJob::fillArgs(Smb4KShare *share, QMap<QString, QVariant>& map)
- //
- bool Smb4KMountJob::fillArgs(Smb4KShare *share, QMap<QString, QVariant>& map)
- {
--  // Find the mount program.
--  QString mount;
--  QStringList paths;
--  paths << "/bin";
--  paths << "/sbin";
--  paths << "/usr/bin";
--  paths << "/usr/sbin";
--  paths << "/usr/local/bin";
--  paths << "/usr/local/sbin";
--
--  for (int i = 0; i < paths.size(); ++i)
--  {
--    mount = KGlobal::dirs()->findExe("mount_smbfs", paths.at(i));
--
--    if (!mount.isEmpty())
--    {
--      map.insert("mh_command", mount);
--      break;
--    }
--    else
--    {
--      continue;
--    }
--  }
-+  const QString mount = findMountExecutable();
- 
-   if (mount.isEmpty())
-   {
-@@ -764,6 +720,8 @@ bool Smb4KMountJob::fillArgs(Smb4KShare *share, QMap<QString, QVariant>& map)
-     // Do nothing
-   }
-   
-+  map.insert("mh_command", mount);
-+  
-   // Mount arguments.
-   QMap<QString, QString> global_options = globalSambaOptions();
-   Smb4KCustomOptions *options  = Smb4KCustomOptionsManager::self()->findOptions(share);
-@@ -1253,29 +1211,7 @@ bool Smb4KUnmountJob::createUnmountAction(Smb4KShare *share, Action *action)
-     // Do nothing
-   }
-   
--  // Find the umount program.
--  QString umount;
--  QStringList paths;
--  paths << "/bin";
--  paths << "/sbin";
--  paths << "/usr/bin";
--  paths << "/usr/sbin";
--  paths << "/usr/local/bin";
--  paths << "/usr/local/sbin";
--
--  for ( int i = 0; i < paths.size(); ++i )
--  {
--    umount = KGlobal::dirs()->findExe("umount", paths.at(i));
--
--    if (!umount.isEmpty())
--    {
--      break;
--    }
--    else
--    {
--      continue;
--    }
--  }
-+  const QString umount = findUmountExecutable();
- 
-   if (umount.isEmpty() && !m_silent)
-   {
-diff --git a/helpers/CMakeLists.txt b/helpers/CMakeLists.txt
-index e9e670b..cd4228d 100644
---- a/helpers/CMakeLists.txt
-+++ b/helpers/CMakeLists.txt
-@@ -1,7 +1,11 @@
-+include_directories(
-+  ${CMAKE_SOURCE_DIR}/core
-+  ${CMAKE_BINARY_DIR}/core )
-+
- set( smb4kmounthelper_SRCS smb4kmounthelper.cpp )
- 
- kde4_add_executable( mounthelper ${smb4kmounthelper_SRCS} )
--target_link_libraries( mounthelper ${KDE4_KDECORE_LIBS} ${KDE4_KIO_LIBS} )
-+target_link_libraries( mounthelper smb4kcore ${KDE4_KDECORE_LIBS} ${KDE4_KIO_LIBS} )
- install( TARGETS mounthelper DESTINATION ${LIBEXEC_INSTALL_DIR} )
- 
- kde4_install_auth_helper_files( mounthelper net.sourceforge.smb4k.mounthelper root )
-diff --git a/helpers/smb4kmounthelper.cpp b/helpers/smb4kmounthelper.cpp
-index a2f2fed..7959020 100644
---- a/helpers/smb4kmounthelper.cpp
-+++ b/helpers/smb4kmounthelper.cpp
-@@ -29,6 +29,7 @@
- 
- // application specific includes
- #include "smb4kmounthelper.h"
-+#include "core/smb4kglobal.h"
- 
- // Qt includes
- #include <QProcessEnvironment>
-@@ -43,12 +44,35 @@
- #include <kmountpoint.h>
- #include <kurl.h>
- 
-+using namespace Smb4KGlobal;
-+
- KDE4_AUTH_HELPER_MAIN( "net.sourceforge.smb4k.mounthelper", Smb4KMountHelper )
- 
- 
- ActionReply Smb4KMountHelper::mount(const QVariantMap &args)
- {
-   ActionReply reply;
-+  
-+  //
-+  // Get the mount executable
-+  //
-+  const QString mount = findMountExecutable();
-+  
-+  //
-+  // Check the executable
-+  //
-+  if (mount != args["mh_command"].toString())
-+  {
-+    // Something weird is going on, bail out.
-+    reply.setErrorCode(ActionReply::HelperError);
-+    reply.setErrorDescription(i18n("Wrong executable passed. Bailing out."));
-+    return reply;
-+  }
-+  else
-+  {
-+    // Do nothing
-+  }
-+  
-   // The mountpoint is a unique and can be used to
-   // find the share.
-   reply.addData("mh_mountpoint", args["mh_mountpoint"]);
-@@ -75,12 +99,12 @@ ActionReply Smb4KMountHelper::mount(const QVariantMap &args)
-   // Set the mount command here.
-   QStringList command;
- #if defined(Q_OS_LINUX)
--  command << args["mh_command"].toString();
-+  command << mount;
-   command << args["mh_unc"].toString();
-   command << args["mh_mountpoint"].toString();
-   command << args["mh_options"].toStringList();
- #elif defined(Q_OS_FREEBSD) || defined(Q_OS_NETBSD)
--  command << args["mh_command"].toString();
-+  command << mount;
-   command << args["mh_options"].toStringList();
-   command << args["mh_unc"].toString();
-   command << args["mh_mountpoint"].toString();
-@@ -161,6 +185,27 @@ ActionReply Smb4KMountHelper::mount(const QVariantMap &args)
- ActionReply Smb4KMountHelper::unmount(const QVariantMap &args)
- {
-   ActionReply reply;
-+  
-+  //
-+  // Get the umount executable
-+  //
-+  const QString umount = findUmountExecutable();
-+  
-+  //
-+  // Check the executable
-+  //
-+  if (umount != args["mh_command"].toString())
-+  {
-+    // Something weird is going on, bail out.
-+    reply.setErrorCode(ActionReply::HelperError);
-+    reply.setErrorDescription(i18n("Wrong executable passed. Bailing out."));
-+    return reply;
-+  }
-+  else
-+  {
-+    // Do nothing
-+  }
-+  
-   // The mountpoint is a unique and can be used to
-   // find the share.
-   reply.addData("mh_mountpoint", args["mh_mountpoint"]);
-@@ -208,7 +253,7 @@ ActionReply Smb4KMountHelper::unmount(const QVariantMap &args)
-   
-   // Set the umount command here.
-   QStringList command;
--  command << args["mh_command"].toString();
-+  command << umount;
-   command << args["mh_options"].toStringList();
-   command << args["mh_mountpoint"].toString();
- 
--- 
-cgit v0.11.2
-
diff --git a/network/smb4k/slack-desc b/network/smb4k/slack-desc
deleted file mode 100644
index 392f44fb1d..0000000000
--- a/network/smb4k/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------------------------------------------------------|
-smb4k: smb4k (A SMB Share Browser)
-smb4k:
-smb4k: Smb4K is an advanced network neighborhood browser for KDE and a
-smb4k: frontend to the programs of the Samba software suite. Its purpose is
-smb4k: to provide a program that's easy to use and has as many features as
-smb4k: possible.
-smb4k:
-smb4k: Homepage: http://smb4k.sourceforge.net/
-smb4k:
-smb4k:
-smb4k:
diff --git a/network/smb4k/smb4k.SlackBuild b/network/smb4k/smb4k.SlackBuild
deleted file mode 100644
index 03be76ba73..0000000000
--- a/network/smb4k/smb4k.SlackBuild
+++ /dev/null
@@ -1,108 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for smb4k
-
-# Copyright 2008-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.
-
-PRGNAM=smb4k
-VERSION=${VERSION:-1.2.3}
-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.?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 {} \;
-
-# Fix for CVE-2017-8849
-patch -p1 < $CWD/find_mount_umount.patch
-
-mkdir build
-cd build
-  cmake \
-    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
-    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DMAN_INSTALL_DIR=/usr/man \
-    -DSYSCONF_INSTALL_DIR=/etc \
-    -DLIB_SUFFIX=${LIBDIRSUFFIX} \
-    ..
-  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/etc/dbus-1/system.d/net.sourceforge.smb4k.mounthelper.conf \
-  $PKG/etc/dbus-1/system.d/net.sourceforge.smb4k.mounthelper.conf.new
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
-  AUTHORS BUGS 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/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/network/smb4k/smb4k.info b/network/smb4k/smb4k.info
deleted file mode 100644
index 4b77a2b7e8..0000000000
--- a/network/smb4k/smb4k.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="smb4k"
-VERSION="1.2.3"
-HOMEPAGE="http://smb4k.sourceforge.net/"
-DOWNLOAD="http://downloads.sourceforge.net/smb4k/smb4k-1.2.3.tar.xz"
-MD5SUM="1f4723a7891e41a5d86397765c6863d4"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="nobody"
-EMAIL="nobody@nowhere"
diff --git a/network/smcroute/README b/network/smcroute/README
index 310894fe2a..0ff354f29c 100644
--- a/network/smcroute/README
+++ b/network/smcroute/README
@@ -1,6 +1,7 @@
 SMCRoute (Static Multicast Routing Daemon)
 
 SMCRoute is a daemon and command line tool to manipulate the multicast
-routing table in a UNIX kernel. It can be used as an alternative to dynamic
-multicast routers like mrouted or pimd in situations where (only) static
-multicast routes should be maintained and/or no proper IGMP signaling exists.
+routing table in a UNIX kernel. It can be used as an alternative to
+dynamic multicast routers like mrouted or pimd in situations where
+(only) static multicast routes should be maintained and/or no proper
+IGMP signaling exists.
diff --git a/network/smcroute/smcroute.SlackBuild b/network/smcroute/smcroute.SlackBuild
index a398932fe4..4968f5fd6e 100644
--- a/network/smcroute/smcroute.SlackBuild
+++ b/network/smcroute/smcroute.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for SMCRoute
 
@@ -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=smcroute
 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}
@@ -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/network/smstools3/destdir.patch b/network/smstools3/destdir.patch
new file mode 100644
index 0000000000..0cdf272b1f
--- /dev/null
+++ b/network/smstools3/destdir.patch
@@ -0,0 +1,97 @@
+diff -Naur a/Makefile b/Makefile
+--- a/Makefile	2007-04-22 11:42:22.000000000 +0000
++++ b/Makefile	2021-04-20 22:48:57.084918445 +0000
+@@ -2,7 +2,7 @@
+ 
+ # If you change destination of executables, remember to change
+ # startup script (init.d/sms3) too.
+-BINDIR=/usr/local/bin
++BINDIR=/usr/bin
+ 
+ VERSION=$(shell grep package_version src/version.h | cut -f2)
+ 
+diff -Naur a/install.sh b/install.sh
+--- a/install.sh	2007-04-22 11:43:17.000000000 +0000
++++ b/install.sh	2021-04-20 23:01:28.251300300 +0000
+@@ -64,7 +64,7 @@
+     echo "  Skipped $1, directory already exists"
+   else
+     echo "  Creating directory $1"
+-    mkdir $1
++    mkdir -p $1
+   fi
+ }
+ 
+@@ -79,43 +79,28 @@
+ if [ -f src/smsd.exe ]; then
+   forcecopy src/smsd.exe $BINDIR/smsd.exe
+ else
+-  forcecopy src/smsd $BINDIR/smsd
++  makedir $DESTDIR/$BINDIR
++  forcecopy src/smsd $DESTDIR/$BINDIR/smsd
+ fi
+-delete $BINDIR/getsms
+-delete $BINDIR/putsms
+ 
+ echo "Installing some scripts"
+-copy scripts/sendsms $BINDIR/sendsms
+-copy scripts/sms2html $BINDIR/sms2html
+-copy scripts/sms2unicode $BINDIR/sms2unicode
+-copy scripts/unicode2sms $BINDIR/unicode2sms
+-
+-echo "Installing config file"
+-copy examples/smsd.conf.easy /etc/smsd.conf
++copy scripts/sendsms $DESTDIR/$BINDIR/sendsms
++copy scripts/sms2html $DESTDIR/$BINDIR/sms2html
++copy scripts/sms2unicode $DESTDIR/$BINDIR/sms2unicode
++copy scripts/unicode2sms $DESTDIR/$BINDIR/unicode2sms
+ 
+ echo "Creating minimum spool directories"
+-makedir /var/spool
+-makedir /var/spool/sms
+-makedir /var/spool/sms/incoming
+-makedir /var/spool/sms/outgoing
+-makedir /var/spool/sms/checked
++makedir $DESTDIR/var/spool
++makedir $DESTDIR/var/spool/sms
++makedir $DESTDIR/var/spool/sms/incoming
++makedir $DESTDIR/var/spool/sms/outgoing
++makedir $DESTDIR/var/spool/sms/checked
+ 
+ echo "Installing start-script"
+-SMS3SCRIPT=scripts/sms3
+-if [ -d /etc/init.d ]; then
+-  copy scripts/sms3 /etc/init.d/sms3
+-  SMS3SCRIPT=/etc/init.d/sms3
+-elif [ -d /sbin/init.d ]; then
+-  copy scripts/sms3 /sbin/init.d/sms3
+-  SMS3SCRIPT=/sbin/init.d/sms3
+-else
+-  echo "  I do not know where to copy scripts/sms3. Please find out yourself."
+-fi
++makedir $DESTDIR/etc/rc.d
++copy scripts/sms3 $DESTDIR/etc/rc.d/rc.sms3.new
++SMS3SCRIPT=/etc/rc.d/rc.sms3
+ 
+ echo ""
+ echo "Example script files are not installed automatically."
+ echo 'Please dont forget to edit /etc/smsd.conf.'
+-if [ "$BINDIR" != "/usr/local/bin" ]; then
+-  echo "You have installed executables to $BINDIR,"
+-  echo "you should manually edit $SMS3SCRIPT script."
+-fi
+diff -Naur a/scripts/sms3 b/scripts/sms3
+--- a/scripts/sms3	2010-05-04 09:21:44.000000000 +0000
++++ b/scripts/sms3	2021-04-20 22:48:57.084918445 +0000
+@@ -24,9 +24,9 @@
+ # Logfile can also be defined in here:
+ LOGFILE="/var/log/smsd.log"
+ 
+-DAEMON=/usr/local/bin/smsd
++DAEMON=/usr/bin/smsd
+ # A program which turns power off for couple of seconds:
+-RESETMODEMS=/usr/local/bin/smsd_resetmodems
++RESETMODEMS=/usr/bin/smsd_resetmodems
+ NAME=smsd
+ PSOPT="-e"
+ ECHO=echo
diff --git a/network/smstools3/doinst.sh b/network/smstools3/doinst.sh
index 859238d1ce..003aac27e2 100644
--- a/network/smstools3/doinst.sh
+++ b/network/smstools3/doinst.sh
@@ -23,6 +23,3 @@ preserve_perms() {
 }
 
 preserve_perms etc/rc.d/rc.sms3.new
-#chgrp -R dialout /var/spool/sms
-#chmod -R g+rw /var/spool/sms
-
diff --git a/network/smstools3/fixups2.diff b/network/smstools3/fixups2.diff
deleted file mode 100644
index d99ee9deee..0000000000
--- a/network/smstools3/fixups2.diff
+++ /dev/null
@@ -1,132 +0,0 @@
-diff -Naur a/Makefile b/Makefile
---- a/Makefile	2007-04-22 11:42:22.000000000 +0000
-+++ b/Makefile	2017-08-10 22:14:15.011099622 +0000
-@@ -2,7 +2,7 @@
- 
- # If you change destination of executables, remember to change
- # startup script (init.d/sms3) too.
--BINDIR=/usr/local/bin
-+BINDIR=/usr/bin
- 
- VERSION=$(shell grep package_version src/version.h | cut -f2)
- 
-diff -Naur a/install.sh b/install.sh
---- a/install.sh	2007-04-22 11:43:17.000000000 +0000
-+++ b/install.sh	2017-08-10 22:18:11.561100240 +0000
-@@ -3,9 +3,11 @@
- 
- BINDIR=$1
- if [ -z "$BINDIR" ]; then
--  BINDIR=/usr/local/bin
-+  BINDIR=/usr/bin
- fi
- 
-+SBINDIR=/usr/sbin
-+
- makepath()
- {
-   p="$1"
-@@ -33,10 +35,10 @@
- {
-   if [ -f $2 ]; then
-     echo "  Skipped $2, file already exists"
--  else  
-+  else
-     echo "  $2"
-     cp $1 $2
--  fi        
-+  fi
- }
- 
- forcecopy()
-@@ -64,58 +66,39 @@
-     echo "  Skipped $1, directory already exists"
-   else
-     echo "  Creating directory $1"
--    mkdir $1
-+    mkdir -p $1
-   fi
- }
- 
- echo ""
--if [ ! -f src/smsd ] && [ ! -f src/smsd.exe ]; then 
-+if [ ! -f src/smsd ] && [ ! -f src/smsd.exe ]; then
-   echo 'Please run "make -s install" instead.'
-   exit 1
- fi
- 
- echo "Installing binary program files"
--makepath $BINDIR
--if [ -f src/smsd.exe ]; then
--  forcecopy src/smsd.exe $BINDIR/smsd.exe
--else
--  forcecopy src/smsd $BINDIR/smsd
--fi
--delete $BINDIR/getsms
--delete $BINDIR/putsms
-+mkdir -p $DESTDIR/$BINDIR
-+mkdir -p $DESTDIR/$SBINDIR
-+forcecopy src/smsd $DESTDIR/$SBINDIR/smsd
- 
- echo "Installing some scripts"
--copy scripts/sendsms $BINDIR/sendsms
--copy scripts/sms2html $BINDIR/sms2html
--copy scripts/sms2unicode $BINDIR/sms2unicode
--copy scripts/unicode2sms $BINDIR/unicode2sms
--
--echo "Installing config file"
--copy examples/smsd.conf.easy /etc/smsd.conf
-+copy scripts/sendsms $DESTDIR/$BINDIR/sendsms
-+copy scripts/sms2html $DESTDIR/$BINDIR/sms2html
-+copy scripts/sms2unicode $DESTDIR/$BINDIR/sms2unicode
-+copy scripts/unicode2sms $DESTDIR/$BINDIR/unicode2sms
- 
- echo "Creating minimum spool directories"
--makedir /var/spool
--makedir /var/spool/sms
--makedir /var/spool/sms/incoming
--makedir /var/spool/sms/outgoing
--makedir /var/spool/sms/checked
-+makedir $DESTDIR/var/spool
-+makedir $DESTDIR/var/spool/sms
-+makedir $DESTDIR/var/spool/sms/incoming
-+makedir $DESTDIR/var/spool/sms/outgoing
-+makedir $DESTDIR/var/spool/sms/checked
- 
- echo "Installing start-script"
--SMS3SCRIPT=scripts/sms3
--if [ -d /etc/init.d ]; then
--  copy scripts/sms3 /etc/init.d/sms3
--  SMS3SCRIPT=/etc/init.d/sms3
--elif [ -d /sbin/init.d ]; then
--  copy scripts/sms3 /sbin/init.d/sms3
--  SMS3SCRIPT=/sbin/init.d/sms3
--else
--  echo "  I do not know where to copy scripts/sms3. Please find out yourself."
--fi
-+makedir $DESTDIR/etc/rc.d
-+copy scripts/sms3 $DESTDIR/etc/rc.d/rc.sms3.new
-+SMS3SCRIPT=/etc/rc.d/rc.sms3
- 
- echo ""
- echo "Example script files are not installed automatically."
- echo 'Please dont forget to edit /etc/smsd.conf.'
--if [ "$BINDIR" != "/usr/local/bin" ]; then
--  echo "You have installed executables to $BINDIR,"
--  echo "you should manually edit $SMS3SCRIPT script."
--fi
-diff -Naur a/scripts/sms3 b/scripts/sms3
---- a/scripts/sms3	2010-05-04 09:21:44.000000000 +0000
-+++ b/scripts/sms3	2017-08-10 21:58:41.968097184 +0000
-@@ -24,9 +24,9 @@
- # Logfile can also be defined in here:
- LOGFILE="/var/log/smsd.log"
- 
--DAEMON=/usr/local/bin/smsd
-+DAEMON=/usr/sbin/smsd
- # A program which turns power off for couple of seconds:
--RESETMODEMS=/usr/local/bin/smsd_resetmodems
-+RESETMODEMS=/usr/bin/smsd_resetmodems
- NAME=smsd
- PSOPT="-e"
- ECHO=echo
diff --git a/network/smstools3/smstools3.SlackBuild b/network/smstools3/smstools3.SlackBuild
index 4936906f92..fa45699844 100644
--- a/network/smstools3/smstools3.SlackBuild
+++ b/network/smstools3/smstools3.SlackBuild
@@ -1,7 +1,7 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for smstools3
-# Copyright 2010  David Woodfall <dave@dawoodfall.net>
+# Copyright 2010  David Woodfall <dave@slackbuilds.org>
 # 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=smstools3
 VERSION=${VERSION:-3.1.21}
 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}
@@ -68,9 +78,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 {} \;
 
-patch --verbose -p1 < $CWD/fixups2.diff
+patch --verbose -p1 <$CWD/destdir.patch
 
-DESTDIR=$PKG make install
+LFLAGS="-z muldefs" \
+CFLAGS="$SLKCFLAGS" \
+DESTDIR=$PKG \
+BINDIR=$PKG/usr/bin \
+  make install
 
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
@@ -95,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/network/smstools3/smstools3.info b/network/smstools3/smstools3.info
index 2b93193511..08cdb6da0a 100644
--- a/network/smstools3/smstools3.info
+++ b/network/smstools3/smstools3.info
@@ -6,5 +6,5 @@ MD5SUM="6a9f038fb38a49cc3a4f8f14a88fb8af"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="David Woodfall"
-EMAIL="dave@dawoodfall.net"
+MAINTAINER="D Woodfall"
+EMAIL="dave@slackbuilds.org"
diff --git a/network/smuxi/README b/network/smuxi/README
deleted file mode 100644
index 1c7d0c11a8..0000000000
--- a/network/smuxi/README
+++ /dev/null
@@ -1,7 +0,0 @@
-Smuxi is an open-source, powerful, flexible, and user-friendly chat client
-created by Mirco Bauer and developed by other contributors.
-Inspired by the combination of screen and irssi,
-Smuxi has a detachable server (or like a "normal" client)
-that stays connected when you aren't, and can allow multiple Smuxi frontends
-like the GNOME frontend, or STFL text-based frontend) to be connected and in sync.
-This is similar to screen+irssi or IRC bouncers, but more elegant and powerful.
diff --git a/network/smuxi/slack-desc b/network/smuxi/slack-desc
deleted file mode 100644
index cb05c114c1..0000000000
--- a/network/smuxi/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------------------------------------------------------|
-smuxi: smuxi (chat client)
-smuxi:
-smuxi: Smuxi is an open-source, powerful, flexible, and user-friendly chat
-smuxi: client created by Mirco Bauer and developed by other contributors.
-smuxi: Inspired by the combination of screen and irssi
-smuxi:
-smuxi: Homepage: https://smuxi.im/
-smuxi:
-smuxi:
-smuxi:
-smuxi:
diff --git a/network/smuxi/smuxi.SlackBuild b/network/smuxi/smuxi.SlackBuild
deleted file mode 100644
index 063f97e9fd..0000000000
--- a/network/smuxi/smuxi.SlackBuild
+++ /dev/null
@@ -1,99 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for smuxi
-
-# Written by James Axl <axlrose112@gmail.com>
-
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (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=smuxi
-VERSION=${VERSION:-1.0.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
-mkdir $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 \
-  --sysconfdir=/etc \
-  --localstatedir=/var \
-  --mandir=/usr/man \
-  --docdir=/usr/doc/$PRGNAM-$VERSION \
-  --build=$ARCH-slackware-linux
-
-make
-make install DESTDIR=$PKG
-
-mkdir mkdir -p $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 {} \;
-for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-
-cp -a BUGS CREDITS FEATURES HACKING LICENSE PROFILING README.md \
-  TODO $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/network/smuxi/smuxi.info b/network/smuxi/smuxi.info
deleted file mode 100644
index 00f181f260..0000000000
--- a/network/smuxi/smuxi.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="smuxi"
-VERSION="1.0.5"
-HOMEPAGE="https://smuxi.im/"
-DOWNLOAD="https://smuxi.im/jaws/data/files/smuxi-1.0.5.tar.gz"
-MD5SUM="af1a0c7d4a60f97063aa119531942fd1"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="stfl log4net nini gtk-sharp dbus-sharp-glib"
-MAINTAINER="jamesaxl"
-EMAIL="axlrose112@gmail.com"
diff --git a/network/sngrep/README b/network/sngrep/README
new file mode 100644
index 0000000000..512a002652
--- /dev/null
+++ b/network/sngrep/README
@@ -0,0 +1,17 @@
+sngrep is a tool for displaying SIP calls message flows from terminal.
+
+It supports live capture to display realtime SIP packets and can also 
+be used as PCAP viewer.
+
+The following options are available for compilation:
+
+ENABLE_IPV6: Default is yes, adds IPv6 support.  Setting this
+  variable to any value other than yes will disable IPv6 support.
+
+OPENSSL_TLS: Default is yes, uses OpenSSL for TLS support.  Setting
+  this variable to any value other than yes results in gnutls being
+  used instead for TLS support.
+
+PCRE2: Default is yes, uses pcre2 for regex support.  Setting this
+  variable to any value other than yes results in the use of pcre
+  instead for regex support.
diff --git a/network/sngrep/slack-desc b/network/sngrep/slack-desc
new file mode 100644
index 0000000000..417def5b76
--- /dev/null
+++ b/network/sngrep/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+      |-----handy-ruler------------------------------------------------------|
+sngrep: sngrep (SIP analysis tool)
+sngrep:
+sngrep: sngrep is a tool for displaying SIP calls message flows from
+sngrep: terminal.
+sngrep:
+sngrep: It supports live capture to display realtime SIP packets and can
+sngrep: also be used as PCAP viewer.
+sngrep:
+sngrep:
+sngrep:
+sngrep:
diff --git a/network/sngrep/sngrep.SlackBuild b/network/sngrep/sngrep.SlackBuild
new file mode 100644
index 0000000000..c03bab7796
--- /dev/null
+++ b/network/sngrep/sngrep.SlackBuild
@@ -0,0 +1,135 @@
+#!/bin/bash
+
+# Slackware build script for sngrep
+
+# Copyright 2023 Yossi Neiman, mishehu+sbo@shavedgoats.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=sngrep
+VERSION=${VERSION:-1.7.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
+
+# Options.  Saying no to OPENSSL_TLS results in gnutls linkage.  no to PCRE2 results in PCRE linkage.
+ENABLE_IPV6=${ENABLE_IPV6:-yes}
+OPENSSL_TLS=${OPENSSL_TLS:-yes}
+PCRE2=${PCRE2:-yes}
+COMPOPTIONS=""
+
+if [ "$ENABLE_IPV6" = "yes" ]
+then
+	COMPOPTIONS="$COMPOPTIONS --enable-ipv6"
+fi
+
+if [ "$OPENSSL_TLS" = "yes" ]
+then
+	COMPOPTIONS="$COMPOPTIONS --with-openssl"
+else
+	COMPOPTIONS="$COMPOPTIONS --with-gnutls"
+fi
+
+if [ "$PCRE2" = "yes" ]
+then
+	COMPOPTIONS="$COMPOPTIONS --with-pcre2"
+else
+	COMPOPTIONS="$COMPOPTIONS --with-pcre"
+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 {} \;
+
+./bootstrap.sh
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --enable-eep \
+  --enable-unicode \
+  --with-zlib \
+  $COMPOPTIONS \
+  --build=$ARCH-slackware-linux
+
+make
+make install DESTDIR=$PKG mandir=/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 {} \;
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp AUTHORS COPYING LICENSE LICENSE.OpenSSL 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/network/sngrep/sngrep.info b/network/sngrep/sngrep.info
new file mode 100644
index 0000000000..44bdf7327b
--- /dev/null
+++ b/network/sngrep/sngrep.info
@@ -0,0 +1,10 @@
+PRGNAM="sngrep"
+VERSION="1.7.0"
+HOMEPAGE="https://github.com/irontec/sngrep"
+DOWNLOAD="https://github.com/irontec/sngrep/releases/download/v1.7.0/sngrep-1.7.0.tar.gz"
+MD5SUM="ee3cc7bd75adeb713411aa678e45ae4c"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Yossi Neiman"
+EMAIL="mishehu+sbo@shavedgoats.net"
diff --git a/network/sniffjoke/README b/network/sniffjoke/README
index 87020ffa73..445e28db08 100644
--- a/network/sniffjoke/README
+++ b/network/sniffjoke/README
@@ -1,5 +1,6 @@
 An internet client running SniffJoke injects in the transmission flow
 some packets able to seriously disturb passive analysis like sniffing,
-interception and low level information theft. No server supports needed!
+interception and low level information theft. No server support needed!
 
-Please read documentation files in /usr/doc/ to set sniffjoke up properly.
+Please read documentation files in /usr/doc/sniffjoke-$VERSION to set
+sniffjoke up properly.
diff --git a/network/sniffjoke/sniffjoke.SlackBuild b/network/sniffjoke/sniffjoke.SlackBuild
index 4b0722ed3d..3250e78b49 100644
--- a/network/sniffjoke/sniffjoke.SlackBuild
+++ b/network/sniffjoke/sniffjoke.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for sniffjoke
 
@@ -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=sniffjoke
 VERSION=${VERSION:-0.4.2_aa2a003}
 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}
@@ -44,8 +54,8 @@ SRCNAM="vecna-sniffjoke"
 GITSRCVERSION="aa2a003"
 DOCFILES="AUTHORS ChangeLog COPYING README.md doc/*.txt"
 
-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"
@@ -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/network/sniffjoke/sniffjoke.info b/network/sniffjoke/sniffjoke.info
index a1319bac2a..157711a63c 100644
--- a/network/sniffjoke/sniffjoke.info
+++ b/network/sniffjoke/sniffjoke.info
@@ -1,7 +1,7 @@
 PRGNAM="sniffjoke"
 VERSION="0.4.2_aa2a003"
 HOMEPAGE="http://www.delirandom.net/sniffjoke/"
-DOWNLOAD="http://lukenshiro.altervista.org/sbo-sources/vecna-sniffjoke-aa2a003.tar.gz"
+DOWNLOAD="https://slackware.uk/~urchlay/src/vecna-sniffjoke-aa2a003.tar.gz"
 MD5SUM="c5c071e6ec2ae0a614f7512fb8c102f3"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/network/snmpsim/snmpsim.SlackBuild b/network/snmpsim/snmpsim.SlackBuild
index 03b768318c..f58946702c 100644
--- a/network/snmpsim/snmpsim.SlackBuild
+++ b/network/snmpsim/snmpsim.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for snmpsim.
 
@@ -23,14 +23,24 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=snmpsim
 VERSION=${VERSION:-0.0.10}
 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/network/snmpsim/snmpsim.info b/network/snmpsim/snmpsim.info
index 9b2389b8d2..9fb7883828 100644
--- a/network/snmpsim/snmpsim.info
+++ b/network/snmpsim/snmpsim.info
@@ -6,5 +6,5 @@ MD5SUM="9cf35ba624f09a2d723fa9dea83f243f"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="pysnmp"
-MAINTAINER="Ilya Etingof"
-EMAIL="ilya@glas.net"
+MAINTAINER="Charles Polisher"
+EMAIL="cpolish@surewest.net"
diff --git a/network/snmptt/snmptt.SlackBuild b/network/snmptt/snmptt.SlackBuild
index 7a9091a570..d95182db55 100644
--- a/network/snmptt/snmptt.SlackBuild
+++ b/network/snmptt/snmptt.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for snmptt
 
@@ -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=snmptt
 VERSION=${VERSION:-1.4}
 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}
@@ -70,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-noarch-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/network/snort/README b/network/snort/README
index 6beb0ff2e3..e34479229f 100644
--- a/network/snort/README
+++ b/network/snort/README
@@ -1,14 +1,15 @@
-Snort is an open source network intrusion detection and prevention system.
-It is capable of performing real-time traffic analysis, alerting, blocking
-and packet logging on IP networks. It utilizes a combination of protocol
-analysis and pattern matching in order to detect a anomalies, misuse and
-attacks.
+Snort is an open source network intrusion detection and prevention
+system. It is capable of performing real-time traffic analysis,
+alerting, blocking and packet logging on IP networks. It utilizes
+a combination of protocol analysis and pattern matching in order to
+detect a anomalies, misuse and attacks.
 
-Snort uses a flexible rules language to describe activity that can be
-considered malicious or anomalous as well as an analysis engine that
-incorporates a modular plugin architecture. Snort is capable of detecting
-and responding in real-time, sending alerts, performing session sniping,
-logging packets, or dropping sessions/packets when deployed in-line.
+Snort uses a flexible rules language to describe activity that can
+be considered malicious or anomalous as well as an analysis engine
+that incorporates a modular plugin architecture. Snort is capable
+of detecting and responding in real-time, sending alerts, performing
+session sniping, logging packets, or dropping sessions/packets when
+deployed in-line.
 
 Snort has three primary functional modes.  It can be used as a packet
 sniffer like tcpdump(1), a packet logger (useful for network traffic
diff --git a/network/snort/snort.SlackBuild b/network/snort/snort.SlackBuild
index 37e1b34f99..88b11aadaf 100644
--- a/network/snort/snort.SlackBuild
+++ b/network/snort/snort.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Copyright 2006-2009, Alan Hicks, Lizella, GA,
 # Copyright 2009, Thomas York, Beech Grove, In.
@@ -25,26 +25,36 @@
 # Modified by the SlackBuilds.org project
 # Maintained by David Spencer <baildon.research@googlemail.com>
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=snort
-VERSION=${VERSION:-2.9.11.1}
+VERSION=${VERSION:-2.9.17}
 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"
@@ -63,7 +73,12 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+# respecting content-disposition may include cgi params in the filename
+TARBALL=$CWD/$PRGNAM-$VERSION.tar.gz
+if [ ! -e $TARBALL ]; then
+  TARBALL="$(/bin/ls $TARBALL\?* | head -1)"
+fi
+tar xvf $TARBALL
 cd $PRGNAM-$VERSION
 
 # The Makefiles do not respect the --libdir setting, which causes the libs to
@@ -87,6 +102,7 @@ if [ "${NON_ETHER:-yes}" = 'no' ]; then
   NON_ETHERNET_DECODERS=''
 fi
 
+CPPFLAGS="$CPPFLAGS -I/usr/include/tirpc/" \
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
@@ -98,7 +114,6 @@ CXXFLAGS="$SLKCFLAGS" \
   --docdir=/usr/doc/$PRGNAM-$VERSION \
   --enable-pthread \
   --enable-linux-smp-stats \
-  --enable-zlib \
   ${NON_ETHERNET_DECODERS} \
   --build=$ARCH-slackware-linux
 
@@ -146,9 +161,11 @@ cp -a COPYING ChangeLog LICENSE RELEASE.NOTES \
 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/network/snort/snort.info b/network/snort/snort.info
index 38c8c4110f..38f7e5cd51 100644
--- a/network/snort/snort.info
+++ b/network/snort/snort.info
@@ -1,10 +1,10 @@
 PRGNAM="snort"
-VERSION="2.9.11.1"
+VERSION="2.9.17"
 HOMEPAGE="https://www.snort.org/"
-DOWNLOAD="https://sourceforge.net/projects/slackbuildsdirectlinks/files/snort/snort-2.9.11.1.tar.gz"
-MD5SUM="378e3938b2b5c8e358f942d0ffce18cc"
+DOWNLOAD="https://www.snort.org/downloads/archive/snort/snort-2.9.17.tar.gz"
+MD5SUM="3fe89f22def4e9ffda01f07f816e666d"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="daq"
+REQUIRES="daq luajit"
 MAINTAINER="David Spencer"
 EMAIL="baildon.research@googlemail.com"
diff --git a/network/sntpc/README b/network/sntpc/README
new file mode 100644
index 0000000000..97fd73a838
--- /dev/null
+++ b/network/sntpc/README
@@ -0,0 +1,4 @@
+sntpc (simple Network Time Protocol client)
+
+This client queries an NTP server for the current time, and sets the
+local clock to the time reported by the server.
diff --git a/network/sntpc/compilefix.diff b/network/sntpc/compilefix.diff
new file mode 100644
index 0000000000..e56b2a70a7
--- /dev/null
+++ b/network/sntpc/compilefix.diff
@@ -0,0 +1,45 @@
+diff -Naur sntpc-20181113_1ca1d00/sntpc.c sntpc-20181113_1ca1d00.patched/sntpc.c
+--- sntpc-20181113_1ca1d00/sntpc.c	2022-01-26 14:17:03.000000000 -0500
++++ sntpc-20181113_1ca1d00.patched/sntpc.c	2022-01-26 14:29:36.384241954 -0500
+@@ -7,9 +7,12 @@
+ #include <strings.h>
+ #include <sys/select.h>
+ #include <sys/socket.h>
++#include <time.h>
+ #include <sys/time.h>
+ #include <unistd.h>
+ 
++extern uint32_t arc4random(void);
++
+ #define SECONDS_1900_1970 (25567 * 86400U)
+ 
+ #pragma pack(1)
+@@ -56,10 +59,6 @@
+         errx(1, "Structure size mismatch (got %lu, expected 68)", sizeof(struct ntp_packet_t));
+     }
+ 
+-    if (pledge("stdio inet dns settime", NULL) < 0) {
+-        err(1, "pledge");
+-    }
+-
+     int ch;
+     while ((ch = getopt(argc, argv, "bhnp:s:t:v")) != -1) {
+         switch (ch) {
+@@ -184,7 +183,7 @@
+ 
+     time_t local_now = time(NULL);
+     if (verbose) {
+-        printf("sntpc: local clock %lld (%.24s)\n", local_now, ctime(&local_now));
++        printf("sntpc: local clock %ld (%.24s)\n", local_now, ctime(&local_now));
+     }
+     if (local_now > seconds_since_1970 && !backwards) {
+         errx(1, "not stepping clock backwards (use -b to allow this)");
+@@ -205,7 +204,7 @@
+             err(1, "settimeofday");
+         }
+         if (verbose) {
+-            printf("sntpc: local clock set to %lld (%.24s)\n", new_clock.tv_sec, ctime(&new_clock.tv_sec));
++            printf("sntpc: local clock set to %ld (%.24s)\n", new_clock.tv_sec, ctime(&new_clock.tv_sec));
+         }
+     } else {
+         printf("sntpc: not setting clock because of -n\n");
diff --git a/network/sntpc/git2tarxz.sh b/network/sntpc/git2tarxz.sh
new file mode 100644
index 0000000000..08bbd6a489
--- /dev/null
+++ b/network/sntpc/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=sntpc
+CLONE_URL=https://github.com/ghewgill/sntpc
+
+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/network/sntpc/slack-desc b/network/sntpc/slack-desc
new file mode 100644
index 0000000000..20b8d8bd67
--- /dev/null
+++ b/network/sntpc/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+     |-----handy-ruler------------------------------------------------------|
+sntpc: sntpc (simple Network Time Protocol client)
+sntpc:
+sntpc: This client queries an NTP server for the current time, and sets the
+sntpc: local clock to the time reported by the server.
+sntpc:
+sntpc:
+sntpc:
+sntpc:
+sntpc:
+sntpc:
+sntpc:
diff --git a/network/sntpc/sntpc.8 b/network/sntpc/sntpc.8
new file mode 100644
index 0000000000..26c7401115
--- /dev/null
+++ b/network/sntpc/sntpc.8
@@ -0,0 +1,98 @@
+.\" 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 "SNTPC" 1 "2022-01-28" "20181113_1ca1d00" "SlackBuilds.org"
+.SH NAME
+sntpc \- Network Time Protocol client
+.\" RST source for sntpc(8) man page. Convert with:
+.
+.\" rst2man.py sntpc.rst > sntpc.8
+.
+.\" rst2man.py comes from the SBo development/docutils package.
+.
+.SH SYNOPSIS
+.sp
+sntpc [\fB\-bhnv\fP] [\fB\-p\fP \fIport\fP] [\fB\-s\fP \fIserver\fP] [\fB\-t\fP \fIthreshold\fP]
+.SH DESCRIPTION
+.sp
+\fBsntpc\fP queries an NTP server for the current time, and sets the
+local clock to the time reported by the server. It\(aqs a standalone
+binary, with no config file and no dependency on the \fIntp\fP package.
+.sp
+\fBsntpc\fP does not run as a daemon like \fBntpd\fP does. To keep
+the time in sync, you can run \fBsntpc\fP from root\(aqs \fBcrontab\fP(1)
+every 30 minutes (or however often it\(aqs necessary).
+.sp
+\fBsntpc\fP requires root access to actually set the local clock,
+although it can be run with \fB\-n\fP by non\-privileged users (e.g. with
+\fB\-v\fP to simply check the local time against the server\(aqs time).
+.SH OPTIONS
+.INDENT 0.0
+.TP
+.B  \-b
+Allow time shift backwards (default: forward only).
+.TP
+.B  \-h
+Show built\-in help message.
+.TP
+.B  \-n
+No set time (dry run).
+.TP
+.B  \-p
+Set server port number (default: 123).
+.TP
+.B  \-s
+Set server name or IPv4 address (default: pool.ntp.org).
+.TP
+.B  \-t
+Set maximum time offset threshold (default: 300 seconds). This can
+be set to a ludicrously high value such as 40000000000 (over 1,000 years)
+to effectively disable the threshold.
+.TP
+.B  \-v
+Verbose (default: silent)
+.UNINDENT
+.SH COPYRIGHT
+.sp
+See the file /usr/doc/sntpc\-20181113_1ca1d00/LICENSE.txt for license information.
+.SH AUTHORS
+.sp
+sntpc was written by Greg Hewgill.
+.sp
+This man page written for the SlackBuilds.org project
+by B. Watson, and is licensed under the WTFPL.
+.SH SEE ALSO
+.sp
+\fBntpd\fP(1)
+.sp
+\fI\%https://www.ntp.org\fP
+.sp
+The sntpc homepage: \fI\%https://github.com/ghewgill/sntpc\fP
+.\" Generated by docutils manpage writer.
+.
diff --git a/network/sntpc/sntpc.SlackBuild b/network/sntpc/sntpc.SlackBuild
new file mode 100644
index 0000000000..13090c2602
--- /dev/null
+++ b/network/sntpc/sntpc.SlackBuild
@@ -0,0 +1,77 @@
+#!/bin/bash
+
+# Slackware build script for sntpc
+
+# 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=sntpc
+VERSION=${VERSION:-20181113_1ca1d00}
+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 .
+chmod 644 *
+
+# Linux doesn't have BSD's pledge() syscall... also fix compile warnings.
+patch -p1 < $CWD/compilefix.diff
+
+make CFLAGS="$SLKCFLAGS -Wall -Wl,-s" LDFLAGS="-lbsd"
+
+mkdir -p $PKG/usr/sbin $PKG/usr/man/man8
+cp -a $PRGNAM $PKG/usr/sbin
+gzip -9c < $CWD/$PRGNAM.8 > $PKG/usr/man/man8/$PRGNAM.8.gz
+
+PKGDOC=$PKG/usr/doc/$PRGNAM-$VERSION
+mkdir -p $PKGDOC
+cp -a *.md *.txt $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/network/sntpc/sntpc.info b/network/sntpc/sntpc.info
new file mode 100644
index 0000000000..a3b274fd50
--- /dev/null
+++ b/network/sntpc/sntpc.info
@@ -0,0 +1,10 @@
+PRGNAM="sntpc"
+VERSION="20181113_1ca1d00"
+HOMEPAGE="https://github.com/ghewgill/sntpc"
+DOWNLOAD="https://slackware.uk/~urchlay/src/sntpc-20181113_1ca1d00.tar.xz"
+MD5SUM="21640d86c27e27838966f0b620399cca"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="libbsd"
+MAINTAINER="B. Watson"
+EMAIL="urchlay@slackware.uk"
diff --git a/network/sntpc/sntpc.rst b/network/sntpc/sntpc.rst
new file mode 100644
index 0000000000..7b326eb1b5
--- /dev/null
+++ b/network/sntpc/sntpc.rst
@@ -0,0 +1,87 @@
+.. RST source for sntpc(8) man page. Convert with:
+..   rst2man.py sntpc.rst > sntpc.8
+.. rst2man.py comes from the SBo development/docutils package.
+
+.. |version| replace:: 20181113_1ca1d00
+.. |date| date::
+
+=====
+sntpc
+=====
+
+----------------------------
+Network Time Protocol client
+----------------------------
+
+:Manual section: 1
+:Manual group: SlackBuilds.org
+:Date: |date|
+:Version: |version|
+
+SYNOPSIS
+========
+
+sntpc [**-bhnv**] [**-p** *port*] [**-s** *server*] [**-t** *threshold*]
+
+DESCRIPTION
+===========
+
+**sntpc** queries an NTP server for the current time, and sets the
+local clock to the time reported by the server. It's a standalone
+binary, with no config file and no dependency on the *ntp* package.
+
+**sntpc** does not run as a daemon like **ntpd** does. To keep
+the time in sync, you can run **sntpc** from root's **crontab**\(1)
+every 30 minutes (or however often it's necessary).
+
+**sntpc** requires root access to actually set the local clock,
+although it can be run with **-n** by non-privileged users (e.g. with
+**-v** to simply check the local time against the server's time).
+
+OPTIONS
+=======
+
+-b
+  Allow time shift backwards (default: forward only).
+
+-h
+  Show built-in help message.
+
+-n
+  No set time (dry run).
+
+-p
+  Set server port number (default: 123).
+
+-s
+  Set server name or IPv4 address (default: pool.ntp.org).
+
+-t
+  Set maximum time offset threshold (default: 300 seconds). This can
+  be set to a ludicrously high value such as 40000000000 (over 1,000 years)
+  to effectively disable the threshold.
+
+-v
+  Verbose (default: silent)
+
+COPYRIGHT
+=========
+
+See the file /usr/doc/sntpc-|version|/LICENSE.txt for license information.
+
+AUTHORS
+=======
+
+sntpc was written by Greg Hewgill.
+
+This man page written for the SlackBuilds.org project
+by B. Watson, and is licensed under the WTFPL.
+
+SEE ALSO
+========
+
+**ntpd**\(1)
+
+https://www.ntp.org
+
+The sntpc homepage: https://github.com/ghewgill/sntpc
diff --git a/network/socat/README b/network/socat/README
deleted file mode 100644
index 828012f25b..0000000000
--- a/network/socat/README
+++ /dev/null
@@ -1,12 +0,0 @@
-socat is a relay for bidirectional data transfer between two
-independent data channels. Each of these data channels may be a file,
-pipe, device (serial line etc. or a pseudo terminal), a socket (UNIX,
-IP4, IP6 - raw, UDP, TCP), an SSL socket, proxy CONNECT connection,
-a file descriptor (stdin etc.), the GNU line editor (readline),
-a program, or a combination of two of these.  These modes include
-generation of "listening" sockets, named pipes, and pseudo terminals.
-
-socat can use the OpenSSL FIPS module, if it is installed on your system.
-
-Upon install, you may want to read the SECURITY file in the documentation
-directory.
diff --git a/network/socat/slack-desc b/network/socat/slack-desc
deleted file mode 100644
index b0e75054c5..0000000000
--- a/network/socat/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------------------------------------------------------|
-socat: socat (multipurpose data relay)
-socat:
-socat: socat is a relay for bidirectional data transfer between two
-socat: independent data channels. Each of these data channels may be a file,
-socat: pipe, device (serial line etc. or a pseudo terminal), a socket (UNIX,
-socat: IP4, IP6 - raw, UDP, TCP), an SSL socket, proxy CONNECT connection,
-socat: a file descriptor (stdin etc.), the GNU line editor (readline),
-socat: a program, or a combination of two of these.  These modes include
-socat: generation of "listening" sockets, named pipes, and pseudo terminals.
-socat:
-socat: Homepage: http://www.dest-unreach.org/socat
diff --git a/network/socat/socat.SlackBuild b/network/socat/socat.SlackBuild
deleted file mode 100644
index a1133b67ca..0000000000
--- a/network/socat/socat.SlackBuild
+++ /dev/null
@@ -1,101 +0,0 @@
-#!/bin/sh
-# Slackware build script for socat
-
-# Copyright 2009 Andrew Psaltis <ampsaltis@gmail.com>
-# Copyright 2011 Grigorios Bouzakis <grbzks@imap.cc>
-# Copyright 2014-2017 Larry Hajali <larryhaja[at]gmail[dot]com>
-# 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.
-
-PRGNAM=socat
-VERSION=${VERSION:-1.7.3.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.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 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 {} \;
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
-  BUGREPORTS CHANGES COPYING* DEVELOPMENT EXAMPLES FAQ PORTING \
-  README* SECURITY doc/*.{css,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
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/network/socat/socat.info b/network/socat/socat.info
deleted file mode 100644
index 85117c205c..0000000000
--- a/network/socat/socat.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="socat"
-VERSION="1.7.3.2"
-HOMEPAGE="http://www.dest-unreach.org/socat"
-DOWNLOAD="http://www.dest-unreach.org/socat/download/socat-1.7.3.2.tar.bz2"
-MD5SUM="607a24c15bd2cb54e9328bfbbd3a1ae9"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Larry Hajali"
-EMAIL="larryhaja[at]gmail[dot]com"
diff --git a/network/social-engineer-toolkit/README b/network/social-engineer-toolkit/README
deleted file mode 100644
index 16eaedd000..0000000000
--- a/network/social-engineer-toolkit/README
+++ /dev/null
@@ -1,6 +0,0 @@
-social-engineer toolkit (SET)
-
-The Social-Engineer Toolkit is an open-source penetration 
-testing framework designed for social engineering. SET has 
-a number of custom attack vectors that allow you to make a 
-believable attack quickly.
diff --git a/network/social-engineer-toolkit/doinst.sh b/network/social-engineer-toolkit/doinst.sh
deleted file mode 100644
index f25bed6fb6..0000000000
--- a/network/social-engineer-toolkit/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/network/social-engineer-toolkit/slack-desc b/network/social-engineer-toolkit/slack-desc
deleted file mode 100644
index 64915dd010..0000000000
--- a/network/social-engineer-toolkit/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------------------------------------------------------|
-social-engineer-toolkit: social-engineer-toolkit (penetration testing framework)
-social-engineer-toolkit:
-social-engineer-toolkit: The Social-engineer Toolkit is an open-source penetration testing
-social-engineer-toolkit: framework designed for social engineering. SET has a number of
-social-engineer-toolkit: custom attack vectors that allow you to make a believable attack
-social-engineer-toolkit: quickly.
-social-engineer-toolkit:
-social-engineer-toolkit:
-social-engineer-toolkit:
-social-engineer-toolkit:
-social-engineer-toolkit:
diff --git a/network/social-engineer-toolkit/social-engineer-toolkit.SlackBuild b/network/social-engineer-toolkit/social-engineer-toolkit.SlackBuild
deleted file mode 100644
index c25b9c8e9e..0000000000
--- a/network/social-engineer-toolkit/social-engineer-toolkit.SlackBuild
+++ /dev/null
@@ -1,82 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for social-engineer-toolkit
-
-# Copyright 2016-2017 Andre Fernando, Indonesia
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
-#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
-#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (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=social-engineer-toolkit
-VERSION=${VERSION:-7.4.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}
-
-set -e
-
-SRCDIR=setoolkit
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-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 {} \;
-
-find $PKG -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
-mkdir -p $PKG/usr/share/$SRCDIR
-cp -ar * $PKG/usr/share/$SRCDIR
-(
-  cd $PKG
-   ln -sf /usr/share/setoolkit/setoolkit $PKG/usr/bin/setoolkit
-   ln -sf /usr/share/setoolkit/seautomate $PKG/usr/bin/seautomate
-   ln -sf /usr/share/setoolkit/seproxy $PKG/usr/bin/seproxy
-   ln -sf /usr/share/setoolkit/seupdate $PKG/usr/bin/seupdate
-)
-
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a README.md requirements.txt $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 -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/network/social-engineer-toolkit/social-engineer-toolkit.info b/network/social-engineer-toolkit/social-engineer-toolkit.info
deleted file mode 100644
index 05974e66bb..0000000000
--- a/network/social-engineer-toolkit/social-engineer-toolkit.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="social-engineer-toolkit"
-VERSION="7.4.5"
-HOMEPAGE="https://github.com/trustedsec/social-engineer-toolkit/"
-DOWNLOAD="https://github.com/trustedsec/social-engineer-toolkit/archive/7.4.5/social-engineer-toolkit-7.4.5.tar.gz"
-MD5SUM="7903c1eae414c6eef1bd360626db70f1"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="pexpect python-requests pyOpenSSL pefile Impacket python-qrcode python3-pillow"
-MAINTAINER="Andre Fernando"
-EMAIL="ando344@gmail.com"
diff --git a/network/sopcast-player/sopcast-player.SlackBuild b/network/sopcast-player/sopcast-player.SlackBuild
index f0294c1e21..7607ea6bea 100644
--- a/network/sopcast-player/sopcast-player.SlackBuild
+++ b/network/sopcast-player/sopcast-player.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for sopcast-player
 
@@ -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=sopcast-player
 VERSION=${VERSION:-0.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 the variable PRINT_PACKAGE_NAME is set, then this script will report what
+# the name of the created package would be, and then exit. This information
+# could be useful to other scripts.
+if [ ! -z "${PRINT_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/network/sopcast/sopcast.SlackBuild b/network/sopcast/sopcast.SlackBuild
index 183d10b1c0..1cd85bed66 100644
--- a/network/sopcast/sopcast.SlackBuild
+++ b/network/sopcast/sopcast.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for sopcast
 
@@ -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=sopcast
 VERSION=${VERSION:-3.2.6}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+ARCH=i586
 
-ARCH=i486
+# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
+# the name of the created package would be, and then exit. 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 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/network/spamassassin/README b/network/spamassassin/README
index 797cee5cae..edaed944de 100644
--- a/network/spamassassin/README
+++ b/network/spamassassin/README
@@ -1,11 +1,12 @@
 spamassassin - perl e-mail filter to identify spam
 
 Spamassassin is an intelligent email filter which uses a diverse range
-of tests to identify unsolicited bulk email, more commonly known as Spam.
-These tests are applied to email headers and content to classify email using
-advanced statistical methods. It has a modular architecture that allows
-other technologies to be quickly wielded against spam and is designed for
-easy integration into virtually any email system.
+of tests to identify unsolicited bulk email, more commonly known
+as Spam. These tests are applied to email headers and content to
+classify email using advanced statistical methods. It has a modular
+architecture that allows other technologies to be quickly wielded
+against spam and is designed for easy integration into virtually any
+email system.
 
 Before using, please read README.SLACKWARE file.
 
diff --git a/network/spamassassin/slack-desc b/network/spamassassin/slack-desc
index da362b6936..ac7015f84a 100644
--- a/network/spamassassin/slack-desc
+++ b/network/spamassassin/slack-desc
@@ -13,7 +13,7 @@ spamassassin: of tests to identify unsolicited bulk email, more commonly
 spamassassin: known as Spam. These tests are applied to email headers and
 spamassassin: content to classify email using advanced statistical methods.
 spamassassin:
-spamassassin: Homepage: http://spamassassin.apache.org
+spamassassin: Homepage: https://spamassassin.apache.org
 spamassassin:
 spamassassin:
 spamassassin:
diff --git a/network/spamassassin/spamassassin.SlackBuild b/network/spamassassin/spamassassin.SlackBuild
index d17f9d5e45..0a71b0af53 100644
--- a/network/spamassassin/spamassassin.SlackBuild
+++ b/network/spamassassin/spamassassin.SlackBuild
@@ -1,10 +1,12 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for spamassassin
 
 # Copyright 2008-2015 LukenShiro, Italy
 # All rights reserved.
 #
+# Maintained by Gerardo Zamudio <gerardo.zamudio@linux.com>
+# 
 # Redistribution and use of this script, with or without modification, is
 # permitted provided that the following conditions are met:
 #
@@ -25,20 +27,30 @@
 # Thanks to Nishant Limbachia for providing a SQL script to be used with
 # spamassassin database, and most of spamassassin dependencies' scripts.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=spamassassin
-VERSION=${VERSION:-3.4.1}
+VERSION=${VERSION:-3.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 the variable PRINT_PACKAGE_NAME is set, then this script will report what
+# the name of the created package would be, and then exit. This information
+# could be useful to other scripts.
+if [ ! -z "${PRINT_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 +59,8 @@ SRC_PRGNAM=Mail-SpamAssassin
 DOCFILES="Changes CREDITS INSTALL LICENSE NOTICE PACKAGING procmailrc.example \
 README sample-nonspam.txt sample-spam.txt TRADEMARK UPGRADE USAGE sql/"
 
-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
@@ -127,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/network/spamassassin/spamassassin.info b/network/spamassassin/spamassassin.info
index ad427e451f..155af2e77e 100644
--- a/network/spamassassin/spamassassin.info
+++ b/network/spamassassin/spamassassin.info
@@ -1,10 +1,10 @@
 PRGNAM="spamassassin"
-VERSION="3.4.1"
-HOMEPAGE="http://spamassassin.apache.org/"
-DOWNLOAD="http://www.eu.apache.org/dist/spamassassin/source/Mail-SpamAssassin-3.4.1.tar.bz2"
-MD5SUM="0db5d27d7b782ff5eadee12b95eae84c"
+VERSION="3.4.6"
+HOMEPAGE="https://spamassassin.apache.org/"
+DOWNLOAD="https://downloads.apache.org//spamassassin/source/Mail-SpamAssassin-3.4.6.tar.bz2"
+MD5SUM="0ef3f64ffcdf6f1e96068e19a16ce1be"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="libwww-perl perl-Crypt-OpenSSL-Bignum perl-Encode-Detect perl-IO-Socket-INET6 perl-IO-Socket-SSL perl-IP-Country perl-Image-Info perl-Mail-DKIM perl-Mail-SPF perl-Net-Ident perl-Net-Server pyzor re2c"
-MAINTAINER="LukenShiro"
-EMAIL="lukenshiro@ngi.it"
+REQUIRES="libwww-perl perl-Crypt-OpenSSL-Bignum perl-Encode-Detect perl-IO-Socket-INET6 perl-IP-Country perl-Image-Info perl-Mail-DKIM perl-Mail-SPF perl-Net-Ident perl-Net-Server pyzor"
+MAINTAINER="Gerardo Zamudio"
+EMAIL="gerardo.zamudio@linux.com"
diff --git a/network/spambayes/README b/network/spambayes/README
index 179ca058b7..bbf88951ba 100644
--- a/network/spambayes/README
+++ b/network/spambayes/README
@@ -1,6 +1,7 @@
-SpamBayes uses a different set of algorithm to most statistical spam filters,
-which enables to dramatically lower the number of legitimate mail classified as
-spam, through the introduction of an 'unsure' category.
+SpamBayes uses a different set of algorithm to most statistical spam
+filters, which enables to dramatically lower the number of legitimate
+mail classified as spam, through the introduction of an 'unsure'
+category.
 
-SpamBayes can be used as a POP3 or an IMAP proxy, as well as a simple mail
-filter for use with procmail.
+SpamBayes can be used as a POP3 or an IMAP proxy, as well as a simple
+mail filter for use with procmail.
diff --git a/network/spambayes/spambayes.SlackBuild b/network/spambayes/spambayes.SlackBuild
index ab404fd66f..4f30f6da97 100644
--- a/network/spambayes/spambayes.SlackBuild
+++ b/network/spambayes/spambayes.SlackBuild
@@ -1,22 +1,32 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for spambayes
 # Written by Audrius Kažukauskas <audrius@neutrino.lt>
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=spambayes
 VERSION=${VERSION:-1.0.4}
 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}
@@ -51,4 +61,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/network/spawn-fcgi/spawn-fcgi.SlackBuild b/network/spawn-fcgi/spawn-fcgi.SlackBuild
index 5473a6b503..6659763676 100644
--- a/network/spawn-fcgi/spawn-fcgi.SlackBuild
+++ b/network/spawn-fcgi/spawn-fcgi.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for spawn-fcgi
 
@@ -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=spawn-fcgi
 VERSION=${VERSION:-1.6.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"
@@ -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/network/speedometer/README b/network/speedometer/README
index ab83bcedd9..ca63b55c04 100644
--- a/network/speedometer/README
+++ b/network/speedometer/README
@@ -1,4 +1,5 @@
 speedometer (Progress monitor for console)
 
 Speedometer is a console bandwidth and file download progress monitor
-with a logarithmic bandwidth display and a simple command-line interface.
+with a logarithmic bandwidth display and a simple command-line
+interface.
diff --git a/network/speedometer/slack-desc b/network/speedometer/slack-desc
index b742df5ad1..e309ea3c8a 100644
--- a/network/speedometer/slack-desc
+++ b/network/speedometer/slack-desc
@@ -13,7 +13,7 @@ speedometer: monitor with a logarithmic bandwidth display and a simple
 speedometer: command-line interface.
 speedometer:
 speedometer:
-speedometer: Homepage: http://excess.org/speedometer/
+speedometer: Homepage: https://excess.org/speedometer/
 speedometer:
 speedometer:
 speedometer:
diff --git a/network/speedometer/speedometer.1.pod b/network/speedometer/speedometer.1.pod
new file mode 100644
index 0000000000..7e228f8fae
--- /dev/null
+++ b/network/speedometer/speedometer.1.pod
@@ -0,0 +1,147 @@
+#   Copyright
+#
+#	Copyright (C) 2007-2010 Jari Aalto
+#
+#   License
+#
+#       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, see <http://www.gnu.org/licenses/>.
+#
+#   Description
+#
+#	To learn what TOP LEVEL sections to use in manual pages,
+#	see POSIX/Susv standard and "Utility Description Defaults" at
+#	http://www.opengroup.org/onlinepubs/009695399/utilities/xcu_chap01.html#tag_01_11
+#
+#	This is manual page in Perl POD format. Read more at
+#	http://perldoc.perl.org/perlpod.html or run command:
+#
+#	    perldoc perlpod | less
+#
+#	To check the syntax:
+#
+#	    podchecker *.pod
+#
+#	Create manual page with command:
+#
+#	    pod2man PAGE.N.pod > PAGE.N
+
+=pod
+
+=head1 NAME
+
+speedometer - measure and display the rate of data across a network connection
+
+=head1 SYNOPSIS
+
+   speedometer [options] tap [[-c] tap] ...
+
+=head1 DESCRIPTION
+
+Monitor network traffic or speed/progress of a file transfer. At least
+one tap option (B<-f>, B<-rx>, B<-tx>) must be entered. Option B<-c>
+starts a new column, otherwise taps are piled vertically.
+
+Note: before you use the program, satrt generating traffic by
+transferring files in/out e.g. with scp(1) in the network you're
+measuring.
+
+=head1 OPTIONS
+
+=over 4
+
+=item B<-b>
+
+Use old blocky display instead of smoothed display even when UTF-8
+encoding is detected.
+
+=item B<-f filename [size]>
+
+Display download speed with progress bar. This option must be used if
+directly following another file tap without an expected size
+specified.
+
+=item B<-i interval>
+
+Interval in seconds. Examples: 5 or 0.25". Default is 1.
+
+=item B<-p>
+
+Use plain-text display (one tap only).
+
+=item B<-rx iface>
+
+Display bytes received on network interface.
+
+=item B<-tx iface>
+
+Display bytes transmitted on network interface.
+
+=item B<-z>
+
+Report zero size on files that don't exist instead of waiting for them
+to be created
+
+=back
+
+EXAMPLES
+
+How long it will take for my 38MB transfer to finish?
+
+    speedometer favorite_episode.rm $(( 38 * 1024 * 1024 ))
+
+How quickly is another transfer going?
+
+    speedometer dl/big.avi
+
+How fast is this LAN?
+
+    host-a$ cat /dev/zero | nc -l -p 12345
+    host-b$ nc host-a 12345 > /dev/null
+    host-b$ speedometer -rx eth0
+
+How fast is the upstream on this ADSL line?
+
+    speedometer -tx ppp0
+
+How fast can I write data to my filesystem? (with at least 1GB free)
+
+    dd bs=1000000 count=1000 if=/dev/zero of=bigfile &
+    speedometer bigfile
+
+=head1 ENVIRONMENT
+
+None.
+
+=head1 FILES
+
+None.
+
+=head1 SEE ALSO
+
+htop(1)
+iotop(1)
+scp(1)
+top(1)
+vmstat(1)
+
+=head1 AUTHORS
+
+Program was written by Ian Ward <ian.ward@excess.org>
+
+This manual page was written by Jari Aalto <jari.aalto@cante.net>.
+Released under license GNU GPL version 2 or (at your option) any later
+version. For more information about license, visit
+<http://www.gnu.org/copyleft/gpl.html>.
+
+=cut
diff --git a/network/speedometer/speedometer.SlackBuild b/network/speedometer/speedometer.SlackBuild
index 32b374ea93..2d7397b59b 100644
--- a/network/speedometer/speedometer.SlackBuild
+++ b/network/speedometer/speedometer.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
-
-# Slackware build script for speedometer
-
-# Copyright 2015 Edinaldo P. Silva, Rio de Janeiro, Brazil
+#!/bin/bash
+#
+# Slackware build script for speedometer.
+#
+# 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,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=speedometer
-VERSION=${VERSION:-2.8}
+VERSION=${VERSION:-2.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"
@@ -59,9 +69,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-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 \
@@ -69,19 +79,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 {} \;
 
-python setup.py install --root=$PKG
+python3 setup.py 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
 
-DOCS="CHANGELOG"
+# make manpage.
+mkdir -p $PKG/usr/man/man1/
+pod2man $CWD/speedometer.1.pod > $PKG/usr/man/man1/speedometer.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 $DOCS $PKG/usr/doc/$PRGNAM-$VERSION
+install -Dm644 CHANGELOG 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
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/network/speedometer/speedometer.info b/network/speedometer/speedometer.info
index f99c0b453c..bb8a78b6d6 100644
--- a/network/speedometer/speedometer.info
+++ b/network/speedometer/speedometer.info
@@ -1,10 +1,10 @@
 PRGNAM="speedometer"
-VERSION="2.8"
-HOMEPAGE="http://excess.org/speedometer/"
-DOWNLOAD="http://excess.org/speedometer/speedometer-2.8.tar.gz"
-MD5SUM="aa52b9253117523202d6ec8c110344ef"
+VERSION="2.9"
+HOMEPAGE="https://excess.org/speedometer/"
+DOWNLOAD="https://github.com/wardi/speedometer/archive/release-2.9/speedometer-release-2.9.tar.gz"
+MD5SUM="8ed83643533af4fdd7aa867c8369f201"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES=""
+REQUIRES="python3-psutil python-urwid"
 MAINTAINER="Edinaldo P. Silva"
 EMAIL="edps.mundognu@gmail.com"
diff --git a/network/speedtest-cli/README b/network/speedtest-cli/README
index 92e211c0de..6e5659c968 100644
--- a/network/speedtest-cli/README
+++ b/network/speedtest-cli/README
@@ -1 +1,2 @@
-Command line interface for testing internet bandwidth using speedtest.net
+Command line interface for testing internet bandwidth using
+speedtest.net
diff --git a/network/speedtest-cli/speedtest-cli.SlackBuild b/network/speedtest-cli/speedtest-cli.SlackBuild
index 7fe3e579da..33afcff2ac 100644
--- a/network/speedtest-cli/speedtest-cli.SlackBuild
+++ b/network/speedtest-cli/speedtest-cli.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for speedtest-cli
 
-# 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=speedtest-cli
-VERSION=${VERSION:-2.1.0}
-BUILD=${BUILD:-1}
+VERSION=${VERSION:-2.1.3}
+BUILD=${BUILD:-3}
 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}
@@ -71,6 +81,11 @@ find -L . \
 
 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
+
 find $PKG -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 +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/network/speedtest-cli/speedtest-cli.info b/network/speedtest-cli/speedtest-cli.info
index 6cc6ad9e0a..6f2f9c5567 100644
--- a/network/speedtest-cli/speedtest-cli.info
+++ b/network/speedtest-cli/speedtest-cli.info
@@ -1,8 +1,8 @@
 PRGNAM="speedtest-cli"
-VERSION="2.1.0"
+VERSION="2.1.3"
 HOMEPAGE="https://github.com/sivel/speedtest-cli"
-DOWNLOAD="https://files.pythonhosted.org/packages/ac/2a/6e0a7f26ab610a6aef55f4527c11d71fb40c92cb430f0c1879127b5e6c01/speedtest-cli-2.1.0.tar.gz"
-MD5SUM="adbe3469d5f77a8a00b5b6584b902346"
+DOWNLOAD="https://files.pythonhosted.org/packages/85/d2/32c8a30768b788d319f94cde3a77e0ccc1812dca464ad8062d3c4d703e06/speedtest-cli-2.1.3.tar.gz"
+MD5SUM="4bd1cf455e210ce47be1a3290988160b"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/network/sphinx/sphinx.SlackBuild b/network/sphinx/sphinx.SlackBuild
index cc10b1a0a7..e9cc80483a 100644
--- a/network/sphinx/sphinx.SlackBuild
+++ b/network/sphinx/sphinx.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for Sphinx
 # Originally written by Michael Johnson <youngmug@animeneko.net>
@@ -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=sphinx
 VERSION=${VERSION:-2.2.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}
@@ -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/network/spice-gtk/spice-gtk.SlackBuild b/network/spice-gtk/spice-gtk.SlackBuild
index 6561b22050..bf2696d61f 100644
--- a/network/spice-gtk/spice-gtk.SlackBuild
+++ b/network/spice-gtk/spice-gtk.SlackBuild
@@ -1,7 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for spice-gtk
-# 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 +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-gtk
-VERSION=${VERSION:-0.35}
+VERSION=${VERSION:-0.42}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -34,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}
@@ -58,7 +69,7 @@ if pkg-config --exists libusbredirhost; then usbredir="en"; else usbredir="dis";
 if pkg-config --exists libcacard; then cacard="en"; else cacard="dis"; fi
 if pkg-config --exists libphodav-2.0; then phodav="en"; else phodav="dis"; fi
 
-DOCS="AUTHORS COPYING NEWS README THANKS TODO"
+DOCS="AUTHORS CHANGELOG.md COPYING README.md"
 
 set -e 
 
@@ -67,7 +78,7 @@ 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 . \
@@ -76,37 +87,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 {} \;
 
-# Disable broken tests
-sed -i 's/ tests//' Makefile.am Makefile.in
-
-export VALAC=$(which valac)
-export VAPIGEN=$(which vapigen)
-
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
+# Configure, build, and install:
+export CFLAGS="$SLKCFLAGS"
+export CXXFLAGS="$SLKCFLAGS"
+mkdir meson-build
+cd meson-build
+meson setup \
   --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --sysconfdir=/etc \
+  --libdir=lib${LIBDIRSUFFIX} \
+  --libexecdir=/usr/libexec \
+  --bindir=/usr/bin \
+  --sbindir=/usr/sbin \
+  --includedir=/usr/include \
+  --datadir=/usr/share \
   --mandir=/usr/man \
-  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --sysconfdir=/etc \
   --localstatedir=/var \
-  --disable-static \
-  --enable-shared \
-  --with-gtk=3.0 \
-  --enable-gstaudio=yes \
-  --enable-gstvideo=yes \
-  --disable-maintainer-mode \
-  --enable-vala \
-  --disable-celt051 \
-  --enable-dbus=yes \
-  --${usbredir}able-usbredir \
-  --${cacard}able-smartcard \
-  --${phodav}able-webdav \
-  --build=$ARCH-slackware-linux
-
-make
-make install DESTDIR=$PKG
+  --buildtype=release \
+  -D gtk_doc=enabled \
+  -D usb-ids-path=/usr/share/hwdata/usb.ids \
+  .. || exit 1
+  "${NINJA:=ninja}" || exit 1
+  DESTDIR=$PKG $NINJA install || exit 1
+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
@@ -120,6 +123,8 @@ cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
+echo "/sbin/setcap CAP_FOWNER=+ep usr/libexec/spice-client-glib-usb-acl-helper" \
+  >> $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/network/spice-gtk/spice-gtk.info b/network/spice-gtk/spice-gtk.info
index e17de616e8..d66f523ebb 100644
--- a/network/spice-gtk/spice-gtk.info
+++ b/network/spice-gtk/spice-gtk.info
@@ -1,10 +1,10 @@
 PRGNAM="spice-gtk"
-VERSION="0.35"
+VERSION="0.42"
 HOMEPAGE="https://www.spice-space.org"
-DOWNLOAD="https://www.spice-space.org/download/gtk/spice-gtk-0.35.tar.bz2"
-MD5SUM="a8c919ee4a48dfeab619deb70900d788"
+DOWNLOAD="https://www.spice-space.org/download/gtk/spice-gtk-0.42.tar.xz"
+MD5SUM="68becfc1192a61265e9981621e9d3dc6"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="opus spice vala"
+REQUIRES="spice"
 MAINTAINER="Matteo Bernardini"
 EMAIL="ponce@slackbuilds.org"
diff --git a/network/spice/README b/network/spice/README
index 33f1c5c341..c3daadff99 100644
--- a/network/spice/README
+++ b/network/spice/README
@@ -7,5 +7,4 @@ without compromising on the user experience.
 
 libcacard is an optional dependency for virtual smartcard support.
 
-lz4, opus, gst-libav, and gst-plugins-bad (with x264 support)  are also
-optional dependencies.
+gst-plugins-ugly (with x264 support) is also an optional dependency.
diff --git a/network/spice/spice.SlackBuild b/network/spice/spice.SlackBuild
index e887c96ddf..4a95f53261 100644
--- a/network/spice/spice.SlackBuild
+++ b/network/spice/spice.SlackBuild
@@ -1,7 +1,7 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for spice
-# 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=spice
-VERSION=${VERSION:-0.14.1}
+VERSION=${VERSION:-0.15.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -34,13 +37,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" = "i586" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i586"
+  SLKCFLAGS="-O2 -march=i586 -mtune=i586"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -53,7 +63,7 @@ else
   LIBDIRSUFFIX=""
 fi
 
-DOCS="AUTHORS COPYING ChangeLog INSTALL NEWS README"
+DOCS="AUTHORS CHANGELOG.md COPYING README"
 
 # check if libcacard is there
 if pkg-config --exists libcacard ; then
@@ -73,10 +83,10 @@ 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" \
 CXXFLAGS="$SLKCFLAGS" \
@@ -100,8 +110,10 @@ 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
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/network/spice/spice.info b/network/spice/spice.info
index 04a4e89706..1aca0b1790 100644
--- a/network/spice/spice.info
+++ b/network/spice/spice.info
@@ -1,10 +1,10 @@
 PRGNAM="spice"
-VERSION="0.14.1"
+VERSION="0.15.2"
 HOMEPAGE="https://www.spice-space.org"
-DOWNLOAD="https://www.spice-space.org/download/releases/spice-server/spice-0.14.1.tar.bz2"
-MD5SUM="1e2442b08605a5a17430d1aaa0912c24"
+DOWNLOAD="https://www.spice-space.org/download/releases/spice-server/spice-0.15.2.tar.bz2"
+MD5SUM="1de1e9157a1e2396884017978e7cf086"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="opus pyparsing six spice-protocol"
+REQUIRES="spice-protocol"
 MAINTAINER="Matteo Bernardini"
 EMAIL="ponce@slackbuilds.org"
diff --git a/network/sqlmap/sqlmap.SlackBuild b/network/sqlmap/sqlmap.SlackBuild
index 0bfd2b7954..20dc25a8ae 100644
--- a/network/sqlmap/sqlmap.SlackBuild
+++ b/network/sqlmap/sqlmap.SlackBuild
@@ -1,9 +1,9 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for sqlmap.
 
 # Copyright 2010-2011 Marco Bonetti <sid77@slackware.it>
-# Copyright 2015-2018 Brenton Earl <brent@exitstatusone.com>
+# Copyright 2015-2018, 2020 Brenton Earl <brent@exitstatusone.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=sqlmap
-VERSION=${VERSION:-1.2.10}
+VERSION=${VERSION:-1.4.9}
 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}
@@ -78,4 +88,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 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/network/sqlmap/sqlmap.info b/network/sqlmap/sqlmap.info
index d60732ed67..2d9ff51976 100644
--- a/network/sqlmap/sqlmap.info
+++ b/network/sqlmap/sqlmap.info
@@ -1,8 +1,8 @@
 PRGNAM="sqlmap"
-VERSION="1.2.10"
+VERSION="1.4.9"
 HOMEPAGE="http://sqlmap.org/"
-DOWNLOAD="https://github.com/sqlmapproject/sqlmap/archive/1.2.10/sqlmap-1.2.10.tar.gz"
-MD5SUM="55e5aa88807d9ea720edd95792a335a6"
+DOWNLOAD="https://github.com/sqlmapproject/sqlmap/archive/1.4.9/sqlmap-1.4.9.tar.gz"
+MD5SUM="f79dac9b60f40ccdb4e1a05797b7cdc6"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/network/sqlninja/README b/network/sqlninja/README
index 3d26adcf36..fa8e0c4317 100644
--- a/network/sqlninja/README
+++ b/network/sqlninja/README
@@ -1,16 +1,19 @@
-Sqlninja is a tool targeted to exploit SQL Injection vulnerabilities on a web
-application that uses Microsoft SQL Server as its back-end. Its main goal is
-to provide a remote access on the vulnerable DB server, even in a very hostile
-environment. It should be used by penetration testers to help automate the
-process of taking over a DB Server when a SQL Injection vulnerability has been
+Sqlninja is a tool targeted to exploit SQL Injection vulnerabilities
+on a web application that uses Microsoft SQL Server as its
+back-end. Its main goal is to provide a remote access on the
+vulnerable DB server, even in a very hostile environment. It should
+be used by penetration testers to help automate the process of
+taking over a DB Server when a SQL Injection vulnerability has been
 discovered.
 
-Since version 0.2.5, sqlninja will upload .exe files by default instead of
-.scr ones. If you want to upload .scr files instead, the original sqlninja
-files are distributed inside /usr/lib$LIBDIRSUFFIX/sqlninja/scripts/ .
+Since version 0.2.5, sqlninja will upload .exe files by default
+instead of .scr ones. If you want to upload .scr files instead,
+the original sqlninja files are distributed in:
+/usr/lib$LIBDIRSUFFIX/sqlninja/scripts/
 
 Raul Siles' patch for better Metasploit Framework interaction has been
-discontinued since it was released for an old version of sqlninja only. The
-patch added two new timers ($client_delay (30 secs) and $server_delay (5
-secs)) to use within sqlninja. Since it could be still somehow handy it has
-been included in the package documentation directory.
+discontinued since it was released for an old version of sqlninja
+only. The patch added two new timers ($client_delay (30 secs) and
+$server_delay (5 secs)) to use within sqlninja. Since it could be
+still somehow handy it has been included in the package documentation
+directory.
diff --git a/network/sqlninja/sqlninja.SlackBuild b/network/sqlninja/sqlninja.SlackBuild
index ef4b850990..804731d710 100644
--- a/network/sqlninja/sqlninja.SlackBuild
+++ b/network/sqlninja/sqlninja.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for sqlninja
 
@@ -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=sqlninja
 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}
@@ -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/network/sqlninja/sqlninja.info b/network/sqlninja/sqlninja.info
index 8195691c7f..a463831b33 100644
--- a/network/sqlninja/sqlninja.info
+++ b/network/sqlninja/sqlninja.info
@@ -5,6 +5,6 @@ DOWNLOAD="http://downloads.sourceforge.net/sqlninja/sqlninja-0.2.5.tgz"
 MD5SUM="95acfd9c5bc2305f239596c613d4ffc7"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="perl-IO-Socket-SSL perl-Net-Pcap perl-Net-RawIP perl-NetPacket perl-net-dns"
+REQUIRES="perl-Net-Pcap perl-Net-RawIP perl-NetPacket perl-net-dns"
 MAINTAINER="Marco Bonetti"
 EMAIL="sid77@slackware.it"
diff --git a/network/sqlrelay/README b/network/sqlrelay/README
index aafdf2b8ac..0c9f2df3e1 100644
--- a/network/sqlrelay/README
+++ b/network/sqlrelay/README
@@ -1,7 +1,8 @@
-With SQL Relay, you can speed up and enhance the scalability of database-driven
-web-based applications, access databases from unsupported platforms, throttle
-database access, distribute load over clustered or replicated databases,
-route queries and migrate applications from one database to another.
+With SQL Relay, you can speed up and enhance the scalability of
+database-driven web-based applications, access databases from
+unsupported platforms, throttle database access, distribute load
+over clustered or replicated databases, route queries and migrate
+applications from one database to another.
 
-Two optional dependencies, postgresql and freetds will be auto detected at
-build time, they can be found on SlackBuilds.org
+Two optional dependencies, postgresql and freetds will be auto
+detected at build time, they can be found on SlackBuilds.org
diff --git a/network/sqlrelay/sqlrelay.SlackBuild b/network/sqlrelay/sqlrelay.SlackBuild
index aa56ae3355..2c25c6217d 100644
--- a/network/sqlrelay/sqlrelay.SlackBuild
+++ b/network/sqlrelay/sqlrelay.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for sqlrelay
 
@@ -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=sqlrelay
-VERSION=${VERSION:-0.65.0}
+VERSION=${VERSION:-1.9.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"
@@ -94,6 +104,8 @@ sed -i "s/^\(EXAMPLEDIR = \).*$/\1\${prefix}\/doc\/$PRGNAM-$VERSION\/examples/"
 make -j1
 make -j1 install DESTDIR=$PKG
 
+rm -rf $PKG/usr/lib${LIBDIRSUFFIX}/*.la
+
 # Change SysV style init scripts to BSD run control style
 mv $PKG/etc/init.d $PKG/etc/rc.d
 (cd $PKG/etc/rc.d ; for i in * ; do mv $i rc.$i.new; done)
@@ -119,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/network/sqlrelay/sqlrelay.info b/network/sqlrelay/sqlrelay.info
index 99177781f8..67514768c0 100644
--- a/network/sqlrelay/sqlrelay.info
+++ b/network/sqlrelay/sqlrelay.info
@@ -1,8 +1,8 @@
 PRGNAM="sqlrelay"
-VERSION="0.65.0"
+VERSION="1.9.2"
 HOMEPAGE="http://sqlrelay.sourceforge.net/"
-DOWNLOAD="http://downloads.sourceforge.net/sqlrelay/sqlrelay-0.65.0.tar.gz"
-MD5SUM="231cc46bc32f6c05dc372c2f04cdcd02"
+DOWNLOAD="http://downloads.sourceforge.net/sqlrelay/sqlrelay-1.9.2.tar.gz"
+MD5SUM="8dc0ba3befaf2cf688cd90fd4e3e4120"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="rudiments"
diff --git a/network/squid/README b/network/squid/README
index 7756f08719..9c36fcc1b9 100644
--- a/network/squid/README
+++ b/network/squid/README
@@ -1,17 +1,13 @@
 Squid is a high-performance proxy caching server for web clients,
-supporting FTP, gopher, and HTTP data objects.  Unlike traditional caching
-software, squid handles all requests in a single, non-blocking, I/O-driven
-process.
+supporting FTP, gopher, and HTTP data objects. Unlike traditional
+caching software, squid handles all requests in a single,
+non-blocking, I/O-driven process.
 
-Squid supports SSL, extensive access controls, and full request logging.  
-By using the lightweight Internet Cache Protocol, squid caches can be 
-arranged in a hierarchy or mesh for additional bandwidth savings.
+Squid supports SSL, extensive access controls, and full request
+logging. By using the lightweight Internet Cache Protocol, squid
+caches can be arranged in a hierarchy or mesh for additional bandwidth
+savings.
 
 See /usr/doc/squid-*/README.SBo for configuration help.
-Note that the default squid.conf and /etc/logrotate.d/squid files have
-changed in this release, so be sure to merge the changes into place.
-
-To build squid with ICAP client support, specify the option "ICAP=yes",
-for example:
-
-  ICAP=yes ./squid.SlackBuild
+Note that the default files in /etc/squid and /etc/logrotate.d may
+change between releases, so be sure to merge the changes into place.
diff --git a/network/squid/README.SBo b/network/squid/README.SBo
index 5dcc214a06..5a93ccda45 100644
--- a/network/squid/README.SBo
+++ b/network/squid/README.SBo
@@ -10,7 +10,7 @@ executable and add the following to /etc/rc.d/rc.local:
 
 ==============================================================================
 
-Uncomment and edit the following lines in /etc/squid.conf:
+Uncomment and edit the following lines in /etc/squid/squid.conf:
 
 http_port <port> <option>
 
diff --git a/network/squid/doinst.sh b/network/squid/doinst.sh
index 664a873749..b79c23655f 100644
--- a/network/squid/doinst.sh
+++ b/network/squid/doinst.sh
@@ -26,5 +26,6 @@ preserve_perms etc/rc.d/rc.squid.new
 preserve_perms etc/squid/mime.conf.new
 preserve_perms etc/squid/squid.conf.new
 preserve_perms etc/squid/cachemgr.conf.new
+preserve_perms etc/squid/errorpage.css.new
 preserve_perms etc/logrotate.d/squid.new
 
diff --git a/network/squid/rc.squid b/network/squid/rc.squid
index 7aef4777fe..2f3463e6be 100644
--- a/network/squid/rc.squid
+++ b/network/squid/rc.squid
@@ -34,7 +34,7 @@ squid_start() {
 
   # Create piddir and set proper permissions
   mkdir -p /var/run/squid
-  chown root:@SQUIDGROUP@ /var/run/squid
+  chown @SQUIDUSER@:@SQUIDGROUP@ /var/run/squid
 
   echo "Starting Squid:  $SQUIDCMD -F"
   $SQUIDCMD -F
diff --git a/network/squid/squid.SlackBuild b/network/squid/squid.SlackBuild
index 900d9081c8..d819c88077 100644
--- a/network/squid/squid.SlackBuild
+++ b/network/squid/squid.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for squid
 # http://www.squid-cache.org/
@@ -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=squid
-VERSION=${VERSION:-3.5.26}
+VERSION=${VERSION:-6.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}
@@ -68,15 +78,10 @@ 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 {} \;
-
-OPT_ICAP=""
-if [ "${ICAP:-no}" = "yes" ]; then
-  OPT_ICAP="--enable-icap-client"
-fi
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 # last option is needed on current
 CFLAGS="$SLKCFLAGS" \
@@ -93,11 +98,34 @@ CXXFLAGS="$SLKCFLAGS" \
   --enable-snmp \
   --enable-auth \
   --enable-auth-basic \
+  --enable-auth-ntlm \
+  --enable-auth-digest \
+  --enable-auth-negotiate \
+  --enable-removal-policies="lru,heap" \
+  --enable-storeio="aufs,ufs,diskd,rock" \
+  --enable-delay-pools \
+  --enable-arp-acl \
+  --with-openssl \
+  --enable-snmp \
   --enable-linux-netfilter \
+  --enable-ident-lookups \
+  --enable-useragent-log \
+  --enable-cache-digests \
+  --enable-referer-log \
+  --enable-arp-acl \
+  --enable-htcp \
+  --enable-carp \
+  --enable-epoll \
+  --with-large-files \
+  --enable-arp-acl \
+  --with-default-user=$SQUIDUSER \
   --enable-async-io \
-  $OPT_ICAP \
-  --build=$ARCH-slackware-linux \
-  --disable-strict-error-checking
+  --enable-truncate \
+  --enable-icap-client \
+  --enable-ssl-crtd \
+  --disable-arch-native \
+  --disable-strict-error-checking \
+  --enable-wccpv2
 
 make all
 make install DESTDIR=$PKG
@@ -117,30 +145,30 @@ cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 chown root:root $PKG/usr/doc/$PRGNAM-$VERSION/*
 
 mkdir -p $PKG/etc/rc.d
-sed -e "s,@SQUIDGROUP@,$SQUIDGROUP," $CWD/rc.squid > $PKG/etc/rc.d/rc.squid.new
+sed  -e "s,@SQUIDUSER@,$SQUIDUSER," -e "s,@SQUIDGROUP@,$SQUIDGROUP," \
+  $CWD/rc.squid > $PKG/etc/rc.d/rc.squid.new
 
 mkdir -p $PKG/etc/logrotate.d
-sed -e "s,@USER@,$SQUIDUSER," -e "s,@GROUP@,$SQUIDGROUP," $CWD/squid.logrotate \
+sed -e "s,@SQUIDUSER@,$SQUIDUSER," -e "s,@SQUIDGROUP@,$SQUIDGROUP," $CWD/squid.logrotate \
   > $PKG/etc/logrotate.d/squid.new
 
-mv $PKG/etc/squid/mime.conf $PKG/etc/squid/mime.conf.new
-mv $PKG/etc/squid/cachemgr.conf $PKG/etc/squid/cachemgr.conf.new
-rm $PKG/etc/squid/squid.conf
-cat $CWD/squid.conf > $PKG/etc/squid/squid.conf.new
-cat $CWD/squid.conf.documented > $PKG/etc/squid/squid.conf.documented
+( cd $PKG/etc/squid
+  for i in mime cachemgr squid ; do mv $i.conf $i.conf.new ; done
+  mv errorpage.css errorpage.css.new )
+cp src/squid.conf.documented $PKG/etc/squid/squid.conf.documented
 
 mkdir -p $PKG/var/{cache,lib,run}/squid
 chown $SQUIDUSER:$SQUIDGROUP $PKG/var/{cache,lib,log,run}/squid
 
-## Edit the config file to set the user and group to run as
-sed -i -e 's%^cache_effective_user nobody%cache_effective_user '"$SQUIDUSER"'%g' \
-  $PKG/etc/squid/squid.conf.new
-sed -i -e 's%^cache_effective_group nobody%cache_effective_group '"$SQUIDGROUP"'%g' \
-  $PKG/etc/squid/squid.conf.new
+# Set a chache dir, the user and group to run as and set the pid location
+sed -i "s|^#cache_dir|cache_dir|" $PKG/etc/squid/squid.conf.new
+echo -e "\npid_filename /var/run/squid/squid.pid" >> $PKG/etc/squid/squid.conf.new
+echo "cache_effective_user $SQUIDUSER"            >> $PKG/etc/squid/squid.conf.new
+echo "cache_effective_group $SQUIDGROUP"          >> $PKG/etc/squid/squid.conf.new
 
 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/network/squid/squid.conf b/network/squid/squid.conf
deleted file mode 100644
index 1e9345bc30..0000000000
--- a/network/squid/squid.conf
+++ /dev/null
@@ -1,7806 +0,0 @@
-#	WELCOME TO SQUID 3.4.10
-#	----------------------------
-#	
-#	This is the documentation for the Squid configuration file.
-#	This documentation can also be found online at:
-#		http://www.squid-cache.org/Doc/config/
-#	
-#	You may wish to look at the Squid home page and wiki for the
-#	FAQ and other documentation:
-#		http://www.squid-cache.org/
-#		http://wiki.squid-cache.org/SquidFaq
-#		http://wiki.squid-cache.org/ConfigExamples
-#	
-#	This documentation shows what the defaults for various directives
-#	happen to be.  If you don't need to change the default, you should
-#	leave the line out of your squid.conf in most cases.
-#	
-#	In some cases "none" refers to no default setting at all,
-#	while in other cases it refers to the value of the option
-#	- the comments for that keyword indicate if this is the case.
-#
-
-#  Configuration options can be included using the "include" directive.
-#  Include takes a list of files to include. Quoting and wildcards are
-#  supported.
-#
-#  For example,
-#
-#  include /path/to/included/file/squid.acl.config
-#
-#  Includes can be nested up to a hard-coded depth of 16 levels.
-#  This arbitrary restriction is to prevent recursive include references
-#  from causing Squid entering an infinite loop whilst trying to load
-#  configuration files.
-#
-#  Values with byte units
-#
-#	Squid accepts size units on some size related directives. All
-#	such directives are documented with a default value displaying
-#	a unit.
-#
-#	Units accepted by Squid are:
-#		bytes - byte
-#		KB - Kilobyte (1024 bytes)
-#		MB - Megabyte
-#		GB - Gigabyte
-#
-#  Values with spaces, quotes, and other special characters
-#
-#	Squid supports directive parameters with spaces, quotes, and other
-#	special characters. Surround such parameters with "double quotes". Use
-#	the configuration_includes_quoted_values directive to enable or
-#	disable that support.
-#
-#	For example;
-#
-#		configuration_includes_quoted_values on
-#		acl group external groupCheck Administrators "Internet Users" Guest
-#		configuration_includes_quoted_values off
-#
-#
-#  Conditional configuration
-#
-#	If-statements can be used to make configuration directives
-#	depend on conditions:
-#
-#	    if <CONDITION>
-#	        ... regular configuration directives ...
-#	    [else
-#	        ... regular configuration directives ...]
-#	    endif
-#
-#	The else part is optional. The keywords "if", "else", and "endif"
-#	must be typed on their own lines, as if they were regular
-#	configuration directives.
-#
-#	NOTE: An else-if condition is not supported.
-#
-#	These individual conditions types are supported:
-#
-#	    true
-#		Always evaluates to true.
-#	    false
-#		Always evaluates to false.
-#	    <integer> = <integer>
-#	        Equality comparison of two integer numbers.
-#
-#
-#  SMP-Related Macros
-#
-#	The following SMP-related preprocessor macros can be used.
-#
-#	${process_name} expands to the current Squid process "name"
-#	(e.g., squid1, squid2, or cache1).
-#
-#	${process_number} expands to the current Squid process
-#	identifier, which is an integer number (e.g., 1, 2, 3) unique
-#	across all Squid processes.
-
-#  TAG: broken_vary_encoding
-#	This option is not yet supported by Squid-3.
-#Default:
-# none
-
-#  TAG: cache_vary
-#	This option is not yet supported by Squid-3.
-#Default:
-# none
-
-#  TAG: collapsed_forwarding
-#	This option is not yet supported by Squid-3. see http://bugs.squid-cache.org/show_bug.cgi?id=3495
-#Default:
-# none
-
-#  TAG: error_map
-#	This option is not yet supported by Squid-3.
-#Default:
-# none
-
-#  TAG: external_refresh_check
-#	This option is not yet supported by Squid-3.
-#Default:
-# none
-
-#  TAG: location_rewrite_program
-#	This option is not yet supported by Squid-3.
-#Default:
-# none
-
-#  TAG: refresh_stale_hit
-#	This option is not yet supported by Squid-3.
-#Default:
-# none
-
-#  TAG: ignore_ims_on_miss
-#	Remove this line. The HTTP/1.1 feature is now configured by 'cache_miss_revalidate'.
-#Default:
-# none
-
-#  TAG: ignore_expect_100
-#	Remove this line. The HTTP/1.1 feature is now fully supported by default.
-#Default:
-# none
-
-#  TAG: dns_v4_fallback
-#	Remove this line. Squid performs a 'Happy Eyeballs' algorithm, the 'fallback' algorithm is no longer relevant.
-#Default:
-# none
-
-#  TAG: ftp_list_width
-#	Remove this line. Configure FTP page display using the CSS controls in errorpages.css instead.
-#Default:
-# none
-
-#  TAG: maximum_single_addr_tries
-#	Replaced by connect_retries. The behaviour has changed, please read the documentation before altering.
-#Default:
-# none
-
-#  TAG: update_headers
-#	Remove this line. The feature is supported by default in storage types where update is implemented.
-#Default:
-# none
-
-#  TAG: url_rewrite_concurrency
-#	Remove this line. Set the 'concurrency=' option of url_rewrite_children instead.
-#Default:
-# none
-
-#  TAG: dns_testnames
-#	Remove this line. DNS is no longer tested on startup.
-#Default:
-# none
-
-#  TAG: extension_methods
-#	Remove this line. All valid methods for HTTP are accepted by default.
-#Default:
-# none
-
-#  TAG: zero_buffers
-#Default:
-# none
-
-#  TAG: incoming_rate
-#Default:
-# none
-
-#  TAG: server_http11
-#	Remove this line. HTTP/1.1 is supported by default.
-#Default:
-# none
-
-#  TAG: upgrade_http0.9
-#	Remove this line. ICY/1.0 streaming protocol is supported by default.
-#Default:
-# none
-
-#  TAG: zph_local
-#	Alter these entries. Use the qos_flows directive instead.
-#Default:
-# none
-
-#  TAG: header_access
-#	Since squid-3.0 replace with request_header_access or reply_header_access
-#	depending on whether you wish to match client requests or server replies.
-#Default:
-# none
-
-#  TAG: httpd_accel_no_pmtu_disc
-#	Since squid-3.0 use the 'disable-pmtu-discovery' flag on http_port instead.
-#Default:
-# none
-
-#  TAG: wais_relay_host
-#	Replace this line with 'cache_peer' configuration.
-#Default:
-# none
-
-#  TAG: wais_relay_port
-#	Replace this line with 'cache_peer' configuration.
-#Default:
-# none
-
-# OPTIONS FOR AUTHENTICATION
-# -----------------------------------------------------------------------------
-
-#  TAG: auth_param
-#	This is used to define parameters for the various authentication
-#	schemes supported by Squid.
-#
-#	format: auth_param scheme parameter [setting]
-#
-#	The order in which authentication schemes are presented to the client is
-#	dependent on the order the scheme first appears in config file. IE
-#	has a bug (it's not RFC 2617 compliant) in that it will use the basic
-#	scheme if basic is the first entry presented, even if more secure
-#	schemes are presented. For now use the order in the recommended
-#	settings section below. If other browsers have difficulties (don't
-#	recognize the schemes offered even if you are using basic) either
-#	put basic first, or disable the other schemes (by commenting out their
-#	program entry).
-#
-#	Once an authentication scheme is fully configured, it can only be
-#	shutdown by shutting squid down and restarting. Changes can be made on
-#	the fly and activated with a reconfigure. I.E. You can change to a
-#	different helper, but not unconfigure the helper completely.
-#
-#	Please note that while this directive defines how Squid processes
-#	authentication it does not automatically activate authentication.
-#	To use authentication you must in addition make use of ACLs based
-#	on login name in http_access (proxy_auth, proxy_auth_regex or
-#	external with %LOGIN used in the format tag). The browser will be
-#	challenged for authentication on the first such acl encountered
-#	in http_access processing and will also be re-challenged for new
-#	login credentials if the request is being denied by a proxy_auth
-#	type acl.
-#
-#	WARNING: authentication can't be used in a transparently intercepting
-#	proxy as the client then thinks it is talking to an origin server and
-#	not the proxy. This is a limitation of bending the TCP/IP protocol to
-#	transparently intercepting port 80, not a limitation in Squid.
-#	Ports flagged 'transparent', 'intercept', or 'tproxy' have
-#	authentication disabled.
-#
-#	=== Parameters for the basic scheme follow. ===
-#
-#	"program" cmdline
-#	Specify the command for the external authenticator.  Such a program
-#	reads a line containing "username password" and	replies with one of
-#	three results:
-#
-#	  OK
-#		the user exists.
-#
-#	  ERR
-#		the user does not exist.
-#
-#	  BH
-#		An internal error occurred in the helper, preventing
-#		a result being identified.
-#
-#	"ERR" and "BH" results may optionally be followed by message="..."
-#	containing a description available as %m in the returned error page.
-#
-#	If you use an authenticator, make sure you have 1 acl of type
-#	proxy_auth.
-#
-#	By default, the basic authentication scheme is not used unless a
-#	program is specified.
-#
-#	If you want to use the traditional NCSA proxy authentication, set
-#	this line to something like
-#
-#	auth_param basic program /usr/libexec/basic_ncsa_auth /usr/etc/passwd
-#
-#	"utf8" on|off
-#	HTTP uses iso-latin-1 as character set, while some authentication
-#	backends such as LDAP expects UTF-8. If this is set to on Squid will
-#	translate the HTTP iso-latin-1 charset to UTF-8 before sending the
-#	username & password to the helper.
-#
-#	"children" numberofchildren [startup=N] [idle=N] [concurrency=N]
-#	The maximum number of authenticator processes to spawn. If you start too few
-#	Squid will have to wait for them to process a backlog of credential
-#	verifications, slowing it down. When password verifications are
-#	done via a (slow) network you are likely to need lots of
-#	authenticator processes.
-#
-#	The startup= and idle= options permit some skew in the exact amount
-#	run. A minimum of startup=N will begin during startup and reconfigure.
-#	Squid will start more in groups of up to idle=N in an attempt to meet
-#	traffic needs and to keep idle=N free above those traffic needs up to
-#	the maximum.
-#
-#	The concurrency= option sets the number of concurrent requests the
-#	helper can process.  The default of 0 is used for helpers who only
-#	supports one request at a time. Setting this to a number greater than
-#	0 changes the protocol used to include a channel number first on the
-#	request/response line, allowing multiple requests to be sent to the
-#	same helper in parallel without waiting for the response.
-#	Must not be set unless it's known the helper supports this.
-#
-#	auth_param basic children 20 startup=0 idle=1
-#
-#	"realm" realmstring
-#	Specifies the realm name which is to be reported to the
-#	client for the basic proxy authentication scheme (part of
-#	the text the user will see when prompted their username and
-#	password). There is no default.
-#	auth_param basic realm Squid proxy-caching web server
-#
-#	"credentialsttl" timetolive
-#	Specifies how long squid assumes an externally validated
-#	username:password pair is valid for - in other words how
-#	often the helper program is called for that user. Set this
-#	low to force revalidation with short lived passwords.  Note
-#	setting this high does not impact your susceptibility
-#	to replay attacks unless you are using an one-time password
-#	system (such as SecureID).  If you are using such a system,
-#	you will be vulnerable to replay attacks unless you also
-#	use the max_user_ip ACL in an http_access rule.
-#
-#	"casesensitive" on|off
-#	Specifies if usernames are case sensitive. Most user databases are
-#	case insensitive allowing the same username to be spelled using both
-#	lower and upper case letters, but some are case sensitive. This
-#	makes a big difference for user_max_ip ACL processing and similar.
-#	auth_param basic casesensitive off
-#
-#	=== Parameters for the digest scheme follow ===
-#
-#	"program" cmdline
-#	Specify the command for the external authenticator.  Such
-#	a program reads a line containing "username":"realm" and
-#	replies with one of three results:
-#
-#	  OK ha1="..."
-#		the user exists. The ha1= key is mandatory and
-#		contains the appropriate H(A1) value, hex encoded.
-#		See rfc 2616 for the definition of H(A1).
-#
-#	  ERR
-#		the user does not exist.
-#
-#	  BH
-#		An internal error occurred in the helper, preventing
-#		a result being identified.
-#
-#	"ERR" and "BH" results may optionally be followed by message="..."
-#	containing a description available as %m in the returned error page.
-#
-#	By default, the digest authentication scheme is not used unless a
-#	program is specified.
-#
-#	If you want to use a digest authenticator, set this line to
-#	something like
-#
-#	auth_param digest program /usr/bin/digest_pw_auth /usr/etc/digpass
-#
-#	"utf8" on|off
-#	HTTP uses iso-latin-1 as character set, while some authentication
-#	backends such as LDAP expects UTF-8. If this is set to on Squid will
-#	translate the HTTP iso-latin-1 charset to UTF-8 before sending the
-#	username & password to the helper.
-#
-#	"children" numberofchildren [startup=N] [idle=N] [concurrency=N]
-#	The maximum number of authenticator processes to spawn (default 5).
-#	If you start too few Squid will have to wait for them to
-#	process a backlog of H(A1) calculations, slowing it down.
-#	When the H(A1) calculations are done via a (slow) network
-#	you are likely to need lots of authenticator processes.
-#
-#	The startup= and idle= options permit some skew in the exact amount
-#	run. A minimum of startup=N will begin during startup and reconfigure.
-#	Squid will start more in groups of up to idle=N in an attempt to meet
-#	traffic needs and to keep idle=N free above those traffic needs up to
-#	the maximum.
-#
-#	The concurrency= option sets the number of concurrent requests the
-#	helper can process.  The default of 0 is used for helpers who only
-#	supports one request at a time. Setting this to a number greater than
-#	0 changes the protocol used to include a channel number first on the
-#	request/response line, allowing multiple requests to be sent to the
-#	same helper in parallel without waiting for the response.
-#	Must not be set unless it's known the helper supports this.
-#
-#	auth_param digest children 20 startup=0 idle=1
-#
-#	"realm" realmstring
-#	Specifies the realm name which is to be reported to the
-#	client for the digest proxy authentication scheme (part of
-#	the text the user will see when prompted their username and
-#	password). There is no default.
-#	auth_param digest realm Squid proxy-caching web server
-#
-#	"nonce_garbage_interval" timeinterval
-#	Specifies the interval that nonces that have been issued
-#	to client_agent's are checked for validity.
-#
-#	"nonce_max_duration" timeinterval
-#	Specifies the maximum length of time a given nonce will be
-#	valid for.
-#
-#	"nonce_max_count" number
-#	Specifies the maximum number of times a given nonce can be
-#	used.
-#
-#	"nonce_strictness" on|off
-#	Determines if squid requires strict increment-by-1 behavior
-#	for nonce counts, or just incrementing (off - for use when
-#	user agents generate nonce counts that occasionally miss 1
-#	(ie, 1,2,4,6)). Default off.
-#
-#	"check_nonce_count" on|off
-#	This directive if set to off can disable the nonce count check
-#	completely to work around buggy digest qop implementations in
-#	certain mainstream browser versions. Default on to check the
-#	nonce count to protect from authentication replay attacks.
-#
-#	"post_workaround" on|off
-#	This is a workaround to certain buggy browsers who sends
-#	an incorrect request digest in POST requests when reusing
-#	the same nonce as acquired earlier on a GET request.
-#
-#	=== NTLM scheme options follow ===
-#
-#	"program" cmdline
-#	Specify the command for the external NTLM authenticator.
-#	Such a program reads exchanged NTLMSSP packets with
-#	the browser via Squid until authentication is completed.
-#	If you use an NTLM authenticator, make sure you have 1 acl
-#	of type proxy_auth.  By default, the NTLM authenticator program
-#	is not used.
-#
-#	auth_param ntlm program /usr/bin/ntlm_auth
-#
-#	"children" numberofchildren [startup=N] [idle=N]
-#	The maximum number of authenticator processes to spawn (default 5).
-#	If you start too few Squid will have to wait for them to
-#	process a backlog of credential verifications, slowing it
-#	down. When credential verifications are done via a (slow)
-#	network you are likely to need lots of authenticator
-#	processes.
-#
-#	The startup= and idle= options permit some skew in the exact amount
-#	run. A minimum of startup=N will begin during startup and reconfigure.
-#	Squid will start more in groups of up to idle=N in an attempt to meet
-#	traffic needs and to keep idle=N free above those traffic needs up to
-#	the maximum.
-#
-#	auth_param ntlm children 20 startup=0 idle=1
-#
-#	"keep_alive" on|off
-#	If you experience problems with PUT/POST requests when using the
-#	Negotiate authentication scheme then you can try setting this to
-#	off. This will cause Squid to forcibly close the connection on
-#	the initial requests where the browser asks which schemes are
-#	supported by the proxy.
-#
-#	auth_param ntlm keep_alive on
-#
-#	=== Options for configuring the NEGOTIATE auth-scheme follow ===
-#
-#	"program" cmdline
-#	Specify the command for the external Negotiate authenticator.
-#	This protocol is used in Microsoft Active-Directory enabled setups with
-#	the Microsoft Internet Explorer or Mozilla Firefox browsers.
-#	Its main purpose is to exchange credentials with the Squid proxy
-#	using the Kerberos mechanisms.
-#	If you use a Negotiate authenticator, make sure you have at least
-#	one acl of type proxy_auth active. By default, the negotiate
-#	authenticator program is not used.
-#	The only supported program for this role is the ntlm_auth
-#	program distributed as part of Samba, version 4 or later.
-#
-#	auth_param negotiate program /usr/bin/ntlm_auth --helper-protocol=gss-spnego
-#
-#	"children" numberofchildren [startup=N] [idle=N]
-#	The maximum number of authenticator processes to spawn (default 5).
-#	If you start too few Squid will have to wait for them to
-#	process a backlog of credential verifications, slowing it
-#	down. When credential verifications are done via a (slow)
-#	network you are likely to need lots of authenticator
-#	processes.
-#
-#	The startup= and idle= options permit some skew in the exact amount
-#	run. A minimum of startup=N will begin during startup and reconfigure.
-#	Squid will start more in groups of up to idle=N in an attempt to meet
-#	traffic needs and to keep idle=N free above those traffic needs up to
-#	the maximum.
-#
-#	auth_param negotiate children 20 startup=0 idle=1
-#
-#	"keep_alive" on|off
-#	If you experience problems with PUT/POST requests when using the
-#	Negotiate authentication scheme then you can try setting this to
-#	off. This will cause Squid to forcibly close the connection on
-#	the initial requests where the browser asks which schemes are
-#	supported by the proxy.
-#
-#	auth_param negotiate keep_alive on
-#
-#	
-#	Examples:
-#
-##Recommended minimum configuration per scheme:
-##auth_param negotiate program <uncomment and complete this line to activate>
-##auth_param negotiate children 20 startup=0 idle=1
-##auth_param negotiate keep_alive on
-##
-##auth_param ntlm program <uncomment and complete this line to activate>
-##auth_param ntlm children 20 startup=0 idle=1
-##auth_param ntlm keep_alive on
-##
-##auth_param digest program <uncomment and complete this line>
-##auth_param digest children 20 startup=0 idle=1
-##auth_param digest realm Squid proxy-caching web server
-##auth_param digest nonce_garbage_interval 5 minutes
-##auth_param digest nonce_max_duration 30 minutes
-##auth_param digest nonce_max_count 50
-##
-##auth_param basic program <uncomment and complete this line>
-##auth_param basic children 5 startup=5 idle=1
-##auth_param basic realm Squid proxy-caching web server
-##auth_param basic credentialsttl 2 hours
-#Default:
-# none
-
-#  TAG: authenticate_cache_garbage_interval
-#	The time period between garbage collection across the username cache.
-#	This is a trade-off between memory utilization (long intervals - say
-#	2 days) and CPU (short intervals - say 1 minute). Only change if you
-#	have good reason to.
-#Default:
-# authenticate_cache_garbage_interval 1 hour
-
-#  TAG: authenticate_ttl
-#	The time a user & their credentials stay in the logged in
-#	user cache since their last request. When the garbage
-#	interval passes, all user credentials that have passed their
-#	TTL are removed from memory.
-#Default:
-# authenticate_ttl 1 hour
-
-#  TAG: authenticate_ip_ttl
-#	If you use proxy authentication and the 'max_user_ip' ACL,
-#	this directive controls how long Squid remembers the IP
-#	addresses associated with each user.  Use a small value
-#	(e.g., 60 seconds) if your users might change addresses
-#	quickly, as is the case with dialup.   You might be safe
-#	using a larger value (e.g., 2 hours) in a corporate LAN
-#	environment with relatively static address assignments.
-#Default:
-# authenticate_ip_ttl 1 second
-
-# ACCESS CONTROLS
-# -----------------------------------------------------------------------------
-
-#  TAG: external_acl_type
-#	This option defines external acl classes using a helper program
-#	to look up the status
-#
-#	  external_acl_type name [options] FORMAT.. /path/to/helper [helper arguments..]
-#
-#	Options:
-#
-#	  ttl=n		TTL in seconds for cached results (defaults to 3600
-#	  		for 1 hour)
-#
-#	  negative_ttl=n
-#	  		TTL for cached negative lookups (default same
-#	  		as ttl)
-#
-#	  grace=n	Percentage remaining of TTL where a refresh of a
-#			cached entry should be initiated without needing to
-#			wait for a new reply. (default is for no grace period)
-#
-#	  cache=n	Limit the result cache size, default is 262144.
-#			The expanded FORMAT value is used as the cache key, so
-#			if the details in FORMAT are highly variable a larger
-#			cache may be needed to produce reduction in helper load.
-#
-#	  children-max=n
-#			Maximum number of acl helper processes spawned to service
-#			external acl lookups of this type. (default 20)
-#
-#	  children-startup=n
-#			Minimum number of acl helper processes to spawn during
-#			startup and reconfigure to service external acl lookups
-#			of this type. (default 0)
-#
-#	  children-idle=n
-#			Number of acl helper processes to keep ahead of traffic
-#			loads. Squid will spawn this many at once whenever load
-#			rises above the capabilities of existing processes.
-#			Up to the value of children-max. (default 1)
-#
-#	  concurrency=n	concurrency level per process. Only used with helpers
-#			capable of processing more than one query at a time.
-#
-#	  protocol=2.5	Compatibility mode for Squid-2.5 external acl helpers.
-#
-#	  ipv4 / ipv6	IP protocol used to communicate with this helper.
-#			The default is to auto-detect IPv6 and use it when available.
-#
-#
-#	FORMAT specifications
-#
-#	  %LOGIN	Authenticated user login name
-#	  %EXT_USER	Username from previous external acl
-#	  %EXT_LOG	Log details from previous external acl
-#	  %EXT_TAG	Tag from previous external acl
-#	  %IDENT	Ident user name
-#	  %SRC		Client IP
-#	  %SRCPORT	Client source port
-#	  %URI		Requested URI
-#	  %DST		Requested host
-#	  %PROTO	Requested protocol
-#	  %PORT		Requested port
-#	  %PATH		Requested URL path
-#	  %METHOD	Request method
-#	  %MYADDR	Squid interface address
-#	  %MYPORT	Squid http_port number
-#	  %PATH		Requested URL-path (including query-string if any)
-#	  %USER_CERT	SSL User certificate in PEM format
-#	  %USER_CERTCHAIN SSL User certificate chain in PEM format
-#	  %USER_CERT_xx	SSL User certificate subject attribute xx
-#	  %USER_CA_CERT_xx SSL User certificate issuer attribute xx
-#
-#	  %>{Header}	HTTP request header "Header"
-#	  %>{Hdr:member}
-#	  		HTTP request header "Hdr" list member "member"
-#	  %>{Hdr:;member}
-#	  		HTTP request header list member using ; as
-#	  		list separator. ; can be any non-alphanumeric
-#			character.
-#
-#	  %<{Header}	HTTP reply header "Header"
-#	  %<{Hdr:member}
-#	  		HTTP reply header "Hdr" list member "member"
-#	  %<{Hdr:;member}
-#	  		HTTP reply header list member using ; as
-#	  		list separator. ; can be any non-alphanumeric
-#			character.
-#
-#	  %ACL		The name of the ACL being tested.
-#	  %DATA		The ACL arguments. If not used then any arguments
-#			is automatically added at the end of the line
-#			sent to the helper.
-#			NOTE: this will encode the arguments as one token,
-#			whereas the default will pass each separately.
-#
-#	  %%		The percent sign. Useful for helpers which need
-#			an unchanging input format.
-#
-#
-#	General request syntax:
-#
-#	  [channel-ID] FORMAT-values [acl-values ...]
-#
-#
-#	FORMAT-values consists of transaction details expanded with
-#	whitespace separation per the config file FORMAT specification
-#	using the FORMAT macros listed above.
-#
-#	acl-values consists of any string specified in the referencing
-#	config 'acl ... external' line. see the "acl external" directive.
-#
-#	Request values sent to the helper are URL escaped to protect
-#	each value in requests against whitespaces.
-#
-#	If using protocol=2.5 then the request sent to the helper is not
-#	URL escaped to protect against whitespace.
-#
-#	NOTE: protocol=3.0 is deprecated as no longer necessary.
-#
-#	When using the concurrency= option the protocol is changed by
-#	introducing a query channel tag in front of the request/response.
-#	The query channel tag is a number between 0 and concurrency-1.
-#	This value must be echoed back unchanged to Squid as the first part
-#	of the response relating to its request.
-#
-#
-#	The helper receives lines expanded per the above format specification
-#	and for each input line returns 1 line starting with OK/ERR/BH result
-#	code and optionally followed by additional keywords with more details.
-#
-#
-#	General result syntax:
-#
-#	  [channel-ID] result keyword=value ...
-#
-#	Result consists of one of the codes:
-#
-#	  OK
-#		the ACL test produced a match.
-#
-#	  ERR
-#		the ACL test does not produce a match.
-#
-#	  BH
-#		An internal error occurred in the helper, preventing
-#		a result being identified.
-#
-#	The meaning of 'a match' is determined by your squid.conf
-#	access control configuration. See the Squid wiki for details.
-#
-#	Defined keywords:
-#
-#	  user=		The users name (login)
-#
-#	  password=	The users password (for login= cache_peer option)
-#
-#	  message=	Message describing the reason for this response.
-#			Available as %o in error pages.
-#			Useful on (ERR and BH results).
-#
-#	  tag=		Apply a tag to a request. Only sets a tag once,
-#			does not alter existing tags.
-#
-#	  log=		String to be logged in access.log. Available as
-#	  		%ea in logformat specifications.
-#
-#	Any keywords may be sent on any response whether OK, ERR or BH.
-#
-#	All response keyword values need to be a single token with URL
-#	escaping, or enclosed in double quotes (") and escaped using \ on
-#	any double quotes or \ characters within the value. The wrapping
-#	double quotes are removed before the value is interpreted by Squid.
-#	\r and \n are also replace by CR and LF.
-#
-#	Some example key values:
-#
-#		user=John%20Smith
-#		user="John Smith"
-#		user="J. \"Bob\" Smith"
-#Default:
-# none
-
-#  TAG: acl
-#	Defining an Access List
-#
-#	Every access list definition must begin with an aclname and acltype, 
-#	followed by either type-specific arguments or a quoted filename that
-#	they are read from.
-#
-#	   acl aclname acltype argument ...
-#	   acl aclname acltype "file" ...
-#
-#	When using "file", the file should contain one item per line.
-#
-#	Some acl types supports options which changes their default behaviour.
-#	The available options are:
-#
-#	-i,+i	By default, regular expressions are CASE-SENSITIVE. To make them
-#		case-insensitive, use the -i option. To return case-sensitive
-#		use the +i option between patterns, or make a new ACL line
-#		without -i.	
-#
-#	-n	Disable lookups and address type conversions.  If lookup or
-#		conversion is required because the parameter type (IP or
-#		domain name) does not match the message address type (domain
-#		name or IP), then the ACL would immediately declare a mismatch
-#		without any warnings or lookups.
-#
-#	--	Used to stop processing all options, in the case the first acl
-#		value has '-' character as first character (for example the '-'
-#		is a valid domain name)
-#
-#	Some acl types require suspending the current request in order
-#	to access some external data source.
-#	Those which do are marked with the tag [slow], those which
-#	don't are marked as [fast].
-#	See http://wiki.squid-cache.org/SquidFaq/SquidAcl
-#	for further information
-#
-#	***** ACL TYPES AVAILABLE *****
-#
-#	acl aclname src ip-address/mask ...	# clients IP address [fast]
-#	acl aclname src addr1-addr2/mask ...	# range of addresses [fast]
-#	acl aclname dst [-n] ip-address/mask ...	# URL host's IP address [slow]
-#	acl aclname localip ip-address/mask ... # IP address the client connected to [fast]
-#
-#	acl aclname arp      mac-address ... (xx:xx:xx:xx:xx:xx notation)
-#	  # The arp ACL requires the special configure option --enable-arp-acl.
-#	  # Furthermore, the ARP ACL code is not portable to all operating systems.
-#	  # It works on Linux, Solaris, Windows, FreeBSD, and some
-#	  # other *BSD variants.
-#	  # [fast]
-#	  #
-#	  # NOTE: Squid can only determine the MAC address for clients that are on
-#	  # the same subnet. If the client is on a different subnet,
-#	  # then Squid cannot find out its MAC address.
-#
-#	acl aclname srcdomain   .foo.com ...
-#	  # reverse lookup, from client IP [slow]
-#	acl aclname dstdomain [-n] .foo.com ...
-#	  # Destination server from URL [fast]
-#	acl aclname srcdom_regex [-i] \.foo\.com ...
-#	  # regex matching client name [slow]
-#	acl aclname dstdom_regex [-n] [-i] \.foo\.com ...
-#	  # regex matching server [fast]
-#	  #
-#	  # For dstdomain and dstdom_regex a reverse lookup is tried if a IP
-#	  # based URL is used and no match is found. The name "none" is used
-#	  # if the reverse lookup fails.
-#
-#	acl aclname src_as number ...
-#	acl aclname dst_as number ...
-#	  # [fast]
-#	  # Except for access control, AS numbers can be used for
-#	  # routing of requests to specific caches. Here's an
-#	  # example for routing all requests for AS#1241 and only
-#	  # those to mycache.mydomain.net:
-#	  # acl asexample dst_as 1241
-#	  # cache_peer_access mycache.mydomain.net allow asexample
-#	  # cache_peer_access mycache_mydomain.net deny all
-#
-#	acl aclname peername myPeer ...
-#	  # [fast]
-#	  # match against a named cache_peer entry
-#	  # set unique name= on cache_peer lines for reliable use.
-#
-#	acl aclname time [day-abbrevs] [h1:m1-h2:m2]
-#	  # [fast]
-#	  #  day-abbrevs:
-#	  #	S - Sunday
-#	  #	M - Monday
-#	  #	T - Tuesday
-#	  #	W - Wednesday
-#	  #	H - Thursday
-#	  #	F - Friday
-#	  #	A - Saturday
-#	  #  h1:m1 must be less than h2:m2
-#
-#	acl aclname url_regex [-i] ^http:// ...
-#	  # regex matching on whole URL [fast]
-#	acl aclname urllogin [-i] [^a-zA-Z0-9] ...
-#	  # regex matching on URL login field
-#	acl aclname urlpath_regex [-i] \.gif$ ...
-#	  # regex matching on URL path [fast]
-#
-#	acl aclname port 80 70 21 0-1024...   # destination TCP port [fast]
-#	                                      # ranges are alloed
-#	acl aclname localport 3128 ...	      # TCP port the client connected to [fast]
-#	                                      # NP: for interception mode this is usually '80'
-#
-#	acl aclname myportname 3128 ...       # http(s)_port name [fast]
-#
-#	acl aclname proto HTTP FTP ...        # request protocol [fast]
-# 
-#	acl aclname method GET POST ...       # HTTP request method [fast]
-#
-#	acl aclname http_status 200 301 500- 400-403 ... 
-#	  # status code in reply [fast]
-#
-#	acl aclname browser [-i] regexp ...
-#	  # pattern match on User-Agent header (see also req_header below) [fast]
-#
-#	acl aclname referer_regex [-i] regexp ...
-#	  # pattern match on Referer header [fast]
-#	  # Referer is highly unreliable, so use with care
-#
-#	acl aclname ident username ...
-#	acl aclname ident_regex [-i] pattern ...
-#	  # string match on ident output [slow]
-#	  # use REQUIRED to accept any non-null ident.
-#
-#	acl aclname proxy_auth [-i] username ...
-#	acl aclname proxy_auth_regex [-i] pattern ...
-#	  # perform http authentication challenge to the client and match against
-#	  # supplied credentials [slow]
-#	  #
-#	  # takes a list of allowed usernames.
-#	  # use REQUIRED to accept any valid username.
-#	  #
-#	  # Will use proxy authentication in forward-proxy scenarios, and plain
-#	  # http authenticaiton in reverse-proxy scenarios
-#	  #
-#	  # NOTE: when a Proxy-Authentication header is sent but it is not
-#	  # needed during ACL checking the username is NOT logged
-#	  # in access.log.
-#	  #
-#	  # NOTE: proxy_auth requires a EXTERNAL authentication program
-#	  # to check username/password combinations (see
-#	  # auth_param directive).
-#	  #
-#	  # NOTE: proxy_auth can't be used in a transparent/intercepting proxy
-#	  # as the browser needs to be configured for using a proxy in order
-#	  # to respond to proxy authentication.
-#
-#	acl aclname snmp_community string ...
-#	  # A community string to limit access to your SNMP Agent [fast]
-#	  # Example:
-#	  #
-#	  #	acl snmppublic snmp_community public
-#
-#	acl aclname maxconn number
-#	  # This will be matched when the client's IP address has
-#	  # more than <number> TCP connections established. [fast]
-#	  # NOTE: This only measures direct TCP links so X-Forwarded-For
-#	  # indirect clients are not counted.
-#
-#	acl aclname max_user_ip [-s] number
-#	  # This will be matched when the user attempts to log in from more
-#	  # than <number> different ip addresses. The authenticate_ip_ttl
-#	  # parameter controls the timeout on the ip entries. [fast]
-#	  # If -s is specified the limit is strict, denying browsing
-#	  # from any further IP addresses until the ttl has expired. Without
-#	  # -s Squid will just annoy the user by "randomly" denying requests.
-#	  # (the counter is reset each time the limit is reached and a
-#	  # request is denied)
-#	  # NOTE: in acceleration mode or where there is mesh of child proxies,
-#	  # clients may appear to come from multiple addresses if they are
-#	  # going through proxy farms, so a limit of 1 may cause user problems.
-#
-#	acl aclname random probability
-#	  # Pseudo-randomly match requests. Based on the probability given.
-#	  # Probability may be written as a decimal (0.333), fraction (1/3)
-#	  # or ratio of matches:non-matches (3:5).
-#
-#	acl aclname req_mime_type [-i] mime-type ...
-#	  # regex match against the mime type of the request generated
-#	  # by the client. Can be used to detect file upload or some
-#	  # types HTTP tunneling requests [fast]
-#	  # NOTE: This does NOT match the reply. You cannot use this
-#	  # to match the returned file type.
-#
-#	acl aclname req_header header-name [-i] any\.regex\.here
-#	  # regex match against any of the known request headers.  May be
-#	  # thought of as a superset of "browser", "referer" and "mime-type"
-#	  # ACL [fast]
-#
-#	acl aclname rep_mime_type [-i] mime-type ...
-#	  # regex match against the mime type of the reply received by
-#	  # squid. Can be used to detect file download or some
-#	  # types HTTP tunneling requests. [fast]
-#	  # NOTE: This has no effect in http_access rules. It only has
-#	  # effect in rules that affect the reply data stream such as
-#	  # http_reply_access.
-#
-#	acl aclname rep_header header-name [-i] any\.regex\.here
-#	  # regex match against any of the known reply headers. May be
-#	  # thought of as a superset of "browser", "referer" and "mime-type"
-#	  # ACLs [fast]
-#
-#	acl aclname external class_name [arguments...]
-#	  # external ACL lookup via a helper class defined by the
-#	  # external_acl_type directive [slow]
-#
-#	acl aclname user_cert attribute values...
-#	  # match against attributes in a user SSL certificate
-#	  # attribute is one of DN/C/O/CN/L/ST [fast]
-#
-#	acl aclname ca_cert attribute values...
-#	  # match against attributes a users issuing CA SSL certificate
-#	  # attribute is one of DN/C/O/CN/L/ST [fast]
-#
-#	acl aclname ext_user username ...
-#	acl aclname ext_user_regex [-i] pattern ...
-#	  # string match on username returned by external acl helper [slow]
-#	  # use REQUIRED to accept any non-null user name.
-#
-#	acl aclname tag tagvalue ...
-#	  # string match on tag returned by external acl helper [slow]
-#
-#	acl aclname hier_code codename ...
-#	  # string match against squid hierarchy code(s); [fast]
-#	  #  e.g., DIRECT, PARENT_HIT, NONE, etc.
-#	  #
-#	  # NOTE: This has no effect in http_access rules. It only has
-#	  # effect in rules that affect the reply data stream such as
-#	  # http_reply_access.
-#
-#	acl aclname note name [value ...]
-#	  # match transaction annotation [fast]
-#	  # Without values, matches any annotation with a given name.
-#	  # With value(s), matches any annotation with a given name that
-#	  # also has one of the given values.
-#	  # Names and values are compared using a string equality test.
-#	  # Annotation sources include note and adaptation_meta directives
-#	  # as well as helper and eCAP responses.
-#
-#	acl aclname any-of acl1 acl2 ...
-#	  # match any one of the acls [fast or slow]
-#	  # The first matching ACL stops further ACL evaluation.
-#	  #
-#	  # ACLs from multiple any-of lines with the same name are ORed.
-#	  # For example, A = (a1 or a2) or (a3 or a4) can be written as
-#	  #   acl A any-of a1 a2
-#	  #   acl A any-of a3 a4
-#	  #
-#	  # This group ACL is fast if all evaluated ACLs in the group are fast
-#	  # and slow otherwise.
-#
-#	acl aclname all-of acl1 acl2 ... 
-#	  # match all of the acls [fast or slow]
-#	  # The first mismatching ACL stops further ACL evaluation.
-#	  #
-#	  # ACLs from multiple all-of lines with the same name are ORed.
-#	  # For example, B = (b1 and b2) or (b3 and b4) can be written as
-#	  #   acl B all-of b1 b2
-#	  #   acl B all-of b3 b4
-#	  #
-#	  # This group ACL is fast if all evaluated ACLs in the group are fast
-#	  # and slow otherwise.
-#
-#	Examples:
-#		acl macaddress arp 09:00:2b:23:45:67
-#		acl myexample dst_as 1241
-#		acl password proxy_auth REQUIRED
-#		acl fileupload req_mime_type -i ^multipart/form-data$
-#		acl javascript rep_mime_type -i ^application/x-javascript$
-#
-#Default:
-# ACLs all, manager, localhost, and to_localhost are predefined.
-#
-#
-# Recommended minimum configuration:
-#
-
-# Example rule allowing access from your local networks.
-# Adapt to list your (internal) IP networks from where browsing
-# should be allowed
-acl localnet src 10.0.0.0/8	# RFC1918 possible internal network
-acl localnet src 172.16.0.0/12	# RFC1918 possible internal network
-acl localnet src 192.168.0.0/16	# RFC1918 possible internal network
-acl localnet src fc00::/7       # RFC 4193 local private network range
-acl localnet src fe80::/10      # RFC 4291 link-local (directly plugged) machines
-
-acl SSL_ports port 443
-acl Safe_ports port 80		# http
-acl Safe_ports port 21		# ftp
-acl Safe_ports port 443		# https
-acl Safe_ports port 70		# gopher
-acl Safe_ports port 210		# wais
-acl Safe_ports port 1025-65535	# unregistered ports
-acl Safe_ports port 280		# http-mgmt
-acl Safe_ports port 488		# gss-http
-acl Safe_ports port 591		# filemaker
-acl Safe_ports port 777		# multiling http
-acl CONNECT method CONNECT
-
-#  TAG: follow_x_forwarded_for
-#	Allowing or Denying the X-Forwarded-For header to be followed to
-#	find the original source of a request.
-#
-#	Requests may pass through a chain of several other proxies
-#	before reaching us.  The X-Forwarded-For header will contain a
-#	comma-separated list of the IP addresses in the chain, with the
-#	rightmost address being the most recent.
-#
-#	If a request reaches us from a source that is allowed by this
-#	configuration item, then we consult the X-Forwarded-For header
-#	to see where that host received the request from.  If the
-#	X-Forwarded-For header contains multiple addresses, we continue
-#	backtracking until we reach an address for which we are not allowed
-#	to follow the X-Forwarded-For header, or until we reach the first
-#	address in the list. For the purpose of ACL used in the
-#	follow_x_forwarded_for directive the src ACL type always matches
-#	the address we are testing and srcdomain matches its rDNS.
-#
-#	The end result of this process is an IP address that we will
-#	refer to as the indirect client address.  This address may
-#	be treated as the client address for access control, ICAP, delay
-#	pools and logging, depending on the acl_uses_indirect_client,
-#	icap_uses_indirect_client, delay_pool_uses_indirect_client, 
-#	log_uses_indirect_client and tproxy_uses_indirect_client options.
-#
-#	This clause only supports fast acl types.
-#	See http://wiki.squid-cache.org/SquidFaq/SquidAcl for details.
-#
-#	SECURITY CONSIDERATIONS:
-#
-#		Any host for which we follow the X-Forwarded-For header
-#		can place incorrect information in the header, and Squid
-#		will use the incorrect information as if it were the
-#		source address of the request.  This may enable remote
-#		hosts to bypass any access control restrictions that are
-#		based on the client's source addresses.
-#
-#	For example:
-#
-#		acl localhost src 127.0.0.1
-#		acl my_other_proxy srcdomain .proxy.example.com
-#		follow_x_forwarded_for allow localhost
-#		follow_x_forwarded_for allow my_other_proxy
-#Default:
-# X-Forwarded-For header will be ignored.
-
-#  TAG: acl_uses_indirect_client	on|off
-#	Controls whether the indirect client address
-#	(see follow_x_forwarded_for) is used instead of the
-#	direct client address in acl matching.
-#
-#	NOTE: maxconn ACL considers direct TCP links and indirect
-#	      clients will always have zero. So no match.
-#Default:
-# acl_uses_indirect_client on
-
-#  TAG: delay_pool_uses_indirect_client	on|off
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-follow-x-forwarded-for and --enable-delay-pools
-#
-#	Controls whether the indirect client address
-#	(see follow_x_forwarded_for) is used instead of the
-#	direct client address in delay pools.
-#Default:
-# delay_pool_uses_indirect_client on
-
-#  TAG: log_uses_indirect_client	on|off
-#	Controls whether the indirect client address
-#	(see follow_x_forwarded_for) is used instead of the
-#	direct client address in the access log.
-#Default:
-# log_uses_indirect_client on
-
-#  TAG: tproxy_uses_indirect_client	on|off
-#	Controls whether the indirect client address
-#	(see follow_x_forwarded_for) is used instead of the
-#	direct client address when spoofing the outgoing client.
-#
-#	This has no effect on requests arriving in non-tproxy
-#	mode ports.
-#
-#	SECURITY WARNING: Usage of this option is dangerous
-#	and should not be used trivially. Correct configuration
-#	of follow_x_forewarded_for with a limited set of trusted
-#	sources is required to prevent abuse of your proxy.
-#Default:
-# tproxy_uses_indirect_client off
-
-#  TAG: spoof_client_ip
-#	Control client IP address spoofing of TPROXY traffic based on
-#	defined access lists.
-#
-#	spoof_client_ip allow|deny [!]aclname ...
-#
-#	If there are no "spoof_client_ip" lines present, the default
-#	is to "allow" spoofing of any suitable request.
-#
-#	Note that the cache_peer "no-tproxy" option overrides this ACL.
-#
-#	This clause supports fast acl types.
-#	See http://wiki.squid-cache.org/SquidFaq/SquidAcl for details.
-#Default:
-# Allow spoofing on all TPROXY traffic.
-
-#  TAG: http_access
-#	Allowing or Denying access based on defined access lists
-#
-#	Access to the HTTP port:
-#	http_access allow|deny [!]aclname ...
-#
-#	NOTE on default values:
-#
-#	If there are no "access" lines present, the default is to deny
-#	the request.
-#
-#	If none of the "access" lines cause a match, the default is the
-#	opposite of the last line in the list.  If the last line was
-#	deny, the default is allow.  Conversely, if the last line
-#	is allow, the default will be deny.  For these reasons, it is a
-#	good idea to have an "deny all" entry at the end of your access
-#	lists to avoid potential confusion.
-#
-#	This clause supports both fast and slow acl types.
-#	See http://wiki.squid-cache.org/SquidFaq/SquidAcl for details.
-#
-#Default:
-# Deny, unless rules exist in squid.conf.
-#
-
-#
-# Recommended minimum Access Permission configuration:
-#
-# Deny requests to certain unsafe ports
-http_access deny !Safe_ports
-
-# Deny CONNECT to other than secure SSL ports
-http_access deny CONNECT !SSL_ports
-
-# Only allow cachemgr access from localhost
-http_access allow localhost manager
-http_access deny manager
-
-# We strongly recommend the following be uncommented to protect innocent
-# web applications running on the proxy server who think the only
-# one who can access services on "localhost" is a local user
-#http_access deny to_localhost
-
-#
-# INSERT YOUR OWN RULE(S) HERE TO ALLOW ACCESS FROM YOUR CLIENTS
-#
-
-# Example rule allowing access from your local networks.
-# Adapt localnet in the ACL section to list your (internal) IP networks
-# from where browsing should be allowed
-http_access allow localnet
-http_access allow localhost
-
-# And finally deny all other access to this proxy
-http_access deny all
-
-#  TAG: adapted_http_access
-#	Allowing or Denying access based on defined access lists
-#
-#	Essentially identical to http_access, but runs after redirectors
-#	and ICAP/eCAP adaptation. Allowing access control based on their
-#	output.
-#
-#	If not set then only http_access is used.
-#Default:
-# Allow, unless rules exist in squid.conf.
-
-#  TAG: http_reply_access
-#	Allow replies to client requests. This is complementary to http_access.
-#
-#	http_reply_access allow|deny [!] aclname ...
-#
-#	NOTE: if there are no access lines present, the default is to allow
-#	all replies.
-#
-#	If none of the access lines cause a match the opposite of the
-#	last line will apply. Thus it is good practice to end the rules
-#	with an "allow all" or "deny all" entry.
-#
-#	This clause supports both fast and slow acl types.
-#	See http://wiki.squid-cache.org/SquidFaq/SquidAcl for details.
-#Default:
-# Allow, unless rules exist in squid.conf.
-
-#  TAG: icp_access
-#	Allowing or Denying access to the ICP port based on defined
-#	access lists
-#
-#	icp_access  allow|deny [!]aclname ...
-#
-#	NOTE: The default if no icp_access lines are present is to
-#	deny all traffic. This default may cause problems with peers
-#	using ICP.
-#
-#	This clause only supports fast acl types.
-#	See http://wiki.squid-cache.org/SquidFaq/SquidAcl for details.
-#
-## Allow ICP queries from local networks only
-##icp_access allow localnet
-##icp_access deny all
-#Default:
-# Deny, unless rules exist in squid.conf.
-
-#  TAG: htcp_access
-#	Allowing or Denying access to the HTCP port based on defined
-#	access lists
-#
-#	htcp_access  allow|deny [!]aclname ...
-#
-#	See also htcp_clr_access for details on access control for
-#	cache purge (CLR) HTCP messages.
-#
-#	NOTE: The default if no htcp_access lines are present is to
-#	deny all traffic. This default may cause problems with peers
-#	using the htcp option.
-#
-#	This clause only supports fast acl types.
-#	See http://wiki.squid-cache.org/SquidFaq/SquidAcl for details.
-#
-## Allow HTCP queries from local networks only
-##htcp_access allow localnet
-##htcp_access deny all
-#Default:
-# Deny, unless rules exist in squid.conf.
-
-#  TAG: htcp_clr_access
-#	Allowing or Denying access to purge content using HTCP based
-#	on defined access lists.
-#	See htcp_access for details on general HTCP access control.
-#
-#	htcp_clr_access  allow|deny [!]aclname ...
-#
-#	This clause only supports fast acl types.
-#	See http://wiki.squid-cache.org/SquidFaq/SquidAcl for details.
-#
-## Allow HTCP CLR requests from trusted peers
-#acl htcp_clr_peer src 192.0.2.2 2001:DB8::2
-#htcp_clr_access allow htcp_clr_peer
-#htcp_clr_access deny all
-#Default:
-# Deny, unless rules exist in squid.conf.
-
-#  TAG: miss_access
-#	Determins whether network access is permitted when satisfying a request.
-#
-#	For example;
-#	    to force your neighbors to use you as a sibling instead of
-#	    a parent.
-#
-#		acl localclients src 192.0.2.0/24 2001:DB8::a:0/64
-#		miss_access deny  !localclients
-#		miss_access allow all
-#
-#	This means only your local clients are allowed to fetch relayed/MISS
-#	replies from the network and all other clients can only fetch cached
-#	objects (HITs).
-#
-#	The default for this setting allows all clients who passed the
-#	http_access rules to relay via this proxy.
-#
-#	This clause only supports fast acl types.
-#	See http://wiki.squid-cache.org/SquidFaq/SquidAcl for details.
-#Default:
-# Allow, unless rules exist in squid.conf.
-
-#  TAG: ident_lookup_access
-#	A list of ACL elements which, if matched, cause an ident
-#	(RFC 931) lookup to be performed for this request.  For
-#	example, you might choose to always perform ident lookups
-#	for your main multi-user Unix boxes, but not for your Macs
-#	and PCs.  By default, ident lookups are not performed for
-#	any requests.
-#
-#	To enable ident lookups for specific client addresses, you
-#	can follow this example:
-#
-#	acl ident_aware_hosts src 198.168.1.0/24
-#	ident_lookup_access allow ident_aware_hosts
-#	ident_lookup_access deny all
-#
-#	Only src type ACL checks are fully supported.  A srcdomain
-#	ACL might work at times, but it will not always provide
-#	the correct result.
-#
-#	This clause only supports fast acl types.
-#	See http://wiki.squid-cache.org/SquidFaq/SquidAcl for details.
-#Default:
-# Unless rules exist in squid.conf, IDENT is not fetched.
-
-#  TAG: reply_body_max_size	size [acl acl...]
-#	This option specifies the maximum size of a reply body. It can be
-#	used to prevent users from downloading very large files, such as
-#	MP3's and movies. When the reply headers are received, the
-#	reply_body_max_size lines are processed, and the first line where
-#	all (if any) listed ACLs are true is used as the maximum body size
-#	for this reply.
-#
-#	This size is checked twice. First when we get the reply headers,
-#	we check the content-length value.  If the content length value exists
-#	and is larger than the allowed size, the request is denied and the
-#	user receives an error message that says "the request or reply
-#	is too large." If there is no content-length, and the reply
-#	size exceeds this limit, the client's connection is just closed
-#	and they will receive a partial reply.
-#
-#	WARNING: downstream caches probably can not detect a partial reply
-#	if there is no content-length header, so they will cache
-#	partial responses and give them out as hits.  You should NOT
-#	use this option if you have downstream caches.
-#
-#	WARNING: A maximum size smaller than the size of squid's error messages
-#	will cause an infinite loop and crash squid. Ensure that the smallest
-#	non-zero value you use is greater that the maximum header size plus
-#	the size of your largest error page.
-#
-#	If you set this parameter none (the default), there will be
-#	no limit imposed.
-#
-#	Configuration Format is:
-#		reply_body_max_size SIZE UNITS [acl ...]
-#	ie.
-#		reply_body_max_size 10 MB
-#
-#Default:
-# No limit is applied.
-
-# NETWORK OPTIONS
-# -----------------------------------------------------------------------------
-
-#  TAG: http_port
-#	Usage:	port [mode] [options]
-#		hostname:port [mode] [options]
-#		1.2.3.4:port [mode] [options]
-#
-#	The socket addresses where Squid will listen for HTTP client
-#	requests.  You may specify multiple socket addresses.
-#	There are three forms: port alone, hostname with port, and
-#	IP address with port.  If you specify a hostname or IP
-#	address, Squid binds the socket to that specific
-#	address. Most likely, you do not need to bind to a specific
-#	address, so you can use the port number alone.
-#
-#	If you are running Squid in accelerator mode, you
-#	probably want to listen on port 80 also, or instead.
-#
-#	The -a command line option may be used to specify additional
-#	port(s) where Squid listens for proxy request. Such ports will
-#	be plain proxy ports with no options.
-#
-#	You may specify multiple socket addresses on multiple lines.
-#
-#	Modes:
-#
-#	   intercept	Support for IP-Layer interception of
-#			outgoing requests without browser settings.
-#			NP: disables authentication and IPv6 on the port.
-#
-#	   tproxy	Support Linux TPROXY for spoofing outgoing
-#			connections using the client IP address.
-#			NP: disables authentication and maybe IPv6 on the port.
-#
-#	   accel	Accelerator / reverse proxy mode
-#
-#	   ssl-bump	For each CONNECT request allowed by ssl_bump ACLs,
-#			establish secure connection with the client and with
-#			the server, decrypt HTTPS messages as they pass through
-#			Squid, and treat them as unencrypted HTTP messages,
-#			becoming the man-in-the-middle.
-#
-#			The ssl_bump option is required to fully enable
-#			bumping of CONNECT requests.
-#
-#	Omitting the mode flag causes default forward proxy mode to be used.
-#
-#
-#	Accelerator Mode Options:
-#
-#	   defaultsite=domainname
-#			What to use for the Host: header if it is not present
-#			in a request. Determines what site (not origin server)
-#			accelerators should consider the default.
-#
-#	   no-vhost	Disable using HTTP/1.1 Host header for virtual domain support.
-#
-#	   protocol=	Protocol to reconstruct accelerated requests with.
-#			Defaults to http for http_port and https for
-#			https_port
-#
-#	   vport	Virtual host port support. Using the http_port number
-#			instead of the port passed on Host: headers.
-#
-#	   vport=NN	Virtual host port support. Using the specified port
-#			number instead of the port passed on Host: headers.
-#
-#	   act-as-origin
-#			Act as if this Squid is the origin server.
-#			This currently means generate new Date: and Expires:
-#			headers on HIT instead of adding Age:.
-#
-#	   ignore-cc	Ignore request Cache-Control headers.
-#
-#			WARNING: This option violates HTTP specifications if
-#			used in non-accelerator setups.
-#
-#	   allow-direct	Allow direct forwarding in accelerator mode. Normally
-#			accelerated requests are denied direct forwarding as if
-#			never_direct was used.
-#
-#			WARNING: this option opens accelerator mode to security
-#			vulnerabilities usually only affecting in interception
-#			mode. Make sure to protect forwarding with suitable
-#			http_access rules when using this.
-#
-#
-#	SSL Bump Mode Options:
-#	    In addition to these options ssl-bump requires TLS/SSL options.
-#
-#	   generate-host-certificates[=<on|off>]
-#			Dynamically create SSL server certificates for the
-#			destination hosts of bumped CONNECT requests.When 
-#			enabled, the cert and key options are used to sign
-#			generated certificates. Otherwise generated
-#			certificate will be selfsigned.
-#			If there is a CA certificate lifetime of the generated 
-#			certificate equals lifetime of the CA certificate. If
-#			generated certificate is selfsigned lifetime is three 
-#			years.
-#			This option is enabled by default when ssl-bump is used.
-#			See the ssl-bump option above for more information.
-#			
-#	   dynamic_cert_mem_cache_size=SIZE
-#			Approximate total RAM size spent on cached generated
-#			certificates. If set to zero, caching is disabled. The
-#			default value is 4MB.
-#
-#	TLS / SSL Options:
-#
-#	   cert=	Path to SSL certificate (PEM format).
-#
-#	   key=		Path to SSL private key file (PEM format)
-#			if not specified, the certificate file is
-#			assumed to be a combined certificate and
-#			key file.
-#
-#	   version=	The version of SSL/TLS supported
-#			    1	automatic (default)
-#			    2	SSLv2 only
-#			    3	SSLv3 only
-#			    4	TLSv1.0 only
-#			    5	TLSv1.1 only
-#			    6	TLSv1.2 only
-#
-#	   cipher=	Colon separated list of supported ciphers.
-#			NOTE: some ciphers such as EDH ciphers depend on
-#			      additional settings. If those settings are
-#			      omitted the ciphers may be silently ignored
-#			      by the OpenSSL library.
-#
-#	   options=	Various SSL implementation options. The most important
-#			being:
-#			    NO_SSLv2    Disallow the use of SSLv2
-#			    NO_SSLv3    Disallow the use of SSLv3
-#			    NO_TLSv1    Disallow the use of TLSv1.0
-#			    NO_TLSv1_1  Disallow the use of TLSv1.1
-#			    NO_TLSv1_2  Disallow the use of TLSv1.2
-#			    SINGLE_DH_USE Always create a new key when using
-#				      temporary/ephemeral DH key exchanges
-#			    ALL       Enable various bug workarounds
-#				      suggested as "harmless" by OpenSSL
-#				      Be warned that this reduces SSL/TLS
-#				      strength to some attacks.
-#			See OpenSSL SSL_CTX_set_options documentation for a
-#			complete list of options.
-#
-#	   clientca=	File containing the list of CAs to use when
-#			requesting a client certificate.
-#
-#	   cafile=	File containing additional CA certificates to
-#			use when verifying client certificates. If unset
-#			clientca will be used.
-#
-#	   capath=	Directory containing additional CA certificates
-#			and CRL lists to use when verifying client certificates.
-#
-#	   crlfile=	File of additional CRL lists to use when verifying
-#			the client certificate, in addition to CRLs stored in
-#			the capath. Implies VERIFY_CRL flag below.
-#
-#	   dhparams=	File containing DH parameters for temporary/ephemeral
-#			DH key exchanges. See OpenSSL documentation for details
-#			on how to create this file.
-#			WARNING: EDH ciphers will be silently disabled if this
-#				 option is not set.
-#
-#	   sslflags=	Various flags modifying the use of SSL:
-#			    DELAYED_AUTH
-#				Don't request client certificates
-#				immediately, but wait until acl processing
-#				requires a certificate (not yet implemented).
-#			    NO_DEFAULT_CA
-#				Don't use the default CA lists built in
-#				to OpenSSL.
-#			    NO_SESSION_REUSE
-#				Don't allow for session reuse. Each connection
-#				will result in a new SSL session.
-#			    VERIFY_CRL
-#				Verify CRL lists when accepting client
-#				certificates.
-#			    VERIFY_CRL_ALL
-#				Verify CRL lists for all certificates in the
-#				client certificate chain.
-#
-#	   sslcontext=	SSL session ID context identifier.
-#
-#	Other Options:
-#
-#	   connection-auth[=on|off]
-#	                use connection-auth=off to tell Squid to prevent 
-#	                forwarding Microsoft connection oriented authentication
-#			(NTLM, Negotiate and Kerberos)
-#
-#	   disable-pmtu-discovery=
-#			Control Path-MTU discovery usage:
-#			    off		lets OS decide on what to do (default).
-#			    transparent	disable PMTU discovery when transparent
-#					support is enabled.
-#			    always	disable always PMTU discovery.
-#
-#			In many setups of transparently intercepting proxies
-#			Path-MTU discovery can not work on traffic towards the
-#			clients. This is the case when the intercepting device
-#			does not fully track connections and fails to forward
-#			ICMP must fragment messages to the cache server. If you
-#			have such setup and experience that certain clients
-#			sporadically hang or never complete requests set
-#			disable-pmtu-discovery option to 'transparent'.
-#
-#	   name=	Specifies a internal name for the port. Defaults to
-#			the port specification (port or addr:port)
-#
-#	   tcpkeepalive[=idle,interval,timeout]
-#			Enable TCP keepalive probes of idle connections.
-#			In seconds; idle is the initial time before TCP starts
-#			probing the connection, interval how often to probe, and
-#			timeout the time before giving up.
-#
-#	If you run Squid on a dual-homed machine with an internal
-#	and an external interface we recommend you to specify the
-#	internal address:port in http_port. This way Squid will only be
-#	visible on the internal address.
-#
-#
-
-# Squid normally listens to port 3128
-http_port 3128
-
-#  TAG: https_port
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-ssl
-#
-#	Usage:  [ip:]port cert=certificate.pem [key=key.pem] [mode] [options...]
-#
-#	The socket address where Squid will listen for client requests made
-#	over TLS or SSL connections. Commonly referred to as HTTPS.
-#
-#	This is most useful for situations where you are running squid in
-#	accelerator mode and you want to do the SSL work at the accelerator level.
-#
-#	You may specify multiple socket addresses on multiple lines,
-#	each with their own SSL certificate and/or options.
-#
-#	Modes:
-#
-#	   accel	Accelerator / reverse proxy mode
-#
-#	   intercept	Support for IP-Layer interception of
-#			outgoing requests without browser settings.
-#			NP: disables authentication and IPv6 on the port.
-#
-#	   tproxy	Support Linux TPROXY for spoofing outgoing
-#			connections using the client IP address.
-#			NP: disables authentication and maybe IPv6 on the port.
-#
-#	   ssl-bump	For each intercepted connection allowed by ssl_bump
-#			ACLs, establish a secure connection with the client and with
-#			the server, decrypt HTTPS messages as they pass through
-#			Squid, and treat them as unencrypted HTTP messages,
-#			becoming the man-in-the-middle.
-#
-#			An "ssl_bump server-first" match is required to
-#			fully enable bumping of intercepted SSL	connections.
-#
-#			Requires tproxy or intercept.
-#
-#	Omitting the mode flag causes default forward proxy mode to be used.
-#
-#
-#	See http_port for a list of generic options
-#
-#
-#	SSL Options:
-#
-#	   cert=	Path to SSL certificate (PEM format).
-#
-#	   key=		Path to SSL private key file (PEM format)
-#			if not specified, the certificate file is
-#			assumed to be a combined certificate and
-#			key file.
-#
-#	   version=	The version of SSL/TLS supported
-#			    1	automatic (default)
-#			    2	SSLv2 only
-#			    3	SSLv3 only
-#			    4	TLSv1 only
-#
-#	   cipher=	Colon separated list of supported ciphers.
-#
-#	   options=	Various SSL engine options. The most important
-#			being:
-#			    NO_SSLv2  Disallow the use of SSLv2
-#			    NO_SSLv3  Disallow the use of SSLv3
-#			    NO_TLSv1  Disallow the use of TLSv1
-#			    SINGLE_DH_USE Always create a new key when using
-#				      temporary/ephemeral DH key exchanges
-#			See src/ssl_support.c or OpenSSL SSL_CTX_set_options
-#			documentation for a complete list of options.
-#
-#	   clientca=	File containing the list of CAs to use when
-#			requesting a client certificate.
-#
-#	   cafile=	File containing additional CA certificates to
-#			use when verifying client certificates. If unset
-#			clientca will be used.
-#
-#	   capath=	Directory containing additional CA certificates
-#			and CRL lists to use when verifying client certificates.
-#
-#	   crlfile=	File of additional CRL lists to use when verifying
-#			the client certificate, in addition to CRLs stored in
-#			the capath. Implies VERIFY_CRL flag below.
-#
-#	   dhparams=	File containing DH parameters for temporary/ephemeral
-#			DH key exchanges.
-#
-#	   sslflags=	Various flags modifying the use of SSL:
-#			    DELAYED_AUTH
-#				Don't request client certificates
-#				immediately, but wait until acl processing
-#				requires a certificate (not yet implemented).
-#			    NO_DEFAULT_CA
-#				Don't use the default CA lists built in
-#				to OpenSSL.
-#			    NO_SESSION_REUSE
-#				Don't allow for session reuse. Each connection
-#				will result in a new SSL session.
-#			    VERIFY_CRL
-#				Verify CRL lists when accepting client
-#				certificates.
-#			    VERIFY_CRL_ALL
-#				Verify CRL lists for all certificates in the
-#				client certificate chain.
-#
-#	   sslcontext=	SSL session ID context identifier.
-#
-#	   generate-host-certificates[=<on|off>]
-#			Dynamically create SSL server certificates for the
-#			destination hosts of bumped SSL requests.When
-#			enabled, the cert and key options are used to sign
-#			generated certificates. Otherwise generated
-#			certificate will be selfsigned.
-#			If there is CA certificate life time of generated
-#			certificate equals lifetime of CA certificate. If
-#			generated certificate is selfsigned lifetime is three
-#			years.
-#			This option is enabled by default when SslBump is used.
-#			See the sslBump option above for more information.
-#
-#	   dynamic_cert_mem_cache_size=SIZE
-#			Approximate total RAM size spent on cached generated
-#			certificates. If set to zero, caching is disabled. The
-#			default value is 4MB.
-#
-#	See http_port for a list of available options.
-#Default:
-# none
-
-#  TAG: tcp_outgoing_tos
-#	Allows you to select a TOS/Diffserv value for packets outgoing
-#	on the server side, based on an ACL.
-#
-#	tcp_outgoing_tos ds-field [!]aclname ...
-#
-#	Example where normal_service_net uses the TOS value 0x00
-#	and good_service_net uses 0x20
-#
-#	acl normal_service_net src 10.0.0.0/24
-#	acl good_service_net src 10.0.1.0/24
-#	tcp_outgoing_tos 0x00 normal_service_net
-#	tcp_outgoing_tos 0x20 good_service_net
-#
-#	TOS/DSCP values really only have local significance - so you should
-#	know what you're specifying. For more information, see RFC2474,
-#	RFC2475, and RFC3260.
-#
-#	The TOS/DSCP byte must be exactly that - a octet value  0 - 255, or
-#	"default" to use whatever default your host has. Note that in
-#	practice often only multiples of 4 is usable as the two rightmost bits
-#	have been redefined for use by ECN (RFC 3168 section 23.1).
-#
-#	Processing proceeds in the order specified, and stops at first fully
-#	matching line.
-#Default:
-# none
-
-#  TAG: clientside_tos
-#	Allows you to select a TOS/Diffserv value for packets being transmitted
-#	on the client-side, based on an ACL.
-#
-#	clientside_tos ds-field [!]aclname ...
-#
-#	Example where normal_service_net uses the TOS value 0x00
-#	and good_service_net uses 0x20
-#
-#	acl normal_service_net src 10.0.0.0/24
-#	acl good_service_net src 10.0.1.0/24
-#	clientside_tos 0x00 normal_service_net
-#	clientside_tos 0x20 good_service_net
-#
-#	Note: This feature is incompatible with qos_flows. Any TOS values set here
-#	will be overwritten by TOS values in qos_flows.
-#Default:
-# none
-
-#  TAG: tcp_outgoing_mark
-# Note: This option is only available if Squid is rebuilt with the
-#       Packet MARK (Linux)
-#
-#	Allows you to apply a Netfilter mark value to outgoing packets
-#	on the server side, based on an ACL.
-#
-#	tcp_outgoing_mark mark-value [!]aclname ...
-#
-#	Example where normal_service_net uses the mark value 0x00
-#	and good_service_net uses 0x20
-#
-#	acl normal_service_net src 10.0.0.0/24
-#	acl good_service_net src 10.0.1.0/24
-#	tcp_outgoing_mark 0x00 normal_service_net
-#	tcp_outgoing_mark 0x20 good_service_net
-#Default:
-# none
-
-#  TAG: clientside_mark
-# Note: This option is only available if Squid is rebuilt with the
-#       Packet MARK (Linux)
-#
-#	Allows you to apply a Netfilter mark value to packets being transmitted
-#	on the client-side, based on an ACL.
-#
-#	clientside_mark mark-value [!]aclname ...
-#
-#	Example where normal_service_net uses the mark value 0x00
-#	and good_service_net uses 0x20
-#
-#	acl normal_service_net src 10.0.0.0/24
-#	acl good_service_net src 10.0.1.0/24
-#	clientside_mark 0x00 normal_service_net
-#	clientside_mark 0x20 good_service_net
-#
-#	Note: This feature is incompatible with qos_flows. Any mark values set here
-#	will be overwritten by mark values in qos_flows.
-#Default:
-# none
-
-#  TAG: qos_flows
-#	Allows you to select a TOS/DSCP value to mark outgoing
-#	connections to the client, based on where the reply was sourced.
-#	For platforms using netfilter, allows you to set a netfilter mark
-#	value instead of, or in addition to, a TOS value.
-#
-#	By default this functionality is disabled. To enable it with the default
-#	settings simply use "qos_flows mark" or "qos_flows tos". Default
-#	settings will result in the netfilter mark or TOS value being copied
-#	from the upstream connection to the client. Note that it is the connection
-#	CONNMARK value not the packet MARK value that is copied.
-#
-#	It is not currently possible to copy the mark or TOS value from the
-#	client to the upstream connection request.
-#
-#	TOS values really only have local significance - so you should
-#	know what you're specifying. For more information, see RFC2474,
-#	RFC2475, and RFC3260.
-#
-#	The TOS/DSCP byte must be exactly that - a octet value  0 - 255. Note that
-#	in practice often only multiples of 4 is usable as the two rightmost bits
-#	have been redefined for use by ECN (RFC 3168 section 23.1).
-#
-#	Mark values can be any unsigned 32-bit integer value.
-#
-#	This setting is configured by setting the following values:
-#
-#	tos|mark                Whether to set TOS or netfilter mark values
-#
-#	local-hit=0xFF		Value to mark local cache hits.
-#
-#	sibling-hit=0xFF	Value to mark hits from sibling peers.
-#
-#	parent-hit=0xFF		Value to mark hits from parent peers.
-#
-#	miss=0xFF[/mask]	Value to mark cache misses. Takes precedence
-#				over the preserve-miss feature (see below), unless
-#				mask is specified, in which case only the bits
-#				specified in the mask are written.
-#
-#	The TOS variant of the following features are only possible on Linux
-#	and require your kernel to be patched with the TOS preserving ZPH
-#	patch, available from http://zph.bratcheda.org
-#	No patch is needed to preserve the netfilter mark, which will work
-#	with all variants of netfilter.
-#
-#	disable-preserve-miss
-#		This option disables the preservation of the TOS or netfilter
-#		mark. By default, the existing TOS or netfilter mark value of
-#		the response coming from the remote server will be retained
-#		and masked with miss-mark.
-#		NOTE: in the case of a netfilter mark, the mark must be set on
-#		the connection (using the CONNMARK target) not on the packet
-#		(MARK target).
-#
-#	miss-mask=0xFF
-#		Allows you to mask certain bits in the TOS or mark value
-#		received from the remote server, before copying the value to
-#		the TOS sent towards clients.
-#		Default for tos: 0xFF (TOS from server is not changed).
-#		Default for mark: 0xFFFFFFFF (mark from server is not changed).
-#
-#	All of these features require the --enable-zph-qos compilation flag
-#	(enabled by default). Netfilter marking also requires the
-#	libnetfilter_conntrack libraries (--with-netfilter-conntrack) and
-#	libcap 2.09+ (--with-libcap).
-#
-#Default:
-# none
-
-#  TAG: tcp_outgoing_address
-#	Allows you to map requests to different outgoing IP addresses
-#	based on the username or source address of the user making
-#	the request.
-#
-#	tcp_outgoing_address ipaddr [[!]aclname] ...
-#
-#	For example;
-#		Forwarding clients with dedicated IPs for certain subnets.
-#
-#	  acl normal_service_net src 10.0.0.0/24
-#	  acl good_service_net src 10.0.2.0/24
-#
-#	  tcp_outgoing_address 2001:db8::c001 good_service_net
-#	  tcp_outgoing_address 10.1.0.2 good_service_net
-#
-#	  tcp_outgoing_address 2001:db8::beef normal_service_net
-#	  tcp_outgoing_address 10.1.0.1 normal_service_net
-#
-#	  tcp_outgoing_address 2001:db8::1
-#	  tcp_outgoing_address 10.1.0.3
-#
-#	Processing proceeds in the order specified, and stops at first fully
-#	matching line.
-#
-#	Squid will add an implicit IP version test to each line.
-#	Requests going to IPv4 websites will use the outgoing 10.1.0.* addresses.
-#	Requests going to IPv6 websites will use the outgoing 2001:db8:* addresses.
-#
-#
-#	NOTE: The use of this directive using client dependent ACLs is
-#	incompatible with the use of server side persistent connections. To
-#	ensure correct results it is best to set server_persistent_connections
-#	to off when using this directive in such configurations.
-#
-#	NOTE: The use of this directive to set a local IP on outgoing TCP links
-#	is incompatible with using TPROXY to set client IP out outbound TCP links.
-#	When needing to contact peers use the no-tproxy cache_peer option and the
-#	client_dst_passthru directive re-enable normal forwarding such as this.
-#
-#Default:
-# Address selection is performed by the operating system.
-
-#  TAG: host_verify_strict
-#	Regardless of this option setting, when dealing with intercepted
-#	traffic, Squid always verifies that the destination IP address matches
-#	the Host header domain or IP (called 'authority form URL').
-#	
-#	This enforcement is performed to satisfy a MUST-level requirement in
-#	RFC 2616 section 14.23: "The Host field value MUST represent the naming
-#	authority of the origin server or gateway given by the original URL".
-#	
-#	When set to ON:
-#		Squid always responds with an HTTP 409 (Conflict) error
-#		page and logs a security warning if there is no match.
-#	
-#		Squid verifies that the destination IP address matches
-#		the Host header for forward-proxy and reverse-proxy traffic
-#		as well. For those traffic types, Squid also enables the
-#		following checks, comparing the corresponding Host header
-#		and Request-URI components:
-#	
-#		 * The host names (domain or IP) must be identical,
-#		   but valueless or missing Host header disables all checks.
-#		   For the two host names to match, both must be either IP
-#		   or FQDN.
-#	
-#		 * Port numbers must be identical, but if a port is missing
-#		   the scheme-default port is assumed.
-#	
-#	
-#	When set to OFF (the default):
-#		Squid allows suspicious requests to continue but logs a
-#		security warning and blocks caching of the response.
-#	
-#		 * Forward-proxy traffic is not checked at all.
-#	
-#		 * Reverse-proxy traffic is not checked at all.
-#	
-#		 * Intercepted traffic which passes verification is handled
-#		   according to client_dst_passthru.
-#	
-#		 * Intercepted requests which fail verification are sent
-#		   to the client original destination instead of DIRECT.
-#		   This overrides 'client_dst_passthru off'.
-#	
-#		For now suspicious intercepted CONNECT requests are always
-#		responded to with an HTTP 409 (Conflict) error page.
-#	
-#	
-#	SECURITY NOTE:
-#	
-#	As described in CVE-2009-0801 when the Host: header alone is used
-#	to determine the destination of a request it becomes trivial for
-#	malicious scripts on remote websites to bypass browser same-origin
-#	security policy and sandboxing protections.
-#	
-#	The cause of this is that such applets are allowed to perform their
-#	own HTTP stack, in which case the same-origin policy of the browser
-#	sandbox only verifies that the applet tries to contact the same IP
-#	as from where it was loaded at the IP level. The Host: header may
-#	be different from the connected IP and approved origin.
-#	
-#Default:
-# host_verify_strict off
-
-#  TAG: client_dst_passthru
-#	With NAT or TPROXY intercepted traffic Squid may pass the request
-#	directly to the original client destination IP or seek a faster
-#	source using the HTTP Host header.
-#	
-#	Using Host to locate alternative servers can provide faster
-#	connectivity with a range of failure recovery options.
-#	But can also lead to connectivity trouble when the client and
-#	server are attempting stateful interactions unaware of the proxy.
-#	
-#	This option (on by default) prevents alternative DNS entries being
-#	located to send intercepted traffic DIRECT to an origin server.
-#	The clients original destination IP and port will be used instead.
-#	
-#	Regardless of this option setting, when dealing with intercepted
-#	traffic Squid will verify the Host: header and any traffic which
-#	fails Host verification will be treated as if this option were ON.
-#	
-#	see host_verify_strict for details on the verification process.
-#Default:
-# client_dst_passthru on
-
-# SSL OPTIONS
-# -----------------------------------------------------------------------------
-
-#  TAG: ssl_unclean_shutdown
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-ssl
-#
-#	Some browsers (especially MSIE) bugs out on SSL shutdown
-#	messages.
-#Default:
-# ssl_unclean_shutdown off
-
-#  TAG: ssl_engine
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-ssl
-#
-#	The OpenSSL engine to use. You will need to set this if you
-#	would like to use hardware SSL acceleration for example.
-#Default:
-# none
-
-#  TAG: sslproxy_client_certificate
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-ssl
-#
-#	Client SSL Certificate to use when proxying https:// URLs
-#Default:
-# none
-
-#  TAG: sslproxy_client_key
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-ssl
-#
-#	Client SSL Key to use when proxying https:// URLs
-#Default:
-# none
-
-#  TAG: sslproxy_version
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-ssl
-#
-#	SSL version level to use when proxying https:// URLs
-#
-#	The versions of SSL/TLS supported:
-#
-#	    1	automatic (default)
-#	    2	SSLv2 only
-#	    3	SSLv3 only
-#	    4	TLSv1.0 only
-#	    5	TLSv1.1 only
-#	    6	TLSv1.2 only
-#Default:
-# automatic SSL/TLS version negotiation
-
-#  TAG: sslproxy_options
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-ssl
-#
-#	SSL implementation options to use when proxying https:// URLs
-#	
-#	The most important being:
-#
-#	    NO_SSLv2    Disallow the use of SSLv2
-#	    NO_SSLv3    Disallow the use of SSLv3
-#	    NO_TLSv1    Disallow the use of TLSv1.0
-#	    NO_TLSv1_1  Disallow the use of TLSv1.1
-#	    NO_TLSv1_2  Disallow the use of TLSv1.2
-#	    SINGLE_DH_USE
-#		      Always create a new key when using temporary/ephemeral
-#		      DH key exchanges
-#	    SSL_OP_NO_TICKET
-#		      Disable use of RFC5077 session tickets. Some servers
-#		      may have problems understanding the TLS extension due
-#		      to ambiguous specification in RFC4507.
-#	    ALL       Enable various bug workarounds suggested as "harmless"
-#		      by OpenSSL. Be warned that this may reduce SSL/TLS
-#		      strength to some attacks.
-#	
-#	See the OpenSSL SSL_CTX_set_options documentation for a
-#	complete list of possible options.
-#Default:
-# none
-
-#  TAG: sslproxy_cipher
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-ssl
-#
-#	SSL cipher list to use when proxying https:// URLs
-#
-#	Colon separated list of supported ciphers.
-#Default:
-# none
-
-#  TAG: sslproxy_cafile
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-ssl
-#
-#	file containing CA certificates to use when verifying server
-#	certificates while proxying https:// URLs
-#Default:
-# none
-
-#  TAG: sslproxy_capath
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-ssl
-#
-#	directory containing CA certificates to use when verifying
-#	server certificates while proxying https:// URLs
-#Default:
-# none
-
-#  TAG: ssl_bump
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-ssl
-#
-#	This option is consulted when a CONNECT request is received on
-#	an http_port (or a new connection is intercepted at an
-#	https_port), provided that port was configured with an ssl-bump
-#	flag. The subsequent data on the connection is either treated as
-#	HTTPS and decrypted OR tunneled at TCP level without decryption,
-#	depending on the first bumping "mode" which ACLs match.
-#
-#	ssl_bump <mode> [!]acl ...
-#
-#	The following bumping modes are supported:
-#
-#	    client-first
-#		Allow bumping of the connection. Establish a secure connection
-#		with the client first, then connect to the server. This old mode
-#		does not allow Squid to mimic server SSL certificate and does
-#		not work with intercepted SSL connections.
-#
-#	    server-first
-#		Allow bumping of the connection. Establish a secure connection
-#		with the server first, then establish a secure connection with
-#		the client, using a mimicked server certificate. Works with both
-#		CONNECT requests and intercepted SSL connections.
-#
-#	    none
-#		Become a TCP tunnel without decoding the connection.
-#		Works with both CONNECT requests and intercepted SSL
-#		connections. This is the default behavior when no
-#		ssl_bump option is given or no ssl_bump ACLs match.
-#
-#	By default, no connections are bumped.
-#
-#	The first matching ssl_bump option wins. If no ACLs match, the
-#	connection is not bumped. Unlike most allow/deny ACL lists, ssl_bump
-#	does not have an implicit "negate the last given option" rule. You
-#	must make that rule explicit if you convert old ssl_bump allow/deny
-#	rules that rely on such an implicit rule.
-#
-#	This clause supports both fast and slow acl types.
-#	See http://wiki.squid-cache.org/SquidFaq/SquidAcl for details.
-#
-#	See also: http_port ssl-bump, https_port ssl-bump
-#
-#
-#	# Example: Bump all requests except those originating from
-#	# localhost or those going to example.com.
-#
-#	acl broken_sites dstdomain .example.com
-#	ssl_bump none localhost
-#	ssl_bump none broken_sites
-#	ssl_bump server-first all
-#Default:
-# Does not bump unless rules are present in squid.conf
-
-#  TAG: sslproxy_flags
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-ssl
-#
-#	Various flags modifying the use of SSL while proxying https:// URLs:
-#	    DONT_VERIFY_PEER	Accept certificates that fail verification.
-#				For refined control, see sslproxy_cert_error.
-#	    NO_DEFAULT_CA	Don't use the default CA list built in
-#				to OpenSSL.
-#Default:
-# none
-
-#  TAG: sslproxy_cert_error
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-ssl
-#
-#	Use this ACL to bypass server certificate validation errors.
-#
-#	For example, the following lines will bypass all validation errors
-#	when talking to servers for example.com. All other
-#	validation errors will result in ERR_SECURE_CONNECT_FAIL error.
-#
-#		acl BrokenButTrustedServers dstdomain example.com
-#		sslproxy_cert_error allow BrokenButTrustedServers
-#		sslproxy_cert_error deny all
-#
-#	This clause only supports fast acl types.
-#	See http://wiki.squid-cache.org/SquidFaq/SquidAcl for details.
-#	Using slow acl types may result in server crashes
-#
-#	Without this option, all server certificate validation errors
-#	terminate the transaction to protect Squid and the client.
-#
-#	SQUID_X509_V_ERR_INFINITE_VALIDATION error cannot be bypassed
-#	but should not happen unless your OpenSSL library is buggy.
-#
-#	SECURITY WARNING:
-#		Bypassing validation errors is dangerous because an
-#		error usually implies that the server cannot be trusted
-#		and the connection may be insecure.
-#
-#	See also: sslproxy_flags and DONT_VERIFY_PEER.
-#Default:
-# Server certificate errors terminate the transaction.
-
-#  TAG: sslproxy_cert_sign
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-ssl
-#
-#
-#        sslproxy_cert_sign <signing algorithm> acl ...
-#
-#        The following certificate signing algorithms are supported:
-#
-#	   signTrusted
-#		Sign using the configured CA certificate which is usually
-#		placed in and trusted by end-user browsers. This is the
-#		default for trusted origin server certificates.
-#
-#	   signUntrusted
-#		Sign to guarantee an X509_V_ERR_CERT_UNTRUSTED browser error.
-#		This is the default for untrusted origin server certificates
-#		that are not self-signed (see ssl::certUntrusted).
-#
-#	   signSelf
-#		Sign using a self-signed certificate with the right CN to
-#		generate a X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT error in the
-#		browser. This is the default for self-signed origin server
-#		certificates (see ssl::certSelfSigned).
-#
-#	This clause only supports fast acl types.
-#
-#	When sslproxy_cert_sign acl(s) match, Squid uses the corresponding
-#	signing algorithm to generate the certificate and ignores all
-#	subsequent sslproxy_cert_sign options (the first match wins). If no
-#	acl(s) match, the default signing algorithm is determined by errors
-#	detected when obtaining and validating the origin server certificate.
-#
-#	WARNING: SQUID_X509_V_ERR_DOMAIN_MISMATCH and ssl:certDomainMismatch can
-#	be used with sslproxy_cert_adapt, but if and only if Squid is bumping a
-#	CONNECT request that carries a domain name. In all other cases (CONNECT
-#	to an IP address or an intercepted SSL connection), Squid cannot detect
-#	the domain mismatch at certificate generation time when
-#	bump-server-first is used.
-#Default:
-# none
-
-#  TAG: sslproxy_cert_adapt
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-ssl
-#
-#	
-#	sslproxy_cert_adapt <adaptation algorithm> acl ...
-#
-#	The following certificate adaptation algorithms are supported:
-#
-#	   setValidAfter
-#		Sets the "Not After" property to the "Not After" property of
-#		the CA certificate used to sign generated certificates.
-#
-#	   setValidBefore
-#		Sets the "Not Before" property to the "Not Before" property of
-#		the CA certificate used to sign generated certificates.
-#
-#	   setCommonName or setCommonName{CN}
-#		Sets Subject.CN property to the host name specified as a 
-#		CN parameter or, if no explicit CN parameter was specified,
-#		extracted from the CONNECT request. It is a misconfiguration
-#		to use setCommonName without an explicit parameter for
-#		intercepted or tproxied SSL connections.
-#		
-#	This clause only supports fast acl types.
-#
-#	Squid first groups sslproxy_cert_adapt options by adaptation algorithm.
-#	Within a group, when sslproxy_cert_adapt acl(s) match, Squid uses the
-#	corresponding adaptation algorithm to generate the certificate and
-#	ignores all subsequent sslproxy_cert_adapt options in that algorithm's
-#	group (i.e., the first match wins within each algorithm group). If no
-#	acl(s) match, the default mimicking action takes place.
-#
-#	WARNING: SQUID_X509_V_ERR_DOMAIN_MISMATCH and ssl:certDomainMismatch can
-#	be used with sslproxy_cert_adapt, but if and only if Squid is bumping a
-#	CONNECT request that carries a domain name. In all other cases (CONNECT
-#	to an IP address or an intercepted SSL connection), Squid cannot detect
-#	the domain mismatch at certificate generation time when
-#	bump-server-first is used.
-#Default:
-# none
-
-#  TAG: sslpassword_program
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-ssl
-#
-#	Specify a program used for entering SSL key passphrases
-#	when using encrypted SSL certificate keys. If not specified
-#	keys must either be unencrypted, or Squid started with the -N
-#	option to allow it to query interactively for the passphrase.
-#
-#	The key file name is given as argument to the program allowing
-#	selection of the right password if you have multiple encrypted
-#	keys.
-#Default:
-# none
-
-# OPTIONS RELATING TO EXTERNAL SSL_CRTD 
-# -----------------------------------------------------------------------------
-
-#  TAG: sslcrtd_program
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-ssl-crtd
-#
-#	Specify the location and options of the executable for ssl_crtd process.
-#	/usr/libexec/ssl_crtd program requires -s and -M parameters
-#	For more information use:
-#		/usr/libexec/ssl_crtd -h
-#Default:
-# sslcrtd_program /usr/libexec/ssl_crtd -s /var/log/squid/lib/ssl_db -M 4MB
-
-#  TAG: sslcrtd_children
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-ssl-crtd
-#
-#	The maximum number of processes spawn to service ssl server.
-#	The maximum this may be safely set to is 32.
-#	
-#	The startup= and idle= options allow some measure of skew in your
-#	tuning.
-#	
-#		startup=N
-#	
-#	Sets the minimum number of processes to spawn when Squid
-#	starts or reconfigures. When set to zero the first request will
-#	cause spawning of the first child process to handle it.
-#	
-#	Starting too few children temporary slows Squid under load while it
-#	tries to spawn enough additional processes to cope with traffic.
-#	
-#		idle=N
-#	
-#	Sets a minimum of how many processes Squid is to try and keep available
-#	at all times. When traffic begins to rise above what the existing
-#	processes can handle this many more will be spawned up to the maximum
-#	configured. A minimum setting of 1 is required.
-#	
-#	You must have at least one ssl_crtd process.
-#Default:
-# sslcrtd_children 32 startup=5 idle=1
-
-#  TAG: sslcrtvalidator_program
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-ssl
-#
-#	Specify the location and options of the executable for ssl_crt_validator
-#	process.
-#
-#	Usage:  sslcrtvalidator_program [ttl=n] [cache=n] path ...
-#
-#	Options:
-#	  ttl=n         TTL in seconds for cached results. The default is 60 secs
-#	  cache=n       limit the result cache size. The default value is 2048
-#Default:
-# none
-
-#  TAG: sslcrtvalidator_children
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-ssl
-#
-#	The maximum number of processes spawn to service SSL server.
-#	The maximum this may be safely set to is 32.
-#	
-#	The startup= and idle= options allow some measure of skew in your
-#	tuning.
-#	
-#		startup=N
-#	
-#	Sets the minimum number of processes to spawn when Squid
-#	starts or reconfigures. When set to zero the first request will
-#	cause spawning of the first child process to handle it.
-#	
-#	Starting too few children temporary slows Squid under load while it
-#	tries to spawn enough additional processes to cope with traffic.
-#	
-#		idle=N
-#	
-#	Sets a minimum of how many processes Squid is to try and keep available
-#	at all times. When traffic begins to rise above what the existing
-#	processes can handle this many more will be spawned up to the maximum
-#	configured. A minimum setting of 1 is required.
-#
-#		concurrency=
-#	
-#	The number of requests each certificate validator helper can handle in
-#	parallel. A value of 0 indicates the certficate validator does not
-#	support concurrency. Defaults to 1.
-#	
-#	When this directive is set to a value >= 1 then the protocol
-#	used to communicate with the helper is modified to include
-#	a request ID in front of the request/response. The request
-#	ID from the request must be echoed back with the response
-#	to that request.
-#	
-#	You must have at least one ssl_crt_validator process.
-#Default:
-# sslcrtvalidator_children 32 startup=5 idle=1 concurrency=1
-
-# OPTIONS WHICH AFFECT THE NEIGHBOR SELECTION ALGORITHM
-# -----------------------------------------------------------------------------
-
-#  TAG: cache_peer
-#	To specify other caches in a hierarchy, use the format:
-#	
-#		cache_peer hostname type http-port icp-port [options]
-#	
-#	For example,
-#	
-#	#                                        proxy  icp
-#	#          hostname             type     port   port  options
-#	#          -------------------- -------- ----- -----  -----------
-#	cache_peer parent.foo.net       parent    3128  3130  default
-#	cache_peer sib1.foo.net         sibling   3128  3130  proxy-only
-#	cache_peer sib2.foo.net         sibling   3128  3130  proxy-only
-#	cache_peer example.com          parent    80       0  default
-#	cache_peer cdn.example.com      sibling   3128     0  
-#	
-#	      type:	either 'parent', 'sibling', or 'multicast'.
-#	
-#	proxy-port:	The port number where the peer accept HTTP requests.
-#			For other Squid proxies this is usually 3128
-#			For web servers this is usually 80
-#	
-#	  icp-port:	Used for querying neighbor caches about objects.
-#			Set to 0 if the peer does not support ICP or HTCP.
-#			See ICP and HTCP options below for additional details.
-#	
-#	
-#	==== ICP OPTIONS ====
-#	
-#	You MUST also set icp_port and icp_access explicitly when using these options.
-#	The defaults will prevent peer traffic using ICP.
-#	
-#	
-#	no-query	Disable ICP queries to this neighbor.
-#	
-#	multicast-responder
-#			Indicates the named peer is a member of a multicast group.
-#			ICP queries will not be sent directly to the peer, but ICP
-#			replies will be accepted from it.
-#	
-#	closest-only	Indicates that, for ICP_OP_MISS replies, we'll only forward
-#			CLOSEST_PARENT_MISSes and never FIRST_PARENT_MISSes.
-#	
-#	background-ping
-#			To only send ICP queries to this neighbor infrequently.
-#			This is used to keep the neighbor round trip time updated
-#			and is usually used in conjunction with weighted-round-robin.
-#	
-#	
-#	==== HTCP OPTIONS ====
-#	
-#	You MUST also set htcp_port and htcp_access explicitly when using these options.
-#	The defaults will prevent peer traffic using HTCP.
-#	
-#	
-#	htcp		Send HTCP, instead of ICP, queries to the neighbor.
-#			You probably also want to set the "icp-port" to 4827
-#			instead of 3130. This directive accepts a comma separated
-#			list of options described below.
-#	
-#	htcp=oldsquid	Send HTCP to old Squid versions (2.5 or earlier).
-#	
-#	htcp=no-clr	Send HTCP to the neighbor but without
-#			sending any CLR requests.  This cannot be used with
-#			only-clr.
-#	
-#	htcp=only-clr	Send HTCP to the neighbor but ONLY CLR requests.
-#			This cannot be used with no-clr.
-#	
-#	htcp=no-purge-clr
-#			Send HTCP to the neighbor including CLRs but only when
-#			they do not result from PURGE requests.
-#	
-#	htcp=forward-clr
-#			Forward any HTCP CLR requests this proxy receives to the peer.
-#	
-#	
-#	==== PEER SELECTION METHODS ====
-#	
-#	The default peer selection method is ICP, with the first responding peer
-#	being used as source. These options can be used for better load balancing.
-#	
-#	
-#	default		This is a parent cache which can be used as a "last-resort"
-#			if a peer cannot be located by any of the peer-selection methods.
-#			If specified more than once, only the first is used.
-#	
-#	round-robin	Load-Balance parents which should be used in a round-robin
-#			fashion in the absence of any ICP queries.
-#			weight=N can be used to add bias.
-#	
-#	weighted-round-robin
-#			Load-Balance parents which should be used in a round-robin
-#			fashion with the frequency of each parent being based on the
-#			round trip time. Closer parents are used more often.
-#			Usually used for background-ping parents.
-#			weight=N can be used to add bias.
-#	
-#	carp		Load-Balance parents which should be used as a CARP array.
-#			The requests will be distributed among the parents based on the
-#			CARP load balancing hash function based on their weight.
-#	
-#	userhash	Load-balance parents based on the client proxy_auth or ident username.
-#	
-#	sourcehash	Load-balance parents based on the client source IP.
-#
-#	multicast-siblings
-#			To be used only for cache peers of type "multicast".
-#			ALL members of this multicast group have "sibling"
-#			relationship with it, not "parent".  This is to a multicast
-#			group when the requested object would be fetched only from
-#			a "parent" cache, anyway.  It's useful, e.g., when
-#			configuring a pool of redundant Squid proxies, being
-#			members of the same multicast group.
-#	
-#	
-#	==== PEER SELECTION OPTIONS ====
-#	
-#	weight=N	use to affect the selection of a peer during any weighted
-#			peer-selection mechanisms.
-#			The weight must be an integer; default is 1,
-#			larger weights are favored more.
-#			This option does not affect parent selection if a peering
-#			protocol is not in use.
-#	
-#	basetime=N	Specify a base amount to be subtracted from round trip
-#			times of parents.
-#			It is subtracted before division by weight in calculating
-#			which parent to fectch from. If the rtt is less than the
-#			base time the rtt is set to a minimal value.
-#	
-#	ttl=N		Specify a TTL to use when sending multicast ICP queries
-#			to this address.
-#			Only useful when sending to a multicast group.
-#			Because we don't accept ICP replies from random
-#			hosts, you must configure other group members as
-#			peers with the 'multicast-responder' option.
-#	
-#	no-delay	To prevent access to this neighbor from influencing the
-#			delay pools.
-#	
-#	digest-url=URL	Tell Squid to fetch the cache digest (if digests are
-#			enabled) for this host from the specified URL rather
-#			than the Squid default location.
-#	
-#	
-#	==== CARP OPTIONS ====
-#	
-#	carp-key=key-specification
-#			use a different key than the full URL to hash against the peer.
-#			the key-specification is a comma-separated list of the keywords			
-#			scheme, host, port, path, params
-#			Order is not important.
-#	
-#	==== ACCELERATOR / REVERSE-PROXY OPTIONS ====
-#	
-#	originserver	Causes this parent to be contacted as an origin server.
-#			Meant to be used in accelerator setups when the peer
-#			is a web server.
-#	
-#	forceddomain=name
-#			Set the Host header of requests forwarded to this peer.
-#			Useful in accelerator setups where the server (peer)
-#			expects a certain domain name but clients may request
-#			others. ie example.com or www.example.com
-#	
-#	no-digest	Disable request of cache digests.
-#	
-#	no-netdb-exchange
-#			Disables requesting ICMP RTT database (NetDB).
-#	
-#	
-#	==== AUTHENTICATION OPTIONS ====
-#	
-#	login=user:password
-#			If this is a personal/workgroup proxy and your parent
-#			requires proxy authentication.
-#			
-#			Note: The string can include URL escapes (i.e. %20 for
-#			spaces). This also means % must be written as %%.
-#	
-#	login=PASSTHRU
-#			Send login details received from client to this peer.
-#			Both Proxy- and WWW-Authorization headers are passed
-#			without alteration to the peer.
-#			Authentication is not required by Squid for this to work.
-#			
-#			Note: This will pass any form of authentication but
-#			only Basic auth will work through a proxy unless the
-#			connection-auth options are also used.
-#
-#	login=PASS	Send login details received from client to this peer.
-#			Authentication is not required by this option.
-#			
-#			If there are no client-provided authentication headers
-#			to pass on, but username and password are available
-#			from an external ACL user= and password= result tags
-#			they may be sent instead.
-#			
-#			Note: To combine this with proxy_auth both proxies must
-#			share the same user database as HTTP only allows for
-#			a single login (one for proxy, one for origin server).
-#			Also be warned this will expose your users proxy
-#			password to the peer. USE WITH CAUTION
-#	
-#	login=*:password
-#			Send the username to the upstream cache, but with a
-#			fixed password. This is meant to be used when the peer
-#			is in another administrative domain, but it is still
-#			needed to identify each user.
-#			The star can optionally be followed by some extra
-#			information which is added to the username. This can
-#			be used to identify this proxy to the peer, similar to
-#			the login=username:password option above.
-#	
-#	login=NEGOTIATE
-#			If this is a personal/workgroup proxy and your parent
-#			requires a secure proxy authentication.
-#			The first principal from the default keytab or defined by
-#			the environment variable KRB5_KTNAME will be used. 
-#	
-#			WARNING: The connection may transmit requests from multiple
-#			clients. Negotiate often assumes end-to-end authentication
-#			and a single-client. Which is not strictly true here.
-#	
-#	login=NEGOTIATE:principal_name
-#			If this is a personal/workgroup proxy and your parent
-#			requires a secure proxy authentication. 
-#			The principal principal_name from the default keytab or
-#			defined by the environment variable KRB5_KTNAME will be
-#			used.
-#	
-#			WARNING: The connection may transmit requests from multiple
-#			clients. Negotiate often assumes end-to-end authentication
-#			and a single-client. Which is not strictly true here.
-#	
-#	connection-auth=on|off
-#			Tell Squid that this peer does or not support Microsoft
-#			connection oriented authentication, and any such
-#			challenges received from there should be ignored.
-#			Default is auto to automatically determine the status
-#			of the peer.
-#	
-#	
-#	==== SSL / HTTPS / TLS OPTIONS ====
-#	
-#	ssl		Encrypt connections to this peer with SSL/TLS.
-#	
-#	sslcert=/path/to/ssl/certificate
-#			A client SSL certificate to use when connecting to
-#			this peer.
-#	
-#	sslkey=/path/to/ssl/key
-#			The private SSL key corresponding to sslcert above.
-#			If 'sslkey' is not specified 'sslcert' is assumed to
-#			reference a combined file containing both the
-#			certificate and the key.
-#	
-#	sslversion=1|2|3|4|5|6
-#			The SSL version to use when connecting to this peer
-#				1 = automatic (default)
-#				2 = SSL v2 only
-#				3 = SSL v3 only
-#				4 = TLS v1.0 only
-#				5 = TLS v1.1 only
-#				6 = TLS v1.2 only
-#	
-#	sslcipher=...	The list of valid SSL ciphers to use when connecting
-#			to this peer.
-#	
-#	ssloptions=... 	Specify various SSL implementation options:
-#
-#			    NO_SSLv2    Disallow the use of SSLv2
-#			    NO_SSLv3    Disallow the use of SSLv3
-#			    NO_TLSv1    Disallow the use of TLSv1.0
-#			    NO_TLSv1_1  Disallow the use of TLSv1.1
-#			    NO_TLSv1_2  Disallow the use of TLSv1.2
-#			    SINGLE_DH_USE
-#				      Always create a new key when using
-#				      temporary/ephemeral DH key exchanges
-#			    ALL       Enable various bug workarounds
-#				      suggested as "harmless" by OpenSSL
-#				      Be warned that this reduces SSL/TLS
-#				      strength to some attacks.
-#
-#			See the OpenSSL SSL_CTX_set_options documentation for a
-#			more complete list.
-#	
-#	sslcafile=... 	A file containing additional CA certificates to use
-#			when verifying the peer certificate.
-#	
-#	sslcapath=...	A directory containing additional CA certificates to
-#			use when verifying the peer certificate.
-#	
-#	sslcrlfile=... 	A certificate revocation list file to use when
-#			verifying the peer certificate.
-#	
-#	sslflags=...	Specify various flags modifying the SSL implementation:
-#	
-#			DONT_VERIFY_PEER
-#				Accept certificates even if they fail to
-#				verify.
-#			NO_DEFAULT_CA
-#				Don't use the default CA list built in
-#				to OpenSSL.
-#			DONT_VERIFY_DOMAIN
-#				Don't verify the peer certificate
-#				matches the server name
-#	
-#	ssldomain= 	The peer name as advertised in it's certificate.
-#			Used for verifying the correctness of the received peer
-#			certificate. If not specified the peer hostname will be
-#			used.
-#	
-#	front-end-https
-#			Enable the "Front-End-Https: On" header needed when
-#			using Squid as a SSL frontend in front of Microsoft OWA.
-#			See MS KB document Q307347 for details on this header.
-#			If set to auto the header will only be added if the
-#			request is forwarded as a https:// URL.
-#	
-#	
-#	==== GENERAL OPTIONS ====
-#	
-#	connect-timeout=N
-#			A peer-specific connect timeout.
-#			Also see the peer_connect_timeout directive.
-#	
-#	connect-fail-limit=N
-#			How many times connecting to a peer must fail before
-#			it is marked as down. Default is 10.
-#	
-#	allow-miss	Disable Squid's use of only-if-cached when forwarding
-#			requests to siblings. This is primarily useful when
-#			icp_hit_stale is used by the sibling. To extensive use
-#			of this option may result in forwarding loops, and you
-#			should avoid having two-way peerings with this option.
-#			For example to deny peer usage on requests from peer
-#			by denying cache_peer_access if the source is a peer.
-#	
-#	max-conn=N	Limit the amount of connections Squid may open to this
-#			peer. see also 
-#	
-#	name=xxx	Unique name for the peer.
-#			Required if you have multiple peers on the same host
-#			but different ports.
-#			This name can be used in cache_peer_access and similar
-#			directives to dentify the peer.
-#			Can be used by outgoing access controls through the
-#			peername ACL type.
-#	
-#	no-tproxy	Do not use the client-spoof TPROXY support when forwarding
-#			requests to this peer. Use normal address selection instead.
-#			This overrides the spoof_client_ip ACL.
-#	
-#	proxy-only	objects fetched from the peer will not be stored locally.
-#	
-#Default:
-# none
-
-#  TAG: cache_peer_domain
-#	Use to limit the domains for which a neighbor cache will be
-#	queried.
-#
-#	Usage:
-#		cache_peer_domain cache-host domain [domain ...]
-#		cache_peer_domain cache-host !domain
-#
-#	For example, specifying
-#
-#		cache_peer_domain parent.foo.net	.edu
-#
-#	has the effect such that UDP query packets are sent to
-#	'bigserver' only when the requested object exists on a
-#	server in the .edu domain.  Prefixing the domainname
-#	with '!' means the cache will be queried for objects
-#	NOT in that domain.
-#
-#	NOTE:	* Any number of domains may be given for a cache-host,
-#		  either on the same or separate lines.
-#		* When multiple domains are given for a particular
-#		  cache-host, the first matched domain is applied.
-#		* Cache hosts with no domain restrictions are queried
-#		  for all requests.
-#		* There are no defaults.
-#		* There is also a 'cache_peer_access' tag in the ACL
-#		  section.
-#Default:
-# none
-
-#  TAG: cache_peer_access
-#	Similar to 'cache_peer_domain' but provides more flexibility by
-#	using ACL elements.
-#
-#	Usage:
-#		cache_peer_access cache-host allow|deny [!]aclname ...
-#
-#	The syntax is identical to 'http_access' and the other lists of
-#	ACL elements.  See the comments for 'http_access' below, or
-#	the Squid FAQ (http://wiki.squid-cache.org/SquidFaq/SquidAcl).
-#Default:
-# none
-
-#  TAG: neighbor_type_domain
-#	Modify the cache_peer neighbor type when passing requests
-#	about specific domains to the peer.
-#
-#	Usage:
-#		 neighbor_type_domain neighbor parent|sibling domain domain ...
-#
-#	For example:
-#		cache_peer foo.example.com parent 3128 3130
-#		neighbor_type_domain foo.example.com sibling .au .de
-#
-#	The above configuration treats all requests to foo.example.com as a
-#	parent proxy unless the request is for a .au or .de ccTLD domain name.
-#Default:
-# The peer type from cache_peer directive is used for all requests to that peer.
-
-#  TAG: dead_peer_timeout	(seconds)
-#	This controls how long Squid waits to declare a peer cache
-#	as "dead."  If there are no ICP replies received in this
-#	amount of time, Squid will declare the peer dead and not
-#	expect to receive any further ICP replies.  However, it
-#	continues to send ICP queries, and will mark the peer as
-#	alive upon receipt of the first subsequent ICP reply.
-#
-#	This timeout also affects when Squid expects to receive ICP
-#	replies from peers.  If more than 'dead_peer' seconds have
-#	passed since the last ICP reply was received, Squid will not
-#	expect to receive an ICP reply on the next query.  Thus, if
-#	your time between requests is greater than this timeout, you
-#	will see a lot of requests sent DIRECT to origin servers
-#	instead of to your parents.
-#Default:
-# dead_peer_timeout 10 seconds
-
-#  TAG: forward_max_tries
-#	Controls how many different forward paths Squid will try
-#	before giving up. See also forward_timeout.
-#	
-#	NOTE: connect_retries (default: none) can make each of these
-#	possible forwarding paths be tried multiple times.
-#Default:
-# forward_max_tries 10
-
-#  TAG: hierarchy_stoplist
-#	A list of words which, if found in a URL, cause the object to
-#	be handled directly by this cache.  In other words, use this
-#	to not query neighbor caches for certain objects.  You may
-#	list this option multiple times.
-#
-#	Example:
-#		hierarchy_stoplist cgi-bin ?
-#
-#	Note: never_direct overrides this option.
-#Default:
-# none
-
-# MEMORY CACHE OPTIONS
-# -----------------------------------------------------------------------------
-
-#  TAG: cache_mem	(bytes)
-#	NOTE: THIS PARAMETER DOES NOT SPECIFY THE MAXIMUM PROCESS SIZE.
-#	IT ONLY PLACES A LIMIT ON HOW MUCH ADDITIONAL MEMORY SQUID WILL
-#	USE AS A MEMORY CACHE OF OBJECTS. SQUID USES MEMORY FOR OTHER
-#	THINGS AS WELL. SEE THE SQUID FAQ SECTION 8 FOR DETAILS.
-#
-#	'cache_mem' specifies the ideal amount of memory to be used
-#	for:
-#		* In-Transit objects
-#		* Hot Objects
-#		* Negative-Cached objects
-#
-#	Data for these objects are stored in 4 KB blocks.  This
-#	parameter specifies the ideal upper limit on the total size of
-#	4 KB blocks allocated.  In-Transit objects take the highest
-#	priority.
-#
-#	In-transit objects have priority over the others.  When
-#	additional space is needed for incoming data, negative-cached
-#	and hot objects will be released.  In other words, the
-#	negative-cached and hot objects will fill up any unused space
-#	not needed for in-transit objects.
-#
-#	If circumstances require, this limit will be exceeded.
-#	Specifically, if your incoming request rate requires more than
-#	'cache_mem' of memory to hold in-transit objects, Squid will
-#	exceed this limit to satisfy the new requests.  When the load
-#	decreases, blocks will be freed until the high-water mark is
-#	reached.  Thereafter, blocks will be used to store hot
-#	objects.
-#
-#	If shared memory caching is enabled, Squid does not use the shared
-#	cache space for in-transit objects, but they still consume as much
-#	local memory as they need. For more details about the shared memory
-#	cache, see memory_cache_shared.
-#Default:
-# cache_mem 256 MB
-
-#  TAG: maximum_object_size_in_memory	(bytes)
-#	Objects greater than this size will not be attempted to kept in
-#	the memory cache. This should be set high enough to keep objects
-#	accessed frequently in memory to improve performance whilst low
-#	enough to keep larger objects from hoarding cache_mem.
-#Default:
-# maximum_object_size_in_memory 512 KB
-
-#  TAG: memory_cache_shared	on|off
-#	Controls whether the memory cache is shared among SMP workers.
-#
-#	The shared memory cache is meant to occupy cache_mem bytes and replace
-#	the non-shared memory cache, although some entities may still be
-#	cached locally by workers for now (e.g., internal and in-transit
-#	objects may be served from a local memory cache even if shared memory
-#	caching is enabled).
-#
-#	By default, the memory cache is shared if and only if all of the
-#	following conditions are satisfied: Squid runs in SMP mode with
-#	multiple workers, cache_mem is positive, and Squid environment
-#	supports required IPC primitives (e.g., POSIX shared memory segments
-#	and GCC-style atomic operations).
-#
-#	To avoid blocking locks, shared memory uses opportunistic algorithms
-#	that do not guarantee that every cachable entity that could have been
-#	shared among SMP workers will actually be shared.
-#
-#	Currently, entities exceeding 32KB in size cannot be shared.
-#Default:
-# "on" where supported if doing memory caching with multiple SMP workers.
-
-#  TAG: memory_cache_mode
-#	Controls which objects to keep in the memory cache (cache_mem)
-#
-#	always	Keep most recently fetched objects in memory (default)
-#
-#	disk	Only disk cache hits are kept in memory, which means
-#		an object must first be cached on disk and then hit
-#		a second time before cached in memory.
-#
-#	network	Only objects fetched from network is kept in memory
-#Default:
-# Keep the most recently fetched objects in memory
-
-#  TAG: memory_replacement_policy
-#	The memory replacement policy parameter determines which
-#	objects are purged from memory when memory space is needed.
-#
-#	See cache_replacement_policy for details on algorithms.
-#Default:
-# memory_replacement_policy lru
-
-# DISK CACHE OPTIONS
-# -----------------------------------------------------------------------------
-
-#  TAG: cache_replacement_policy
-#	The cache replacement policy parameter determines which
-#	objects are evicted (replaced) when disk space is needed.
-#
-#	    lru       : Squid's original list based LRU policy
-#	    heap GDSF : Greedy-Dual Size Frequency
-#	    heap LFUDA: Least Frequently Used with Dynamic Aging
-#	    heap LRU  : LRU policy implemented using a heap
-#
-#	Applies to any cache_dir lines listed below this directive.
-#
-#	The LRU policies keeps recently referenced objects.
-#
-#	The heap GDSF policy optimizes object hit rate by keeping smaller
-#	popular objects in cache so it has a better chance of getting a
-#	hit.  It achieves a lower byte hit rate than LFUDA though since
-#	it evicts larger (possibly popular) objects.
-#
-#	The heap LFUDA policy keeps popular objects in cache regardless of
-#	their size and thus optimizes byte hit rate at the expense of
-#	hit rate since one large, popular object will prevent many
-#	smaller, slightly less popular objects from being cached.
-#
-#	Both policies utilize a dynamic aging mechanism that prevents
-#	cache pollution that can otherwise occur with frequency-based
-#	replacement policies.
-#
-#	NOTE: if using the LFUDA replacement policy you should increase
-#	the value of maximum_object_size above its default of 4 MB to
-#	to maximize the potential byte hit rate improvement of LFUDA.
-#
-#	For more information about the GDSF and LFUDA cache replacement
-#	policies see http://www.hpl.hp.com/techreports/1999/HPL-1999-69.html
-#	and http://fog.hpl.external.hp.com/techreports/98/HPL-98-173.html.
-#Default:
-# cache_replacement_policy lru
-
-#  TAG: minimum_object_size	(bytes)
-#	Objects smaller than this size will NOT be saved on disk.  The
-#	value is specified in bytes, and the default is 0 KB, which
-#	means all responses can be stored.
-#Default:
-# no limit
-
-#  TAG: maximum_object_size	(bytes)
-#	Set the default value for max-size parameter on any cache_dir.
-#	The value is specified in bytes, and the default is 4 MB.
-#	
-#	If you wish to get a high BYTES hit ratio, you should probably
-#	increase this (one 32 MB object hit counts for 3200 10KB
-#	hits).
-#	
-#	If you wish to increase hit ratio more than you want to
-#	save bandwidth you should leave this low.
-#	
-#	NOTE: if using the LFUDA replacement policy you should increase
-#	this value to maximize the byte hit rate improvement of LFUDA!
-#	See cache_replacement_policy for a discussion of this policy.
-#Default:
-# maximum_object_size 4 MB
-
-#  TAG: cache_dir
-#	Format:
-#		cache_dir Type Directory-Name Fs-specific-data [options]
-#
-#	You can specify multiple cache_dir lines to spread the
-#	cache among different disk partitions.
-#
-#	Type specifies the kind of storage system to use. Only "ufs"
-#	is built by default. To enable any of the other storage systems
-#	see the --enable-storeio configure option.
-#
-#	'Directory' is a top-level directory where cache swap
-#	files will be stored.  If you want to use an entire disk
-#	for caching, this can be the mount-point directory.
-#	The directory must exist and be writable by the Squid
-#	process.  Squid will NOT create this directory for you.
-#
-#	In SMP configurations, cache_dir must not precede the workers option
-#	and should use configuration macros or conditionals to give each
-#	worker interested in disk caching a dedicated cache directory.
-#
-#
-#	====  The ufs store type  ====
-#
-#	"ufs" is the old well-known Squid storage format that has always
-#	been there.
-#
-#	Usage:
-#		cache_dir ufs Directory-Name Mbytes L1 L2 [options]
-#
-#	'Mbytes' is the amount of disk space (MB) to use under this
-#	directory.  The default is 100 MB.  Change this to suit your
-#	configuration.  Do NOT put the size of your disk drive here.
-#	Instead, if you want Squid to use the entire disk drive,
-#	subtract 20% and use that value.
-#
-#	'L1' is the number of first-level subdirectories which
-#	will be created under the 'Directory'.  The default is 16.
-#
-#	'L2' is the number of second-level subdirectories which
-#	will be created under each first-level directory.  The default
-#	is 256.
-#
-#
-#	====  The aufs store type  ====
-#
-#	"aufs" uses the same storage format as "ufs", utilizing
-#	POSIX-threads to avoid blocking the main Squid process on
-#	disk-I/O. This was formerly known in Squid as async-io.
-#
-#	Usage:
-#		cache_dir aufs Directory-Name Mbytes L1 L2 [options]
-#
-#	see argument descriptions under ufs above
-#
-#
-#	====  The diskd store type  ====
-#
-#	"diskd" uses the same storage format as "ufs", utilizing a
-#	separate process to avoid blocking the main Squid process on
-#	disk-I/O.
-#
-#	Usage:
-#		cache_dir diskd Directory-Name Mbytes L1 L2 [options] [Q1=n] [Q2=n]
-#
-#	see argument descriptions under ufs above
-#
-#	Q1 specifies the number of unacknowledged I/O requests when Squid
-#	stops opening new files. If this many messages are in the queues,
-#	Squid won't open new files. Default is 64
-#
-#	Q2 specifies the number of unacknowledged messages when Squid
-#	starts blocking.  If this many messages are in the queues,
-#	Squid blocks until it receives some replies. Default is 72
-#
-#	When Q1 < Q2 (the default), the cache directory is optimized
-#	for lower response time at the expense of a decrease in hit
-#	ratio.  If Q1 > Q2, the cache directory is optimized for
-#	higher hit ratio at the expense of an increase in response
-#	time.
-#
-#
-#	====  The rock store type  ====
-#
-#	Usage:
-#	    cache_dir rock Directory-Name Mbytes <max-size=bytes> [options]
-#
-#	The Rock Store type is a database-style storage. All cached
-#	entries are stored in a "database" file, using fixed-size slots,
-#	one entry per slot. The database size is specified in MB. The
-#	slot size is specified in bytes using the max-size option. See
-#	below for more info on the max-size option.
-#
-#	If possible, Squid using Rock Store creates a dedicated kid
-#	process called "disker" to avoid blocking Squid worker(s) on disk
-#	I/O. One disker kid is created for each rock cache_dir.  Diskers
-#	are created only when Squid, running in daemon mode, has support
-#	for the IpcIo disk I/O module.
-#
-#	swap-timeout=msec: Squid will not start writing a miss to or
-#	reading a hit from disk if it estimates that the swap operation
-#	will take more than the specified number of milliseconds. By
-#	default and when set to zero, disables the disk I/O time limit
-#	enforcement. Ignored when using blocking I/O module because
-#	blocking synchronous I/O does not allow Squid to estimate the
-#	expected swap wait time.
-#
-#	max-swap-rate=swaps/sec: Artificially limits disk access using
-#	the specified I/O rate limit. Swap out requests that
-#	would cause the average I/O rate to exceed the limit are
-#	delayed. Individual swap in requests (i.e., hits or reads) are
-#	not delayed, but they do contribute to measured swap rate and
-#	since they are placed in the same FIFO queue as swap out
-#	requests, they may wait longer if max-swap-rate is smaller.
-#	This is necessary on file systems that buffer "too
-#	many" writes and then start blocking Squid and other processes
-#	while committing those writes to disk.  Usually used together
-#	with swap-timeout to avoid excessive delays and queue overflows
-#	when disk demand exceeds available disk "bandwidth". By default
-#	and when set to zero, disables the disk I/O rate limit
-#	enforcement. Currently supported by IpcIo module only.
-#
-#
-#	====  The coss store type  ====
-#
-#	NP: COSS filesystem in Squid-3 has been deemed too unstable for
-#	    production use and has thus been removed from this release.
-#	    We hope that it can be made usable again soon.
-#
-#	block-size=n defines the "block size" for COSS cache_dir's.
-#	Squid uses file numbers as block numbers.  Since file numbers
-#	are limited to 24 bits, the block size determines the maximum
-#	size of the COSS partition.  The default is 512 bytes, which
-#	leads to a maximum cache_dir size of 512<<24, or 8 GB.  Note
-#	you should not change the coss block size after Squid
-#	has written some objects to the cache_dir.
-#
-#	The coss file store has changed from 2.5. Now it uses a file
-#	called 'stripe' in the directory names in the config - and
-#	this will be created by squid -z.
-#
-#
-#	==== COMMON OPTIONS ====
-#
-#	no-store	no new objects should be stored to this cache_dir.
-#
-#	min-size=n	the minimum object size in bytes this cache_dir
-#			will accept.  It's used to restrict a cache_dir
-#			to only store large objects (e.g. AUFS) while
-#			other stores are optimized for smaller objects
-#			(e.g. COSS).
-#			Defaults to 0.
-#
-#	max-size=n	the maximum object size in bytes this cache_dir
-#			supports.
-#			The value in maximum_object_size directive sets
-#			the default unless more specific details are
-#			available (ie a small store capacity).
-#
-#	Note: To make optimal use of the max-size limits you should order
-#	the cache_dir lines with the smallest max-size value first.
-#
-#	Note for coss, max-size must be less than COSS_MEMBUF_SZ,
-#	which can be changed with the --with-coss-membuf-size=N configure
-#	option.
-#
-#Default:
-# No disk cache. Store cache ojects only in memory.
-#
-
-# Uncomment and adjust the following to add a disk cache directory.
-cache_dir ufs /var/cache/squid 256 16 256
-
-#  TAG: store_dir_select_algorithm
-#	How Squid selects which cache_dir to use when the response
-#	object will fit into more than one.
-#
-#	Regardless of which algorithm is used the cache_dir min-size
-#	and max-size parameters are obeyed. As such they can affect
-#	the selection algorithm by limiting the set of considered
-#	cache_dir.
-#
-#	Algorithms:
-#
-#		least-load
-#
-#	This algorithm is suited to caches with similar cache_dir
-#	sizes and disk speeds.
-#
-#	The disk with the least I/O pending is selected.
-#	When there are multiple disks with the same I/O load ranking
-#	the cache_dir with most available capacity is selected.
-#
-#	When a mix of cache_dir sizes are configured the faster disks
-#	have a naturally lower I/O loading and larger disks have more
-#	capacity. So space used to store objects and data throughput
-#	may be very unbalanced towards larger disks.
-#
-#
-#		round-robin
-#
-#	This algorithm is suited to caches with unequal cache_dir
-#	disk sizes.
-#
-#	Each cache_dir is selected in a rotation. The next suitable
-#	cache_dir is used.
-#
-#	Available cache_dir capacity is only considered in relation
-#	to whether the object will fit and meets the min-size and
-#	max-size parameters.
-#
-#	Disk I/O loading is only considered to prevent overload on slow
-#	disks. This algorithm does not spread objects by size, so any
-#	I/O loading per-disk may appear very unbalanced and volatile.
-#
-#Default:
-# store_dir_select_algorithm least-load
-
-#  TAG: max_open_disk_fds
-#	To avoid having disk as the I/O bottleneck Squid can optionally
-#	bypass the on-disk cache if more than this amount of disk file
-#	descriptors are open.
-#
-#	A value of 0 indicates no limit.
-#Default:
-# no limit
-
-#  TAG: cache_swap_low	(percent, 0-100)
-#	The low-water mark for cache object replacement.
-#	Replacement begins when the swap (disk) usage is above the
-#	low-water mark and attempts to maintain utilization near the
-#	low-water mark.  As swap utilization gets close to high-water
-#	mark object eviction becomes more aggressive.  If utilization is
-#	close to the low-water mark less replacement is done each time.
-#
-#	Defaults are 90% and 95%. If you have a large cache, 5% could be
-#	hundreds of MB. If this is the case you may wish to set these
-#	numbers closer together.
-#
-#	See also cache_swap_high
-#Default:
-# cache_swap_low 90
-
-#  TAG: cache_swap_high	(percent, 0-100)
-#	The high-water mark for cache object replacement.
-#	Replacement begins when the swap (disk) usage is above the
-#	low-water mark and attempts to maintain utilization near the
-#	low-water mark.  As swap utilization gets close to high-water
-#	mark object eviction becomes more aggressive.  If utilization is
-#	close to the low-water mark less replacement is done each time.
-#
-#	Defaults are 90% and 95%. If you have a large cache, 5% could be
-#	hundreds of MB. If this is the case you may wish to set these
-#	numbers closer together.
-#
-#	See also cache_swap_low
-#Default:
-# cache_swap_high 95
-
-# LOGFILE OPTIONS
-# -----------------------------------------------------------------------------
-
-#  TAG: logformat
-#	Usage:
-#
-#	logformat <name> <format specification>
-#
-#	Defines an access log format.
-#
-#	The <format specification> is a string with embedded % format codes
-#
-#	% format codes all follow the same basic structure where all but
-#	the formatcode is optional. Output strings are automatically escaped
-#	as required according to their context and the output format
-#	modifiers are usually not needed, but can be specified if an explicit
-#	output format is desired.
-#
-#		% ["|[|'|#] [-] [[0]width] [{argument}] formatcode
-#
-#		"	output in quoted string format
-#		[	output in squid text log format as used by log_mime_hdrs
-#		#	output in URL quoted format
-#		'	output as-is
-#
-#		-	left aligned
-#
-#		width	minimum and/or maximum field width:
-#			    [width_min][.width_max]
-#			When minimum starts with 0, the field is zero-padded.
-#			String values exceeding maximum width are truncated.
-#
-#		{arg}	argument such as header name etc
-#
-#	Format codes:
-#
-#		%	a literal % character
-#		sn	Unique sequence number per log line entry
-#		err_code    The ID of an error response served by Squid or
-#				a similar internal error identifier.
-#		err_detail  Additional err_code-dependent error information.
-#		note	The annotation specified by the argument. Also
-#			logs the adaptation meta headers set by the
-#			adaptation_meta configuration parameter.
-#			If no argument given all annotations logged.
-#			The argument may include a separator to use with
-#			annotation values:
-#                            name[:separator]
-#			By default, multiple note values are separated with ","
-#			and multiple notes are separated with "\r\n".
-#			When logging named notes with %{name}note, the
-#			explicitly configured separator is used between note
-#			values. When logging all notes with %note, the
-#			explicitly configured separator is used between
-#			individual notes. There is currently no way to
-#			specify both value and notes separators when logging
-#			all notes with %note.
-#
-#	Connection related format codes:
-#
-#		>a	Client source IP address
-#		>A	Client FQDN
-#		>p	Client source port
-#		>eui	Client source EUI (MAC address, EUI-48 or EUI-64 identifier)
-#		>la	Local IP address the client connected to
-#		>lp	Local port number the client connected to
-#		>qos    Client connection TOS/DSCP value set by Squid
-#		>nfmark Client connection netfilter mark set by Squid
-#
-#		la	Local listening IP address the client connection was connected to.
-#		lp	Local listening port number the client connection was connected to.
-#
-#		<a	Server IP address of the last server or peer connection
-#		<A	Server FQDN or peer name
-#		<p	Server port number of the last server or peer connection
-#		<la	Local IP address of the last server or peer connection
-#		<lp     Local port number of the last server or peer connection
-#		<qos	Server connection TOS/DSCP value set by Squid
-#		<nfmark Server connection netfilter mark set by Squid
-#
-#	Time related format codes:
-#
-#		ts	Seconds since epoch
-#		tu	subsecond time (milliseconds)
-#		tl	Local time. Optional strftime format argument
-#				default %d/%b/%Y:%H:%M:%S %z
-#		tg	GMT time. Optional strftime format argument
-#				default %d/%b/%Y:%H:%M:%S %z
-#		tr	Response time (milliseconds)
-#		dt	Total time spent making DNS lookups (milliseconds)
-#
-#	Access Control related format codes:
-#
-#		et	Tag returned by external acl
-#		ea	Log string returned by external acl
-#		un	User name (any available)
-#		ul	User name from authentication
-#		ue	User name from external acl helper
-#		ui	User name from ident
-#		us	User name from SSL
-#
-#	HTTP related format codes:
-#
-#		[http::]>h	Original received request header. 
-#				Usually differs from the request header sent by
-#				Squid, although most fields are often preserved.
-#				Accepts optional header field name/value filter
-#				argument using name[:[separator]element] format.
-#		[http::]>ha	Received request header after adaptation and
-#				redirection (pre-cache REQMOD vectoring point).
-#				Usually differs from the request header sent by
-#				Squid, although most fields are often preserved.
-#				Optional header name argument as for >h
-#		[http::]<h	Reply header. Optional header name argument
-#				as for >h
-#		[http::]>Hs	HTTP status code sent to the client
-#		[http::]<Hs	HTTP status code received from the next hop
-#		[http::]<bs	Number of HTTP-equivalent message body bytes 
-#				received from the next hop, excluding chunked
-#				transfer encoding and control messages.
-#				Generated FTP/Gopher listings are treated as
-#				received bodies.
-#		[http::]mt	MIME content type
-#		[http::]rm	Request method (GET/POST etc)
-#		[http::]>rm	Request method from client
-#		[http::]<rm	Request method sent to server or peer
-#		[http::]ru	Request URL from client (historic, filtered for logging)
-#		[http::]>ru	Request URL from client
-#		[http::]<ru	Request URL sent to server or peer
-#		[http::]rp	Request URL-Path excluding hostname
-#		[http::]>rp	Request URL-Path excluding hostname from client
-#		[http::]<rp	Request URL-Path excluding hostname sento to server or peer
-#		[http::]rv	Request protocol version
-#		[http::]>rv	Request protocol version from client
-#		[http::]<rv	Request protocol version sent to server or peer
-#		[http::]<st	Sent reply size including HTTP headers
-#		[http::]>st	Received request size including HTTP headers. In the
-#				case of chunked requests the chunked encoding metadata
-#				are not included
-#		[http::]>sh	Received HTTP request headers size
-#		[http::]<sh	Sent HTTP reply headers size
-#		[http::]st	Request+Reply size including HTTP headers
-#		[http::]<sH	Reply high offset sent
-#		[http::]<sS	Upstream object size
-#		[http::]<pt	Peer response time in milliseconds. The timer starts
-#				when the last request byte is sent to the next hop
-#				and stops when the last response byte is received.
-#		[http::]<tt	Total server-side time in milliseconds. The timer 
-#				starts with the first connect request (or write I/O)
-#				sent to the first selected peer. The timer stops
-#				with the last I/O with the last peer.
-#
-#	Squid handling related format codes:
-#
-#		Ss	Squid request status (TCP_MISS etc)
-#		Sh	Squid hierarchy status (DEFAULT_PARENT etc)
-#
-#	SSL-related format codes:
-#
-#		ssl::bump_mode	SslBump decision for the transaction:
-#
-#				For CONNECT requests that initiated bumping of
-#				a connection and for any request received on
-#				an already bumped connection, Squid logs the
-#				corresponding SslBump mode ("server-first" or
-#				"client-first"). See the ssl_bump option for
-#				more information about these modes.
-#
-#				A "none" token is logged for requests that
-#				triggered "ssl_bump" ACL evaluation matching
-#				either a "none" rule or no rules at all.
-#
-#				In all other cases, a single dash ("-") is
-#				logged.
-#
-#	If ICAP is enabled, the following code becomes available (as
-#	well as ICAP log codes documented with the icap_log option):
-#
-#		icap::tt        Total ICAP processing time for the HTTP
-#				transaction. The timer ticks when ICAP
-#				ACLs are checked and when ICAP
-#				transaction is in progress.
-#
-#	If adaptation is enabled the following three codes become available:
-#
-#		adapt::<last_h	The header of the last ICAP response or
-#				meta-information from the last eCAP
-#				transaction related to the HTTP transaction.
-#				Like <h, accepts an optional header name
-#				argument.
-#
-#		adapt::sum_trs Summed adaptation transaction response
-#				times recorded as a comma-separated list in
-#				the order of transaction start time. Each time
-#				value is recorded as an integer number,
-#				representing response time of one or more
-#				adaptation (ICAP or eCAP) transaction in
-#				milliseconds.  When a failed transaction is
-#				being retried or repeated, its time is not
-#				logged individually but added to the
-#				replacement (next) transaction. See also:
-#				adapt::all_trs.
-#
-#		adapt::all_trs All adaptation transaction response times.
-#				Same as adaptation_strs but response times of
-#				individual transactions are never added
-#				together. Instead, all transaction response
-#				times are recorded individually.
-#
-#	You can prefix adapt::*_trs format codes with adaptation
-#	service name in curly braces to record response time(s) specific
-#	to that service. For example: %{my_service}adapt::sum_trs
-#
-#	If SSL is enabled, the following formating codes become available:
-#
-#		%ssl::>cert_subject The Subject field of the received client
-#				SSL certificate or a dash ('-') if Squid has
-#				received an invalid/malformed certificate or
-#				no certificate at all. Consider encoding the
-#				logged value because Subject often has spaces.
-#
-#		%ssl::>cert_issuer The Issuer field of the received client
-#				SSL certificate or a dash ('-') if Squid has
-#				received an invalid/malformed certificate or
-#				no certificate at all. Consider encoding the
-#				logged value because Issuer often has spaces.
-#
-#	The default formats available (which do not need re-defining) are:
-#
-#logformat squid      %ts.%03tu %6tr %>a %Ss/%03>Hs %<st %rm %ru %[un %Sh/%<a %mt
-#logformat common     %>a %[ui %[un [%tl] "%rm %ru HTTP/%rv" %>Hs %<st %Ss:%Sh
-#logformat combined   %>a %[ui %[un [%tl] "%rm %ru HTTP/%rv" %>Hs %<st "%{Referer}>h" "%{User-Agent}>h" %Ss:%Sh
-#logformat referrer   %ts.%03tu %>a %{Referer}>h %ru
-#logformat useragent  %>a [%tl] "%{User-Agent}>h"
-#
-#	NOTE: When the log_mime_hdrs directive is set to ON.
-#		The squid, common and combined formats have a safely encoded copy
-#		of the mime headers appended to each line within a pair of brackets.
-#
-#	NOTE: The common and combined formats are not quite true to the Apache definition.
-#		The logs from Squid contain an extra status and hierarchy code appended.
-#
-#Default:
-# The format definitions squid, common, combined, referrer, useragent are built in.
-
-#  TAG: access_log
-#	Configures whether and how Squid logs HTTP and ICP transactions.
-#	If access logging is enabled, a single line is logged for every 
-#	matching HTTP or ICP request. The recommended directive formats are:
-#
-#	access_log <module>:<place> [option ...] [acl acl ...]
-#	access_log none [acl acl ...]
-#
-#	The following directive format is accepted but may be deprecated:
-#	access_log <module>:<place> [<logformat name> [acl acl ...]]
-#
-#        In most cases, the first ACL name must not contain the '=' character
-#	and should not be equal to an existing logformat name. You can always
-#	start with an 'all' ACL to work around those restrictions.
-#	
-#	Will log to the specified module:place using the specified format (which
-#	must be defined in a logformat directive) those entries which match
-#	ALL the acl's specified (which must be defined in acl clauses).
-#	If no acl is specified, all requests will be logged to this destination.
-#	
-#	===== Available options for the recommended directive format =====
-#
-#	logformat=name		Names log line format (either built-in or
-#				defined by a logformat directive). Defaults
-#				to 'squid'.
-#
-#	buffer-size=64KB	Defines approximate buffering limit for log
-#				records (see buffered_logs).  Squid should not
-#				keep more than the specified size and, hence,
-#				should flush records before the buffer becomes
-#				full to avoid overflows under normal
-#				conditions (the exact flushing algorithm is
-#				module-dependent though).  The on-error option
-#				controls overflow handling.
-#
-#	on-error=die|drop	Defines action on unrecoverable errors. The
-#				'drop' action ignores (i.e., does not log)
-#				affected log records. The default 'die' action
-#				kills the affected worker. The drop action 
-#				support has not been tested for modules other
-#				than tcp.
-#
-#	===== Modules Currently available =====
-#	
-#	none	Do not log any requests matching these ACL.
-#		Do not specify Place or logformat name.
-#	
-#	stdio	Write each log line to disk immediately at the completion of
-#		each request.
-#		Place: the filename and path to be written.
-#	
-#	daemon	Very similar to stdio. But instead of writing to disk the log
-#		line is passed to a daemon helper for asychronous handling instead.
-#		Place: varies depending on the daemon.
-#		
-#		log_file_daemon Place: the file name and path to be written.
-#	
-#	syslog	To log each request via syslog facility.
-#		Place: The syslog facility and priority level for these entries.
-#		Place Format:  facility.priority
-#
-#		where facility could be any of:
-#			authpriv, daemon, local0 ... local7 or user.
-#
-#		And priority could be any of:
-#			err, warning, notice, info, debug.
-#	
-#	udp	To send each log line as text data to a UDP receiver.
-#		Place: The destination host name or IP and port.
-#		Place Format:   //host:port
-#
-#	tcp	To send each log line as text data to a TCP receiver.
-#		Lines may be accumulated before sending (see buffered_logs).
-#		Place: The destination host name or IP and port.
-#		Place Format:   //host:port
-#
-#	Default:
-#		access_log daemon:/var/log/squid/access.log squid
-#Default:
-# access_log daemon:/var/log/squid/access.log squid
-
-#  TAG: icap_log
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-icap-client
-#
-#	ICAP log files record ICAP transaction summaries, one line per
-#	transaction.
-#
-#	The icap_log option format is:
-#	icap_log <filepath> [<logformat name> [acl acl ...]]
-#	icap_log none [acl acl ...]]
-#	
-#	Please see access_log option documentation for details. The two
-#	kinds of logs share the overall configuration approach and many
-#	features.
-#
-#	ICAP processing of a single HTTP message or transaction may
-#	require multiple ICAP transactions.  In such cases, multiple
-#	ICAP transaction log lines will correspond to a single access
-#	log line.
-#
-#	ICAP log uses logformat codes that make sense for an ICAP
-#	transaction. Header-related codes are applied to the HTTP header
-#	embedded in an ICAP server response, with the following caveats:
-#	For REQMOD, there is no HTTP response header unless the ICAP
-#	server performed request satisfaction. For RESPMOD, the HTTP
-#	request header is the header sent to the ICAP server. For
-#	OPTIONS, there are no HTTP headers.
-#
-#	The following format codes are also available for ICAP logs:
-#
-#		icap::<A	ICAP server IP address. Similar to <A.
-#
-#		icap::<service_name	ICAP service name from the icap_service
-#				option in Squid configuration file.
-#
-#		icap::ru	ICAP Request-URI. Similar to ru.
-#
-#		icap::rm	ICAP request method (REQMOD, RESPMOD, or 
-#				OPTIONS). Similar to existing rm.
-#
-#		icap::>st	Bytes sent to the ICAP server (TCP payload
-#				only; i.e., what Squid writes to the socket).
-#
-#		icap::<st	Bytes received from the ICAP server (TCP
-#				payload only; i.e., what Squid reads from
-#				the socket).
-#
-#		icap::<bs	Number of message body bytes received from the
-#				ICAP server. ICAP message body, if any, usually
-#				includes encapsulated HTTP message headers and
-#				possibly encapsulated HTTP message body. The
-#				HTTP body part is dechunked before its size is
-#				computed.
-#
-#		icap::tr 	Transaction response time (in
-#				milliseconds).  The timer starts when
-#				the ICAP transaction is created and
-#				stops when the transaction is completed.
-#				Similar to tr.
-#
-#		icap::tio	Transaction I/O time (in milliseconds). The
-#				timer starts when the first ICAP request
-#				byte is scheduled for sending. The timers
-#				stops when the last byte of the ICAP response
-#				is received.
-#
-#		icap::to 	Transaction outcome: ICAP_ERR* for all
-#				transaction errors, ICAP_OPT for OPTION
-#				transactions, ICAP_ECHO for 204
-#				responses, ICAP_MOD for message
-#				modification, and ICAP_SAT for request
-#				satisfaction. Similar to Ss.
-#
-#		icap::Hs	ICAP response status code. Similar to Hs.
-#
-#		icap::>h	ICAP request header(s). Similar to >h.
-#
-#		icap::<h	ICAP response header(s). Similar to <h.
-#
-#	The default ICAP log format, which can be used without an explicit
-#	definition, is called icap_squid:
-#
-#logformat icap_squid %ts.%03tu %6icap::tr %>a %icap::to/%03icap::Hs %icap::<size %icap::rm %icap::ru% %un -/%icap::<A -
-#
-#	See also: logformat, log_icap, and %adapt::<last_h 
-#Default:
-# none
-
-#  TAG: logfile_daemon
-#	Specify the path to the logfile-writing daemon. This daemon is
-#	used to write the access and store logs, if configured.
-#
-#	Squid sends a number of commands to the log daemon:
-#	  L<data>\n - logfile data
-#	  R\n - rotate file
-#	  T\n - truncate file
-#	  O\n - reopen file
-#	  F\n - flush file
-#	  r<n>\n - set rotate count to <n>
-#	  b<n>\n - 1 = buffer output, 0 = don't buffer output
-#
-#	No responses is expected.
-#Default:
-# logfile_daemon /usr/libexec/log_file_daemon
-
-#  TAG: log_access
-#	Remove this line. Use acls with access_log directives to control access logging
-#Default:
-# none
-
-#  TAG: log_icap
-#	Remove this line. Use acls with icap_log directives to control icap logging
-#Default:
-# none
-
-#  TAG: stats_collection	allow|deny acl acl...
-#	This options allows you to control which requests gets accounted
-#	in performance counters.
-#
-#	This clause only supports fast acl types.
-#	See http://wiki.squid-cache.org/SquidFaq/SquidAcl for details.
-#Default:
-# Allow logging for all transactions.
-
-#  TAG: cache_store_log
-#	Logs the activities of the storage manager.  Shows which
-#	objects are ejected from the cache, and which objects are
-#	saved and for how long.
-#	There are not really utilities to analyze this data, so you can safely
-#	disable it (the default).
-#	
-#	Store log uses modular logging outputs. See access_log for the list
-#	of modules supported.
-#	
-#	Example:
-#		cache_store_log stdio:/var/log/squid/store.log
-#		cache_store_log daemon:/var/log/squid/store.log
-#Default:
-# none
-
-#  TAG: cache_swap_state
-#	Location for the cache "swap.state" file. This index file holds
-#	the metadata of objects saved on disk.  It is used to rebuild
-#	the cache during startup.  Normally this file resides in each
-#	'cache_dir' directory, but you may specify an alternate
-#	pathname here.  Note you must give a full filename, not just
-#	a directory. Since this is the index for the whole object
-#	list you CANNOT periodically rotate it!
-#
-#	If %s can be used in the file name it will be replaced with a
-#	a representation of the cache_dir name where each / is replaced
-#	with '.'. This is needed to allow adding/removing cache_dir
-#	lines when cache_swap_log is being used.
-#
-#	If have more than one 'cache_dir', and %s is not used in the name
-#	these swap logs will have names such as:
-#
-#		cache_swap_log.00
-#		cache_swap_log.01
-#		cache_swap_log.02
-#
-#	The numbered extension (which is added automatically)
-#	corresponds to the order of the 'cache_dir' lines in this
-#	configuration file.  If you change the order of the 'cache_dir'
-#	lines in this file, these index files will NOT correspond to
-#	the correct 'cache_dir' entry (unless you manually rename
-#	them).  We recommend you do NOT use this option.  It is
-#	better to keep these index files in each 'cache_dir' directory.
-#Default:
-# Store the journal inside its cache_dir
-
-#  TAG: logfile_rotate
-#	Specifies the number of logfile rotations to make when you
-#	type 'squid -k rotate'. The default is 10, which will rotate
-#	with extensions 0 through 9. Setting logfile_rotate to 0 will
-#	disable the file name rotation, but the logfiles are still closed
-#	and re-opened. This will enable you to rename the logfiles
-#	yourself just before sending the rotate signal.
-#
-#	Note, the 'squid -k rotate' command normally sends a USR1
-#	signal to the running squid process.  In certain situations
-#	(e.g. on Linux with Async I/O), USR1 is used for other
-#	purposes, so -k rotate uses another signal.  It is best to get
-#	in the habit of using 'squid -k rotate' instead of 'kill -USR1
-#	<pid>'.
-#
-#	Note, from Squid-3.1 this option is only a default for cache.log,
-#	that log can be rotated separately by using debug_options.
-#Default:
-# logfile_rotate 10
-
-#  TAG: emulate_httpd_log
-#	Replace this with an access_log directive using the format 'common' or 'combined'.
-#Default:
-# none
-
-#  TAG: log_ip_on_direct
-#	Remove this option from your config. To log server or peer names use %<A in the log format.
-#Default:
-# none
-
-#  TAG: mime_table
-#	Path to Squid's icon configuration file.
-#
-#	You shouldn't need to change this, but the default file contains
-#	examples and formatting information if you do.
-#Default:
-# mime_table /etc/squid/mime.conf
-
-#  TAG: log_mime_hdrs	on|off
-#	The Cache can record both the request and the response MIME
-#	headers for each HTTP transaction.  The headers are encoded
-#	safely and will appear as two bracketed fields at the end of
-#	the access log (for either the native or httpd-emulated log
-#	formats).  To enable this logging set log_mime_hdrs to 'on'.
-#Default:
-# log_mime_hdrs off
-
-#  TAG: useragent_log
-#	Replace this with an access_log directive using the format 'useragent'.
-#Default:
-# none
-
-#  TAG: referer_log
-#	Replace this with an access_log directive using the format 'referrer'.
-#Default:
-# none
-
-#  TAG: pid_filename
-#	A filename to write the process-id to.  To disable, enter "none".
-#Default:
-pid_filename /var/run/squid/squid.pid
-
-#  TAG: log_fqdn
-#	Remove this option from your config. To log FQDN use %>A in the log format.
-#Default:
-# none
-
-#  TAG: client_netmask
-#	A netmask for client addresses in logfiles and cachemgr output.
-#	Change this to protect the privacy of your cache clients.
-#	A netmask of 255.255.255.0 will log all IP's in that range with
-#	the last digit set to '0'.
-#Default:
-# Log full client IP address
-
-#  TAG: forward_log
-#	Use a regular access.log with ACL limiting it to MISS events.
-#Default:
-# none
-
-#  TAG: strip_query_terms
-#	By default, Squid strips query terms from requested URLs before
-#	logging.  This protects your user's privacy and reduces log size.
-#
-#	When investigating HIT/MISS or other caching behaviour you
-#	will need to disable this to see the full URL used by Squid.
-#Default:
-# strip_query_terms on
-
-#  TAG: buffered_logs	on|off
-#	Whether to write/send access_log records ASAP or accumulate them and
-#	then write/send them in larger chunks. Buffering may improve
-#	performance because it decreases the number of I/Os. However,
-#	buffering increases the delay before log records become available to
-#	the final recipient (e.g., a disk file or logging daemon) and,
-#	hence, increases the risk of log records loss.
-#
-#	Note that even when buffered_logs are off, Squid may have to buffer
-#	records if it cannot write/send them immediately due to pending I/Os
-#	(e.g., the I/O writing the previous log record) or connectivity loss.
-#
-#	Currently honored by 'daemon' and 'tcp' access_log modules only.
-#Default:
-# buffered_logs off
-
-#  TAG: netdb_filename
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-icmp
-#
-#	Where Squid stores it's netdb journal.
-#	When enabled this journal preserves netdb state between restarts.
-#
-#	To disable, enter "none".
-#Default:
-# netdb_filename stdio:/var/log/squid/netdb.state
-
-# OPTIONS FOR TROUBLESHOOTING
-# -----------------------------------------------------------------------------
-
-#  TAG: cache_log
-#	Squid administrative logging file.
-#
-#	This is where general information about Squid behavior goes. You can
-#	increase the amount of data logged to this file and how often it is
-#	rotated with "debug_options"
-#Default:
-# cache_log /var/log/squid/cache.log
-
-#  TAG: debug_options
-#	Logging options are set as section,level where each source file
-#	is assigned a unique section.  Lower levels result in less
-#	output,  Full debugging (level 9) can result in a very large
-#	log file, so be careful.
-#
-#	The magic word "ALL" sets debugging levels for all sections.
-#	The default is to run with "ALL,1" to record important warnings.
-#
-#	The rotate=N option can be used to keep more or less of these logs
-#	than would otherwise be kept by logfile_rotate.
-#	For most uses a single log should be enough to monitor current
-#	events affecting Squid.
-#Default:
-# Log all critical and important messages.
-
-#  TAG: coredump_dir
-#	By default Squid leaves core files in the directory from where
-#	it was started. If you set 'coredump_dir' to a directory
-#	that exists, Squid will chdir() to that directory at startup
-#	and coredump files will be left there.
-#
-#Default:
-# Use the directory from where Squid was started.
-#
-
-# Leave coredumps in the first cache dir
-coredump_dir /var/log/squid/cache/squid
-
-# OPTIONS FOR FTP GATEWAYING
-# -----------------------------------------------------------------------------
-
-#  TAG: ftp_user
-#	If you want the anonymous login password to be more informative
-#	(and enable the use of picky FTP servers), set this to something
-#	reasonable for your domain, like wwwuser@somewhere.net
-#
-#	The reason why this is domainless by default is the
-#	request can be made on the behalf of a user in any domain,
-#	depending on how the cache is used.
-#	Some FTP server also validate the email address is valid
-#	(for example perl.com).
-#Default:
-# ftp_user Squid@
-
-#  TAG: ftp_passive
-#	If your firewall does not allow Squid to use passive
-#	connections, turn off this option.
-#
-#	Use of ftp_epsv_all option requires this to be ON.
-#Default:
-# ftp_passive on
-
-#  TAG: ftp_epsv_all
-#	FTP Protocol extensions permit the use of a special "EPSV ALL" command.
-#
-#	NATs may be able to put the connection on a "fast path" through the
-#	translator, as the EPRT command will never be used and therefore,
-#	translation of the data portion of the segments will never be needed.
-#
-#	When a client only expects to do two-way FTP transfers this may be
-#	useful.
-#	If squid finds that it must do a three-way FTP transfer after issuing
-#	an EPSV ALL command, the FTP session will fail.
-#
-#	If you have any doubts about this option do not use it.
-#	Squid will nicely attempt all other connection methods.
-#
-#	Requires ftp_passive to be ON (default) for any effect.
-#Default:
-# ftp_epsv_all off
-
-#  TAG: ftp_epsv
-#	FTP Protocol extensions permit the use of a special "EPSV" command.
-#
-#	NATs may be able to put the connection on a "fast path" through the
-#	translator using EPSV, as the EPRT command will never be used
-#	and therefore, translation of the data portion of the segments 
-#	will never be needed.
-#
-#	Turning this OFF will prevent EPSV being attempted.
-#	WARNING: Doing so will convert Squid back to the old behavior with all
-#	the related problems with external NAT devices/layers.
-#
-#	Requires ftp_passive to be ON (default) for any effect.
-#Default:
-# ftp_epsv on
-
-#  TAG: ftp_eprt
-#	FTP Protocol extensions permit the use of a special "EPRT" command.
-#
-#	This extension provides a protocol neutral alternative to the
-#	IPv4-only PORT command. When supported it enables active FTP data
-#	channels over IPv6 and efficient NAT handling.
-#
-#	Turning this OFF will prevent EPRT being attempted and will skip
-#	straight to using PORT for IPv4 servers.
-#
-#	Some devices are known to not handle this extension correctly and
-#	may result in crashes. Devices which suport EPRT enough to fail
-#	cleanly will result in Squid attempting PORT anyway. This directive
-#	should only be disabled when EPRT results in device failures.
-#
-#	WARNING: Doing so will convert Squid back to the old behavior with all
-#	the related problems with external NAT devices/layers and IPv4-only FTP.
-#Default:
-# ftp_eprt on
-
-#  TAG: ftp_sanitycheck
-#	For security and data integrity reasons Squid by default performs
-#	sanity checks of the addresses of FTP data connections ensure the
-#	data connection is to the requested server. If you need to allow
-#	FTP connections to servers using another IP address for the data
-#	connection turn this off.
-#Default:
-# ftp_sanitycheck on
-
-#  TAG: ftp_telnet_protocol
-#	The FTP protocol is officially defined to use the telnet protocol
-#	as transport channel for the control connection. However, many
-#	implementations are broken and does not respect this aspect of
-#	the FTP protocol.
-#
-#	If you have trouble accessing files with ASCII code 255 in the
-#	path or similar problems involving this ASCII code you can
-#	try setting this directive to off. If that helps, report to the
-#	operator of the FTP server in question that their FTP server
-#	is broken and does not follow the FTP standard.
-#Default:
-# ftp_telnet_protocol on
-
-# OPTIONS FOR EXTERNAL SUPPORT PROGRAMS
-# -----------------------------------------------------------------------------
-
-#  TAG: diskd_program
-#	Specify the location of the diskd executable.
-#	Note this is only useful if you have compiled in
-#	diskd as one of the store io modules.
-#Default:
-# diskd_program /usr/libexec/diskd
-
-#  TAG: unlinkd_program
-#	Specify the location of the executable for file deletion process.
-#Default:
-# unlinkd_program /usr/libexec/unlinkd
-
-#  TAG: pinger_program
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-icmp
-#
-#	Specify the location of the executable for the pinger process.
-#Default:
-# pinger_program /usr/libexec/pinger
-
-#  TAG: pinger_enable
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-icmp
-#
-#	Control whether the pinger is active at run-time.
-#	Enables turning ICMP pinger on and off with a simple
-#	squid -k reconfigure.
-#Default:
-# pinger_enable on
-
-# OPTIONS FOR URL REWRITING
-# -----------------------------------------------------------------------------
-
-#  TAG: url_rewrite_program
-#	Specify the location of the executable URL rewriter to use.
-#	Since they can perform almost any function there isn't one included.
-#
-#	For each requested URL, the rewriter will receive on line with the format
-#
-#	  [channel-ID <SP>] URL <SP> client_ip "/" fqdn <SP> user <SP> method [<SP> kv-pairs]<NL>
-#
-#
-#	After processing the request the helper must reply using the following format:
-#
-#	  [channel-ID <SP>] result [<SP> kv-pairs]
-#
-#	The result code can be:
-#
-#	  OK status=30N url="..."
-#		Redirect the URL to the one supplied in 'url='.
-#		'status=' is optional and contains the status code to send
-#		the client in Squids HTTP response. It must be one of the
-#		HTTP redirect status codes: 301, 302, 303, 307, 308.
-#		When no status is given Squid will use 302.
-#
-#	  OK rewrite-url="..."
-#		Rewrite the URL to the one supplied in 'rewrite-url='.
-#		The new URL is fetched directly by Squid and returned to
-#		the client as the response to its request.
-#
-#	  OK
-#		When neither of url= and rewrite-url= are sent Squid does
-#		not change the URL.
-#
-#	  ERR
-#		Do not change the URL.
-#
-#	  BH
-#		An internal error occurred in the helper, preventing
-#		a result being identified. The 'message=' key name is
-#		reserved for delivering a log message.
-#
-#
-#	In the future, the interface protocol will be extended with
-#	key=value pairs ("kv-pairs" shown above).  Helper programs
-#	should be prepared to receive and possibly ignore additional
-#	whitespace-separated tokens on each input line.
-#
-#	When using the concurrency= option the protocol is changed by
-#	introducing a query channel tag in front of the request/response.
-#	The query channel tag is a number between 0 and concurrency-1.
-#	This value must be echoed back unchanged to Squid as the first part
-#	of the response relating to its request.
-#
-#	WARNING: URL re-writing ability should be avoided whenever possible.
-#		 Use the URL redirect form of response instead.
-#
-#	Re-write creates a difference in the state held by the client
-#	and server. Possibly causing confusion when the server response
-#	contains snippets of its view state. Embeded URLs, response
-#	and content Location headers, etc. are not re-written by this
-#	interface.
-#
-#	By default, a URL rewriter is not used.
-#Default:
-# none
-
-#  TAG: url_rewrite_children
-#	The maximum number of redirector processes to spawn. If you limit
-#	it too few Squid will have to wait for them to process a backlog of
-#	URLs, slowing it down. If you allow too many they will use RAM
-#	and other system resources noticably.
-#	
-#	The startup= and idle= options allow some measure of skew in your
-#	tuning.
-#	
-#		startup=
-#	
-#	Sets a minimum of how many processes are to be spawned when Squid
-#	starts or reconfigures. When set to zero the first request will
-#	cause spawning of the first child process to handle it.
-#	
-#	Starting too few will cause an initial slowdown in traffic as Squid
-#	attempts to simultaneously spawn enough processes to cope.
-#	
-#		idle=
-#	
-#	Sets a minimum of how many processes Squid is to try and keep available
-#	at all times. When traffic begins to rise above what the existing
-#	processes can handle this many more will be spawned up to the maximum
-#	configured. A minimum setting of 1 is required.
-#
-#		concurrency=
-#
-#	The number of requests each redirector helper can handle in
-#	parallel. Defaults to 0 which indicates the redirector
-#	is a old-style single threaded redirector.
-#
-#	When this directive is set to a value >= 1 then the protocol
-#	used to communicate with the helper is modified to include
-#	an ID in front of the request/response. The ID from the request
-#	must be echoed back with the response to that request.
-#Default:
-# url_rewrite_children 20 startup=0 idle=1 concurrency=0
-
-#  TAG: url_rewrite_host_header
-#	To preserve same-origin security policies in browsers and
-#	prevent Host: header forgery by redirectors Squid rewrites
-#	any Host: header in redirected requests.
-#	
-#	If you are running an accelerator this may not be a wanted
-#	effect of a redirector. This directive enables you disable
-#	Host: alteration in reverse-proxy traffic.
-#	
-#	WARNING: Entries are cached on the result of the URL rewriting
-#	process, so be careful if you have domain-virtual hosts.
-#	
-#	WARNING: Squid and other software verifies the URL and Host
-#	are matching, so be careful not to relay through other proxies
-#	or inspecting firewalls with this disabled.
-#Default:
-# url_rewrite_host_header on
-
-#  TAG: url_rewrite_access
-#	If defined, this access list specifies which requests are
-#	sent to the redirector processes.
-#
-#	This clause supports both fast and slow acl types.
-#	See http://wiki.squid-cache.org/SquidFaq/SquidAcl for details.
-#Default:
-# Allow, unless rules exist in squid.conf.
-
-#  TAG: url_rewrite_bypass
-#	When this is 'on', a request will not go through the
-#	redirector if all the helpers are busy.  If this is 'off'
-#	and the redirector queue grows too large, Squid will exit
-#	with a FATAL error and ask you to increase the number of
-#	redirectors.  You should only enable this if the redirectors
-#	are not critical to your caching system.  If you use
-#	redirectors for access control, and you enable this option,
-#	users may have access to pages they should not
-#	be allowed to request.
-#Default:
-# url_rewrite_bypass off
-
-# OPTIONS FOR STORE ID
-# -----------------------------------------------------------------------------
-
-#  TAG: store_id_program
-#	Specify the location of the executable StoreID helper to use.
-#	Since they can perform almost any function there isn't one included.
-#
-#	For each requested URL, the helper will receive one line with the format
-#
-#	  [channel-ID <SP>] URL <SP> client_ip "/" fqdn <SP> user <SP> method [<SP> kv-pairs]<NL>
-#
-#
-#	After processing the request the helper must reply using the following format:
-#
-#	  [channel-ID <SP>] result [<SP> kv-pairs]
-#
-#	The result code can be:
-#
-#	  OK store-id="..."
-#		Use the StoreID supplied in 'store-id='.
-#
-#	  ERR
-#		The default is to use HTTP request URL as the store ID.
-#
-#	  BH
-#		An internal error occured in the helper, preventing
-#		a result being identified.
-#
-#
-#	Helper programs should be prepared to receive and possibly ignore additional
-#	kv-pairs with keys they do not support.
-#
-#	When using the concurrency= option the protocol is changed by
-#	introducing a query channel tag in front of the request/response.
-#	The query channel tag is a number between 0 and concurrency-1.
-#	This value must be echoed back unchanged to Squid as the first part
-#	of the response relating to its request.
-#
-#	NOTE: when using StoreID refresh_pattern will apply to the StoreID
-#	      returned from the helper and not the URL.
-#
-#	WARNING: Wrong StoreID value returned by a careless helper may result
-#	         in the wrong cached response returned to the user.
-#
-#	By default, a StoreID helper is not used.
-#Default:
-# none
-
-#  TAG: store_id_children
-#	The maximum number of StoreID helper processes to spawn. If you limit
-#	it too few Squid will have to wait for them to process a backlog of
-#	requests, slowing it down. If you allow too many they will use RAM
-#	and other system resources noticably.
-#	
-#	The startup= and idle= options allow some measure of skew in your
-#	tuning.
-#	
-#		startup=
-#	
-#	Sets a minimum of how many processes are to be spawned when Squid
-#	starts or reconfigures. When set to zero the first request will
-#	cause spawning of the first child process to handle it.
-#	
-#	Starting too few will cause an initial slowdown in traffic as Squid
-#	attempts to simultaneously spawn enough processes to cope.
-#	
-#		idle=
-#	
-#	Sets a minimum of how many processes Squid is to try and keep available
-#	at all times. When traffic begins to rise above what the existing
-#	processes can handle this many more will be spawned up to the maximum
-#	configured. A minimum setting of 1 is required.
-#
-#		concurrency=
-#
-#	The number of requests each storeID helper can handle in
-#	parallel. Defaults to 0 which indicates the helper
-#	is a old-style single threaded program.
-#
-#	When this directive is set to a value >= 1 then the protocol
-#	used to communicate with the helper is modified to include
-#	an ID in front of the request/response. The ID from the request
-#	must be echoed back with the response to that request.
-#Default:
-# store_id_children 20 startup=0 idle=1 concurrency=0
-
-#  TAG: store_id_access
-#	If defined, this access list specifies which requests are
-#	sent to the StoreID processes.  By default all requests
-#	are sent.
-#
-#	This clause supports both fast and slow acl types.
-#	See http://wiki.squid-cache.org/SquidFaq/SquidAcl for details.
-#Default:
-# Allow, unless rules exist in squid.conf.
-
-#  TAG: store_id_bypass
-#	When this is 'on', a request will not go through the
-#	helper if all helpers are busy.  If this is 'off'
-#	and the helper queue grows too large, Squid will exit
-#	with a FATAL error and ask you to increase the number of
-#	helpers.  You should only enable this if the helperss
-#	are not critical to your caching system.  If you use
-#	helpers for critical caching components, and you enable this 
-#	option,	users may not get objects from cache.
-#Default:
-# store_id_bypass on
-
-# OPTIONS FOR TUNING THE CACHE
-# -----------------------------------------------------------------------------
-
-#  TAG: cache
-#	A list of ACL elements which, if matched and denied, cause the request to
-#	not be satisfied from the cache and the reply to not be cached.
-#	In other words, use this to force certain objects to never be cached.
-#
-#	You must use the words 'allow' or 'deny' to indicate whether items
-#	matching the ACL should be allowed or denied into the cache.
-#
-#	This clause supports both fast and slow acl types.
-#	See http://wiki.squid-cache.org/SquidFaq/SquidAcl for details.
-#Default:
-# Allow caching, unless rules exist in squid.conf.
-
-#  TAG: max_stale	time-units
-#	This option puts an upper limit on how stale content Squid
-#	will serve from the cache if cache validation fails.
-#	Can be overriden by the refresh_pattern max-stale option.
-#Default:
-# max_stale 1 week
-
-#  TAG: refresh_pattern
-#	usage: refresh_pattern [-i] regex min percent max [options]
-#
-#	By default, regular expressions are CASE-SENSITIVE.  To make
-#	them case-insensitive, use the -i option.
-#
-#	'Min' is the time (in minutes) an object without an explicit
-#	expiry time should be considered fresh. The recommended
-#	value is 0, any higher values may cause dynamic applications
-#	to be erroneously cached unless the application designer
-#	has taken the appropriate actions.
-#
-#	'Percent' is a percentage of the objects age (time since last
-#	modification age) an object without explicit expiry time
-#	will be considered fresh.
-#
-#	'Max' is an upper limit on how long objects without an explicit
-#	expiry time will be considered fresh.
-#
-#	options: override-expire
-#		 override-lastmod
-#		 reload-into-ims
-#		 ignore-reload
-#		 ignore-no-store
-#		 ignore-must-revalidate
-#		 ignore-private
-#		 ignore-auth
-#		 max-stale=NN
-#		 refresh-ims
-#		 store-stale
-#
-#		override-expire enforces min age even if the server
-#		sent an explicit expiry time (e.g., with the
-#		Expires: header or Cache-Control: max-age). Doing this
-#		VIOLATES the HTTP standard.  Enabling this feature
-#		could make you liable for problems which it causes.
-#
-#		Note: override-expire does not enforce staleness - it only extends
-#		freshness / min. If the server returns a Expires time which
-#		is longer than your max time, Squid will still consider
-#		the object fresh for that period of time.
-#
-#		override-lastmod enforces min age even on objects
-#		that were modified recently.
-#
-#		reload-into-ims changes a client no-cache or ``reload''
-#		request for a cached entry into a conditional request using
-#		If-Modified-Since and/or If-None-Match headers, provided the
-#		cached entry has a Last-Modified and/or a strong ETag header.
-#		Doing this VIOLATES the HTTP standard. Enabling this feature
-#		could make you liable for problems which it causes.
-#
-#		ignore-reload ignores a client no-cache or ``reload''
-#		header. Doing this VIOLATES the HTTP standard. Enabling
-#		this feature could make you liable for problems which
-#		it causes.
-#
-#		ignore-no-store ignores any ``Cache-control: no-store''
-#		headers received from a server. Doing this VIOLATES
-#		the HTTP standard. Enabling this feature could make you
-#		liable for problems which it causes.
-#
-#		ignore-must-revalidate ignores any ``Cache-Control: must-revalidate``
-#		headers received from a server. Doing this VIOLATES
-#		the HTTP standard. Enabling this feature could make you
-#		liable for problems which it causes.
-#
-#		ignore-private ignores any ``Cache-control: private''
-#		headers received from a server. Doing this VIOLATES
-#		the HTTP standard. Enabling this feature could make you
-#		liable for problems which it causes.
-#
-#		ignore-auth caches responses to requests with authorization,
-#		as if the originserver had sent ``Cache-control: public''
-#		in the response header. Doing this VIOLATES the HTTP standard.
-#		Enabling this feature could make you liable for problems which
-#		it causes.
-#
-#		refresh-ims causes squid to contact the origin server
-#		when a client issues an If-Modified-Since request. This
-#		ensures that the client will receive an updated version
-#		if one is available.
-#
-#		store-stale stores responses even if they don't have explicit 
-#		freshness or a validator (i.e., Last-Modified or an ETag) 
-#		present, or if they're already stale. By default, Squid will 
-#		not cache such responses because they usually can't be
-#		reused. Note that such responses will be stale by default.
-#
-#		max-stale=NN provide a maximum staleness factor. Squid won't
-#		serve objects more stale than this even if it failed to
-#		validate the object. Default: use the max_stale global limit.
-#
-#	Basically a cached object is:
-#
-#		FRESH if expires < now, else STALE
-#		STALE if age > max
-#		FRESH if lm-factor < percent, else STALE
-#		FRESH if age < min
-#		else STALE
-#
-#	The refresh_pattern lines are checked in the order listed here.
-#	The first entry which matches is used.  If none of the entries
-#	match the default will be used.
-#
-#	Note, you must uncomment all the default lines if you want
-#	to change one. The default setting is only active if none is
-#	used.
-#
-#
-
-#
-# Add any of your own refresh_pattern entries above these.
-#
-refresh_pattern ^ftp:		1440	20%	10080
-refresh_pattern ^gopher:	1440	0%	1440
-refresh_pattern -i (/cgi-bin/|\?) 0	0%	0
-refresh_pattern .		0	20%	4320
-
-#  TAG: quick_abort_min	(KB)
-#Default:
-# quick_abort_min 16 KB
-
-#  TAG: quick_abort_max	(KB)
-#Default:
-# quick_abort_max 16 KB
-
-#  TAG: quick_abort_pct	(percent)
-#	The cache by default continues downloading aborted requests
-#	which are almost completed (less than 16 KB remaining). This
-#	may be undesirable on slow (e.g. SLIP) links and/or very busy
-#	caches.  Impatient users may tie up file descriptors and
-#	bandwidth by repeatedly requesting and immediately aborting
-#	downloads.
-#
-#	When the user aborts a request, Squid will check the
-#	quick_abort values to the amount of data transferred until
-#	then.
-#
-#	If the transfer has less than 'quick_abort_min' KB remaining,
-#	it will finish the retrieval.
-#
-#	If the transfer has more than 'quick_abort_max' KB remaining,
-#	it will abort the retrieval.
-#
-#	If more than 'quick_abort_pct' of the transfer has completed,
-#	it will finish the retrieval.
-#
-#	If you do not want any retrieval to continue after the client
-#	has aborted, set both 'quick_abort_min' and 'quick_abort_max'
-#	to '0 KB'.
-#
-#	If you want retrievals to always continue if they are being
-#	cached set 'quick_abort_min' to '-1 KB'.
-#Default:
-# quick_abort_pct 95
-
-#  TAG: read_ahead_gap	buffer-size
-#	The amount of data the cache will buffer ahead of what has been
-#	sent to the client when retrieving an object from another server.
-#Default:
-# read_ahead_gap 16 KB
-
-#  TAG: negative_ttl	time-units
-#	Set the Default Time-to-Live (TTL) for failed requests.
-#	Certain types of failures (such as "connection refused" and
-#	"404 Not Found") are able to be negatively-cached for a short time.
-#	Modern web servers should provide Expires: header, however if they
-#	do not this can provide a minimum TTL.
-#	The default is not to cache errors with unknown expiry details.
-#
-#	Note that this is different from negative caching of DNS lookups.
-#
-#	WARNING: Doing this VIOLATES the HTTP standard.  Enabling
-#	this feature could make you liable for problems which it
-#	causes.
-#Default:
-# negative_ttl 0 seconds
-
-#  TAG: positive_dns_ttl	time-units
-#	Upper limit on how long Squid will cache positive DNS responses.
-#	Default is 6 hours (360 minutes). This directive must be set
-#	larger than negative_dns_ttl.
-#Default:
-# positive_dns_ttl 6 hours
-
-#  TAG: negative_dns_ttl	time-units
-#	Time-to-Live (TTL) for negative caching of failed DNS lookups.
-#	This also sets the lower cache limit on positive lookups.
-#	Minimum value is 1 second, and it is not recommendable to go
-#	much below 10 seconds.
-#Default:
-# negative_dns_ttl 1 minutes
-
-#  TAG: range_offset_limit	size [acl acl...]
-#	usage: (size) [units] [[!]aclname]
-#	
-#	Sets an upper limit on how far (number of bytes) into the file 
-#	a Range request	may be to cause Squid to prefetch the whole file. 
-#	If beyond this limit, Squid forwards the Range request as it is and 
-#	the result is NOT cached.
-#	
-#	This is to stop a far ahead range request (lets say start at 17MB)
-#	from making Squid fetch the whole object up to that point before
-#	sending anything to the client.
-#	
-#	Multiple range_offset_limit lines may be specified, and they will 
-#	be searched from top to bottom on each request until a match is found. 
-#	The first match found will be used.  If no line matches a request, the 
-#	default limit of 0 bytes will be used.
-#	
-#	'size' is the limit specified as a number of units.
-#	
-#	'units' specifies whether to use bytes, KB, MB, etc.
-#	If no units are specified bytes are assumed.
-#	
-#	A size of 0 causes Squid to never fetch more than the
-#	client requested. (default)
-#	
-#	A size of 'none' causes Squid to always fetch the object from the
-#	beginning so it may cache the result. (2.0 style)
-#	
-#	'aclname' is the name of a defined ACL.
-#	
-#	NP: Using 'none' as the byte value here will override any quick_abort settings 
-#	    that may otherwise apply to the range request. The range request will
-#	    be fully fetched from start to finish regardless of the client
-#	    actions. This affects bandwidth usage.
-#Default:
-# none
-
-#  TAG: minimum_expiry_time	(seconds)
-#	The minimum caching time according to (Expires - Date)
-#	headers Squid honors if the object can't be revalidated.
-#	The default is 60 seconds.
-#
-#	In reverse proxy environments it might be desirable to honor
-#	shorter object lifetimes. It is most likely better to make
-#	your server return a meaningful Last-Modified header however.
-#
-#	In ESI environments where page fragments often have short
-#	lifetimes, this will often be best set to 0.
-#Default:
-# minimum_expiry_time 60 seconds
-
-#  TAG: store_avg_object_size	(bytes)
-#	Average object size, used to estimate number of objects your
-#	cache can hold.  The default is 13 KB.
-#
-#	This is used to pre-seed the cache index memory allocation to
-#	reduce expensive reallocate operations while handling clients
-#	traffic. Too-large values may result in memory allocation during
-#	peak traffic, too-small values will result in wasted memory.
-#
-#	Check the cache manager 'info' report metrics for the real
-#	object sizes seen by your Squid before tuning this.
-#Default:
-# store_avg_object_size 13 KB
-
-#  TAG: store_objects_per_bucket
-#	Target number of objects per bucket in the store hash table.
-#	Lowering this value increases the total number of buckets and
-#	also the storage maintenance rate.  The default is 20.
-#Default:
-# store_objects_per_bucket 20
-
-# HTTP OPTIONS
-# -----------------------------------------------------------------------------
-
-#  TAG: request_header_max_size	(KB)
-#	This specifies the maximum size for HTTP headers in a request.
-#	Request headers are usually relatively small (about 512 bytes).
-#	Placing a limit on the request header size will catch certain
-#	bugs (for example with persistent connections) and possibly
-#	buffer-overflow or denial-of-service attacks.
-#Default:
-# request_header_max_size 64 KB
-
-#  TAG: reply_header_max_size	(KB)
-#	This specifies the maximum size for HTTP headers in a reply.
-#	Reply headers are usually relatively small (about 512 bytes).
-#	Placing a limit on the reply header size will catch certain
-#	bugs (for example with persistent connections) and possibly
-#	buffer-overflow or denial-of-service attacks.
-#Default:
-# reply_header_max_size 64 KB
-
-#  TAG: request_body_max_size	(bytes)
-#	This specifies the maximum size for an HTTP request body.
-#	In other words, the maximum size of a PUT/POST request.
-#	A user who attempts to send a request with a body larger
-#	than this limit receives an "Invalid Request" error message.
-#	If you set this parameter to a zero (the default), there will
-#	be no limit imposed.
-#
-#	See also client_request_buffer_max_size for an alternative
-#	limitation on client uploads which can be configured.
-#Default:
-# No limit.
-
-#  TAG: client_request_buffer_max_size	(bytes)
-#	This specifies the maximum buffer size of a client request.
-#	It prevents squid eating too much memory when somebody uploads
-#	a large file.
-#Default:
-# client_request_buffer_max_size 512 KB
-
-#  TAG: chunked_request_body_max_size	(bytes)
-#	A broken or confused HTTP/1.1 client may send a chunked HTTP
-#	request to Squid. Squid does not have full support for that
-#	feature yet. To cope with such requests, Squid buffers the
-#	entire request and then dechunks request body to create a
-#	plain HTTP/1.0 request with a known content length. The plain
-#	request is then used by the rest of Squid code as usual.
-#
-#	The option value specifies the maximum size of the buffer used
-#	to hold the request before the conversion. If the chunked
-#	request size exceeds the specified limit, the conversion
-#	fails, and the client receives an "unsupported request" error,
-#	as if dechunking was disabled.
-#
-#	Dechunking is enabled by default. To disable conversion of
-#	chunked requests, set the maximum to zero.
-#
-#	Request dechunking feature and this option in particular are a
-#	temporary hack. When chunking requests and responses are fully
-#	supported, there will be no need to buffer a chunked request.
-#Default:
-# chunked_request_body_max_size 64 KB
-
-#  TAG: broken_posts
-#	A list of ACL elements which, if matched, causes Squid to send
-#	an extra CRLF pair after the body of a PUT/POST request.
-#
-#	Some HTTP servers has broken implementations of PUT/POST,
-#	and rely on an extra CRLF pair sent by some WWW clients.
-#
-#	Quote from RFC2616 section 4.1 on this matter:
-#
-#	  Note: certain buggy HTTP/1.0 client implementations generate an
-#	  extra CRLF's after a POST request. To restate what is explicitly
-#	  forbidden by the BNF, an HTTP/1.1 client must not preface or follow
-#	  a request with an extra CRLF.
-#
-#	This clause only supports fast acl types.
-#	See http://wiki.squid-cache.org/SquidFaq/SquidAcl for details.
-#
-#Example:
-# acl buggy_server url_regex ^http://....
-# broken_posts allow buggy_server
-#Default:
-# Obey RFC 2616.
-
-#  TAG: adaptation_uses_indirect_client	on|off
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-follow-x-forwarded-for and (--enable-icap-client and/or --enable-ecap)
-#
-#	Controls whether the indirect client IP address (instead of the direct
-#	client IP address) is passed to adaptation services.
-#
-#	See also: follow_x_forwarded_for adaptation_send_client_ip
-#Default:
-# adaptation_uses_indirect_client on
-
-#  TAG: via	on|off
-#	If set (default), Squid will include a Via header in requests and
-#	replies as required by RFC2616.
-#Default:
-# via on
-
-#  TAG: ie_refresh	on|off
-#	Microsoft Internet Explorer up until version 5.5 Service
-#	Pack 1 has an issue with transparent proxies, wherein it
-#	is impossible to force a refresh.  Turning this on provides
-#	a partial fix to the problem, by causing all IMS-REFRESH
-#	requests from older IE versions to check the origin server
-#	for fresh content.  This reduces hit ratio by some amount
-#	(~10% in my experience), but allows users to actually get
-#	fresh content when they want it.  Note because Squid
-#	cannot tell if the user is using 5.5 or 5.5SP1, the behavior
-#	of 5.5 is unchanged from old versions of Squid (i.e. a
-#	forced refresh is impossible).  Newer versions of IE will,
-#	hopefully, continue to have the new behavior and will be
-#	handled based on that assumption.  This option defaults to
-#	the old Squid behavior, which is better for hit ratios but
-#	worse for clients using IE, if they need to be able to
-#	force fresh content.
-#Default:
-# ie_refresh off
-
-#  TAG: vary_ignore_expire	on|off
-#	Many HTTP servers supporting Vary gives such objects
-#	immediate expiry time with no cache-control header
-#	when requested by a HTTP/1.0 client. This option
-#	enables Squid to ignore such expiry times until
-#	HTTP/1.1 is fully implemented.
-#
-#	WARNING: If turned on this may eventually cause some
-#	varying objects not intended for caching to get cached.
-#Default:
-# vary_ignore_expire off
-
-#  TAG: request_entities
-#	Squid defaults to deny GET and HEAD requests with request entities,
-#	as the meaning of such requests are undefined in the HTTP standard
-#	even if not explicitly forbidden.
-#
-#	Set this directive to on if you have clients which insists
-#	on sending request entities in GET or HEAD requests. But be warned
-#	that there is server software (both proxies and web servers) which
-#	can fail to properly process this kind of request which may make you
-#	vulnerable to cache pollution attacks if enabled.
-#Default:
-# request_entities off
-
-#  TAG: request_header_access
-#	Usage: request_header_access header_name allow|deny [!]aclname ...
-#
-#	WARNING: Doing this VIOLATES the HTTP standard.  Enabling
-#	this feature could make you liable for problems which it
-#	causes.
-#
-#	This option replaces the old 'anonymize_headers' and the
-#	older 'http_anonymizer' option with something that is much
-#	more configurable. A list of ACLs for each header name allows
-#	removal of specific header fields under specific conditions.
-#
-#	This option only applies to outgoing HTTP request headers (i.e.,
-#	headers sent by Squid to the next HTTP hop such as a cache peer
-#	or an origin server). The option has no effect during cache hit
-#	detection. The equivalent adaptation vectoring point in ICAP
-#	terminology is post-cache REQMOD.
-#
-#	The option is applied to individual outgoing request header
-#	fields. For each request header field F, Squid uses the first
-#	qualifying sets of request_header_access rules:
-#
-#	    1. Rules with header_name equal to F's name.
-#	    2. Rules with header_name 'Other', provided F's name is not
-#	       on the hard-coded list of commonly used HTTP header names.
-#	    3. Rules with header_name 'All'.
-#
-#	Within that qualifying rule set, rule ACLs are checked as usual.
-#	If ACLs of an "allow" rule match, the header field is allowed to
-#	go through as is. If ACLs of a "deny" rule match, the header is
-#	removed and request_header_replace is then checked to identify
-#	if the removed header has a replacement. If no rules within the
-#	set have matching ACLs, the header field is left as is.
-#
-#	For example, to achieve the same behavior as the old
-#	'http_anonymizer standard' option, you should use:
-#
-#		request_header_access From deny all
-#		request_header_access Referer deny all
-#		request_header_access User-Agent deny all
-#
-#	Or, to reproduce the old 'http_anonymizer paranoid' feature
-#	you should use:
-#
-#		request_header_access Authorization allow all
-#		request_header_access Proxy-Authorization allow all
-#		request_header_access Cache-Control allow all
-#		request_header_access Content-Length allow all
-#		request_header_access Content-Type allow all
-#		request_header_access Date allow all
-#		request_header_access Host allow all
-#		request_header_access If-Modified-Since allow all
-#		request_header_access Pragma allow all
-#		request_header_access Accept allow all
-#		request_header_access Accept-Charset allow all
-#		request_header_access Accept-Encoding allow all
-#		request_header_access Accept-Language allow all
-#		request_header_access Connection allow all
-#		request_header_access All deny all
-#
-#	HTTP reply headers are controlled with the reply_header_access directive.
-#
-#	By default, all headers are allowed (no anonymizing is performed).
-#Default:
-# No limits.
-
-#  TAG: reply_header_access
-#	Usage: reply_header_access header_name allow|deny [!]aclname ...
-#
-#	WARNING: Doing this VIOLATES the HTTP standard.  Enabling
-#	this feature could make you liable for problems which it
-#	causes.
-#
-#	This option only applies to reply headers, i.e., from the
-#	server to the client.
-#
-#	This is the same as request_header_access, but in the other
-#	direction. Please see request_header_access for detailed
-#	documentation.
-#
-#	For example, to achieve the same behavior as the old
-#	'http_anonymizer standard' option, you should use:
-#
-#		reply_header_access Server deny all
-#		reply_header_access WWW-Authenticate deny all
-#		reply_header_access Link deny all
-#
-#	Or, to reproduce the old 'http_anonymizer paranoid' feature
-#	you should use:
-#
-#		reply_header_access Allow allow all
-#		reply_header_access WWW-Authenticate allow all
-#		reply_header_access Proxy-Authenticate allow all
-#		reply_header_access Cache-Control allow all
-#		reply_header_access Content-Encoding allow all
-#		reply_header_access Content-Length allow all
-#		reply_header_access Content-Type allow all
-#		reply_header_access Date allow all
-#		reply_header_access Expires allow all
-#		reply_header_access Last-Modified allow all
-#		reply_header_access Location allow all
-#		reply_header_access Pragma allow all
-#		reply_header_access Content-Language allow all
-#		reply_header_access Retry-After allow all
-#		reply_header_access Title allow all
-#		reply_header_access Content-Disposition allow all
-#		reply_header_access Connection allow all
-#		reply_header_access All deny all
-#
-#	HTTP request headers are controlled with the request_header_access directive.
-#
-#	By default, all headers are allowed (no anonymizing is
-#	performed).
-#Default:
-# No limits.
-
-#  TAG: request_header_replace
-#	Usage:   request_header_replace header_name message
-#	Example: request_header_replace User-Agent Nutscrape/1.0 (CP/M; 8-bit)
-#
-#	This option allows you to change the contents of headers
-#	denied with request_header_access above, by replacing them
-#	with some fixed string.
-#
-#	This only applies to request headers, not reply headers.
-#
-#	By default, headers are removed if denied.
-#Default:
-# none
-
-#  TAG: reply_header_replace
-#        Usage:   reply_header_replace header_name message
-#        Example: reply_header_replace Server Foo/1.0
-#
-#        This option allows you to change the contents of headers
-#        denied with reply_header_access above, by replacing them
-#        with some fixed string.
-#
-#        This only applies to reply headers, not request headers.
-#
-#        By default, headers are removed if denied.
-#Default:
-# none
-
-#  TAG: request_header_add
-#	Usage:   request_header_add field-name field-value acl1 [acl2] ...
-#	Example: request_header_add X-Client-CA "CA=%ssl::>cert_issuer" all
-#
-#	This option adds header fields to outgoing HTTP requests (i.e.,
-#	request headers sent by Squid to the next HTTP hop such as a
-#	cache peer or an origin server). The option has no effect during
-#	cache hit detection. The equivalent adaptation vectoring point
-#	in ICAP terminology is post-cache REQMOD.
-#
-#	Field-name is a token specifying an HTTP header name. If a
-#	standard HTTP header name is used, Squid does not check whether
-#	the new header conflicts with any existing headers or violates
-#	HTTP rules. If the request to be modified already contains a
-#	field with the same name, the old field is preserved but the
-#	header field values are not merged.
-#
-#	Field-value is either a token or a quoted string. If quoted
-#	string format is used, then the surrounding quotes are removed
-#	while escape sequences and %macros are processed.
-#
-#	In theory, all of the logformat codes can be used as %macros.
-#	However, unlike logging (which happens at the very end of
-#	transaction lifetime), the transaction may not yet have enough
-#	information to expand a macro when the new header value is needed.
-#	And some information may already be available to Squid but not yet
-#	committed where the macro expansion code can access it (report
-#	such instances!). The macro will be expanded into a single dash
-#	('-') in such cases. Not all macros have been tested.
-#
-#	One or more Squid ACLs may be specified to restrict header
-#	injection to matching requests. As always in squid.conf, all
-#	ACLs in an option ACL list must be satisfied for the insertion
-#	to happen. The request_header_add option supports fast ACLs
-#	only.
-#Default:
-# none
-
-#  TAG: note
-#	This option used to log custom information about the master
-#	transaction. For example, an admin may configure Squid to log
-#	which "user group" the transaction belongs to, where "user group"
-#	will be determined based on a set of ACLs and not [just]
-#	authentication information.
-#	Values of key/value pairs can be logged using %{key}note macros:
-#
-#	    note key value acl ...
-#	    logformat myFormat ... %{key}note ...
-#Default:
-# none
-
-#  TAG: relaxed_header_parser	on|off|warn
-#	In the default "on" setting Squid accepts certain forms
-#	of non-compliant HTTP messages where it is unambiguous
-#	what the sending application intended even if the message
-#	is not correctly formatted. The messages is then normalized
-#	to the correct form when forwarded by Squid.
-#
-#	If set to "warn" then a warning will be emitted in cache.log
-#	each time such HTTP error is encountered.
-#
-#	If set to "off" then such HTTP errors will cause the request
-#	or response to be rejected.
-#Default:
-# relaxed_header_parser on
-
-# TIMEOUTS
-# -----------------------------------------------------------------------------
-
-#  TAG: forward_timeout	time-units
-#	This parameter specifies how long Squid should at most attempt in
-#	finding a forwarding path for the request before giving up.
-#Default:
-# forward_timeout 4 minutes
-
-#  TAG: connect_timeout	time-units
-#	This parameter specifies how long to wait for the TCP connect to
-#	the requested server or peer to complete before Squid should
-#	attempt to find another path where to forward the request.
-#Default:
-# connect_timeout 1 minute
-
-#  TAG: peer_connect_timeout	time-units
-#	This parameter specifies how long to wait for a pending TCP
-#	connection to a peer cache.  The default is 30 seconds.   You
-#	may also set different timeout values for individual neighbors
-#	with the 'connect-timeout' option on a 'cache_peer' line.
-#Default:
-# peer_connect_timeout 30 seconds
-
-#  TAG: read_timeout	time-units
-#	The read_timeout is applied on server-side connections.  After
-#	each successful read(), the timeout will be extended by this
-#	amount.  If no data is read again after this amount of time,
-#	the request is aborted and logged with ERR_READ_TIMEOUT.  The
-#	default is 15 minutes.
-#Default:
-# read_timeout 15 minutes
-
-#  TAG: write_timeout	time-units
-#	This timeout is tracked for all connections that have data
-#	available for writing and are waiting for the socket to become
-#	ready. After each successful write, the timeout is extended by
-#	the configured amount. If Squid has data to write but the
-#	connection is not ready for the configured duration, the
-#	transaction associated with the connection is terminated. The
-#	default is 15 minutes.
-#Default:
-# write_timeout 15 minutes
-
-#  TAG: request_timeout
-#	How long to wait for complete HTTP request headers after initial
-#	connection establishment.
-#Default:
-# request_timeout 5 minutes
-
-#  TAG: client_idle_pconn_timeout
-#	How long to wait for the next HTTP request on a persistent
-#	client connection after the previous request completes.
-#Default:
-# client_idle_pconn_timeout 2 minutes
-
-#  TAG: client_lifetime	time-units
-#	The maximum amount of time a client (browser) is allowed to
-#	remain connected to the cache process.  This protects the Cache
-#	from having a lot of sockets (and hence file descriptors) tied up
-#	in a CLOSE_WAIT state from remote clients that go away without
-#	properly shutting down (either because of a network failure or
-#	because of a poor client implementation).  The default is one
-#	day, 1440 minutes.
-#
-#	NOTE:  The default value is intended to be much larger than any
-#	client would ever need to be connected to your cache.  You
-#	should probably change client_lifetime only as a last resort.
-#	If you seem to have many client connections tying up
-#	filedescriptors, we recommend first tuning the read_timeout,
-#	request_timeout, persistent_request_timeout and quick_abort values.
-#Default:
-# client_lifetime 1 day
-
-#  TAG: half_closed_clients
-#	Some clients may shutdown the sending side of their TCP
-#	connections, while leaving their receiving sides open.	Sometimes,
-#	Squid can not tell the difference between a half-closed and a
-#	fully-closed TCP connection.
-#
-#	By default, Squid will immediately close client connections when
-#	read(2) returns "no more data to read."
-#
-#	Change this option to 'on' and Squid will keep open connections
-#	until a read(2) or write(2) on the socket returns an error.
-#	This may show some benefits for reverse proxies. But if not
-#	it is recommended to leave OFF.
-#Default:
-# half_closed_clients off
-
-#  TAG: server_idle_pconn_timeout
-#	Timeout for idle persistent connections to servers and other
-#	proxies.
-#Default:
-# server_idle_pconn_timeout 1 minute
-
-#  TAG: ident_timeout
-#	Maximum time to wait for IDENT lookups to complete.
-#
-#	If this is too high, and you enabled IDENT lookups from untrusted
-#	users, you might be susceptible to denial-of-service by having
-#	many ident requests going at once.
-#Default:
-# ident_timeout 10 seconds
-
-#  TAG: shutdown_lifetime	time-units
-#	When SIGTERM or SIGHUP is received, the cache is put into
-#	"shutdown pending" mode until all active sockets are closed.
-#	This value is the lifetime to set for all open descriptors
-#	during shutdown mode.  Any active clients after this many
-#	seconds will receive a 'timeout' message.
-#Default:
-# shutdown_lifetime 30 seconds
-
-# ADMINISTRATIVE PARAMETERS
-# -----------------------------------------------------------------------------
-
-#  TAG: cache_mgr
-#	Email-address of local cache manager who will receive
-#	mail if the cache dies.  The default is "webmaster".
-#Default:
-# cache_mgr webmaster
-
-#  TAG: mail_from
-#	From: email-address for mail sent when the cache dies.
-#	The default is to use 'squid@unique_hostname'.
-#
-#	See also: unique_hostname directive.
-#Default:
-# none
-
-#  TAG: mail_program
-#	Email program used to send mail if the cache dies.
-#	The default is "mail". The specified program must comply
-#	with the standard Unix mail syntax:
-#	  mail-program recipient < mailfile
-#
-#	Optional command line options can be specified.
-#Default:
-# mail_program mail
-
-#  TAG: cache_effective_user
-#	If you start Squid as root, it will change its effective/real
-#	UID/GID to the user specified below.  The default is to change
-#	to UID of nobody.
-#	see also; cache_effective_group
-#Default:
-# cache_effective_user nobody
-
-#  TAG: cache_effective_group
-#	Squid sets the GID to the effective user's default group ID
-#	(taken from the password file) and supplementary group list
-#	from the groups membership.
-#
-#	If you want Squid to run with a specific GID regardless of
-#	the group memberships of the effective user then set this
-#	to the group (or GID) you want Squid to run as. When set
-#	all other group privileges of the effective user are ignored
-#	and only this GID is effective. If Squid is not started as
-#	root the user starting Squid MUST be member of the specified
-#	group.
-#
-#	This option is not recommended by the Squid Team.
-#	Our preference is for administrators to configure a secure
-#	user account for squid with UID/GID matching system policies.
-#Default:
-# Use system group memberships of the cache_effective_user account
-
-#  TAG: httpd_suppress_version_string	on|off
-#	Suppress Squid version string info in HTTP headers and HTML error pages.
-#Default:
-# httpd_suppress_version_string off
-
-#  TAG: visible_hostname
-#	If you want to present a special hostname in error messages, etc,
-#	define this.  Otherwise, the return value of gethostname()
-#	will be used. If you have multiple caches in a cluster and
-#	get errors about IP-forwarding you must set them to have individual
-#	names with this setting.
-#Default:
-# Automatically detect the system host name
-
-#  TAG: unique_hostname
-#	If you want to have multiple machines with the same
-#	'visible_hostname' you must give each machine a different
-#	'unique_hostname' so forwarding loops can be detected.
-#Default:
-# Copy the value from visible_hostname
-
-#  TAG: hostname_aliases
-#	A list of other DNS names your cache has.
-#Default:
-# none
-
-#  TAG: umask
-#	Minimum umask which should be enforced while the proxy
-#	is running, in addition to the umask set at startup.
-#
-#	For a traditional octal representation of umasks, start
-#        your value with 0.
-#Default:
-# umask 027
-
-# OPTIONS FOR THE CACHE REGISTRATION SERVICE
-# -----------------------------------------------------------------------------
-#
-#	This section contains parameters for the (optional) cache
-#	announcement service.  This service is provided to help
-#	cache administrators locate one another in order to join or
-#	create cache hierarchies.
-#
-#	An 'announcement' message is sent (via UDP) to the registration
-#	service by Squid.  By default, the announcement message is NOT
-#	SENT unless you enable it with 'announce_period' below.
-#
-#	The announcement message includes your hostname, plus the
-#	following information from this configuration file:
-#
-#		http_port
-#		icp_port
-#		cache_mgr
-#
-#	All current information is processed regularly and made
-#	available on the Web at http://www.ircache.net/Cache/Tracker/.
-
-#  TAG: announce_period
-#	This is how frequently to send cache announcements.
-#
-#	To enable announcing your cache, just set an announce period.
-#
-#	Example:
-#		announce_period 1 day
-#Default:
-# Announcement messages disabled.
-
-#  TAG: announce_host
-#	Set the hostname where announce registration messages will be sent.
-#
-#	See also announce_port and announce_file
-#Default:
-# announce_host tracker.ircache.net
-
-#  TAG: announce_file
-#	The contents of this file will be included in the announce
-#	registration messages.
-#Default:
-# none
-
-#  TAG: announce_port
-#	Set the port where announce registration messages will be sent.
-#
-#	See also announce_host and announce_file
-#Default:
-# announce_port 3131
-
-# HTTPD-ACCELERATOR OPTIONS
-# -----------------------------------------------------------------------------
-
-#  TAG: httpd_accel_surrogate_id
-#	Surrogates (http://www.esi.org/architecture_spec_1.0.html)
-#	need an identification token to allow control targeting. Because
-#	a farm of surrogates may all perform the same tasks, they may share
-#	an identification token.
-#Default:
-# visible_hostname is used if no specific ID is set.
-
-#  TAG: http_accel_surrogate_remote	on|off
-#	Remote surrogates (such as those in a CDN) honour the header
-#	"Surrogate-Control: no-store-remote".
-#
-#	Set this to on to have squid behave as a remote surrogate.
-#Default:
-# http_accel_surrogate_remote off
-
-#  TAG: esi_parser	libxml2|expat|custom
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-esi
-#
-#	ESI markup is not strictly XML compatible. The custom ESI parser
-#	will give higher performance, but cannot handle non ASCII character
-#	encodings.
-#Default:
-# esi_parser custom
-
-# DELAY POOL PARAMETERS
-# -----------------------------------------------------------------------------
-
-#  TAG: delay_pools
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-delay-pools
-#
-#	This represents the number of delay pools to be used.  For example,
-#	if you have one class 2 delay pool and one class 3 delays pool, you
-#	have a total of 2 delay pools.
-#
-#	See also delay_parameters, delay_class, delay_access for pool
-#	configuration details.
-#Default:
-# delay_pools 0
-
-#  TAG: delay_class
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-delay-pools
-#
-#	This defines the class of each delay pool.  There must be exactly one
-#	delay_class line for each delay pool.  For example, to define two
-#	delay pools, one of class 2 and one of class 3, the settings above
-#	and here would be:
-#
-#	Example:
-#	    delay_pools 4      # 4 delay pools
-#	    delay_class 1 2    # pool 1 is a class 2 pool
-#	    delay_class 2 3    # pool 2 is a class 3 pool
-#	    delay_class 3 4    # pool 3 is a class 4 pool
-#	    delay_class 4 5    # pool 4 is a class 5 pool
-#
-#	The delay pool classes are:
-#
-#		class 1		Everything is limited by a single aggregate
-#				bucket.
-#
-#		class 2 	Everything is limited by a single aggregate
-#				bucket as well as an "individual" bucket chosen
-#				from bits 25 through 32 of the IPv4 address.
-#
-#		class 3		Everything is limited by a single aggregate
-#				bucket as well as a "network" bucket chosen
-#				from bits 17 through 24 of the IP address and a
-#				"individual" bucket chosen from bits 17 through
-#				32 of the IPv4 address.
-#
-#		class 4		Everything in a class 3 delay pool, with an
-#				additional limit on a per user basis. This
-#				only takes effect if the username is established
-#				in advance - by forcing authentication in your
-#				http_access rules.
-#
-#		class 5		Requests are grouped according their tag (see
-#				external_acl's tag= reply).
-#
-#
-#	Each pool also requires a delay_parameters directive to configure the pool size
-#	and speed limits used whenever the pool is applied to a request. Along with
-#	a set of delay_access directives to determine when it is used.
-#
-#	NOTE: If an IP address is a.b.c.d
-#		-> bits 25 through 32 are "d"
-#		-> bits 17 through 24 are "c"
-#		-> bits 17 through 32 are "c * 256 + d"
-#
-#	NOTE-2: Due to the use of bitmasks in class 2,3,4 pools they only apply to
-#		IPv4 traffic. Class 1 and 5 pools may be used with IPv6 traffic.
-#
-#	This clause only supports fast acl types.
-#	See http://wiki.squid-cache.org/SquidFaq/SquidAcl for details.
-#
-#	See also delay_parameters and delay_access.
-#Default:
-# none
-
-#  TAG: delay_access
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-delay-pools
-#
-#	This is used to determine which delay pool a request falls into.
-#
-#	delay_access is sorted per pool and the matching starts with pool 1,
-#	then pool 2, ..., and finally pool N. The first delay pool where the
-#	request is allowed is selected for the request. If it does not allow
-#	the request to any pool then the request is not delayed (default).
-#
-#	For example, if you want some_big_clients in delay
-#	pool 1 and lotsa_little_clients in delay pool 2:
-#
-#		delay_access 1 allow some_big_clients
-#		delay_access 1 deny all
-#		delay_access 2 allow lotsa_little_clients
-#		delay_access 2 deny all
-#		delay_access 3 allow authenticated_clients
-#
-#	See also delay_parameters and delay_class.
-#
-#Default:
-# Deny using the pool, unless allow rules exist in squid.conf for the pool.
-
-#  TAG: delay_parameters
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-delay-pools
-#
-#	This defines the parameters for a delay pool.  Each delay pool has
-#	a number of "buckets" associated with it, as explained in the
-#	description of delay_class.
-#
-#	For a class 1 delay pool, the syntax is:
-#		delay_pools pool 1
-#		delay_parameters pool aggregate
-#
-#	For a class 2 delay pool:
-#		delay_pools pool 2
-#		delay_parameters pool aggregate individual
-#
-#	For a class 3 delay pool:
-#		delay_pools pool 3
-#		delay_parameters pool aggregate network individual
-#
-#	For a class 4 delay pool:
-#		delay_pools pool 4
-#		delay_parameters pool aggregate network individual user
-#
-#	For a class 5 delay pool:
-#		delay_pools pool 5
-#		delay_parameters pool tagrate
-#
-#	The option variables are:
-#
-#		pool		a pool number - ie, a number between 1 and the
-#				number specified in delay_pools as used in
-#				delay_class lines.
-#
-#		aggregate	the speed limit parameters for the aggregate bucket
-#				(class 1, 2, 3).
-#
-#		individual	the speed limit parameters for the individual
-#				buckets (class 2, 3).
-#
-#		network		the speed limit parameters for the network buckets
-#				(class 3).
-#
-#		user		the speed limit parameters for the user buckets
-#				(class 4).
-#
-#		tagrate		the speed limit parameters for the tag buckets
-#				(class 5).
-#
-#	A pair of delay parameters is written restore/maximum, where restore is
-#	the number of bytes (not bits - modem and network speeds are usually
-#	quoted in bits) per second placed into the bucket, and maximum is the
-#	maximum number of bytes which can be in the bucket at any time.
-#
-#	There must be one delay_parameters line for each delay pool.
-#
-#
-#	For example, if delay pool number 1 is a class 2 delay pool as in the
-#	above example, and is being used to strictly limit each host to 64Kbit/sec
-#	(plus overheads), with no overall limit, the line is:
-#
-#		delay_parameters 1 -1/-1 8000/8000
-#
-#	Note that 8 x 8000 KByte/sec -> 64Kbit/sec.
-#
-#	Note that the figure -1 is used to represent "unlimited".
-#
-#
-#	And, if delay pool number 2 is a class 3 delay pool as in the above
-#	example, and you want to limit it to a total of 256Kbit/sec (strict limit)
-#	with each 8-bit network permitted 64Kbit/sec (strict limit) and each
-#	individual host permitted 4800bit/sec with a bucket maximum size of 64Kbits
-#	to permit a decent web page to be downloaded at a decent speed
-#	(if the network is not being limited due to overuse) but slow down
-#	large downloads more significantly:
-#
-#		delay_parameters 2 32000/32000 8000/8000 600/8000
-#
-#	Note that 8 x 32000 KByte/sec -> 256Kbit/sec.
-#		  8 x  8000 KByte/sec ->  64Kbit/sec.
-#		  8 x   600 Byte/sec  -> 4800bit/sec.
-#
-#
-#	Finally, for a class 4 delay pool as in the example - each user will
-#	be limited to 128Kbits/sec no matter how many workstations they are logged into.:
-#
-#		delay_parameters 4 32000/32000 8000/8000 600/64000 16000/16000
-#
-#
-#	See also delay_class and delay_access.
-#
-#Default:
-# none
-
-#  TAG: delay_initial_bucket_level	(percent, 0-100)
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-delay-pools
-#
-#	The initial bucket percentage is used to determine how much is put
-#	in each bucket when squid starts, is reconfigured, or first notices
-#	a host accessing it (in class 2 and class 3, individual hosts and
-#	networks only have buckets associated with them once they have been
-#	"seen" by squid).
-#Default:
-# delay_initial_bucket_level 50
-
-# CLIENT DELAY POOL PARAMETERS
-# -----------------------------------------------------------------------------
-
-#  TAG: client_delay_pools
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-delay-pools
-#
-#	This option specifies the number of client delay pools used. It must
-#	preceed other client_delay_* options.
-#
-#	Example:
-#		client_delay_pools 2
-#
-#	See also client_delay_parameters and client_delay_access.
-#Default:
-# client_delay_pools 0
-
-#  TAG: client_delay_initial_bucket_level	(percent, 0-no_limit)
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-delay-pools
-#
-#	This option determines the initial bucket size as a percentage of
-#	max_bucket_size from client_delay_parameters. Buckets are created
-#	at the time of the "first" connection from the matching IP. Idle
-#	buckets are periodically deleted up.
-#
-#	You can specify more than 100 percent but note that such "oversized"
-#	buckets are not refilled until their size goes down to max_bucket_size
-#	from client_delay_parameters.
-#
-#	Example:
-#		client_delay_initial_bucket_level 50
-#Default:
-# client_delay_initial_bucket_level 50
-
-#  TAG: client_delay_parameters
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-delay-pools
-#
-#
-#	This option configures client-side bandwidth limits using the
-#	following format:
-#
-#	    client_delay_parameters pool speed_limit max_bucket_size
-#
-#	pool is an integer ID used for client_delay_access matching.
-#
-#	speed_limit is bytes added to the bucket per second.
-#
-#	max_bucket_size is the maximum size of a bucket, enforced after any
-#	speed_limit additions.
-#
-#	Please see the delay_parameters option for more information and
-#	examples.
-#
-#	Example:
-#		client_delay_parameters 1 1024 2048
-#		client_delay_parameters 2 51200 16384
-#
-#	See also client_delay_access.
-#
-#Default:
-# none
-
-#  TAG: client_delay_access
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-delay-pools
-#
-#	This option determines the client-side delay pool for the
-#	request:
-#
-#	    client_delay_access pool_ID allow|deny acl_name
-#
-#	All client_delay_access options are checked in their pool ID
-#	order, starting with pool 1. The first checked pool with allowed
-#	request is selected for the request. If no ACL matches or there
-#	are no client_delay_access options, the request bandwidth is not
-#	limited.
-#
-#	The ACL-selected pool is then used to find the
-#	client_delay_parameters for the request. Client-side pools are
-#	not used to aggregate clients. Clients are always aggregated
-#	based on their source IP addresses (one bucket per source IP).
-#
-#	This clause only supports fast acl types.
-#	See http://wiki.squid-cache.org/SquidFaq/SquidAcl for details.
-#	Additionally, only the client TCP connection details are available.
-#	ACLs testing HTTP properties will not work.
-#
-#	Please see delay_access for more examples.
-#
-#	Example:
-#		client_delay_access 1 allow low_rate_network
-#		client_delay_access 2 allow vips_network
-#
-#
-#	See also client_delay_parameters and client_delay_pools.
-#Default:
-# Deny use of the pool, unless allow rules exist in squid.conf for the pool.
-
-# WCCPv1 AND WCCPv2 CONFIGURATION OPTIONS
-# -----------------------------------------------------------------------------
-
-#  TAG: wccp_router
-#	Use this option to define your WCCP ``home'' router for
-#	Squid.
-#
-#	wccp_router supports a single WCCP(v1) router
-#
-#	wccp2_router supports multiple WCCPv2 routers
-#
-#	only one of the two may be used at the same time and defines
-#	which version of WCCP to use.
-#Default:
-# WCCP disabled.
-
-#  TAG: wccp2_router
-#	Use this option to define your WCCP ``home'' router for
-#	Squid.
-#
-#	wccp_router supports a single WCCP(v1) router
-#
-#	wccp2_router supports multiple WCCPv2 routers
-#
-#	only one of the two may be used at the same time and defines
-#	which version of WCCP to use.
-#Default:
-# WCCPv2 disabled.
-
-#  TAG: wccp_version
-#	This directive is only relevant if you need to set up WCCP(v1)
-#	to some very old and end-of-life Cisco routers. In all other
-#	setups it must be left unset or at the default setting.
-#	It defines an internal version in the WCCP(v1) protocol,
-#	with version 4 being the officially documented protocol.
-#
-#	According to some users, Cisco IOS 11.2 and earlier only
-#	support WCCP version 3.  If you're using that or an earlier
-#	version of IOS, you may need to change this value to 3, otherwise
-#	do not specify this parameter.
-#Default:
-# wccp_version 4
-
-#  TAG: wccp2_rebuild_wait
-#	If this is enabled Squid will wait for the cache dir rebuild to finish
-#	before sending the first wccp2 HereIAm packet
-#Default:
-# wccp2_rebuild_wait on
-
-#  TAG: wccp2_forwarding_method
-#	WCCP2 allows the setting of forwarding methods between the
-#	router/switch and the cache.  Valid values are as follows:
-#
-#	gre - GRE encapsulation (forward the packet in a GRE/WCCP tunnel)
-#	l2  - L2 redirect (forward the packet using Layer 2/MAC rewriting)
-#
-#	Currently (as of IOS 12.4) cisco routers only support GRE.
-#	Cisco switches only support the L2 redirect assignment method.
-#Default:
-# wccp2_forwarding_method gre
-
-#  TAG: wccp2_return_method
-#	WCCP2 allows the setting of return methods between the
-#	router/switch and the cache for packets that the cache
-#	decides not to handle.  Valid values are as follows:
-#
-#	gre - GRE encapsulation (forward the packet in a GRE/WCCP tunnel)
-#	l2  - L2 redirect (forward the packet using Layer 2/MAC rewriting)
-#
-#	Currently (as of IOS 12.4) cisco routers only support GRE.
-#	Cisco switches only support the L2 redirect assignment.
-#
-#	If the "ip wccp redirect exclude in" command has been
-#	enabled on the cache interface, then it is still safe for
-#	the proxy server to use a l2 redirect method even if this
-#	option is set to GRE.
-#Default:
-# wccp2_return_method gre
-
-#  TAG: wccp2_assignment_method
-#	WCCP2 allows the setting of methods to assign the WCCP hash
-#	Valid values are as follows:
-#
-#	hash - Hash assignment
-#	mask - Mask assignment
-#
-#	As a general rule, cisco routers support the hash assignment method
-#	and cisco switches support the mask assignment method.
-#Default:
-# wccp2_assignment_method hash
-
-#  TAG: wccp2_service
-#	WCCP2 allows for multiple traffic services. There are two
-#	types: "standard" and "dynamic". The standard type defines
-#	one service id - http (id 0). The dynamic service ids can be from
-#	51 to 255 inclusive.  In order to use a dynamic service id
-#	one must define the type of traffic to be redirected; this is done
-#	using the wccp2_service_info option.
-#
-#	The "standard" type does not require a wccp2_service_info option,
-#	just specifying the service id will suffice.
-#
-#	MD5 service authentication can be enabled by adding
-#	"password=<password>" to the end of this service declaration.
-#
-#	Examples:
-#
-#	wccp2_service standard 0	# for the 'web-cache' standard service
-#	wccp2_service dynamic 80	# a dynamic service type which will be
-#					# fleshed out with subsequent options.
-#	wccp2_service standard 0 password=foo
-#Default:
-# Use the 'web-cache' standard service.
-
-#  TAG: wccp2_service_info
-#	Dynamic WCCPv2 services require further information to define the
-#	traffic you wish to have diverted.
-#
-#	The format is:
-#
-#	wccp2_service_info <id> protocol=<protocol> flags=<flag>,<flag>..
-#	    priority=<priority> ports=<port>,<port>..
-#
-#	The relevant WCCPv2 flags:
-#	+ src_ip_hash, dst_ip_hash
-#	+ source_port_hash, dst_port_hash
-#	+ src_ip_alt_hash, dst_ip_alt_hash
-#	+ src_port_alt_hash, dst_port_alt_hash
-#	+ ports_source
-#
-#	The port list can be one to eight entries.
-#
-#	Example:
-#
-#	wccp2_service_info 80 protocol=tcp flags=src_ip_hash,ports_source
-#	    priority=240 ports=80
-#
-#	Note: the service id must have been defined by a previous
-#	'wccp2_service dynamic <id>' entry.
-#Default:
-# none
-
-#  TAG: wccp2_weight
-#	Each cache server gets assigned a set of the destination
-#	hash proportional to their weight.
-#Default:
-# wccp2_weight 10000
-
-#  TAG: wccp_address
-#	Use this option if you require WCCPv2 to use a specific
-#	interface address.
-#
-#	The default behavior is to not bind to any specific address.
-#Default:
-# Address selected by the operating system.
-
-#  TAG: wccp2_address
-#	Use this option if you require WCCP to use a specific
-#	interface address.
-#
-#	The default behavior is to not bind to any specific address.
-#Default:
-# Address selected by the operating system.
-
-# PERSISTENT CONNECTION HANDLING
-# -----------------------------------------------------------------------------
-#
-# Also see "pconn_timeout" in the TIMEOUTS section
-
-#  TAG: client_persistent_connections
-#	Persistent connection support for clients.
-#	Squid uses persistent connections (when allowed). You can use
-#	this option to disable persistent connections with clients.
-#Default:
-# client_persistent_connections on
-
-#  TAG: server_persistent_connections
-#	Persistent connection support for servers.
-#	Squid uses persistent connections (when allowed). You can use
-#	this option to disable persistent connections with servers.
-#Default:
-# server_persistent_connections on
-
-#  TAG: persistent_connection_after_error
-#	With this directive the use of persistent connections after
-#	HTTP errors can be disabled. Useful if you have clients
-#	who fail to handle errors on persistent connections proper.
-#Default:
-# persistent_connection_after_error on
-
-#  TAG: detect_broken_pconn
-#	Some servers have been found to incorrectly signal the use
-#	of HTTP/1.0 persistent connections even on replies not
-#	compatible, causing significant delays. This server problem
-#	has mostly been seen on redirects.
-#
-#	By enabling this directive Squid attempts to detect such
-#	broken replies and automatically assume the reply is finished
-#	after 10 seconds timeout.
-#Default:
-# detect_broken_pconn off
-
-# CACHE DIGEST OPTIONS
-# -----------------------------------------------------------------------------
-
-#  TAG: digest_generation
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-cache-digests
-#
-#	This controls whether the server will generate a Cache Digest
-#	of its contents.  By default, Cache Digest generation is
-#	enabled if Squid is compiled with --enable-cache-digests defined.
-#Default:
-# digest_generation on
-
-#  TAG: digest_bits_per_entry
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-cache-digests
-#
-#	This is the number of bits of the server's Cache Digest which
-#	will be associated with the Digest entry for a given HTTP
-#	Method and URL (public key) combination.  The default is 5.
-#Default:
-# digest_bits_per_entry 5
-
-#  TAG: digest_rebuild_period	(seconds)
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-cache-digests
-#
-#	This is the wait time between Cache Digest rebuilds.
-#Default:
-# digest_rebuild_period 1 hour
-
-#  TAG: digest_rewrite_period	(seconds)
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-cache-digests
-#
-#	This is the wait time between Cache Digest writes to
-#	disk.
-#Default:
-# digest_rewrite_period 1 hour
-
-#  TAG: digest_swapout_chunk_size	(bytes)
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-cache-digests
-#
-#	This is the number of bytes of the Cache Digest to write to
-#	disk at a time.  It defaults to 4096 bytes (4KB), the Squid
-#	default swap page.
-#Default:
-# digest_swapout_chunk_size 4096 bytes
-
-#  TAG: digest_rebuild_chunk_percentage	(percent, 0-100)
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-cache-digests
-#
-#	This is the percentage of the Cache Digest to be scanned at a
-#	time.  By default it is set to 10% of the Cache Digest.
-#Default:
-# digest_rebuild_chunk_percentage 10
-
-# SNMP OPTIONS
-# -----------------------------------------------------------------------------
-
-#  TAG: snmp_port
-#	The port number where Squid listens for SNMP requests. To enable
-#	SNMP support set this to a suitable port number. Port number
-#	3401 is often used for the Squid SNMP agent. By default it's
-#	set to "0" (disabled)
-#
-#	Example:
-#		snmp_port 3401
-#Default:
-# SNMP disabled.
-
-#  TAG: snmp_access
-#	Allowing or denying access to the SNMP port.
-#
-#	All access to the agent is denied by default.
-#	usage:
-#
-#	snmp_access allow|deny [!]aclname ...
-#
-#	This clause only supports fast acl types.
-#	See http://wiki.squid-cache.org/SquidFaq/SquidAcl for details.
-#
-#Example:
-# snmp_access allow snmppublic localhost
-# snmp_access deny all
-#Default:
-# Deny, unless rules exist in squid.conf.
-
-#  TAG: snmp_incoming_address
-#	Just like 'udp_incoming_address', but for the SNMP port.
-#
-#	snmp_incoming_address	is used for the SNMP socket receiving
-#				messages from SNMP agents.
-#
-#	The default snmp_incoming_address is to listen on all
-#	available network interfaces.
-#Default:
-# Accept SNMP packets from all machine interfaces.
-
-#  TAG: snmp_outgoing_address
-#	Just like 'udp_outgoing_address', but for the SNMP port.
-#
-#	snmp_outgoing_address	is used for SNMP packets returned to SNMP
-#				agents.
-#
-#	If snmp_outgoing_address is not set it will use the same socket
-#	as snmp_incoming_address. Only change this if you want to have
-#	SNMP replies sent using another address than where this Squid
-#	listens for SNMP queries.
-#
-#	NOTE, snmp_incoming_address and snmp_outgoing_address can not have
-#	the same value since they both use the same port.
-#Default:
-# Use snmp_incoming_address or an address selected by the operating system.
-
-# ICP OPTIONS
-# -----------------------------------------------------------------------------
-
-#  TAG: icp_port
-#	The port number where Squid sends and receives ICP queries to
-#	and from neighbor caches.  The standard UDP port for ICP is 3130.
-#
-#	Example:
-#		icp_port 3130
-#Default:
-# ICP disabled.
-
-#  TAG: htcp_port
-#	The port number where Squid sends and receives HTCP queries to
-#	and from neighbor caches.  To turn it on you want to set it to
-#	4827.
-#
-#	Example:
-#		htcp_port 4827
-#Default:
-# HTCP disabled.
-
-#  TAG: log_icp_queries	on|off
-#	If set, ICP queries are logged to access.log. You may wish
-#	do disable this if your ICP load is VERY high to speed things
-#	up or to simplify log analysis.
-#Default:
-# log_icp_queries on
-
-#  TAG: udp_incoming_address
-#	udp_incoming_address	is used for UDP packets received from other
-#				caches.
-#
-#	The default behavior is to not bind to any specific address.
-#
-#	Only change this if you want to have all UDP queries received on
-#	a specific interface/address.
-#
-#	NOTE: udp_incoming_address is used by the ICP, HTCP, and DNS
-#	modules. Altering it will affect all of them in the same manner.
-#
-#	see also; udp_outgoing_address
-#
-#	NOTE, udp_incoming_address and udp_outgoing_address can not
-#	have the same value since they both use the same port.
-#Default:
-# Accept packets from all machine interfaces.
-
-#  TAG: udp_outgoing_address
-#	udp_outgoing_address	is used for UDP packets sent out to other
-#				caches.
-#
-#	The default behavior is to not bind to any specific address.
-#
-#	Instead it will use the same socket as udp_incoming_address.
-#	Only change this if you want to have UDP queries sent using another
-#	address than where this Squid listens for UDP queries from other
-#	caches.
-#
-#	NOTE: udp_outgoing_address is used by the ICP, HTCP, and DNS
-#	modules. Altering it will affect all of them in the same manner.
-#
-#	see also; udp_incoming_address
-#
-#	NOTE, udp_incoming_address and udp_outgoing_address can not
-#	have the same value since they both use the same port.
-#Default:
-# Use udp_incoming_address or an address selected by the operating system.
-
-#  TAG: icp_hit_stale	on|off
-#	If you want to return ICP_HIT for stale cache objects, set this
-#	option to 'on'.  If you have sibling relationships with caches
-#	in other administrative domains, this should be 'off'.  If you only
-#	have sibling relationships with caches under your control,
-#	it is probably okay to set this to 'on'.
-#	If set to 'on', your siblings should use the option "allow-miss"
-#	on their cache_peer lines for connecting to you.
-#Default:
-# icp_hit_stale off
-
-#  TAG: minimum_direct_hops
-#	If using the ICMP pinging stuff, do direct fetches for sites
-#	which are no more than this many hops away.
-#Default:
-# minimum_direct_hops 4
-
-#  TAG: minimum_direct_rtt	(msec)
-#	If using the ICMP pinging stuff, do direct fetches for sites
-#	which are no more than this many rtt milliseconds away.
-#Default:
-# minimum_direct_rtt 400
-
-#  TAG: netdb_low
-#	The low water mark for the ICMP measurement database.
-#
-#	Note: high watermark controlled by netdb_high directive.
-#
-#	These watermarks are counts, not percents.  The defaults are
-#	(low) 900 and (high) 1000.  When the high water mark is
-#	reached, database entries will be deleted until the low
-#	mark is reached.
-#Default:
-# netdb_low 900
-
-#  TAG: netdb_high
-#	The high water mark for the ICMP measurement database.
-#
-#	Note: low watermark controlled by netdb_low directive.
-#
-#	These watermarks are counts, not percents.  The defaults are
-#	(low) 900 and (high) 1000.  When the high water mark is
-#	reached, database entries will be deleted until the low
-#	mark is reached.
-#Default:
-# netdb_high 1000
-
-#  TAG: netdb_ping_period
-#	The minimum period for measuring a site.  There will be at
-#	least this much delay between successive pings to the same
-#	network.  The default is five minutes.
-#Default:
-# netdb_ping_period 5 minutes
-
-#  TAG: query_icmp	on|off
-#	If you want to ask your peers to include ICMP data in their ICP
-#	replies, enable this option.
-#
-#	If your peer has configured Squid (during compilation) with
-#	'--enable-icmp' that peer will send ICMP pings to origin server
-#	sites of the URLs it receives.  If you enable this option the
-#	ICP replies from that peer will include the ICMP data (if available).
-#	Then, when choosing a parent cache, Squid will choose the parent with
-#	the minimal RTT to the origin server.  When this happens, the
-#	hierarchy field of the access.log will be
-#	"CLOSEST_PARENT_MISS".  This option is off by default.
-#Default:
-# query_icmp off
-
-#  TAG: test_reachability	on|off
-#	When this is 'on', ICP MISS replies will be ICP_MISS_NOFETCH
-#	instead of ICP_MISS if the target host is NOT in the ICMP
-#	database, or has a zero RTT.
-#Default:
-# test_reachability off
-
-#  TAG: icp_query_timeout	(msec)
-#	Normally Squid will automatically determine an optimal ICP
-#	query timeout value based on the round-trip-time of recent ICP
-#	queries.  If you want to override the value determined by
-#	Squid, set this 'icp_query_timeout' to a non-zero value.  This
-#	value is specified in MILLISECONDS, so, to use a 2-second
-#	timeout (the old default), you would write:
-#
-#		icp_query_timeout 2000
-#Default:
-# Dynamic detection.
-
-#  TAG: maximum_icp_query_timeout	(msec)
-#	Normally the ICP query timeout is determined dynamically.  But
-#	sometimes it can lead to very large values (say 5 seconds).
-#	Use this option to put an upper limit on the dynamic timeout
-#	value.  Do NOT use this option to always use a fixed (instead
-#	of a dynamic) timeout value. To set a fixed timeout see the
-#	'icp_query_timeout' directive.
-#Default:
-# maximum_icp_query_timeout 2000
-
-#  TAG: minimum_icp_query_timeout	(msec)
-#	Normally the ICP query timeout is determined dynamically.  But
-#	sometimes it can lead to very small timeouts, even lower than
-#	the normal latency variance on your link due to traffic.
-#	Use this option to put an lower limit on the dynamic timeout
-#	value.  Do NOT use this option to always use a fixed (instead
-#	of a dynamic) timeout value. To set a fixed timeout see the
-#	'icp_query_timeout' directive.
-#Default:
-# minimum_icp_query_timeout 5
-
-#  TAG: background_ping_rate	time-units
-#	Controls how often the ICP pings are sent to siblings that
-#	have background-ping set.
-#Default:
-# background_ping_rate 10 seconds
-
-# MULTICAST ICP OPTIONS
-# -----------------------------------------------------------------------------
-
-#  TAG: mcast_groups
-#	This tag specifies a list of multicast groups which your server
-#	should join to receive multicasted ICP queries.
-#
-#	NOTE!  Be very careful what you put here!  Be sure you
-#	understand the difference between an ICP _query_ and an ICP
-#	_reply_.  This option is to be set only if you want to RECEIVE
-#	multicast queries.  Do NOT set this option to SEND multicast
-#	ICP (use cache_peer for that).  ICP replies are always sent via
-#	unicast, so this option does not affect whether or not you will
-#	receive replies from multicast group members.
-#
-#	You must be very careful to NOT use a multicast address which
-#	is already in use by another group of caches.
-#
-#	If you are unsure about multicast, please read the Multicast
-#	chapter in the Squid FAQ (http://www.squid-cache.org/FAQ/).
-#
-#	Usage: mcast_groups 239.128.16.128 224.0.1.20
-#
-#	By default, Squid doesn't listen on any multicast groups.
-#Default:
-# none
-
-#  TAG: mcast_miss_addr
-# Note: This option is only available if Squid is rebuilt with the
-#       -DMULTICAST_MISS_STREAM define
-#
-#	If you enable this option, every "cache miss" URL will
-#	be sent out on the specified multicast address.
-#
-#	Do not enable this option unless you are are absolutely
-#	certain you understand what you are doing.
-#Default:
-# disabled.
-
-#  TAG: mcast_miss_ttl
-# Note: This option is only available if Squid is rebuilt with the
-#       -DMULTICAST_MISS_STREAM define
-#
-#	This is the time-to-live value for packets multicasted
-#	when multicasting off cache miss URLs is enabled.  By
-#	default this is set to 'site scope', i.e. 16.
-#Default:
-# mcast_miss_ttl 16
-
-#  TAG: mcast_miss_port
-# Note: This option is only available if Squid is rebuilt with the
-#       -DMULTICAST_MISS_STREAM define
-#
-#	This is the port number to be used in conjunction with
-#	'mcast_miss_addr'.
-#Default:
-# mcast_miss_port 3135
-
-#  TAG: mcast_miss_encode_key
-# Note: This option is only available if Squid is rebuilt with the
-#       -DMULTICAST_MISS_STREAM define
-#
-#	The URLs that are sent in the multicast miss stream are
-#	encrypted.  This is the encryption key.
-#Default:
-# mcast_miss_encode_key XXXXXXXXXXXXXXXX
-
-#  TAG: mcast_icp_query_timeout	(msec)
-#	For multicast peers, Squid regularly sends out ICP "probes" to
-#	count how many other peers are listening on the given multicast
-#	address.  This value specifies how long Squid should wait to
-#	count all the replies.  The default is 2000 msec, or 2
-#	seconds.
-#Default:
-# mcast_icp_query_timeout 2000
-
-# INTERNAL ICON OPTIONS
-# -----------------------------------------------------------------------------
-
-#  TAG: icon_directory
-#	Where the icons are stored. These are normally kept in
-#	/usr/share/squid/icons
-#Default:
-# icon_directory /usr/share/squid/icons
-
-#  TAG: global_internal_static
-#	This directive controls is Squid should intercept all requests for
-#	/squid-internal-static/ no matter which host the URL is requesting
-#	(default on setting), or if nothing special should be done for
-#	such URLs (off setting). The purpose of this directive is to make
-#	icons etc work better in complex cache hierarchies where it may
-#	not always be possible for all corners in the cache mesh to reach
-#	the server generating a directory listing.
-#Default:
-# global_internal_static on
-
-#  TAG: short_icon_urls
-#	If this is enabled Squid will use short URLs for icons.
-#	If disabled it will revert to the old behavior of including
-#	it's own name and port in the URL.
-#
-#	If you run a complex cache hierarchy with a mix of Squid and
-#	other proxies you may need to disable this directive.
-#Default:
-# short_icon_urls on
-
-# ERROR PAGE OPTIONS
-# -----------------------------------------------------------------------------
-
-#  TAG: error_directory
-#	If you wish to create your own versions of the default
-#	error files to customize them to suit your company copy
-#	the error/template files to another directory and point
-#	this tag at them.
-#
-#	WARNING: This option will disable multi-language support
-#	         on error pages if used.
-#
-#	The squid developers are interested in making squid available in
-#	a wide variety of languages. If you are making translations for a
-#	language that Squid does not currently provide please consider
-#	contributing your translation back to the project.
-#	http://wiki.squid-cache.org/Translations
-#
-#	The squid developers working on translations are happy to supply drop-in
-#	translated error files in exchange for any new language contributions.
-#Default:
-# Send error pages in the clients preferred language
-
-#  TAG: error_default_language
-#	Set the default language which squid will send error pages in
-#	if no existing translation matches the clients language
-#	preferences.
-#
-#	If unset (default) generic English will be used.
-#
-#	The squid developers are interested in making squid available in
-#	a wide variety of languages. If you are interested in making
-#	translations for any language see the squid wiki for details.
-#	http://wiki.squid-cache.org/Translations
-#Default:
-# Generate English language pages.
-
-#  TAG: error_log_languages
-#	Log to cache.log what languages users are attempting to
-#	auto-negotiate for translations.
-#
-#	Successful negotiations are not logged. Only failures
-#	have meaning to indicate that Squid may need an upgrade
-#	of its error page translations.
-#Default:
-# error_log_languages on
-
-#  TAG: err_page_stylesheet
-#	CSS Stylesheet to pattern the display of Squid default error pages.
-#
-#	For information on CSS see http://www.w3.org/Style/CSS/
-#Default:
-# err_page_stylesheet /etc/squid/errorpage.css
-
-#  TAG: err_html_text
-#	HTML text to include in error messages.  Make this a "mailto"
-#	URL to your admin address, or maybe just a link to your
-#	organizations Web page.
-#
-#	To include this in your error messages, you must rewrite
-#	the error template files (found in the "errors" directory).
-#	Wherever you want the 'err_html_text' line to appear,
-#	insert a %L tag in the error template file.
-#Default:
-# none
-
-#  TAG: email_err_data	on|off
-#	If enabled, information about the occurred error will be
-#	included in the mailto links of the ERR pages (if %W is set)
-#	so that the email body contains the data.
-#	Syntax is <A HREF="mailto:%w%W">%w</A>
-#Default:
-# email_err_data on
-
-#  TAG: deny_info
-#	Usage:   deny_info err_page_name acl
-#	or       deny_info http://... acl
-#	or       deny_info TCP_RESET acl
-#
-#	This can be used to return a ERR_ page for requests which
-#	do not pass the 'http_access' rules.  Squid remembers the last
-#	acl it evaluated in http_access, and if a 'deny_info' line exists
-#	for that ACL Squid returns a corresponding error page.
-#
-#	The acl is typically the last acl on the http_access deny line which
-#	denied access. The exceptions to this rule are:
-#	- When Squid needs to request authentication credentials. It's then
-#	  the first authentication related acl encountered
-#	- When none of the http_access lines matches. It's then the last
-#	  acl processed on the last http_access line.
-#	- When the decision to deny access was made by an adaptation service,
-#	  the acl name is the corresponding eCAP or ICAP service_name.
-#
-#	NP: If providing your own custom error pages with error_directory
-#	    you may also specify them by your custom file name:
-#	    Example: deny_info ERR_CUSTOM_ACCESS_DENIED bad_guys
-#
-#	By defaut Squid will send "403 Forbidden". A different 4xx or 5xx
-#	may be specified by prefixing the file name with the code and a colon.
-#	e.g. 404:ERR_CUSTOM_ACCESS_DENIED
-#
-#	Alternatively you can tell Squid to reset the TCP connection
-#	by specifying TCP_RESET.
-#
-#	Or you can specify an error URL or URL pattern. The browsers will
-#	get redirected to the specified URL after formatting tags have
-#	been replaced. Redirect will be done with 302 or 307 according to
-#	HTTP/1.1 specs. A different 3xx code may be specified by prefixing
-#	the URL. e.g. 303:http://example.com/
-#
-#	URL FORMAT TAGS:
-#		%a	- username (if available. Password NOT included)
-#		%B	- FTP path URL
-#		%e	- Error number
-#		%E	- Error description
-#		%h	- Squid hostname
-#		%H	- Request domain name
-#		%i	- Client IP Address
-#		%M	- Request Method
-#		%o	- Message result from external ACL helper
-#		%p	- Request Port number
-#		%P	- Request Protocol name
-#		%R	- Request URL path
-#		%T	- Timestamp in RFC 1123 format
-#		%U	- Full canonical URL from client
-#			  (HTTPS URLs terminate with *)
-#		%u	- Full canonical URL from client
-#		%w	- Admin email from squid.conf
-#		%x	- Error name
-#		%%	- Literal percent (%) code
-#
-#Default:
-# none
-
-# OPTIONS INFLUENCING REQUEST FORWARDING 
-# -----------------------------------------------------------------------------
-
-#  TAG: nonhierarchical_direct
-#	By default, Squid will send any non-hierarchical requests
-#	(matching hierarchy_stoplist or not cacheable request type) direct
-#	to origin servers.
-#
-#	When this is set to "off", Squid will prefer to send these
-#	requests to parents.
-#
-#	Note that in most configurations, by turning this off you will only
-#	add latency to these request without any improvement in global hit
-#	ratio.
-#
-#	This option only sets a preference. If the parent is unavailable a
-#	direct connection to the origin server may still be attempted. To
-#	completely prevent direct connections use never_direct.
-#Default:
-# nonhierarchical_direct on
-
-#  TAG: prefer_direct
-#	Normally Squid tries to use parents for most requests. If you for some
-#	reason like it to first try going direct and only use a parent if
-#	going direct fails set this to on.
-#
-#	By combining nonhierarchical_direct off and prefer_direct on you
-#	can set up Squid to use a parent as a backup path if going direct
-#	fails.
-#
-#	Note: If you want Squid to use parents for all requests see
-#	the never_direct directive. prefer_direct only modifies how Squid
-#	acts on cacheable requests.
-#Default:
-# prefer_direct off
-
-#  TAG: cache_miss_revalidate	on|off
-#	RFC 7232 defines a conditional request mechanism to prevent
-#	response objects being unnecessarily transferred over the network.
-#	If that mechanism is used by the client and a cache MISS occurs
-#	it can prevent new cache entries being created.
-#
-#	This option determines whether Squid on cache MISS will pass the
-#	client revalidation request to the server or tries to fetch new
-#	content for caching. It can be useful while the cache is mostly
-#	empty to more quickly have the cache populated by generating
-#	non-conditional GETs.
-#
-#	When set to 'on' (default), Squid will pass all client If-* headers
-#	to the server. This permits server responses without a cacheable
-#	payload to be delivered and on MISS no new cache entry is created.
-#
-#	When set to 'off' and if the request is cacheable, Squid will
-#	remove the clients If-Modified-Since and If-None-Match headers from
-#	the request sent to the server. This requests a 200 status response
-#	from the server to create a new cache entry with.
-#Default:
-# cache_miss_revalidate on
-
-#  TAG: always_direct
-#	Usage: always_direct allow|deny [!]aclname ...
-#
-#	Here you can use ACL elements to specify requests which should
-#	ALWAYS be forwarded by Squid to the origin servers without using
-#	any peers.  For example, to always directly forward requests for
-#	local servers ignoring any parents or siblings you may have use
-#	something like:
-#
-#		acl local-servers dstdomain my.domain.net
-#		always_direct allow local-servers
-#
-#	To always forward FTP requests directly, use
-#
-#		acl FTP proto FTP
-#		always_direct allow FTP
-#
-#	NOTE: There is a similar, but opposite option named
-#	'never_direct'.  You need to be aware that "always_direct deny
-#	foo" is NOT the same thing as "never_direct allow foo".  You
-#	may need to use a deny rule to exclude a more-specific case of
-#	some other rule.  Example:
-#
-#		acl local-external dstdomain external.foo.net
-#		acl local-servers dstdomain  .foo.net
-#		always_direct deny local-external
-#		always_direct allow local-servers
-#
-#	NOTE: If your goal is to make the client forward the request
-#	directly to the origin server bypassing Squid then this needs
-#	to be done in the client configuration. Squid configuration
-#	can only tell Squid how Squid should fetch the object.
-#
-#	NOTE: This directive is not related to caching. The replies
-#	is cached as usual even if you use always_direct. To not cache
-#	the replies see the 'cache' directive.
-#
-#	This clause supports both fast and slow acl types.
-#	See http://wiki.squid-cache.org/SquidFaq/SquidAcl for details.
-#Default:
-# Prevent any cache_peer being used for this request.
-
-#  TAG: never_direct
-#	Usage: never_direct allow|deny [!]aclname ...
-#
-#	never_direct is the opposite of always_direct.  Please read
-#	the description for always_direct if you have not already.
-#
-#	With 'never_direct' you can use ACL elements to specify
-#	requests which should NEVER be forwarded directly to origin
-#	servers.  For example, to force the use of a proxy for all
-#	requests, except those in your local domain use something like:
-#
-#		acl local-servers dstdomain .foo.net
-#		never_direct deny local-servers
-#		never_direct allow all
-#
-#	or if Squid is inside a firewall and there are local intranet
-#	servers inside the firewall use something like:
-#
-#		acl local-intranet dstdomain .foo.net
-#		acl local-external dstdomain external.foo.net
-#		always_direct deny local-external
-#		always_direct allow local-intranet
-#		never_direct allow all
-#
-#	This clause supports both fast and slow acl types.
-#	See http://wiki.squid-cache.org/SquidFaq/SquidAcl for details.
-#Default:
-# Allow DNS results to be used for this request.
-
-# ADVANCED NETWORKING OPTIONS
-# -----------------------------------------------------------------------------
-
-#  TAG: incoming_udp_average
-#	Heavy voodoo here.  I can't even believe you are reading this.
-#	Are you crazy?  Don't even think about adjusting these unless
-#	you understand the algorithms in comm_select.c first!
-#Default:
-# incoming_udp_average 6
-
-#  TAG: incoming_tcp_average
-#	Heavy voodoo here.  I can't even believe you are reading this.
-#	Are you crazy?  Don't even think about adjusting these unless
-#	you understand the algorithms in comm_select.c first!
-#Default:
-# incoming_tcp_average 4
-
-#  TAG: incoming_dns_average
-#	Heavy voodoo here.  I can't even believe you are reading this.
-#	Are you crazy?  Don't even think about adjusting these unless
-#	you understand the algorithms in comm_select.c first!
-#Default:
-# incoming_dns_average 4
-
-#  TAG: min_udp_poll_cnt
-#	Heavy voodoo here.  I can't even believe you are reading this.
-#	Are you crazy?  Don't even think about adjusting these unless
-#	you understand the algorithms in comm_select.c first!
-#Default:
-# min_udp_poll_cnt 8
-
-#  TAG: min_dns_poll_cnt
-#	Heavy voodoo here.  I can't even believe you are reading this.
-#	Are you crazy?  Don't even think about adjusting these unless
-#	you understand the algorithms in comm_select.c first!
-#Default:
-# min_dns_poll_cnt 8
-
-#  TAG: min_tcp_poll_cnt
-#	Heavy voodoo here.  I can't even believe you are reading this.
-#	Are you crazy?  Don't even think about adjusting these unless
-#	you understand the algorithms in comm_select.c first!
-#Default:
-# min_tcp_poll_cnt 8
-
-#  TAG: accept_filter
-#	FreeBSD:
-#
-#	The name of an accept(2) filter to install on Squid's
-#	listen socket(s).  This feature is perhaps specific to
-#	FreeBSD and requires support in the kernel.
-#
-#	The 'httpready' filter delays delivering new connections
-#	to Squid until a full HTTP request has been received.
-#	See the accf_http(9) man page for details.
-#
-#	The 'dataready' filter delays delivering new connections
-#	to Squid until there is some data to process.
-#	See the accf_dataready(9) man page for details.
-#
-#	Linux:
-#	
-#	The 'data' filter delays delivering of new connections
-#	to Squid until there is some data to process by TCP_ACCEPT_DEFER.
-#	You may optionally specify a number of seconds to wait by
-#	'data=N' where N is the number of seconds. Defaults to 30
-#	if not specified.  See the tcp(7) man page for details.
-#EXAMPLE:
-## FreeBSD
-#accept_filter httpready
-## Linux
-#accept_filter data
-#Default:
-# none
-
-#  TAG: client_ip_max_connections
-#	Set an absolute limit on the number of connections a single
-#	client IP can use. Any more than this and Squid will begin to drop
-#	new connections from the client until it closes some links.
-#
-#	Note that this is a global limit. It affects all HTTP, HTCP, Gopher and FTP
-#	connections from the client. For finer control use the ACL access controls.
-#
-#	Requires client_db to be enabled (the default).
-#
-#	WARNING: This may noticably slow down traffic received via external proxies
-#	or NAT devices and cause them to rebound error messages back to their clients.
-#Default:
-# No limit.
-
-#  TAG: tcp_recv_bufsize	(bytes)
-#	Size of receive buffer to set for TCP sockets.  Probably just
-#	as easy to change your kernel's default.
-#	Omit from squid.conf to use the default buffer size.
-#Default:
-# Use operating system TCP defaults.
-
-# ICAP OPTIONS
-# -----------------------------------------------------------------------------
-
-#  TAG: icap_enable	on|off
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-icap-client
-#
-#	If you want to enable the ICAP module support, set this to on.
-#Default:
-# icap_enable off
-
-#  TAG: icap_connect_timeout
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-icap-client
-#
-#	This parameter specifies how long to wait for the TCP connect to
-#	the requested ICAP server to complete before giving up and either
-#	terminating the HTTP transaction or bypassing the failure.
-#
-#	The default for optional services is peer_connect_timeout.
-#	The default for essential services is connect_timeout.
-#	If this option is explicitly set, its value applies to all services.
-#Default:
-# none
-
-#  TAG: icap_io_timeout	time-units
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-icap-client
-#
-#	This parameter specifies how long to wait for an I/O activity on
-#	an established, active ICAP connection before giving up and
-#	either terminating the HTTP transaction or bypassing the
-#	failure.
-#Default:
-# Use read_timeout.
-
-#  TAG: icap_service_failure_limit	limit [in memory-depth time-units]
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-icap-client
-#
-#	The limit specifies the number of failures that Squid tolerates
-#	when establishing a new TCP connection with an ICAP service. If
-#	the number of failures exceeds the limit, the ICAP service is
-#	not used for new ICAP requests until it is time to refresh its
-#	OPTIONS.
-#
-#	A negative value disables the limit. Without the limit, an ICAP
-#	service will not be considered down due to connectivity failures
-#	between ICAP OPTIONS requests.
-#
-#	Squid forgets ICAP service failures older than the specified
-#	value of memory-depth. The memory fading algorithm 
-#	is approximate because Squid does not remember individual 
-#	errors but groups them instead, splitting the option
-#	value into ten time slots of equal length.
-#
-#	When memory-depth is 0 and by default this option has no 
-#	effect on service failure expiration.
-#
-#	Squid always forgets failures when updating service settings
-#	using an ICAP OPTIONS transaction, regardless of this option
-#	setting.
-#
-#	For example,
-#		# suspend service usage after 10 failures in 5 seconds:
-#		icap_service_failure_limit 10 in 5 seconds
-#Default:
-# icap_service_failure_limit 10
-
-#  TAG: icap_service_revival_delay
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-icap-client
-#
-#	The delay specifies the number of seconds to wait after an ICAP
-#	OPTIONS request failure before requesting the options again. The
-#	failed ICAP service is considered "down" until fresh OPTIONS are
-#	fetched.
-#
-#	The actual delay cannot be smaller than the hardcoded minimum
-#	delay of 30 seconds.
-#Default:
-# icap_service_revival_delay 180
-
-#  TAG: icap_preview_enable	on|off
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-icap-client
-#
-#	The ICAP Preview feature allows the ICAP server to handle the
-#	HTTP message by looking only at the beginning of the message body
-#	or even without receiving the body at all. In some environments, 
-#	previews greatly speedup ICAP processing.
-#
-#	During an ICAP OPTIONS transaction, the server may tell	Squid what
-#	HTTP messages should be previewed and how big the preview should be.
-#	Squid will not use Preview if the server did not request one.
-#
-#	To disable ICAP Preview for all ICAP services, regardless of
-#	individual ICAP server OPTIONS responses, set this option to "off".
-#Example:
-#icap_preview_enable off
-#Default:
-# icap_preview_enable on
-
-#  TAG: icap_preview_size
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-icap-client
-#
-#	The default size of preview data to be sent to the ICAP server.
-#	This value might be overwritten on a per server basis by OPTIONS requests.
-#Default:
-# No preview sent.
-
-#  TAG: icap_206_enable	on|off
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-icap-client
-#
-#	206 (Partial Content) responses is an ICAP extension that allows the
-#	ICAP agents to optionally combine adapted and original HTTP message
-#	content. The decision to combine is postponed until the end of the
-#	ICAP response. Squid supports Partial Content extension by default.
-#
-#	Activation of the Partial Content extension is negotiated with each
-#	ICAP service during OPTIONS exchange. Most ICAP servers should handle
-#	negotation correctly even if they do not support the extension, but
-#	some might fail. To disable Partial Content support for all ICAP
-#	services and to avoid any negotiation, set this option to "off".
-#
-#	Example:
-#	    icap_206_enable off
-#Default:
-# icap_206_enable on
-
-#  TAG: icap_default_options_ttl
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-icap-client
-#
-#	The default TTL value for ICAP OPTIONS responses that don't have
-#	an Options-TTL header.
-#Default:
-# icap_default_options_ttl 60
-
-#  TAG: icap_persistent_connections	on|off
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-icap-client
-#
-#	Whether or not Squid should use persistent connections to
-#	an ICAP server.
-#Default:
-# icap_persistent_connections on
-
-#  TAG: adaptation_send_client_ip	on|off
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-ecap or --enable-icap-client
-#
-#	If enabled, Squid shares HTTP client IP information with adaptation
-#	services. For ICAP, Squid adds the X-Client-IP header to ICAP requests.
-#	For eCAP, Squid sets the libecap::metaClientIp transaction option.
-#
-#	See also: adaptation_uses_indirect_client
-#Default:
-# adaptation_send_client_ip off
-
-#  TAG: adaptation_send_username	on|off
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-ecap or --enable-icap-client
-#
-#	This sends authenticated HTTP client username (if available) to
-#	the adaptation service.
-#
-#	For ICAP, the username value is encoded based on the
-#	icap_client_username_encode option and is sent using the header
-#	specified by the icap_client_username_header option.
-#Default:
-# adaptation_send_username off
-
-#  TAG: icap_client_username_header
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-icap-client
-#
-#	ICAP request header name to use for adaptation_send_username.
-#Default:
-# icap_client_username_header X-Client-Username
-
-#  TAG: icap_client_username_encode	on|off
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-icap-client
-#
-#	Whether to base64 encode the authenticated client username.
-#Default:
-# icap_client_username_encode off
-
-#  TAG: icap_service
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-icap-client
-#
-#	Defines a single ICAP service using the following format:
-#
-#	icap_service id vectoring_point uri [option ...]
-#
-#	id: ID
-#		an opaque identifier or name which is used to direct traffic to
-#		this specific service. Must be unique among all adaptation
-#		services in squid.conf.
-#
-#	vectoring_point: reqmod_precache|reqmod_postcache|respmod_precache|respmod_postcache
-#		This specifies at which point of transaction processing the
-#		ICAP service should be activated. *_postcache vectoring points
-#		are not yet supported.
-#
-#	uri: icap://servername:port/servicepath
-#		ICAP server and service location.
-#
-#	ICAP does not allow a single service to handle both REQMOD and RESPMOD
-#	transactions. Squid does not enforce that requirement. You can specify
-#	services with the same service_url and different vectoring_points. You
-#	can even specify multiple identical services as long as their
-#	service_names differ.
-#
-#	To activate a service, use the adaptation_access directive. To group
-#	services, use adaptation_service_chain and adaptation_service_set.
-#
-#	Service options are separated by white space. ICAP services support
-#	the following name=value options:
-#
-#	bypass=on|off|1|0
-#		If set to 'on' or '1', the ICAP service is treated as
-#		optional. If the service cannot be reached or malfunctions,
-#		Squid will try to ignore any errors and process the message as
-#		if the service was not enabled. No all ICAP errors can be
-#		bypassed.  If set to 0, the ICAP service is treated as
-#		essential and all ICAP errors will result in an error page
-#		returned to the HTTP client.
-#
-#		Bypass is off by default: services are treated as essential.
-#
-#	routing=on|off|1|0
-#		If set to 'on' or '1', the ICAP service is allowed to
-#		dynamically change the current message adaptation plan by
-#		returning a chain of services to be used next. The services
-#		are specified using the X-Next-Services ICAP response header
-#		value, formatted as a comma-separated list of service names.
-#		Each named service should be configured in squid.conf. Other
-#		services are ignored. An empty X-Next-Services value results
-#		in an empty plan which ends the current adaptation.
-#
-#		Dynamic adaptation plan may cross or cover multiple supported
-#		vectoring points in their natural processing order.
-#
-#		Routing is not allowed by default: the ICAP X-Next-Services
-#		response header is ignored.
-#
-#	ipv6=on|off
-#		Only has effect on split-stack systems. The default on those systems
-#		is to use IPv4-only connections. When set to 'on' this option will
-#		make Squid use IPv6-only connections to contact this ICAP service.
-#
-#	on-overload=block|bypass|wait|force
-#		If the service Max-Connections limit has been reached, do
-#		one of the following for each new ICAP transaction:
-#		  * block:  send an HTTP error response to the client
-#		  * bypass: ignore the "over-connected" ICAP service
-#		  * wait:   wait (in a FIFO queue) for an ICAP connection slot
-#		  * force:  proceed, ignoring the Max-Connections limit 
-#
-#		In SMP mode with N workers, each worker assumes the service
-#		connection limit is Max-Connections/N, even though not all
-#		workers may use a given service.
-#
-#		The default value is "bypass" if service is bypassable,
-#		otherwise it is set to "wait".
-#		
-#
-#	max-conn=number
-#		Use the given number as the Max-Connections limit, regardless
-#		of the Max-Connections value given by the service, if any.
-#
-#	Older icap_service format without optional named parameters is
-#	deprecated but supported for backward compatibility.
-#
-#Example:
-#icap_service svcBlocker reqmod_precache icap://icap1.mydomain.net:1344/reqmod bypass=0
-#icap_service svcLogger reqmod_precache icap://icap2.mydomain.net:1344/respmod routing=on
-#Default:
-# none
-
-#  TAG: icap_class
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-icap-client
-#
-#	This deprecated option was documented to define an ICAP service
-#	chain, even though it actually defined a set of similar, redundant
-#	services, and the chains were not supported. 
-#
-#	To define a set of redundant services, please use the
-#	adaptation_service_set directive. For service chains, use
-#	adaptation_service_chain.
-#Default:
-# none
-
-#  TAG: icap_access
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-icap-client
-#
-#	This option is deprecated. Please use adaptation_access, which
-#	has the same ICAP functionality, but comes with better
-#	documentation, and eCAP support.
-#Default:
-# none
-
-# eCAP OPTIONS
-# -----------------------------------------------------------------------------
-
-#  TAG: ecap_enable	on|off
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-ecap
-#
-#	Controls whether eCAP support is enabled.
-#Default:
-# ecap_enable off
-
-#  TAG: ecap_service
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-ecap
-#
-#	Defines a single eCAP service
-#
-#	ecap_service id vectoring_point uri [option ...]
-#
-#        id: ID
-#		an opaque identifier or name which is used to direct traffic to
-#		this specific service. Must be unique among all adaptation
-#		services in squid.conf.
-#
-#	vectoring_point: reqmod_precache|reqmod_postcache|respmod_precache|respmod_postcache
-#		This specifies at which point of transaction processing the
-#		eCAP service should be activated. *_postcache vectoring points
-#		are not yet supported.
-#
-#	uri: ecap://vendor/service_name?custom&cgi=style&parameters=optional
-#		Squid uses the eCAP service URI to match this configuration
-#		line with one of the dynamically loaded services. Each loaded
-#		eCAP service must have a unique URI. Obtain the right URI from
-#		the service provider.
-#
-#	To activate a service, use the adaptation_access directive. To group
-#	services, use adaptation_service_chain and adaptation_service_set.
-#
-#	Service options are separated by white space. eCAP services support
-#	the following name=value options:
-#
-#	bypass=on|off|1|0
-#		If set to 'on' or '1', the eCAP service is treated as optional.
-#		If the service cannot be reached or malfunctions, Squid will try
-#		to ignore any errors and process the message as if the service
-#		was not enabled. No all eCAP errors can be bypassed.
-#		If set to 'off' or '0', the eCAP service is treated as essential
-#		and all eCAP errors will result in an error page returned to the
-#		HTTP client.
-#
-#                Bypass is off by default: services are treated as essential.
-#
-#	routing=on|off|1|0
-#		If set to 'on' or '1', the eCAP service is allowed to
-#		dynamically change the current message adaptation plan by
-#		returning a chain of services to be used next.
-#
-#		Dynamic adaptation plan may cross or cover multiple supported
-#		vectoring points in their natural processing order.
-#
-#		Routing is not allowed by default.
-#
-#	Older ecap_service format without optional named parameters is
-#	deprecated but supported for backward compatibility.
-#
-#
-#Example:
-#ecap_service s1 reqmod_precache ecap://filters.R.us/leakDetector?on_error=block bypass=off
-#ecap_service s2 respmod_precache ecap://filters.R.us/virusFilter config=/etc/vf.cfg bypass=on
-#Default:
-# none
-
-#  TAG: loadable_modules
-#	Instructs Squid to load the specified dynamic module(s) or activate
-#	preloaded module(s).
-#Example:
-#loadable_modules /usr/lib/MinimalAdapter.so
-#Default:
-# none
-
-# MESSAGE ADAPTATION OPTIONS
-# -----------------------------------------------------------------------------
-
-#  TAG: adaptation_service_set
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-ecap or --enable-icap-client
-#
-#
-#	Configures an ordered set of similar, redundant services. This is
-#	useful when hot standby or backup adaptation servers are available.
-#
-#	    adaptation_service_set set_name service_name1 service_name2 ...
-#
-# 	The named services are used in the set declaration order. The first
-#	applicable adaptation service from the set is used first. The next
-#	applicable service is tried if and only if the transaction with the
-#	previous service fails and the message waiting to be adapted is still
-#	intact.
-#
-#	When adaptation starts, broken services are ignored as if they were
-#	not a part of the set. A broken service is a down optional service.
-#
-#	The services in a set must be attached to the same vectoring point
-#	(e.g., pre-cache) and use the same adaptation method (e.g., REQMOD).
-#
-#	If all services in a set are optional then adaptation failures are
-#	bypassable. If all services in the set are essential, then a
-#	transaction failure with one service may still be retried using
-#	another service from the set, but when all services fail, the master
-#	transaction fails as well.
-#
-#	A set may contain a mix of optional and essential services, but that
-#	is likely to lead to surprising results because broken services become
-#	ignored (see above), making previously bypassable failures fatal.
-#	Technically, it is the bypassability of the last failed service that
-#	matters.
-#
-#	See also: adaptation_access adaptation_service_chain
-#
-#Example:
-#adaptation_service_set svcBlocker urlFilterPrimary urlFilterBackup
-#adaptation service_set svcLogger loggerLocal loggerRemote
-#Default:
-# none
-
-#  TAG: adaptation_service_chain
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-ecap or --enable-icap-client
-#
-#
-#	Configures a list of complementary services that will be applied
-#	one-by-one, forming an adaptation chain or pipeline. This is useful
-#	when Squid must perform different adaptations on the same message.
-#
-#	    adaptation_service_chain chain_name service_name1 svc_name2 ...
-#
-# 	The named services are used in the chain declaration order. The first
-#	applicable adaptation service from the chain is used first. The next
-#	applicable service is applied to the successful adaptation results of
-#	the previous service in the chain.
-#
-#	When adaptation starts, broken services are ignored as if they were
-#	not a part of the chain. A broken service is a down optional service.
-#
-#	Request satisfaction terminates the adaptation chain because Squid
-#	does not currently allow declaration of RESPMOD services at the
-#	"reqmod_precache" vectoring point (see icap_service or ecap_service).
-#
-#	The services in a chain must be attached to the same vectoring point
-#	(e.g., pre-cache) and use the same adaptation method (e.g., REQMOD).
-#
-#	A chain may contain a mix of optional and essential services. If an
-#	essential adaptation fails (or the failure cannot be bypassed for
-#	other reasons), the master transaction fails. Otherwise, the failure
-#	is bypassed as if the failed adaptation service was not in the chain.
-#
-#	See also: adaptation_access adaptation_service_set
-#
-#Example:
-#adaptation_service_chain svcRequest requestLogger urlFilter leakDetector
-#Default:
-# none
-
-#  TAG: adaptation_access
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-ecap or --enable-icap-client
-#
-#	Sends an HTTP transaction to an ICAP or eCAP adaptation	service.
-#
-#	adaptation_access service_name allow|deny [!]aclname...
-#	adaptation_access set_name     allow|deny [!]aclname...
-#
-#	At each supported vectoring point, the adaptation_access
-#	statements are processed in the order they appear in this
-#	configuration file. Statements pointing to the following services
-#	are ignored (i.e., skipped without checking their ACL):
-#
-#	    - services serving different vectoring points
-#	    - "broken-but-bypassable" services
-#	    - "up" services configured to ignore such transactions
-#              (e.g., based on the ICAP Transfer-Ignore header).
-#
-#        When a set_name is used, all services in the set are checked
-#	using the same rules, to find the first applicable one. See
-#	adaptation_service_set for details.
-#
-#	If an access list is checked and there is a match, the
-#	processing stops: For an "allow" rule, the corresponding
-#	adaptation service is used for the transaction. For a "deny"
-#	rule, no adaptation service is activated.
-#
-#	It is currently not possible to apply more than one adaptation
-#	service at the same vectoring point to the same HTTP transaction.
-#
-#        See also: icap_service and ecap_service
-#
-#Example:
-#adaptation_access service_1 allow all
-#Default:
-# Allow, unless rules exist in squid.conf.
-
-#  TAG: adaptation_service_iteration_limit
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-ecap or --enable-icap-client
-#
-#	Limits the number of iterations allowed when applying adaptation
-#	services to a message. If your longest adaptation set or chain
-#	may have more than 16 services, increase the limit beyond its
-#	default value of 16. If detecting infinite iteration loops sooner
-#	is critical, make the iteration limit match the actual number
-#	of services in your longest adaptation set or chain.
-#
-#	Infinite adaptation loops are most likely with routing services.
-#
-#	See also: icap_service routing=1
-#Default:
-# adaptation_service_iteration_limit 16
-
-#  TAG: adaptation_masterx_shared_names
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-ecap or --enable-icap-client
-#
-#	For each master transaction (i.e., the HTTP request and response
-#	sequence, including all related ICAP and eCAP exchanges), Squid
-#	maintains a table of metadata. The table entries are (name, value)
-#	pairs shared among eCAP and ICAP exchanges. The table is destroyed
-#	with the master transaction.
-#
-#	This option specifies the table entry names that Squid must accept
-#	from and forward to the adaptation transactions.
-#
-#	An ICAP REQMOD or RESPMOD transaction may set an entry in the 
-#	shared table by returning an ICAP header field with a name 
-#	specified in adaptation_masterx_shared_names.
-#
-#	An eCAP REQMOD or RESPMOD transaction may set an entry in the
-#	shared table by implementing the libecap::visitEachOption() API
-#	to provide an option with a name specified in
-#	adaptation_masterx_shared_names.
-#
-#	Squid will store and forward the set entry to subsequent adaptation
-#	transactions within the same master transaction scope.
-#
-#	Only one shared entry name is supported at this time.
-#
-#Example:
-## share authentication information among ICAP services
-#adaptation_masterx_shared_names X-Subscriber-ID
-#Default:
-# none
-
-#  TAG: adaptation_meta
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-ecap or --enable-icap-client
-#
-#	This option allows Squid administrator to add custom ICAP request
-#	headers or eCAP options to Squid ICAP requests or eCAP transactions.
-#	Use it to pass custom authentication tokens and other
-#	transaction-state related meta information to an ICAP/eCAP service.
-#	
-#	The addition of a meta header is ACL-driven:
-#		adaptation_meta name value [!]aclname ...
-#	
-#	Processing for a given header name stops after the first ACL list match.
-#	Thus, it is impossible to add two headers with the same name. If no ACL
-#	lists match for a given header name, no such header is added. For 
-#	example:
-#	
-#		# do not debug transactions except for those that need debugging
-#		adaptation_meta X-Debug 1 needs_debugging
-#	
-#		# log all transactions except for those that must remain secret
-#		adaptation_meta X-Log 1 !keep_secret
-#	
-#		# mark transactions from users in the "G 1" group
-#		adaptation_meta X-Authenticated-Groups "G 1" authed_as_G1
-#	
-#	The "value" parameter may be a regular squid.conf token or a "double
-#	quoted string". Within the quoted string, use backslash (\) to escape
-#	any character, which is currently only useful for escaping backslashes
-#	and double quotes. For example,
-#	    "this string has one backslash (\\) and two \"quotes\""
-#
-#	Used adaptation_meta header values may be logged via %note
-#	logformat code. If multiple adaptation_meta headers with the same name
-#	are used during master transaction lifetime, the header values are
-#	logged in the order they were used and duplicate values are ignored
-#	(only the first repeated value will be logged).
-#Default:
-# none
-
-#  TAG: icap_retry
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-icap-client
-#
-#	This ACL determines which retriable ICAP transactions are
-#	retried. Transactions that received a complete ICAP response
-#	and did not have to consume or produce HTTP bodies to receive
-#	that response are usually retriable.
-#
-#	icap_retry allow|deny [!]aclname ...
-#
-#	Squid automatically retries some ICAP I/O timeouts and errors
-#	due to persistent connection race conditions.
-#
-#	See also: icap_retry_limit
-#Default:
-# icap_retry deny all
-
-#  TAG: icap_retry_limit
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-icap-client
-#
-#	Limits the number of retries allowed.
-#
-#	Communication errors due to persistent connection race
-#	conditions are unavoidable, automatically retried, and do not
-#	count against this limit.
-#
-#	See also: icap_retry
-#Default:
-# No retries are allowed.
-
-# DNS OPTIONS
-# -----------------------------------------------------------------------------
-
-#  TAG: check_hostnames
-#	For security and stability reasons Squid can check
-#	hostnames for Internet standard RFC compliance. If you want
-#	Squid to perform these checks turn this directive on.
-#Default:
-# check_hostnames off
-
-#  TAG: allow_underscore
-#	Underscore characters is not strictly allowed in Internet hostnames
-#	but nevertheless used by many sites. Set this to off if you want
-#	Squid to be strict about the standard.
-#	This check is performed only when check_hostnames is set to on.
-#Default:
-# allow_underscore on
-
-#  TAG: cache_dns_program
-# Note: This option is only available if Squid is rebuilt with the
-#       --disable-internal-dns
-#
-#	Specify the location of the executable for dnslookup process.
-#Default:
-# cache_dns_program /usr/libexec/dnsserver
-
-#  TAG: dns_children
-# Note: This option is only available if Squid is rebuilt with the
-#       --disable-internal-dns
-#
-#	The maximum number of processes spawn to service DNS name lookups.
-#	If you limit it too few Squid will have to wait for them to process
-#	a backlog of requests, slowing it down. If you allow too many they
-#	will use RAM and other system resources noticably.
-#	The maximum this may be safely set to is 32.
-#	
-#	The startup= and idle= options allow some measure of skew in your
-#	tuning.
-#	
-#		startup=
-#	
-#	Sets a minimum of how many processes are to be spawned when Squid
-#	starts or reconfigures. When set to zero the first request will
-#	cause spawning of the first child process to handle it.
-#	
-#	Starting too few will cause an initial slowdown in traffic as Squid
-#	attempts to simultaneously spawn enough processes to cope.
-#	
-#		idle=
-#	
-#	Sets a minimum of how many processes Squid is to try and keep available
-#	at all times. When traffic begins to rise above what the existing
-#	processes can handle this many more will be spawned up to the maximum
-#	configured. A minimum setting of 1 is required.
-#Default:
-# dns_children 32 startup=1 idle=1
-
-#  TAG: dns_retransmit_interval
-#	Initial retransmit interval for DNS queries. The interval is
-#	doubled each time all configured DNS servers have been tried.
-#Default:
-# dns_retransmit_interval 5 seconds
-
-#  TAG: dns_timeout
-#	DNS Query timeout. If no response is received to a DNS query
-#	within this time all DNS servers for the queried domain
-#	are assumed to be unavailable.
-#Default:
-# dns_timeout 30 seconds
-
-#  TAG: dns_packet_max
-#	Maximum number of bytes packet size to advertise via EDNS.
-#	Set to "none" to disable EDNS large packet support.
-#	
-#	For legacy reasons DNS UDP replies will default to 512 bytes which
-#	is too small for many responses. EDNS provides a means for Squid to
-#	negotiate receiving larger responses back immediately without having
-#	to failover with repeat requests. Responses larger than this limit
-#	will retain the old behaviour of failover to TCP DNS.
-#	
-#	Squid has no real fixed limit internally, but allowing packet sizes
-#	over 1500 bytes requires network jumbogram support and is usually not
-#	necessary.
-#	
-#	WARNING: The RFC also indicates that some older resolvers will reply
-#	with failure of the whole request if the extension is added. Some
-#	resolvers have already been identified which will reply with mangled
-#	EDNS response on occasion. Usually in response to many-KB jumbogram
-#	sizes being advertised by Squid.
-#	Squid will currently treat these both as an unable-to-resolve domain
-#	even if it would be resolvable without EDNS.
-#Default:
-# EDNS disabled
-
-#  TAG: dns_defnames	on|off
-#	Normally the RES_DEFNAMES resolver option is disabled
-#	(see res_init(3)).  This prevents caches in a hierarchy
-#	from interpreting single-component hostnames locally.  To allow
-#	Squid to handle single-component names, enable this option.
-#Default:
-# Search for single-label domain names is disabled.
-
-#  TAG: dns_multicast_local	on|off
-#	When set to on, Squid sends multicast DNS lookups on the local
-#	network for domains ending in .local and .arpa.
-#	This enables local servers and devices to be contacted in an
-#	ad-hoc or zero-configuration network environment.
-#Default:
-# Search for .local and .arpa names is disabled.
-
-#  TAG: dns_nameservers
-#	Use this if you want to specify a list of DNS name servers
-#	(IP addresses) to use instead of those given in your
-#	/etc/resolv.conf file.
-#
-#	On Windows platforms, if no value is specified here or in
-#	the /etc/resolv.conf file, the list of DNS name servers are
-#	taken from the Windows registry, both static and dynamic DHCP
-#	configurations are supported.
-#
-#	Example: dns_nameservers 10.0.0.1 192.172.0.4
-#Default:
-# Use operating system definitions
-
-#  TAG: hosts_file
-#	Location of the host-local IP name-address associations
-#	database. Most Operating Systems have such a file on different
-#	default locations:
-#	- Un*X & Linux:    /etc/hosts
-#	- Windows NT/2000: %SystemRoot%\system32\drivers\etc\hosts
-#			   (%SystemRoot% value install default is c:\winnt)
-#	- Windows XP/2003: %SystemRoot%\system32\drivers\etc\hosts
-#			   (%SystemRoot% value install default is c:\windows)
-#	- Windows 9x/Me:   %windir%\hosts
-#			   (%windir% value is usually c:\windows)
-#	- Cygwin:	   /etc/hosts
-#
-#	The file contains newline-separated definitions, in the
-#	form ip_address_in_dotted_form name [name ...] names are
-#	whitespace-separated. Lines beginning with an hash (#)
-#	character are comments.
-#
-#	The file is checked at startup and upon configuration.
-#	If set to 'none', it won't be checked.
-#	If append_domain is used, that domain will be added to
-#	domain-local (i.e. not containing any dot character) host
-#	definitions.
-#Default:
-# hosts_file /etc/hosts
-
-#  TAG: append_domain
-#	Appends local domain name to hostnames without any dots in
-#	them.  append_domain must begin with a period.
-#
-#	Be warned there are now Internet names with no dots in
-#	them using only top-domain names, so setting this may
-#	cause some Internet sites to become unavailable.
-#
-#Example:
-# append_domain .yourdomain.com
-#Default:
-# Use operating system definitions
-
-#  TAG: ignore_unknown_nameservers
-#	By default Squid checks that DNS responses are received
-#	from the same IP addresses they are sent to.  If they
-#	don't match, Squid ignores the response and writes a warning
-#	message to cache.log.  You can allow responses from unknown
-#	nameservers by setting this option to 'off'.
-#Default:
-# ignore_unknown_nameservers on
-
-#  TAG: dns_v4_first
-#	With the IPv6 Internet being as fast or faster than IPv4 Internet
-#	for most networks Squid prefers to contact websites over IPv6.
-#
-#	This option reverses the order of preference to make Squid contact
-#	dual-stack websites over IPv4 first. Squid will still perform both
-#	IPv6 and IPv4 DNS lookups before connecting.
-#
-#	WARNING:
-#	  This option will restrict the situations under which IPv6
-#	  connectivity is used (and tested). Hiding network problems
-#	  which would otherwise be detected and warned about.
-#Default:
-# dns_v4_first off
-
-#  TAG: ipcache_size	(number of entries)
-#	Maximum number of DNS IP cache entries.
-#Default:
-# ipcache_size 1024
-
-#  TAG: ipcache_low	(percent)
-#Default:
-# ipcache_low 90
-
-#  TAG: ipcache_high	(percent)
-#	The size, low-, and high-water marks for the IP cache.
-#Default:
-# ipcache_high 95
-
-#  TAG: fqdncache_size	(number of entries)
-#	Maximum number of FQDN cache entries.
-#Default:
-# fqdncache_size 1024
-
-# MISCELLANEOUS
-# -----------------------------------------------------------------------------
-
-#  TAG: configuration_includes_quoted_values	on|off
-#	Previous Squid versions have defined "quoted/string" as syntax for
-#	ACL to signifiy the value is an included file containing values and
-#	has treated the " characters in other places of the configuration file
-#	as part of the parameter value it was used for.
-#
-#	For compatibility with existing installations that behaviour
-#	remains the default.
-#
-#	If this directive is set to 'on', Squid will start parsing each
-#	"quoted string" as a single configuration directive parameter. The
-#	quotes are stripped before the parameter value is interpreted or use.
-#
-#	That will continue for all lines until this directive is set to 'off',
-#	where Squid will return to the default configuration parsing.
-#
-#	For example;
-#
-#		configuration_includes_quoted_values on
-#		acl group external groupCheck Administrators "Internet Users" Guest
-#		configuration_includes_quoted_values off
-#
-#Default:
-# configuration_includes_quoted_values off
-
-#  TAG: memory_pools	on|off
-#	If set, Squid will keep pools of allocated (but unused) memory
-#	available for future use.  If memory is a premium on your
-#	system and you believe your malloc library outperforms Squid
-#	routines, disable this.
-#Default:
-# memory_pools on
-
-#  TAG: memory_pools_limit	(bytes)
-#	Used only with memory_pools on:
-#	memory_pools_limit 50 MB
-#
-#	If set to a non-zero value, Squid will keep at most the specified
-#	limit of allocated (but unused) memory in memory pools. All free()
-#	requests that exceed this limit will be handled by your malloc
-#	library. Squid does not pre-allocate any memory, just safe-keeps
-#	objects that otherwise would be free()d. Thus, it is safe to set
-#	memory_pools_limit to a reasonably high value even if your
-#	configuration will use less memory.
-#
-#	If set to none, Squid will keep all memory it can. That is, there
-#	will be no limit on the total amount of memory used for safe-keeping.
-#
-#	To disable memory allocation optimization, do not set
-#	memory_pools_limit to 0 or none. Set memory_pools to "off" instead.
-#
-#	An overhead for maintaining memory pools is not taken into account
-#	when the limit is checked. This overhead is close to four bytes per
-#	object kept. However, pools may actually _save_ memory because of
-#	reduced memory thrashing in your malloc library.
-#Default:
-# memory_pools_limit 5 MB
-
-#  TAG: forwarded_for	on|off|transparent|truncate|delete
-#	If set to "on", Squid will append your client's IP address
-#	in the HTTP requests it forwards. By default it looks like:
-#
-#		X-Forwarded-For: 192.1.2.3
-#
-#	If set to "off", it will appear as
-#
-#		X-Forwarded-For: unknown
-#
-#	If set to "transparent", Squid will not alter the
-#	X-Forwarded-For header in any way.
-#
-#	If set to "delete", Squid will delete the entire
-#	X-Forwarded-For header.
-#
-#	If set to "truncate", Squid will remove all existing
-#	X-Forwarded-For entries, and place the client IP as the sole entry.
-#Default:
-# forwarded_for on
-
-#  TAG: cachemgr_passwd
-#	Specify passwords for cachemgr operations.
-#
-#	Usage: cachemgr_passwd password action action ...
-#
-#	Some valid actions are (see cache manager menu for a full list):
-#		5min
-#		60min
-#		asndb
-#		authenticator
-#		cbdata
-#		client_list
-#		comm_incoming
-#		config *
-#		counters
-#		delay
-#		digest_stats
-#		dns
-#		events
-#		filedescriptors
-#		fqdncache
-#		histograms
-#		http_headers
-#		info
-#		io
-#		ipcache
-#		mem
-#		menu
-#		netdb
-#		non_peers
-#		objects
-#		offline_toggle *
-#		pconn
-#		peer_select
-#		reconfigure *
-#		redirector
-#		refresh
-#		server_list
-#		shutdown *
-#		store_digest
-#		storedir
-#		utilization
-#		via_headers
-#		vm_objects
-#
-#	* Indicates actions which will not be performed without a
-#	  valid password, others can be performed if not listed here.
-#
-#	To disable an action, set the password to "disable".
-#	To allow performing an action without a password, set the
-#	password to "none".
-#
-#	Use the keyword "all" to set the same password for all actions.
-#
-#Example:
-# cachemgr_passwd secret shutdown
-# cachemgr_passwd lesssssssecret info stats/objects
-# cachemgr_passwd disable all
-#Default:
-# No password. Actions which require password are denied.
-
-#  TAG: client_db	on|off
-#	If you want to disable collecting per-client statistics,
-#	turn off client_db here.
-#Default:
-# client_db on
-
-#  TAG: refresh_all_ims	on|off
-#	When you enable this option, squid will always check
-#	the origin server for an update when a client sends an
-#	If-Modified-Since request.  Many browsers use IMS
-#	requests when the user requests a reload, and this
-#	ensures those clients receive the latest version.
-#
-#	By default (off), squid may return a Not Modified response
-#	based on the age of the cached version.
-#Default:
-# refresh_all_ims off
-
-#  TAG: reload_into_ims	on|off
-#	When you enable this option, client no-cache or ``reload''
-#	requests will be changed to If-Modified-Since requests.
-#	Doing this VIOLATES the HTTP standard.  Enabling this
-#	feature could make you liable for problems which it
-#	causes.
-#
-#	see also refresh_pattern for a more selective approach.
-#Default:
-# reload_into_ims off
-
-#  TAG: connect_retries
-#	This sets the maximum number of connection attempts made for each
-#	TCP connection. The connect_retries attempts must all still
-#	complete within the connection timeout period.
-#
-#	The default is not to re-try if the first connection attempt fails.
-#	The (not recommended) maximum is 10 tries.
-#
-#	A warning message will be generated if it is set to a too-high
-#	value and the configured value will be over-ridden.
-#
-#	Note: These re-tries are in addition to forward_max_tries
-#	which limit how many different addresses may be tried to find
-#	a useful server.
-#Default:
-# Do not retry failed connections.
-
-#  TAG: retry_on_error
-#	If set to ON Squid will automatically retry requests when
-#	receiving an error response with status 403 (Forbidden),
-#	500 (Internal Error), 501 or 503 (Service not available).
-#	Status 502 and 504 (Gateway errors) are always retried.
-#	
-#	This is mainly useful if you are in a complex cache hierarchy to
-#	work around access control errors.
-#	
-#	NOTE: This retry will attempt to find another working destination.
-#	Which is different from the server which just failed.
-#Default:
-# retry_on_error off
-
-#  TAG: as_whois_server
-#	WHOIS server to query for AS numbers.  NOTE: AS numbers are
-#	queried only when Squid starts up, not for every request.
-#Default:
-# as_whois_server whois.ra.net
-
-#  TAG: offline_mode
-#	Enable this option and Squid will never try to validate cached
-#	objects.
-#Default:
-# offline_mode off
-
-#  TAG: uri_whitespace
-#	What to do with requests that have whitespace characters in the
-#	URI.  Options:
-#
-#	strip:  The whitespace characters are stripped out of the URL.
-#		This is the behavior recommended by RFC2396 and RFC3986
-#		for tolerant handling of generic URI.
-#		NOTE: This is one difference between generic URI and HTTP URLs.
-#
-#	deny:   The request is denied.  The user receives an "Invalid
-#		Request" message.
-#		This is the behaviour recommended by RFC2616 for safe
-#		handling of HTTP request URL.
-#
-#	allow:  The request is allowed and the URI is not changed.  The
-#		whitespace characters remain in the URI.  Note the
-#		whitespace is passed to redirector processes if they
-#		are in use.
-#		Note this may be considered a violation of RFC2616
-#		request parsing where whitespace is prohibited in the
-#		URL field.
-#
-#	encode:	The request is allowed and the whitespace characters are
-#		encoded according to RFC1738.
-#
-#	chop:	The request is allowed and the URI is chopped at the
-#		first whitespace.
-#
-#
-#	NOTE the current Squid implementation of encode and chop violates
-#	RFC2616 by not using a 301 redirect after altering the URL.
-#Default:
-# uri_whitespace strip
-
-#  TAG: chroot
-#	Specifies a directory where Squid should do a chroot() while
-#	initializing.  This also causes Squid to fully drop root
-#	privileges after initializing.  This means, for example, if you
-#	use a HTTP port less than 1024 and try to reconfigure, you may
-#	get an error saying that Squid can not open the port.
-#Default:
-# none
-
-#  TAG: balance_on_multiple_ip
-#	Modern IP resolvers in squid sort lookup results by preferred access.
-#	By default squid will use these IP in order and only rotates to
-#	the next listed when the most preffered fails.
-#
-#	Some load balancing servers based on round robin DNS have been
-#	found not to preserve user session state across requests
-#	to different IP addresses.
-#
-#	Enabling this directive Squid rotates IP's per request.
-#Default:
-# balance_on_multiple_ip off
-
-#  TAG: pipeline_prefetch
-#	HTTP clients may send a pipeline of 1+N requests to Squid using a
-#	single connection, without waiting for Squid to respond to the first
-#	of those requests. This option limits the number of concurrent
-#	requests Squid will try to handle in parallel. If set to N, Squid
-#	will try to receive and process up to 1+N requests on the same
-#	connection concurrently.
-#
-#	Defaults to 0 (off) for bandwidth management and access logging
-#	reasons.
-#
-#	NOTE: pipelining requires persistent connections to clients.
-#
-#	WARNING: pipelining breaks NTLM and Negotiate/Kerberos authentication.
-#Default:
-# Do not pre-parse pipelined requests.
-
-#  TAG: high_response_time_warning	(msec)
-#	If the one-minute median response time exceeds this value,
-#	Squid prints a WARNING with debug level 0 to get the
-#	administrators attention.  The value is in milliseconds.
-#Default:
-# disabled.
-
-#  TAG: high_page_fault_warning
-#	If the one-minute average page fault rate exceeds this
-#	value, Squid prints a WARNING with debug level 0 to get
-#	the administrators attention.  The value is in page faults
-#	per second.
-#Default:
-# disabled.
-
-#  TAG: high_memory_warning
-# Note: This option is only available if Squid is rebuilt with the
-#       GNU Malloc with mstats()
-#
-#	If the memory usage (as determined by mallinfo) exceeds
-#	this amount, Squid prints a WARNING with debug level 0 to get
-#	the administrators attention.
-#Default:
-# disabled.
-
-#  TAG: sleep_after_fork	(microseconds)
-#	When this is set to a non-zero value, the main Squid process
-#	sleeps the specified number of microseconds after a fork()
-#	system call. This sleep may help the situation where your
-#	system reports fork() failures due to lack of (virtual)
-#	memory. Note, however, if you have a lot of child
-#	processes, these sleep delays will add up and your
-#	Squid will not service requests for some amount of time
-#	until all the child processes have been started.
-#	On Windows value less then 1000 (1 milliseconds) are
-#	rounded to 1000.
-#Default:
-# sleep_after_fork 0
-
-#  TAG: windows_ipaddrchangemonitor	on|off
-# Note: This option is only available if Squid is rebuilt with the
-#       MS Windows
-#
-#	On Windows Squid by default will monitor IP address changes and will 
-#	reconfigure itself after any detected event. This is very useful for
-#	proxies connected to internet with dial-up interfaces.
-#	In some cases (a Proxy server acting as VPN gateway is one) it could be
-#	desiderable to disable this behaviour setting this to 'off'.
-#	Note: after changing this, Squid service must be restarted.
-#Default:
-# windows_ipaddrchangemonitor on
-
-#  TAG: eui_lookup
-#	Whether to lookup the EUI or MAC address of a connected client.
-#Default:
-# eui_lookup on
-
-#  TAG: max_filedescriptors
-#	Reduce the maximum number of filedescriptors supported below
-#	the usual operating system defaults.
-#
-#	Remove from squid.conf to inherit the current ulimit setting.
-#
-#	Note: Changing this requires a restart of Squid. Also
-#	not all I/O types supports large values (eg on Windows).
-#Default:
-# Use operating system limits set by ulimit.
-
-#  TAG: workers
-#	Number of main Squid processes or "workers" to fork and maintain.
-#	0: "no daemon" mode, like running "squid -N ..."
-#	1: "no SMP" mode, start one main Squid process daemon (default)
-#	N: start N main Squid process daemons (i.e., SMP mode)
-#
-#	In SMP mode, each worker does nearly all what a single Squid daemon
-#	does (e.g., listen on http_port and forward HTTP requests).
-#Default:
-# SMP support disabled.
-
-#  TAG: cpu_affinity_map
-#	Usage: cpu_affinity_map process_numbers=P1,P2,... cores=C1,C2,...
-#
-#	Sets 1:1 mapping between Squid processes and CPU cores. For example,
-#
-#	    cpu_affinity_map process_numbers=1,2,3,4 cores=1,3,5,7
-#
-#	affects processes 1 through 4 only and places them on the first
-#	four even cores, starting with core #1.
-#
-#	CPU cores are numbered starting from 1. Requires support for
-#	sched_getaffinity(2) and sched_setaffinity(2) system calls.
-#
-#	Multiple cpu_affinity_map options are merged.
-#
-#	See also: workers
-#Default:
-# Let operating system decide.
-
diff --git a/network/squid/squid.conf.documented b/network/squid/squid.conf.documented
deleted file mode 100644
index bd70bbfa5f..0000000000
--- a/network/squid/squid.conf.documented
+++ /dev/null
@@ -1,7806 +0,0 @@
-#	WELCOME TO SQUID 3.4.10
-#	----------------------------
-#	
-#	This is the documentation for the Squid configuration file.
-#	This documentation can also be found online at:
-#		http://www.squid-cache.org/Doc/config/
-#	
-#	You may wish to look at the Squid home page and wiki for the
-#	FAQ and other documentation:
-#		http://www.squid-cache.org/
-#		http://wiki.squid-cache.org/SquidFaq
-#		http://wiki.squid-cache.org/ConfigExamples
-#	
-#	This documentation shows what the defaults for various directives
-#	happen to be.  If you don't need to change the default, you should
-#	leave the line out of your squid.conf in most cases.
-#	
-#	In some cases "none" refers to no default setting at all,
-#	while in other cases it refers to the value of the option
-#	- the comments for that keyword indicate if this is the case.
-#
-
-#  Configuration options can be included using the "include" directive.
-#  Include takes a list of files to include. Quoting and wildcards are
-#  supported.
-#
-#  For example,
-#
-#  include /path/to/included/file/squid.acl.config
-#
-#  Includes can be nested up to a hard-coded depth of 16 levels.
-#  This arbitrary restriction is to prevent recursive include references
-#  from causing Squid entering an infinite loop whilst trying to load
-#  configuration files.
-#
-#  Values with byte units
-#
-#	Squid accepts size units on some size related directives. All
-#	such directives are documented with a default value displaying
-#	a unit.
-#
-#	Units accepted by Squid are:
-#		bytes - byte
-#		KB - Kilobyte (1024 bytes)
-#		MB - Megabyte
-#		GB - Gigabyte
-#
-#  Values with spaces, quotes, and other special characters
-#
-#	Squid supports directive parameters with spaces, quotes, and other
-#	special characters. Surround such parameters with "double quotes". Use
-#	the configuration_includes_quoted_values directive to enable or
-#	disable that support.
-#
-#	For example;
-#
-#		configuration_includes_quoted_values on
-#		acl group external groupCheck Administrators "Internet Users" Guest
-#		configuration_includes_quoted_values off
-#
-#
-#  Conditional configuration
-#
-#	If-statements can be used to make configuration directives
-#	depend on conditions:
-#
-#	    if <CONDITION>
-#	        ... regular configuration directives ...
-#	    [else
-#	        ... regular configuration directives ...]
-#	    endif
-#
-#	The else part is optional. The keywords "if", "else", and "endif"
-#	must be typed on their own lines, as if they were regular
-#	configuration directives.
-#
-#	NOTE: An else-if condition is not supported.
-#
-#	These individual conditions types are supported:
-#
-#	    true
-#		Always evaluates to true.
-#	    false
-#		Always evaluates to false.
-#	    <integer> = <integer>
-#	        Equality comparison of two integer numbers.
-#
-#
-#  SMP-Related Macros
-#
-#	The following SMP-related preprocessor macros can be used.
-#
-#	${process_name} expands to the current Squid process "name"
-#	(e.g., squid1, squid2, or cache1).
-#
-#	${process_number} expands to the current Squid process
-#	identifier, which is an integer number (e.g., 1, 2, 3) unique
-#	across all Squid processes.
-
-#  TAG: broken_vary_encoding
-#	This option is not yet supported by Squid-3.
-#Default:
-# none
-
-#  TAG: cache_vary
-#	This option is not yet supported by Squid-3.
-#Default:
-# none
-
-#  TAG: collapsed_forwarding
-#	This option is not yet supported by Squid-3. see http://bugs.squid-cache.org/show_bug.cgi?id=3495
-#Default:
-# none
-
-#  TAG: error_map
-#	This option is not yet supported by Squid-3.
-#Default:
-# none
-
-#  TAG: external_refresh_check
-#	This option is not yet supported by Squid-3.
-#Default:
-# none
-
-#  TAG: location_rewrite_program
-#	This option is not yet supported by Squid-3.
-#Default:
-# none
-
-#  TAG: refresh_stale_hit
-#	This option is not yet supported by Squid-3.
-#Default:
-# none
-
-#  TAG: ignore_ims_on_miss
-#	Remove this line. The HTTP/1.1 feature is now configured by 'cache_miss_revalidate'.
-#Default:
-# none
-
-#  TAG: ignore_expect_100
-#	Remove this line. The HTTP/1.1 feature is now fully supported by default.
-#Default:
-# none
-
-#  TAG: dns_v4_fallback
-#	Remove this line. Squid performs a 'Happy Eyeballs' algorithm, the 'fallback' algorithm is no longer relevant.
-#Default:
-# none
-
-#  TAG: ftp_list_width
-#	Remove this line. Configure FTP page display using the CSS controls in errorpages.css instead.
-#Default:
-# none
-
-#  TAG: maximum_single_addr_tries
-#	Replaced by connect_retries. The behaviour has changed, please read the documentation before altering.
-#Default:
-# none
-
-#  TAG: update_headers
-#	Remove this line. The feature is supported by default in storage types where update is implemented.
-#Default:
-# none
-
-#  TAG: url_rewrite_concurrency
-#	Remove this line. Set the 'concurrency=' option of url_rewrite_children instead.
-#Default:
-# none
-
-#  TAG: dns_testnames
-#	Remove this line. DNS is no longer tested on startup.
-#Default:
-# none
-
-#  TAG: extension_methods
-#	Remove this line. All valid methods for HTTP are accepted by default.
-#Default:
-# none
-
-#  TAG: zero_buffers
-#Default:
-# none
-
-#  TAG: incoming_rate
-#Default:
-# none
-
-#  TAG: server_http11
-#	Remove this line. HTTP/1.1 is supported by default.
-#Default:
-# none
-
-#  TAG: upgrade_http0.9
-#	Remove this line. ICY/1.0 streaming protocol is supported by default.
-#Default:
-# none
-
-#  TAG: zph_local
-#	Alter these entries. Use the qos_flows directive instead.
-#Default:
-# none
-
-#  TAG: header_access
-#	Since squid-3.0 replace with request_header_access or reply_header_access
-#	depending on whether you wish to match client requests or server replies.
-#Default:
-# none
-
-#  TAG: httpd_accel_no_pmtu_disc
-#	Since squid-3.0 use the 'disable-pmtu-discovery' flag on http_port instead.
-#Default:
-# none
-
-#  TAG: wais_relay_host
-#	Replace this line with 'cache_peer' configuration.
-#Default:
-# none
-
-#  TAG: wais_relay_port
-#	Replace this line with 'cache_peer' configuration.
-#Default:
-# none
-
-# OPTIONS FOR AUTHENTICATION
-# -----------------------------------------------------------------------------
-
-#  TAG: auth_param
-#	This is used to define parameters for the various authentication
-#	schemes supported by Squid.
-#
-#	format: auth_param scheme parameter [setting]
-#
-#	The order in which authentication schemes are presented to the client is
-#	dependent on the order the scheme first appears in config file. IE
-#	has a bug (it's not RFC 2617 compliant) in that it will use the basic
-#	scheme if basic is the first entry presented, even if more secure
-#	schemes are presented. For now use the order in the recommended
-#	settings section below. If other browsers have difficulties (don't
-#	recognize the schemes offered even if you are using basic) either
-#	put basic first, or disable the other schemes (by commenting out their
-#	program entry).
-#
-#	Once an authentication scheme is fully configured, it can only be
-#	shutdown by shutting squid down and restarting. Changes can be made on
-#	the fly and activated with a reconfigure. I.E. You can change to a
-#	different helper, but not unconfigure the helper completely.
-#
-#	Please note that while this directive defines how Squid processes
-#	authentication it does not automatically activate authentication.
-#	To use authentication you must in addition make use of ACLs based
-#	on login name in http_access (proxy_auth, proxy_auth_regex or
-#	external with %LOGIN used in the format tag). The browser will be
-#	challenged for authentication on the first such acl encountered
-#	in http_access processing and will also be re-challenged for new
-#	login credentials if the request is being denied by a proxy_auth
-#	type acl.
-#
-#	WARNING: authentication can't be used in a transparently intercepting
-#	proxy as the client then thinks it is talking to an origin server and
-#	not the proxy. This is a limitation of bending the TCP/IP protocol to
-#	transparently intercepting port 80, not a limitation in Squid.
-#	Ports flagged 'transparent', 'intercept', or 'tproxy' have
-#	authentication disabled.
-#
-#	=== Parameters for the basic scheme follow. ===
-#
-#	"program" cmdline
-#	Specify the command for the external authenticator.  Such a program
-#	reads a line containing "username password" and	replies with one of
-#	three results:
-#
-#	  OK
-#		the user exists.
-#
-#	  ERR
-#		the user does not exist.
-#
-#	  BH
-#		An internal error occurred in the helper, preventing
-#		a result being identified.
-#
-#	"ERR" and "BH" results may optionally be followed by message="..."
-#	containing a description available as %m in the returned error page.
-#
-#	If you use an authenticator, make sure you have 1 acl of type
-#	proxy_auth.
-#
-#	By default, the basic authentication scheme is not used unless a
-#	program is specified.
-#
-#	If you want to use the traditional NCSA proxy authentication, set
-#	this line to something like
-#
-#	auth_param basic program /usr/libexec/basic_ncsa_auth /usr/etc/passwd
-#
-#	"utf8" on|off
-#	HTTP uses iso-latin-1 as character set, while some authentication
-#	backends such as LDAP expects UTF-8. If this is set to on Squid will
-#	translate the HTTP iso-latin-1 charset to UTF-8 before sending the
-#	username & password to the helper.
-#
-#	"children" numberofchildren [startup=N] [idle=N] [concurrency=N]
-#	The maximum number of authenticator processes to spawn. If you start too few
-#	Squid will have to wait for them to process a backlog of credential
-#	verifications, slowing it down. When password verifications are
-#	done via a (slow) network you are likely to need lots of
-#	authenticator processes.
-#
-#	The startup= and idle= options permit some skew in the exact amount
-#	run. A minimum of startup=N will begin during startup and reconfigure.
-#	Squid will start more in groups of up to idle=N in an attempt to meet
-#	traffic needs and to keep idle=N free above those traffic needs up to
-#	the maximum.
-#
-#	The concurrency= option sets the number of concurrent requests the
-#	helper can process.  The default of 0 is used for helpers who only
-#	supports one request at a time. Setting this to a number greater than
-#	0 changes the protocol used to include a channel number first on the
-#	request/response line, allowing multiple requests to be sent to the
-#	same helper in parallel without waiting for the response.
-#	Must not be set unless it's known the helper supports this.
-#
-#	auth_param basic children 20 startup=0 idle=1
-#
-#	"realm" realmstring
-#	Specifies the realm name which is to be reported to the
-#	client for the basic proxy authentication scheme (part of
-#	the text the user will see when prompted their username and
-#	password). There is no default.
-#	auth_param basic realm Squid proxy-caching web server
-#
-#	"credentialsttl" timetolive
-#	Specifies how long squid assumes an externally validated
-#	username:password pair is valid for - in other words how
-#	often the helper program is called for that user. Set this
-#	low to force revalidation with short lived passwords.  Note
-#	setting this high does not impact your susceptibility
-#	to replay attacks unless you are using an one-time password
-#	system (such as SecureID).  If you are using such a system,
-#	you will be vulnerable to replay attacks unless you also
-#	use the max_user_ip ACL in an http_access rule.
-#
-#	"casesensitive" on|off
-#	Specifies if usernames are case sensitive. Most user databases are
-#	case insensitive allowing the same username to be spelled using both
-#	lower and upper case letters, but some are case sensitive. This
-#	makes a big difference for user_max_ip ACL processing and similar.
-#	auth_param basic casesensitive off
-#
-#	=== Parameters for the digest scheme follow ===
-#
-#	"program" cmdline
-#	Specify the command for the external authenticator.  Such
-#	a program reads a line containing "username":"realm" and
-#	replies with one of three results:
-#
-#	  OK ha1="..."
-#		the user exists. The ha1= key is mandatory and
-#		contains the appropriate H(A1) value, hex encoded.
-#		See rfc 2616 for the definition of H(A1).
-#
-#	  ERR
-#		the user does not exist.
-#
-#	  BH
-#		An internal error occurred in the helper, preventing
-#		a result being identified.
-#
-#	"ERR" and "BH" results may optionally be followed by message="..."
-#	containing a description available as %m in the returned error page.
-#
-#	By default, the digest authentication scheme is not used unless a
-#	program is specified.
-#
-#	If you want to use a digest authenticator, set this line to
-#	something like
-#
-#	auth_param digest program /usr/bin/digest_pw_auth /usr/etc/digpass
-#
-#	"utf8" on|off
-#	HTTP uses iso-latin-1 as character set, while some authentication
-#	backends such as LDAP expects UTF-8. If this is set to on Squid will
-#	translate the HTTP iso-latin-1 charset to UTF-8 before sending the
-#	username & password to the helper.
-#
-#	"children" numberofchildren [startup=N] [idle=N] [concurrency=N]
-#	The maximum number of authenticator processes to spawn (default 5).
-#	If you start too few Squid will have to wait for them to
-#	process a backlog of H(A1) calculations, slowing it down.
-#	When the H(A1) calculations are done via a (slow) network
-#	you are likely to need lots of authenticator processes.
-#
-#	The startup= and idle= options permit some skew in the exact amount
-#	run. A minimum of startup=N will begin during startup and reconfigure.
-#	Squid will start more in groups of up to idle=N in an attempt to meet
-#	traffic needs and to keep idle=N free above those traffic needs up to
-#	the maximum.
-#
-#	The concurrency= option sets the number of concurrent requests the
-#	helper can process.  The default of 0 is used for helpers who only
-#	supports one request at a time. Setting this to a number greater than
-#	0 changes the protocol used to include a channel number first on the
-#	request/response line, allowing multiple requests to be sent to the
-#	same helper in parallel without waiting for the response.
-#	Must not be set unless it's known the helper supports this.
-#
-#	auth_param digest children 20 startup=0 idle=1
-#
-#	"realm" realmstring
-#	Specifies the realm name which is to be reported to the
-#	client for the digest proxy authentication scheme (part of
-#	the text the user will see when prompted their username and
-#	password). There is no default.
-#	auth_param digest realm Squid proxy-caching web server
-#
-#	"nonce_garbage_interval" timeinterval
-#	Specifies the interval that nonces that have been issued
-#	to client_agent's are checked for validity.
-#
-#	"nonce_max_duration" timeinterval
-#	Specifies the maximum length of time a given nonce will be
-#	valid for.
-#
-#	"nonce_max_count" number
-#	Specifies the maximum number of times a given nonce can be
-#	used.
-#
-#	"nonce_strictness" on|off
-#	Determines if squid requires strict increment-by-1 behavior
-#	for nonce counts, or just incrementing (off - for use when
-#	user agents generate nonce counts that occasionally miss 1
-#	(ie, 1,2,4,6)). Default off.
-#
-#	"check_nonce_count" on|off
-#	This directive if set to off can disable the nonce count check
-#	completely to work around buggy digest qop implementations in
-#	certain mainstream browser versions. Default on to check the
-#	nonce count to protect from authentication replay attacks.
-#
-#	"post_workaround" on|off
-#	This is a workaround to certain buggy browsers who sends
-#	an incorrect request digest in POST requests when reusing
-#	the same nonce as acquired earlier on a GET request.
-#
-#	=== NTLM scheme options follow ===
-#
-#	"program" cmdline
-#	Specify the command for the external NTLM authenticator.
-#	Such a program reads exchanged NTLMSSP packets with
-#	the browser via Squid until authentication is completed.
-#	If you use an NTLM authenticator, make sure you have 1 acl
-#	of type proxy_auth.  By default, the NTLM authenticator program
-#	is not used.
-#
-#	auth_param ntlm program /usr/bin/ntlm_auth
-#
-#	"children" numberofchildren [startup=N] [idle=N]
-#	The maximum number of authenticator processes to spawn (default 5).
-#	If you start too few Squid will have to wait for them to
-#	process a backlog of credential verifications, slowing it
-#	down. When credential verifications are done via a (slow)
-#	network you are likely to need lots of authenticator
-#	processes.
-#
-#	The startup= and idle= options permit some skew in the exact amount
-#	run. A minimum of startup=N will begin during startup and reconfigure.
-#	Squid will start more in groups of up to idle=N in an attempt to meet
-#	traffic needs and to keep idle=N free above those traffic needs up to
-#	the maximum.
-#
-#	auth_param ntlm children 20 startup=0 idle=1
-#
-#	"keep_alive" on|off
-#	If you experience problems with PUT/POST requests when using the
-#	Negotiate authentication scheme then you can try setting this to
-#	off. This will cause Squid to forcibly close the connection on
-#	the initial requests where the browser asks which schemes are
-#	supported by the proxy.
-#
-#	auth_param ntlm keep_alive on
-#
-#	=== Options for configuring the NEGOTIATE auth-scheme follow ===
-#
-#	"program" cmdline
-#	Specify the command for the external Negotiate authenticator.
-#	This protocol is used in Microsoft Active-Directory enabled setups with
-#	the Microsoft Internet Explorer or Mozilla Firefox browsers.
-#	Its main purpose is to exchange credentials with the Squid proxy
-#	using the Kerberos mechanisms.
-#	If you use a Negotiate authenticator, make sure you have at least
-#	one acl of type proxy_auth active. By default, the negotiate
-#	authenticator program is not used.
-#	The only supported program for this role is the ntlm_auth
-#	program distributed as part of Samba, version 4 or later.
-#
-#	auth_param negotiate program /usr/bin/ntlm_auth --helper-protocol=gss-spnego
-#
-#	"children" numberofchildren [startup=N] [idle=N]
-#	The maximum number of authenticator processes to spawn (default 5).
-#	If you start too few Squid will have to wait for them to
-#	process a backlog of credential verifications, slowing it
-#	down. When credential verifications are done via a (slow)
-#	network you are likely to need lots of authenticator
-#	processes.
-#
-#	The startup= and idle= options permit some skew in the exact amount
-#	run. A minimum of startup=N will begin during startup and reconfigure.
-#	Squid will start more in groups of up to idle=N in an attempt to meet
-#	traffic needs and to keep idle=N free above those traffic needs up to
-#	the maximum.
-#
-#	auth_param negotiate children 20 startup=0 idle=1
-#
-#	"keep_alive" on|off
-#	If you experience problems with PUT/POST requests when using the
-#	Negotiate authentication scheme then you can try setting this to
-#	off. This will cause Squid to forcibly close the connection on
-#	the initial requests where the browser asks which schemes are
-#	supported by the proxy.
-#
-#	auth_param negotiate keep_alive on
-#
-#	
-#	Examples:
-#
-##Recommended minimum configuration per scheme:
-##auth_param negotiate program <uncomment and complete this line to activate>
-##auth_param negotiate children 20 startup=0 idle=1
-##auth_param negotiate keep_alive on
-##
-##auth_param ntlm program <uncomment and complete this line to activate>
-##auth_param ntlm children 20 startup=0 idle=1
-##auth_param ntlm keep_alive on
-##
-##auth_param digest program <uncomment and complete this line>
-##auth_param digest children 20 startup=0 idle=1
-##auth_param digest realm Squid proxy-caching web server
-##auth_param digest nonce_garbage_interval 5 minutes
-##auth_param digest nonce_max_duration 30 minutes
-##auth_param digest nonce_max_count 50
-##
-##auth_param basic program <uncomment and complete this line>
-##auth_param basic children 5 startup=5 idle=1
-##auth_param basic realm Squid proxy-caching web server
-##auth_param basic credentialsttl 2 hours
-#Default:
-# none
-
-#  TAG: authenticate_cache_garbage_interval
-#	The time period between garbage collection across the username cache.
-#	This is a trade-off between memory utilization (long intervals - say
-#	2 days) and CPU (short intervals - say 1 minute). Only change if you
-#	have good reason to.
-#Default:
-# authenticate_cache_garbage_interval 1 hour
-
-#  TAG: authenticate_ttl
-#	The time a user & their credentials stay in the logged in
-#	user cache since their last request. When the garbage
-#	interval passes, all user credentials that have passed their
-#	TTL are removed from memory.
-#Default:
-# authenticate_ttl 1 hour
-
-#  TAG: authenticate_ip_ttl
-#	If you use proxy authentication and the 'max_user_ip' ACL,
-#	this directive controls how long Squid remembers the IP
-#	addresses associated with each user.  Use a small value
-#	(e.g., 60 seconds) if your users might change addresses
-#	quickly, as is the case with dialup.   You might be safe
-#	using a larger value (e.g., 2 hours) in a corporate LAN
-#	environment with relatively static address assignments.
-#Default:
-# authenticate_ip_ttl 1 second
-
-# ACCESS CONTROLS
-# -----------------------------------------------------------------------------
-
-#  TAG: external_acl_type
-#	This option defines external acl classes using a helper program
-#	to look up the status
-#
-#	  external_acl_type name [options] FORMAT.. /path/to/helper [helper arguments..]
-#
-#	Options:
-#
-#	  ttl=n		TTL in seconds for cached results (defaults to 3600
-#	  		for 1 hour)
-#
-#	  negative_ttl=n
-#	  		TTL for cached negative lookups (default same
-#	  		as ttl)
-#
-#	  grace=n	Percentage remaining of TTL where a refresh of a
-#			cached entry should be initiated without needing to
-#			wait for a new reply. (default is for no grace period)
-#
-#	  cache=n	Limit the result cache size, default is 262144.
-#			The expanded FORMAT value is used as the cache key, so
-#			if the details in FORMAT are highly variable a larger
-#			cache may be needed to produce reduction in helper load.
-#
-#	  children-max=n
-#			Maximum number of acl helper processes spawned to service
-#			external acl lookups of this type. (default 20)
-#
-#	  children-startup=n
-#			Minimum number of acl helper processes to spawn during
-#			startup and reconfigure to service external acl lookups
-#			of this type. (default 0)
-#
-#	  children-idle=n
-#			Number of acl helper processes to keep ahead of traffic
-#			loads. Squid will spawn this many at once whenever load
-#			rises above the capabilities of existing processes.
-#			Up to the value of children-max. (default 1)
-#
-#	  concurrency=n	concurrency level per process. Only used with helpers
-#			capable of processing more than one query at a time.
-#
-#	  protocol=2.5	Compatibility mode for Squid-2.5 external acl helpers.
-#
-#	  ipv4 / ipv6	IP protocol used to communicate with this helper.
-#			The default is to auto-detect IPv6 and use it when available.
-#
-#
-#	FORMAT specifications
-#
-#	  %LOGIN	Authenticated user login name
-#	  %EXT_USER	Username from previous external acl
-#	  %EXT_LOG	Log details from previous external acl
-#	  %EXT_TAG	Tag from previous external acl
-#	  %IDENT	Ident user name
-#	  %SRC		Client IP
-#	  %SRCPORT	Client source port
-#	  %URI		Requested URI
-#	  %DST		Requested host
-#	  %PROTO	Requested protocol
-#	  %PORT		Requested port
-#	  %PATH		Requested URL path
-#	  %METHOD	Request method
-#	  %MYADDR	Squid interface address
-#	  %MYPORT	Squid http_port number
-#	  %PATH		Requested URL-path (including query-string if any)
-#	  %USER_CERT	SSL User certificate in PEM format
-#	  %USER_CERTCHAIN SSL User certificate chain in PEM format
-#	  %USER_CERT_xx	SSL User certificate subject attribute xx
-#	  %USER_CA_CERT_xx SSL User certificate issuer attribute xx
-#
-#	  %>{Header}	HTTP request header "Header"
-#	  %>{Hdr:member}
-#	  		HTTP request header "Hdr" list member "member"
-#	  %>{Hdr:;member}
-#	  		HTTP request header list member using ; as
-#	  		list separator. ; can be any non-alphanumeric
-#			character.
-#
-#	  %<{Header}	HTTP reply header "Header"
-#	  %<{Hdr:member}
-#	  		HTTP reply header "Hdr" list member "member"
-#	  %<{Hdr:;member}
-#	  		HTTP reply header list member using ; as
-#	  		list separator. ; can be any non-alphanumeric
-#			character.
-#
-#	  %ACL		The name of the ACL being tested.
-#	  %DATA		The ACL arguments. If not used then any arguments
-#			is automatically added at the end of the line
-#			sent to the helper.
-#			NOTE: this will encode the arguments as one token,
-#			whereas the default will pass each separately.
-#
-#	  %%		The percent sign. Useful for helpers which need
-#			an unchanging input format.
-#
-#
-#	General request syntax:
-#
-#	  [channel-ID] FORMAT-values [acl-values ...]
-#
-#
-#	FORMAT-values consists of transaction details expanded with
-#	whitespace separation per the config file FORMAT specification
-#	using the FORMAT macros listed above.
-#
-#	acl-values consists of any string specified in the referencing
-#	config 'acl ... external' line. see the "acl external" directive.
-#
-#	Request values sent to the helper are URL escaped to protect
-#	each value in requests against whitespaces.
-#
-#	If using protocol=2.5 then the request sent to the helper is not
-#	URL escaped to protect against whitespace.
-#
-#	NOTE: protocol=3.0 is deprecated as no longer necessary.
-#
-#	When using the concurrency= option the protocol is changed by
-#	introducing a query channel tag in front of the request/response.
-#	The query channel tag is a number between 0 and concurrency-1.
-#	This value must be echoed back unchanged to Squid as the first part
-#	of the response relating to its request.
-#
-#
-#	The helper receives lines expanded per the above format specification
-#	and for each input line returns 1 line starting with OK/ERR/BH result
-#	code and optionally followed by additional keywords with more details.
-#
-#
-#	General result syntax:
-#
-#	  [channel-ID] result keyword=value ...
-#
-#	Result consists of one of the codes:
-#
-#	  OK
-#		the ACL test produced a match.
-#
-#	  ERR
-#		the ACL test does not produce a match.
-#
-#	  BH
-#		An internal error occurred in the helper, preventing
-#		a result being identified.
-#
-#	The meaning of 'a match' is determined by your squid.conf
-#	access control configuration. See the Squid wiki for details.
-#
-#	Defined keywords:
-#
-#	  user=		The users name (login)
-#
-#	  password=	The users password (for login= cache_peer option)
-#
-#	  message=	Message describing the reason for this response.
-#			Available as %o in error pages.
-#			Useful on (ERR and BH results).
-#
-#	  tag=		Apply a tag to a request. Only sets a tag once,
-#			does not alter existing tags.
-#
-#	  log=		String to be logged in access.log. Available as
-#	  		%ea in logformat specifications.
-#
-#	Any keywords may be sent on any response whether OK, ERR or BH.
-#
-#	All response keyword values need to be a single token with URL
-#	escaping, or enclosed in double quotes (") and escaped using \ on
-#	any double quotes or \ characters within the value. The wrapping
-#	double quotes are removed before the value is interpreted by Squid.
-#	\r and \n are also replace by CR and LF.
-#
-#	Some example key values:
-#
-#		user=John%20Smith
-#		user="John Smith"
-#		user="J. \"Bob\" Smith"
-#Default:
-# none
-
-#  TAG: acl
-#	Defining an Access List
-#
-#	Every access list definition must begin with an aclname and acltype, 
-#	followed by either type-specific arguments or a quoted filename that
-#	they are read from.
-#
-#	   acl aclname acltype argument ...
-#	   acl aclname acltype "file" ...
-#
-#	When using "file", the file should contain one item per line.
-#
-#	Some acl types supports options which changes their default behaviour.
-#	The available options are:
-#
-#	-i,+i	By default, regular expressions are CASE-SENSITIVE. To make them
-#		case-insensitive, use the -i option. To return case-sensitive
-#		use the +i option between patterns, or make a new ACL line
-#		without -i.	
-#
-#	-n	Disable lookups and address type conversions.  If lookup or
-#		conversion is required because the parameter type (IP or
-#		domain name) does not match the message address type (domain
-#		name or IP), then the ACL would immediately declare a mismatch
-#		without any warnings or lookups.
-#
-#	--	Used to stop processing all options, in the case the first acl
-#		value has '-' character as first character (for example the '-'
-#		is a valid domain name)
-#
-#	Some acl types require suspending the current request in order
-#	to access some external data source.
-#	Those which do are marked with the tag [slow], those which
-#	don't are marked as [fast].
-#	See http://wiki.squid-cache.org/SquidFaq/SquidAcl
-#	for further information
-#
-#	***** ACL TYPES AVAILABLE *****
-#
-#	acl aclname src ip-address/mask ...	# clients IP address [fast]
-#	acl aclname src addr1-addr2/mask ...	# range of addresses [fast]
-#	acl aclname dst [-n] ip-address/mask ...	# URL host's IP address [slow]
-#	acl aclname localip ip-address/mask ... # IP address the client connected to [fast]
-#
-#	acl aclname arp      mac-address ... (xx:xx:xx:xx:xx:xx notation)
-#	  # The arp ACL requires the special configure option --enable-arp-acl.
-#	  # Furthermore, the ARP ACL code is not portable to all operating systems.
-#	  # It works on Linux, Solaris, Windows, FreeBSD, and some
-#	  # other *BSD variants.
-#	  # [fast]
-#	  #
-#	  # NOTE: Squid can only determine the MAC address for clients that are on
-#	  # the same subnet. If the client is on a different subnet,
-#	  # then Squid cannot find out its MAC address.
-#
-#	acl aclname srcdomain   .foo.com ...
-#	  # reverse lookup, from client IP [slow]
-#	acl aclname dstdomain [-n] .foo.com ...
-#	  # Destination server from URL [fast]
-#	acl aclname srcdom_regex [-i] \.foo\.com ...
-#	  # regex matching client name [slow]
-#	acl aclname dstdom_regex [-n] [-i] \.foo\.com ...
-#	  # regex matching server [fast]
-#	  #
-#	  # For dstdomain and dstdom_regex a reverse lookup is tried if a IP
-#	  # based URL is used and no match is found. The name "none" is used
-#	  # if the reverse lookup fails.
-#
-#	acl aclname src_as number ...
-#	acl aclname dst_as number ...
-#	  # [fast]
-#	  # Except for access control, AS numbers can be used for
-#	  # routing of requests to specific caches. Here's an
-#	  # example for routing all requests for AS#1241 and only
-#	  # those to mycache.mydomain.net:
-#	  # acl asexample dst_as 1241
-#	  # cache_peer_access mycache.mydomain.net allow asexample
-#	  # cache_peer_access mycache_mydomain.net deny all
-#
-#	acl aclname peername myPeer ...
-#	  # [fast]
-#	  # match against a named cache_peer entry
-#	  # set unique name= on cache_peer lines for reliable use.
-#
-#	acl aclname time [day-abbrevs] [h1:m1-h2:m2]
-#	  # [fast]
-#	  #  day-abbrevs:
-#	  #	S - Sunday
-#	  #	M - Monday
-#	  #	T - Tuesday
-#	  #	W - Wednesday
-#	  #	H - Thursday
-#	  #	F - Friday
-#	  #	A - Saturday
-#	  #  h1:m1 must be less than h2:m2
-#
-#	acl aclname url_regex [-i] ^http:// ...
-#	  # regex matching on whole URL [fast]
-#	acl aclname urllogin [-i] [^a-zA-Z0-9] ...
-#	  # regex matching on URL login field
-#	acl aclname urlpath_regex [-i] \.gif$ ...
-#	  # regex matching on URL path [fast]
-#
-#	acl aclname port 80 70 21 0-1024...   # destination TCP port [fast]
-#	                                      # ranges are alloed
-#	acl aclname localport 3128 ...	      # TCP port the client connected to [fast]
-#	                                      # NP: for interception mode this is usually '80'
-#
-#	acl aclname myportname 3128 ...       # http(s)_port name [fast]
-#
-#	acl aclname proto HTTP FTP ...        # request protocol [fast]
-# 
-#	acl aclname method GET POST ...       # HTTP request method [fast]
-#
-#	acl aclname http_status 200 301 500- 400-403 ... 
-#	  # status code in reply [fast]
-#
-#	acl aclname browser [-i] regexp ...
-#	  # pattern match on User-Agent header (see also req_header below) [fast]
-#
-#	acl aclname referer_regex [-i] regexp ...
-#	  # pattern match on Referer header [fast]
-#	  # Referer is highly unreliable, so use with care
-#
-#	acl aclname ident username ...
-#	acl aclname ident_regex [-i] pattern ...
-#	  # string match on ident output [slow]
-#	  # use REQUIRED to accept any non-null ident.
-#
-#	acl aclname proxy_auth [-i] username ...
-#	acl aclname proxy_auth_regex [-i] pattern ...
-#	  # perform http authentication challenge to the client and match against
-#	  # supplied credentials [slow]
-#	  #
-#	  # takes a list of allowed usernames.
-#	  # use REQUIRED to accept any valid username.
-#	  #
-#	  # Will use proxy authentication in forward-proxy scenarios, and plain
-#	  # http authenticaiton in reverse-proxy scenarios
-#	  #
-#	  # NOTE: when a Proxy-Authentication header is sent but it is not
-#	  # needed during ACL checking the username is NOT logged
-#	  # in access.log.
-#	  #
-#	  # NOTE: proxy_auth requires a EXTERNAL authentication program
-#	  # to check username/password combinations (see
-#	  # auth_param directive).
-#	  #
-#	  # NOTE: proxy_auth can't be used in a transparent/intercepting proxy
-#	  # as the browser needs to be configured for using a proxy in order
-#	  # to respond to proxy authentication.
-#
-#	acl aclname snmp_community string ...
-#	  # A community string to limit access to your SNMP Agent [fast]
-#	  # Example:
-#	  #
-#	  #	acl snmppublic snmp_community public
-#
-#	acl aclname maxconn number
-#	  # This will be matched when the client's IP address has
-#	  # more than <number> TCP connections established. [fast]
-#	  # NOTE: This only measures direct TCP links so X-Forwarded-For
-#	  # indirect clients are not counted.
-#
-#	acl aclname max_user_ip [-s] number
-#	  # This will be matched when the user attempts to log in from more
-#	  # than <number> different ip addresses. The authenticate_ip_ttl
-#	  # parameter controls the timeout on the ip entries. [fast]
-#	  # If -s is specified the limit is strict, denying browsing
-#	  # from any further IP addresses until the ttl has expired. Without
-#	  # -s Squid will just annoy the user by "randomly" denying requests.
-#	  # (the counter is reset each time the limit is reached and a
-#	  # request is denied)
-#	  # NOTE: in acceleration mode or where there is mesh of child proxies,
-#	  # clients may appear to come from multiple addresses if they are
-#	  # going through proxy farms, so a limit of 1 may cause user problems.
-#
-#	acl aclname random probability
-#	  # Pseudo-randomly match requests. Based on the probability given.
-#	  # Probability may be written as a decimal (0.333), fraction (1/3)
-#	  # or ratio of matches:non-matches (3:5).
-#
-#	acl aclname req_mime_type [-i] mime-type ...
-#	  # regex match against the mime type of the request generated
-#	  # by the client. Can be used to detect file upload or some
-#	  # types HTTP tunneling requests [fast]
-#	  # NOTE: This does NOT match the reply. You cannot use this
-#	  # to match the returned file type.
-#
-#	acl aclname req_header header-name [-i] any\.regex\.here
-#	  # regex match against any of the known request headers.  May be
-#	  # thought of as a superset of "browser", "referer" and "mime-type"
-#	  # ACL [fast]
-#
-#	acl aclname rep_mime_type [-i] mime-type ...
-#	  # regex match against the mime type of the reply received by
-#	  # squid. Can be used to detect file download or some
-#	  # types HTTP tunneling requests. [fast]
-#	  # NOTE: This has no effect in http_access rules. It only has
-#	  # effect in rules that affect the reply data stream such as
-#	  # http_reply_access.
-#
-#	acl aclname rep_header header-name [-i] any\.regex\.here
-#	  # regex match against any of the known reply headers. May be
-#	  # thought of as a superset of "browser", "referer" and "mime-type"
-#	  # ACLs [fast]
-#
-#	acl aclname external class_name [arguments...]
-#	  # external ACL lookup via a helper class defined by the
-#	  # external_acl_type directive [slow]
-#
-#	acl aclname user_cert attribute values...
-#	  # match against attributes in a user SSL certificate
-#	  # attribute is one of DN/C/O/CN/L/ST [fast]
-#
-#	acl aclname ca_cert attribute values...
-#	  # match against attributes a users issuing CA SSL certificate
-#	  # attribute is one of DN/C/O/CN/L/ST [fast]
-#
-#	acl aclname ext_user username ...
-#	acl aclname ext_user_regex [-i] pattern ...
-#	  # string match on username returned by external acl helper [slow]
-#	  # use REQUIRED to accept any non-null user name.
-#
-#	acl aclname tag tagvalue ...
-#	  # string match on tag returned by external acl helper [slow]
-#
-#	acl aclname hier_code codename ...
-#	  # string match against squid hierarchy code(s); [fast]
-#	  #  e.g., DIRECT, PARENT_HIT, NONE, etc.
-#	  #
-#	  # NOTE: This has no effect in http_access rules. It only has
-#	  # effect in rules that affect the reply data stream such as
-#	  # http_reply_access.
-#
-#	acl aclname note name [value ...]
-#	  # match transaction annotation [fast]
-#	  # Without values, matches any annotation with a given name.
-#	  # With value(s), matches any annotation with a given name that
-#	  # also has one of the given values.
-#	  # Names and values are compared using a string equality test.
-#	  # Annotation sources include note and adaptation_meta directives
-#	  # as well as helper and eCAP responses.
-#
-#	acl aclname any-of acl1 acl2 ...
-#	  # match any one of the acls [fast or slow]
-#	  # The first matching ACL stops further ACL evaluation.
-#	  #
-#	  # ACLs from multiple any-of lines with the same name are ORed.
-#	  # For example, A = (a1 or a2) or (a3 or a4) can be written as
-#	  #   acl A any-of a1 a2
-#	  #   acl A any-of a3 a4
-#	  #
-#	  # This group ACL is fast if all evaluated ACLs in the group are fast
-#	  # and slow otherwise.
-#
-#	acl aclname all-of acl1 acl2 ... 
-#	  # match all of the acls [fast or slow]
-#	  # The first mismatching ACL stops further ACL evaluation.
-#	  #
-#	  # ACLs from multiple all-of lines with the same name are ORed.
-#	  # For example, B = (b1 and b2) or (b3 and b4) can be written as
-#	  #   acl B all-of b1 b2
-#	  #   acl B all-of b3 b4
-#	  #
-#	  # This group ACL is fast if all evaluated ACLs in the group are fast
-#	  # and slow otherwise.
-#
-#	Examples:
-#		acl macaddress arp 09:00:2b:23:45:67
-#		acl myexample dst_as 1241
-#		acl password proxy_auth REQUIRED
-#		acl fileupload req_mime_type -i ^multipart/form-data$
-#		acl javascript rep_mime_type -i ^application/x-javascript$
-#
-#Default:
-# ACLs all, manager, localhost, and to_localhost are predefined.
-#
-#
-# Recommended minimum configuration:
-#
-
-# Example rule allowing access from your local networks.
-# Adapt to list your (internal) IP networks from where browsing
-# should be allowed
-acl localnet src 10.0.0.0/8	# RFC1918 possible internal network
-acl localnet src 172.16.0.0/12	# RFC1918 possible internal network
-acl localnet src 192.168.0.0/16	# RFC1918 possible internal network
-acl localnet src fc00::/7       # RFC 4193 local private network range
-acl localnet src fe80::/10      # RFC 4291 link-local (directly plugged) machines
-
-acl SSL_ports port 443
-acl Safe_ports port 80		# http
-acl Safe_ports port 21		# ftp
-acl Safe_ports port 443		# https
-acl Safe_ports port 70		# gopher
-acl Safe_ports port 210		# wais
-acl Safe_ports port 1025-65535	# unregistered ports
-acl Safe_ports port 280		# http-mgmt
-acl Safe_ports port 488		# gss-http
-acl Safe_ports port 591		# filemaker
-acl Safe_ports port 777		# multiling http
-acl CONNECT method CONNECT
-
-#  TAG: follow_x_forwarded_for
-#	Allowing or Denying the X-Forwarded-For header to be followed to
-#	find the original source of a request.
-#
-#	Requests may pass through a chain of several other proxies
-#	before reaching us.  The X-Forwarded-For header will contain a
-#	comma-separated list of the IP addresses in the chain, with the
-#	rightmost address being the most recent.
-#
-#	If a request reaches us from a source that is allowed by this
-#	configuration item, then we consult the X-Forwarded-For header
-#	to see where that host received the request from.  If the
-#	X-Forwarded-For header contains multiple addresses, we continue
-#	backtracking until we reach an address for which we are not allowed
-#	to follow the X-Forwarded-For header, or until we reach the first
-#	address in the list. For the purpose of ACL used in the
-#	follow_x_forwarded_for directive the src ACL type always matches
-#	the address we are testing and srcdomain matches its rDNS.
-#
-#	The end result of this process is an IP address that we will
-#	refer to as the indirect client address.  This address may
-#	be treated as the client address for access control, ICAP, delay
-#	pools and logging, depending on the acl_uses_indirect_client,
-#	icap_uses_indirect_client, delay_pool_uses_indirect_client, 
-#	log_uses_indirect_client and tproxy_uses_indirect_client options.
-#
-#	This clause only supports fast acl types.
-#	See http://wiki.squid-cache.org/SquidFaq/SquidAcl for details.
-#
-#	SECURITY CONSIDERATIONS:
-#
-#		Any host for which we follow the X-Forwarded-For header
-#		can place incorrect information in the header, and Squid
-#		will use the incorrect information as if it were the
-#		source address of the request.  This may enable remote
-#		hosts to bypass any access control restrictions that are
-#		based on the client's source addresses.
-#
-#	For example:
-#
-#		acl localhost src 127.0.0.1
-#		acl my_other_proxy srcdomain .proxy.example.com
-#		follow_x_forwarded_for allow localhost
-#		follow_x_forwarded_for allow my_other_proxy
-#Default:
-# X-Forwarded-For header will be ignored.
-
-#  TAG: acl_uses_indirect_client	on|off
-#	Controls whether the indirect client address
-#	(see follow_x_forwarded_for) is used instead of the
-#	direct client address in acl matching.
-#
-#	NOTE: maxconn ACL considers direct TCP links and indirect
-#	      clients will always have zero. So no match.
-#Default:
-# acl_uses_indirect_client on
-
-#  TAG: delay_pool_uses_indirect_client	on|off
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-follow-x-forwarded-for and --enable-delay-pools
-#
-#	Controls whether the indirect client address
-#	(see follow_x_forwarded_for) is used instead of the
-#	direct client address in delay pools.
-#Default:
-# delay_pool_uses_indirect_client on
-
-#  TAG: log_uses_indirect_client	on|off
-#	Controls whether the indirect client address
-#	(see follow_x_forwarded_for) is used instead of the
-#	direct client address in the access log.
-#Default:
-# log_uses_indirect_client on
-
-#  TAG: tproxy_uses_indirect_client	on|off
-#	Controls whether the indirect client address
-#	(see follow_x_forwarded_for) is used instead of the
-#	direct client address when spoofing the outgoing client.
-#
-#	This has no effect on requests arriving in non-tproxy
-#	mode ports.
-#
-#	SECURITY WARNING: Usage of this option is dangerous
-#	and should not be used trivially. Correct configuration
-#	of follow_x_forewarded_for with a limited set of trusted
-#	sources is required to prevent abuse of your proxy.
-#Default:
-# tproxy_uses_indirect_client off
-
-#  TAG: spoof_client_ip
-#	Control client IP address spoofing of TPROXY traffic based on
-#	defined access lists.
-#
-#	spoof_client_ip allow|deny [!]aclname ...
-#
-#	If there are no "spoof_client_ip" lines present, the default
-#	is to "allow" spoofing of any suitable request.
-#
-#	Note that the cache_peer "no-tproxy" option overrides this ACL.
-#
-#	This clause supports fast acl types.
-#	See http://wiki.squid-cache.org/SquidFaq/SquidAcl for details.
-#Default:
-# Allow spoofing on all TPROXY traffic.
-
-#  TAG: http_access
-#	Allowing or Denying access based on defined access lists
-#
-#	Access to the HTTP port:
-#	http_access allow|deny [!]aclname ...
-#
-#	NOTE on default values:
-#
-#	If there are no "access" lines present, the default is to deny
-#	the request.
-#
-#	If none of the "access" lines cause a match, the default is the
-#	opposite of the last line in the list.  If the last line was
-#	deny, the default is allow.  Conversely, if the last line
-#	is allow, the default will be deny.  For these reasons, it is a
-#	good idea to have an "deny all" entry at the end of your access
-#	lists to avoid potential confusion.
-#
-#	This clause supports both fast and slow acl types.
-#	See http://wiki.squid-cache.org/SquidFaq/SquidAcl for details.
-#
-#Default:
-# Deny, unless rules exist in squid.conf.
-#
-
-#
-# Recommended minimum Access Permission configuration:
-#
-# Deny requests to certain unsafe ports
-http_access deny !Safe_ports
-
-# Deny CONNECT to other than secure SSL ports
-http_access deny CONNECT !SSL_ports
-
-# Only allow cachemgr access from localhost
-http_access allow localhost manager
-http_access deny manager
-
-# We strongly recommend the following be uncommented to protect innocent
-# web applications running on the proxy server who think the only
-# one who can access services on "localhost" is a local user
-#http_access deny to_localhost
-
-#
-# INSERT YOUR OWN RULE(S) HERE TO ALLOW ACCESS FROM YOUR CLIENTS
-#
-
-# Example rule allowing access from your local networks.
-# Adapt localnet in the ACL section to list your (internal) IP networks
-# from where browsing should be allowed
-http_access allow localnet
-http_access allow localhost
-
-# And finally deny all other access to this proxy
-http_access deny all
-
-#  TAG: adapted_http_access
-#	Allowing or Denying access based on defined access lists
-#
-#	Essentially identical to http_access, but runs after redirectors
-#	and ICAP/eCAP adaptation. Allowing access control based on their
-#	output.
-#
-#	If not set then only http_access is used.
-#Default:
-# Allow, unless rules exist in squid.conf.
-
-#  TAG: http_reply_access
-#	Allow replies to client requests. This is complementary to http_access.
-#
-#	http_reply_access allow|deny [!] aclname ...
-#
-#	NOTE: if there are no access lines present, the default is to allow
-#	all replies.
-#
-#	If none of the access lines cause a match the opposite of the
-#	last line will apply. Thus it is good practice to end the rules
-#	with an "allow all" or "deny all" entry.
-#
-#	This clause supports both fast and slow acl types.
-#	See http://wiki.squid-cache.org/SquidFaq/SquidAcl for details.
-#Default:
-# Allow, unless rules exist in squid.conf.
-
-#  TAG: icp_access
-#	Allowing or Denying access to the ICP port based on defined
-#	access lists
-#
-#	icp_access  allow|deny [!]aclname ...
-#
-#	NOTE: The default if no icp_access lines are present is to
-#	deny all traffic. This default may cause problems with peers
-#	using ICP.
-#
-#	This clause only supports fast acl types.
-#	See http://wiki.squid-cache.org/SquidFaq/SquidAcl for details.
-#
-## Allow ICP queries from local networks only
-##icp_access allow localnet
-##icp_access deny all
-#Default:
-# Deny, unless rules exist in squid.conf.
-
-#  TAG: htcp_access
-#	Allowing or Denying access to the HTCP port based on defined
-#	access lists
-#
-#	htcp_access  allow|deny [!]aclname ...
-#
-#	See also htcp_clr_access for details on access control for
-#	cache purge (CLR) HTCP messages.
-#
-#	NOTE: The default if no htcp_access lines are present is to
-#	deny all traffic. This default may cause problems with peers
-#	using the htcp option.
-#
-#	This clause only supports fast acl types.
-#	See http://wiki.squid-cache.org/SquidFaq/SquidAcl for details.
-#
-## Allow HTCP queries from local networks only
-##htcp_access allow localnet
-##htcp_access deny all
-#Default:
-# Deny, unless rules exist in squid.conf.
-
-#  TAG: htcp_clr_access
-#	Allowing or Denying access to purge content using HTCP based
-#	on defined access lists.
-#	See htcp_access for details on general HTCP access control.
-#
-#	htcp_clr_access  allow|deny [!]aclname ...
-#
-#	This clause only supports fast acl types.
-#	See http://wiki.squid-cache.org/SquidFaq/SquidAcl for details.
-#
-## Allow HTCP CLR requests from trusted peers
-#acl htcp_clr_peer src 192.0.2.2 2001:DB8::2
-#htcp_clr_access allow htcp_clr_peer
-#htcp_clr_access deny all
-#Default:
-# Deny, unless rules exist in squid.conf.
-
-#  TAG: miss_access
-#	Determins whether network access is permitted when satisfying a request.
-#
-#	For example;
-#	    to force your neighbors to use you as a sibling instead of
-#	    a parent.
-#
-#		acl localclients src 192.0.2.0/24 2001:DB8::a:0/64
-#		miss_access deny  !localclients
-#		miss_access allow all
-#
-#	This means only your local clients are allowed to fetch relayed/MISS
-#	replies from the network and all other clients can only fetch cached
-#	objects (HITs).
-#
-#	The default for this setting allows all clients who passed the
-#	http_access rules to relay via this proxy.
-#
-#	This clause only supports fast acl types.
-#	See http://wiki.squid-cache.org/SquidFaq/SquidAcl for details.
-#Default:
-# Allow, unless rules exist in squid.conf.
-
-#  TAG: ident_lookup_access
-#	A list of ACL elements which, if matched, cause an ident
-#	(RFC 931) lookup to be performed for this request.  For
-#	example, you might choose to always perform ident lookups
-#	for your main multi-user Unix boxes, but not for your Macs
-#	and PCs.  By default, ident lookups are not performed for
-#	any requests.
-#
-#	To enable ident lookups for specific client addresses, you
-#	can follow this example:
-#
-#	acl ident_aware_hosts src 198.168.1.0/24
-#	ident_lookup_access allow ident_aware_hosts
-#	ident_lookup_access deny all
-#
-#	Only src type ACL checks are fully supported.  A srcdomain
-#	ACL might work at times, but it will not always provide
-#	the correct result.
-#
-#	This clause only supports fast acl types.
-#	See http://wiki.squid-cache.org/SquidFaq/SquidAcl for details.
-#Default:
-# Unless rules exist in squid.conf, IDENT is not fetched.
-
-#  TAG: reply_body_max_size	size [acl acl...]
-#	This option specifies the maximum size of a reply body. It can be
-#	used to prevent users from downloading very large files, such as
-#	MP3's and movies. When the reply headers are received, the
-#	reply_body_max_size lines are processed, and the first line where
-#	all (if any) listed ACLs are true is used as the maximum body size
-#	for this reply.
-#
-#	This size is checked twice. First when we get the reply headers,
-#	we check the content-length value.  If the content length value exists
-#	and is larger than the allowed size, the request is denied and the
-#	user receives an error message that says "the request or reply
-#	is too large." If there is no content-length, and the reply
-#	size exceeds this limit, the client's connection is just closed
-#	and they will receive a partial reply.
-#
-#	WARNING: downstream caches probably can not detect a partial reply
-#	if there is no content-length header, so they will cache
-#	partial responses and give them out as hits.  You should NOT
-#	use this option if you have downstream caches.
-#
-#	WARNING: A maximum size smaller than the size of squid's error messages
-#	will cause an infinite loop and crash squid. Ensure that the smallest
-#	non-zero value you use is greater that the maximum header size plus
-#	the size of your largest error page.
-#
-#	If you set this parameter none (the default), there will be
-#	no limit imposed.
-#
-#	Configuration Format is:
-#		reply_body_max_size SIZE UNITS [acl ...]
-#	ie.
-#		reply_body_max_size 10 MB
-#
-#Default:
-# No limit is applied.
-
-# NETWORK OPTIONS
-# -----------------------------------------------------------------------------
-
-#  TAG: http_port
-#	Usage:	port [mode] [options]
-#		hostname:port [mode] [options]
-#		1.2.3.4:port [mode] [options]
-#
-#	The socket addresses where Squid will listen for HTTP client
-#	requests.  You may specify multiple socket addresses.
-#	There are three forms: port alone, hostname with port, and
-#	IP address with port.  If you specify a hostname or IP
-#	address, Squid binds the socket to that specific
-#	address. Most likely, you do not need to bind to a specific
-#	address, so you can use the port number alone.
-#
-#	If you are running Squid in accelerator mode, you
-#	probably want to listen on port 80 also, or instead.
-#
-#	The -a command line option may be used to specify additional
-#	port(s) where Squid listens for proxy request. Such ports will
-#	be plain proxy ports with no options.
-#
-#	You may specify multiple socket addresses on multiple lines.
-#
-#	Modes:
-#
-#	   intercept	Support for IP-Layer interception of
-#			outgoing requests without browser settings.
-#			NP: disables authentication and IPv6 on the port.
-#
-#	   tproxy	Support Linux TPROXY for spoofing outgoing
-#			connections using the client IP address.
-#			NP: disables authentication and maybe IPv6 on the port.
-#
-#	   accel	Accelerator / reverse proxy mode
-#
-#	   ssl-bump	For each CONNECT request allowed by ssl_bump ACLs,
-#			establish secure connection with the client and with
-#			the server, decrypt HTTPS messages as they pass through
-#			Squid, and treat them as unencrypted HTTP messages,
-#			becoming the man-in-the-middle.
-#
-#			The ssl_bump option is required to fully enable
-#			bumping of CONNECT requests.
-#
-#	Omitting the mode flag causes default forward proxy mode to be used.
-#
-#
-#	Accelerator Mode Options:
-#
-#	   defaultsite=domainname
-#			What to use for the Host: header if it is not present
-#			in a request. Determines what site (not origin server)
-#			accelerators should consider the default.
-#
-#	   no-vhost	Disable using HTTP/1.1 Host header for virtual domain support.
-#
-#	   protocol=	Protocol to reconstruct accelerated requests with.
-#			Defaults to http for http_port and https for
-#			https_port
-#
-#	   vport	Virtual host port support. Using the http_port number
-#			instead of the port passed on Host: headers.
-#
-#	   vport=NN	Virtual host port support. Using the specified port
-#			number instead of the port passed on Host: headers.
-#
-#	   act-as-origin
-#			Act as if this Squid is the origin server.
-#			This currently means generate new Date: and Expires:
-#			headers on HIT instead of adding Age:.
-#
-#	   ignore-cc	Ignore request Cache-Control headers.
-#
-#			WARNING: This option violates HTTP specifications if
-#			used in non-accelerator setups.
-#
-#	   allow-direct	Allow direct forwarding in accelerator mode. Normally
-#			accelerated requests are denied direct forwarding as if
-#			never_direct was used.
-#
-#			WARNING: this option opens accelerator mode to security
-#			vulnerabilities usually only affecting in interception
-#			mode. Make sure to protect forwarding with suitable
-#			http_access rules when using this.
-#
-#
-#	SSL Bump Mode Options:
-#	    In addition to these options ssl-bump requires TLS/SSL options.
-#
-#	   generate-host-certificates[=<on|off>]
-#			Dynamically create SSL server certificates for the
-#			destination hosts of bumped CONNECT requests.When 
-#			enabled, the cert and key options are used to sign
-#			generated certificates. Otherwise generated
-#			certificate will be selfsigned.
-#			If there is a CA certificate lifetime of the generated 
-#			certificate equals lifetime of the CA certificate. If
-#			generated certificate is selfsigned lifetime is three 
-#			years.
-#			This option is enabled by default when ssl-bump is used.
-#			See the ssl-bump option above for more information.
-#			
-#	   dynamic_cert_mem_cache_size=SIZE
-#			Approximate total RAM size spent on cached generated
-#			certificates. If set to zero, caching is disabled. The
-#			default value is 4MB.
-#
-#	TLS / SSL Options:
-#
-#	   cert=	Path to SSL certificate (PEM format).
-#
-#	   key=		Path to SSL private key file (PEM format)
-#			if not specified, the certificate file is
-#			assumed to be a combined certificate and
-#			key file.
-#
-#	   version=	The version of SSL/TLS supported
-#			    1	automatic (default)
-#			    2	SSLv2 only
-#			    3	SSLv3 only
-#			    4	TLSv1.0 only
-#			    5	TLSv1.1 only
-#			    6	TLSv1.2 only
-#
-#	   cipher=	Colon separated list of supported ciphers.
-#			NOTE: some ciphers such as EDH ciphers depend on
-#			      additional settings. If those settings are
-#			      omitted the ciphers may be silently ignored
-#			      by the OpenSSL library.
-#
-#	   options=	Various SSL implementation options. The most important
-#			being:
-#			    NO_SSLv2    Disallow the use of SSLv2
-#			    NO_SSLv3    Disallow the use of SSLv3
-#			    NO_TLSv1    Disallow the use of TLSv1.0
-#			    NO_TLSv1_1  Disallow the use of TLSv1.1
-#			    NO_TLSv1_2  Disallow the use of TLSv1.2
-#			    SINGLE_DH_USE Always create a new key when using
-#				      temporary/ephemeral DH key exchanges
-#			    ALL       Enable various bug workarounds
-#				      suggested as "harmless" by OpenSSL
-#				      Be warned that this reduces SSL/TLS
-#				      strength to some attacks.
-#			See OpenSSL SSL_CTX_set_options documentation for a
-#			complete list of options.
-#
-#	   clientca=	File containing the list of CAs to use when
-#			requesting a client certificate.
-#
-#	   cafile=	File containing additional CA certificates to
-#			use when verifying client certificates. If unset
-#			clientca will be used.
-#
-#	   capath=	Directory containing additional CA certificates
-#			and CRL lists to use when verifying client certificates.
-#
-#	   crlfile=	File of additional CRL lists to use when verifying
-#			the client certificate, in addition to CRLs stored in
-#			the capath. Implies VERIFY_CRL flag below.
-#
-#	   dhparams=	File containing DH parameters for temporary/ephemeral
-#			DH key exchanges. See OpenSSL documentation for details
-#			on how to create this file.
-#			WARNING: EDH ciphers will be silently disabled if this
-#				 option is not set.
-#
-#	   sslflags=	Various flags modifying the use of SSL:
-#			    DELAYED_AUTH
-#				Don't request client certificates
-#				immediately, but wait until acl processing
-#				requires a certificate (not yet implemented).
-#			    NO_DEFAULT_CA
-#				Don't use the default CA lists built in
-#				to OpenSSL.
-#			    NO_SESSION_REUSE
-#				Don't allow for session reuse. Each connection
-#				will result in a new SSL session.
-#			    VERIFY_CRL
-#				Verify CRL lists when accepting client
-#				certificates.
-#			    VERIFY_CRL_ALL
-#				Verify CRL lists for all certificates in the
-#				client certificate chain.
-#
-#	   sslcontext=	SSL session ID context identifier.
-#
-#	Other Options:
-#
-#	   connection-auth[=on|off]
-#	                use connection-auth=off to tell Squid to prevent 
-#	                forwarding Microsoft connection oriented authentication
-#			(NTLM, Negotiate and Kerberos)
-#
-#	   disable-pmtu-discovery=
-#			Control Path-MTU discovery usage:
-#			    off		lets OS decide on what to do (default).
-#			    transparent	disable PMTU discovery when transparent
-#					support is enabled.
-#			    always	disable always PMTU discovery.
-#
-#			In many setups of transparently intercepting proxies
-#			Path-MTU discovery can not work on traffic towards the
-#			clients. This is the case when the intercepting device
-#			does not fully track connections and fails to forward
-#			ICMP must fragment messages to the cache server. If you
-#			have such setup and experience that certain clients
-#			sporadically hang or never complete requests set
-#			disable-pmtu-discovery option to 'transparent'.
-#
-#	   name=	Specifies a internal name for the port. Defaults to
-#			the port specification (port or addr:port)
-#
-#	   tcpkeepalive[=idle,interval,timeout]
-#			Enable TCP keepalive probes of idle connections.
-#			In seconds; idle is the initial time before TCP starts
-#			probing the connection, interval how often to probe, and
-#			timeout the time before giving up.
-#
-#	If you run Squid on a dual-homed machine with an internal
-#	and an external interface we recommend you to specify the
-#	internal address:port in http_port. This way Squid will only be
-#	visible on the internal address.
-#
-#
-
-# Squid normally listens to port 3128
-http_port 3128
-
-#  TAG: https_port
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-ssl
-#
-#	Usage:  [ip:]port cert=certificate.pem [key=key.pem] [mode] [options...]
-#
-#	The socket address where Squid will listen for client requests made
-#	over TLS or SSL connections. Commonly referred to as HTTPS.
-#
-#	This is most useful for situations where you are running squid in
-#	accelerator mode and you want to do the SSL work at the accelerator level.
-#
-#	You may specify multiple socket addresses on multiple lines,
-#	each with their own SSL certificate and/or options.
-#
-#	Modes:
-#
-#	   accel	Accelerator / reverse proxy mode
-#
-#	   intercept	Support for IP-Layer interception of
-#			outgoing requests without browser settings.
-#			NP: disables authentication and IPv6 on the port.
-#
-#	   tproxy	Support Linux TPROXY for spoofing outgoing
-#			connections using the client IP address.
-#			NP: disables authentication and maybe IPv6 on the port.
-#
-#	   ssl-bump	For each intercepted connection allowed by ssl_bump
-#			ACLs, establish a secure connection with the client and with
-#			the server, decrypt HTTPS messages as they pass through
-#			Squid, and treat them as unencrypted HTTP messages,
-#			becoming the man-in-the-middle.
-#
-#			An "ssl_bump server-first" match is required to
-#			fully enable bumping of intercepted SSL	connections.
-#
-#			Requires tproxy or intercept.
-#
-#	Omitting the mode flag causes default forward proxy mode to be used.
-#
-#
-#	See http_port for a list of generic options
-#
-#
-#	SSL Options:
-#
-#	   cert=	Path to SSL certificate (PEM format).
-#
-#	   key=		Path to SSL private key file (PEM format)
-#			if not specified, the certificate file is
-#			assumed to be a combined certificate and
-#			key file.
-#
-#	   version=	The version of SSL/TLS supported
-#			    1	automatic (default)
-#			    2	SSLv2 only
-#			    3	SSLv3 only
-#			    4	TLSv1 only
-#
-#	   cipher=	Colon separated list of supported ciphers.
-#
-#	   options=	Various SSL engine options. The most important
-#			being:
-#			    NO_SSLv2  Disallow the use of SSLv2
-#			    NO_SSLv3  Disallow the use of SSLv3
-#			    NO_TLSv1  Disallow the use of TLSv1
-#			    SINGLE_DH_USE Always create a new key when using
-#				      temporary/ephemeral DH key exchanges
-#			See src/ssl_support.c or OpenSSL SSL_CTX_set_options
-#			documentation for a complete list of options.
-#
-#	   clientca=	File containing the list of CAs to use when
-#			requesting a client certificate.
-#
-#	   cafile=	File containing additional CA certificates to
-#			use when verifying client certificates. If unset
-#			clientca will be used.
-#
-#	   capath=	Directory containing additional CA certificates
-#			and CRL lists to use when verifying client certificates.
-#
-#	   crlfile=	File of additional CRL lists to use when verifying
-#			the client certificate, in addition to CRLs stored in
-#			the capath. Implies VERIFY_CRL flag below.
-#
-#	   dhparams=	File containing DH parameters for temporary/ephemeral
-#			DH key exchanges.
-#
-#	   sslflags=	Various flags modifying the use of SSL:
-#			    DELAYED_AUTH
-#				Don't request client certificates
-#				immediately, but wait until acl processing
-#				requires a certificate (not yet implemented).
-#			    NO_DEFAULT_CA
-#				Don't use the default CA lists built in
-#				to OpenSSL.
-#			    NO_SESSION_REUSE
-#				Don't allow for session reuse. Each connection
-#				will result in a new SSL session.
-#			    VERIFY_CRL
-#				Verify CRL lists when accepting client
-#				certificates.
-#			    VERIFY_CRL_ALL
-#				Verify CRL lists for all certificates in the
-#				client certificate chain.
-#
-#	   sslcontext=	SSL session ID context identifier.
-#
-#	   generate-host-certificates[=<on|off>]
-#			Dynamically create SSL server certificates for the
-#			destination hosts of bumped SSL requests.When
-#			enabled, the cert and key options are used to sign
-#			generated certificates. Otherwise generated
-#			certificate will be selfsigned.
-#			If there is CA certificate life time of generated
-#			certificate equals lifetime of CA certificate. If
-#			generated certificate is selfsigned lifetime is three
-#			years.
-#			This option is enabled by default when SslBump is used.
-#			See the sslBump option above for more information.
-#
-#	   dynamic_cert_mem_cache_size=SIZE
-#			Approximate total RAM size spent on cached generated
-#			certificates. If set to zero, caching is disabled. The
-#			default value is 4MB.
-#
-#	See http_port for a list of available options.
-#Default:
-# none
-
-#  TAG: tcp_outgoing_tos
-#	Allows you to select a TOS/Diffserv value for packets outgoing
-#	on the server side, based on an ACL.
-#
-#	tcp_outgoing_tos ds-field [!]aclname ...
-#
-#	Example where normal_service_net uses the TOS value 0x00
-#	and good_service_net uses 0x20
-#
-#	acl normal_service_net src 10.0.0.0/24
-#	acl good_service_net src 10.0.1.0/24
-#	tcp_outgoing_tos 0x00 normal_service_net
-#	tcp_outgoing_tos 0x20 good_service_net
-#
-#	TOS/DSCP values really only have local significance - so you should
-#	know what you're specifying. For more information, see RFC2474,
-#	RFC2475, and RFC3260.
-#
-#	The TOS/DSCP byte must be exactly that - a octet value  0 - 255, or
-#	"default" to use whatever default your host has. Note that in
-#	practice often only multiples of 4 is usable as the two rightmost bits
-#	have been redefined for use by ECN (RFC 3168 section 23.1).
-#
-#	Processing proceeds in the order specified, and stops at first fully
-#	matching line.
-#Default:
-# none
-
-#  TAG: clientside_tos
-#	Allows you to select a TOS/Diffserv value for packets being transmitted
-#	on the client-side, based on an ACL.
-#
-#	clientside_tos ds-field [!]aclname ...
-#
-#	Example where normal_service_net uses the TOS value 0x00
-#	and good_service_net uses 0x20
-#
-#	acl normal_service_net src 10.0.0.0/24
-#	acl good_service_net src 10.0.1.0/24
-#	clientside_tos 0x00 normal_service_net
-#	clientside_tos 0x20 good_service_net
-#
-#	Note: This feature is incompatible with qos_flows. Any TOS values set here
-#	will be overwritten by TOS values in qos_flows.
-#Default:
-# none
-
-#  TAG: tcp_outgoing_mark
-# Note: This option is only available if Squid is rebuilt with the
-#       Packet MARK (Linux)
-#
-#	Allows you to apply a Netfilter mark value to outgoing packets
-#	on the server side, based on an ACL.
-#
-#	tcp_outgoing_mark mark-value [!]aclname ...
-#
-#	Example where normal_service_net uses the mark value 0x00
-#	and good_service_net uses 0x20
-#
-#	acl normal_service_net src 10.0.0.0/24
-#	acl good_service_net src 10.0.1.0/24
-#	tcp_outgoing_mark 0x00 normal_service_net
-#	tcp_outgoing_mark 0x20 good_service_net
-#Default:
-# none
-
-#  TAG: clientside_mark
-# Note: This option is only available if Squid is rebuilt with the
-#       Packet MARK (Linux)
-#
-#	Allows you to apply a Netfilter mark value to packets being transmitted
-#	on the client-side, based on an ACL.
-#
-#	clientside_mark mark-value [!]aclname ...
-#
-#	Example where normal_service_net uses the mark value 0x00
-#	and good_service_net uses 0x20
-#
-#	acl normal_service_net src 10.0.0.0/24
-#	acl good_service_net src 10.0.1.0/24
-#	clientside_mark 0x00 normal_service_net
-#	clientside_mark 0x20 good_service_net
-#
-#	Note: This feature is incompatible with qos_flows. Any mark values set here
-#	will be overwritten by mark values in qos_flows.
-#Default:
-# none
-
-#  TAG: qos_flows
-#	Allows you to select a TOS/DSCP value to mark outgoing
-#	connections to the client, based on where the reply was sourced.
-#	For platforms using netfilter, allows you to set a netfilter mark
-#	value instead of, or in addition to, a TOS value.
-#
-#	By default this functionality is disabled. To enable it with the default
-#	settings simply use "qos_flows mark" or "qos_flows tos". Default
-#	settings will result in the netfilter mark or TOS value being copied
-#	from the upstream connection to the client. Note that it is the connection
-#	CONNMARK value not the packet MARK value that is copied.
-#
-#	It is not currently possible to copy the mark or TOS value from the
-#	client to the upstream connection request.
-#
-#	TOS values really only have local significance - so you should
-#	know what you're specifying. For more information, see RFC2474,
-#	RFC2475, and RFC3260.
-#
-#	The TOS/DSCP byte must be exactly that - a octet value  0 - 255. Note that
-#	in practice often only multiples of 4 is usable as the two rightmost bits
-#	have been redefined for use by ECN (RFC 3168 section 23.1).
-#
-#	Mark values can be any unsigned 32-bit integer value.
-#
-#	This setting is configured by setting the following values:
-#
-#	tos|mark                Whether to set TOS or netfilter mark values
-#
-#	local-hit=0xFF		Value to mark local cache hits.
-#
-#	sibling-hit=0xFF	Value to mark hits from sibling peers.
-#
-#	parent-hit=0xFF		Value to mark hits from parent peers.
-#
-#	miss=0xFF[/mask]	Value to mark cache misses. Takes precedence
-#				over the preserve-miss feature (see below), unless
-#				mask is specified, in which case only the bits
-#				specified in the mask are written.
-#
-#	The TOS variant of the following features are only possible on Linux
-#	and require your kernel to be patched with the TOS preserving ZPH
-#	patch, available from http://zph.bratcheda.org
-#	No patch is needed to preserve the netfilter mark, which will work
-#	with all variants of netfilter.
-#
-#	disable-preserve-miss
-#		This option disables the preservation of the TOS or netfilter
-#		mark. By default, the existing TOS or netfilter mark value of
-#		the response coming from the remote server will be retained
-#		and masked with miss-mark.
-#		NOTE: in the case of a netfilter mark, the mark must be set on
-#		the connection (using the CONNMARK target) not on the packet
-#		(MARK target).
-#
-#	miss-mask=0xFF
-#		Allows you to mask certain bits in the TOS or mark value
-#		received from the remote server, before copying the value to
-#		the TOS sent towards clients.
-#		Default for tos: 0xFF (TOS from server is not changed).
-#		Default for mark: 0xFFFFFFFF (mark from server is not changed).
-#
-#	All of these features require the --enable-zph-qos compilation flag
-#	(enabled by default). Netfilter marking also requires the
-#	libnetfilter_conntrack libraries (--with-netfilter-conntrack) and
-#	libcap 2.09+ (--with-libcap).
-#
-#Default:
-# none
-
-#  TAG: tcp_outgoing_address
-#	Allows you to map requests to different outgoing IP addresses
-#	based on the username or source address of the user making
-#	the request.
-#
-#	tcp_outgoing_address ipaddr [[!]aclname] ...
-#
-#	For example;
-#		Forwarding clients with dedicated IPs for certain subnets.
-#
-#	  acl normal_service_net src 10.0.0.0/24
-#	  acl good_service_net src 10.0.2.0/24
-#
-#	  tcp_outgoing_address 2001:db8::c001 good_service_net
-#	  tcp_outgoing_address 10.1.0.2 good_service_net
-#
-#	  tcp_outgoing_address 2001:db8::beef normal_service_net
-#	  tcp_outgoing_address 10.1.0.1 normal_service_net
-#
-#	  tcp_outgoing_address 2001:db8::1
-#	  tcp_outgoing_address 10.1.0.3
-#
-#	Processing proceeds in the order specified, and stops at first fully
-#	matching line.
-#
-#	Squid will add an implicit IP version test to each line.
-#	Requests going to IPv4 websites will use the outgoing 10.1.0.* addresses.
-#	Requests going to IPv6 websites will use the outgoing 2001:db8:* addresses.
-#
-#
-#	NOTE: The use of this directive using client dependent ACLs is
-#	incompatible with the use of server side persistent connections. To
-#	ensure correct results it is best to set server_persistent_connections
-#	to off when using this directive in such configurations.
-#
-#	NOTE: The use of this directive to set a local IP on outgoing TCP links
-#	is incompatible with using TPROXY to set client IP out outbound TCP links.
-#	When needing to contact peers use the no-tproxy cache_peer option and the
-#	client_dst_passthru directive re-enable normal forwarding such as this.
-#
-#Default:
-# Address selection is performed by the operating system.
-
-#  TAG: host_verify_strict
-#	Regardless of this option setting, when dealing with intercepted
-#	traffic, Squid always verifies that the destination IP address matches
-#	the Host header domain or IP (called 'authority form URL').
-#	
-#	This enforcement is performed to satisfy a MUST-level requirement in
-#	RFC 2616 section 14.23: "The Host field value MUST represent the naming
-#	authority of the origin server or gateway given by the original URL".
-#	
-#	When set to ON:
-#		Squid always responds with an HTTP 409 (Conflict) error
-#		page and logs a security warning if there is no match.
-#	
-#		Squid verifies that the destination IP address matches
-#		the Host header for forward-proxy and reverse-proxy traffic
-#		as well. For those traffic types, Squid also enables the
-#		following checks, comparing the corresponding Host header
-#		and Request-URI components:
-#	
-#		 * The host names (domain or IP) must be identical,
-#		   but valueless or missing Host header disables all checks.
-#		   For the two host names to match, both must be either IP
-#		   or FQDN.
-#	
-#		 * Port numbers must be identical, but if a port is missing
-#		   the scheme-default port is assumed.
-#	
-#	
-#	When set to OFF (the default):
-#		Squid allows suspicious requests to continue but logs a
-#		security warning and blocks caching of the response.
-#	
-#		 * Forward-proxy traffic is not checked at all.
-#	
-#		 * Reverse-proxy traffic is not checked at all.
-#	
-#		 * Intercepted traffic which passes verification is handled
-#		   according to client_dst_passthru.
-#	
-#		 * Intercepted requests which fail verification are sent
-#		   to the client original destination instead of DIRECT.
-#		   This overrides 'client_dst_passthru off'.
-#	
-#		For now suspicious intercepted CONNECT requests are always
-#		responded to with an HTTP 409 (Conflict) error page.
-#	
-#	
-#	SECURITY NOTE:
-#	
-#	As described in CVE-2009-0801 when the Host: header alone is used
-#	to determine the destination of a request it becomes trivial for
-#	malicious scripts on remote websites to bypass browser same-origin
-#	security policy and sandboxing protections.
-#	
-#	The cause of this is that such applets are allowed to perform their
-#	own HTTP stack, in which case the same-origin policy of the browser
-#	sandbox only verifies that the applet tries to contact the same IP
-#	as from where it was loaded at the IP level. The Host: header may
-#	be different from the connected IP and approved origin.
-#	
-#Default:
-# host_verify_strict off
-
-#  TAG: client_dst_passthru
-#	With NAT or TPROXY intercepted traffic Squid may pass the request
-#	directly to the original client destination IP or seek a faster
-#	source using the HTTP Host header.
-#	
-#	Using Host to locate alternative servers can provide faster
-#	connectivity with a range of failure recovery options.
-#	But can also lead to connectivity trouble when the client and
-#	server are attempting stateful interactions unaware of the proxy.
-#	
-#	This option (on by default) prevents alternative DNS entries being
-#	located to send intercepted traffic DIRECT to an origin server.
-#	The clients original destination IP and port will be used instead.
-#	
-#	Regardless of this option setting, when dealing with intercepted
-#	traffic Squid will verify the Host: header and any traffic which
-#	fails Host verification will be treated as if this option were ON.
-#	
-#	see host_verify_strict for details on the verification process.
-#Default:
-# client_dst_passthru on
-
-# SSL OPTIONS
-# -----------------------------------------------------------------------------
-
-#  TAG: ssl_unclean_shutdown
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-ssl
-#
-#	Some browsers (especially MSIE) bugs out on SSL shutdown
-#	messages.
-#Default:
-# ssl_unclean_shutdown off
-
-#  TAG: ssl_engine
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-ssl
-#
-#	The OpenSSL engine to use. You will need to set this if you
-#	would like to use hardware SSL acceleration for example.
-#Default:
-# none
-
-#  TAG: sslproxy_client_certificate
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-ssl
-#
-#	Client SSL Certificate to use when proxying https:// URLs
-#Default:
-# none
-
-#  TAG: sslproxy_client_key
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-ssl
-#
-#	Client SSL Key to use when proxying https:// URLs
-#Default:
-# none
-
-#  TAG: sslproxy_version
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-ssl
-#
-#	SSL version level to use when proxying https:// URLs
-#
-#	The versions of SSL/TLS supported:
-#
-#	    1	automatic (default)
-#	    2	SSLv2 only
-#	    3	SSLv3 only
-#	    4	TLSv1.0 only
-#	    5	TLSv1.1 only
-#	    6	TLSv1.2 only
-#Default:
-# automatic SSL/TLS version negotiation
-
-#  TAG: sslproxy_options
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-ssl
-#
-#	SSL implementation options to use when proxying https:// URLs
-#	
-#	The most important being:
-#
-#	    NO_SSLv2    Disallow the use of SSLv2
-#	    NO_SSLv3    Disallow the use of SSLv3
-#	    NO_TLSv1    Disallow the use of TLSv1.0
-#	    NO_TLSv1_1  Disallow the use of TLSv1.1
-#	    NO_TLSv1_2  Disallow the use of TLSv1.2
-#	    SINGLE_DH_USE
-#		      Always create a new key when using temporary/ephemeral
-#		      DH key exchanges
-#	    SSL_OP_NO_TICKET
-#		      Disable use of RFC5077 session tickets. Some servers
-#		      may have problems understanding the TLS extension due
-#		      to ambiguous specification in RFC4507.
-#	    ALL       Enable various bug workarounds suggested as "harmless"
-#		      by OpenSSL. Be warned that this may reduce SSL/TLS
-#		      strength to some attacks.
-#	
-#	See the OpenSSL SSL_CTX_set_options documentation for a
-#	complete list of possible options.
-#Default:
-# none
-
-#  TAG: sslproxy_cipher
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-ssl
-#
-#	SSL cipher list to use when proxying https:// URLs
-#
-#	Colon separated list of supported ciphers.
-#Default:
-# none
-
-#  TAG: sslproxy_cafile
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-ssl
-#
-#	file containing CA certificates to use when verifying server
-#	certificates while proxying https:// URLs
-#Default:
-# none
-
-#  TAG: sslproxy_capath
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-ssl
-#
-#	directory containing CA certificates to use when verifying
-#	server certificates while proxying https:// URLs
-#Default:
-# none
-
-#  TAG: ssl_bump
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-ssl
-#
-#	This option is consulted when a CONNECT request is received on
-#	an http_port (or a new connection is intercepted at an
-#	https_port), provided that port was configured with an ssl-bump
-#	flag. The subsequent data on the connection is either treated as
-#	HTTPS and decrypted OR tunneled at TCP level without decryption,
-#	depending on the first bumping "mode" which ACLs match.
-#
-#	ssl_bump <mode> [!]acl ...
-#
-#	The following bumping modes are supported:
-#
-#	    client-first
-#		Allow bumping of the connection. Establish a secure connection
-#		with the client first, then connect to the server. This old mode
-#		does not allow Squid to mimic server SSL certificate and does
-#		not work with intercepted SSL connections.
-#
-#	    server-first
-#		Allow bumping of the connection. Establish a secure connection
-#		with the server first, then establish a secure connection with
-#		the client, using a mimicked server certificate. Works with both
-#		CONNECT requests and intercepted SSL connections.
-#
-#	    none
-#		Become a TCP tunnel without decoding the connection.
-#		Works with both CONNECT requests and intercepted SSL
-#		connections. This is the default behavior when no
-#		ssl_bump option is given or no ssl_bump ACLs match.
-#
-#	By default, no connections are bumped.
-#
-#	The first matching ssl_bump option wins. If no ACLs match, the
-#	connection is not bumped. Unlike most allow/deny ACL lists, ssl_bump
-#	does not have an implicit "negate the last given option" rule. You
-#	must make that rule explicit if you convert old ssl_bump allow/deny
-#	rules that rely on such an implicit rule.
-#
-#	This clause supports both fast and slow acl types.
-#	See http://wiki.squid-cache.org/SquidFaq/SquidAcl for details.
-#
-#	See also: http_port ssl-bump, https_port ssl-bump
-#
-#
-#	# Example: Bump all requests except those originating from
-#	# localhost or those going to example.com.
-#
-#	acl broken_sites dstdomain .example.com
-#	ssl_bump none localhost
-#	ssl_bump none broken_sites
-#	ssl_bump server-first all
-#Default:
-# Does not bump unless rules are present in squid.conf
-
-#  TAG: sslproxy_flags
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-ssl
-#
-#	Various flags modifying the use of SSL while proxying https:// URLs:
-#	    DONT_VERIFY_PEER	Accept certificates that fail verification.
-#				For refined control, see sslproxy_cert_error.
-#	    NO_DEFAULT_CA	Don't use the default CA list built in
-#				to OpenSSL.
-#Default:
-# none
-
-#  TAG: sslproxy_cert_error
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-ssl
-#
-#	Use this ACL to bypass server certificate validation errors.
-#
-#	For example, the following lines will bypass all validation errors
-#	when talking to servers for example.com. All other
-#	validation errors will result in ERR_SECURE_CONNECT_FAIL error.
-#
-#		acl BrokenButTrustedServers dstdomain example.com
-#		sslproxy_cert_error allow BrokenButTrustedServers
-#		sslproxy_cert_error deny all
-#
-#	This clause only supports fast acl types.
-#	See http://wiki.squid-cache.org/SquidFaq/SquidAcl for details.
-#	Using slow acl types may result in server crashes
-#
-#	Without this option, all server certificate validation errors
-#	terminate the transaction to protect Squid and the client.
-#
-#	SQUID_X509_V_ERR_INFINITE_VALIDATION error cannot be bypassed
-#	but should not happen unless your OpenSSL library is buggy.
-#
-#	SECURITY WARNING:
-#		Bypassing validation errors is dangerous because an
-#		error usually implies that the server cannot be trusted
-#		and the connection may be insecure.
-#
-#	See also: sslproxy_flags and DONT_VERIFY_PEER.
-#Default:
-# Server certificate errors terminate the transaction.
-
-#  TAG: sslproxy_cert_sign
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-ssl
-#
-#
-#        sslproxy_cert_sign <signing algorithm> acl ...
-#
-#        The following certificate signing algorithms are supported:
-#
-#	   signTrusted
-#		Sign using the configured CA certificate which is usually
-#		placed in and trusted by end-user browsers. This is the
-#		default for trusted origin server certificates.
-#
-#	   signUntrusted
-#		Sign to guarantee an X509_V_ERR_CERT_UNTRUSTED browser error.
-#		This is the default for untrusted origin server certificates
-#		that are not self-signed (see ssl::certUntrusted).
-#
-#	   signSelf
-#		Sign using a self-signed certificate with the right CN to
-#		generate a X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT error in the
-#		browser. This is the default for self-signed origin server
-#		certificates (see ssl::certSelfSigned).
-#
-#	This clause only supports fast acl types.
-#
-#	When sslproxy_cert_sign acl(s) match, Squid uses the corresponding
-#	signing algorithm to generate the certificate and ignores all
-#	subsequent sslproxy_cert_sign options (the first match wins). If no
-#	acl(s) match, the default signing algorithm is determined by errors
-#	detected when obtaining and validating the origin server certificate.
-#
-#	WARNING: SQUID_X509_V_ERR_DOMAIN_MISMATCH and ssl:certDomainMismatch can
-#	be used with sslproxy_cert_adapt, but if and only if Squid is bumping a
-#	CONNECT request that carries a domain name. In all other cases (CONNECT
-#	to an IP address or an intercepted SSL connection), Squid cannot detect
-#	the domain mismatch at certificate generation time when
-#	bump-server-first is used.
-#Default:
-# none
-
-#  TAG: sslproxy_cert_adapt
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-ssl
-#
-#	
-#	sslproxy_cert_adapt <adaptation algorithm> acl ...
-#
-#	The following certificate adaptation algorithms are supported:
-#
-#	   setValidAfter
-#		Sets the "Not After" property to the "Not After" property of
-#		the CA certificate used to sign generated certificates.
-#
-#	   setValidBefore
-#		Sets the "Not Before" property to the "Not Before" property of
-#		the CA certificate used to sign generated certificates.
-#
-#	   setCommonName or setCommonName{CN}
-#		Sets Subject.CN property to the host name specified as a 
-#		CN parameter or, if no explicit CN parameter was specified,
-#		extracted from the CONNECT request. It is a misconfiguration
-#		to use setCommonName without an explicit parameter for
-#		intercepted or tproxied SSL connections.
-#		
-#	This clause only supports fast acl types.
-#
-#	Squid first groups sslproxy_cert_adapt options by adaptation algorithm.
-#	Within a group, when sslproxy_cert_adapt acl(s) match, Squid uses the
-#	corresponding adaptation algorithm to generate the certificate and
-#	ignores all subsequent sslproxy_cert_adapt options in that algorithm's
-#	group (i.e., the first match wins within each algorithm group). If no
-#	acl(s) match, the default mimicking action takes place.
-#
-#	WARNING: SQUID_X509_V_ERR_DOMAIN_MISMATCH and ssl:certDomainMismatch can
-#	be used with sslproxy_cert_adapt, but if and only if Squid is bumping a
-#	CONNECT request that carries a domain name. In all other cases (CONNECT
-#	to an IP address or an intercepted SSL connection), Squid cannot detect
-#	the domain mismatch at certificate generation time when
-#	bump-server-first is used.
-#Default:
-# none
-
-#  TAG: sslpassword_program
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-ssl
-#
-#	Specify a program used for entering SSL key passphrases
-#	when using encrypted SSL certificate keys. If not specified
-#	keys must either be unencrypted, or Squid started with the -N
-#	option to allow it to query interactively for the passphrase.
-#
-#	The key file name is given as argument to the program allowing
-#	selection of the right password if you have multiple encrypted
-#	keys.
-#Default:
-# none
-
-# OPTIONS RELATING TO EXTERNAL SSL_CRTD 
-# -----------------------------------------------------------------------------
-
-#  TAG: sslcrtd_program
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-ssl-crtd
-#
-#	Specify the location and options of the executable for ssl_crtd process.
-#	/usr/libexec/ssl_crtd program requires -s and -M parameters
-#	For more information use:
-#		/usr/libexec/ssl_crtd -h
-#Default:
-# sslcrtd_program /usr/libexec/ssl_crtd -s /var/log/squid/lib/ssl_db -M 4MB
-
-#  TAG: sslcrtd_children
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-ssl-crtd
-#
-#	The maximum number of processes spawn to service ssl server.
-#	The maximum this may be safely set to is 32.
-#	
-#	The startup= and idle= options allow some measure of skew in your
-#	tuning.
-#	
-#		startup=N
-#	
-#	Sets the minimum number of processes to spawn when Squid
-#	starts or reconfigures. When set to zero the first request will
-#	cause spawning of the first child process to handle it.
-#	
-#	Starting too few children temporary slows Squid under load while it
-#	tries to spawn enough additional processes to cope with traffic.
-#	
-#		idle=N
-#	
-#	Sets a minimum of how many processes Squid is to try and keep available
-#	at all times. When traffic begins to rise above what the existing
-#	processes can handle this many more will be spawned up to the maximum
-#	configured. A minimum setting of 1 is required.
-#	
-#	You must have at least one ssl_crtd process.
-#Default:
-# sslcrtd_children 32 startup=5 idle=1
-
-#  TAG: sslcrtvalidator_program
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-ssl
-#
-#	Specify the location and options of the executable for ssl_crt_validator
-#	process.
-#
-#	Usage:  sslcrtvalidator_program [ttl=n] [cache=n] path ...
-#
-#	Options:
-#	  ttl=n         TTL in seconds for cached results. The default is 60 secs
-#	  cache=n       limit the result cache size. The default value is 2048
-#Default:
-# none
-
-#  TAG: sslcrtvalidator_children
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-ssl
-#
-#	The maximum number of processes spawn to service SSL server.
-#	The maximum this may be safely set to is 32.
-#	
-#	The startup= and idle= options allow some measure of skew in your
-#	tuning.
-#	
-#		startup=N
-#	
-#	Sets the minimum number of processes to spawn when Squid
-#	starts or reconfigures. When set to zero the first request will
-#	cause spawning of the first child process to handle it.
-#	
-#	Starting too few children temporary slows Squid under load while it
-#	tries to spawn enough additional processes to cope with traffic.
-#	
-#		idle=N
-#	
-#	Sets a minimum of how many processes Squid is to try and keep available
-#	at all times. When traffic begins to rise above what the existing
-#	processes can handle this many more will be spawned up to the maximum
-#	configured. A minimum setting of 1 is required.
-#
-#		concurrency=
-#	
-#	The number of requests each certificate validator helper can handle in
-#	parallel. A value of 0 indicates the certficate validator does not
-#	support concurrency. Defaults to 1.
-#	
-#	When this directive is set to a value >= 1 then the protocol
-#	used to communicate with the helper is modified to include
-#	a request ID in front of the request/response. The request
-#	ID from the request must be echoed back with the response
-#	to that request.
-#	
-#	You must have at least one ssl_crt_validator process.
-#Default:
-# sslcrtvalidator_children 32 startup=5 idle=1 concurrency=1
-
-# OPTIONS WHICH AFFECT THE NEIGHBOR SELECTION ALGORITHM
-# -----------------------------------------------------------------------------
-
-#  TAG: cache_peer
-#	To specify other caches in a hierarchy, use the format:
-#	
-#		cache_peer hostname type http-port icp-port [options]
-#	
-#	For example,
-#	
-#	#                                        proxy  icp
-#	#          hostname             type     port   port  options
-#	#          -------------------- -------- ----- -----  -----------
-#	cache_peer parent.foo.net       parent    3128  3130  default
-#	cache_peer sib1.foo.net         sibling   3128  3130  proxy-only
-#	cache_peer sib2.foo.net         sibling   3128  3130  proxy-only
-#	cache_peer example.com          parent    80       0  default
-#	cache_peer cdn.example.com      sibling   3128     0  
-#	
-#	      type:	either 'parent', 'sibling', or 'multicast'.
-#	
-#	proxy-port:	The port number where the peer accept HTTP requests.
-#			For other Squid proxies this is usually 3128
-#			For web servers this is usually 80
-#	
-#	  icp-port:	Used for querying neighbor caches about objects.
-#			Set to 0 if the peer does not support ICP or HTCP.
-#			See ICP and HTCP options below for additional details.
-#	
-#	
-#	==== ICP OPTIONS ====
-#	
-#	You MUST also set icp_port and icp_access explicitly when using these options.
-#	The defaults will prevent peer traffic using ICP.
-#	
-#	
-#	no-query	Disable ICP queries to this neighbor.
-#	
-#	multicast-responder
-#			Indicates the named peer is a member of a multicast group.
-#			ICP queries will not be sent directly to the peer, but ICP
-#			replies will be accepted from it.
-#	
-#	closest-only	Indicates that, for ICP_OP_MISS replies, we'll only forward
-#			CLOSEST_PARENT_MISSes and never FIRST_PARENT_MISSes.
-#	
-#	background-ping
-#			To only send ICP queries to this neighbor infrequently.
-#			This is used to keep the neighbor round trip time updated
-#			and is usually used in conjunction with weighted-round-robin.
-#	
-#	
-#	==== HTCP OPTIONS ====
-#	
-#	You MUST also set htcp_port and htcp_access explicitly when using these options.
-#	The defaults will prevent peer traffic using HTCP.
-#	
-#	
-#	htcp		Send HTCP, instead of ICP, queries to the neighbor.
-#			You probably also want to set the "icp-port" to 4827
-#			instead of 3130. This directive accepts a comma separated
-#			list of options described below.
-#	
-#	htcp=oldsquid	Send HTCP to old Squid versions (2.5 or earlier).
-#	
-#	htcp=no-clr	Send HTCP to the neighbor but without
-#			sending any CLR requests.  This cannot be used with
-#			only-clr.
-#	
-#	htcp=only-clr	Send HTCP to the neighbor but ONLY CLR requests.
-#			This cannot be used with no-clr.
-#	
-#	htcp=no-purge-clr
-#			Send HTCP to the neighbor including CLRs but only when
-#			they do not result from PURGE requests.
-#	
-#	htcp=forward-clr
-#			Forward any HTCP CLR requests this proxy receives to the peer.
-#	
-#	
-#	==== PEER SELECTION METHODS ====
-#	
-#	The default peer selection method is ICP, with the first responding peer
-#	being used as source. These options can be used for better load balancing.
-#	
-#	
-#	default		This is a parent cache which can be used as a "last-resort"
-#			if a peer cannot be located by any of the peer-selection methods.
-#			If specified more than once, only the first is used.
-#	
-#	round-robin	Load-Balance parents which should be used in a round-robin
-#			fashion in the absence of any ICP queries.
-#			weight=N can be used to add bias.
-#	
-#	weighted-round-robin
-#			Load-Balance parents which should be used in a round-robin
-#			fashion with the frequency of each parent being based on the
-#			round trip time. Closer parents are used more often.
-#			Usually used for background-ping parents.
-#			weight=N can be used to add bias.
-#	
-#	carp		Load-Balance parents which should be used as a CARP array.
-#			The requests will be distributed among the parents based on the
-#			CARP load balancing hash function based on their weight.
-#	
-#	userhash	Load-balance parents based on the client proxy_auth or ident username.
-#	
-#	sourcehash	Load-balance parents based on the client source IP.
-#
-#	multicast-siblings
-#			To be used only for cache peers of type "multicast".
-#			ALL members of this multicast group have "sibling"
-#			relationship with it, not "parent".  This is to a multicast
-#			group when the requested object would be fetched only from
-#			a "parent" cache, anyway.  It's useful, e.g., when
-#			configuring a pool of redundant Squid proxies, being
-#			members of the same multicast group.
-#	
-#	
-#	==== PEER SELECTION OPTIONS ====
-#	
-#	weight=N	use to affect the selection of a peer during any weighted
-#			peer-selection mechanisms.
-#			The weight must be an integer; default is 1,
-#			larger weights are favored more.
-#			This option does not affect parent selection if a peering
-#			protocol is not in use.
-#	
-#	basetime=N	Specify a base amount to be subtracted from round trip
-#			times of parents.
-#			It is subtracted before division by weight in calculating
-#			which parent to fectch from. If the rtt is less than the
-#			base time the rtt is set to a minimal value.
-#	
-#	ttl=N		Specify a TTL to use when sending multicast ICP queries
-#			to this address.
-#			Only useful when sending to a multicast group.
-#			Because we don't accept ICP replies from random
-#			hosts, you must configure other group members as
-#			peers with the 'multicast-responder' option.
-#	
-#	no-delay	To prevent access to this neighbor from influencing the
-#			delay pools.
-#	
-#	digest-url=URL	Tell Squid to fetch the cache digest (if digests are
-#			enabled) for this host from the specified URL rather
-#			than the Squid default location.
-#	
-#	
-#	==== CARP OPTIONS ====
-#	
-#	carp-key=key-specification
-#			use a different key than the full URL to hash against the peer.
-#			the key-specification is a comma-separated list of the keywords			
-#			scheme, host, port, path, params
-#			Order is not important.
-#	
-#	==== ACCELERATOR / REVERSE-PROXY OPTIONS ====
-#	
-#	originserver	Causes this parent to be contacted as an origin server.
-#			Meant to be used in accelerator setups when the peer
-#			is a web server.
-#	
-#	forceddomain=name
-#			Set the Host header of requests forwarded to this peer.
-#			Useful in accelerator setups where the server (peer)
-#			expects a certain domain name but clients may request
-#			others. ie example.com or www.example.com
-#	
-#	no-digest	Disable request of cache digests.
-#	
-#	no-netdb-exchange
-#			Disables requesting ICMP RTT database (NetDB).
-#	
-#	
-#	==== AUTHENTICATION OPTIONS ====
-#	
-#	login=user:password
-#			If this is a personal/workgroup proxy and your parent
-#			requires proxy authentication.
-#			
-#			Note: The string can include URL escapes (i.e. %20 for
-#			spaces). This also means % must be written as %%.
-#	
-#	login=PASSTHRU
-#			Send login details received from client to this peer.
-#			Both Proxy- and WWW-Authorization headers are passed
-#			without alteration to the peer.
-#			Authentication is not required by Squid for this to work.
-#			
-#			Note: This will pass any form of authentication but
-#			only Basic auth will work through a proxy unless the
-#			connection-auth options are also used.
-#
-#	login=PASS	Send login details received from client to this peer.
-#			Authentication is not required by this option.
-#			
-#			If there are no client-provided authentication headers
-#			to pass on, but username and password are available
-#			from an external ACL user= and password= result tags
-#			they may be sent instead.
-#			
-#			Note: To combine this with proxy_auth both proxies must
-#			share the same user database as HTTP only allows for
-#			a single login (one for proxy, one for origin server).
-#			Also be warned this will expose your users proxy
-#			password to the peer. USE WITH CAUTION
-#	
-#	login=*:password
-#			Send the username to the upstream cache, but with a
-#			fixed password. This is meant to be used when the peer
-#			is in another administrative domain, but it is still
-#			needed to identify each user.
-#			The star can optionally be followed by some extra
-#			information which is added to the username. This can
-#			be used to identify this proxy to the peer, similar to
-#			the login=username:password option above.
-#	
-#	login=NEGOTIATE
-#			If this is a personal/workgroup proxy and your parent
-#			requires a secure proxy authentication.
-#			The first principal from the default keytab or defined by
-#			the environment variable KRB5_KTNAME will be used. 
-#	
-#			WARNING: The connection may transmit requests from multiple
-#			clients. Negotiate often assumes end-to-end authentication
-#			and a single-client. Which is not strictly true here.
-#	
-#	login=NEGOTIATE:principal_name
-#			If this is a personal/workgroup proxy and your parent
-#			requires a secure proxy authentication. 
-#			The principal principal_name from the default keytab or
-#			defined by the environment variable KRB5_KTNAME will be
-#			used.
-#	
-#			WARNING: The connection may transmit requests from multiple
-#			clients. Negotiate often assumes end-to-end authentication
-#			and a single-client. Which is not strictly true here.
-#	
-#	connection-auth=on|off
-#			Tell Squid that this peer does or not support Microsoft
-#			connection oriented authentication, and any such
-#			challenges received from there should be ignored.
-#			Default is auto to automatically determine the status
-#			of the peer.
-#	
-#	
-#	==== SSL / HTTPS / TLS OPTIONS ====
-#	
-#	ssl		Encrypt connections to this peer with SSL/TLS.
-#	
-#	sslcert=/path/to/ssl/certificate
-#			A client SSL certificate to use when connecting to
-#			this peer.
-#	
-#	sslkey=/path/to/ssl/key
-#			The private SSL key corresponding to sslcert above.
-#			If 'sslkey' is not specified 'sslcert' is assumed to
-#			reference a combined file containing both the
-#			certificate and the key.
-#	
-#	sslversion=1|2|3|4|5|6
-#			The SSL version to use when connecting to this peer
-#				1 = automatic (default)
-#				2 = SSL v2 only
-#				3 = SSL v3 only
-#				4 = TLS v1.0 only
-#				5 = TLS v1.1 only
-#				6 = TLS v1.2 only
-#	
-#	sslcipher=...	The list of valid SSL ciphers to use when connecting
-#			to this peer.
-#	
-#	ssloptions=... 	Specify various SSL implementation options:
-#
-#			    NO_SSLv2    Disallow the use of SSLv2
-#			    NO_SSLv3    Disallow the use of SSLv3
-#			    NO_TLSv1    Disallow the use of TLSv1.0
-#			    NO_TLSv1_1  Disallow the use of TLSv1.1
-#			    NO_TLSv1_2  Disallow the use of TLSv1.2
-#			    SINGLE_DH_USE
-#				      Always create a new key when using
-#				      temporary/ephemeral DH key exchanges
-#			    ALL       Enable various bug workarounds
-#				      suggested as "harmless" by OpenSSL
-#				      Be warned that this reduces SSL/TLS
-#				      strength to some attacks.
-#
-#			See the OpenSSL SSL_CTX_set_options documentation for a
-#			more complete list.
-#	
-#	sslcafile=... 	A file containing additional CA certificates to use
-#			when verifying the peer certificate.
-#	
-#	sslcapath=...	A directory containing additional CA certificates to
-#			use when verifying the peer certificate.
-#	
-#	sslcrlfile=... 	A certificate revocation list file to use when
-#			verifying the peer certificate.
-#	
-#	sslflags=...	Specify various flags modifying the SSL implementation:
-#	
-#			DONT_VERIFY_PEER
-#				Accept certificates even if they fail to
-#				verify.
-#			NO_DEFAULT_CA
-#				Don't use the default CA list built in
-#				to OpenSSL.
-#			DONT_VERIFY_DOMAIN
-#				Don't verify the peer certificate
-#				matches the server name
-#	
-#	ssldomain= 	The peer name as advertised in it's certificate.
-#			Used for verifying the correctness of the received peer
-#			certificate. If not specified the peer hostname will be
-#			used.
-#	
-#	front-end-https
-#			Enable the "Front-End-Https: On" header needed when
-#			using Squid as a SSL frontend in front of Microsoft OWA.
-#			See MS KB document Q307347 for details on this header.
-#			If set to auto the header will only be added if the
-#			request is forwarded as a https:// URL.
-#	
-#	
-#	==== GENERAL OPTIONS ====
-#	
-#	connect-timeout=N
-#			A peer-specific connect timeout.
-#			Also see the peer_connect_timeout directive.
-#	
-#	connect-fail-limit=N
-#			How many times connecting to a peer must fail before
-#			it is marked as down. Default is 10.
-#	
-#	allow-miss	Disable Squid's use of only-if-cached when forwarding
-#			requests to siblings. This is primarily useful when
-#			icp_hit_stale is used by the sibling. To extensive use
-#			of this option may result in forwarding loops, and you
-#			should avoid having two-way peerings with this option.
-#			For example to deny peer usage on requests from peer
-#			by denying cache_peer_access if the source is a peer.
-#	
-#	max-conn=N	Limit the amount of connections Squid may open to this
-#			peer. see also 
-#	
-#	name=xxx	Unique name for the peer.
-#			Required if you have multiple peers on the same host
-#			but different ports.
-#			This name can be used in cache_peer_access and similar
-#			directives to dentify the peer.
-#			Can be used by outgoing access controls through the
-#			peername ACL type.
-#	
-#	no-tproxy	Do not use the client-spoof TPROXY support when forwarding
-#			requests to this peer. Use normal address selection instead.
-#			This overrides the spoof_client_ip ACL.
-#	
-#	proxy-only	objects fetched from the peer will not be stored locally.
-#	
-#Default:
-# none
-
-#  TAG: cache_peer_domain
-#	Use to limit the domains for which a neighbor cache will be
-#	queried.
-#
-#	Usage:
-#		cache_peer_domain cache-host domain [domain ...]
-#		cache_peer_domain cache-host !domain
-#
-#	For example, specifying
-#
-#		cache_peer_domain parent.foo.net	.edu
-#
-#	has the effect such that UDP query packets are sent to
-#	'bigserver' only when the requested object exists on a
-#	server in the .edu domain.  Prefixing the domainname
-#	with '!' means the cache will be queried for objects
-#	NOT in that domain.
-#
-#	NOTE:	* Any number of domains may be given for a cache-host,
-#		  either on the same or separate lines.
-#		* When multiple domains are given for a particular
-#		  cache-host, the first matched domain is applied.
-#		* Cache hosts with no domain restrictions are queried
-#		  for all requests.
-#		* There are no defaults.
-#		* There is also a 'cache_peer_access' tag in the ACL
-#		  section.
-#Default:
-# none
-
-#  TAG: cache_peer_access
-#	Similar to 'cache_peer_domain' but provides more flexibility by
-#	using ACL elements.
-#
-#	Usage:
-#		cache_peer_access cache-host allow|deny [!]aclname ...
-#
-#	The syntax is identical to 'http_access' and the other lists of
-#	ACL elements.  See the comments for 'http_access' below, or
-#	the Squid FAQ (http://wiki.squid-cache.org/SquidFaq/SquidAcl).
-#Default:
-# none
-
-#  TAG: neighbor_type_domain
-#	Modify the cache_peer neighbor type when passing requests
-#	about specific domains to the peer.
-#
-#	Usage:
-#		 neighbor_type_domain neighbor parent|sibling domain domain ...
-#
-#	For example:
-#		cache_peer foo.example.com parent 3128 3130
-#		neighbor_type_domain foo.example.com sibling .au .de
-#
-#	The above configuration treats all requests to foo.example.com as a
-#	parent proxy unless the request is for a .au or .de ccTLD domain name.
-#Default:
-# The peer type from cache_peer directive is used for all requests to that peer.
-
-#  TAG: dead_peer_timeout	(seconds)
-#	This controls how long Squid waits to declare a peer cache
-#	as "dead."  If there are no ICP replies received in this
-#	amount of time, Squid will declare the peer dead and not
-#	expect to receive any further ICP replies.  However, it
-#	continues to send ICP queries, and will mark the peer as
-#	alive upon receipt of the first subsequent ICP reply.
-#
-#	This timeout also affects when Squid expects to receive ICP
-#	replies from peers.  If more than 'dead_peer' seconds have
-#	passed since the last ICP reply was received, Squid will not
-#	expect to receive an ICP reply on the next query.  Thus, if
-#	your time between requests is greater than this timeout, you
-#	will see a lot of requests sent DIRECT to origin servers
-#	instead of to your parents.
-#Default:
-# dead_peer_timeout 10 seconds
-
-#  TAG: forward_max_tries
-#	Controls how many different forward paths Squid will try
-#	before giving up. See also forward_timeout.
-#	
-#	NOTE: connect_retries (default: none) can make each of these
-#	possible forwarding paths be tried multiple times.
-#Default:
-# forward_max_tries 10
-
-#  TAG: hierarchy_stoplist
-#	A list of words which, if found in a URL, cause the object to
-#	be handled directly by this cache.  In other words, use this
-#	to not query neighbor caches for certain objects.  You may
-#	list this option multiple times.
-#
-#	Example:
-#		hierarchy_stoplist cgi-bin ?
-#
-#	Note: never_direct overrides this option.
-#Default:
-# none
-
-# MEMORY CACHE OPTIONS
-# -----------------------------------------------------------------------------
-
-#  TAG: cache_mem	(bytes)
-#	NOTE: THIS PARAMETER DOES NOT SPECIFY THE MAXIMUM PROCESS SIZE.
-#	IT ONLY PLACES A LIMIT ON HOW MUCH ADDITIONAL MEMORY SQUID WILL
-#	USE AS A MEMORY CACHE OF OBJECTS. SQUID USES MEMORY FOR OTHER
-#	THINGS AS WELL. SEE THE SQUID FAQ SECTION 8 FOR DETAILS.
-#
-#	'cache_mem' specifies the ideal amount of memory to be used
-#	for:
-#		* In-Transit objects
-#		* Hot Objects
-#		* Negative-Cached objects
-#
-#	Data for these objects are stored in 4 KB blocks.  This
-#	parameter specifies the ideal upper limit on the total size of
-#	4 KB blocks allocated.  In-Transit objects take the highest
-#	priority.
-#
-#	In-transit objects have priority over the others.  When
-#	additional space is needed for incoming data, negative-cached
-#	and hot objects will be released.  In other words, the
-#	negative-cached and hot objects will fill up any unused space
-#	not needed for in-transit objects.
-#
-#	If circumstances require, this limit will be exceeded.
-#	Specifically, if your incoming request rate requires more than
-#	'cache_mem' of memory to hold in-transit objects, Squid will
-#	exceed this limit to satisfy the new requests.  When the load
-#	decreases, blocks will be freed until the high-water mark is
-#	reached.  Thereafter, blocks will be used to store hot
-#	objects.
-#
-#	If shared memory caching is enabled, Squid does not use the shared
-#	cache space for in-transit objects, but they still consume as much
-#	local memory as they need. For more details about the shared memory
-#	cache, see memory_cache_shared.
-#Default:
-# cache_mem 256 MB
-
-#  TAG: maximum_object_size_in_memory	(bytes)
-#	Objects greater than this size will not be attempted to kept in
-#	the memory cache. This should be set high enough to keep objects
-#	accessed frequently in memory to improve performance whilst low
-#	enough to keep larger objects from hoarding cache_mem.
-#Default:
-# maximum_object_size_in_memory 512 KB
-
-#  TAG: memory_cache_shared	on|off
-#	Controls whether the memory cache is shared among SMP workers.
-#
-#	The shared memory cache is meant to occupy cache_mem bytes and replace
-#	the non-shared memory cache, although some entities may still be
-#	cached locally by workers for now (e.g., internal and in-transit
-#	objects may be served from a local memory cache even if shared memory
-#	caching is enabled).
-#
-#	By default, the memory cache is shared if and only if all of the
-#	following conditions are satisfied: Squid runs in SMP mode with
-#	multiple workers, cache_mem is positive, and Squid environment
-#	supports required IPC primitives (e.g., POSIX shared memory segments
-#	and GCC-style atomic operations).
-#
-#	To avoid blocking locks, shared memory uses opportunistic algorithms
-#	that do not guarantee that every cachable entity that could have been
-#	shared among SMP workers will actually be shared.
-#
-#	Currently, entities exceeding 32KB in size cannot be shared.
-#Default:
-# "on" where supported if doing memory caching with multiple SMP workers.
-
-#  TAG: memory_cache_mode
-#	Controls which objects to keep in the memory cache (cache_mem)
-#
-#	always	Keep most recently fetched objects in memory (default)
-#
-#	disk	Only disk cache hits are kept in memory, which means
-#		an object must first be cached on disk and then hit
-#		a second time before cached in memory.
-#
-#	network	Only objects fetched from network is kept in memory
-#Default:
-# Keep the most recently fetched objects in memory
-
-#  TAG: memory_replacement_policy
-#	The memory replacement policy parameter determines which
-#	objects are purged from memory when memory space is needed.
-#
-#	See cache_replacement_policy for details on algorithms.
-#Default:
-# memory_replacement_policy lru
-
-# DISK CACHE OPTIONS
-# -----------------------------------------------------------------------------
-
-#  TAG: cache_replacement_policy
-#	The cache replacement policy parameter determines which
-#	objects are evicted (replaced) when disk space is needed.
-#
-#	    lru       : Squid's original list based LRU policy
-#	    heap GDSF : Greedy-Dual Size Frequency
-#	    heap LFUDA: Least Frequently Used with Dynamic Aging
-#	    heap LRU  : LRU policy implemented using a heap
-#
-#	Applies to any cache_dir lines listed below this directive.
-#
-#	The LRU policies keeps recently referenced objects.
-#
-#	The heap GDSF policy optimizes object hit rate by keeping smaller
-#	popular objects in cache so it has a better chance of getting a
-#	hit.  It achieves a lower byte hit rate than LFUDA though since
-#	it evicts larger (possibly popular) objects.
-#
-#	The heap LFUDA policy keeps popular objects in cache regardless of
-#	their size and thus optimizes byte hit rate at the expense of
-#	hit rate since one large, popular object will prevent many
-#	smaller, slightly less popular objects from being cached.
-#
-#	Both policies utilize a dynamic aging mechanism that prevents
-#	cache pollution that can otherwise occur with frequency-based
-#	replacement policies.
-#
-#	NOTE: if using the LFUDA replacement policy you should increase
-#	the value of maximum_object_size above its default of 4 MB to
-#	to maximize the potential byte hit rate improvement of LFUDA.
-#
-#	For more information about the GDSF and LFUDA cache replacement
-#	policies see http://www.hpl.hp.com/techreports/1999/HPL-1999-69.html
-#	and http://fog.hpl.external.hp.com/techreports/98/HPL-98-173.html.
-#Default:
-# cache_replacement_policy lru
-
-#  TAG: minimum_object_size	(bytes)
-#	Objects smaller than this size will NOT be saved on disk.  The
-#	value is specified in bytes, and the default is 0 KB, which
-#	means all responses can be stored.
-#Default:
-# no limit
-
-#  TAG: maximum_object_size	(bytes)
-#	Set the default value for max-size parameter on any cache_dir.
-#	The value is specified in bytes, and the default is 4 MB.
-#	
-#	If you wish to get a high BYTES hit ratio, you should probably
-#	increase this (one 32 MB object hit counts for 3200 10KB
-#	hits).
-#	
-#	If you wish to increase hit ratio more than you want to
-#	save bandwidth you should leave this low.
-#	
-#	NOTE: if using the LFUDA replacement policy you should increase
-#	this value to maximize the byte hit rate improvement of LFUDA!
-#	See cache_replacement_policy for a discussion of this policy.
-#Default:
-# maximum_object_size 4 MB
-
-#  TAG: cache_dir
-#	Format:
-#		cache_dir Type Directory-Name Fs-specific-data [options]
-#
-#	You can specify multiple cache_dir lines to spread the
-#	cache among different disk partitions.
-#
-#	Type specifies the kind of storage system to use. Only "ufs"
-#	is built by default. To enable any of the other storage systems
-#	see the --enable-storeio configure option.
-#
-#	'Directory' is a top-level directory where cache swap
-#	files will be stored.  If you want to use an entire disk
-#	for caching, this can be the mount-point directory.
-#	The directory must exist and be writable by the Squid
-#	process.  Squid will NOT create this directory for you.
-#
-#	In SMP configurations, cache_dir must not precede the workers option
-#	and should use configuration macros or conditionals to give each
-#	worker interested in disk caching a dedicated cache directory.
-#
-#
-#	====  The ufs store type  ====
-#
-#	"ufs" is the old well-known Squid storage format that has always
-#	been there.
-#
-#	Usage:
-#		cache_dir ufs Directory-Name Mbytes L1 L2 [options]
-#
-#	'Mbytes' is the amount of disk space (MB) to use under this
-#	directory.  The default is 100 MB.  Change this to suit your
-#	configuration.  Do NOT put the size of your disk drive here.
-#	Instead, if you want Squid to use the entire disk drive,
-#	subtract 20% and use that value.
-#
-#	'L1' is the number of first-level subdirectories which
-#	will be created under the 'Directory'.  The default is 16.
-#
-#	'L2' is the number of second-level subdirectories which
-#	will be created under each first-level directory.  The default
-#	is 256.
-#
-#
-#	====  The aufs store type  ====
-#
-#	"aufs" uses the same storage format as "ufs", utilizing
-#	POSIX-threads to avoid blocking the main Squid process on
-#	disk-I/O. This was formerly known in Squid as async-io.
-#
-#	Usage:
-#		cache_dir aufs Directory-Name Mbytes L1 L2 [options]
-#
-#	see argument descriptions under ufs above
-#
-#
-#	====  The diskd store type  ====
-#
-#	"diskd" uses the same storage format as "ufs", utilizing a
-#	separate process to avoid blocking the main Squid process on
-#	disk-I/O.
-#
-#	Usage:
-#		cache_dir diskd Directory-Name Mbytes L1 L2 [options] [Q1=n] [Q2=n]
-#
-#	see argument descriptions under ufs above
-#
-#	Q1 specifies the number of unacknowledged I/O requests when Squid
-#	stops opening new files. If this many messages are in the queues,
-#	Squid won't open new files. Default is 64
-#
-#	Q2 specifies the number of unacknowledged messages when Squid
-#	starts blocking.  If this many messages are in the queues,
-#	Squid blocks until it receives some replies. Default is 72
-#
-#	When Q1 < Q2 (the default), the cache directory is optimized
-#	for lower response time at the expense of a decrease in hit
-#	ratio.  If Q1 > Q2, the cache directory is optimized for
-#	higher hit ratio at the expense of an increase in response
-#	time.
-#
-#
-#	====  The rock store type  ====
-#
-#	Usage:
-#	    cache_dir rock Directory-Name Mbytes <max-size=bytes> [options]
-#
-#	The Rock Store type is a database-style storage. All cached
-#	entries are stored in a "database" file, using fixed-size slots,
-#	one entry per slot. The database size is specified in MB. The
-#	slot size is specified in bytes using the max-size option. See
-#	below for more info on the max-size option.
-#
-#	If possible, Squid using Rock Store creates a dedicated kid
-#	process called "disker" to avoid blocking Squid worker(s) on disk
-#	I/O. One disker kid is created for each rock cache_dir.  Diskers
-#	are created only when Squid, running in daemon mode, has support
-#	for the IpcIo disk I/O module.
-#
-#	swap-timeout=msec: Squid will not start writing a miss to or
-#	reading a hit from disk if it estimates that the swap operation
-#	will take more than the specified number of milliseconds. By
-#	default and when set to zero, disables the disk I/O time limit
-#	enforcement. Ignored when using blocking I/O module because
-#	blocking synchronous I/O does not allow Squid to estimate the
-#	expected swap wait time.
-#
-#	max-swap-rate=swaps/sec: Artificially limits disk access using
-#	the specified I/O rate limit. Swap out requests that
-#	would cause the average I/O rate to exceed the limit are
-#	delayed. Individual swap in requests (i.e., hits or reads) are
-#	not delayed, but they do contribute to measured swap rate and
-#	since they are placed in the same FIFO queue as swap out
-#	requests, they may wait longer if max-swap-rate is smaller.
-#	This is necessary on file systems that buffer "too
-#	many" writes and then start blocking Squid and other processes
-#	while committing those writes to disk.  Usually used together
-#	with swap-timeout to avoid excessive delays and queue overflows
-#	when disk demand exceeds available disk "bandwidth". By default
-#	and when set to zero, disables the disk I/O rate limit
-#	enforcement. Currently supported by IpcIo module only.
-#
-#
-#	====  The coss store type  ====
-#
-#	NP: COSS filesystem in Squid-3 has been deemed too unstable for
-#	    production use and has thus been removed from this release.
-#	    We hope that it can be made usable again soon.
-#
-#	block-size=n defines the "block size" for COSS cache_dir's.
-#	Squid uses file numbers as block numbers.  Since file numbers
-#	are limited to 24 bits, the block size determines the maximum
-#	size of the COSS partition.  The default is 512 bytes, which
-#	leads to a maximum cache_dir size of 512<<24, or 8 GB.  Note
-#	you should not change the coss block size after Squid
-#	has written some objects to the cache_dir.
-#
-#	The coss file store has changed from 2.5. Now it uses a file
-#	called 'stripe' in the directory names in the config - and
-#	this will be created by squid -z.
-#
-#
-#	==== COMMON OPTIONS ====
-#
-#	no-store	no new objects should be stored to this cache_dir.
-#
-#	min-size=n	the minimum object size in bytes this cache_dir
-#			will accept.  It's used to restrict a cache_dir
-#			to only store large objects (e.g. AUFS) while
-#			other stores are optimized for smaller objects
-#			(e.g. COSS).
-#			Defaults to 0.
-#
-#	max-size=n	the maximum object size in bytes this cache_dir
-#			supports.
-#			The value in maximum_object_size directive sets
-#			the default unless more specific details are
-#			available (ie a small store capacity).
-#
-#	Note: To make optimal use of the max-size limits you should order
-#	the cache_dir lines with the smallest max-size value first.
-#
-#	Note for coss, max-size must be less than COSS_MEMBUF_SZ,
-#	which can be changed with the --with-coss-membuf-size=N configure
-#	option.
-#
-#Default:
-# No disk cache. Store cache ojects only in memory.
-#
-
-# Uncomment and adjust the following to add a disk cache directory.
-#cache_dir ufs /var/log/squid/cache/squid 100 16 256
-
-#  TAG: store_dir_select_algorithm
-#	How Squid selects which cache_dir to use when the response
-#	object will fit into more than one.
-#
-#	Regardless of which algorithm is used the cache_dir min-size
-#	and max-size parameters are obeyed. As such they can affect
-#	the selection algorithm by limiting the set of considered
-#	cache_dir.
-#
-#	Algorithms:
-#
-#		least-load
-#
-#	This algorithm is suited to caches with similar cache_dir
-#	sizes and disk speeds.
-#
-#	The disk with the least I/O pending is selected.
-#	When there are multiple disks with the same I/O load ranking
-#	the cache_dir with most available capacity is selected.
-#
-#	When a mix of cache_dir sizes are configured the faster disks
-#	have a naturally lower I/O loading and larger disks have more
-#	capacity. So space used to store objects and data throughput
-#	may be very unbalanced towards larger disks.
-#
-#
-#		round-robin
-#
-#	This algorithm is suited to caches with unequal cache_dir
-#	disk sizes.
-#
-#	Each cache_dir is selected in a rotation. The next suitable
-#	cache_dir is used.
-#
-#	Available cache_dir capacity is only considered in relation
-#	to whether the object will fit and meets the min-size and
-#	max-size parameters.
-#
-#	Disk I/O loading is only considered to prevent overload on slow
-#	disks. This algorithm does not spread objects by size, so any
-#	I/O loading per-disk may appear very unbalanced and volatile.
-#
-#Default:
-# store_dir_select_algorithm least-load
-
-#  TAG: max_open_disk_fds
-#	To avoid having disk as the I/O bottleneck Squid can optionally
-#	bypass the on-disk cache if more than this amount of disk file
-#	descriptors are open.
-#
-#	A value of 0 indicates no limit.
-#Default:
-# no limit
-
-#  TAG: cache_swap_low	(percent, 0-100)
-#	The low-water mark for cache object replacement.
-#	Replacement begins when the swap (disk) usage is above the
-#	low-water mark and attempts to maintain utilization near the
-#	low-water mark.  As swap utilization gets close to high-water
-#	mark object eviction becomes more aggressive.  If utilization is
-#	close to the low-water mark less replacement is done each time.
-#
-#	Defaults are 90% and 95%. If you have a large cache, 5% could be
-#	hundreds of MB. If this is the case you may wish to set these
-#	numbers closer together.
-#
-#	See also cache_swap_high
-#Default:
-# cache_swap_low 90
-
-#  TAG: cache_swap_high	(percent, 0-100)
-#	The high-water mark for cache object replacement.
-#	Replacement begins when the swap (disk) usage is above the
-#	low-water mark and attempts to maintain utilization near the
-#	low-water mark.  As swap utilization gets close to high-water
-#	mark object eviction becomes more aggressive.  If utilization is
-#	close to the low-water mark less replacement is done each time.
-#
-#	Defaults are 90% and 95%. If you have a large cache, 5% could be
-#	hundreds of MB. If this is the case you may wish to set these
-#	numbers closer together.
-#
-#	See also cache_swap_low
-#Default:
-# cache_swap_high 95
-
-# LOGFILE OPTIONS
-# -----------------------------------------------------------------------------
-
-#  TAG: logformat
-#	Usage:
-#
-#	logformat <name> <format specification>
-#
-#	Defines an access log format.
-#
-#	The <format specification> is a string with embedded % format codes
-#
-#	% format codes all follow the same basic structure where all but
-#	the formatcode is optional. Output strings are automatically escaped
-#	as required according to their context and the output format
-#	modifiers are usually not needed, but can be specified if an explicit
-#	output format is desired.
-#
-#		% ["|[|'|#] [-] [[0]width] [{argument}] formatcode
-#
-#		"	output in quoted string format
-#		[	output in squid text log format as used by log_mime_hdrs
-#		#	output in URL quoted format
-#		'	output as-is
-#
-#		-	left aligned
-#
-#		width	minimum and/or maximum field width:
-#			    [width_min][.width_max]
-#			When minimum starts with 0, the field is zero-padded.
-#			String values exceeding maximum width are truncated.
-#
-#		{arg}	argument such as header name etc
-#
-#	Format codes:
-#
-#		%	a literal % character
-#		sn	Unique sequence number per log line entry
-#		err_code    The ID of an error response served by Squid or
-#				a similar internal error identifier.
-#		err_detail  Additional err_code-dependent error information.
-#		note	The annotation specified by the argument. Also
-#			logs the adaptation meta headers set by the
-#			adaptation_meta configuration parameter.
-#			If no argument given all annotations logged.
-#			The argument may include a separator to use with
-#			annotation values:
-#                            name[:separator]
-#			By default, multiple note values are separated with ","
-#			and multiple notes are separated with "\r\n".
-#			When logging named notes with %{name}note, the
-#			explicitly configured separator is used between note
-#			values. When logging all notes with %note, the
-#			explicitly configured separator is used between
-#			individual notes. There is currently no way to
-#			specify both value and notes separators when logging
-#			all notes with %note.
-#
-#	Connection related format codes:
-#
-#		>a	Client source IP address
-#		>A	Client FQDN
-#		>p	Client source port
-#		>eui	Client source EUI (MAC address, EUI-48 or EUI-64 identifier)
-#		>la	Local IP address the client connected to
-#		>lp	Local port number the client connected to
-#		>qos    Client connection TOS/DSCP value set by Squid
-#		>nfmark Client connection netfilter mark set by Squid
-#
-#		la	Local listening IP address the client connection was connected to.
-#		lp	Local listening port number the client connection was connected to.
-#
-#		<a	Server IP address of the last server or peer connection
-#		<A	Server FQDN or peer name
-#		<p	Server port number of the last server or peer connection
-#		<la	Local IP address of the last server or peer connection
-#		<lp     Local port number of the last server or peer connection
-#		<qos	Server connection TOS/DSCP value set by Squid
-#		<nfmark Server connection netfilter mark set by Squid
-#
-#	Time related format codes:
-#
-#		ts	Seconds since epoch
-#		tu	subsecond time (milliseconds)
-#		tl	Local time. Optional strftime format argument
-#				default %d/%b/%Y:%H:%M:%S %z
-#		tg	GMT time. Optional strftime format argument
-#				default %d/%b/%Y:%H:%M:%S %z
-#		tr	Response time (milliseconds)
-#		dt	Total time spent making DNS lookups (milliseconds)
-#
-#	Access Control related format codes:
-#
-#		et	Tag returned by external acl
-#		ea	Log string returned by external acl
-#		un	User name (any available)
-#		ul	User name from authentication
-#		ue	User name from external acl helper
-#		ui	User name from ident
-#		us	User name from SSL
-#
-#	HTTP related format codes:
-#
-#		[http::]>h	Original received request header. 
-#				Usually differs from the request header sent by
-#				Squid, although most fields are often preserved.
-#				Accepts optional header field name/value filter
-#				argument using name[:[separator]element] format.
-#		[http::]>ha	Received request header after adaptation and
-#				redirection (pre-cache REQMOD vectoring point).
-#				Usually differs from the request header sent by
-#				Squid, although most fields are often preserved.
-#				Optional header name argument as for >h
-#		[http::]<h	Reply header. Optional header name argument
-#				as for >h
-#		[http::]>Hs	HTTP status code sent to the client
-#		[http::]<Hs	HTTP status code received from the next hop
-#		[http::]<bs	Number of HTTP-equivalent message body bytes 
-#				received from the next hop, excluding chunked
-#				transfer encoding and control messages.
-#				Generated FTP/Gopher listings are treated as
-#				received bodies.
-#		[http::]mt	MIME content type
-#		[http::]rm	Request method (GET/POST etc)
-#		[http::]>rm	Request method from client
-#		[http::]<rm	Request method sent to server or peer
-#		[http::]ru	Request URL from client (historic, filtered for logging)
-#		[http::]>ru	Request URL from client
-#		[http::]<ru	Request URL sent to server or peer
-#		[http::]rp	Request URL-Path excluding hostname
-#		[http::]>rp	Request URL-Path excluding hostname from client
-#		[http::]<rp	Request URL-Path excluding hostname sento to server or peer
-#		[http::]rv	Request protocol version
-#		[http::]>rv	Request protocol version from client
-#		[http::]<rv	Request protocol version sent to server or peer
-#		[http::]<st	Sent reply size including HTTP headers
-#		[http::]>st	Received request size including HTTP headers. In the
-#				case of chunked requests the chunked encoding metadata
-#				are not included
-#		[http::]>sh	Received HTTP request headers size
-#		[http::]<sh	Sent HTTP reply headers size
-#		[http::]st	Request+Reply size including HTTP headers
-#		[http::]<sH	Reply high offset sent
-#		[http::]<sS	Upstream object size
-#		[http::]<pt	Peer response time in milliseconds. The timer starts
-#				when the last request byte is sent to the next hop
-#				and stops when the last response byte is received.
-#		[http::]<tt	Total server-side time in milliseconds. The timer 
-#				starts with the first connect request (or write I/O)
-#				sent to the first selected peer. The timer stops
-#				with the last I/O with the last peer.
-#
-#	Squid handling related format codes:
-#
-#		Ss	Squid request status (TCP_MISS etc)
-#		Sh	Squid hierarchy status (DEFAULT_PARENT etc)
-#
-#	SSL-related format codes:
-#
-#		ssl::bump_mode	SslBump decision for the transaction:
-#
-#				For CONNECT requests that initiated bumping of
-#				a connection and for any request received on
-#				an already bumped connection, Squid logs the
-#				corresponding SslBump mode ("server-first" or
-#				"client-first"). See the ssl_bump option for
-#				more information about these modes.
-#
-#				A "none" token is logged for requests that
-#				triggered "ssl_bump" ACL evaluation matching
-#				either a "none" rule or no rules at all.
-#
-#				In all other cases, a single dash ("-") is
-#				logged.
-#
-#	If ICAP is enabled, the following code becomes available (as
-#	well as ICAP log codes documented with the icap_log option):
-#
-#		icap::tt        Total ICAP processing time for the HTTP
-#				transaction. The timer ticks when ICAP
-#				ACLs are checked and when ICAP
-#				transaction is in progress.
-#
-#	If adaptation is enabled the following three codes become available:
-#
-#		adapt::<last_h	The header of the last ICAP response or
-#				meta-information from the last eCAP
-#				transaction related to the HTTP transaction.
-#				Like <h, accepts an optional header name
-#				argument.
-#
-#		adapt::sum_trs Summed adaptation transaction response
-#				times recorded as a comma-separated list in
-#				the order of transaction start time. Each time
-#				value is recorded as an integer number,
-#				representing response time of one or more
-#				adaptation (ICAP or eCAP) transaction in
-#				milliseconds.  When a failed transaction is
-#				being retried or repeated, its time is not
-#				logged individually but added to the
-#				replacement (next) transaction. See also:
-#				adapt::all_trs.
-#
-#		adapt::all_trs All adaptation transaction response times.
-#				Same as adaptation_strs but response times of
-#				individual transactions are never added
-#				together. Instead, all transaction response
-#				times are recorded individually.
-#
-#	You can prefix adapt::*_trs format codes with adaptation
-#	service name in curly braces to record response time(s) specific
-#	to that service. For example: %{my_service}adapt::sum_trs
-#
-#	If SSL is enabled, the following formating codes become available:
-#
-#		%ssl::>cert_subject The Subject field of the received client
-#				SSL certificate or a dash ('-') if Squid has
-#				received an invalid/malformed certificate or
-#				no certificate at all. Consider encoding the
-#				logged value because Subject often has spaces.
-#
-#		%ssl::>cert_issuer The Issuer field of the received client
-#				SSL certificate or a dash ('-') if Squid has
-#				received an invalid/malformed certificate or
-#				no certificate at all. Consider encoding the
-#				logged value because Issuer often has spaces.
-#
-#	The default formats available (which do not need re-defining) are:
-#
-#logformat squid      %ts.%03tu %6tr %>a %Ss/%03>Hs %<st %rm %ru %[un %Sh/%<a %mt
-#logformat common     %>a %[ui %[un [%tl] "%rm %ru HTTP/%rv" %>Hs %<st %Ss:%Sh
-#logformat combined   %>a %[ui %[un [%tl] "%rm %ru HTTP/%rv" %>Hs %<st "%{Referer}>h" "%{User-Agent}>h" %Ss:%Sh
-#logformat referrer   %ts.%03tu %>a %{Referer}>h %ru
-#logformat useragent  %>a [%tl] "%{User-Agent}>h"
-#
-#	NOTE: When the log_mime_hdrs directive is set to ON.
-#		The squid, common and combined formats have a safely encoded copy
-#		of the mime headers appended to each line within a pair of brackets.
-#
-#	NOTE: The common and combined formats are not quite true to the Apache definition.
-#		The logs from Squid contain an extra status and hierarchy code appended.
-#
-#Default:
-# The format definitions squid, common, combined, referrer, useragent are built in.
-
-#  TAG: access_log
-#	Configures whether and how Squid logs HTTP and ICP transactions.
-#	If access logging is enabled, a single line is logged for every 
-#	matching HTTP or ICP request. The recommended directive formats are:
-#
-#	access_log <module>:<place> [option ...] [acl acl ...]
-#	access_log none [acl acl ...]
-#
-#	The following directive format is accepted but may be deprecated:
-#	access_log <module>:<place> [<logformat name> [acl acl ...]]
-#
-#        In most cases, the first ACL name must not contain the '=' character
-#	and should not be equal to an existing logformat name. You can always
-#	start with an 'all' ACL to work around those restrictions.
-#	
-#	Will log to the specified module:place using the specified format (which
-#	must be defined in a logformat directive) those entries which match
-#	ALL the acl's specified (which must be defined in acl clauses).
-#	If no acl is specified, all requests will be logged to this destination.
-#	
-#	===== Available options for the recommended directive format =====
-#
-#	logformat=name		Names log line format (either built-in or
-#				defined by a logformat directive). Defaults
-#				to 'squid'.
-#
-#	buffer-size=64KB	Defines approximate buffering limit for log
-#				records (see buffered_logs).  Squid should not
-#				keep more than the specified size and, hence,
-#				should flush records before the buffer becomes
-#				full to avoid overflows under normal
-#				conditions (the exact flushing algorithm is
-#				module-dependent though).  The on-error option
-#				controls overflow handling.
-#
-#	on-error=die|drop	Defines action on unrecoverable errors. The
-#				'drop' action ignores (i.e., does not log)
-#				affected log records. The default 'die' action
-#				kills the affected worker. The drop action 
-#				support has not been tested for modules other
-#				than tcp.
-#
-#	===== Modules Currently available =====
-#	
-#	none	Do not log any requests matching these ACL.
-#		Do not specify Place or logformat name.
-#	
-#	stdio	Write each log line to disk immediately at the completion of
-#		each request.
-#		Place: the filename and path to be written.
-#	
-#	daemon	Very similar to stdio. But instead of writing to disk the log
-#		line is passed to a daemon helper for asychronous handling instead.
-#		Place: varies depending on the daemon.
-#		
-#		log_file_daemon Place: the file name and path to be written.
-#	
-#	syslog	To log each request via syslog facility.
-#		Place: The syslog facility and priority level for these entries.
-#		Place Format:  facility.priority
-#
-#		where facility could be any of:
-#			authpriv, daemon, local0 ... local7 or user.
-#
-#		And priority could be any of:
-#			err, warning, notice, info, debug.
-#	
-#	udp	To send each log line as text data to a UDP receiver.
-#		Place: The destination host name or IP and port.
-#		Place Format:   //host:port
-#
-#	tcp	To send each log line as text data to a TCP receiver.
-#		Lines may be accumulated before sending (see buffered_logs).
-#		Place: The destination host name or IP and port.
-#		Place Format:   //host:port
-#
-#	Default:
-#		access_log daemon:/var/log/squid/access.log squid
-#Default:
-# access_log daemon:/var/log/squid/access.log squid
-
-#  TAG: icap_log
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-icap-client
-#
-#	ICAP log files record ICAP transaction summaries, one line per
-#	transaction.
-#
-#	The icap_log option format is:
-#	icap_log <filepath> [<logformat name> [acl acl ...]]
-#	icap_log none [acl acl ...]]
-#	
-#	Please see access_log option documentation for details. The two
-#	kinds of logs share the overall configuration approach and many
-#	features.
-#
-#	ICAP processing of a single HTTP message or transaction may
-#	require multiple ICAP transactions.  In such cases, multiple
-#	ICAP transaction log lines will correspond to a single access
-#	log line.
-#
-#	ICAP log uses logformat codes that make sense for an ICAP
-#	transaction. Header-related codes are applied to the HTTP header
-#	embedded in an ICAP server response, with the following caveats:
-#	For REQMOD, there is no HTTP response header unless the ICAP
-#	server performed request satisfaction. For RESPMOD, the HTTP
-#	request header is the header sent to the ICAP server. For
-#	OPTIONS, there are no HTTP headers.
-#
-#	The following format codes are also available for ICAP logs:
-#
-#		icap::<A	ICAP server IP address. Similar to <A.
-#
-#		icap::<service_name	ICAP service name from the icap_service
-#				option in Squid configuration file.
-#
-#		icap::ru	ICAP Request-URI. Similar to ru.
-#
-#		icap::rm	ICAP request method (REQMOD, RESPMOD, or 
-#				OPTIONS). Similar to existing rm.
-#
-#		icap::>st	Bytes sent to the ICAP server (TCP payload
-#				only; i.e., what Squid writes to the socket).
-#
-#		icap::<st	Bytes received from the ICAP server (TCP
-#				payload only; i.e., what Squid reads from
-#				the socket).
-#
-#		icap::<bs	Number of message body bytes received from the
-#				ICAP server. ICAP message body, if any, usually
-#				includes encapsulated HTTP message headers and
-#				possibly encapsulated HTTP message body. The
-#				HTTP body part is dechunked before its size is
-#				computed.
-#
-#		icap::tr 	Transaction response time (in
-#				milliseconds).  The timer starts when
-#				the ICAP transaction is created and
-#				stops when the transaction is completed.
-#				Similar to tr.
-#
-#		icap::tio	Transaction I/O time (in milliseconds). The
-#				timer starts when the first ICAP request
-#				byte is scheduled for sending. The timers
-#				stops when the last byte of the ICAP response
-#				is received.
-#
-#		icap::to 	Transaction outcome: ICAP_ERR* for all
-#				transaction errors, ICAP_OPT for OPTION
-#				transactions, ICAP_ECHO for 204
-#				responses, ICAP_MOD for message
-#				modification, and ICAP_SAT for request
-#				satisfaction. Similar to Ss.
-#
-#		icap::Hs	ICAP response status code. Similar to Hs.
-#
-#		icap::>h	ICAP request header(s). Similar to >h.
-#
-#		icap::<h	ICAP response header(s). Similar to <h.
-#
-#	The default ICAP log format, which can be used without an explicit
-#	definition, is called icap_squid:
-#
-#logformat icap_squid %ts.%03tu %6icap::tr %>a %icap::to/%03icap::Hs %icap::<size %icap::rm %icap::ru% %un -/%icap::<A -
-#
-#	See also: logformat, log_icap, and %adapt::<last_h 
-#Default:
-# none
-
-#  TAG: logfile_daemon
-#	Specify the path to the logfile-writing daemon. This daemon is
-#	used to write the access and store logs, if configured.
-#
-#	Squid sends a number of commands to the log daemon:
-#	  L<data>\n - logfile data
-#	  R\n - rotate file
-#	  T\n - truncate file
-#	  O\n - reopen file
-#	  F\n - flush file
-#	  r<n>\n - set rotate count to <n>
-#	  b<n>\n - 1 = buffer output, 0 = don't buffer output
-#
-#	No responses is expected.
-#Default:
-# logfile_daemon /usr/libexec/log_file_daemon
-
-#  TAG: log_access
-#	Remove this line. Use acls with access_log directives to control access logging
-#Default:
-# none
-
-#  TAG: log_icap
-#	Remove this line. Use acls with icap_log directives to control icap logging
-#Default:
-# none
-
-#  TAG: stats_collection	allow|deny acl acl...
-#	This options allows you to control which requests gets accounted
-#	in performance counters.
-#
-#	This clause only supports fast acl types.
-#	See http://wiki.squid-cache.org/SquidFaq/SquidAcl for details.
-#Default:
-# Allow logging for all transactions.
-
-#  TAG: cache_store_log
-#	Logs the activities of the storage manager.  Shows which
-#	objects are ejected from the cache, and which objects are
-#	saved and for how long.
-#	There are not really utilities to analyze this data, so you can safely
-#	disable it (the default).
-#	
-#	Store log uses modular logging outputs. See access_log for the list
-#	of modules supported.
-#	
-#	Example:
-#		cache_store_log stdio:/var/log/squid/store.log
-#		cache_store_log daemon:/var/log/squid/store.log
-#Default:
-# none
-
-#  TAG: cache_swap_state
-#	Location for the cache "swap.state" file. This index file holds
-#	the metadata of objects saved on disk.  It is used to rebuild
-#	the cache during startup.  Normally this file resides in each
-#	'cache_dir' directory, but you may specify an alternate
-#	pathname here.  Note you must give a full filename, not just
-#	a directory. Since this is the index for the whole object
-#	list you CANNOT periodically rotate it!
-#
-#	If %s can be used in the file name it will be replaced with a
-#	a representation of the cache_dir name where each / is replaced
-#	with '.'. This is needed to allow adding/removing cache_dir
-#	lines when cache_swap_log is being used.
-#
-#	If have more than one 'cache_dir', and %s is not used in the name
-#	these swap logs will have names such as:
-#
-#		cache_swap_log.00
-#		cache_swap_log.01
-#		cache_swap_log.02
-#
-#	The numbered extension (which is added automatically)
-#	corresponds to the order of the 'cache_dir' lines in this
-#	configuration file.  If you change the order of the 'cache_dir'
-#	lines in this file, these index files will NOT correspond to
-#	the correct 'cache_dir' entry (unless you manually rename
-#	them).  We recommend you do NOT use this option.  It is
-#	better to keep these index files in each 'cache_dir' directory.
-#Default:
-# Store the journal inside its cache_dir
-
-#  TAG: logfile_rotate
-#	Specifies the number of logfile rotations to make when you
-#	type 'squid -k rotate'. The default is 10, which will rotate
-#	with extensions 0 through 9. Setting logfile_rotate to 0 will
-#	disable the file name rotation, but the logfiles are still closed
-#	and re-opened. This will enable you to rename the logfiles
-#	yourself just before sending the rotate signal.
-#
-#	Note, the 'squid -k rotate' command normally sends a USR1
-#	signal to the running squid process.  In certain situations
-#	(e.g. on Linux with Async I/O), USR1 is used for other
-#	purposes, so -k rotate uses another signal.  It is best to get
-#	in the habit of using 'squid -k rotate' instead of 'kill -USR1
-#	<pid>'.
-#
-#	Note, from Squid-3.1 this option is only a default for cache.log,
-#	that log can be rotated separately by using debug_options.
-#Default:
-# logfile_rotate 10
-
-#  TAG: emulate_httpd_log
-#	Replace this with an access_log directive using the format 'common' or 'combined'.
-#Default:
-# none
-
-#  TAG: log_ip_on_direct
-#	Remove this option from your config. To log server or peer names use %<A in the log format.
-#Default:
-# none
-
-#  TAG: mime_table
-#	Path to Squid's icon configuration file.
-#
-#	You shouldn't need to change this, but the default file contains
-#	examples and formatting information if you do.
-#Default:
-# mime_table /etc/squid/mime.conf
-
-#  TAG: log_mime_hdrs	on|off
-#	The Cache can record both the request and the response MIME
-#	headers for each HTTP transaction.  The headers are encoded
-#	safely and will appear as two bracketed fields at the end of
-#	the access log (for either the native or httpd-emulated log
-#	formats).  To enable this logging set log_mime_hdrs to 'on'.
-#Default:
-# log_mime_hdrs off
-
-#  TAG: useragent_log
-#	Replace this with an access_log directive using the format 'useragent'.
-#Default:
-# none
-
-#  TAG: referer_log
-#	Replace this with an access_log directive using the format 'referrer'.
-#Default:
-# none
-
-#  TAG: pid_filename
-#	A filename to write the process-id to.  To disable, enter "none".
-#Default:
-# pid_filename /var/run/squid
-
-#  TAG: log_fqdn
-#	Remove this option from your config. To log FQDN use %>A in the log format.
-#Default:
-# none
-
-#  TAG: client_netmask
-#	A netmask for client addresses in logfiles and cachemgr output.
-#	Change this to protect the privacy of your cache clients.
-#	A netmask of 255.255.255.0 will log all IP's in that range with
-#	the last digit set to '0'.
-#Default:
-# Log full client IP address
-
-#  TAG: forward_log
-#	Use a regular access.log with ACL limiting it to MISS events.
-#Default:
-# none
-
-#  TAG: strip_query_terms
-#	By default, Squid strips query terms from requested URLs before
-#	logging.  This protects your user's privacy and reduces log size.
-#
-#	When investigating HIT/MISS or other caching behaviour you
-#	will need to disable this to see the full URL used by Squid.
-#Default:
-# strip_query_terms on
-
-#  TAG: buffered_logs	on|off
-#	Whether to write/send access_log records ASAP or accumulate them and
-#	then write/send them in larger chunks. Buffering may improve
-#	performance because it decreases the number of I/Os. However,
-#	buffering increases the delay before log records become available to
-#	the final recipient (e.g., a disk file or logging daemon) and,
-#	hence, increases the risk of log records loss.
-#
-#	Note that even when buffered_logs are off, Squid may have to buffer
-#	records if it cannot write/send them immediately due to pending I/Os
-#	(e.g., the I/O writing the previous log record) or connectivity loss.
-#
-#	Currently honored by 'daemon' and 'tcp' access_log modules only.
-#Default:
-# buffered_logs off
-
-#  TAG: netdb_filename
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-icmp
-#
-#	Where Squid stores it's netdb journal.
-#	When enabled this journal preserves netdb state between restarts.
-#
-#	To disable, enter "none".
-#Default:
-# netdb_filename stdio:/var/log/squid/netdb.state
-
-# OPTIONS FOR TROUBLESHOOTING
-# -----------------------------------------------------------------------------
-
-#  TAG: cache_log
-#	Squid administrative logging file.
-#
-#	This is where general information about Squid behavior goes. You can
-#	increase the amount of data logged to this file and how often it is
-#	rotated with "debug_options"
-#Default:
-# cache_log /var/log/squid/cache.log
-
-#  TAG: debug_options
-#	Logging options are set as section,level where each source file
-#	is assigned a unique section.  Lower levels result in less
-#	output,  Full debugging (level 9) can result in a very large
-#	log file, so be careful.
-#
-#	The magic word "ALL" sets debugging levels for all sections.
-#	The default is to run with "ALL,1" to record important warnings.
-#
-#	The rotate=N option can be used to keep more or less of these logs
-#	than would otherwise be kept by logfile_rotate.
-#	For most uses a single log should be enough to monitor current
-#	events affecting Squid.
-#Default:
-# Log all critical and important messages.
-
-#  TAG: coredump_dir
-#	By default Squid leaves core files in the directory from where
-#	it was started. If you set 'coredump_dir' to a directory
-#	that exists, Squid will chdir() to that directory at startup
-#	and coredump files will be left there.
-#
-#Default:
-# Use the directory from where Squid was started.
-#
-
-# Leave coredumps in the first cache dir
-coredump_dir /var/log/squid/cache/squid
-
-# OPTIONS FOR FTP GATEWAYING
-# -----------------------------------------------------------------------------
-
-#  TAG: ftp_user
-#	If you want the anonymous login password to be more informative
-#	(and enable the use of picky FTP servers), set this to something
-#	reasonable for your domain, like wwwuser@somewhere.net
-#
-#	The reason why this is domainless by default is the
-#	request can be made on the behalf of a user in any domain,
-#	depending on how the cache is used.
-#	Some FTP server also validate the email address is valid
-#	(for example perl.com).
-#Default:
-# ftp_user Squid@
-
-#  TAG: ftp_passive
-#	If your firewall does not allow Squid to use passive
-#	connections, turn off this option.
-#
-#	Use of ftp_epsv_all option requires this to be ON.
-#Default:
-# ftp_passive on
-
-#  TAG: ftp_epsv_all
-#	FTP Protocol extensions permit the use of a special "EPSV ALL" command.
-#
-#	NATs may be able to put the connection on a "fast path" through the
-#	translator, as the EPRT command will never be used and therefore,
-#	translation of the data portion of the segments will never be needed.
-#
-#	When a client only expects to do two-way FTP transfers this may be
-#	useful.
-#	If squid finds that it must do a three-way FTP transfer after issuing
-#	an EPSV ALL command, the FTP session will fail.
-#
-#	If you have any doubts about this option do not use it.
-#	Squid will nicely attempt all other connection methods.
-#
-#	Requires ftp_passive to be ON (default) for any effect.
-#Default:
-# ftp_epsv_all off
-
-#  TAG: ftp_epsv
-#	FTP Protocol extensions permit the use of a special "EPSV" command.
-#
-#	NATs may be able to put the connection on a "fast path" through the
-#	translator using EPSV, as the EPRT command will never be used
-#	and therefore, translation of the data portion of the segments 
-#	will never be needed.
-#
-#	Turning this OFF will prevent EPSV being attempted.
-#	WARNING: Doing so will convert Squid back to the old behavior with all
-#	the related problems with external NAT devices/layers.
-#
-#	Requires ftp_passive to be ON (default) for any effect.
-#Default:
-# ftp_epsv on
-
-#  TAG: ftp_eprt
-#	FTP Protocol extensions permit the use of a special "EPRT" command.
-#
-#	This extension provides a protocol neutral alternative to the
-#	IPv4-only PORT command. When supported it enables active FTP data
-#	channels over IPv6 and efficient NAT handling.
-#
-#	Turning this OFF will prevent EPRT being attempted and will skip
-#	straight to using PORT for IPv4 servers.
-#
-#	Some devices are known to not handle this extension correctly and
-#	may result in crashes. Devices which suport EPRT enough to fail
-#	cleanly will result in Squid attempting PORT anyway. This directive
-#	should only be disabled when EPRT results in device failures.
-#
-#	WARNING: Doing so will convert Squid back to the old behavior with all
-#	the related problems with external NAT devices/layers and IPv4-only FTP.
-#Default:
-# ftp_eprt on
-
-#  TAG: ftp_sanitycheck
-#	For security and data integrity reasons Squid by default performs
-#	sanity checks of the addresses of FTP data connections ensure the
-#	data connection is to the requested server. If you need to allow
-#	FTP connections to servers using another IP address for the data
-#	connection turn this off.
-#Default:
-# ftp_sanitycheck on
-
-#  TAG: ftp_telnet_protocol
-#	The FTP protocol is officially defined to use the telnet protocol
-#	as transport channel for the control connection. However, many
-#	implementations are broken and does not respect this aspect of
-#	the FTP protocol.
-#
-#	If you have trouble accessing files with ASCII code 255 in the
-#	path or similar problems involving this ASCII code you can
-#	try setting this directive to off. If that helps, report to the
-#	operator of the FTP server in question that their FTP server
-#	is broken and does not follow the FTP standard.
-#Default:
-# ftp_telnet_protocol on
-
-# OPTIONS FOR EXTERNAL SUPPORT PROGRAMS
-# -----------------------------------------------------------------------------
-
-#  TAG: diskd_program
-#	Specify the location of the diskd executable.
-#	Note this is only useful if you have compiled in
-#	diskd as one of the store io modules.
-#Default:
-# diskd_program /usr/libexec/diskd
-
-#  TAG: unlinkd_program
-#	Specify the location of the executable for file deletion process.
-#Default:
-# unlinkd_program /usr/libexec/unlinkd
-
-#  TAG: pinger_program
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-icmp
-#
-#	Specify the location of the executable for the pinger process.
-#Default:
-# pinger_program /usr/libexec/pinger
-
-#  TAG: pinger_enable
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-icmp
-#
-#	Control whether the pinger is active at run-time.
-#	Enables turning ICMP pinger on and off with a simple
-#	squid -k reconfigure.
-#Default:
-# pinger_enable on
-
-# OPTIONS FOR URL REWRITING
-# -----------------------------------------------------------------------------
-
-#  TAG: url_rewrite_program
-#	Specify the location of the executable URL rewriter to use.
-#	Since they can perform almost any function there isn't one included.
-#
-#	For each requested URL, the rewriter will receive on line with the format
-#
-#	  [channel-ID <SP>] URL <SP> client_ip "/" fqdn <SP> user <SP> method [<SP> kv-pairs]<NL>
-#
-#
-#	After processing the request the helper must reply using the following format:
-#
-#	  [channel-ID <SP>] result [<SP> kv-pairs]
-#
-#	The result code can be:
-#
-#	  OK status=30N url="..."
-#		Redirect the URL to the one supplied in 'url='.
-#		'status=' is optional and contains the status code to send
-#		the client in Squids HTTP response. It must be one of the
-#		HTTP redirect status codes: 301, 302, 303, 307, 308.
-#		When no status is given Squid will use 302.
-#
-#	  OK rewrite-url="..."
-#		Rewrite the URL to the one supplied in 'rewrite-url='.
-#		The new URL is fetched directly by Squid and returned to
-#		the client as the response to its request.
-#
-#	  OK
-#		When neither of url= and rewrite-url= are sent Squid does
-#		not change the URL.
-#
-#	  ERR
-#		Do not change the URL.
-#
-#	  BH
-#		An internal error occurred in the helper, preventing
-#		a result being identified. The 'message=' key name is
-#		reserved for delivering a log message.
-#
-#
-#	In the future, the interface protocol will be extended with
-#	key=value pairs ("kv-pairs" shown above).  Helper programs
-#	should be prepared to receive and possibly ignore additional
-#	whitespace-separated tokens on each input line.
-#
-#	When using the concurrency= option the protocol is changed by
-#	introducing a query channel tag in front of the request/response.
-#	The query channel tag is a number between 0 and concurrency-1.
-#	This value must be echoed back unchanged to Squid as the first part
-#	of the response relating to its request.
-#
-#	WARNING: URL re-writing ability should be avoided whenever possible.
-#		 Use the URL redirect form of response instead.
-#
-#	Re-write creates a difference in the state held by the client
-#	and server. Possibly causing confusion when the server response
-#	contains snippets of its view state. Embeded URLs, response
-#	and content Location headers, etc. are not re-written by this
-#	interface.
-#
-#	By default, a URL rewriter is not used.
-#Default:
-# none
-
-#  TAG: url_rewrite_children
-#	The maximum number of redirector processes to spawn. If you limit
-#	it too few Squid will have to wait for them to process a backlog of
-#	URLs, slowing it down. If you allow too many they will use RAM
-#	and other system resources noticably.
-#	
-#	The startup= and idle= options allow some measure of skew in your
-#	tuning.
-#	
-#		startup=
-#	
-#	Sets a minimum of how many processes are to be spawned when Squid
-#	starts or reconfigures. When set to zero the first request will
-#	cause spawning of the first child process to handle it.
-#	
-#	Starting too few will cause an initial slowdown in traffic as Squid
-#	attempts to simultaneously spawn enough processes to cope.
-#	
-#		idle=
-#	
-#	Sets a minimum of how many processes Squid is to try and keep available
-#	at all times. When traffic begins to rise above what the existing
-#	processes can handle this many more will be spawned up to the maximum
-#	configured. A minimum setting of 1 is required.
-#
-#		concurrency=
-#
-#	The number of requests each redirector helper can handle in
-#	parallel. Defaults to 0 which indicates the redirector
-#	is a old-style single threaded redirector.
-#
-#	When this directive is set to a value >= 1 then the protocol
-#	used to communicate with the helper is modified to include
-#	an ID in front of the request/response. The ID from the request
-#	must be echoed back with the response to that request.
-#Default:
-# url_rewrite_children 20 startup=0 idle=1 concurrency=0
-
-#  TAG: url_rewrite_host_header
-#	To preserve same-origin security policies in browsers and
-#	prevent Host: header forgery by redirectors Squid rewrites
-#	any Host: header in redirected requests.
-#	
-#	If you are running an accelerator this may not be a wanted
-#	effect of a redirector. This directive enables you disable
-#	Host: alteration in reverse-proxy traffic.
-#	
-#	WARNING: Entries are cached on the result of the URL rewriting
-#	process, so be careful if you have domain-virtual hosts.
-#	
-#	WARNING: Squid and other software verifies the URL and Host
-#	are matching, so be careful not to relay through other proxies
-#	or inspecting firewalls with this disabled.
-#Default:
-# url_rewrite_host_header on
-
-#  TAG: url_rewrite_access
-#	If defined, this access list specifies which requests are
-#	sent to the redirector processes.
-#
-#	This clause supports both fast and slow acl types.
-#	See http://wiki.squid-cache.org/SquidFaq/SquidAcl for details.
-#Default:
-# Allow, unless rules exist in squid.conf.
-
-#  TAG: url_rewrite_bypass
-#	When this is 'on', a request will not go through the
-#	redirector if all the helpers are busy.  If this is 'off'
-#	and the redirector queue grows too large, Squid will exit
-#	with a FATAL error and ask you to increase the number of
-#	redirectors.  You should only enable this if the redirectors
-#	are not critical to your caching system.  If you use
-#	redirectors for access control, and you enable this option,
-#	users may have access to pages they should not
-#	be allowed to request.
-#Default:
-# url_rewrite_bypass off
-
-# OPTIONS FOR STORE ID
-# -----------------------------------------------------------------------------
-
-#  TAG: store_id_program
-#	Specify the location of the executable StoreID helper to use.
-#	Since they can perform almost any function there isn't one included.
-#
-#	For each requested URL, the helper will receive one line with the format
-#
-#	  [channel-ID <SP>] URL <SP> client_ip "/" fqdn <SP> user <SP> method [<SP> kv-pairs]<NL>
-#
-#
-#	After processing the request the helper must reply using the following format:
-#
-#	  [channel-ID <SP>] result [<SP> kv-pairs]
-#
-#	The result code can be:
-#
-#	  OK store-id="..."
-#		Use the StoreID supplied in 'store-id='.
-#
-#	  ERR
-#		The default is to use HTTP request URL as the store ID.
-#
-#	  BH
-#		An internal error occured in the helper, preventing
-#		a result being identified.
-#
-#
-#	Helper programs should be prepared to receive and possibly ignore additional
-#	kv-pairs with keys they do not support.
-#
-#	When using the concurrency= option the protocol is changed by
-#	introducing a query channel tag in front of the request/response.
-#	The query channel tag is a number between 0 and concurrency-1.
-#	This value must be echoed back unchanged to Squid as the first part
-#	of the response relating to its request.
-#
-#	NOTE: when using StoreID refresh_pattern will apply to the StoreID
-#	      returned from the helper and not the URL.
-#
-#	WARNING: Wrong StoreID value returned by a careless helper may result
-#	         in the wrong cached response returned to the user.
-#
-#	By default, a StoreID helper is not used.
-#Default:
-# none
-
-#  TAG: store_id_children
-#	The maximum number of StoreID helper processes to spawn. If you limit
-#	it too few Squid will have to wait for them to process a backlog of
-#	requests, slowing it down. If you allow too many they will use RAM
-#	and other system resources noticably.
-#	
-#	The startup= and idle= options allow some measure of skew in your
-#	tuning.
-#	
-#		startup=
-#	
-#	Sets a minimum of how many processes are to be spawned when Squid
-#	starts or reconfigures. When set to zero the first request will
-#	cause spawning of the first child process to handle it.
-#	
-#	Starting too few will cause an initial slowdown in traffic as Squid
-#	attempts to simultaneously spawn enough processes to cope.
-#	
-#		idle=
-#	
-#	Sets a minimum of how many processes Squid is to try and keep available
-#	at all times. When traffic begins to rise above what the existing
-#	processes can handle this many more will be spawned up to the maximum
-#	configured. A minimum setting of 1 is required.
-#
-#		concurrency=
-#
-#	The number of requests each storeID helper can handle in
-#	parallel. Defaults to 0 which indicates the helper
-#	is a old-style single threaded program.
-#
-#	When this directive is set to a value >= 1 then the protocol
-#	used to communicate with the helper is modified to include
-#	an ID in front of the request/response. The ID from the request
-#	must be echoed back with the response to that request.
-#Default:
-# store_id_children 20 startup=0 idle=1 concurrency=0
-
-#  TAG: store_id_access
-#	If defined, this access list specifies which requests are
-#	sent to the StoreID processes.  By default all requests
-#	are sent.
-#
-#	This clause supports both fast and slow acl types.
-#	See http://wiki.squid-cache.org/SquidFaq/SquidAcl for details.
-#Default:
-# Allow, unless rules exist in squid.conf.
-
-#  TAG: store_id_bypass
-#	When this is 'on', a request will not go through the
-#	helper if all helpers are busy.  If this is 'off'
-#	and the helper queue grows too large, Squid will exit
-#	with a FATAL error and ask you to increase the number of
-#	helpers.  You should only enable this if the helperss
-#	are not critical to your caching system.  If you use
-#	helpers for critical caching components, and you enable this 
-#	option,	users may not get objects from cache.
-#Default:
-# store_id_bypass on
-
-# OPTIONS FOR TUNING THE CACHE
-# -----------------------------------------------------------------------------
-
-#  TAG: cache
-#	A list of ACL elements which, if matched and denied, cause the request to
-#	not be satisfied from the cache and the reply to not be cached.
-#	In other words, use this to force certain objects to never be cached.
-#
-#	You must use the words 'allow' or 'deny' to indicate whether items
-#	matching the ACL should be allowed or denied into the cache.
-#
-#	This clause supports both fast and slow acl types.
-#	See http://wiki.squid-cache.org/SquidFaq/SquidAcl for details.
-#Default:
-# Allow caching, unless rules exist in squid.conf.
-
-#  TAG: max_stale	time-units
-#	This option puts an upper limit on how stale content Squid
-#	will serve from the cache if cache validation fails.
-#	Can be overriden by the refresh_pattern max-stale option.
-#Default:
-# max_stale 1 week
-
-#  TAG: refresh_pattern
-#	usage: refresh_pattern [-i] regex min percent max [options]
-#
-#	By default, regular expressions are CASE-SENSITIVE.  To make
-#	them case-insensitive, use the -i option.
-#
-#	'Min' is the time (in minutes) an object without an explicit
-#	expiry time should be considered fresh. The recommended
-#	value is 0, any higher values may cause dynamic applications
-#	to be erroneously cached unless the application designer
-#	has taken the appropriate actions.
-#
-#	'Percent' is a percentage of the objects age (time since last
-#	modification age) an object without explicit expiry time
-#	will be considered fresh.
-#
-#	'Max' is an upper limit on how long objects without an explicit
-#	expiry time will be considered fresh.
-#
-#	options: override-expire
-#		 override-lastmod
-#		 reload-into-ims
-#		 ignore-reload
-#		 ignore-no-store
-#		 ignore-must-revalidate
-#		 ignore-private
-#		 ignore-auth
-#		 max-stale=NN
-#		 refresh-ims
-#		 store-stale
-#
-#		override-expire enforces min age even if the server
-#		sent an explicit expiry time (e.g., with the
-#		Expires: header or Cache-Control: max-age). Doing this
-#		VIOLATES the HTTP standard.  Enabling this feature
-#		could make you liable for problems which it causes.
-#
-#		Note: override-expire does not enforce staleness - it only extends
-#		freshness / min. If the server returns a Expires time which
-#		is longer than your max time, Squid will still consider
-#		the object fresh for that period of time.
-#
-#		override-lastmod enforces min age even on objects
-#		that were modified recently.
-#
-#		reload-into-ims changes a client no-cache or ``reload''
-#		request for a cached entry into a conditional request using
-#		If-Modified-Since and/or If-None-Match headers, provided the
-#		cached entry has a Last-Modified and/or a strong ETag header.
-#		Doing this VIOLATES the HTTP standard. Enabling this feature
-#		could make you liable for problems which it causes.
-#
-#		ignore-reload ignores a client no-cache or ``reload''
-#		header. Doing this VIOLATES the HTTP standard. Enabling
-#		this feature could make you liable for problems which
-#		it causes.
-#
-#		ignore-no-store ignores any ``Cache-control: no-store''
-#		headers received from a server. Doing this VIOLATES
-#		the HTTP standard. Enabling this feature could make you
-#		liable for problems which it causes.
-#
-#		ignore-must-revalidate ignores any ``Cache-Control: must-revalidate``
-#		headers received from a server. Doing this VIOLATES
-#		the HTTP standard. Enabling this feature could make you
-#		liable for problems which it causes.
-#
-#		ignore-private ignores any ``Cache-control: private''
-#		headers received from a server. Doing this VIOLATES
-#		the HTTP standard. Enabling this feature could make you
-#		liable for problems which it causes.
-#
-#		ignore-auth caches responses to requests with authorization,
-#		as if the originserver had sent ``Cache-control: public''
-#		in the response header. Doing this VIOLATES the HTTP standard.
-#		Enabling this feature could make you liable for problems which
-#		it causes.
-#
-#		refresh-ims causes squid to contact the origin server
-#		when a client issues an If-Modified-Since request. This
-#		ensures that the client will receive an updated version
-#		if one is available.
-#
-#		store-stale stores responses even if they don't have explicit 
-#		freshness or a validator (i.e., Last-Modified or an ETag) 
-#		present, or if they're already stale. By default, Squid will 
-#		not cache such responses because they usually can't be
-#		reused. Note that such responses will be stale by default.
-#
-#		max-stale=NN provide a maximum staleness factor. Squid won't
-#		serve objects more stale than this even if it failed to
-#		validate the object. Default: use the max_stale global limit.
-#
-#	Basically a cached object is:
-#
-#		FRESH if expires < now, else STALE
-#		STALE if age > max
-#		FRESH if lm-factor < percent, else STALE
-#		FRESH if age < min
-#		else STALE
-#
-#	The refresh_pattern lines are checked in the order listed here.
-#	The first entry which matches is used.  If none of the entries
-#	match the default will be used.
-#
-#	Note, you must uncomment all the default lines if you want
-#	to change one. The default setting is only active if none is
-#	used.
-#
-#
-
-#
-# Add any of your own refresh_pattern entries above these.
-#
-refresh_pattern ^ftp:		1440	20%	10080
-refresh_pattern ^gopher:	1440	0%	1440
-refresh_pattern -i (/cgi-bin/|\?) 0	0%	0
-refresh_pattern .		0	20%	4320
-
-#  TAG: quick_abort_min	(KB)
-#Default:
-# quick_abort_min 16 KB
-
-#  TAG: quick_abort_max	(KB)
-#Default:
-# quick_abort_max 16 KB
-
-#  TAG: quick_abort_pct	(percent)
-#	The cache by default continues downloading aborted requests
-#	which are almost completed (less than 16 KB remaining). This
-#	may be undesirable on slow (e.g. SLIP) links and/or very busy
-#	caches.  Impatient users may tie up file descriptors and
-#	bandwidth by repeatedly requesting and immediately aborting
-#	downloads.
-#
-#	When the user aborts a request, Squid will check the
-#	quick_abort values to the amount of data transferred until
-#	then.
-#
-#	If the transfer has less than 'quick_abort_min' KB remaining,
-#	it will finish the retrieval.
-#
-#	If the transfer has more than 'quick_abort_max' KB remaining,
-#	it will abort the retrieval.
-#
-#	If more than 'quick_abort_pct' of the transfer has completed,
-#	it will finish the retrieval.
-#
-#	If you do not want any retrieval to continue after the client
-#	has aborted, set both 'quick_abort_min' and 'quick_abort_max'
-#	to '0 KB'.
-#
-#	If you want retrievals to always continue if they are being
-#	cached set 'quick_abort_min' to '-1 KB'.
-#Default:
-# quick_abort_pct 95
-
-#  TAG: read_ahead_gap	buffer-size
-#	The amount of data the cache will buffer ahead of what has been
-#	sent to the client when retrieving an object from another server.
-#Default:
-# read_ahead_gap 16 KB
-
-#  TAG: negative_ttl	time-units
-#	Set the Default Time-to-Live (TTL) for failed requests.
-#	Certain types of failures (such as "connection refused" and
-#	"404 Not Found") are able to be negatively-cached for a short time.
-#	Modern web servers should provide Expires: header, however if they
-#	do not this can provide a minimum TTL.
-#	The default is not to cache errors with unknown expiry details.
-#
-#	Note that this is different from negative caching of DNS lookups.
-#
-#	WARNING: Doing this VIOLATES the HTTP standard.  Enabling
-#	this feature could make you liable for problems which it
-#	causes.
-#Default:
-# negative_ttl 0 seconds
-
-#  TAG: positive_dns_ttl	time-units
-#	Upper limit on how long Squid will cache positive DNS responses.
-#	Default is 6 hours (360 minutes). This directive must be set
-#	larger than negative_dns_ttl.
-#Default:
-# positive_dns_ttl 6 hours
-
-#  TAG: negative_dns_ttl	time-units
-#	Time-to-Live (TTL) for negative caching of failed DNS lookups.
-#	This also sets the lower cache limit on positive lookups.
-#	Minimum value is 1 second, and it is not recommendable to go
-#	much below 10 seconds.
-#Default:
-# negative_dns_ttl 1 minutes
-
-#  TAG: range_offset_limit	size [acl acl...]
-#	usage: (size) [units] [[!]aclname]
-#	
-#	Sets an upper limit on how far (number of bytes) into the file 
-#	a Range request	may be to cause Squid to prefetch the whole file. 
-#	If beyond this limit, Squid forwards the Range request as it is and 
-#	the result is NOT cached.
-#	
-#	This is to stop a far ahead range request (lets say start at 17MB)
-#	from making Squid fetch the whole object up to that point before
-#	sending anything to the client.
-#	
-#	Multiple range_offset_limit lines may be specified, and they will 
-#	be searched from top to bottom on each request until a match is found. 
-#	The first match found will be used.  If no line matches a request, the 
-#	default limit of 0 bytes will be used.
-#	
-#	'size' is the limit specified as a number of units.
-#	
-#	'units' specifies whether to use bytes, KB, MB, etc.
-#	If no units are specified bytes are assumed.
-#	
-#	A size of 0 causes Squid to never fetch more than the
-#	client requested. (default)
-#	
-#	A size of 'none' causes Squid to always fetch the object from the
-#	beginning so it may cache the result. (2.0 style)
-#	
-#	'aclname' is the name of a defined ACL.
-#	
-#	NP: Using 'none' as the byte value here will override any quick_abort settings 
-#	    that may otherwise apply to the range request. The range request will
-#	    be fully fetched from start to finish regardless of the client
-#	    actions. This affects bandwidth usage.
-#Default:
-# none
-
-#  TAG: minimum_expiry_time	(seconds)
-#	The minimum caching time according to (Expires - Date)
-#	headers Squid honors if the object can't be revalidated.
-#	The default is 60 seconds.
-#
-#	In reverse proxy environments it might be desirable to honor
-#	shorter object lifetimes. It is most likely better to make
-#	your server return a meaningful Last-Modified header however.
-#
-#	In ESI environments where page fragments often have short
-#	lifetimes, this will often be best set to 0.
-#Default:
-# minimum_expiry_time 60 seconds
-
-#  TAG: store_avg_object_size	(bytes)
-#	Average object size, used to estimate number of objects your
-#	cache can hold.  The default is 13 KB.
-#
-#	This is used to pre-seed the cache index memory allocation to
-#	reduce expensive reallocate operations while handling clients
-#	traffic. Too-large values may result in memory allocation during
-#	peak traffic, too-small values will result in wasted memory.
-#
-#	Check the cache manager 'info' report metrics for the real
-#	object sizes seen by your Squid before tuning this.
-#Default:
-# store_avg_object_size 13 KB
-
-#  TAG: store_objects_per_bucket
-#	Target number of objects per bucket in the store hash table.
-#	Lowering this value increases the total number of buckets and
-#	also the storage maintenance rate.  The default is 20.
-#Default:
-# store_objects_per_bucket 20
-
-# HTTP OPTIONS
-# -----------------------------------------------------------------------------
-
-#  TAG: request_header_max_size	(KB)
-#	This specifies the maximum size for HTTP headers in a request.
-#	Request headers are usually relatively small (about 512 bytes).
-#	Placing a limit on the request header size will catch certain
-#	bugs (for example with persistent connections) and possibly
-#	buffer-overflow or denial-of-service attacks.
-#Default:
-# request_header_max_size 64 KB
-
-#  TAG: reply_header_max_size	(KB)
-#	This specifies the maximum size for HTTP headers in a reply.
-#	Reply headers are usually relatively small (about 512 bytes).
-#	Placing a limit on the reply header size will catch certain
-#	bugs (for example with persistent connections) and possibly
-#	buffer-overflow or denial-of-service attacks.
-#Default:
-# reply_header_max_size 64 KB
-
-#  TAG: request_body_max_size	(bytes)
-#	This specifies the maximum size for an HTTP request body.
-#	In other words, the maximum size of a PUT/POST request.
-#	A user who attempts to send a request with a body larger
-#	than this limit receives an "Invalid Request" error message.
-#	If you set this parameter to a zero (the default), there will
-#	be no limit imposed.
-#
-#	See also client_request_buffer_max_size for an alternative
-#	limitation on client uploads which can be configured.
-#Default:
-# No limit.
-
-#  TAG: client_request_buffer_max_size	(bytes)
-#	This specifies the maximum buffer size of a client request.
-#	It prevents squid eating too much memory when somebody uploads
-#	a large file.
-#Default:
-# client_request_buffer_max_size 512 KB
-
-#  TAG: chunked_request_body_max_size	(bytes)
-#	A broken or confused HTTP/1.1 client may send a chunked HTTP
-#	request to Squid. Squid does not have full support for that
-#	feature yet. To cope with such requests, Squid buffers the
-#	entire request and then dechunks request body to create a
-#	plain HTTP/1.0 request with a known content length. The plain
-#	request is then used by the rest of Squid code as usual.
-#
-#	The option value specifies the maximum size of the buffer used
-#	to hold the request before the conversion. If the chunked
-#	request size exceeds the specified limit, the conversion
-#	fails, and the client receives an "unsupported request" error,
-#	as if dechunking was disabled.
-#
-#	Dechunking is enabled by default. To disable conversion of
-#	chunked requests, set the maximum to zero.
-#
-#	Request dechunking feature and this option in particular are a
-#	temporary hack. When chunking requests and responses are fully
-#	supported, there will be no need to buffer a chunked request.
-#Default:
-# chunked_request_body_max_size 64 KB
-
-#  TAG: broken_posts
-#	A list of ACL elements which, if matched, causes Squid to send
-#	an extra CRLF pair after the body of a PUT/POST request.
-#
-#	Some HTTP servers has broken implementations of PUT/POST,
-#	and rely on an extra CRLF pair sent by some WWW clients.
-#
-#	Quote from RFC2616 section 4.1 on this matter:
-#
-#	  Note: certain buggy HTTP/1.0 client implementations generate an
-#	  extra CRLF's after a POST request. To restate what is explicitly
-#	  forbidden by the BNF, an HTTP/1.1 client must not preface or follow
-#	  a request with an extra CRLF.
-#
-#	This clause only supports fast acl types.
-#	See http://wiki.squid-cache.org/SquidFaq/SquidAcl for details.
-#
-#Example:
-# acl buggy_server url_regex ^http://....
-# broken_posts allow buggy_server
-#Default:
-# Obey RFC 2616.
-
-#  TAG: adaptation_uses_indirect_client	on|off
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-follow-x-forwarded-for and (--enable-icap-client and/or --enable-ecap)
-#
-#	Controls whether the indirect client IP address (instead of the direct
-#	client IP address) is passed to adaptation services.
-#
-#	See also: follow_x_forwarded_for adaptation_send_client_ip
-#Default:
-# adaptation_uses_indirect_client on
-
-#  TAG: via	on|off
-#	If set (default), Squid will include a Via header in requests and
-#	replies as required by RFC2616.
-#Default:
-# via on
-
-#  TAG: ie_refresh	on|off
-#	Microsoft Internet Explorer up until version 5.5 Service
-#	Pack 1 has an issue with transparent proxies, wherein it
-#	is impossible to force a refresh.  Turning this on provides
-#	a partial fix to the problem, by causing all IMS-REFRESH
-#	requests from older IE versions to check the origin server
-#	for fresh content.  This reduces hit ratio by some amount
-#	(~10% in my experience), but allows users to actually get
-#	fresh content when they want it.  Note because Squid
-#	cannot tell if the user is using 5.5 or 5.5SP1, the behavior
-#	of 5.5 is unchanged from old versions of Squid (i.e. a
-#	forced refresh is impossible).  Newer versions of IE will,
-#	hopefully, continue to have the new behavior and will be
-#	handled based on that assumption.  This option defaults to
-#	the old Squid behavior, which is better for hit ratios but
-#	worse for clients using IE, if they need to be able to
-#	force fresh content.
-#Default:
-# ie_refresh off
-
-#  TAG: vary_ignore_expire	on|off
-#	Many HTTP servers supporting Vary gives such objects
-#	immediate expiry time with no cache-control header
-#	when requested by a HTTP/1.0 client. This option
-#	enables Squid to ignore such expiry times until
-#	HTTP/1.1 is fully implemented.
-#
-#	WARNING: If turned on this may eventually cause some
-#	varying objects not intended for caching to get cached.
-#Default:
-# vary_ignore_expire off
-
-#  TAG: request_entities
-#	Squid defaults to deny GET and HEAD requests with request entities,
-#	as the meaning of such requests are undefined in the HTTP standard
-#	even if not explicitly forbidden.
-#
-#	Set this directive to on if you have clients which insists
-#	on sending request entities in GET or HEAD requests. But be warned
-#	that there is server software (both proxies and web servers) which
-#	can fail to properly process this kind of request which may make you
-#	vulnerable to cache pollution attacks if enabled.
-#Default:
-# request_entities off
-
-#  TAG: request_header_access
-#	Usage: request_header_access header_name allow|deny [!]aclname ...
-#
-#	WARNING: Doing this VIOLATES the HTTP standard.  Enabling
-#	this feature could make you liable for problems which it
-#	causes.
-#
-#	This option replaces the old 'anonymize_headers' and the
-#	older 'http_anonymizer' option with something that is much
-#	more configurable. A list of ACLs for each header name allows
-#	removal of specific header fields under specific conditions.
-#
-#	This option only applies to outgoing HTTP request headers (i.e.,
-#	headers sent by Squid to the next HTTP hop such as a cache peer
-#	or an origin server). The option has no effect during cache hit
-#	detection. The equivalent adaptation vectoring point in ICAP
-#	terminology is post-cache REQMOD.
-#
-#	The option is applied to individual outgoing request header
-#	fields. For each request header field F, Squid uses the first
-#	qualifying sets of request_header_access rules:
-#
-#	    1. Rules with header_name equal to F's name.
-#	    2. Rules with header_name 'Other', provided F's name is not
-#	       on the hard-coded list of commonly used HTTP header names.
-#	    3. Rules with header_name 'All'.
-#
-#	Within that qualifying rule set, rule ACLs are checked as usual.
-#	If ACLs of an "allow" rule match, the header field is allowed to
-#	go through as is. If ACLs of a "deny" rule match, the header is
-#	removed and request_header_replace is then checked to identify
-#	if the removed header has a replacement. If no rules within the
-#	set have matching ACLs, the header field is left as is.
-#
-#	For example, to achieve the same behavior as the old
-#	'http_anonymizer standard' option, you should use:
-#
-#		request_header_access From deny all
-#		request_header_access Referer deny all
-#		request_header_access User-Agent deny all
-#
-#	Or, to reproduce the old 'http_anonymizer paranoid' feature
-#	you should use:
-#
-#		request_header_access Authorization allow all
-#		request_header_access Proxy-Authorization allow all
-#		request_header_access Cache-Control allow all
-#		request_header_access Content-Length allow all
-#		request_header_access Content-Type allow all
-#		request_header_access Date allow all
-#		request_header_access Host allow all
-#		request_header_access If-Modified-Since allow all
-#		request_header_access Pragma allow all
-#		request_header_access Accept allow all
-#		request_header_access Accept-Charset allow all
-#		request_header_access Accept-Encoding allow all
-#		request_header_access Accept-Language allow all
-#		request_header_access Connection allow all
-#		request_header_access All deny all
-#
-#	HTTP reply headers are controlled with the reply_header_access directive.
-#
-#	By default, all headers are allowed (no anonymizing is performed).
-#Default:
-# No limits.
-
-#  TAG: reply_header_access
-#	Usage: reply_header_access header_name allow|deny [!]aclname ...
-#
-#	WARNING: Doing this VIOLATES the HTTP standard.  Enabling
-#	this feature could make you liable for problems which it
-#	causes.
-#
-#	This option only applies to reply headers, i.e., from the
-#	server to the client.
-#
-#	This is the same as request_header_access, but in the other
-#	direction. Please see request_header_access for detailed
-#	documentation.
-#
-#	For example, to achieve the same behavior as the old
-#	'http_anonymizer standard' option, you should use:
-#
-#		reply_header_access Server deny all
-#		reply_header_access WWW-Authenticate deny all
-#		reply_header_access Link deny all
-#
-#	Or, to reproduce the old 'http_anonymizer paranoid' feature
-#	you should use:
-#
-#		reply_header_access Allow allow all
-#		reply_header_access WWW-Authenticate allow all
-#		reply_header_access Proxy-Authenticate allow all
-#		reply_header_access Cache-Control allow all
-#		reply_header_access Content-Encoding allow all
-#		reply_header_access Content-Length allow all
-#		reply_header_access Content-Type allow all
-#		reply_header_access Date allow all
-#		reply_header_access Expires allow all
-#		reply_header_access Last-Modified allow all
-#		reply_header_access Location allow all
-#		reply_header_access Pragma allow all
-#		reply_header_access Content-Language allow all
-#		reply_header_access Retry-After allow all
-#		reply_header_access Title allow all
-#		reply_header_access Content-Disposition allow all
-#		reply_header_access Connection allow all
-#		reply_header_access All deny all
-#
-#	HTTP request headers are controlled with the request_header_access directive.
-#
-#	By default, all headers are allowed (no anonymizing is
-#	performed).
-#Default:
-# No limits.
-
-#  TAG: request_header_replace
-#	Usage:   request_header_replace header_name message
-#	Example: request_header_replace User-Agent Nutscrape/1.0 (CP/M; 8-bit)
-#
-#	This option allows you to change the contents of headers
-#	denied with request_header_access above, by replacing them
-#	with some fixed string.
-#
-#	This only applies to request headers, not reply headers.
-#
-#	By default, headers are removed if denied.
-#Default:
-# none
-
-#  TAG: reply_header_replace
-#        Usage:   reply_header_replace header_name message
-#        Example: reply_header_replace Server Foo/1.0
-#
-#        This option allows you to change the contents of headers
-#        denied with reply_header_access above, by replacing them
-#        with some fixed string.
-#
-#        This only applies to reply headers, not request headers.
-#
-#        By default, headers are removed if denied.
-#Default:
-# none
-
-#  TAG: request_header_add
-#	Usage:   request_header_add field-name field-value acl1 [acl2] ...
-#	Example: request_header_add X-Client-CA "CA=%ssl::>cert_issuer" all
-#
-#	This option adds header fields to outgoing HTTP requests (i.e.,
-#	request headers sent by Squid to the next HTTP hop such as a
-#	cache peer or an origin server). The option has no effect during
-#	cache hit detection. The equivalent adaptation vectoring point
-#	in ICAP terminology is post-cache REQMOD.
-#
-#	Field-name is a token specifying an HTTP header name. If a
-#	standard HTTP header name is used, Squid does not check whether
-#	the new header conflicts with any existing headers or violates
-#	HTTP rules. If the request to be modified already contains a
-#	field with the same name, the old field is preserved but the
-#	header field values are not merged.
-#
-#	Field-value is either a token or a quoted string. If quoted
-#	string format is used, then the surrounding quotes are removed
-#	while escape sequences and %macros are processed.
-#
-#	In theory, all of the logformat codes can be used as %macros.
-#	However, unlike logging (which happens at the very end of
-#	transaction lifetime), the transaction may not yet have enough
-#	information to expand a macro when the new header value is needed.
-#	And some information may already be available to Squid but not yet
-#	committed where the macro expansion code can access it (report
-#	such instances!). The macro will be expanded into a single dash
-#	('-') in such cases. Not all macros have been tested.
-#
-#	One or more Squid ACLs may be specified to restrict header
-#	injection to matching requests. As always in squid.conf, all
-#	ACLs in an option ACL list must be satisfied for the insertion
-#	to happen. The request_header_add option supports fast ACLs
-#	only.
-#Default:
-# none
-
-#  TAG: note
-#	This option used to log custom information about the master
-#	transaction. For example, an admin may configure Squid to log
-#	which "user group" the transaction belongs to, where "user group"
-#	will be determined based on a set of ACLs and not [just]
-#	authentication information.
-#	Values of key/value pairs can be logged using %{key}note macros:
-#
-#	    note key value acl ...
-#	    logformat myFormat ... %{key}note ...
-#Default:
-# none
-
-#  TAG: relaxed_header_parser	on|off|warn
-#	In the default "on" setting Squid accepts certain forms
-#	of non-compliant HTTP messages where it is unambiguous
-#	what the sending application intended even if the message
-#	is not correctly formatted. The messages is then normalized
-#	to the correct form when forwarded by Squid.
-#
-#	If set to "warn" then a warning will be emitted in cache.log
-#	each time such HTTP error is encountered.
-#
-#	If set to "off" then such HTTP errors will cause the request
-#	or response to be rejected.
-#Default:
-# relaxed_header_parser on
-
-# TIMEOUTS
-# -----------------------------------------------------------------------------
-
-#  TAG: forward_timeout	time-units
-#	This parameter specifies how long Squid should at most attempt in
-#	finding a forwarding path for the request before giving up.
-#Default:
-# forward_timeout 4 minutes
-
-#  TAG: connect_timeout	time-units
-#	This parameter specifies how long to wait for the TCP connect to
-#	the requested server or peer to complete before Squid should
-#	attempt to find another path where to forward the request.
-#Default:
-# connect_timeout 1 minute
-
-#  TAG: peer_connect_timeout	time-units
-#	This parameter specifies how long to wait for a pending TCP
-#	connection to a peer cache.  The default is 30 seconds.   You
-#	may also set different timeout values for individual neighbors
-#	with the 'connect-timeout' option on a 'cache_peer' line.
-#Default:
-# peer_connect_timeout 30 seconds
-
-#  TAG: read_timeout	time-units
-#	The read_timeout is applied on server-side connections.  After
-#	each successful read(), the timeout will be extended by this
-#	amount.  If no data is read again after this amount of time,
-#	the request is aborted and logged with ERR_READ_TIMEOUT.  The
-#	default is 15 minutes.
-#Default:
-# read_timeout 15 minutes
-
-#  TAG: write_timeout	time-units
-#	This timeout is tracked for all connections that have data
-#	available for writing and are waiting for the socket to become
-#	ready. After each successful write, the timeout is extended by
-#	the configured amount. If Squid has data to write but the
-#	connection is not ready for the configured duration, the
-#	transaction associated with the connection is terminated. The
-#	default is 15 minutes.
-#Default:
-# write_timeout 15 minutes
-
-#  TAG: request_timeout
-#	How long to wait for complete HTTP request headers after initial
-#	connection establishment.
-#Default:
-# request_timeout 5 minutes
-
-#  TAG: client_idle_pconn_timeout
-#	How long to wait for the next HTTP request on a persistent
-#	client connection after the previous request completes.
-#Default:
-# client_idle_pconn_timeout 2 minutes
-
-#  TAG: client_lifetime	time-units
-#	The maximum amount of time a client (browser) is allowed to
-#	remain connected to the cache process.  This protects the Cache
-#	from having a lot of sockets (and hence file descriptors) tied up
-#	in a CLOSE_WAIT state from remote clients that go away without
-#	properly shutting down (either because of a network failure or
-#	because of a poor client implementation).  The default is one
-#	day, 1440 minutes.
-#
-#	NOTE:  The default value is intended to be much larger than any
-#	client would ever need to be connected to your cache.  You
-#	should probably change client_lifetime only as a last resort.
-#	If you seem to have many client connections tying up
-#	filedescriptors, we recommend first tuning the read_timeout,
-#	request_timeout, persistent_request_timeout and quick_abort values.
-#Default:
-# client_lifetime 1 day
-
-#  TAG: half_closed_clients
-#	Some clients may shutdown the sending side of their TCP
-#	connections, while leaving their receiving sides open.	Sometimes,
-#	Squid can not tell the difference between a half-closed and a
-#	fully-closed TCP connection.
-#
-#	By default, Squid will immediately close client connections when
-#	read(2) returns "no more data to read."
-#
-#	Change this option to 'on' and Squid will keep open connections
-#	until a read(2) or write(2) on the socket returns an error.
-#	This may show some benefits for reverse proxies. But if not
-#	it is recommended to leave OFF.
-#Default:
-# half_closed_clients off
-
-#  TAG: server_idle_pconn_timeout
-#	Timeout for idle persistent connections to servers and other
-#	proxies.
-#Default:
-# server_idle_pconn_timeout 1 minute
-
-#  TAG: ident_timeout
-#	Maximum time to wait for IDENT lookups to complete.
-#
-#	If this is too high, and you enabled IDENT lookups from untrusted
-#	users, you might be susceptible to denial-of-service by having
-#	many ident requests going at once.
-#Default:
-# ident_timeout 10 seconds
-
-#  TAG: shutdown_lifetime	time-units
-#	When SIGTERM or SIGHUP is received, the cache is put into
-#	"shutdown pending" mode until all active sockets are closed.
-#	This value is the lifetime to set for all open descriptors
-#	during shutdown mode.  Any active clients after this many
-#	seconds will receive a 'timeout' message.
-#Default:
-# shutdown_lifetime 30 seconds
-
-# ADMINISTRATIVE PARAMETERS
-# -----------------------------------------------------------------------------
-
-#  TAG: cache_mgr
-#	Email-address of local cache manager who will receive
-#	mail if the cache dies.  The default is "webmaster".
-#Default:
-# cache_mgr webmaster
-
-#  TAG: mail_from
-#	From: email-address for mail sent when the cache dies.
-#	The default is to use 'squid@unique_hostname'.
-#
-#	See also: unique_hostname directive.
-#Default:
-# none
-
-#  TAG: mail_program
-#	Email program used to send mail if the cache dies.
-#	The default is "mail". The specified program must comply
-#	with the standard Unix mail syntax:
-#	  mail-program recipient < mailfile
-#
-#	Optional command line options can be specified.
-#Default:
-# mail_program mail
-
-#  TAG: cache_effective_user
-#	If you start Squid as root, it will change its effective/real
-#	UID/GID to the user specified below.  The default is to change
-#	to UID of nobody.
-#	see also; cache_effective_group
-#Default:
-# cache_effective_user nobody
-
-#  TAG: cache_effective_group
-#	Squid sets the GID to the effective user's default group ID
-#	(taken from the password file) and supplementary group list
-#	from the groups membership.
-#
-#	If you want Squid to run with a specific GID regardless of
-#	the group memberships of the effective user then set this
-#	to the group (or GID) you want Squid to run as. When set
-#	all other group privileges of the effective user are ignored
-#	and only this GID is effective. If Squid is not started as
-#	root the user starting Squid MUST be member of the specified
-#	group.
-#
-#	This option is not recommended by the Squid Team.
-#	Our preference is for administrators to configure a secure
-#	user account for squid with UID/GID matching system policies.
-#Default:
-# Use system group memberships of the cache_effective_user account
-
-#  TAG: httpd_suppress_version_string	on|off
-#	Suppress Squid version string info in HTTP headers and HTML error pages.
-#Default:
-# httpd_suppress_version_string off
-
-#  TAG: visible_hostname
-#	If you want to present a special hostname in error messages, etc,
-#	define this.  Otherwise, the return value of gethostname()
-#	will be used. If you have multiple caches in a cluster and
-#	get errors about IP-forwarding you must set them to have individual
-#	names with this setting.
-#Default:
-# Automatically detect the system host name
-
-#  TAG: unique_hostname
-#	If you want to have multiple machines with the same
-#	'visible_hostname' you must give each machine a different
-#	'unique_hostname' so forwarding loops can be detected.
-#Default:
-# Copy the value from visible_hostname
-
-#  TAG: hostname_aliases
-#	A list of other DNS names your cache has.
-#Default:
-# none
-
-#  TAG: umask
-#	Minimum umask which should be enforced while the proxy
-#	is running, in addition to the umask set at startup.
-#
-#	For a traditional octal representation of umasks, start
-#        your value with 0.
-#Default:
-# umask 027
-
-# OPTIONS FOR THE CACHE REGISTRATION SERVICE
-# -----------------------------------------------------------------------------
-#
-#	This section contains parameters for the (optional) cache
-#	announcement service.  This service is provided to help
-#	cache administrators locate one another in order to join or
-#	create cache hierarchies.
-#
-#	An 'announcement' message is sent (via UDP) to the registration
-#	service by Squid.  By default, the announcement message is NOT
-#	SENT unless you enable it with 'announce_period' below.
-#
-#	The announcement message includes your hostname, plus the
-#	following information from this configuration file:
-#
-#		http_port
-#		icp_port
-#		cache_mgr
-#
-#	All current information is processed regularly and made
-#	available on the Web at http://www.ircache.net/Cache/Tracker/.
-
-#  TAG: announce_period
-#	This is how frequently to send cache announcements.
-#
-#	To enable announcing your cache, just set an announce period.
-#
-#	Example:
-#		announce_period 1 day
-#Default:
-# Announcement messages disabled.
-
-#  TAG: announce_host
-#	Set the hostname where announce registration messages will be sent.
-#
-#	See also announce_port and announce_file
-#Default:
-# announce_host tracker.ircache.net
-
-#  TAG: announce_file
-#	The contents of this file will be included in the announce
-#	registration messages.
-#Default:
-# none
-
-#  TAG: announce_port
-#	Set the port where announce registration messages will be sent.
-#
-#	See also announce_host and announce_file
-#Default:
-# announce_port 3131
-
-# HTTPD-ACCELERATOR OPTIONS
-# -----------------------------------------------------------------------------
-
-#  TAG: httpd_accel_surrogate_id
-#	Surrogates (http://www.esi.org/architecture_spec_1.0.html)
-#	need an identification token to allow control targeting. Because
-#	a farm of surrogates may all perform the same tasks, they may share
-#	an identification token.
-#Default:
-# visible_hostname is used if no specific ID is set.
-
-#  TAG: http_accel_surrogate_remote	on|off
-#	Remote surrogates (such as those in a CDN) honour the header
-#	"Surrogate-Control: no-store-remote".
-#
-#	Set this to on to have squid behave as a remote surrogate.
-#Default:
-# http_accel_surrogate_remote off
-
-#  TAG: esi_parser	libxml2|expat|custom
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-esi
-#
-#	ESI markup is not strictly XML compatible. The custom ESI parser
-#	will give higher performance, but cannot handle non ASCII character
-#	encodings.
-#Default:
-# esi_parser custom
-
-# DELAY POOL PARAMETERS
-# -----------------------------------------------------------------------------
-
-#  TAG: delay_pools
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-delay-pools
-#
-#	This represents the number of delay pools to be used.  For example,
-#	if you have one class 2 delay pool and one class 3 delays pool, you
-#	have a total of 2 delay pools.
-#
-#	See also delay_parameters, delay_class, delay_access for pool
-#	configuration details.
-#Default:
-# delay_pools 0
-
-#  TAG: delay_class
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-delay-pools
-#
-#	This defines the class of each delay pool.  There must be exactly one
-#	delay_class line for each delay pool.  For example, to define two
-#	delay pools, one of class 2 and one of class 3, the settings above
-#	and here would be:
-#
-#	Example:
-#	    delay_pools 4      # 4 delay pools
-#	    delay_class 1 2    # pool 1 is a class 2 pool
-#	    delay_class 2 3    # pool 2 is a class 3 pool
-#	    delay_class 3 4    # pool 3 is a class 4 pool
-#	    delay_class 4 5    # pool 4 is a class 5 pool
-#
-#	The delay pool classes are:
-#
-#		class 1		Everything is limited by a single aggregate
-#				bucket.
-#
-#		class 2 	Everything is limited by a single aggregate
-#				bucket as well as an "individual" bucket chosen
-#				from bits 25 through 32 of the IPv4 address.
-#
-#		class 3		Everything is limited by a single aggregate
-#				bucket as well as a "network" bucket chosen
-#				from bits 17 through 24 of the IP address and a
-#				"individual" bucket chosen from bits 17 through
-#				32 of the IPv4 address.
-#
-#		class 4		Everything in a class 3 delay pool, with an
-#				additional limit on a per user basis. This
-#				only takes effect if the username is established
-#				in advance - by forcing authentication in your
-#				http_access rules.
-#
-#		class 5		Requests are grouped according their tag (see
-#				external_acl's tag= reply).
-#
-#
-#	Each pool also requires a delay_parameters directive to configure the pool size
-#	and speed limits used whenever the pool is applied to a request. Along with
-#	a set of delay_access directives to determine when it is used.
-#
-#	NOTE: If an IP address is a.b.c.d
-#		-> bits 25 through 32 are "d"
-#		-> bits 17 through 24 are "c"
-#		-> bits 17 through 32 are "c * 256 + d"
-#
-#	NOTE-2: Due to the use of bitmasks in class 2,3,4 pools they only apply to
-#		IPv4 traffic. Class 1 and 5 pools may be used with IPv6 traffic.
-#
-#	This clause only supports fast acl types.
-#	See http://wiki.squid-cache.org/SquidFaq/SquidAcl for details.
-#
-#	See also delay_parameters and delay_access.
-#Default:
-# none
-
-#  TAG: delay_access
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-delay-pools
-#
-#	This is used to determine which delay pool a request falls into.
-#
-#	delay_access is sorted per pool and the matching starts with pool 1,
-#	then pool 2, ..., and finally pool N. The first delay pool where the
-#	request is allowed is selected for the request. If it does not allow
-#	the request to any pool then the request is not delayed (default).
-#
-#	For example, if you want some_big_clients in delay
-#	pool 1 and lotsa_little_clients in delay pool 2:
-#
-#		delay_access 1 allow some_big_clients
-#		delay_access 1 deny all
-#		delay_access 2 allow lotsa_little_clients
-#		delay_access 2 deny all
-#		delay_access 3 allow authenticated_clients
-#
-#	See also delay_parameters and delay_class.
-#
-#Default:
-# Deny using the pool, unless allow rules exist in squid.conf for the pool.
-
-#  TAG: delay_parameters
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-delay-pools
-#
-#	This defines the parameters for a delay pool.  Each delay pool has
-#	a number of "buckets" associated with it, as explained in the
-#	description of delay_class.
-#
-#	For a class 1 delay pool, the syntax is:
-#		delay_pools pool 1
-#		delay_parameters pool aggregate
-#
-#	For a class 2 delay pool:
-#		delay_pools pool 2
-#		delay_parameters pool aggregate individual
-#
-#	For a class 3 delay pool:
-#		delay_pools pool 3
-#		delay_parameters pool aggregate network individual
-#
-#	For a class 4 delay pool:
-#		delay_pools pool 4
-#		delay_parameters pool aggregate network individual user
-#
-#	For a class 5 delay pool:
-#		delay_pools pool 5
-#		delay_parameters pool tagrate
-#
-#	The option variables are:
-#
-#		pool		a pool number - ie, a number between 1 and the
-#				number specified in delay_pools as used in
-#				delay_class lines.
-#
-#		aggregate	the speed limit parameters for the aggregate bucket
-#				(class 1, 2, 3).
-#
-#		individual	the speed limit parameters for the individual
-#				buckets (class 2, 3).
-#
-#		network		the speed limit parameters for the network buckets
-#				(class 3).
-#
-#		user		the speed limit parameters for the user buckets
-#				(class 4).
-#
-#		tagrate		the speed limit parameters for the tag buckets
-#				(class 5).
-#
-#	A pair of delay parameters is written restore/maximum, where restore is
-#	the number of bytes (not bits - modem and network speeds are usually
-#	quoted in bits) per second placed into the bucket, and maximum is the
-#	maximum number of bytes which can be in the bucket at any time.
-#
-#	There must be one delay_parameters line for each delay pool.
-#
-#
-#	For example, if delay pool number 1 is a class 2 delay pool as in the
-#	above example, and is being used to strictly limit each host to 64Kbit/sec
-#	(plus overheads), with no overall limit, the line is:
-#
-#		delay_parameters 1 -1/-1 8000/8000
-#
-#	Note that 8 x 8000 KByte/sec -> 64Kbit/sec.
-#
-#	Note that the figure -1 is used to represent "unlimited".
-#
-#
-#	And, if delay pool number 2 is a class 3 delay pool as in the above
-#	example, and you want to limit it to a total of 256Kbit/sec (strict limit)
-#	with each 8-bit network permitted 64Kbit/sec (strict limit) and each
-#	individual host permitted 4800bit/sec with a bucket maximum size of 64Kbits
-#	to permit a decent web page to be downloaded at a decent speed
-#	(if the network is not being limited due to overuse) but slow down
-#	large downloads more significantly:
-#
-#		delay_parameters 2 32000/32000 8000/8000 600/8000
-#
-#	Note that 8 x 32000 KByte/sec -> 256Kbit/sec.
-#		  8 x  8000 KByte/sec ->  64Kbit/sec.
-#		  8 x   600 Byte/sec  -> 4800bit/sec.
-#
-#
-#	Finally, for a class 4 delay pool as in the example - each user will
-#	be limited to 128Kbits/sec no matter how many workstations they are logged into.:
-#
-#		delay_parameters 4 32000/32000 8000/8000 600/64000 16000/16000
-#
-#
-#	See also delay_class and delay_access.
-#
-#Default:
-# none
-
-#  TAG: delay_initial_bucket_level	(percent, 0-100)
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-delay-pools
-#
-#	The initial bucket percentage is used to determine how much is put
-#	in each bucket when squid starts, is reconfigured, or first notices
-#	a host accessing it (in class 2 and class 3, individual hosts and
-#	networks only have buckets associated with them once they have been
-#	"seen" by squid).
-#Default:
-# delay_initial_bucket_level 50
-
-# CLIENT DELAY POOL PARAMETERS
-# -----------------------------------------------------------------------------
-
-#  TAG: client_delay_pools
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-delay-pools
-#
-#	This option specifies the number of client delay pools used. It must
-#	preceed other client_delay_* options.
-#
-#	Example:
-#		client_delay_pools 2
-#
-#	See also client_delay_parameters and client_delay_access.
-#Default:
-# client_delay_pools 0
-
-#  TAG: client_delay_initial_bucket_level	(percent, 0-no_limit)
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-delay-pools
-#
-#	This option determines the initial bucket size as a percentage of
-#	max_bucket_size from client_delay_parameters. Buckets are created
-#	at the time of the "first" connection from the matching IP. Idle
-#	buckets are periodically deleted up.
-#
-#	You can specify more than 100 percent but note that such "oversized"
-#	buckets are not refilled until their size goes down to max_bucket_size
-#	from client_delay_parameters.
-#
-#	Example:
-#		client_delay_initial_bucket_level 50
-#Default:
-# client_delay_initial_bucket_level 50
-
-#  TAG: client_delay_parameters
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-delay-pools
-#
-#
-#	This option configures client-side bandwidth limits using the
-#	following format:
-#
-#	    client_delay_parameters pool speed_limit max_bucket_size
-#
-#	pool is an integer ID used for client_delay_access matching.
-#
-#	speed_limit is bytes added to the bucket per second.
-#
-#	max_bucket_size is the maximum size of a bucket, enforced after any
-#	speed_limit additions.
-#
-#	Please see the delay_parameters option for more information and
-#	examples.
-#
-#	Example:
-#		client_delay_parameters 1 1024 2048
-#		client_delay_parameters 2 51200 16384
-#
-#	See also client_delay_access.
-#
-#Default:
-# none
-
-#  TAG: client_delay_access
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-delay-pools
-#
-#	This option determines the client-side delay pool for the
-#	request:
-#
-#	    client_delay_access pool_ID allow|deny acl_name
-#
-#	All client_delay_access options are checked in their pool ID
-#	order, starting with pool 1. The first checked pool with allowed
-#	request is selected for the request. If no ACL matches or there
-#	are no client_delay_access options, the request bandwidth is not
-#	limited.
-#
-#	The ACL-selected pool is then used to find the
-#	client_delay_parameters for the request. Client-side pools are
-#	not used to aggregate clients. Clients are always aggregated
-#	based on their source IP addresses (one bucket per source IP).
-#
-#	This clause only supports fast acl types.
-#	See http://wiki.squid-cache.org/SquidFaq/SquidAcl for details.
-#	Additionally, only the client TCP connection details are available.
-#	ACLs testing HTTP properties will not work.
-#
-#	Please see delay_access for more examples.
-#
-#	Example:
-#		client_delay_access 1 allow low_rate_network
-#		client_delay_access 2 allow vips_network
-#
-#
-#	See also client_delay_parameters and client_delay_pools.
-#Default:
-# Deny use of the pool, unless allow rules exist in squid.conf for the pool.
-
-# WCCPv1 AND WCCPv2 CONFIGURATION OPTIONS
-# -----------------------------------------------------------------------------
-
-#  TAG: wccp_router
-#	Use this option to define your WCCP ``home'' router for
-#	Squid.
-#
-#	wccp_router supports a single WCCP(v1) router
-#
-#	wccp2_router supports multiple WCCPv2 routers
-#
-#	only one of the two may be used at the same time and defines
-#	which version of WCCP to use.
-#Default:
-# WCCP disabled.
-
-#  TAG: wccp2_router
-#	Use this option to define your WCCP ``home'' router for
-#	Squid.
-#
-#	wccp_router supports a single WCCP(v1) router
-#
-#	wccp2_router supports multiple WCCPv2 routers
-#
-#	only one of the two may be used at the same time and defines
-#	which version of WCCP to use.
-#Default:
-# WCCPv2 disabled.
-
-#  TAG: wccp_version
-#	This directive is only relevant if you need to set up WCCP(v1)
-#	to some very old and end-of-life Cisco routers. In all other
-#	setups it must be left unset or at the default setting.
-#	It defines an internal version in the WCCP(v1) protocol,
-#	with version 4 being the officially documented protocol.
-#
-#	According to some users, Cisco IOS 11.2 and earlier only
-#	support WCCP version 3.  If you're using that or an earlier
-#	version of IOS, you may need to change this value to 3, otherwise
-#	do not specify this parameter.
-#Default:
-# wccp_version 4
-
-#  TAG: wccp2_rebuild_wait
-#	If this is enabled Squid will wait for the cache dir rebuild to finish
-#	before sending the first wccp2 HereIAm packet
-#Default:
-# wccp2_rebuild_wait on
-
-#  TAG: wccp2_forwarding_method
-#	WCCP2 allows the setting of forwarding methods between the
-#	router/switch and the cache.  Valid values are as follows:
-#
-#	gre - GRE encapsulation (forward the packet in a GRE/WCCP tunnel)
-#	l2  - L2 redirect (forward the packet using Layer 2/MAC rewriting)
-#
-#	Currently (as of IOS 12.4) cisco routers only support GRE.
-#	Cisco switches only support the L2 redirect assignment method.
-#Default:
-# wccp2_forwarding_method gre
-
-#  TAG: wccp2_return_method
-#	WCCP2 allows the setting of return methods between the
-#	router/switch and the cache for packets that the cache
-#	decides not to handle.  Valid values are as follows:
-#
-#	gre - GRE encapsulation (forward the packet in a GRE/WCCP tunnel)
-#	l2  - L2 redirect (forward the packet using Layer 2/MAC rewriting)
-#
-#	Currently (as of IOS 12.4) cisco routers only support GRE.
-#	Cisco switches only support the L2 redirect assignment.
-#
-#	If the "ip wccp redirect exclude in" command has been
-#	enabled on the cache interface, then it is still safe for
-#	the proxy server to use a l2 redirect method even if this
-#	option is set to GRE.
-#Default:
-# wccp2_return_method gre
-
-#  TAG: wccp2_assignment_method
-#	WCCP2 allows the setting of methods to assign the WCCP hash
-#	Valid values are as follows:
-#
-#	hash - Hash assignment
-#	mask - Mask assignment
-#
-#	As a general rule, cisco routers support the hash assignment method
-#	and cisco switches support the mask assignment method.
-#Default:
-# wccp2_assignment_method hash
-
-#  TAG: wccp2_service
-#	WCCP2 allows for multiple traffic services. There are two
-#	types: "standard" and "dynamic". The standard type defines
-#	one service id - http (id 0). The dynamic service ids can be from
-#	51 to 255 inclusive.  In order to use a dynamic service id
-#	one must define the type of traffic to be redirected; this is done
-#	using the wccp2_service_info option.
-#
-#	The "standard" type does not require a wccp2_service_info option,
-#	just specifying the service id will suffice.
-#
-#	MD5 service authentication can be enabled by adding
-#	"password=<password>" to the end of this service declaration.
-#
-#	Examples:
-#
-#	wccp2_service standard 0	# for the 'web-cache' standard service
-#	wccp2_service dynamic 80	# a dynamic service type which will be
-#					# fleshed out with subsequent options.
-#	wccp2_service standard 0 password=foo
-#Default:
-# Use the 'web-cache' standard service.
-
-#  TAG: wccp2_service_info
-#	Dynamic WCCPv2 services require further information to define the
-#	traffic you wish to have diverted.
-#
-#	The format is:
-#
-#	wccp2_service_info <id> protocol=<protocol> flags=<flag>,<flag>..
-#	    priority=<priority> ports=<port>,<port>..
-#
-#	The relevant WCCPv2 flags:
-#	+ src_ip_hash, dst_ip_hash
-#	+ source_port_hash, dst_port_hash
-#	+ src_ip_alt_hash, dst_ip_alt_hash
-#	+ src_port_alt_hash, dst_port_alt_hash
-#	+ ports_source
-#
-#	The port list can be one to eight entries.
-#
-#	Example:
-#
-#	wccp2_service_info 80 protocol=tcp flags=src_ip_hash,ports_source
-#	    priority=240 ports=80
-#
-#	Note: the service id must have been defined by a previous
-#	'wccp2_service dynamic <id>' entry.
-#Default:
-# none
-
-#  TAG: wccp2_weight
-#	Each cache server gets assigned a set of the destination
-#	hash proportional to their weight.
-#Default:
-# wccp2_weight 10000
-
-#  TAG: wccp_address
-#	Use this option if you require WCCPv2 to use a specific
-#	interface address.
-#
-#	The default behavior is to not bind to any specific address.
-#Default:
-# Address selected by the operating system.
-
-#  TAG: wccp2_address
-#	Use this option if you require WCCP to use a specific
-#	interface address.
-#
-#	The default behavior is to not bind to any specific address.
-#Default:
-# Address selected by the operating system.
-
-# PERSISTENT CONNECTION HANDLING
-# -----------------------------------------------------------------------------
-#
-# Also see "pconn_timeout" in the TIMEOUTS section
-
-#  TAG: client_persistent_connections
-#	Persistent connection support for clients.
-#	Squid uses persistent connections (when allowed). You can use
-#	this option to disable persistent connections with clients.
-#Default:
-# client_persistent_connections on
-
-#  TAG: server_persistent_connections
-#	Persistent connection support for servers.
-#	Squid uses persistent connections (when allowed). You can use
-#	this option to disable persistent connections with servers.
-#Default:
-# server_persistent_connections on
-
-#  TAG: persistent_connection_after_error
-#	With this directive the use of persistent connections after
-#	HTTP errors can be disabled. Useful if you have clients
-#	who fail to handle errors on persistent connections proper.
-#Default:
-# persistent_connection_after_error on
-
-#  TAG: detect_broken_pconn
-#	Some servers have been found to incorrectly signal the use
-#	of HTTP/1.0 persistent connections even on replies not
-#	compatible, causing significant delays. This server problem
-#	has mostly been seen on redirects.
-#
-#	By enabling this directive Squid attempts to detect such
-#	broken replies and automatically assume the reply is finished
-#	after 10 seconds timeout.
-#Default:
-# detect_broken_pconn off
-
-# CACHE DIGEST OPTIONS
-# -----------------------------------------------------------------------------
-
-#  TAG: digest_generation
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-cache-digests
-#
-#	This controls whether the server will generate a Cache Digest
-#	of its contents.  By default, Cache Digest generation is
-#	enabled if Squid is compiled with --enable-cache-digests defined.
-#Default:
-# digest_generation on
-
-#  TAG: digest_bits_per_entry
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-cache-digests
-#
-#	This is the number of bits of the server's Cache Digest which
-#	will be associated with the Digest entry for a given HTTP
-#	Method and URL (public key) combination.  The default is 5.
-#Default:
-# digest_bits_per_entry 5
-
-#  TAG: digest_rebuild_period	(seconds)
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-cache-digests
-#
-#	This is the wait time between Cache Digest rebuilds.
-#Default:
-# digest_rebuild_period 1 hour
-
-#  TAG: digest_rewrite_period	(seconds)
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-cache-digests
-#
-#	This is the wait time between Cache Digest writes to
-#	disk.
-#Default:
-# digest_rewrite_period 1 hour
-
-#  TAG: digest_swapout_chunk_size	(bytes)
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-cache-digests
-#
-#	This is the number of bytes of the Cache Digest to write to
-#	disk at a time.  It defaults to 4096 bytes (4KB), the Squid
-#	default swap page.
-#Default:
-# digest_swapout_chunk_size 4096 bytes
-
-#  TAG: digest_rebuild_chunk_percentage	(percent, 0-100)
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-cache-digests
-#
-#	This is the percentage of the Cache Digest to be scanned at a
-#	time.  By default it is set to 10% of the Cache Digest.
-#Default:
-# digest_rebuild_chunk_percentage 10
-
-# SNMP OPTIONS
-# -----------------------------------------------------------------------------
-
-#  TAG: snmp_port
-#	The port number where Squid listens for SNMP requests. To enable
-#	SNMP support set this to a suitable port number. Port number
-#	3401 is often used for the Squid SNMP agent. By default it's
-#	set to "0" (disabled)
-#
-#	Example:
-#		snmp_port 3401
-#Default:
-# SNMP disabled.
-
-#  TAG: snmp_access
-#	Allowing or denying access to the SNMP port.
-#
-#	All access to the agent is denied by default.
-#	usage:
-#
-#	snmp_access allow|deny [!]aclname ...
-#
-#	This clause only supports fast acl types.
-#	See http://wiki.squid-cache.org/SquidFaq/SquidAcl for details.
-#
-#Example:
-# snmp_access allow snmppublic localhost
-# snmp_access deny all
-#Default:
-# Deny, unless rules exist in squid.conf.
-
-#  TAG: snmp_incoming_address
-#	Just like 'udp_incoming_address', but for the SNMP port.
-#
-#	snmp_incoming_address	is used for the SNMP socket receiving
-#				messages from SNMP agents.
-#
-#	The default snmp_incoming_address is to listen on all
-#	available network interfaces.
-#Default:
-# Accept SNMP packets from all machine interfaces.
-
-#  TAG: snmp_outgoing_address
-#	Just like 'udp_outgoing_address', but for the SNMP port.
-#
-#	snmp_outgoing_address	is used for SNMP packets returned to SNMP
-#				agents.
-#
-#	If snmp_outgoing_address is not set it will use the same socket
-#	as snmp_incoming_address. Only change this if you want to have
-#	SNMP replies sent using another address than where this Squid
-#	listens for SNMP queries.
-#
-#	NOTE, snmp_incoming_address and snmp_outgoing_address can not have
-#	the same value since they both use the same port.
-#Default:
-# Use snmp_incoming_address or an address selected by the operating system.
-
-# ICP OPTIONS
-# -----------------------------------------------------------------------------
-
-#  TAG: icp_port
-#	The port number where Squid sends and receives ICP queries to
-#	and from neighbor caches.  The standard UDP port for ICP is 3130.
-#
-#	Example:
-#		icp_port 3130
-#Default:
-# ICP disabled.
-
-#  TAG: htcp_port
-#	The port number where Squid sends and receives HTCP queries to
-#	and from neighbor caches.  To turn it on you want to set it to
-#	4827.
-#
-#	Example:
-#		htcp_port 4827
-#Default:
-# HTCP disabled.
-
-#  TAG: log_icp_queries	on|off
-#	If set, ICP queries are logged to access.log. You may wish
-#	do disable this if your ICP load is VERY high to speed things
-#	up or to simplify log analysis.
-#Default:
-# log_icp_queries on
-
-#  TAG: udp_incoming_address
-#	udp_incoming_address	is used for UDP packets received from other
-#				caches.
-#
-#	The default behavior is to not bind to any specific address.
-#
-#	Only change this if you want to have all UDP queries received on
-#	a specific interface/address.
-#
-#	NOTE: udp_incoming_address is used by the ICP, HTCP, and DNS
-#	modules. Altering it will affect all of them in the same manner.
-#
-#	see also; udp_outgoing_address
-#
-#	NOTE, udp_incoming_address and udp_outgoing_address can not
-#	have the same value since they both use the same port.
-#Default:
-# Accept packets from all machine interfaces.
-
-#  TAG: udp_outgoing_address
-#	udp_outgoing_address	is used for UDP packets sent out to other
-#				caches.
-#
-#	The default behavior is to not bind to any specific address.
-#
-#	Instead it will use the same socket as udp_incoming_address.
-#	Only change this if you want to have UDP queries sent using another
-#	address than where this Squid listens for UDP queries from other
-#	caches.
-#
-#	NOTE: udp_outgoing_address is used by the ICP, HTCP, and DNS
-#	modules. Altering it will affect all of them in the same manner.
-#
-#	see also; udp_incoming_address
-#
-#	NOTE, udp_incoming_address and udp_outgoing_address can not
-#	have the same value since they both use the same port.
-#Default:
-# Use udp_incoming_address or an address selected by the operating system.
-
-#  TAG: icp_hit_stale	on|off
-#	If you want to return ICP_HIT for stale cache objects, set this
-#	option to 'on'.  If you have sibling relationships with caches
-#	in other administrative domains, this should be 'off'.  If you only
-#	have sibling relationships with caches under your control,
-#	it is probably okay to set this to 'on'.
-#	If set to 'on', your siblings should use the option "allow-miss"
-#	on their cache_peer lines for connecting to you.
-#Default:
-# icp_hit_stale off
-
-#  TAG: minimum_direct_hops
-#	If using the ICMP pinging stuff, do direct fetches for sites
-#	which are no more than this many hops away.
-#Default:
-# minimum_direct_hops 4
-
-#  TAG: minimum_direct_rtt	(msec)
-#	If using the ICMP pinging stuff, do direct fetches for sites
-#	which are no more than this many rtt milliseconds away.
-#Default:
-# minimum_direct_rtt 400
-
-#  TAG: netdb_low
-#	The low water mark for the ICMP measurement database.
-#
-#	Note: high watermark controlled by netdb_high directive.
-#
-#	These watermarks are counts, not percents.  The defaults are
-#	(low) 900 and (high) 1000.  When the high water mark is
-#	reached, database entries will be deleted until the low
-#	mark is reached.
-#Default:
-# netdb_low 900
-
-#  TAG: netdb_high
-#	The high water mark for the ICMP measurement database.
-#
-#	Note: low watermark controlled by netdb_low directive.
-#
-#	These watermarks are counts, not percents.  The defaults are
-#	(low) 900 and (high) 1000.  When the high water mark is
-#	reached, database entries will be deleted until the low
-#	mark is reached.
-#Default:
-# netdb_high 1000
-
-#  TAG: netdb_ping_period
-#	The minimum period for measuring a site.  There will be at
-#	least this much delay between successive pings to the same
-#	network.  The default is five minutes.
-#Default:
-# netdb_ping_period 5 minutes
-
-#  TAG: query_icmp	on|off
-#	If you want to ask your peers to include ICMP data in their ICP
-#	replies, enable this option.
-#
-#	If your peer has configured Squid (during compilation) with
-#	'--enable-icmp' that peer will send ICMP pings to origin server
-#	sites of the URLs it receives.  If you enable this option the
-#	ICP replies from that peer will include the ICMP data (if available).
-#	Then, when choosing a parent cache, Squid will choose the parent with
-#	the minimal RTT to the origin server.  When this happens, the
-#	hierarchy field of the access.log will be
-#	"CLOSEST_PARENT_MISS".  This option is off by default.
-#Default:
-# query_icmp off
-
-#  TAG: test_reachability	on|off
-#	When this is 'on', ICP MISS replies will be ICP_MISS_NOFETCH
-#	instead of ICP_MISS if the target host is NOT in the ICMP
-#	database, or has a zero RTT.
-#Default:
-# test_reachability off
-
-#  TAG: icp_query_timeout	(msec)
-#	Normally Squid will automatically determine an optimal ICP
-#	query timeout value based on the round-trip-time of recent ICP
-#	queries.  If you want to override the value determined by
-#	Squid, set this 'icp_query_timeout' to a non-zero value.  This
-#	value is specified in MILLISECONDS, so, to use a 2-second
-#	timeout (the old default), you would write:
-#
-#		icp_query_timeout 2000
-#Default:
-# Dynamic detection.
-
-#  TAG: maximum_icp_query_timeout	(msec)
-#	Normally the ICP query timeout is determined dynamically.  But
-#	sometimes it can lead to very large values (say 5 seconds).
-#	Use this option to put an upper limit on the dynamic timeout
-#	value.  Do NOT use this option to always use a fixed (instead
-#	of a dynamic) timeout value. To set a fixed timeout see the
-#	'icp_query_timeout' directive.
-#Default:
-# maximum_icp_query_timeout 2000
-
-#  TAG: minimum_icp_query_timeout	(msec)
-#	Normally the ICP query timeout is determined dynamically.  But
-#	sometimes it can lead to very small timeouts, even lower than
-#	the normal latency variance on your link due to traffic.
-#	Use this option to put an lower limit on the dynamic timeout
-#	value.  Do NOT use this option to always use a fixed (instead
-#	of a dynamic) timeout value. To set a fixed timeout see the
-#	'icp_query_timeout' directive.
-#Default:
-# minimum_icp_query_timeout 5
-
-#  TAG: background_ping_rate	time-units
-#	Controls how often the ICP pings are sent to siblings that
-#	have background-ping set.
-#Default:
-# background_ping_rate 10 seconds
-
-# MULTICAST ICP OPTIONS
-# -----------------------------------------------------------------------------
-
-#  TAG: mcast_groups
-#	This tag specifies a list of multicast groups which your server
-#	should join to receive multicasted ICP queries.
-#
-#	NOTE!  Be very careful what you put here!  Be sure you
-#	understand the difference between an ICP _query_ and an ICP
-#	_reply_.  This option is to be set only if you want to RECEIVE
-#	multicast queries.  Do NOT set this option to SEND multicast
-#	ICP (use cache_peer for that).  ICP replies are always sent via
-#	unicast, so this option does not affect whether or not you will
-#	receive replies from multicast group members.
-#
-#	You must be very careful to NOT use a multicast address which
-#	is already in use by another group of caches.
-#
-#	If you are unsure about multicast, please read the Multicast
-#	chapter in the Squid FAQ (http://www.squid-cache.org/FAQ/).
-#
-#	Usage: mcast_groups 239.128.16.128 224.0.1.20
-#
-#	By default, Squid doesn't listen on any multicast groups.
-#Default:
-# none
-
-#  TAG: mcast_miss_addr
-# Note: This option is only available if Squid is rebuilt with the
-#       -DMULTICAST_MISS_STREAM define
-#
-#	If you enable this option, every "cache miss" URL will
-#	be sent out on the specified multicast address.
-#
-#	Do not enable this option unless you are are absolutely
-#	certain you understand what you are doing.
-#Default:
-# disabled.
-
-#  TAG: mcast_miss_ttl
-# Note: This option is only available if Squid is rebuilt with the
-#       -DMULTICAST_MISS_STREAM define
-#
-#	This is the time-to-live value for packets multicasted
-#	when multicasting off cache miss URLs is enabled.  By
-#	default this is set to 'site scope', i.e. 16.
-#Default:
-# mcast_miss_ttl 16
-
-#  TAG: mcast_miss_port
-# Note: This option is only available if Squid is rebuilt with the
-#       -DMULTICAST_MISS_STREAM define
-#
-#	This is the port number to be used in conjunction with
-#	'mcast_miss_addr'.
-#Default:
-# mcast_miss_port 3135
-
-#  TAG: mcast_miss_encode_key
-# Note: This option is only available if Squid is rebuilt with the
-#       -DMULTICAST_MISS_STREAM define
-#
-#	The URLs that are sent in the multicast miss stream are
-#	encrypted.  This is the encryption key.
-#Default:
-# mcast_miss_encode_key XXXXXXXXXXXXXXXX
-
-#  TAG: mcast_icp_query_timeout	(msec)
-#	For multicast peers, Squid regularly sends out ICP "probes" to
-#	count how many other peers are listening on the given multicast
-#	address.  This value specifies how long Squid should wait to
-#	count all the replies.  The default is 2000 msec, or 2
-#	seconds.
-#Default:
-# mcast_icp_query_timeout 2000
-
-# INTERNAL ICON OPTIONS
-# -----------------------------------------------------------------------------
-
-#  TAG: icon_directory
-#	Where the icons are stored. These are normally kept in
-#	/usr/share/squid/icons
-#Default:
-# icon_directory /usr/share/squid/icons
-
-#  TAG: global_internal_static
-#	This directive controls is Squid should intercept all requests for
-#	/squid-internal-static/ no matter which host the URL is requesting
-#	(default on setting), or if nothing special should be done for
-#	such URLs (off setting). The purpose of this directive is to make
-#	icons etc work better in complex cache hierarchies where it may
-#	not always be possible for all corners in the cache mesh to reach
-#	the server generating a directory listing.
-#Default:
-# global_internal_static on
-
-#  TAG: short_icon_urls
-#	If this is enabled Squid will use short URLs for icons.
-#	If disabled it will revert to the old behavior of including
-#	it's own name and port in the URL.
-#
-#	If you run a complex cache hierarchy with a mix of Squid and
-#	other proxies you may need to disable this directive.
-#Default:
-# short_icon_urls on
-
-# ERROR PAGE OPTIONS
-# -----------------------------------------------------------------------------
-
-#  TAG: error_directory
-#	If you wish to create your own versions of the default
-#	error files to customize them to suit your company copy
-#	the error/template files to another directory and point
-#	this tag at them.
-#
-#	WARNING: This option will disable multi-language support
-#	         on error pages if used.
-#
-#	The squid developers are interested in making squid available in
-#	a wide variety of languages. If you are making translations for a
-#	language that Squid does not currently provide please consider
-#	contributing your translation back to the project.
-#	http://wiki.squid-cache.org/Translations
-#
-#	The squid developers working on translations are happy to supply drop-in
-#	translated error files in exchange for any new language contributions.
-#Default:
-# Send error pages in the clients preferred language
-
-#  TAG: error_default_language
-#	Set the default language which squid will send error pages in
-#	if no existing translation matches the clients language
-#	preferences.
-#
-#	If unset (default) generic English will be used.
-#
-#	The squid developers are interested in making squid available in
-#	a wide variety of languages. If you are interested in making
-#	translations for any language see the squid wiki for details.
-#	http://wiki.squid-cache.org/Translations
-#Default:
-# Generate English language pages.
-
-#  TAG: error_log_languages
-#	Log to cache.log what languages users are attempting to
-#	auto-negotiate for translations.
-#
-#	Successful negotiations are not logged. Only failures
-#	have meaning to indicate that Squid may need an upgrade
-#	of its error page translations.
-#Default:
-# error_log_languages on
-
-#  TAG: err_page_stylesheet
-#	CSS Stylesheet to pattern the display of Squid default error pages.
-#
-#	For information on CSS see http://www.w3.org/Style/CSS/
-#Default:
-# err_page_stylesheet /etc/squid/errorpage.css
-
-#  TAG: err_html_text
-#	HTML text to include in error messages.  Make this a "mailto"
-#	URL to your admin address, or maybe just a link to your
-#	organizations Web page.
-#
-#	To include this in your error messages, you must rewrite
-#	the error template files (found in the "errors" directory).
-#	Wherever you want the 'err_html_text' line to appear,
-#	insert a %L tag in the error template file.
-#Default:
-# none
-
-#  TAG: email_err_data	on|off
-#	If enabled, information about the occurred error will be
-#	included in the mailto links of the ERR pages (if %W is set)
-#	so that the email body contains the data.
-#	Syntax is <A HREF="mailto:%w%W">%w</A>
-#Default:
-# email_err_data on
-
-#  TAG: deny_info
-#	Usage:   deny_info err_page_name acl
-#	or       deny_info http://... acl
-#	or       deny_info TCP_RESET acl
-#
-#	This can be used to return a ERR_ page for requests which
-#	do not pass the 'http_access' rules.  Squid remembers the last
-#	acl it evaluated in http_access, and if a 'deny_info' line exists
-#	for that ACL Squid returns a corresponding error page.
-#
-#	The acl is typically the last acl on the http_access deny line which
-#	denied access. The exceptions to this rule are:
-#	- When Squid needs to request authentication credentials. It's then
-#	  the first authentication related acl encountered
-#	- When none of the http_access lines matches. It's then the last
-#	  acl processed on the last http_access line.
-#	- When the decision to deny access was made by an adaptation service,
-#	  the acl name is the corresponding eCAP or ICAP service_name.
-#
-#	NP: If providing your own custom error pages with error_directory
-#	    you may also specify them by your custom file name:
-#	    Example: deny_info ERR_CUSTOM_ACCESS_DENIED bad_guys
-#
-#	By defaut Squid will send "403 Forbidden". A different 4xx or 5xx
-#	may be specified by prefixing the file name with the code and a colon.
-#	e.g. 404:ERR_CUSTOM_ACCESS_DENIED
-#
-#	Alternatively you can tell Squid to reset the TCP connection
-#	by specifying TCP_RESET.
-#
-#	Or you can specify an error URL or URL pattern. The browsers will
-#	get redirected to the specified URL after formatting tags have
-#	been replaced. Redirect will be done with 302 or 307 according to
-#	HTTP/1.1 specs. A different 3xx code may be specified by prefixing
-#	the URL. e.g. 303:http://example.com/
-#
-#	URL FORMAT TAGS:
-#		%a	- username (if available. Password NOT included)
-#		%B	- FTP path URL
-#		%e	- Error number
-#		%E	- Error description
-#		%h	- Squid hostname
-#		%H	- Request domain name
-#		%i	- Client IP Address
-#		%M	- Request Method
-#		%o	- Message result from external ACL helper
-#		%p	- Request Port number
-#		%P	- Request Protocol name
-#		%R	- Request URL path
-#		%T	- Timestamp in RFC 1123 format
-#		%U	- Full canonical URL from client
-#			  (HTTPS URLs terminate with *)
-#		%u	- Full canonical URL from client
-#		%w	- Admin email from squid.conf
-#		%x	- Error name
-#		%%	- Literal percent (%) code
-#
-#Default:
-# none
-
-# OPTIONS INFLUENCING REQUEST FORWARDING 
-# -----------------------------------------------------------------------------
-
-#  TAG: nonhierarchical_direct
-#	By default, Squid will send any non-hierarchical requests
-#	(matching hierarchy_stoplist or not cacheable request type) direct
-#	to origin servers.
-#
-#	When this is set to "off", Squid will prefer to send these
-#	requests to parents.
-#
-#	Note that in most configurations, by turning this off you will only
-#	add latency to these request without any improvement in global hit
-#	ratio.
-#
-#	This option only sets a preference. If the parent is unavailable a
-#	direct connection to the origin server may still be attempted. To
-#	completely prevent direct connections use never_direct.
-#Default:
-# nonhierarchical_direct on
-
-#  TAG: prefer_direct
-#	Normally Squid tries to use parents for most requests. If you for some
-#	reason like it to first try going direct and only use a parent if
-#	going direct fails set this to on.
-#
-#	By combining nonhierarchical_direct off and prefer_direct on you
-#	can set up Squid to use a parent as a backup path if going direct
-#	fails.
-#
-#	Note: If you want Squid to use parents for all requests see
-#	the never_direct directive. prefer_direct only modifies how Squid
-#	acts on cacheable requests.
-#Default:
-# prefer_direct off
-
-#  TAG: cache_miss_revalidate	on|off
-#	RFC 7232 defines a conditional request mechanism to prevent
-#	response objects being unnecessarily transferred over the network.
-#	If that mechanism is used by the client and a cache MISS occurs
-#	it can prevent new cache entries being created.
-#
-#	This option determines whether Squid on cache MISS will pass the
-#	client revalidation request to the server or tries to fetch new
-#	content for caching. It can be useful while the cache is mostly
-#	empty to more quickly have the cache populated by generating
-#	non-conditional GETs.
-#
-#	When set to 'on' (default), Squid will pass all client If-* headers
-#	to the server. This permits server responses without a cacheable
-#	payload to be delivered and on MISS no new cache entry is created.
-#
-#	When set to 'off' and if the request is cacheable, Squid will
-#	remove the clients If-Modified-Since and If-None-Match headers from
-#	the request sent to the server. This requests a 200 status response
-#	from the server to create a new cache entry with.
-#Default:
-# cache_miss_revalidate on
-
-#  TAG: always_direct
-#	Usage: always_direct allow|deny [!]aclname ...
-#
-#	Here you can use ACL elements to specify requests which should
-#	ALWAYS be forwarded by Squid to the origin servers without using
-#	any peers.  For example, to always directly forward requests for
-#	local servers ignoring any parents or siblings you may have use
-#	something like:
-#
-#		acl local-servers dstdomain my.domain.net
-#		always_direct allow local-servers
-#
-#	To always forward FTP requests directly, use
-#
-#		acl FTP proto FTP
-#		always_direct allow FTP
-#
-#	NOTE: There is a similar, but opposite option named
-#	'never_direct'.  You need to be aware that "always_direct deny
-#	foo" is NOT the same thing as "never_direct allow foo".  You
-#	may need to use a deny rule to exclude a more-specific case of
-#	some other rule.  Example:
-#
-#		acl local-external dstdomain external.foo.net
-#		acl local-servers dstdomain  .foo.net
-#		always_direct deny local-external
-#		always_direct allow local-servers
-#
-#	NOTE: If your goal is to make the client forward the request
-#	directly to the origin server bypassing Squid then this needs
-#	to be done in the client configuration. Squid configuration
-#	can only tell Squid how Squid should fetch the object.
-#
-#	NOTE: This directive is not related to caching. The replies
-#	is cached as usual even if you use always_direct. To not cache
-#	the replies see the 'cache' directive.
-#
-#	This clause supports both fast and slow acl types.
-#	See http://wiki.squid-cache.org/SquidFaq/SquidAcl for details.
-#Default:
-# Prevent any cache_peer being used for this request.
-
-#  TAG: never_direct
-#	Usage: never_direct allow|deny [!]aclname ...
-#
-#	never_direct is the opposite of always_direct.  Please read
-#	the description for always_direct if you have not already.
-#
-#	With 'never_direct' you can use ACL elements to specify
-#	requests which should NEVER be forwarded directly to origin
-#	servers.  For example, to force the use of a proxy for all
-#	requests, except those in your local domain use something like:
-#
-#		acl local-servers dstdomain .foo.net
-#		never_direct deny local-servers
-#		never_direct allow all
-#
-#	or if Squid is inside a firewall and there are local intranet
-#	servers inside the firewall use something like:
-#
-#		acl local-intranet dstdomain .foo.net
-#		acl local-external dstdomain external.foo.net
-#		always_direct deny local-external
-#		always_direct allow local-intranet
-#		never_direct allow all
-#
-#	This clause supports both fast and slow acl types.
-#	See http://wiki.squid-cache.org/SquidFaq/SquidAcl for details.
-#Default:
-# Allow DNS results to be used for this request.
-
-# ADVANCED NETWORKING OPTIONS
-# -----------------------------------------------------------------------------
-
-#  TAG: incoming_udp_average
-#	Heavy voodoo here.  I can't even believe you are reading this.
-#	Are you crazy?  Don't even think about adjusting these unless
-#	you understand the algorithms in comm_select.c first!
-#Default:
-# incoming_udp_average 6
-
-#  TAG: incoming_tcp_average
-#	Heavy voodoo here.  I can't even believe you are reading this.
-#	Are you crazy?  Don't even think about adjusting these unless
-#	you understand the algorithms in comm_select.c first!
-#Default:
-# incoming_tcp_average 4
-
-#  TAG: incoming_dns_average
-#	Heavy voodoo here.  I can't even believe you are reading this.
-#	Are you crazy?  Don't even think about adjusting these unless
-#	you understand the algorithms in comm_select.c first!
-#Default:
-# incoming_dns_average 4
-
-#  TAG: min_udp_poll_cnt
-#	Heavy voodoo here.  I can't even believe you are reading this.
-#	Are you crazy?  Don't even think about adjusting these unless
-#	you understand the algorithms in comm_select.c first!
-#Default:
-# min_udp_poll_cnt 8
-
-#  TAG: min_dns_poll_cnt
-#	Heavy voodoo here.  I can't even believe you are reading this.
-#	Are you crazy?  Don't even think about adjusting these unless
-#	you understand the algorithms in comm_select.c first!
-#Default:
-# min_dns_poll_cnt 8
-
-#  TAG: min_tcp_poll_cnt
-#	Heavy voodoo here.  I can't even believe you are reading this.
-#	Are you crazy?  Don't even think about adjusting these unless
-#	you understand the algorithms in comm_select.c first!
-#Default:
-# min_tcp_poll_cnt 8
-
-#  TAG: accept_filter
-#	FreeBSD:
-#
-#	The name of an accept(2) filter to install on Squid's
-#	listen socket(s).  This feature is perhaps specific to
-#	FreeBSD and requires support in the kernel.
-#
-#	The 'httpready' filter delays delivering new connections
-#	to Squid until a full HTTP request has been received.
-#	See the accf_http(9) man page for details.
-#
-#	The 'dataready' filter delays delivering new connections
-#	to Squid until there is some data to process.
-#	See the accf_dataready(9) man page for details.
-#
-#	Linux:
-#	
-#	The 'data' filter delays delivering of new connections
-#	to Squid until there is some data to process by TCP_ACCEPT_DEFER.
-#	You may optionally specify a number of seconds to wait by
-#	'data=N' where N is the number of seconds. Defaults to 30
-#	if not specified.  See the tcp(7) man page for details.
-#EXAMPLE:
-## FreeBSD
-#accept_filter httpready
-## Linux
-#accept_filter data
-#Default:
-# none
-
-#  TAG: client_ip_max_connections
-#	Set an absolute limit on the number of connections a single
-#	client IP can use. Any more than this and Squid will begin to drop
-#	new connections from the client until it closes some links.
-#
-#	Note that this is a global limit. It affects all HTTP, HTCP, Gopher and FTP
-#	connections from the client. For finer control use the ACL access controls.
-#
-#	Requires client_db to be enabled (the default).
-#
-#	WARNING: This may noticably slow down traffic received via external proxies
-#	or NAT devices and cause them to rebound error messages back to their clients.
-#Default:
-# No limit.
-
-#  TAG: tcp_recv_bufsize	(bytes)
-#	Size of receive buffer to set for TCP sockets.  Probably just
-#	as easy to change your kernel's default.
-#	Omit from squid.conf to use the default buffer size.
-#Default:
-# Use operating system TCP defaults.
-
-# ICAP OPTIONS
-# -----------------------------------------------------------------------------
-
-#  TAG: icap_enable	on|off
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-icap-client
-#
-#	If you want to enable the ICAP module support, set this to on.
-#Default:
-# icap_enable off
-
-#  TAG: icap_connect_timeout
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-icap-client
-#
-#	This parameter specifies how long to wait for the TCP connect to
-#	the requested ICAP server to complete before giving up and either
-#	terminating the HTTP transaction or bypassing the failure.
-#
-#	The default for optional services is peer_connect_timeout.
-#	The default for essential services is connect_timeout.
-#	If this option is explicitly set, its value applies to all services.
-#Default:
-# none
-
-#  TAG: icap_io_timeout	time-units
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-icap-client
-#
-#	This parameter specifies how long to wait for an I/O activity on
-#	an established, active ICAP connection before giving up and
-#	either terminating the HTTP transaction or bypassing the
-#	failure.
-#Default:
-# Use read_timeout.
-
-#  TAG: icap_service_failure_limit	limit [in memory-depth time-units]
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-icap-client
-#
-#	The limit specifies the number of failures that Squid tolerates
-#	when establishing a new TCP connection with an ICAP service. If
-#	the number of failures exceeds the limit, the ICAP service is
-#	not used for new ICAP requests until it is time to refresh its
-#	OPTIONS.
-#
-#	A negative value disables the limit. Without the limit, an ICAP
-#	service will not be considered down due to connectivity failures
-#	between ICAP OPTIONS requests.
-#
-#	Squid forgets ICAP service failures older than the specified
-#	value of memory-depth. The memory fading algorithm 
-#	is approximate because Squid does not remember individual 
-#	errors but groups them instead, splitting the option
-#	value into ten time slots of equal length.
-#
-#	When memory-depth is 0 and by default this option has no 
-#	effect on service failure expiration.
-#
-#	Squid always forgets failures when updating service settings
-#	using an ICAP OPTIONS transaction, regardless of this option
-#	setting.
-#
-#	For example,
-#		# suspend service usage after 10 failures in 5 seconds:
-#		icap_service_failure_limit 10 in 5 seconds
-#Default:
-# icap_service_failure_limit 10
-
-#  TAG: icap_service_revival_delay
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-icap-client
-#
-#	The delay specifies the number of seconds to wait after an ICAP
-#	OPTIONS request failure before requesting the options again. The
-#	failed ICAP service is considered "down" until fresh OPTIONS are
-#	fetched.
-#
-#	The actual delay cannot be smaller than the hardcoded minimum
-#	delay of 30 seconds.
-#Default:
-# icap_service_revival_delay 180
-
-#  TAG: icap_preview_enable	on|off
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-icap-client
-#
-#	The ICAP Preview feature allows the ICAP server to handle the
-#	HTTP message by looking only at the beginning of the message body
-#	or even without receiving the body at all. In some environments, 
-#	previews greatly speedup ICAP processing.
-#
-#	During an ICAP OPTIONS transaction, the server may tell	Squid what
-#	HTTP messages should be previewed and how big the preview should be.
-#	Squid will not use Preview if the server did not request one.
-#
-#	To disable ICAP Preview for all ICAP services, regardless of
-#	individual ICAP server OPTIONS responses, set this option to "off".
-#Example:
-#icap_preview_enable off
-#Default:
-# icap_preview_enable on
-
-#  TAG: icap_preview_size
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-icap-client
-#
-#	The default size of preview data to be sent to the ICAP server.
-#	This value might be overwritten on a per server basis by OPTIONS requests.
-#Default:
-# No preview sent.
-
-#  TAG: icap_206_enable	on|off
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-icap-client
-#
-#	206 (Partial Content) responses is an ICAP extension that allows the
-#	ICAP agents to optionally combine adapted and original HTTP message
-#	content. The decision to combine is postponed until the end of the
-#	ICAP response. Squid supports Partial Content extension by default.
-#
-#	Activation of the Partial Content extension is negotiated with each
-#	ICAP service during OPTIONS exchange. Most ICAP servers should handle
-#	negotation correctly even if they do not support the extension, but
-#	some might fail. To disable Partial Content support for all ICAP
-#	services and to avoid any negotiation, set this option to "off".
-#
-#	Example:
-#	    icap_206_enable off
-#Default:
-# icap_206_enable on
-
-#  TAG: icap_default_options_ttl
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-icap-client
-#
-#	The default TTL value for ICAP OPTIONS responses that don't have
-#	an Options-TTL header.
-#Default:
-# icap_default_options_ttl 60
-
-#  TAG: icap_persistent_connections	on|off
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-icap-client
-#
-#	Whether or not Squid should use persistent connections to
-#	an ICAP server.
-#Default:
-# icap_persistent_connections on
-
-#  TAG: adaptation_send_client_ip	on|off
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-ecap or --enable-icap-client
-#
-#	If enabled, Squid shares HTTP client IP information with adaptation
-#	services. For ICAP, Squid adds the X-Client-IP header to ICAP requests.
-#	For eCAP, Squid sets the libecap::metaClientIp transaction option.
-#
-#	See also: adaptation_uses_indirect_client
-#Default:
-# adaptation_send_client_ip off
-
-#  TAG: adaptation_send_username	on|off
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-ecap or --enable-icap-client
-#
-#	This sends authenticated HTTP client username (if available) to
-#	the adaptation service.
-#
-#	For ICAP, the username value is encoded based on the
-#	icap_client_username_encode option and is sent using the header
-#	specified by the icap_client_username_header option.
-#Default:
-# adaptation_send_username off
-
-#  TAG: icap_client_username_header
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-icap-client
-#
-#	ICAP request header name to use for adaptation_send_username.
-#Default:
-# icap_client_username_header X-Client-Username
-
-#  TAG: icap_client_username_encode	on|off
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-icap-client
-#
-#	Whether to base64 encode the authenticated client username.
-#Default:
-# icap_client_username_encode off
-
-#  TAG: icap_service
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-icap-client
-#
-#	Defines a single ICAP service using the following format:
-#
-#	icap_service id vectoring_point uri [option ...]
-#
-#	id: ID
-#		an opaque identifier or name which is used to direct traffic to
-#		this specific service. Must be unique among all adaptation
-#		services in squid.conf.
-#
-#	vectoring_point: reqmod_precache|reqmod_postcache|respmod_precache|respmod_postcache
-#		This specifies at which point of transaction processing the
-#		ICAP service should be activated. *_postcache vectoring points
-#		are not yet supported.
-#
-#	uri: icap://servername:port/servicepath
-#		ICAP server and service location.
-#
-#	ICAP does not allow a single service to handle both REQMOD and RESPMOD
-#	transactions. Squid does not enforce that requirement. You can specify
-#	services with the same service_url and different vectoring_points. You
-#	can even specify multiple identical services as long as their
-#	service_names differ.
-#
-#	To activate a service, use the adaptation_access directive. To group
-#	services, use adaptation_service_chain and adaptation_service_set.
-#
-#	Service options are separated by white space. ICAP services support
-#	the following name=value options:
-#
-#	bypass=on|off|1|0
-#		If set to 'on' or '1', the ICAP service is treated as
-#		optional. If the service cannot be reached or malfunctions,
-#		Squid will try to ignore any errors and process the message as
-#		if the service was not enabled. No all ICAP errors can be
-#		bypassed.  If set to 0, the ICAP service is treated as
-#		essential and all ICAP errors will result in an error page
-#		returned to the HTTP client.
-#
-#		Bypass is off by default: services are treated as essential.
-#
-#	routing=on|off|1|0
-#		If set to 'on' or '1', the ICAP service is allowed to
-#		dynamically change the current message adaptation plan by
-#		returning a chain of services to be used next. The services
-#		are specified using the X-Next-Services ICAP response header
-#		value, formatted as a comma-separated list of service names.
-#		Each named service should be configured in squid.conf. Other
-#		services are ignored. An empty X-Next-Services value results
-#		in an empty plan which ends the current adaptation.
-#
-#		Dynamic adaptation plan may cross or cover multiple supported
-#		vectoring points in their natural processing order.
-#
-#		Routing is not allowed by default: the ICAP X-Next-Services
-#		response header is ignored.
-#
-#	ipv6=on|off
-#		Only has effect on split-stack systems. The default on those systems
-#		is to use IPv4-only connections. When set to 'on' this option will
-#		make Squid use IPv6-only connections to contact this ICAP service.
-#
-#	on-overload=block|bypass|wait|force
-#		If the service Max-Connections limit has been reached, do
-#		one of the following for each new ICAP transaction:
-#		  * block:  send an HTTP error response to the client
-#		  * bypass: ignore the "over-connected" ICAP service
-#		  * wait:   wait (in a FIFO queue) for an ICAP connection slot
-#		  * force:  proceed, ignoring the Max-Connections limit 
-#
-#		In SMP mode with N workers, each worker assumes the service
-#		connection limit is Max-Connections/N, even though not all
-#		workers may use a given service.
-#
-#		The default value is "bypass" if service is bypassable,
-#		otherwise it is set to "wait".
-#		
-#
-#	max-conn=number
-#		Use the given number as the Max-Connections limit, regardless
-#		of the Max-Connections value given by the service, if any.
-#
-#	Older icap_service format without optional named parameters is
-#	deprecated but supported for backward compatibility.
-#
-#Example:
-#icap_service svcBlocker reqmod_precache icap://icap1.mydomain.net:1344/reqmod bypass=0
-#icap_service svcLogger reqmod_precache icap://icap2.mydomain.net:1344/respmod routing=on
-#Default:
-# none
-
-#  TAG: icap_class
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-icap-client
-#
-#	This deprecated option was documented to define an ICAP service
-#	chain, even though it actually defined a set of similar, redundant
-#	services, and the chains were not supported. 
-#
-#	To define a set of redundant services, please use the
-#	adaptation_service_set directive. For service chains, use
-#	adaptation_service_chain.
-#Default:
-# none
-
-#  TAG: icap_access
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-icap-client
-#
-#	This option is deprecated. Please use adaptation_access, which
-#	has the same ICAP functionality, but comes with better
-#	documentation, and eCAP support.
-#Default:
-# none
-
-# eCAP OPTIONS
-# -----------------------------------------------------------------------------
-
-#  TAG: ecap_enable	on|off
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-ecap
-#
-#	Controls whether eCAP support is enabled.
-#Default:
-# ecap_enable off
-
-#  TAG: ecap_service
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-ecap
-#
-#	Defines a single eCAP service
-#
-#	ecap_service id vectoring_point uri [option ...]
-#
-#        id: ID
-#		an opaque identifier or name which is used to direct traffic to
-#		this specific service. Must be unique among all adaptation
-#		services in squid.conf.
-#
-#	vectoring_point: reqmod_precache|reqmod_postcache|respmod_precache|respmod_postcache
-#		This specifies at which point of transaction processing the
-#		eCAP service should be activated. *_postcache vectoring points
-#		are not yet supported.
-#
-#	uri: ecap://vendor/service_name?custom&cgi=style&parameters=optional
-#		Squid uses the eCAP service URI to match this configuration
-#		line with one of the dynamically loaded services. Each loaded
-#		eCAP service must have a unique URI. Obtain the right URI from
-#		the service provider.
-#
-#	To activate a service, use the adaptation_access directive. To group
-#	services, use adaptation_service_chain and adaptation_service_set.
-#
-#	Service options are separated by white space. eCAP services support
-#	the following name=value options:
-#
-#	bypass=on|off|1|0
-#		If set to 'on' or '1', the eCAP service is treated as optional.
-#		If the service cannot be reached or malfunctions, Squid will try
-#		to ignore any errors and process the message as if the service
-#		was not enabled. No all eCAP errors can be bypassed.
-#		If set to 'off' or '0', the eCAP service is treated as essential
-#		and all eCAP errors will result in an error page returned to the
-#		HTTP client.
-#
-#                Bypass is off by default: services are treated as essential.
-#
-#	routing=on|off|1|0
-#		If set to 'on' or '1', the eCAP service is allowed to
-#		dynamically change the current message adaptation plan by
-#		returning a chain of services to be used next.
-#
-#		Dynamic adaptation plan may cross or cover multiple supported
-#		vectoring points in their natural processing order.
-#
-#		Routing is not allowed by default.
-#
-#	Older ecap_service format without optional named parameters is
-#	deprecated but supported for backward compatibility.
-#
-#
-#Example:
-#ecap_service s1 reqmod_precache ecap://filters.R.us/leakDetector?on_error=block bypass=off
-#ecap_service s2 respmod_precache ecap://filters.R.us/virusFilter config=/etc/vf.cfg bypass=on
-#Default:
-# none
-
-#  TAG: loadable_modules
-#	Instructs Squid to load the specified dynamic module(s) or activate
-#	preloaded module(s).
-#Example:
-#loadable_modules /usr/lib/MinimalAdapter.so
-#Default:
-# none
-
-# MESSAGE ADAPTATION OPTIONS
-# -----------------------------------------------------------------------------
-
-#  TAG: adaptation_service_set
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-ecap or --enable-icap-client
-#
-#
-#	Configures an ordered set of similar, redundant services. This is
-#	useful when hot standby or backup adaptation servers are available.
-#
-#	    adaptation_service_set set_name service_name1 service_name2 ...
-#
-# 	The named services are used in the set declaration order. The first
-#	applicable adaptation service from the set is used first. The next
-#	applicable service is tried if and only if the transaction with the
-#	previous service fails and the message waiting to be adapted is still
-#	intact.
-#
-#	When adaptation starts, broken services are ignored as if they were
-#	not a part of the set. A broken service is a down optional service.
-#
-#	The services in a set must be attached to the same vectoring point
-#	(e.g., pre-cache) and use the same adaptation method (e.g., REQMOD).
-#
-#	If all services in a set are optional then adaptation failures are
-#	bypassable. If all services in the set are essential, then a
-#	transaction failure with one service may still be retried using
-#	another service from the set, but when all services fail, the master
-#	transaction fails as well.
-#
-#	A set may contain a mix of optional and essential services, but that
-#	is likely to lead to surprising results because broken services become
-#	ignored (see above), making previously bypassable failures fatal.
-#	Technically, it is the bypassability of the last failed service that
-#	matters.
-#
-#	See also: adaptation_access adaptation_service_chain
-#
-#Example:
-#adaptation_service_set svcBlocker urlFilterPrimary urlFilterBackup
-#adaptation service_set svcLogger loggerLocal loggerRemote
-#Default:
-# none
-
-#  TAG: adaptation_service_chain
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-ecap or --enable-icap-client
-#
-#
-#	Configures a list of complementary services that will be applied
-#	one-by-one, forming an adaptation chain or pipeline. This is useful
-#	when Squid must perform different adaptations on the same message.
-#
-#	    adaptation_service_chain chain_name service_name1 svc_name2 ...
-#
-# 	The named services are used in the chain declaration order. The first
-#	applicable adaptation service from the chain is used first. The next
-#	applicable service is applied to the successful adaptation results of
-#	the previous service in the chain.
-#
-#	When adaptation starts, broken services are ignored as if they were
-#	not a part of the chain. A broken service is a down optional service.
-#
-#	Request satisfaction terminates the adaptation chain because Squid
-#	does not currently allow declaration of RESPMOD services at the
-#	"reqmod_precache" vectoring point (see icap_service or ecap_service).
-#
-#	The services in a chain must be attached to the same vectoring point
-#	(e.g., pre-cache) and use the same adaptation method (e.g., REQMOD).
-#
-#	A chain may contain a mix of optional and essential services. If an
-#	essential adaptation fails (or the failure cannot be bypassed for
-#	other reasons), the master transaction fails. Otherwise, the failure
-#	is bypassed as if the failed adaptation service was not in the chain.
-#
-#	See also: adaptation_access adaptation_service_set
-#
-#Example:
-#adaptation_service_chain svcRequest requestLogger urlFilter leakDetector
-#Default:
-# none
-
-#  TAG: adaptation_access
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-ecap or --enable-icap-client
-#
-#	Sends an HTTP transaction to an ICAP or eCAP adaptation	service.
-#
-#	adaptation_access service_name allow|deny [!]aclname...
-#	adaptation_access set_name     allow|deny [!]aclname...
-#
-#	At each supported vectoring point, the adaptation_access
-#	statements are processed in the order they appear in this
-#	configuration file. Statements pointing to the following services
-#	are ignored (i.e., skipped without checking their ACL):
-#
-#	    - services serving different vectoring points
-#	    - "broken-but-bypassable" services
-#	    - "up" services configured to ignore such transactions
-#              (e.g., based on the ICAP Transfer-Ignore header).
-#
-#        When a set_name is used, all services in the set are checked
-#	using the same rules, to find the first applicable one. See
-#	adaptation_service_set for details.
-#
-#	If an access list is checked and there is a match, the
-#	processing stops: For an "allow" rule, the corresponding
-#	adaptation service is used for the transaction. For a "deny"
-#	rule, no adaptation service is activated.
-#
-#	It is currently not possible to apply more than one adaptation
-#	service at the same vectoring point to the same HTTP transaction.
-#
-#        See also: icap_service and ecap_service
-#
-#Example:
-#adaptation_access service_1 allow all
-#Default:
-# Allow, unless rules exist in squid.conf.
-
-#  TAG: adaptation_service_iteration_limit
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-ecap or --enable-icap-client
-#
-#	Limits the number of iterations allowed when applying adaptation
-#	services to a message. If your longest adaptation set or chain
-#	may have more than 16 services, increase the limit beyond its
-#	default value of 16. If detecting infinite iteration loops sooner
-#	is critical, make the iteration limit match the actual number
-#	of services in your longest adaptation set or chain.
-#
-#	Infinite adaptation loops are most likely with routing services.
-#
-#	See also: icap_service routing=1
-#Default:
-# adaptation_service_iteration_limit 16
-
-#  TAG: adaptation_masterx_shared_names
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-ecap or --enable-icap-client
-#
-#	For each master transaction (i.e., the HTTP request and response
-#	sequence, including all related ICAP and eCAP exchanges), Squid
-#	maintains a table of metadata. The table entries are (name, value)
-#	pairs shared among eCAP and ICAP exchanges. The table is destroyed
-#	with the master transaction.
-#
-#	This option specifies the table entry names that Squid must accept
-#	from and forward to the adaptation transactions.
-#
-#	An ICAP REQMOD or RESPMOD transaction may set an entry in the 
-#	shared table by returning an ICAP header field with a name 
-#	specified in adaptation_masterx_shared_names.
-#
-#	An eCAP REQMOD or RESPMOD transaction may set an entry in the
-#	shared table by implementing the libecap::visitEachOption() API
-#	to provide an option with a name specified in
-#	adaptation_masterx_shared_names.
-#
-#	Squid will store and forward the set entry to subsequent adaptation
-#	transactions within the same master transaction scope.
-#
-#	Only one shared entry name is supported at this time.
-#
-#Example:
-## share authentication information among ICAP services
-#adaptation_masterx_shared_names X-Subscriber-ID
-#Default:
-# none
-
-#  TAG: adaptation_meta
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-ecap or --enable-icap-client
-#
-#	This option allows Squid administrator to add custom ICAP request
-#	headers or eCAP options to Squid ICAP requests or eCAP transactions.
-#	Use it to pass custom authentication tokens and other
-#	transaction-state related meta information to an ICAP/eCAP service.
-#	
-#	The addition of a meta header is ACL-driven:
-#		adaptation_meta name value [!]aclname ...
-#	
-#	Processing for a given header name stops after the first ACL list match.
-#	Thus, it is impossible to add two headers with the same name. If no ACL
-#	lists match for a given header name, no such header is added. For 
-#	example:
-#	
-#		# do not debug transactions except for those that need debugging
-#		adaptation_meta X-Debug 1 needs_debugging
-#	
-#		# log all transactions except for those that must remain secret
-#		adaptation_meta X-Log 1 !keep_secret
-#	
-#		# mark transactions from users in the "G 1" group
-#		adaptation_meta X-Authenticated-Groups "G 1" authed_as_G1
-#	
-#	The "value" parameter may be a regular squid.conf token or a "double
-#	quoted string". Within the quoted string, use backslash (\) to escape
-#	any character, which is currently only useful for escaping backslashes
-#	and double quotes. For example,
-#	    "this string has one backslash (\\) and two \"quotes\""
-#
-#	Used adaptation_meta header values may be logged via %note
-#	logformat code. If multiple adaptation_meta headers with the same name
-#	are used during master transaction lifetime, the header values are
-#	logged in the order they were used and duplicate values are ignored
-#	(only the first repeated value will be logged).
-#Default:
-# none
-
-#  TAG: icap_retry
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-icap-client
-#
-#	This ACL determines which retriable ICAP transactions are
-#	retried. Transactions that received a complete ICAP response
-#	and did not have to consume or produce HTTP bodies to receive
-#	that response are usually retriable.
-#
-#	icap_retry allow|deny [!]aclname ...
-#
-#	Squid automatically retries some ICAP I/O timeouts and errors
-#	due to persistent connection race conditions.
-#
-#	See also: icap_retry_limit
-#Default:
-# icap_retry deny all
-
-#  TAG: icap_retry_limit
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-icap-client
-#
-#	Limits the number of retries allowed.
-#
-#	Communication errors due to persistent connection race
-#	conditions are unavoidable, automatically retried, and do not
-#	count against this limit.
-#
-#	See also: icap_retry
-#Default:
-# No retries are allowed.
-
-# DNS OPTIONS
-# -----------------------------------------------------------------------------
-
-#  TAG: check_hostnames
-#	For security and stability reasons Squid can check
-#	hostnames for Internet standard RFC compliance. If you want
-#	Squid to perform these checks turn this directive on.
-#Default:
-# check_hostnames off
-
-#  TAG: allow_underscore
-#	Underscore characters is not strictly allowed in Internet hostnames
-#	but nevertheless used by many sites. Set this to off if you want
-#	Squid to be strict about the standard.
-#	This check is performed only when check_hostnames is set to on.
-#Default:
-# allow_underscore on
-
-#  TAG: cache_dns_program
-# Note: This option is only available if Squid is rebuilt with the
-#       --disable-internal-dns
-#
-#	Specify the location of the executable for dnslookup process.
-#Default:
-# cache_dns_program /usr/libexec/dnsserver
-
-#  TAG: dns_children
-# Note: This option is only available if Squid is rebuilt with the
-#       --disable-internal-dns
-#
-#	The maximum number of processes spawn to service DNS name lookups.
-#	If you limit it too few Squid will have to wait for them to process
-#	a backlog of requests, slowing it down. If you allow too many they
-#	will use RAM and other system resources noticably.
-#	The maximum this may be safely set to is 32.
-#	
-#	The startup= and idle= options allow some measure of skew in your
-#	tuning.
-#	
-#		startup=
-#	
-#	Sets a minimum of how many processes are to be spawned when Squid
-#	starts or reconfigures. When set to zero the first request will
-#	cause spawning of the first child process to handle it.
-#	
-#	Starting too few will cause an initial slowdown in traffic as Squid
-#	attempts to simultaneously spawn enough processes to cope.
-#	
-#		idle=
-#	
-#	Sets a minimum of how many processes Squid is to try and keep available
-#	at all times. When traffic begins to rise above what the existing
-#	processes can handle this many more will be spawned up to the maximum
-#	configured. A minimum setting of 1 is required.
-#Default:
-# dns_children 32 startup=1 idle=1
-
-#  TAG: dns_retransmit_interval
-#	Initial retransmit interval for DNS queries. The interval is
-#	doubled each time all configured DNS servers have been tried.
-#Default:
-# dns_retransmit_interval 5 seconds
-
-#  TAG: dns_timeout
-#	DNS Query timeout. If no response is received to a DNS query
-#	within this time all DNS servers for the queried domain
-#	are assumed to be unavailable.
-#Default:
-# dns_timeout 30 seconds
-
-#  TAG: dns_packet_max
-#	Maximum number of bytes packet size to advertise via EDNS.
-#	Set to "none" to disable EDNS large packet support.
-#	
-#	For legacy reasons DNS UDP replies will default to 512 bytes which
-#	is too small for many responses. EDNS provides a means for Squid to
-#	negotiate receiving larger responses back immediately without having
-#	to failover with repeat requests. Responses larger than this limit
-#	will retain the old behaviour of failover to TCP DNS.
-#	
-#	Squid has no real fixed limit internally, but allowing packet sizes
-#	over 1500 bytes requires network jumbogram support and is usually not
-#	necessary.
-#	
-#	WARNING: The RFC also indicates that some older resolvers will reply
-#	with failure of the whole request if the extension is added. Some
-#	resolvers have already been identified which will reply with mangled
-#	EDNS response on occasion. Usually in response to many-KB jumbogram
-#	sizes being advertised by Squid.
-#	Squid will currently treat these both as an unable-to-resolve domain
-#	even if it would be resolvable without EDNS.
-#Default:
-# EDNS disabled
-
-#  TAG: dns_defnames	on|off
-#	Normally the RES_DEFNAMES resolver option is disabled
-#	(see res_init(3)).  This prevents caches in a hierarchy
-#	from interpreting single-component hostnames locally.  To allow
-#	Squid to handle single-component names, enable this option.
-#Default:
-# Search for single-label domain names is disabled.
-
-#  TAG: dns_multicast_local	on|off
-#	When set to on, Squid sends multicast DNS lookups on the local
-#	network for domains ending in .local and .arpa.
-#	This enables local servers and devices to be contacted in an
-#	ad-hoc or zero-configuration network environment.
-#Default:
-# Search for .local and .arpa names is disabled.
-
-#  TAG: dns_nameservers
-#	Use this if you want to specify a list of DNS name servers
-#	(IP addresses) to use instead of those given in your
-#	/etc/resolv.conf file.
-#
-#	On Windows platforms, if no value is specified here or in
-#	the /etc/resolv.conf file, the list of DNS name servers are
-#	taken from the Windows registry, both static and dynamic DHCP
-#	configurations are supported.
-#
-#	Example: dns_nameservers 10.0.0.1 192.172.0.4
-#Default:
-# Use operating system definitions
-
-#  TAG: hosts_file
-#	Location of the host-local IP name-address associations
-#	database. Most Operating Systems have such a file on different
-#	default locations:
-#	- Un*X & Linux:    /etc/hosts
-#	- Windows NT/2000: %SystemRoot%\system32\drivers\etc\hosts
-#			   (%SystemRoot% value install default is c:\winnt)
-#	- Windows XP/2003: %SystemRoot%\system32\drivers\etc\hosts
-#			   (%SystemRoot% value install default is c:\windows)
-#	- Windows 9x/Me:   %windir%\hosts
-#			   (%windir% value is usually c:\windows)
-#	- Cygwin:	   /etc/hosts
-#
-#	The file contains newline-separated definitions, in the
-#	form ip_address_in_dotted_form name [name ...] names are
-#	whitespace-separated. Lines beginning with an hash (#)
-#	character are comments.
-#
-#	The file is checked at startup and upon configuration.
-#	If set to 'none', it won't be checked.
-#	If append_domain is used, that domain will be added to
-#	domain-local (i.e. not containing any dot character) host
-#	definitions.
-#Default:
-# hosts_file /etc/hosts
-
-#  TAG: append_domain
-#	Appends local domain name to hostnames without any dots in
-#	them.  append_domain must begin with a period.
-#
-#	Be warned there are now Internet names with no dots in
-#	them using only top-domain names, so setting this may
-#	cause some Internet sites to become unavailable.
-#
-#Example:
-# append_domain .yourdomain.com
-#Default:
-# Use operating system definitions
-
-#  TAG: ignore_unknown_nameservers
-#	By default Squid checks that DNS responses are received
-#	from the same IP addresses they are sent to.  If they
-#	don't match, Squid ignores the response and writes a warning
-#	message to cache.log.  You can allow responses from unknown
-#	nameservers by setting this option to 'off'.
-#Default:
-# ignore_unknown_nameservers on
-
-#  TAG: dns_v4_first
-#	With the IPv6 Internet being as fast or faster than IPv4 Internet
-#	for most networks Squid prefers to contact websites over IPv6.
-#
-#	This option reverses the order of preference to make Squid contact
-#	dual-stack websites over IPv4 first. Squid will still perform both
-#	IPv6 and IPv4 DNS lookups before connecting.
-#
-#	WARNING:
-#	  This option will restrict the situations under which IPv6
-#	  connectivity is used (and tested). Hiding network problems
-#	  which would otherwise be detected and warned about.
-#Default:
-# dns_v4_first off
-
-#  TAG: ipcache_size	(number of entries)
-#	Maximum number of DNS IP cache entries.
-#Default:
-# ipcache_size 1024
-
-#  TAG: ipcache_low	(percent)
-#Default:
-# ipcache_low 90
-
-#  TAG: ipcache_high	(percent)
-#	The size, low-, and high-water marks for the IP cache.
-#Default:
-# ipcache_high 95
-
-#  TAG: fqdncache_size	(number of entries)
-#	Maximum number of FQDN cache entries.
-#Default:
-# fqdncache_size 1024
-
-# MISCELLANEOUS
-# -----------------------------------------------------------------------------
-
-#  TAG: configuration_includes_quoted_values	on|off
-#	Previous Squid versions have defined "quoted/string" as syntax for
-#	ACL to signifiy the value is an included file containing values and
-#	has treated the " characters in other places of the configuration file
-#	as part of the parameter value it was used for.
-#
-#	For compatibility with existing installations that behaviour
-#	remains the default.
-#
-#	If this directive is set to 'on', Squid will start parsing each
-#	"quoted string" as a single configuration directive parameter. The
-#	quotes are stripped before the parameter value is interpreted or use.
-#
-#	That will continue for all lines until this directive is set to 'off',
-#	where Squid will return to the default configuration parsing.
-#
-#	For example;
-#
-#		configuration_includes_quoted_values on
-#		acl group external groupCheck Administrators "Internet Users" Guest
-#		configuration_includes_quoted_values off
-#
-#Default:
-# configuration_includes_quoted_values off
-
-#  TAG: memory_pools	on|off
-#	If set, Squid will keep pools of allocated (but unused) memory
-#	available for future use.  If memory is a premium on your
-#	system and you believe your malloc library outperforms Squid
-#	routines, disable this.
-#Default:
-# memory_pools on
-
-#  TAG: memory_pools_limit	(bytes)
-#	Used only with memory_pools on:
-#	memory_pools_limit 50 MB
-#
-#	If set to a non-zero value, Squid will keep at most the specified
-#	limit of allocated (but unused) memory in memory pools. All free()
-#	requests that exceed this limit will be handled by your malloc
-#	library. Squid does not pre-allocate any memory, just safe-keeps
-#	objects that otherwise would be free()d. Thus, it is safe to set
-#	memory_pools_limit to a reasonably high value even if your
-#	configuration will use less memory.
-#
-#	If set to none, Squid will keep all memory it can. That is, there
-#	will be no limit on the total amount of memory used for safe-keeping.
-#
-#	To disable memory allocation optimization, do not set
-#	memory_pools_limit to 0 or none. Set memory_pools to "off" instead.
-#
-#	An overhead for maintaining memory pools is not taken into account
-#	when the limit is checked. This overhead is close to four bytes per
-#	object kept. However, pools may actually _save_ memory because of
-#	reduced memory thrashing in your malloc library.
-#Default:
-# memory_pools_limit 5 MB
-
-#  TAG: forwarded_for	on|off|transparent|truncate|delete
-#	If set to "on", Squid will append your client's IP address
-#	in the HTTP requests it forwards. By default it looks like:
-#
-#		X-Forwarded-For: 192.1.2.3
-#
-#	If set to "off", it will appear as
-#
-#		X-Forwarded-For: unknown
-#
-#	If set to "transparent", Squid will not alter the
-#	X-Forwarded-For header in any way.
-#
-#	If set to "delete", Squid will delete the entire
-#	X-Forwarded-For header.
-#
-#	If set to "truncate", Squid will remove all existing
-#	X-Forwarded-For entries, and place the client IP as the sole entry.
-#Default:
-# forwarded_for on
-
-#  TAG: cachemgr_passwd
-#	Specify passwords for cachemgr operations.
-#
-#	Usage: cachemgr_passwd password action action ...
-#
-#	Some valid actions are (see cache manager menu for a full list):
-#		5min
-#		60min
-#		asndb
-#		authenticator
-#		cbdata
-#		client_list
-#		comm_incoming
-#		config *
-#		counters
-#		delay
-#		digest_stats
-#		dns
-#		events
-#		filedescriptors
-#		fqdncache
-#		histograms
-#		http_headers
-#		info
-#		io
-#		ipcache
-#		mem
-#		menu
-#		netdb
-#		non_peers
-#		objects
-#		offline_toggle *
-#		pconn
-#		peer_select
-#		reconfigure *
-#		redirector
-#		refresh
-#		server_list
-#		shutdown *
-#		store_digest
-#		storedir
-#		utilization
-#		via_headers
-#		vm_objects
-#
-#	* Indicates actions which will not be performed without a
-#	  valid password, others can be performed if not listed here.
-#
-#	To disable an action, set the password to "disable".
-#	To allow performing an action without a password, set the
-#	password to "none".
-#
-#	Use the keyword "all" to set the same password for all actions.
-#
-#Example:
-# cachemgr_passwd secret shutdown
-# cachemgr_passwd lesssssssecret info stats/objects
-# cachemgr_passwd disable all
-#Default:
-# No password. Actions which require password are denied.
-
-#  TAG: client_db	on|off
-#	If you want to disable collecting per-client statistics,
-#	turn off client_db here.
-#Default:
-# client_db on
-
-#  TAG: refresh_all_ims	on|off
-#	When you enable this option, squid will always check
-#	the origin server for an update when a client sends an
-#	If-Modified-Since request.  Many browsers use IMS
-#	requests when the user requests a reload, and this
-#	ensures those clients receive the latest version.
-#
-#	By default (off), squid may return a Not Modified response
-#	based on the age of the cached version.
-#Default:
-# refresh_all_ims off
-
-#  TAG: reload_into_ims	on|off
-#	When you enable this option, client no-cache or ``reload''
-#	requests will be changed to If-Modified-Since requests.
-#	Doing this VIOLATES the HTTP standard.  Enabling this
-#	feature could make you liable for problems which it
-#	causes.
-#
-#	see also refresh_pattern for a more selective approach.
-#Default:
-# reload_into_ims off
-
-#  TAG: connect_retries
-#	This sets the maximum number of connection attempts made for each
-#	TCP connection. The connect_retries attempts must all still
-#	complete within the connection timeout period.
-#
-#	The default is not to re-try if the first connection attempt fails.
-#	The (not recommended) maximum is 10 tries.
-#
-#	A warning message will be generated if it is set to a too-high
-#	value and the configured value will be over-ridden.
-#
-#	Note: These re-tries are in addition to forward_max_tries
-#	which limit how many different addresses may be tried to find
-#	a useful server.
-#Default:
-# Do not retry failed connections.
-
-#  TAG: retry_on_error
-#	If set to ON Squid will automatically retry requests when
-#	receiving an error response with status 403 (Forbidden),
-#	500 (Internal Error), 501 or 503 (Service not available).
-#	Status 502 and 504 (Gateway errors) are always retried.
-#	
-#	This is mainly useful if you are in a complex cache hierarchy to
-#	work around access control errors.
-#	
-#	NOTE: This retry will attempt to find another working destination.
-#	Which is different from the server which just failed.
-#Default:
-# retry_on_error off
-
-#  TAG: as_whois_server
-#	WHOIS server to query for AS numbers.  NOTE: AS numbers are
-#	queried only when Squid starts up, not for every request.
-#Default:
-# as_whois_server whois.ra.net
-
-#  TAG: offline_mode
-#	Enable this option and Squid will never try to validate cached
-#	objects.
-#Default:
-# offline_mode off
-
-#  TAG: uri_whitespace
-#	What to do with requests that have whitespace characters in the
-#	URI.  Options:
-#
-#	strip:  The whitespace characters are stripped out of the URL.
-#		This is the behavior recommended by RFC2396 and RFC3986
-#		for tolerant handling of generic URI.
-#		NOTE: This is one difference between generic URI and HTTP URLs.
-#
-#	deny:   The request is denied.  The user receives an "Invalid
-#		Request" message.
-#		This is the behaviour recommended by RFC2616 for safe
-#		handling of HTTP request URL.
-#
-#	allow:  The request is allowed and the URI is not changed.  The
-#		whitespace characters remain in the URI.  Note the
-#		whitespace is passed to redirector processes if they
-#		are in use.
-#		Note this may be considered a violation of RFC2616
-#		request parsing where whitespace is prohibited in the
-#		URL field.
-#
-#	encode:	The request is allowed and the whitespace characters are
-#		encoded according to RFC1738.
-#
-#	chop:	The request is allowed and the URI is chopped at the
-#		first whitespace.
-#
-#
-#	NOTE the current Squid implementation of encode and chop violates
-#	RFC2616 by not using a 301 redirect after altering the URL.
-#Default:
-# uri_whitespace strip
-
-#  TAG: chroot
-#	Specifies a directory where Squid should do a chroot() while
-#	initializing.  This also causes Squid to fully drop root
-#	privileges after initializing.  This means, for example, if you
-#	use a HTTP port less than 1024 and try to reconfigure, you may
-#	get an error saying that Squid can not open the port.
-#Default:
-# none
-
-#  TAG: balance_on_multiple_ip
-#	Modern IP resolvers in squid sort lookup results by preferred access.
-#	By default squid will use these IP in order and only rotates to
-#	the next listed when the most preffered fails.
-#
-#	Some load balancing servers based on round robin DNS have been
-#	found not to preserve user session state across requests
-#	to different IP addresses.
-#
-#	Enabling this directive Squid rotates IP's per request.
-#Default:
-# balance_on_multiple_ip off
-
-#  TAG: pipeline_prefetch
-#	HTTP clients may send a pipeline of 1+N requests to Squid using a
-#	single connection, without waiting for Squid to respond to the first
-#	of those requests. This option limits the number of concurrent
-#	requests Squid will try to handle in parallel. If set to N, Squid
-#	will try to receive and process up to 1+N requests on the same
-#	connection concurrently.
-#
-#	Defaults to 0 (off) for bandwidth management and access logging
-#	reasons.
-#
-#	NOTE: pipelining requires persistent connections to clients.
-#
-#	WARNING: pipelining breaks NTLM and Negotiate/Kerberos authentication.
-#Default:
-# Do not pre-parse pipelined requests.
-
-#  TAG: high_response_time_warning	(msec)
-#	If the one-minute median response time exceeds this value,
-#	Squid prints a WARNING with debug level 0 to get the
-#	administrators attention.  The value is in milliseconds.
-#Default:
-# disabled.
-
-#  TAG: high_page_fault_warning
-#	If the one-minute average page fault rate exceeds this
-#	value, Squid prints a WARNING with debug level 0 to get
-#	the administrators attention.  The value is in page faults
-#	per second.
-#Default:
-# disabled.
-
-#  TAG: high_memory_warning
-# Note: This option is only available if Squid is rebuilt with the
-#       GNU Malloc with mstats()
-#
-#	If the memory usage (as determined by mallinfo) exceeds
-#	this amount, Squid prints a WARNING with debug level 0 to get
-#	the administrators attention.
-#Default:
-# disabled.
-
-#  TAG: sleep_after_fork	(microseconds)
-#	When this is set to a non-zero value, the main Squid process
-#	sleeps the specified number of microseconds after a fork()
-#	system call. This sleep may help the situation where your
-#	system reports fork() failures due to lack of (virtual)
-#	memory. Note, however, if you have a lot of child
-#	processes, these sleep delays will add up and your
-#	Squid will not service requests for some amount of time
-#	until all the child processes have been started.
-#	On Windows value less then 1000 (1 milliseconds) are
-#	rounded to 1000.
-#Default:
-# sleep_after_fork 0
-
-#  TAG: windows_ipaddrchangemonitor	on|off
-# Note: This option is only available if Squid is rebuilt with the
-#       MS Windows
-#
-#	On Windows Squid by default will monitor IP address changes and will 
-#	reconfigure itself after any detected event. This is very useful for
-#	proxies connected to internet with dial-up interfaces.
-#	In some cases (a Proxy server acting as VPN gateway is one) it could be
-#	desiderable to disable this behaviour setting this to 'off'.
-#	Note: after changing this, Squid service must be restarted.
-#Default:
-# windows_ipaddrchangemonitor on
-
-#  TAG: eui_lookup
-#	Whether to lookup the EUI or MAC address of a connected client.
-#Default:
-# eui_lookup on
-
-#  TAG: max_filedescriptors
-#	Reduce the maximum number of filedescriptors supported below
-#	the usual operating system defaults.
-#
-#	Remove from squid.conf to inherit the current ulimit setting.
-#
-#	Note: Changing this requires a restart of Squid. Also
-#	not all I/O types supports large values (eg on Windows).
-#Default:
-# Use operating system limits set by ulimit.
-
-#  TAG: workers
-#	Number of main Squid processes or "workers" to fork and maintain.
-#	0: "no daemon" mode, like running "squid -N ..."
-#	1: "no SMP" mode, start one main Squid process daemon (default)
-#	N: start N main Squid process daemons (i.e., SMP mode)
-#
-#	In SMP mode, each worker does nearly all what a single Squid daemon
-#	does (e.g., listen on http_port and forward HTTP requests).
-#Default:
-# SMP support disabled.
-
-#  TAG: cpu_affinity_map
-#	Usage: cpu_affinity_map process_numbers=P1,P2,... cores=C1,C2,...
-#
-#	Sets 1:1 mapping between Squid processes and CPU cores. For example,
-#
-#	    cpu_affinity_map process_numbers=1,2,3,4 cores=1,3,5,7
-#
-#	affects processes 1 through 4 only and places them on the first
-#	four even cores, starting with core #1.
-#
-#	CPU cores are numbered starting from 1. Requires support for
-#	sched_getaffinity(2) and sched_setaffinity(2) system calls.
-#
-#	Multiple cpu_affinity_map options are merged.
-#
-#	See also: workers
-#Default:
-# Let operating system decide.
-
diff --git a/network/squid/squid.info b/network/squid/squid.info
index 720212f47b..e925b15dca 100644
--- a/network/squid/squid.info
+++ b/network/squid/squid.info
@@ -1,8 +1,8 @@
 PRGNAM="squid"
-VERSION="3.5.26"
+VERSION="6.6"
 HOMEPAGE="http://www.squid-cache.org/"
-DOWNLOAD="http://www.squid-cache.org/Versions/v3/3.5/squid-3.5.26.tar.xz"
-MD5SUM="510e2c84773879c00d0e7ced997864d9"
+DOWNLOAD="http://www.squid-cache.org/Versions/v6/squid-6.6.tar.xz"
+MD5SUM="5a41134ee1b7e75f62088acdec92d2ca"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/network/squid/squid.logrotate b/network/squid/squid.logrotate
index eeca36223f..9c2b9c2816 100644
--- a/network/squid/squid.logrotate
+++ b/network/squid/squid.logrotate
@@ -7,7 +7,7 @@
 # reopen squid.log, effectively using the new logfile.  The old logfile
 # (squid.log.1) will be compressed by logrotate's next invocation.
 /var/log/squid/*.log {
-    su @USER@ @GROUP@
+    su @SQUIDUSER@ @SQUIDGROUP@
     weekly
     rotate 5
     compress
diff --git a/network/squidGuard/README b/network/squidGuard/README
deleted file mode 100644
index 3b76ae4f42..0000000000
--- a/network/squidGuard/README
+++ /dev/null
@@ -1,2 +0,0 @@
-SquidGuard is a URL redirector software used to use blacklists with
-the proxy software Squid.
diff --git a/network/squidGuard/doinst.sh b/network/squidGuard/doinst.sh
deleted file mode 100644
index 0938b3cf5f..0000000000
--- a/network/squidGuard/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/squidguard/squidguard.conf.new
diff --git a/network/squidGuard/rewrite.patch b/network/squidGuard/rewrite.patch
deleted file mode 100644
index 878a2af167..0000000000
--- a/network/squidGuard/rewrite.patch
+++ /dev/null
@@ -1,73 +0,0 @@
---- squidGuard-1.4.orig/src/main.c	2013-12-11 17:42:15.000000000 +1300
-+++ squidGuard-1.4.orig/src/main.c	2013-12-11 19:04:09.000000000 +1300
-@@ -175,7 +175,7 @@ 
- 	sgReloadConfig();
-       }
-       if(failsafe_mode) {
--	puts("");
-+	puts("ERR message=\"squidGuard failsafe mode\"");
- 	fflush(stdout);
- 	if(sig_hup){
-           sgReloadConfig();
-@@ -184,7 +184,7 @@ 
-       }
-       if(parseLine(buf,&squidInfo) != 1){
- 	sgLogError("Error parsing squid line: %s",buf);
--	puts("");
-+	puts("BH message=\"squidGuard error parsing squid line\"");
-       }
-         else {
- 	src = Source;
-@@ -196,14 +196,14 @@ 
- 	  acl = sgAclCheckSource(src);
- 	  if((redirect = sgAclAccess(src,acl,&squidInfo)) == NULL){
- 	    if(src == NULL || src->cont_search == 0){
--	      puts(""); 
-+	      puts("ERR");
- 	      break;
- 	    } else
- 	      if(src->next != NULL){
- 		src = src->next;
- 		continue;
- 	      } else {
--		puts("");
-+		puts("ERR");
- 		break;
- 	      }
- 	  } else {
-@@ -215,9 +215,10 @@ 
- 	      squidInfo.ident[0] = '-';
- 	      squidInfo.ident[1] = '\0';
- 	    }
--	    fprintf(stdout,"%s %s/%s %s %s\n",redirect,squidInfo.src,
--		    squidInfo.srcDomain,squidInfo.ident,
--		    squidInfo.method);
-+	    if (isdigit(redirect[0]) && isdigit(redirect[1]) && isdigit(redirect[2]) && redirect[3]==':') {
-+	      fprintf(stdout,"OK status=%c%c%c url=\"%s\"\n", redirect[0], redirect[1], redirect[2], &redirect[4]);
-+	    } else
-+	      fprintf(stdout,"OK rewrite-url=\"%s\"\n",redirect);
-             /* sgLogError("%s %s/%s %s %s\n",redirect,squidInfo.src,squidInfo.srcDomain,squidInfo.ident,squidInfo.method);  */
- 	    break;
- 	  }
---- squidGuard-1.4.orig/src/sgDiv.c	2013-12-11 17:42:15.000000000 +1300
-+++ squidGuard-1.4.orig/src/sgDiv.c	2013-12-11 18:58:33.000000000 +1300
-@@ -771,7 +771,7 @@ 
-   }
-   sgLogError("Going into emergency mode");
-   while(fgets(buf, MAX_BUF, stdin) != NULL){
--    puts("");
-+    puts("ERR");
-     fflush(stdout);
-   }
-   sgLogError("ending emergency mode, stdin empty");
---- squidGuard-1.4.orig/src/sgDiv.c.in	2013-12-11 17:42:15.000000000 +1300
-+++ squidGuard-1.4.orig/src/sgDiv.c.in	2013-12-11 18:58:40.000000000 +1300
-@@ -782,7 +782,7 @@ 
-   }
-   sgLogError("Going into emergency mode");
-   while(fgets(buf, MAX_BUF, stdin) != NULL){
--    puts("");
-+    puts("ERR");
-     fflush(stdout);
-   }
-   sgLogError("ending emergency mode, stdin empty");
diff --git a/network/squidGuard/slack-desc b/network/squidGuard/slack-desc
deleted file mode 100644
index 4b87692bf6..0000000000
--- a/network/squidGuard/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------------------------------------------------------|
-squidGuard: squidGuard (URL redirector)
-squidGuard:
-squidGuard: SquidGuard is a URL redirector software used to use blacklists with
-squidGuard: the proxy software Squid.
-squidGuard:
-squidGuard:
-squidGuard:
-squidGuard:
-squidGuard:
-squidGuard:
-squidGuard: Homepage: http://www.squidguard.org
diff --git a/network/squidGuard/squidGuard.SlackBuild b/network/squidGuard/squidGuard.SlackBuild
deleted file mode 100644
index c79c786bb1..0000000000
--- a/network/squidGuard/squidGuard.SlackBuild
+++ /dev/null
@@ -1,119 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for squidGuard
-
-# Written by Niki Kovacs <info@microlinux.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.
-
-PRGNAM=squidGuard
-VERSION=${VERSION:-1.4}
-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"
-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 {} \;
-
-# Fixes a buffer overflow problem and prevents squidGuard from going into
-# emergency mode when overlong URLs are encountered (they can be perfectly
-# legal).
-
-# Fixes two bypass problems with URLs having a length closed to the defined
-# MAX_BUF value (4096).
-patch -p1 < $CWD/squidGuard.patch
-
-# Patch to fix compatibility with SquidGuard 3.4
-patch -p1 < $CWD/rewrite.patch
-
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
-  --prefix=/usr \
-  --with-sg-config=/etc/squidguard/squidguard.conf \
-  --with-sg-logdir=/var/log/squidguard \
-  --with-sg-dbhome=/var/lib/squidguard \
-  --with-squiduser=nobody \
-  --docdir=/usr/doc/$PRGNAM-$VERSION \
-  --htmldir=/usr/doc/$PRGNAM-$VERSION \
-  --build=$ARCH-slackware-linux
-
-make
-make prefix=$PKG/usr install
-
-mkdir -p $PKG/etc/squidguard
-mkdir -p $PKG/var/lib/squidguard
-mkdir -p $PKG/var/log/squidguard
-cat samples/sample.conf > $PKG/etc/squidguard/squidguard.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 ANNOUNCE CHANGELOG CONFIGURATION COPYING FAQ GPL INSTALL ISSUES.txt \
-  README* samples/ doc/{*.html,*.txt,*.gif} \
-  $PKG/usr/doc/$PRGNAM-$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/network/squidGuard/squidGuard.info b/network/squidGuard/squidGuard.info
deleted file mode 100644
index 33defaf45c..0000000000
--- a/network/squidGuard/squidGuard.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="squidGuard"
-VERSION="1.4"
-HOMEPAGE="http://www.squidguard.org"
-DOWNLOAD="http://www.squidguard.org/Downloads/squidGuard-1.4.tar.gz"
-MD5SUM="de834150998c1386c30feae196f16b06"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="squid"
-MAINTAINER="Niki Kovacs"
-EMAIL="info@microlinux.fr"
diff --git a/network/squidGuard/squidGuard.patch b/network/squidGuard/squidGuard.patch
deleted file mode 100644
index 46880baf67..0000000000
--- a/network/squidGuard/squidGuard.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-diff -Nur squidGuard-1.4.orig/src/sg.h.in squidGuard-1.4/src/sg.h.in
---- squidGuard-1.4.orig/src/sg.h.in	2007-11-16 23:58:32.000000000 +0700
-+++ squidGuard-1.4/src/sg.h.in	2015-02-07 22:26:18.632797069 +0700
-@@ -73,7 +73,7 @@
- #define REQUEST_TYPE_REDIRECT   2
- #define REQUEST_TYPE_PASS       3
- 
--#define MAX_BUF 4096
-+#define MAX_BUF 12288
- 
- #define DEFAULT_LOGFILE "squidGuard.log"
- #define WARNING_LOGFILE "squidGuard.log"
-diff -Nur squidGuard-1.4.orig/src/sgDiv.c.in squidGuard-1.4/src/sgDiv.c.in
---- squidGuard-1.4.orig/src/sgDiv.c.in	2008-07-14 23:02:43.000000000 +0700
-+++ squidGuard-1.4/src/sgDiv.c.in	2015-02-07 22:26:18.632797069 +0700
-@@ -745,7 +745,7 @@
-       p++;
-       break;
-     case 'u': /* Requested URL */
--      strcat(buf, req->orig);
-+      strncat(buf, req->orig, 2048);
-       p++;
-       break;
-     default:
-diff -Nur squidGuard-1.4.orig/src/sgLog.c squidGuard-1.4/src/sgLog.c
---- squidGuard-1.4.orig/src/sgLog.c	2007-11-16 23:58:32.000000000 +0700
-+++ squidGuard-1.4/src/sgLog.c	2015-02-07 22:26:39.122853889 +0700
-@@ -2,7 +2,7 @@
-   By accepting this notice, you agree to be bound by the following
-   agreements:
-   
--  This software product, squidGuard, is copyrighted (C) 1998-2007
-+  This software product, squidGuard, is copyrighted (C) 1998-2009
-   by Christine Kronberg, Shalla Secure Services. All rights reserved.
-  
-   This program is free software; you can redistribute it and/or modify it
-@@ -55,8 +55,8 @@
-   char msg[MAX_BUF];
-   va_list ap;
-   VA_START(ap, format);
--  if(vsprintf(msg, format, ap) > (MAX_BUF - 1)) 
--    fprintf(stderr,"overflow in vsprintf (sgLog): %s",strerror(errno));
-+  if(vsnprintf(msg, MAX_BUF, format, ap) > (MAX_BUF - 1)) 
-+    fprintf(stderr,"overflow in vsnprintf (sgLog): %s",strerror(errno));
-   va_end(ap);
-   date = niso(0);
-   if(globalDebug || log == NULL) {
-@@ -87,8 +87,8 @@
-   char msg[MAX_BUF];
-   va_list ap;
-   VA_START(ap, format);
--  if(vsprintf(msg, format, ap) > (MAX_BUF - 1)) 
--    sgLogFatalError("overflow in vsprintf (sgLogError): %s",strerror(errno));
-+  if(vsnprintf(msg, MAX_BUF, format, ap) > (MAX_BUF - 1)) 
-+    sgLog(globalErrorLog, "overflow in vsnprintf (sgLogError): %s",strerror(errno));
-   va_end(ap);
-   sgLog(globalErrorLog,"%s",msg);
- }
-@@ -104,8 +104,8 @@
-   char msg[MAX_BUF];
-   va_list ap;
-   VA_START(ap, format);
--  if(vsprintf(msg, format, ap) > (MAX_BUF - 1)) 
--    return;
-+  if(vsnprintf(msg, MAX_BUF, format, ap) > (MAX_BUF - 1)) 
-+    sgLog(globalErrorLog, "overflow in vsnprintf (sgLogError): %s",strerror(errno));
-   va_end(ap);
-   sgLog(globalErrorLog,"%s",msg);
-   sgEmergency();
diff --git a/network/squidanalyzer/README b/network/squidanalyzer/README
index 4689876293..8cc80e2926 100644
--- a/network/squidanalyzer/README
+++ b/network/squidanalyzer/README
@@ -1,3 +1,4 @@
-Squid Analyzer parses Squid proxy access log and reports general statistics
-about hits, bytes, users, networks, top URLs, and top second level domains.
-Statistic reports are oriented toward user and bandwidth control. 
+Squid Analyzer parses Squid proxy access log and reports general
+statistics about hits, bytes, users, networks, top URLs, and top
+second level domains. Statistic reports are oriented toward user and
+bandwidth control.
diff --git a/network/squidanalyzer/squidanalyzer.SlackBuild b/network/squidanalyzer/squidanalyzer.SlackBuild
index 3a759a27a5..b1600bda1b 100644
--- a/network/squidanalyzer/squidanalyzer.SlackBuild
+++ b/network/squidanalyzer/squidanalyzer.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for squidanalyzer
 
@@ -24,10 +24,13 @@
 
 # Modified by the SlackBuilds.org project
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=squidanalyzer
 VERSION=${VERSION:-5.3}
 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}
@@ -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/network/squirrelmail/README b/network/squirrelmail/README
new file mode 100644
index 0000000000..fe88288631
--- /dev/null
+++ b/network/squirrelmail/README
@@ -0,0 +1,9 @@
+quirrelMail is a project that provides both a web-based email client
+and a proxy server for the IMAP protocol. SquirrelMail webmail
+is available for any platform supporting PHP. The SquirrelMail
+webmail client itself is a complete webmail system, but extra
+features are available in the form of plugins. There are over 200
+third-party plugins available for download from the SquirrelMail
+website and SquirrelMail ships with several "standard" or "core"
+plugins. SquirrelMail webmail has been translated into over 50
+languages.
diff --git a/network/squirrelmail/config.php.txt b/network/squirrelmail/config.php.txt
new file mode 100644
index 0000000000..d901ee1885
--- /dev/null
+++ b/network/squirrelmail/config.php.txt
@@ -0,0 +1,177 @@
+<?php
+
+/**
+ * SquirrelMail Configuration File
+ * Created using the configure script, conf.pl
+ */
+
+global $version;
+$config_version = '1.4.0';
+$config_use_color = 1;
+
+$org_name      = "SquirrelMail";
+$org_logo      = SM_PATH . 'images/sm_logo.png';
+$org_logo_width  = '308';
+$org_logo_height = '111';
+$org_title     = "SquirrelMail $version";
+$signout_page  = '';
+$frame_top     = '_top';
+
+$provider_uri     = 'http://squirrelmail.org/';
+
+$provider_name     = 'SquirrelMail';
+
+$motd = "";
+
+$squirrelmail_default_language = 'en_US';
+
+$domain                 = 'localhost';
+$imapServerAddress      = 'localhost';
+$imapPort               = 143;
+$useSendmail            = true;
+$smtpServerAddress      = 'localhost';
+$smtpPort               = 25;
+$sendmail_path          = '/usr/sbin/sendmail';
+$pop_before_smtp        = false;
+$imap_server_type       = 'uw';
+$invert_time            = false;
+$optional_delimiter     = '/';
+
+$default_folder_prefix          = 'mail/';
+$trash_folder                   = 'Trash';
+$sent_folder                    = 'Sent';
+$draft_folder                   = 'Drafts';
+$default_move_to_trash          = true;
+$default_move_to_sent           = true;
+$default_save_as_draft          = true;
+$show_prefix_option             = true;
+$list_special_folders_first     = true;
+$use_special_folder_color       = true;
+$auto_expunge                   = true;
+$default_sub_of_inbox           = false;
+$show_contain_subfolders_option = true;
+$default_unseen_notify          = 2;
+$default_unseen_type            = 1;
+$auto_create_special            = true;
+$delete_folder                  = false;
+$noselect_fix_enable            = false;
+
+$default_charset          = 'utf-8';
+$data_dir                 = '/var/lib/squirrelmail/prefs/';
+$attachment_dir           = '/var/spool/squirrelmail/attach/';
+$dir_hash_level           = 0;
+$default_left_size        = '150';
+$force_username_lowercase = false;
+$default_use_priority     = true;
+$hide_sm_attributions     = false;
+$default_use_mdn          = true;
+$edit_identity            = true;
+$edit_name                = true;
+$allow_thread_sort        = true;
+$allow_server_sort        = true;
+$allow_charset_search     = true;
+$uid_support              = true;
+
+$plugins[0] = 'delete_move_next';
+$plugins[1] = 'squirrelspell';
+$plugins[2] = 'newmail';
+
+$theme_css = '';
+$theme_default = 0;
+$theme[0]['PATH'] = SM_PATH . 'themes/default_theme.php';
+$theme[0]['NAME'] = 'Default';
+$theme[1]['PATH'] = SM_PATH . 'themes/plain_blue_theme.php';
+$theme[1]['NAME'] = 'Plain Blue';
+$theme[2]['PATH'] = SM_PATH . 'themes/sandstorm_theme.php';
+$theme[2]['NAME'] = 'Sand Storm';
+$theme[3]['PATH'] = SM_PATH . 'themes/deepocean_theme.php';
+$theme[3]['NAME'] = 'Deep Ocean';
+$theme[4]['PATH'] = SM_PATH . 'themes/slashdot_theme.php';
+$theme[4]['NAME'] = 'Slashdot';
+$theme[5]['PATH'] = SM_PATH . 'themes/purple_theme.php';
+$theme[5]['NAME'] = 'Purple';
+$theme[6]['PATH'] = SM_PATH . 'themes/forest_theme.php';
+$theme[6]['NAME'] = 'Forest';
+$theme[7]['PATH'] = SM_PATH . 'themes/ice_theme.php';
+$theme[7]['NAME'] = 'Ice';
+$theme[8]['PATH'] = SM_PATH . 'themes/seaspray_theme.php';
+$theme[8]['NAME'] = 'Sea Spray';
+$theme[9]['PATH'] = SM_PATH . 'themes/bluesteel_theme.php';
+$theme[9]['NAME'] = 'Blue Steel';
+$theme[10]['PATH'] = SM_PATH . 'themes/dark_grey_theme.php';
+$theme[10]['NAME'] = 'Dark Grey';
+$theme[11]['PATH'] = SM_PATH . 'themes/high_contrast_theme.php';
+$theme[11]['NAME'] = 'High Contrast';
+$theme[12]['PATH'] = SM_PATH . 'themes/black_bean_burrito_theme.php';
+$theme[12]['NAME'] = 'Black Bean Burrito';
+$theme[13]['PATH'] = SM_PATH . 'themes/servery_theme.php';
+$theme[13]['NAME'] = 'Servery';
+$theme[14]['PATH'] = SM_PATH . 'themes/maize_theme.php';
+$theme[14]['NAME'] = 'Maize';
+$theme[15]['PATH'] = SM_PATH . 'themes/bluesnews_theme.php';
+$theme[15]['NAME'] = 'BluesNews';
+$theme[16]['PATH'] = SM_PATH . 'themes/deepocean2_theme.php';
+$theme[16]['NAME'] = 'Deep Ocean 2';
+$theme[17]['PATH'] = SM_PATH . 'themes/blue_grey_theme.php';
+$theme[17]['NAME'] = 'Blue Grey';
+$theme[18]['PATH'] = SM_PATH . 'themes/dompie_theme.php';
+$theme[18]['NAME'] = 'Dompie';
+$theme[19]['PATH'] = SM_PATH . 'themes/methodical_theme.php';
+$theme[19]['NAME'] = 'Methodical';
+$theme[20]['PATH'] = SM_PATH . 'themes/greenhouse_effect.php';
+$theme[20]['NAME'] = 'Greenhouse Effect (Changes)';
+$theme[21]['PATH'] = SM_PATH . 'themes/in_the_pink.php';
+$theme[21]['NAME'] = 'In The Pink (Changes)';
+$theme[22]['PATH'] = SM_PATH . 'themes/kind_of_blue.php';
+$theme[22]['NAME'] = 'Kind of Blue (Changes)';
+$theme[23]['PATH'] = SM_PATH . 'themes/monostochastic.php';
+$theme[23]['NAME'] = 'Monostochastic (Changes)';
+$theme[24]['PATH'] = SM_PATH . 'themes/shades_of_grey.php';
+$theme[24]['NAME'] = 'Shades of Grey (Changes)';
+$theme[25]['PATH'] = SM_PATH . 'themes/spice_of_life.php';
+$theme[25]['NAME'] = 'Spice of Life (Changes)';
+$theme[26]['PATH'] = SM_PATH . 'themes/spice_of_life_lite.php';
+$theme[26]['NAME'] = 'Spice of Life - Lite (Changes)';
+$theme[27]['PATH'] = SM_PATH . 'themes/spice_of_life_dark.php';
+$theme[27]['NAME'] = 'Spice of Life - Dark (Changes)';
+$theme[28]['PATH'] = SM_PATH . 'themes/christmas.php';
+$theme[28]['NAME'] = 'Holiday - Christmas';
+$theme[29]['PATH'] = SM_PATH . 'themes/darkness.php';
+$theme[29]['NAME'] = 'Darkness (Changes)';
+$theme[30]['PATH'] = SM_PATH . 'themes/random.php';
+$theme[30]['NAME'] = 'Random (Changes every login)';
+$theme[31]['PATH'] = SM_PATH . 'themes/midnight.php';
+$theme[31]['NAME'] = 'Midnight';
+$theme[32]['PATH'] = SM_PATH . 'themes/alien_glow.php';
+$theme[32]['NAME'] = 'Alien Glow';
+$theme[33]['PATH'] = SM_PATH . 'themes/dark_green.php';
+$theme[33]['NAME'] = 'Dark Green';
+$theme[34]['PATH'] = SM_PATH . 'themes/penguin.php';
+$theme[34]['NAME'] = 'Penguin';
+
+$default_use_javascript_addr_book = false;
+$addrbook_dsn = '';
+$addrbook_table = 'address';
+
+$prefs_dsn = '';
+$prefs_table = 'userprefs';
+$prefs_user_field = 'user';
+$prefs_key_field = 'prefkey';
+$prefs_val_field = 'prefval';
+$no_list_for_subscribe = false;
+$smtp_auth_mech = 'none';
+$imap_auth_mech = 'login';
+$use_imap_tls = false;
+$use_smtp_tls = false;
+$session_name = 'SQMSESSID';
+
+@include SM_PATH . 'config/config_local.php';
+
+/**
+ * Make sure there are no characters after the PHP closing
+ * tag below (including newline characters and whitespace).
+ * Otherwise, that character will cause the headers to be
+ * sent and regular output to begin, which will majorly screw
+ * things up when we try to send more headers later.
+ */
+?>
diff --git a/network/squirrelmail/config_local.php.txt b/network/squirrelmail/config_local.php.txt
new file mode 100644
index 0000000000..fb4ee5967a
--- /dev/null
+++ b/network/squirrelmail/config_local.php.txt
@@ -0,0 +1,18 @@
+<?php
+
+/**
+ * Local config overrides.
+ *
+ * You can override the config.php settings here.
+ * Don't do it unless you know what you're doing.
+ * Use standard PHP syntax, see config.php for examples.
+ *
+ * @copyright &copy; 2002-2006 The SquirrelMail Project Team
+ * @license http://opensource.org/licenses/gpl-license.php GNU Public License
+ * @version $Id$
+ * @package squirrelmail
+ * @subpackage config
+ */
+
+$default_folder_prefix		= '';
+?>
diff --git a/network/squirrelmail/doinst.sh b/network/squirrelmail/doinst.sh
new file mode 100644
index 0000000000..2d2ff2bd28
--- /dev/null
+++ b/network/squirrelmail/doinst.sh
@@ -0,0 +1,2 @@
+chown apache:apache /var/lib/squirrelmail/prefs /var/spool/squirrelmail/attach
+chmod 0700 /var/lib/squirrelmail/prefs /var/spool/squirrelmail/attach
diff --git a/network/squirrelmail/slack-desc b/network/squirrelmail/slack-desc
new file mode 100644
index 0000000000..f357150415
--- /dev/null
+++ b/network/squirrelmail/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+            |-----handy-ruler------------------------------------------------------|
+squirrelmail: squirrelmail (forever green webmail)
+squirrelmail:
+squirrelmail: SquirrelMail is a project that provides both a web-based email client
+squirrelmail: and a proxy server for the IMAP protocol.
+squirrelmail:
+squirrelmail:
+squirrelmail:
+squirrelmail:
+squirrelmail:
+squirrelmail:
+squirrelmail:
diff --git a/network/squirrelmail/squirrelmail.SlackBuild b/network/squirrelmail/squirrelmail.SlackBuild
new file mode 100644
index 0000000000..4ed8d6d18b
--- /dev/null
+++ b/network/squirrelmail/squirrelmail.SlackBuild
@@ -0,0 +1,183 @@
+#!/bin/bash
+
+# Slackware build script for squirrelmail
+
+# Copyright 2020 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.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=squirrelmail
+VERSION=${VERSION:-1.4.22}
+LOCALEVERSION=${LOCALEVERSION:-1.4.18-20090526}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+SRCNAM="squirrelmail-webmail"
+
+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 $PKG/usr/share $OUTPUT
+cd $PKG/usr/share
+tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
+mv $SRCNAM* $PRGNAM
+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/usr/doc/
+mv doc $PKG/usr/doc/$PRGNAM-$VERSION
+mv plugins/README.plugins $PKG/usr/doc/$PRGNAM-$VERSION
+mv locale/README.locales $PKG/usr/doc/$PRGNAM-$VERSION
+mv themes/README.themes $PKG/usr/doc/$PRGNAM-$VERSION
+rm -f $PKG/usr/doc/$PRGNAM-$VERSION/.htaccess
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/etc/httpd/extra
+cat $CWD/squirrelmail.conf > $PKG/etc/httpd/extra/squirrelmail.conf
+
+rm -rf $TMP/squireelmail-locales
+mkdir $TMP/squireelmail-locales
+cd $TMP/squireelmail-locales
+tar xf $CWD/locales-$LOCALEVERSION-src.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 {} \;
+
+#use utf-8 by default
+for LOCALE in $(ls locale/) ; do
+	SKIPINVALID=
+	case $LOCALE in
+		ja_JP)
+			CHARSET=euc-jp
+			;;
+		ko_KR)
+			SKIPINVALID=-c
+			CHARSET=$(grep CHARSET locale/$LOCALE/setup.php | \
+				cut -f6 -d\')
+			;;
+		*)
+			CHARSET=$(grep CHARSET locale/$LOCALE/setup.php | \
+				cut -f6 -d\')
+			;;
+	esac
+
+	grep LOCALE locale/$LOCALE/setup.php | grep -vi $CHARSET  || true
+
+	if [ "$CHARSET" != utf-8 -a "$CHARSET" != UTF-8 ] ; then
+		for a in $(ls help/$LOCALE/ 2>/dev/null) ; do
+			if [ "$LOCALE" == "ja_JP" ] ; then continue ; fi
+			iconv $SKIPINVALID -f $CHARSET -t utf-8 \
+				help/$LOCALE/$a > $a.new && \
+				mv $a.new help/$LOCALE/$a
+		done
+		sed -e "s/CHARSET..[ ]*= [^;]*;/CHARSET'] = 'utf-8';/" \
+		    -e "s/LOCALE..[ ]*= [^;]*;/LOCALE'] = '$LOCALE.UTF-8';/" \
+			locale/$LOCALE/setup.php  > \
+			setup.php.new && \
+			mv setup.php.new locale/$LOCALE/setup.php
+	fi
+done
+
+for POFILE in $(find locale -name \*.po) ; do
+	CHARSET=$(grep charset= $POFILE | cut -f2 -d= | cut -f1 -d\\)
+	if [ "$CHARSET" != utf-8 -a "$CHARSET" != UTF-8 ]; then
+		sed s/charset=$CHARSET/charset=utf-8/ $POFILE | \
+			iconv -f $CHARSET -t utf-8 > $POFILE.new && \
+			mv $POFILE.new $POFILE
+	fi
+done
+
+for POFILE in $(find . -name \*.po) ; do
+    msgfmt $POFILE -c -o $(echo $POFILE | sed s/\.po\$/.mo/)
+done
+
+find locale -name \*.mo | cpio -pduv $PKG/usr/share/squirrelmail/
+cp -r images/* $PKG/usr/share/squirrelmail/images/
+cp -r help/* $PKG/usr/share/squirrelmail/help/
+
+cd $PKG/usr/share/squirrelmail
+
+sed -i 's/^ *\($default_charset *=\).*$/'"\1 'utf-8';/" \
+	config/config_default.php
+
+sed -i functions/i18n.php \
+	-e "s/^\(\$languages\['\([^']*\)'\]\['CHARSET'].*= '\)\([^']*\)';/\1utf-8';/" \
+	-e "s/^\(\$languages\['\([^']*\)'\]\['LOCALE'].*=\).*/\1 '\2.UTF-8';/" 
+
+rm -f  plugins/make_archive.pl
+
+mkdir -p $PKG/etc/squirrelmail
+
+cp $CWD/config.php.txt $PKG/etc/squirrelmail/config.php
+ln -sf /etc/squirrelmail/config.php config/config.php
+
+cp $CWD/config_local.php.txt $PKG/etc/squirrelmail/config_local.php
+ln -sf /etc/squirrelmail/config_local.php config/config_local.php
+
+mv plugins/squirrelspell/sqspell_config.php \
+	$PKG/etc/squirrelmail/sqspell_config.php
+ln -sf /etc/squirrelmail/sqspell_config.php \
+	plugins/squirrelspell/sqspell_config.php
+
+mv data/default_pref $PKG/etc/squirrelmail/default_pref
+mkdir -p $PKG/var/lib/squirrelmail/prefs
+ln -sf /etc/squirrelmail/default_pref \
+	$PKG/var/lib/squirrelmail/prefs/default_pref
+
+mkdir -p $PKG/var/spool/squirrelmail/attach
+
+mkdir -p $PKG/etc/cron.daily
+cp $CWD/squirrelmail.cron $PKG/etc/cron.daily/squirrelmail
+chmod +x $PKG/etc/cron.daily/squirrelmail
+
+rm -rf contrib data po README configure plugins/demo
+
+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/network/squirrelmail/squirrelmail.conf b/network/squirrelmail/squirrelmail.conf
new file mode 100644
index 0000000000..858426271e
--- /dev/null
+++ b/network/squirrelmail/squirrelmail.conf
@@ -0,0 +1,36 @@
+#
+# SquirrelMail is a webmail package written in PHP.
+#
+
+Alias /webmail /usr/share/squirrelmail
+
+<Directory "/usr/share/squirrelmail/plugins/squirrelspell/modules">
+  <IfModule mod_authz_core.c>
+    # Apache 2.4
+    Require all denied
+  </IfModule>
+  <IfModule !mod_authz_core.c>
+    # Apache 2.2
+    Order deny,allow
+    Deny from all
+  </IfModule>
+</Directory>
+
+# this section makes squirrelmail use https connections only, for this you
+# need to have mod_ssl installed. If you want to use unsecure http 
+# connections, just remove this section:
+<Directory /usr/share/squirrelmail>
+  RewriteEngine  on
+  RewriteCond    %{HTTPS} !=on
+  RewriteRule (.*) https://%{HTTP_HOST}%{REQUEST_URI}
+  <IfModule mod_authz_core.c>
+    # Apache 2.4
+    Require all granted
+  </IfModule>
+  <IfModule !mod_authz_core.c>
+    # Apache 2.2
+    Order allow,deny
+    Allow from all
+  </IfModule>
+</Directory>
+
diff --git a/network/squirrelmail/squirrelmail.cron b/network/squirrelmail/squirrelmail.cron
new file mode 100644
index 0000000000..7556163a6f
--- /dev/null
+++ b/network/squirrelmail/squirrelmail.cron
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+find /var/spool/squirrelmail/attach/ -type f -mtime +30 -print0 |
+	xargs -0 rm -f >/dev/null 2>&1
+
diff --git a/network/squirrelmail/squirrelmail.info b/network/squirrelmail/squirrelmail.info
new file mode 100644
index 0000000000..6c983f39ae
--- /dev/null
+++ b/network/squirrelmail/squirrelmail.info
@@ -0,0 +1,12 @@
+PRGNAM="squirrelmail"
+VERSION="1.4.22"
+HOMEPAGE="https://squirrelmail.sourceforge.net"
+DOWNLOAD="https://downloads.sourceforge.net/project/squirrelmail/stable/1.4.22/squirrelmail-webmail-1.4.22.tar.gz \
+          https://sourceforge.net/projects/squirrelmail/files/locales/1.4.18-20090526/locales-1.4.18-20090526-src.tar.gz"
+MD5SUM="ae9e2bc7f4fa58162b6152fcb0cbb3a5 \
+        fc5258ad981f866844955e27a0fb9b67"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Jan F. Chadima"
+EMAIL="jfch@jagda.eu"
diff --git a/network/ssh-chat/README b/network/ssh-chat/README
new file mode 100644
index 0000000000..839acf76ee
--- /dev/null
+++ b/network/ssh-chat/README
@@ -0,0 +1,23 @@
+ssh-chat (IRC-like chat server using ssh as a client)
+
+ssh-chat is a custom SSH server written in Go. Instead of a shell, you
+get a chat prompt.
+
+Note that this is only the server. There is no dedicated client: users
+just use ssh to connect to the server.
+
+This SlackBuild just repackages the official release binary, and does
+not attempt to compile anything.
+
+There is no startup script; if you want to run ssh-chat as a daemon,
+add something like this to /etc/rc.d/rc.local:
+
+if [ -x /usr/sbin/ssh-chat ]; then
+  cd /
+  /usr/sbin/ssh-chat <options> </dev/null >/dev/null 2>&1 &
+fi
+
+Replace <options> with whatever options you want (one of which should
+be --log). If you'd rather run as a non-root user, prefix the command
+with e.g. "su - nobody -s ", and make sure your --bind has a port
+numbered higher than 1024.
diff --git a/network/ssh-chat/slack-desc b/network/ssh-chat/slack-desc
new file mode 100644
index 0000000000..6b2b1f2413
--- /dev/null
+++ b/network/ssh-chat/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+        |-----handy-ruler------------------------------------------------------|
+ssh-chat: ssh-chat (IRC-like chat server using ssh as a client)
+ssh-chat:
+ssh-chat: ssh-chat is a custom SSH server written in Go. Instead of a shell, you
+ssh-chat: get a chat prompt.
+ssh-chat:
+ssh-chat: Note that this is only the server. There is no dedicated client: users
+ssh-chat: just use ssh to connect to the server.
+ssh-chat:
+ssh-chat:
+ssh-chat:
+ssh-chat:
diff --git a/network/ssh-chat/ssh-chat.8 b/network/ssh-chat/ssh-chat.8
new file mode 100644
index 0000000000..a1889dafdb
--- /dev/null
+++ b/network/ssh-chat/ssh-chat.8
@@ -0,0 +1,116 @@
+.\" Man page generated from reStructuredText.
+.
+.TH SSH-CHAT 8 "2020-11-18" "1.10" "SlackBuilds.org"
+.SH NAME
+ssh-chat \- custom ssh server providing IRC-like chat
+.
+.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 ssh-chat(1) man page. Convert with:
+.
+.\" rst2man.py ssh-chat.rst > ssh-chat.8
+.
+.\" rst2man.py comes from the SBo development/docutils package.
+.
+.SH SYNOPSIS
+.sp
+ssh\-chat [\fI\-options\fP]
+.SH DESCRIPTION
+.sp
+ssh\-chat is a custom SSH server written in Go. Instead of a shell,
+clients get a chat prompt when they connect.
+.sp
+There is no specific client for ssh\-chat; use a standard ssh client to connect.
+.SH OPTIONS
+.INDENT 0.0
+.TP
+.B \-v\fP,\fB  \-\-verbose
+Show verbose logging.
+.TP
+.B \-\-version
+Print version and exit.
+.TP
+.BI \-i\fP,\fB  \-\-identity\fB= file
+Private key to identify server with. (default: ~/.ssh/id_rsa)
+.UNINDENT
+.INDENT 0.0
+.TP
+.B \-\-bind=host:port
+Host and port to listen on. (default: 0.0.0.0:2022)
+.UNINDENT
+.INDENT 0.0
+.TP
+.BI \-\-admin\fB= file
+File of public keys who are admins.
+.TP
+.BI \-\-whitelist\fB= file
+Optional file of public keys who are allowed to connect.
+.TP
+.BI \-\-motd\fB= file
+Optional Message of the Day file.
+.TP
+.BI \-\-log\fB= file
+Write chat log to this file.
+.TP
+.BI \-\-pprof\fB= yes
+Enable pprof http server for profiling.
+.TP
+.B \-h\fP,\fB  \-\-help
+Show this help message
+.UNINDENT
+.SH DEMO
+.sp
+To connect to the project\(aqs ssh\-chat server:
+.sp
+$ ssh ssh.chat
+.SH EXAMPLES
+.sp
+ssh\-chat \-\-verbose \-\-bind ":22" \-\-identity ~/.ssh/id_dsa
+.sp
+To bind on port 22, you\(aqll need to make sure it\(aqs free (move any other ssh
+daemons to another port) and run ssh\-chat as root (or with sudo).
+.sp
+Note that ssh\-chat doesn\(aqt run in the background. If you want to \(aqdaemonize\(aq it,
+use the \-\-log option, and run it with a command like:
+.sp
+$ cd / ; ssh\-chat [options] \-\-log=logfile </dev/null >/dev/null 2>&1 &
+.SH COPYRIGHT
+.sp
+See the file /usr/doc/ssh\-chat\-1.10/LICENSE for license information.
+.SH AUTHORS
+.sp
+ssh\-chat was written by Andrey Petrov.
+.sp
+This man page written for the SlackBuilds.org project
+by B. Watson, and is licensed under the WTFPL.
+.SH SEE ALSO
+.sp
+ssh(1), sshd(1)
+.sp
+The ssh\-chat homepage: \fI\%https://github.com/shazow/ssh\-chat/\fP
+.\" Generated by docutils manpage writer.
+.
diff --git a/network/ssh-chat/ssh-chat.SlackBuild b/network/ssh-chat/ssh-chat.SlackBuild
new file mode 100644
index 0000000000..6789a83a8f
--- /dev/null
+++ b/network/ssh-chat/ssh-chat.SlackBuild
@@ -0,0 +1,69 @@
+#!/bin/bash
+
+# Slackware build script for ssh-chat
+
+# 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=ssh-chat
+VERSION=${VERSION:-1.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}
+
+case "$ARCH" in
+  i?86)   SRCARCH="386"   ;;
+  x86_64) SRCARCH="amd64" ;;
+  *)      echo "Unsupported ARCH '$ARCH' (only i586, i686, x864_64 supported)" 1>&2
+          exit 1 ;;
+esac
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+mkdir -p $PRGNAM-$VERSION
+cd $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-linux_$SRCARCH.tgz
+cd $PRGNAM
+chown -R root:root .
+
+mkdir -p $PKG/usr/sbin $PKG/usr/doc/$PRGNAM-$VERSION
+install -m0755 $PRGNAM $PKG/usr/sbin
+install -m0644 README* LICENSE* $PKG/usr/doc/$PRGNAM-$VERSION
+
+# man page by SlackBuild author
+mkdir -p $PKG/usr/man/man8
+gzip -9 < $CWD/$PRGNAM.8 > $PKG/usr/man/man8/$PRGNAM.8.gz
+
+# include our README since it has Slack-specific stuff.
+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
+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/network/ssh-chat/ssh-chat.info b/network/ssh-chat/ssh-chat.info
new file mode 100644
index 0000000000..d6b45badb5
--- /dev/null
+++ b/network/ssh-chat/ssh-chat.info
@@ -0,0 +1,10 @@
+PRGNAM="ssh-chat"
+VERSION="1.10"
+HOMEPAGE="https://github.com/shazow/ssh-chat/"
+DOWNLOAD="https://github.com/shazow/ssh-chat/releases/download/v1.10/ssh-chat-linux_386.tgz"
+MD5SUM="21313e16a3ffcb2659231d93d4010d40"
+DOWNLOAD_x86_64="https://github.com/shazow/ssh-chat/releases/download/v1.10/ssh-chat-linux_amd64.tgz"
+MD5SUM_x86_64="624d31da8f76331bc03bd07f3ff6fd4c"
+REQUIRES=""
+MAINTAINER="B. Watson"
+EMAIL="urchlay@slackware.uk"
diff --git a/network/ssh-chat/ssh-chat.rst b/network/ssh-chat/ssh-chat.rst
new file mode 100644
index 0000000000..1e3dfb44ef
--- /dev/null
+++ b/network/ssh-chat/ssh-chat.rst
@@ -0,0 +1,104 @@
+.. RST source for ssh-chat(1) man page. Convert with:
+..   rst2man.py ssh-chat.rst > ssh-chat.8
+.. rst2man.py comes from the SBo development/docutils package.
+
+.. |version| replace:: 1.10
+.. |date| date::
+
+========
+ssh-chat
+========
+
+-----------------------------------------
+custom ssh server providing IRC-like chat
+-----------------------------------------
+
+:Manual section: 8
+:Manual group: SlackBuilds.org
+:Date: |date|
+:Version: |version|
+
+SYNOPSIS
+========
+
+ssh-chat [*-options*]
+
+DESCRIPTION
+===========
+
+ssh-chat is a custom SSH server written in Go. Instead of a shell,
+clients get a chat prompt when they connect.
+
+There is no specific client for ssh-chat; use a standard ssh client to connect.
+
+OPTIONS
+=======
+
+-v, --verbose
+  Show verbose logging.
+
+--version
+  Print version and exit.
+
+-i, --identity=file
+  Private key to identify server with. (default: ~/.ssh/id_rsa)
+
+--bind=host:port
+  Host and port to listen on. (default: 0.0.0.0:2022)
+
+--admin=file
+  File of public keys who are admins.
+
+--whitelist=file
+  Optional file of public keys who are allowed to connect.
+
+--motd=file
+  Optional Message of the Day file.
+
+--log=file
+  Write chat log to this file.
+
+--pprof=yes
+  Enable pprof http server for profiling.
+
+-h, --help       Show this help message
+
+DEMO
+====
+
+To connect to the project's ssh-chat server:
+
+$ ssh ssh.chat
+
+EXAMPLES
+========
+
+ssh-chat --verbose --bind ":22" --identity ~/.ssh/id_dsa
+
+To bind on port 22, you'll need to make sure it's free (move any other ssh
+daemons to another port) and run ssh-chat as root (or with sudo).
+
+Note that ssh-chat doesn't run in the background. If you want to 'daemonize' it,
+use the --log option, and run it with a command like:
+
+$ cd / ; ssh-chat [options] --log=logfile </dev/null >/dev/null 2>&1 &
+
+COPYRIGHT
+=========
+
+See the file /usr/doc/ssh-chat-|version|/LICENSE for license information.
+
+AUTHORS
+=======
+
+ssh-chat was written by Andrey Petrov.
+
+This man page written for the SlackBuilds.org project
+by B. Watson, and is licensed under the WTFPL.
+
+SEE ALSO
+========
+
+ssh(1), sshd(1)
+
+The ssh-chat homepage: https://github.com/shazow/ssh-chat/
diff --git a/network/sshblock/sshblock.SlackBuild b/network/sshblock/sshblock.SlackBuild
index 7bf7cbc82e..e5828b544d 100644
--- a/network/sshblock/sshblock.SlackBuild
+++ b/network/sshblock/sshblock.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for sshblock
 
@@ -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=sshblock
 VERSION=${VERSION:-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}
@@ -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/network/sshfp/sshfp.SlackBuild b/network/sshfp/sshfp.SlackBuild
index 2415f1fb6d..40d790dc9f 100644
--- a/network/sshfp/sshfp.SlackBuild
+++ b/network/sshfp/sshfp.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for "sshfp".
 
@@ -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=sshfp
 VERSION=${VERSION:-1.2.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"
@@ -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/network/sshfp/sshfp.info b/network/sshfp/sshfp.info
index 4ae6fa9d3e..6d3fc1c2bb 100644
--- a/network/sshfp/sshfp.info
+++ b/network/sshfp/sshfp.info
@@ -1,10 +1,10 @@
 PRGNAM="sshfp"
 VERSION="1.2.2"
 HOMEPAGE="https://github.com/xelerance/sshfp"
-DOWNLOAD="https://github.com/xelerance/sshfp/archive/1.2.2.tar.gz"
+DOWNLOAD="https://github.com/xelerance/sshfp/archive/1.2.2/sshfp-1.2.2.tar.gz"
 MD5SUM="3cedcc3463e72196ee2028543d03ebfc"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="dnspython python-ipcalc ldns"
+REQUIRES="python-ipcalc ldns"
 MAINTAINER="Marcel Saegebarth"
 EMAIL="marc@mos6581.de"
diff --git a/network/sshfs-fuse/README b/network/sshfs-fuse/README
deleted file mode 100644
index 300d34090d..0000000000
--- a/network/sshfs-fuse/README
+++ /dev/null
@@ -1,10 +0,0 @@
-SSHFS (Secure SHell FileSystem) is a file system for Linux capable of 
-operating on files on a remote computer using just a secure shell login 
-on the remote computer. On the local computer where the SSHFS is mounted, 
-the implementation makes use of the FUSE (Filesystem in Userspace) 
-kernel module. 
-
-The practical effect of this is that the end user can seamlessly interact 
-with remote files being securely served over SSH just as if they were 
-local files on his/her computer. On the remote computer the SFTP subsystem 
-of SSH is used.
diff --git a/network/sshfs-fuse/slack-desc b/network/sshfs-fuse/slack-desc
deleted file mode 100644
index 7e342f6fac..0000000000
--- a/network/sshfs-fuse/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------------------------------------------------------|
-sshfs-fuse: sshfs-fuse (ssh file system module for FUSE)
-sshfs-fuse:
-sshfs-fuse: This is a filesystem client based on the SSH File Transfer
-sshfs-fuse: Protocol. Since most SSH servers already support this protocol it
-sshfs-fuse: is very easy to set up: i.e. on the server side there's nothing
-sshfs-fuse: to do.  On the client side mounting the filesystem is as easy as
-sshfs-fuse: logging into the server with ssh.
-sshfs-fuse:
-sshfs-fuse:
-sshfs-fuse:
-sshfs-fuse:
diff --git a/network/sshfs-fuse/sshfs-fuse.SlackBuild b/network/sshfs-fuse/sshfs-fuse.SlackBuild
deleted file mode 100644
index 1e43941878..0000000000
--- a/network/sshfs-fuse/sshfs-fuse.SlackBuild
+++ /dev/null
@@ -1,99 +0,0 @@
-#!/bin/sh
-
-# Copyright 2012, Michiel van Wessem, Leicester, United Kingdom
-# Copyright 2006-2009  Alan Hicks, Lizella, GA
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
-#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
-#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (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=sshfs-fuse
-SRCNAM=sshfs
-VERSION=${VERSION:-2.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 $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" \
-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
-
-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 $PKG/usr/doc/$PRGNAM-$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/network/sshfs-fuse/sshfs-fuse.info b/network/sshfs-fuse/sshfs-fuse.info
deleted file mode 100644
index ec97eeb668..0000000000
--- a/network/sshfs-fuse/sshfs-fuse.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="sshfs-fuse"
-VERSION="2.8"
-HOMEPAGE="https://github.com/libfuse/sshfs"
-DOWNLOAD="https://github.com/libfuse/sshfs/releases/download/sshfs_2.8/sshfs-2.8.tar.gz"
-MD5SUM="0ba25e848ee59e2595d6576c8f6284b6"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Michiel van Wessem"
-EMAIL="michiel@slackbuilds.org"
diff --git a/network/sshguard/README b/network/sshguard/README
index e20330a6c7..fd59f1d8b6 100644
--- a/network/sshguard/README
+++ b/network/sshguard/README
@@ -1,14 +1,23 @@
-SSHGuard protects hosts from brute-force attacks against SSH and other services.
-It has been written entirely in C and has no external dependencies and no
-configuration file. SSHGuard aggregates system logs and blocks repeat offenders.
-It can read log messages from standard input (suitable for piping from syslog)
-or monitor one or more log files. Log messages are parsed, line-by-line, for
-recognized patterns. If an attack, such as several login failures within a few
-seconds, is detected, the offending IP is blocked. Offenders are unblocked after
-a set interval, but can be semi-permanently banned using the blacklist option.
+sshguard protects hosts from brute-force attacks against SSH and other
+services. It aggregates system logs and blocks repeat offenders using
+one of several firewall backends, including iptables, ipfw, and pf.
+
+sshguard can read log messages from standard input (suitable for piping
+from syslog) or monitor one or more log files. Log messages are parsed,
+line-by-line, for recognized patterns. If an attack, such as several
+login failures within a few seconds, is detected, the offending IP is
+blocked. Offenders are unblocked after a set interval, but can be semi-
+permanently banned using the blacklist option.
 
 IMPORTANT:
-You will need to properly set up "sshguard" chain in iptables. For further
-information PLEASE CONSULT MAN PAGE, installed together with this package.
-The information available on the website tends to be outdated, (it is well
-worth reading anyway).
+
+1. You will need to properly set up an "sshguard" chain in your firewall
+   backend. For further information consult `sshguard-setup(7)`.
+
+2. Starting with version 2.0.0, SSHGuard **requires** a config file
+   to start. `sshguard.conf` as shipped with this SlackBuild provides
+   defaults such that they reassemble the values that were previously
+   specified on the command line in the `rc.sshguard` script.
+
+   See `examples/sshguard.conf.sample` in the doc directory for
+   additional config options.
diff --git a/network/sshguard/doinst.sh b/network/sshguard/doinst.sh
index 8e1f832831..ff3107fbc3 100644
--- a/network/sshguard/doinst.sh
+++ b/network/sshguard/doinst.sh
@@ -19,4 +19,5 @@ preserve_perms() {
   config $NEW
 }
 
+config etc/sshguard.conf.new
 preserve_perms etc/rc.d/rc.sshguard.new
diff --git a/network/sshguard/rc.sshguard b/network/sshguard/rc.sshguard
index 24c4f29d88..c08033b3c7 100644
--- a/network/sshguard/rc.sshguard
+++ b/network/sshguard/rc.sshguard
@@ -1,45 +1,105 @@
-#!/bin/sh
+#!/bin/bash
+
+declare -r daemon_name=sshguard
+declare -r daemon_prog=/usr/sbin/sshguard
+
+################################################################################
+the_daemon()
+################################################################################
+{
+    daemon --name "${daemon_name}" "${@}"
+}
 
 ################################################################################
-sshguard_start() {
+the_damon_start()
 ################################################################################
-  if [ -n "$(pidof sshguard)" ]; then
-    echo "sshguard seems to be already running."
-    return
-  fi
+{
+    if ! the_daemon --running; then
+        echo "Starting ${daemon_name}:  ${daemon_prog}"
 
-  /usr/sbin/sshguard -l /var/log/messages 1>/dev/null &
+        the_daemon -- ${daemon_prog}
+    else
+        echo "${daemon_name} seems to be already running."
+    fi
 }
 
 ################################################################################
-sshguard_stop() {
+the_damon_stop()
 ################################################################################
-  if [ -z "$(pidof sshguard)" ]; then
-    echo "sshguard does not seem to be running."
-    return
-  fi
+{
+    if the_daemon --running; then
+        echo "Stopping ${daemon_name}."
 
-  kill $(pidof sshguard)
+        the_daemon --stop
+    else
+        echo "${daemon_name} does not seem to be running."
+    fi
 }
 
 ################################################################################
-sshguard_restart() {
+the_damon_restart()
 ################################################################################
-  sshguard_stop
-  sleep 1
-  sshguard_start
+{
+    if the_daemon --running; then
+        the_damon_stop
+        the_daemon_wait_stopped
+        the_damon_start
+    else
+        echo "${daemon_name} does not seem to be running."
+    fi
 }
 
-case "$1" in
-'start')
-  sshguard_start
-  ;;
-'stop')
-  sshguard_stop
-  ;;
-'restart')
-  sshguard_restart
-  ;;
+################################################################################
+the_daemon_wait_stopped()
+################################################################################
+{
+    # All time values given in a unit of 0.1 second.
+
+    local -r timeout=50
+    local delay=1
+    local delay_sum=0
+    local -r test_expr=(the_daemon --running)
+
+    # Poll (with timeout) for the daemon to exit.
+
+    while "${test_expr[@]}" && [[ ${delay_sum} -lt ${timeout} ]]; do
+        sleep $(echo "${delay} / 10.0" | bc -l)
+        delay_sum=$((delay_sum + delay))
+
+        # Double the delay in each iteration to lower the CPU use.
+
+        delay=$((delay * 2))
+
+        # Adjust next's iteration delay prevent waiting longer than _timeout_
+        # in case the time already waited and the delay to be waited in
+        # the next iteration would be greater than the requested _timeout_.
+
+        if [[ $((delay_sum + delay)) -gt ${timeout} ]]; then
+            delay=$((timeout - delay_sum))
+        fi
+    done
+
+    if "${test_expr[@]}"; then
+        echo "Timeout waiting for ${daemon_name} to stop."
+
+        exit 1
+    fi
+}
+
+case "${1}" in
+start)
+    the_damon_start
+;;
+
+stop)
+    the_damon_stop
+;;
+
+restart)
+    the_damon_restart
+;;
+
 *)
-  echo "usage: $0 start|stop|restart"
+    echo "usage: ${0} start|stop|restart"
+;;
 esac
diff --git a/network/sshguard/slack-desc b/network/sshguard/slack-desc
index 2747ed7241..3ff04458b1 100644
--- a/network/sshguard/slack-desc
+++ b/network/sshguard/slack-desc
@@ -8,12 +8,12 @@
         |-----handy-ruler------------------------------------------------------|
 sshguard: sshguard (SSH brute-force attack protection)
 sshguard:
-sshguard: SSHGuard protects hosts from brute-force attacks against SSH and
-sshguard: other services. It aggregates system logs and blocks repeat
-sshguard: offenders. SSHGuard can read log messages from standard input
-sshguard: (suitable for piping from syslog) or monitor one or more log files.
-sshguard: If an attack, such as several login failures within a few seconds,
-sshguard: is detected, the offending IP is blocked.
+sshguard: sshguard protects hosts from brute-force attacks against SSH and other
+sshguard: services. It aggregates system logs and blocks repeat offenders using
+sshguard: one of several firewall backends, including iptables, ipfw, and pf.
 sshguard:
 sshguard: Homepage: https://www.sshguard.net/
 sshguard:
+sshguard:
+sshguard:
+sshguard:
diff --git a/network/sshguard/sshguard.SlackBuild b/network/sshguard/sshguard.SlackBuild
index 77957fcac4..45b565d94a 100644
--- a/network/sshguard/sshguard.SlackBuild
+++ b/network/sshguard/sshguard.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for sshguard
 
-# Copyright 2016 Andrzej Telszewski, Banie
+# Copyright 2022 Andrzej Telszewski, Koszalin
 # 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=sshguard
-VERSION=${VERSION:-1.7.0}
+VERSION=${VERSION:-2.4.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}
@@ -54,27 +61,25 @@ else
   LIBDIRSUFFIX=""
 fi
 
-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 .
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
+  --sysconfdir=/etc \
   --mandir=/usr/man \
-  --with-firewall=iptables \
   --build=$ARCH-slackware-linux
 
 make
@@ -83,6 +88,9 @@ 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/etc
+cat $CWD/${PRGNAM}.conf > $PKG/etc/${PRGNAM}.conf.new
+
 mkdir -p $PKG/etc/rc.d
 cat $CWD/rc.$PRGNAM > $PKG/etc/rc.d/rc.$PRGNAM.new
 
@@ -90,13 +98,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 -a doc/{developers,setup,sshguard.8}.rst examples CHANGELOG.rst COPYING \
-  README.rst $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a doc/{sshguard-setup.7,sshguard.8}.rst examples COPYING \
+  {CHANGELOG,CONTRIBUTING,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
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/network/sshguard/sshguard.conf b/network/sshguard/sshguard.conf
new file mode 100644
index 0000000000..07c13b3e45
--- /dev/null
+++ b/network/sshguard/sshguard.conf
@@ -0,0 +1,17 @@
+#!/bin/sh
+
+# sshguard.conf -- SSHGuard configuration
+# Based on /usr/doc/sshguard-2.4.2/examples/sshguard.conf.sample
+
+# Full path to backend executable.
+
+BACKEND="/usr/libexec/sshg-fw-iptables"
+
+# Space-separated list of log files to monitor.
+
+FILES="/var/log/messages"
+
+# Do not provide PID file path.
+# It is handled by daemon(1).
+
+PID_FILE=
diff --git a/network/sshguard/sshguard.info b/network/sshguard/sshguard.info
index 06a268516c..efdd417d4b 100644
--- a/network/sshguard/sshguard.info
+++ b/network/sshguard/sshguard.info
@@ -1,10 +1,10 @@
 PRGNAM="sshguard"
-VERSION="1.7.0"
+VERSION="2.4.2"
 HOMEPAGE="https://www.sshguard.net/"
-DOWNLOAD="https://download.sourceforge.net/project/sshguard/sshguard/1.7.0/sshguard-1.7.0.tar.gz"
-MD5SUM="db251a2e31cb5af203d10c42be33ea9c"
+DOWNLOAD="https://download.sourceforge.net/project/sshguard/sshguard/2.4.2/sshguard-2.4.2.tar.gz"
+MD5SUM="0f83f5e7e1b197fb3bd4e9dfe9e601e6"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
 MAINTAINER="Andrzej Telszewski"
-EMAIL="atelszewski@gmail.com"
+EMAIL="andrzej@telszewski.com"
diff --git a/network/sshpass/sshpass.SlackBuild b/network/sshpass/sshpass.SlackBuild
index 6811febe8d..095b482ac1 100644
--- a/network/sshpass/sshpass.SlackBuild
+++ b/network/sshpass/sshpass.SlackBuild
@@ -1,10 +1,9 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for sshpass
 
-# Copyright 2012 K.D.Hedger
-# kdhedger@yahoo.co.uk
-#
+# Copyright 2012  K.D.Hedger <kdhedger@yahoo.co.uk>
+# Copyright 2020  Mario Preksavec, Zagreb, Croatia
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,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=sshpass
-VERSION=${VERSION:-1.05}
+VERSION=${VERSION:-1.06}
 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"
@@ -103,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/network/sshpass/sshpass.info b/network/sshpass/sshpass.info
index 5de6956cee..5e9dddc1ea 100644
--- a/network/sshpass/sshpass.info
+++ b/network/sshpass/sshpass.info
@@ -1,10 +1,10 @@
 PRGNAM="sshpass"
-VERSION="1.05"
+VERSION="1.06"
 HOMEPAGE="https://sourceforge.net/projects/sshpass"
-DOWNLOAD="http://downloads.sourceforge.net/sshpass/sshpass-1.05.tar.gz"
-MD5SUM="c52d65fdee0712af6f77eb2b60974ac7"
+DOWNLOAD="http://downloads.sourceforge.net/sshpass/sshpass-1.06.tar.gz"
+MD5SUM="f59695e3b9761fb51be7d795819421f9"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="K.D.Hedger"
-EMAIL="kdhedger@yahoo.co.uk"
+MAINTAINER="Mario Preksavec"
+EMAIL="mario at slackware dot hr"
diff --git a/network/sshuttle/sshuttle.SlackBuild b/network/sshuttle/sshuttle.SlackBuild
index ab71b64d8f..75a3fd87c8 100644
--- a/network/sshuttle/sshuttle.SlackBuild
+++ b/network/sshuttle/sshuttle.SlackBuild
@@ -1,6 +1,7 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for "sshuttle".
+# Yth | Pont-en-Royans, France | yth@ythogtha.org
 
 # Copyright 2014-2016 Marcel Saegebarth <marc@mos6581.de>
 # All rights reserved.
@@ -24,26 +25,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=sshuttle
-VERSION=${VERSION:-0.78.1}
+VERSION=${VERSION:-1.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" = "i586" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -51,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,15 +85,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 {} \;
 
-python setup.py install --root=$PKG
-
-mkdir -p $PKG/usr/man/man8
-cat $TMP/$PRGNAM-$VERSION/Documentation/$PRGNAM.8 | gzip -9c > \
-$PKG/usr/man/man8/$PRGNAM.8.gz
+python3 -m build --no-isolation
+python3 -m installer -d "$PKG" dist/*.whl
+# python3 setup.py install --root=$PKG
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
-  CHANGES.rst LICENSE README.rst \
+  *.rst LICENSE README* \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
@@ -87,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/network/sshuttle/sshuttle.info b/network/sshuttle/sshuttle.info
index 484552dbf3..c82c310300 100644
--- a/network/sshuttle/sshuttle.info
+++ b/network/sshuttle/sshuttle.info
@@ -1,10 +1,10 @@
 PRGNAM="sshuttle"
-VERSION="0.78.1"
-HOMEPAGE="https://github.com/apenwarr/sshuttle/"
-DOWNLOAD="https://pypi.python.org/packages/48/be/c1c9ead0c38383c4b2a192de4679f09413ddc6701988ca56bd220c64ec50/sshuttle-0.78.1.tar.gz"
-MD5SUM="3b792dc650c99ce6e8bbeae6d5f1179e"
+VERSION="1.1.2"
+HOMEPAGE="https://github.com/sshuttle/sshuttle"
+DOWNLOAD="https://pypi.python.org/packages/source/s/sshuttle/sshuttle-1.1.2.tar.gz"
+MD5SUM="1c7bf12ae8ed576b16d1e2b144835863"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="pytest-runner"
-MAINTAINER="Marcel Saegebarth"
-EMAIL="marc@mos6581.de"
+REQUIRES="python3-poetry-core"
+MAINTAINER="Yth - Arnaud"
+EMAIL="yth@ythogtha.org"
diff --git a/network/sslh/sslh.SlackBuild b/network/sslh/sslh.SlackBuild
index 1490c14546..0b2eda07c8 100644
--- a/network/sslh/sslh.SlackBuild
+++ b/network/sslh/sslh.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for sslh
 
@@ -6,10 +6,13 @@
 # Script created by mara <mara@fail.pp.ua>
 #
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=sslh
 VERSION=${VERSION:-1.18}
 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}
@@ -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/network/ssllabs-scan/ssllabs-scan.SlackBuild b/network/ssllabs-scan/ssllabs-scan.SlackBuild
index a7616655de..330b372912 100644
--- a/network/ssllabs-scan/ssllabs-scan.SlackBuild
+++ b/network/ssllabs-scan/ssllabs-scan.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for ssllabs-scan
 
@@ -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=ssllabs-scan
 VERSION=${VERSION:-1.5.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}
@@ -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/network/sslscan/README b/network/sslscan/README
index 6626f8fa0c..f20fe6373c 100644
--- a/network/sslscan/README
+++ b/network/sslscan/README
@@ -3,8 +3,8 @@ ciphers that are supported.  SSLScan is designed to be easy, lean and
 fast.  The output includes prefered ciphers of the SSL service, the
 certificate, and is in Text and XML formats.
 
-Upstream recommends building statically against OpenSSL 1.0.2 (with weak
-ciphers and small DH keys re-enabled) for the widest compatibility for
-scanning. You can build against the system openssl with:
+Upstream recommends building statically against OpenSSL 1.1.1 for the
+widest compatibility for scanning. You can build against the system
+openssl with:
 
 STATIC=no ./sslscan.SlackBuild
diff --git a/network/sslscan/sslscan.SlackBuild b/network/sslscan/sslscan.SlackBuild
index 2292ef2d7b..7110db9a7d 100644
--- a/network/sslscan/sslscan.SlackBuild
+++ b/network/sslscan/sslscan.SlackBuild
@@ -1,11 +1,12 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for sslscan
 
 # Copyright (c) 2010  Markus Reichelt, Aachen, DE
 # Copyright (c) 2014  Andrew Clemons, Wellington, New Zealand
 # Copyright (c) 2015  Andrew Clemons, Leimen, Germany
-# Copyright (c) 2016-2019  Andrew Clemons, Wellington, New Zealand
+# Copyright (c) 2016-2022  Andrew Clemons, Wellington, New Zealand
+# Copyright (c) 2022-2024  Andrew Clemons, Tokyo, Japan
 # All rights reserved.
 #
 #   Permission to use, copy, modify, and distribute this software for
@@ -32,10 +33,13 @@
 # Andrew Clemons
 # 2014-10-23 - changed to build rbsec's fork from github
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=sslscan
-VERSION=${VERSION:-1.11.13}
+VERSION=${VERSION:-2.1.3}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -45,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}
@@ -56,6 +64,8 @@ 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
@@ -65,9 +75,9 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$VERSION-rbsec
-tar xvf $CWD/$PRGNAM-$VERSION-rbsec.tar.gz
-cd $PRGNAM-$VERSION-rbsec
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
 
 sed -i 's/^\(\.openssl.is.fresh:\).*$/\1/' Makefile
 sed -i "s/^GIT_VERSION = .*$/GIT_VERSION = $VERSION/" Makefile
@@ -75,7 +85,7 @@ sed -i "s/^GIT_VERSION = .*$/GIT_VERSION = $VERSION/" Makefile
 STATIC=${STATIC:-yes}
 
 if [ "$STATIC" = "yes" ] ; then
-  OPENSSLVERSION=${OPENSSLVERSION:-83abb7af5cee7dd1c9ab500a10a776c586a18f1b}
+  OPENSSLVERSION=${OPENSSLVERSION:-openssl-3.0.12}
   tar xf "$CWD/openssl-$OPENSSLVERSION.tar.gz"
   mv "openssl-$OPENSSLVERSION" openssl
 fi
@@ -92,9 +102,9 @@ mkdir -p $PKG/usr/bin $PKG/usr/man/man1
 sed -i "s|share/man|man|" Makefile
 
 if [ "$STATIC" = "yes" ] ; then
-  CLFAGS=$SLKCFLAGS make -j1 static
+  CLFAGS=$SLKCFLAGS make static
 else
-  CLFAGS=$SLKCFLAGS make -j1
+  CLFAGS=$SLKCFLAGS make
 fi
 
 make install DESTDIR=$PKG
@@ -102,14 +112,15 @@ 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
 
+find $PKG/usr/man -type f -exec chmod 0644 {} \;
 find $PKG/usr/man -type f -exec gzip -9 {} \;
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a Changelog INSTALL LICENSE README.md TODO $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a Changelog LICENSE 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/network/sslscan/sslscan.info b/network/sslscan/sslscan.info
index 69dc61865c..af908d6c42 100644
--- a/network/sslscan/sslscan.info
+++ b/network/sslscan/sslscan.info
@@ -1,10 +1,10 @@
 PRGNAM="sslscan"
-VERSION="1.11.13"
+VERSION="2.1.3"
 HOMEPAGE="https://github.com/rbsec/sslscan"
-DOWNLOAD="https://github.com/rbsec/sslscan/archive/1.11.13-rbsec/sslscan-1.11.13-rbsec.tar.gz \
-          https://github.com/PeterMosmans/openssl/archive/83abb7af5cee7dd1c9ab500a10a776c586a18f1b/openssl-83abb7af5cee7dd1c9ab500a10a776c586a18f1b.tar.gz"
-MD5SUM="ca73b626b93dc228989241b4decd42e6 \
-        7bc7d20f588c8467fdfcddd92a88e3d9"
+DOWNLOAD="https://github.com/rbsec/sslscan/archive/2.1.3/sslscan-2.1.3.tar.gz \
+          https://github.com/openssl/openssl/archive/openssl-3.0.12/openssl-openssl-3.0.12.tar.gz"
+MD5SUM="68f3e535c7343c0bdb79796d73d51a13 \
+        1729299909f326bbabad5a5a3543c69b"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/network/sslstrip/README b/network/sslstrip/README
deleted file mode 100644
index 3dc16f6912..0000000000
--- a/network/sslstrip/README
+++ /dev/null
@@ -1,6 +0,0 @@
-sslstrip (HTTPS ssl stripping)
-
-This tool provides a demonstration of the HTTPS stripping attacks.
-It will transparently hijack HTTP traffic on a network, watch for
-HTTPS links and redirects, then map those links into either
-look-alike HTTP links or homograph-similar HTTPS links. 
diff --git a/network/sslstrip/slack-desc b/network/sslstrip/slack-desc
deleted file mode 100644
index 9c9d6bc6d4..0000000000
--- a/network/sslstrip/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------------------------------------------------------|
-sslstrip: sslstrip (HTTPS ssl stripping)
-sslstrip:
-sslstrip: This tool provides a demonstration of the HTTPS stripping attacks.
-sslstrip: It will transparently hijack HTTP traffic on a network, watch for
-sslstrip: HTTPS links and redirects, then map those links into either
-sslstrip: look-alike HTTP links or homograph-similar HTTPS links.
-sslstrip:
-sslstrip: Homepage: http://www.thoughtcrime.org/software/sslstrip/
-sslstrip:
-sslstrip:
-sslstrip:
diff --git a/network/sslstrip/sslstrip.SlackBuild b/network/sslstrip/sslstrip.SlackBuild
deleted file mode 100644
index bab0f3f2b1..0000000000
--- a/network/sslstrip/sslstrip.SlackBuild
+++ /dev/null
@@ -1,87 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for sslstrip
-
-# Copyright 2011  Vincent Batts, Vienna, VA, 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=sslstrip
-VERSION=${VERSION:-0.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 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 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/network/sslstrip/sslstrip.info b/network/sslstrip/sslstrip.info
deleted file mode 100644
index a10d8137c4..0000000000
--- a/network/sslstrip/sslstrip.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="sslstrip"
-VERSION="0.9"
-HOMEPAGE="http://www.thoughtcrime.org/software/sslstrip/"
-DOWNLOAD="http://www.thoughtcrime.org/software/sslstrip/sslstrip-0.9.tar.gz"
-MD5SUM="944020144e4f5528888b3dfbb107dd78"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="pyOpenSSL python-twisted"
-MAINTAINER="Vincent Batts"
-EMAIL="vbatts@hashbangbash.com"
diff --git a/network/ssmtp/README b/network/ssmtp/README
index 515b0d4d46..bc2832f727 100644
--- a/network/ssmtp/README
+++ b/network/ssmtp/README
@@ -1,8 +1,17 @@
-sSMTP, replaces sendmail on workstations that should send their mail via the
-departmental mailhub from which they pick up their mail (via pop, imap, rsmtp,
-pop_fetch, NFS... or the like).  This program accepts mail and sends it to the
-mailhub, optionally replacing the domain in the From: line with a different
-one.
+ssmtp (extremely simple MTA to get mail off the system to a mail hub)
 
-NOTE:
-After installing, please run /usr/sbin/generate_config /etc/ssmtp/ssmtp.conf
+sSMTP, replaces sendmail on workstations that should send their mail
+via the departmental mailhub from which they pick up their mail (via
+pop, imap, rsmtp, pop_fetch, NFS... or the like). This program accepts
+mail and sends it to the mailhub, optionally replacing the domain in
+the From: line with a different one.
+
+Normally, when using ssmtp, you want to remove the OS's MTA
+package(s), sendmail and/or postfix. In this case, ssmtp will
+be symlinked to /usr/sbin/sendmail, and software that sends mail
+shouldn't have to be modified. If you keep sendmail/postfix installed,
+there's no conflict, but any software that sends mail will have to be
+configured or modified to use /usr/sbin/ssmtp.
+
+NOTE: After installing, you'll want to edit "/etc/ssmtp/ssmtp.conf".
+There's a man page for it (man ssmtp.conf).
diff --git a/network/ssmtp/doinst.sh b/network/ssmtp/doinst.sh
index a96179b56e..ec579a9543 100644
--- a/network/ssmtp/doinst.sh
+++ b/network/ssmtp/doinst.sh
@@ -1,5 +1,17 @@
-if [ ! -e /usr/sbin/sendmail ];then
-	ln -s ssmtp /usr/sbin/sendmail
-else
-	echo '/usr/sbin/sendmail already exists!'
+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/ssmtp/revaliases.new
+config etc/ssmtp/ssmtp.conf.new
+
+# If there's no sendmail link, take over:
+if [ ! -r usr/sbin/sendmail ]; then
+  ( cd usr/sbin ; ln -sf ssmtp sendmail )
 fi
diff --git a/network/ssmtp/patches/01-configure_lcrypto.diff.gz b/network/ssmtp/patches/01-configure_lcrypto.diff.gz
deleted file mode 100644
index a819caf670..0000000000
--- a/network/ssmtp/patches/01-configure_lcrypto.diff.gz
+++ /dev/null
diff --git a/network/ssmtp/patches/02-configure_in_lcrypto.diff.gz b/network/ssmtp/patches/02-configure_in_lcrypto.diff.gz
deleted file mode 100644
index ea8d2e48f6..0000000000
--- a/network/ssmtp/patches/02-configure_in_lcrypto.diff.gz
+++ /dev/null
diff --git a/network/ssmtp/patches/03-557741-remote-addr.patch b/network/ssmtp/patches/03-557741-remote-addr.patch
new file mode 100644
index 0000000000..03efa81cd6
--- /dev/null
+++ b/network/ssmtp/patches/03-557741-remote-addr.patch
@@ -0,0 +1,28 @@
+http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=557741
+
+Patch by Victor Sudakov <sudakov@sibptus.tomsk.ru>
+Modified by Anibal Monsalve Salazar <anibal@debian.org>
+
+Index: ssmtp-2.64/ssmtp.c
+===================================================================
+--- ssmtp-2.64.orig/ssmtp.c
++++ ssmtp-2.64/ssmtp.c
+@@ -1421,6 +1421,7 @@ ssmtp() -- send the message (exactly one
+ int ssmtp(char *argv[])
+ {
+ 	char b[(BUF_SZ + 2)], *buf = b+1, *p, *q;
++	char *remote_addr;
+ #ifdef MD5AUTH
+ 	char challenge[(BUF_SZ + 1)];
+ #endif
+@@ -1624,6 +1625,10 @@ int ssmtp(char *argv[])
+ 		outbytes += smtp_write(sock, "From: %s", from);
+ 	}
+ 
++	if(remote_addr=getenv("REMOTE_ADDR")) {
++		outbytes += smtp_write(sock, "X-Originating-IP: %s", remote_addr);
++	}
++
+ 	if(have_date == False) {
+ 		outbytes += smtp_write(sock, "Date: %s", arpadate);
+ 	}
diff --git a/network/ssmtp/patches/04-508759-garbage.patch b/network/ssmtp/patches/04-508759-garbage.patch
new file mode 100644
index 0000000000..3e53f8bcb8
--- /dev/null
+++ b/network/ssmtp/patches/04-508759-garbage.patch
@@ -0,0 +1,23 @@
+Common subdirectories: ssmtp-original/debian and ssmtp-2.62/debian
+Common subdirectories: ssmtp-original/md5auth and ssmtp-2.62/md5auth
+Common subdirectories: ssmtp-original/.pc and ssmtp-2.62/.pc
+Index: ssmtp-2.64/ssmtp.c
+===================================================================
+--- ssmtp-2.64.orig/ssmtp.c
++++ ssmtp-2.64/ssmtp.c
+@@ -1674,12 +1674,12 @@ int ssmtp(char *argv[])
+ 			outbytes += smtp_write(sock, "%s", leadingdot ? b : buf);
+ 		} else {
+ 			if (log_level > 0) {
+-				log_event(LOG_INFO, "Sent a very long line in chunks");
++				log_event(LOG_INFO, "Sending a partial line");
+ 			}
+ 			if (leadingdot) {
+-				outbytes += fd_puts(sock, b, sizeof(b));
++				outbytes += fd_puts(sock, b, strlen(b));
+ 			} else {
+-				outbytes += fd_puts(sock, buf, bufsize);
++				outbytes += fd_puts(sock, buf, strlen(buf));
+ 			}
+ 		}
+ 		(void)alarm((unsigned) MEDWAIT);
diff --git a/network/ssmtp/patches/fix-tls1.3-handshake.patch b/network/ssmtp/patches/fix-tls1.3-handshake.patch
new file mode 100644
index 0000000000..a84f45b84a
--- /dev/null
+++ b/network/ssmtp/patches/fix-tls1.3-handshake.patch
@@ -0,0 +1,24 @@
+Subject: Fix TLS 1.3 handshake
+From: Jeff King <peff@peff.net>
+Bug-Debian: https://bugs.debian.org/932605
+Last-Update: 2019-08-13
+
+diff --git a/ssmtp.c b/ssmtp.c
+index 7ab79ab..6b2b9d0 100644
+--- a/ssmtp.c
++++ b/ssmtp.c
+@@ -1291,8 +1291,12 @@ fd_getc() -- Read a character from an fd
+ ssize_t fd_getc(int fd, void *c)
+ {
+ #ifdef HAVE_SSL
+-	if(use_tls == True) { 
+-		return(SSL_read(ssl, c, 1));
++	if(use_tls == True) {
++		int attempt = 3;
++		int ret = 0;
++		while (attempt-- > 0 && ret == 0)
++			ret = SSL_read(ssl, c, 1);
++		return ret;
+ 	}
+ #endif
+ 	return(read(fd, c, 1));
diff --git a/network/ssmtp/patches/ssmtp-bug584162-fix.patch b/network/ssmtp/patches/ssmtp-bug584162-fix.patch
new file mode 100644
index 0000000000..17ab1d908e
--- /dev/null
+++ b/network/ssmtp/patches/ssmtp-bug584162-fix.patch
@@ -0,0 +1,120 @@
+Bug-Debian: http://bugs.debian.org/584162
+Reported-By: Christoph Biedl <debian.axhn@manchmal.in-ulm.de>
+Forwarded: not-needed
+Reviewed-By: Anibal Monsalve Salazar <anibal@debian.org>
+Last-Update: 2014-08-15
+
+From: "Daniel Richard G." <skunk@iSKUNK.ORG>
+Subject: Re: ssmtp: Partial loss of message body, sending message to wrong recipicients
+Date: Thu, 19 Jun 2014 14:44:30 -0400
+
+Attached is a patch against the original 2.64 source that should address
+this bug, and hopefully not break anything. An overview of my changes:
+
+* Added code to standarise() to drop the trailing '\r' if the line
+  originally ended with "\r\n".
+
+* Added a check to header_parse() that effectively converts an "\r\n" in
+  the input into '\n'.
+
+* Added a conditional so that header_parse() doesn't pass the empty
+  string to header_save()---a behavior I observed in testing, at the end
+  of a header block with "\r\n" line endings.
+
+* Simplified the last if(in_header) conditional in header_parse(),
+  because it erroneously assumes that if in_header == True, then c could
+  have some value other than EOF. (See the condition on the previous
+  "while" loop, and the lack of any other way to exit said loop.)
+
+  header_parse() will now properly grab a header if fed a message
+  without a body (i.e. no "\n\n" ending the header block), although this
+  code will still drop a header if there is no newline at the end.
+
+Christoph, thank you for your excellent analysis, and the test cases. I
+made use of them, and with my changes sSMTP appears to do the right
+thing.
+
+Index: ssmtp-2.64/ssmtp.c
+===================================================================
+--- ssmtp-2.64.orig/ssmtp.c
++++ ssmtp-2.64/ssmtp.c
+@@ -375,6 +375,12 @@ bool_t standardise(char *str, bool_t *li
+ 	if((p = strchr(str, '\n'))) {
+ 		*p = (char)NULL;
+ 		*linestart = True;
++
++		/* If the line ended in "\r\n", then drop the '\r' too */
++		sl = strlen(str);
++		if(sl >= 1 && str[sl - 1] == '\r') {
++			str[sl - 1] = (char)NULL;
++		}
+ 	}
+ 	return(leadingdot);
+ }
+@@ -768,6 +774,14 @@ void header_parse(FILE *stream)
+ 		}
+ 		len++;
+ 
++		if(l == '\r' && c == '\n') {
++			/* Properly handle input that already has "\r\n"
++			   line endings; see https://bugs.debian.org/584162 */
++			l = (len >= 2 ? *(q - 2) : '\n');
++			q--;
++			len--;
++		}
++
+ 		if(l == '\n') {
+ 			switch(c) {
+ 				case ' ':
+@@ -790,7 +804,9 @@ void header_parse(FILE *stream)
+ 						if((q = strrchr(p, '\n'))) {
+ 							*q = (char)NULL;
+ 						}
+-						header_save(p);
++						if(len > 0) {
++							header_save(p);
++						}
+ 
+ 						q = p;
+ 						len = 0;
+@@ -800,35 +816,12 @@ void header_parse(FILE *stream)
+ 
+ 		l = c;
+ 	}
+-	if(in_header) {
+-		if(l == '\n') {
+-			switch(c) {
+-				case ' ':
+-				case '\t':
+-						/* Must insert '\r' before '\n's embedded in header
+-						   fields otherwise qmail won't accept our mail
+-						   because a bare '\n' violates some RFC */
+-						
+-						*(q - 1) = '\r';	/* Replace previous \n with \r */
+-						*q++ = '\n';		/* Insert \n */
+-						len++;
+-						
+-						break;
+-
+-				case '\n':
+-						in_header = False;
+-
+-				default:
+-						*q = (char)NULL;
+-						if((q = strrchr(p, '\n'))) {
+-							*q = (char)NULL;
+-						}
+-						header_save(p);
+-
+-						q = p;
+-						len = 0;
+-			}
++	if(in_header && l == '\n') {
++		/* Got EOF while reading the header */
++		if((q = strrchr(p, '\n'))) {
++			*q = (char)NULL;
+ 		}
++		header_save(p);
+ 	}
+ 	(void)free(p);
+ }
diff --git a/network/ssmtp/patches/zzz_fix_warnings.patch b/network/ssmtp/patches/zzz_fix_warnings.patch
new file mode 100644
index 0000000000..936dc0d4c4
--- /dev/null
+++ b/network/ssmtp/patches/zzz_fix_warnings.patch
@@ -0,0 +1,189 @@
+diff -Naur ssmtp-2.64/ssmtp.c ssmtp-2.64.patched/ssmtp.c
+--- ssmtp-2.64/ssmtp.c	2021-09-25 20:31:20.120006571 -0400
++++ ssmtp-2.64.patched/ssmtp.c	2021-09-25 20:42:51.453926150 -0400
+@@ -55,21 +55,21 @@
+ 
+ #define ARPADATE_LENGTH 32		/* Current date in RFC format */
+ char arpadate[ARPADATE_LENGTH];
+-char *auth_user = (char)NULL;
+-char *auth_pass = (char)NULL;
+-char *auth_method = (char)NULL;		/* Mechanism for SMTP authentication */
+-char *mail_domain = (char)NULL;
+-char *from = (char)NULL;		/* Use this as the From: address */
++char *auth_user = (char *)NULL;
++char *auth_pass = (char *)NULL;
++char *auth_method = (char *)NULL;		/* Mechanism for SMTP authentication */
++char *mail_domain = (char *)NULL;
++char *from = (char *)NULL;		/* Use this as the From: address */
+ char *hostname;
+ char *mailhost = "mailhub";
+-char *minus_f = (char)NULL;
+-char *minus_F = (char)NULL;
++char *minus_f = (char *)NULL;
++char *minus_F = (char *)NULL;
+ char *gecos;
+-char *prog = (char)NULL;
++char *prog = (char *)NULL;
+ char *root = NULL;
+ char *tls_cert = "/etc/ssl/certs/ssmtp.pem";	/* Default Certificate */
+-char *uad = (char)NULL;
+-char *config_file = (char)NULL;		/* alternate configuration file */
++char *uad = (char *)NULL;
++char *config_file = (char *)NULL;		/* alternate configuration file */
+ 
+ headers_t headers, *ht;
+ 
+@@ -261,7 +261,7 @@
+ 
+ 	p = (str + strlen(str));
+ 	while(isspace(*--p)) {
+-		*p = (char)NULL;
++		*p = '\0';
+ 	}
+ 
+ 	return(p);
+@@ -287,7 +287,7 @@
+ 		q++;
+ 
+ 		if((p = strchr(q, '>'))) {
+-			*p = (char)NULL;
++			*p = '\0';
+ 		}
+ 
+ #if 0
+@@ -310,7 +310,7 @@
+ 	q = strip_post_ws(p);
+ 	if(*q == ')') {
+ 		while((*--q != '('));
+-		*q = (char)NULL;
++		*q = '\0';
+ 	}
+ 	(void)strip_post_ws(p);
+ 
+@@ -363,13 +363,13 @@
+ 	*linestart = False;
+ 
+ 	if((p = strchr(str, '\n'))) {
+-		*p = (char)NULL;
++		*p = '\0';
+ 		*linestart = True;
+ 
+ 		/* If the line ended in "\r\n", then drop the '\r' too */
+ 		sl = strlen(str);
+ 		if(sl >= 1 && str[sl - 1] == '\r') {
+-			str[sl - 1] = (char)NULL;
++			str[sl - 1] = '\0';
+ 		}
+ 	}
+ 	return(leadingdot);
+@@ -390,7 +390,7 @@
+ 		while(fgets(buf, sizeof(buf), fp)) {
+ 			/* Make comments invisible */
+ 			if((p = strchr(buf, '#'))) {
+-				*p = (char)NULL;
++				*p = '\0';
+ 			}
+ 
+ 			/* Ignore malformed lines and comments */
+@@ -525,7 +525,7 @@
+ #endif
+ 
+ 	/* Ignore missing usernames */
+-	if(*str == (char)NULL) {
++	if(*str == '\0') {
+ 		return;
+ 	}
+ 
+@@ -582,7 +582,7 @@
+ 		}
+ 
+ 		/* End of string? */
+-		if(*(q + 1) == (char)NULL) {
++		if(*(q + 1) == '\0') {
+ 			got_addr = True;
+ 		}
+ 
+@@ -590,7 +590,7 @@
+ 		if((*q == ',') && (in_quotes == False)) {
+ 			got_addr = True;
+ 
+-			*q = (char)NULL;
++			*q = '\0';
+ 		}
+ 
+ 		if(got_addr) {
+@@ -682,7 +682,7 @@
+ 	if(strncasecmp(ht->string, "From:", 5) == 0) {
+ #if 1
+ 		/* Hack check for NULL From: line */
+-		if(*(p + 6) == (char)NULL) {
++		if(*(p + 6) == '\0') {
+ 			return;
+ 		}
+ #endif
+@@ -747,7 +747,7 @@
+ 	size_t size = BUF_SZ, len = 0;
+ 	char *p = (char *)NULL, *q;
+ 	bool_t in_header = True;
+-	char l = (char)NULL;
++	char l = '\0';
+ 	int c;
+ 
+ 	while(in_header && ((c = fgetc(stream)) != EOF)) {
+@@ -790,9 +790,9 @@
+ 						in_header = False;
+ 
+ 				default:
+-						*q = (char)NULL;
++						*q = '\0';
+ 						if((q = strrchr(p, '\n'))) {
+-							*q = (char)NULL;
++							*q = '\0';
+ 						}
+ 						if(len > 0) {
+ 							header_save(p);
+@@ -809,7 +809,7 @@
+ 	if(in_header && l == '\n') {
+ 		/* Got EOF while reading the header */
+ 		if((q = strrchr(p, '\n'))) {
+-			*q = (char)NULL;
++			*q = '\0';
+ 		}
+ 		header_save(p);
+ 	}
+@@ -869,7 +869,7 @@
+ 		char *rightside;
+ 		/* Make comments invisible */
+ 		if((p = strchr(buf, '#'))) {
+-			*p = (char)NULL;
++			*p = '\0';
+ 		}
+ 
+ 		/* Ignore malformed lines and comments */
+@@ -1113,7 +1113,7 @@
+ 
+ 	/* Init SSL stuff */
+ 	SSL_CTX *ctx;
+-	SSL_METHOD *meth;
++	const SSL_METHOD *meth;
+ 	X509 *server_cert;
+ 
+ 	SSL_load_error_strings();
+@@ -1307,7 +1307,7 @@
+ 			buf[i++] = c;
+ 		}
+ 	}
+-	buf[i] = (char)NULL;
++	buf[i] = '\0';
+ 
+ 	return(buf);
+ }
+@@ -1739,7 +1739,7 @@
+ 		j = 0;
+ 
+ 		add = 1;
+-		while(argv[i][++j] != (char)NULL) {
++		while(argv[i][++j] != '\0') {
+ 			switch(argv[i][j]) {
+ #ifdef INET6
+ 			case '6':
diff --git a/network/ssmtp/ssmtp.SlackBuild b/network/ssmtp/ssmtp.SlackBuild
index 528a75876c..d75306bc87 100644
--- a/network/ssmtp/ssmtp.SlackBuild
+++ b/network/ssmtp/ssmtp.SlackBuild
@@ -1,6 +1,7 @@
-#!/bin/sh
+#!/bin/bash
 
 # Copyright (c) 2011-2014 LEVAI Daniel
+# Copyright (c) 2020 B. Watson
 # All rights reserved.
 #
 # * Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,25 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20210925 bkw: BUILD=4
+# - get rid of unneeded configure lcrypto patches.
+# - add bugfix patches from Debian.
+# - don't install useless INSTALL in doc dir.
+# - fix compiler warnings caused by such brain damage as:
+#   char *foo = (char)NULL;
+# - install ssmptd.conf.new and (comment-only) revaliases.new.
+# - *don't* install generate_config script.
+# - fix doinst.sh.
+
+# 20200129 bkw: take over maintenance, no script changes yet.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=ssmtp
 VERSION=${VERSION:-2.64}
-BUILD=${BUILD:-3}
+BUILD=${BUILD:-4}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -36,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}
@@ -64,43 +84,46 @@ rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/${PRGNAM}_${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 \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-for diff in "${CWD}"/patches/*.diff.gz;do
-	gzip -dc "${diff}" |patch -p0
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
+
+for i in $CWD/patches/*.patch; do
+  patch -p1 < $i
 done
 
+LIBS="-lcrypto" \
+CFLAGS="$SLKCFLAGS -Wl,-s" \
 ./configure \
-	--prefix=/usr \
-	--sysconfdir='$(DESTDIR)/etc' \
-	--mandir=/usr/man \
-	--enable-ssl
+  --prefix=/usr \
+  --sysconfdir='$(DESTDIR)/etc' \
+  --mandir=/usr/man \
+  --enable-ssl
+
+# Make generate_config non-interactive (just take the defaults).
+# Also don't install it as part of the package. The config file is
+# simple enough to edit, well-commented, and has its own man page.
+sed -i '/^read/d' generate_config
+
+make
+make install prefix=$PKG/usr DESTDIR=$PKG
 
-sed -i	-e's,prefix=/usr,prefix=$(DESTDIR)/usr,' \
-	-e'/\$(GEN_CONFIG) \$(INSTALLED_CONFIGURATION_FILE)/d' \
-	Makefile
-CFLAGS="$SLKCFLAGS" make
-make install DESTDIR=$PKG
-install -D -m644 -o root -g root ssmtp.conf.5 $PKG/usr/man/man5/ssmtp.conf.5
+gzip -9 $PKG/usr/man/man?/*.*
 
-strip --strip-unneeded $PKG/usr/sbin/ssmtp
-gzip -9 $PKG/usr/man/man8/ssmtp.8 $PKG/usr/man/man5/ssmtp.conf.5
+# upstream wrote this handy man page, but forgot to install it
+mkdir -p $PKG/usr/man/man5
+gzip -9c < ssmtp.conf.5 > $PKG/usr/man/man5/ssmtp.conf.5.gz
+
+for i in $PKG/etc/$PRGNAM/*; do
+  mv $i $i.new
+done
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp README INSTALL COPYING COPYRIGHT TLS $PKG/usr/doc/$PRGNAM-$VERSION/
+cp -a README COPY* CHANGE* Change* TLS $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 {} \;
-cp generate_config $PKG/usr/sbin
-chmod 755 $PKG/usr/sbin/generate_config
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
-sed -i -e"s,<VERSION>,${VERSION}," $CWD/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/network/ssmtp/ssmtp.info b/network/ssmtp/ssmtp.info
index 4cda3081be..3fb15026c2 100644
--- a/network/ssmtp/ssmtp.info
+++ b/network/ssmtp/ssmtp.info
@@ -6,5 +6,5 @@ MD5SUM="65b4e0df4934a6cd08c506cabcbe584f"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="LEVAI Daniel"
-EMAIL="leva@ecentrum.hu"
+MAINTAINER="B. Watson"
+EMAIL="urchlay@slackware.uk"
diff --git a/network/sstp-client/README b/network/sstp-client/README
index 821a637329..59d06a4bcc 100644
--- a/network/sstp-client/README
+++ b/network/sstp-client/README
@@ -1,15 +1,15 @@
 SSTP-Client (SSTP client for Linux)
 
-SSTP is Microsofts Remote Access Solution (RAS) for PPP over SSL. It can be
-used instead of PPTP or L2TP, and is only available with Windows Vista/7
-connecting to a Windows 2008 Server. The advantage of SSTP compared to PPTP
-and L2TP is that it cannot be easily blocked by firewalls since the traffic
-is transmitted over HTTPS on port 443. Windows Vista/7 uses SSTP if PPTP or
-L2TP cannot be established.
+SSTP is Microsofts Remote Access Solution (RAS) for PPP over SSL. It
+can be used instead of PPTP or L2TP, and is only available with
+Windows Vista/7 connecting to a Windows 2008 Server. The advantage of
+SSTP compared to PPTP and L2TP is that it cannot be easily blocked
+by firewalls since the traffic is transmitted over HTTPS on port
+443. Windows Vista/7 uses SSTP if PPTP or L2TP cannot be established.
 
-SSTP-Client is an SSTP client for Linux. It can be used to establish a SSTP
-connection to a Windows 2008 Server. This software is similar commandline
-and configuration as the pptp-client software.
+SSTP-Client is an SSTP client for Linux. It can be used to establish
+a SSTP connection to a Windows 2008 Server. This software is similar
+commandline and configuration as the pptp-client software.
 
 SSTP-Client features:
 
diff --git a/network/sstp-client/sstp-client.SlackBuild b/network/sstp-client/sstp-client.SlackBuild
index c58a7efec3..a9835ec5ce 100644
--- a/network/sstp-client/sstp-client.SlackBuild
+++ b/network/sstp-client/sstp-client.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for SSTP-Client
 
-# Copyright 2013, 2016, 2017, 2019  Mario Preksavec, Zagreb, Croatia
+# Copyright 2013, 2023  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.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=sstp-client
-VERSION=${VERSION:-1.0.12}
+VERSION=${VERSION:-1.0.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"
@@ -72,6 +82,9 @@ find -L . \
 # Set proper examples dir, --docdir overriding does not work
 sed -i -e "/^docdir/s:@PACKAGE@:$PRGNAM-$VERSION/examples:" Makefile.in
 
+# Set PPPD version, plugin dir detection does not work
+PPPD_VERSION=$(pppd --version | awk '{print $NF}')
+
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
@@ -85,6 +98,7 @@ CXXFLAGS="$SLKCFLAGS" \
   --enable-user=nobody \
   --enable-group=nogroup \
   --enable-ppp-plugin \
+  --with-pppd-plugin-dir=/usr/lib${LIBDIRSUFFIX}/pppd/$PPPD_VERSION \
   --build=$ARCH-slackware-linux
 
 make
@@ -102,8 +116,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/network/sstp-client/sstp-client.info b/network/sstp-client/sstp-client.info
index 30500d0b47..3f8e2b3bbe 100644
--- a/network/sstp-client/sstp-client.info
+++ b/network/sstp-client/sstp-client.info
@@ -1,8 +1,8 @@
 PRGNAM="sstp-client"
-VERSION="1.0.12"
+VERSION="1.0.18"
 HOMEPAGE="http://sstp-client.sourceforge.net/"
-DOWNLOAD="http://downloads.sourceforge.net/sstp-client/sstp-client-1.0.12.tar.gz"
-MD5SUM="94c927fc6177b7f0048f4f673d9479fe"
+DOWNLOAD="http://downloads.sourceforge.net/sstp-client/sstp-client-1.0.18.tar.gz"
+MD5SUM="04ec1868f825d3218173a95bc9b9eff2"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/network/ssvnc/Makefile.patch b/network/ssvnc/Makefile.patch
deleted file mode 100644
index b16e4bc5c3..0000000000
--- a/network/ssvnc/Makefile.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- ssvnc-1.0.30/Makefile.orig	2014-01-26 08:11:30.168836072 +0700
-+++ ssvnc-1.0.30/Makefile	2014-01-26 08:12:03.465391347 +0700
-@@ -24,7 +24,7 @@
- PREFIX  ?= /usr/local
- ROOT    ?=
- BIN      = bin
--LIB      = lib/ssvnc
-+LIB     ?= lib/ssvnc
- MAN      = man
- MANDIR  ?= $(MAN)
- APPS    ?= share/applications
-@@ -32,7 +32,7 @@
- 
- 
- VSRC = vnc_unixsrc
--JSRC = ultraftp
-+JSRC ?= ultraftp
- PSRC = vncstorepw
- 
- VIEWER  = $(VSRC)/vncviewer/vncviewer
diff --git a/network/ssvnc/README b/network/ssvnc/README
deleted file mode 100644
index 372459bb90..0000000000
--- a/network/ssvnc/README
+++ /dev/null
@@ -1,33 +0,0 @@
-The Enhanced TightVNC Viewer, SSVNC, adds encryption security to VNC
-connections.
-
-The package provides a GUI for Windows, Mac OS X, and Unix that
-automatically starts up an STUNNEL SSL tunnel for SSL or ssh/plink for
-SSH connections to any VNC server, such as x11vnc, and then launches the
-VNC Viewer to use the encrypted tunnel.
-
-The x11vnc server has built-in SSL support, however SSVNC can make SSL
-encrypted VNC connections to any VNC Server if they are running an SSL
-tunnel, such as STUNNEL or socat, at their end. SSVNC's SSH tunnel will
-work to any VNC Server host running sshd that you can log into.
-
-The SSVNC Unix vncviewer can also be run without the SSVNC encryption
-GUI as an enhanced replacement for the xvncviewer, xtightvncviewer,
-etc., viewers.
-
-In addition to normal SSL, SSVNC also supports the VeNCrypt SSL/TLS and
-Vino/ANONTLS encryption extensions to VNC on Unix, Mac OS X, and
-Windows. Via the provided SSVNC VeNCrypt bridge, VeNCrypt and ANONTLS
-encryption also works with any third party VNC Viewer (e.g. RealVNC,
-TightVNC, UltraVNC, etc...) you select via 'Change VNC Viewer'.
-
-There is a simplified SSH-Only mode (sshvnc). And an even more
-simplified Terminal-Services mode (tsvnc) for use with x11vnc on the
-remote side.
-
-Note:
-If you don't require or don't wish to build the Java based viewer you
-can ignore the JDK dependency and set the JSRC environment variable to
-the empty string.  Here is how I build it:
-
-$ env JSRC="" sh ./ssvnc.SlackBuild
diff --git a/network/ssvnc/doinst.sh b/network/ssvnc/doinst.sh
deleted file mode 100644
index 5fb28930db..0000000000
--- a/network/ssvnc/doinst.sh
+++ /dev/null
@@ -1,3 +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/network/ssvnc/slack-desc b/network/ssvnc/slack-desc
deleted file mode 100644
index 6892a3f9c8..0000000000
--- a/network/ssvnc/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------------------------------------------------------|
-ssvnc: ssvnc (Adds encryption/security to VNC connections)
-ssvnc:
-ssvnc: The package provides a GUI for Windows, Mac OS X, and Unix that
-ssvnc: automatically starts up an STUNNEL SSL tunnel for SSL or ssh/plink
-ssvnc: for SSH connections to any VNC server, such as x11vnc, and then
-ssvnc: launches the VNC Viewer to use the encrypted tunnel.
-ssvnc: The package also includes an enhanced TightVNCViewer.
-ssvnc:
-ssvnc:
-ssvnc:
-ssvnc:
diff --git a/network/ssvnc/ssvnc.SlackBuild b/network/ssvnc/ssvnc.SlackBuild
deleted file mode 100644
index 6ff2bef0a4..0000000000
--- a/network/ssvnc/ssvnc.SlackBuild
+++ /dev/null
@@ -1,95 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for ssvnc
-
-# Copyright 2014 Wayne Cuddy Fairfax, VA (USA)
-# 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=ssvnc
-VERSION=${VERSION:-1.0.30}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-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
-
-if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
-    arm*) ARCH=arm ;;
-       *) ARCH=$( uname -m ) ;;
-  esac
-fi
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.src.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 < $CWD/Makefile.patch
-
-make config
-make all
-make ROOT=$PKG PREFIX=/usr install LIB=lib${LIBDIRSUFFIX}/ssvnc
-
-find $PKG -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* ReleaseNotes $PKG/usr/doc/$PRGNAM-$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/network/ssvnc/ssvnc.info b/network/ssvnc/ssvnc.info
deleted file mode 100644
index 5f7804bad3..0000000000
--- a/network/ssvnc/ssvnc.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="ssvnc"
-VERSION="1.0.30"
-HOMEPAGE="http://www.karlrunge.com/x11vnc/ssvnc.html"
-DOWNLOAD="http://ssvnc.sourceforge.net/dev/ssvnc-1.0.30.src.tar.gz"
-MD5SUM="33d7c2d22d80ed26803275a9a83ddbb5"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="jdk"
-MAINTAINER="Wayne Cuddy"
-EMAIL="wcuddy@useunix.net"
diff --git a/network/strongswan/README b/network/strongswan/README
index 051e5974a9..c94b742200 100644
--- a/network/strongswan/README
+++ b/network/strongswan/README
@@ -4,7 +4,7 @@ This SlackBuild enables configure options which are known to compile
 without issue on a stock Slackware 14.2 system. These options provide
 additional functionality and increase this packages ability to
 inter operate with various vendor implementations. Unwanted and/or
-unnecessary plugins can be disabled a run-time via the 'load' flag in
+unnecessary plugins can be disabled at run-time via the 'load' flag in
 /etc/strongswan.d/charon/*.conf files.
 
 The following configure options are enabled by default:
@@ -23,12 +23,34 @@ The following configure options are enabled by default:
     --enable-sha3
     --enable-files
     --enable-lookip
+    --enable-eap-gtc
+    --enable-eap-md5
+    --enable-eap-identity
     --enable-eap-mschapv2
     --enable-eap-tls
     --enable-eap-ttls
     --enable-eap-radius
     --enable-ext-auth
     --enable-xauth-eap
+    --enable-coupling
+    --enable-dnscert
+    --enable-eap-sim
+    --enable-eap-sim-file
+    --enable-eap-sim-file
+    --enable-eap-aka
+    --enable-eap-aka-3gpp
+    --enable-eap-simaka-sql
+    --enable-eap-simaka-pseudonym
+    --enable-eap-simaka-reauth
+    --enable-attr-sql
+    --enable-dhcp
+    --enable-bypass-lan
+    --enable-connmark
+    --enable-counters
+    --enable-farp
+    --enable-lookip
+    --enable-nm
+
 
 To disable the above options set the environment variable CONFIG_OPTS
 to the empty string when calling this SlackBuild.
@@ -40,13 +62,19 @@ To override the defaults options set CONFIG_OPTS to your desired set
 of configure options.
 
 Example:
-env CONFIG_OPTS="--enable-openssl --enable-unity" sh ./strongswan.SlackBuild
+env CONFIG_OPTS="--enable-openssl --enable-unity" \
+    sh ./strongswan.SlackBuild
 
 To add to the default options without overwriting them set the
 EXTRA_CONFIG_OPTS environment variable.
 
 Example:
-env EXTRA_CONFIG_OPTS="--enable-socket-dynamic --enable-dhcp"  sh ./strongswan.SlackBuild
+env EXTRA_CONFIG_OPTS="--enable-socket-dynamic --enable-dhcp"\
+    sh ./strongswan.SlackBuild
+
+Certain use cases may cause issues when bypass-lan is loaded. The
+SlackBuild script disables loading of the bypass-lan module. This can
+be changed in bypass-lan.conf after installation if required.
 
 The list of available options and their descriptions are available here:
 
diff --git a/network/strongswan/doinst.sh b/network/strongswan/doinst.sh
index a88995c5ed..19a6ff6ac8 100644
--- a/network/strongswan/doinst.sh
+++ b/network/strongswan/doinst.sh
@@ -1,22 +1,13 @@
-
 config() {
-    NEW="$1"
-    OLD="${1%.new}"
-    if [ ! -r $OLD ];
-    then
-        # If there's no config file by that name, mv it over:
-        mv $NEW $OLD
-    elif [ "$(md5sum <$OLD)" = "$(md5sum <$NEW)" ];
-    then
-        # toss the redundant copy
-        rm $NEW
-    fi
-    # Otherwise, we leave the .new copy for the admin to consider...
+  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...
 }
 
-# doinst.sh reads the list of files from ./install/conffiles at install time.
-# ./install/conffiles was generated by strongswan.SlackBuild
-for cf in $(cat install/conffiles)
-do
-    config $cf.new
-done
diff --git a/network/strongswan/strongswan.SlackBuild b/network/strongswan/strongswan.SlackBuild
index 648f426e0f..be9f4e9a42 100644
--- a/network/strongswan/strongswan.SlackBuild
+++ b/network/strongswan/strongswan.SlackBuild
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/bash
 
-# Copyright 2018-2019, Wayne Cuddy, wcuddyATgmailDOTcom
+# Copyright 2018-2022, Wayne Cuddy, wcuddyATgmailDOTcom
 # Copyright 2009-2013, Jonathan Larsen (agentc0re), SLC, UT
 # Copyright 2013-2015, Markus Hutmacher, mailing@markhu.de
 # All rights reserved.
@@ -23,15 +23,42 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #
+# 2023-11-17
+#   - upgraded upstream to verion 5.9.11
+#
+# 2022-12-25
+#   - added configure options in preparation for NetworkManager-Strongswan
+#     --enable-eap-gtc
+#     --enable-eap-md5
+#     --enable-nm
+#
+# 2022-10-09
+#   - upgraded upstream version to 5.9.8
+#   - removed INSTALL file per sbopkglint
+#
+# 2022-04-16
+#   - upgraded upstream version to 5.9.5
+#
+# 2020-12-21
+#   - continue building bypass-lan but disable it by default so that the
+#     admin can still enable it if necessary
+#
+# 2019-09-17
+#   - upgraded upstream version to 5.8.1
+#   - added additional "enable" options to DEFAULT_CONFIG_OPTS
+#
 # 2019-03-02:
 #   - upgraded upstream version to 5.7.2
 #   - added DEFAULT_CONFIG_OPTS and EXTRA_CONFIG_OPTS
 #
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=strongswan
-VERSION=${VERSION:-5.7.2}
+VERSION=${VERSION:-5.9.11}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 DEFAULT_CONFIG_OPTS="\
     --enable-shared \
@@ -48,12 +75,33 @@ DEFAULT_CONFIG_OPTS="\
     --enable-sha3 \
     --enable-files \
     --enable-lookip \
+    --enable-eap-gtc \
+    --enable-eap-md5 \
+    --enable-eap-identity \
     --enable-eap-mschapv2 \
     --enable-eap-tls \
     --enable-eap-ttls \
     --enable-eap-radius \
     --enable-ext-auth \
     --enable-xauth-eap \
+    --enable-coupling \
+    --enable-dnscert \
+    --enable-eap-sim \
+    --enable-eap-sim-file \
+    --enable-eap-sim-file \
+    --enable-eap-aka \
+    --enable-eap-aka-3gpp \
+    --enable-eap-simaka-sql \
+    --enable-eap-simaka-pseudonym \
+    --enable-eap-simaka-reauth \
+    --enable-attr-sql \
+    --enable-dhcp \
+    --enable-bypass-lan \
+    --enable-connmark \
+    --enable-counters \
+    --enable-farp \
+    --enable-lookip \
+    --enable-nm \
 "
 
 if [ -z "$ARCH" ]; then
@@ -64,7 +112,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
+# the name of the created package would be, and then exit. This information
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -122,7 +177,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
 cd $TMP/$PRGNAM-$VERSION
-cp -a COPYING ChangeLog INSTALL NEWS README TODO $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a COPYING ChangeLog NEWS README TODO $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 
@@ -143,7 +198,12 @@ cd $PKG
 for i in $(find etc -type f)
 do
     mv $i $i.new
-    echo $i
-done 1>>$PKG/install/conffiles
+    echo "config $i.new" >> $PKG/install/doinst.sh
+done
+
+# bypass-lan may cause problems for most users but it still used in many
+# situations. Disable it by default allowing the user to enable it if
+# necessary.
+sed -i -e 's/load = yes/load = no/' $PKG/etc/strongswan.d/charon/bypass-lan.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/network/strongswan/strongswan.info b/network/strongswan/strongswan.info
index 04418f989a..3a9a3ff6d4 100644
--- a/network/strongswan/strongswan.info
+++ b/network/strongswan/strongswan.info
@@ -1,8 +1,8 @@
 PRGNAM="strongswan"
-VERSION="5.7.2"
+VERSION="5.9.11"
 HOMEPAGE="https://www.strongswan.org"
-DOWNLOAD="https://download.strongswan.org/strongswan-5.7.2.tar.bz2"
-MD5SUM="618de96dc2a506f82a162a5abf9263d4"
+DOWNLOAD="https://download.strongswan.org/strongswan-5.9.11.tar.bz2"
+MD5SUM="673e194cd256af77b46928179f2c81ad"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/network/surf/getkbdevice.diff b/network/surf/getkbdevice.diff
deleted file mode 100644
index 14bef9460d..0000000000
--- a/network/surf/getkbdevice.diff
+++ /dev/null
@@ -1,61 +0,0 @@
-diff -Naur surf-2.0/surf.c surf-2.0.patched/surf.c
---- surf-2.0/surf.c	2017-03-28 12:17:45.000000000 -0400
-+++ surf-2.0.patched/surf.c	2017-06-25 01:23:41.445168316 -0400
-@@ -174,6 +174,7 @@
- static void cleanup(void);
- 
- /* GTK/WebKit */
-+static GdkDevice *getkbdevice(void);
- static WebKitWebView *newview(Client *c, WebKitWebView *rv);
- static void initwebextensions(WebKitWebContext *wc, Client *c);
- static GtkWidget *createview(WebKitWebView *v, WebKitNavigationAction *a,
-@@ -263,7 +264,6 @@
- void
- setup(void)
- {
--	GdkDisplay *gdpy;
- 	int i, j;
- 
- 	/* clean up any zombies immediately */
-@@ -281,8 +281,6 @@
- 
- 	gtk_init(NULL, NULL);
- 
--	gdpy = gdk_display_get_default();
--
- 	curconfig = defconfig;
- 
- 	/* dirs and files */
-@@ -290,7 +288,7 @@
- 	scriptfile = buildfile(scriptfile);
- 	cachedir   = buildpath(cachedir);
- 
--	gdkkb = gdk_seat_get_keyboard(gdk_display_get_default_seat(gdpy));
-+	gdkkb = getkbdevice();
- 
- 	if (!stylefile) {
- 		styledir = buildpath(styledir);
-@@ -329,6 +327,23 @@
- 	}
- }
- 
-+static GdkDevice *
-+getkbdevice(void)
-+{
-+	GList *l, *gdl = gdk_device_manager_list_devices(
-+	           gdk_display_get_device_manager(gdk_display_get_default()),
-+		   GDK_DEVICE_TYPE_MASTER);
-+	GdkDevice *gd = NULL;
-+
-+	for (l = gdl; l != NULL; l = l->next)
-+		if (gdk_device_get_source(l->data) == GDK_SOURCE_KEYBOARD)
-+			gd = l->data;
-+
-+	g_list_free(gdl);
-+	return gd;
-+}
-+
-+
- void
- sigchld(int unused)
- {
diff --git a/network/surf/options.txt b/network/surf/options.txt
index 6069a9ebac..308ab3bc86 100644
--- a/network/surf/options.txt
+++ b/network/surf/options.txt
@@ -21,13 +21,14 @@ HOMEPAGE
 WIDTH
 HEIGHT
   The default window size for surf to use, when it starts. Default values
-  are WIDTH=800 HEIGHT=600.
+  are WIDTH=1280 HEIGHT=1024.
 
 SLACKVER
-  The version of Slackware you're building for. If not set, the version
-  from /etc/slackware-version will be used. You only need to set this
-  if building on Slackware-current (use SLACKVER=current). This is only
-  used for the searchengines patch, so it does nothing if PATCH=no.
+  The version of Slackware you're building for. If not set, the
+  version from /etc/slackware-version will be used. You only need to
+  set this if building on Slackware-current (use the latest stable
+  version). This is only used for the searchengines patch, so it does
+  nothing if PATCH=no.
 
 STRICTSSL
   If STRICTSSL=yes, refuse untrusted connections (e.g. invalid/unknown
diff --git a/network/surf/patches.txt b/network/surf/patches.txt
index 957465989a..2295c4983e 100644
--- a/network/surf/patches.txt
+++ b/network/surf/patches.txt
@@ -9,7 +9,6 @@ google for foo and bar. Supported engines:
   g - google.com
   dict - search for a word on thefreedictionary.com
   sb - search for packages on slackbuilds.org
-  sw - search for official slackware packages on search.slackware.eu
 
 homepage - The browser will start at your home page if called with no
 arguments (normally it starts with a blank window).
diff --git a/network/surf/patches/homepage.diff b/network/surf/patches/homepage.diff
index 4e130a6e88..0e8e680891 100644
--- a/network/surf/patches/homepage.diff
+++ b/network/surf/patches/homepage.diff
@@ -1,7 +1,7 @@
-diff -Naur surf-2.0/surf.c surf-2.0.patched/surf.c
---- surf-2.0/surf.c	2017-03-28 12:17:45.000000000 -0400
-+++ surf-2.0.patched/surf.c	2017-06-25 01:33:34.501169322 -0400
-@@ -1751,7 +1751,7 @@
+diff -Naur surf-2.1/surf.c surf-2.1.patched/surf.c
+--- surf-2.1/surf.c	2021-05-09 18:34:33.000000000 -0400
++++ surf-2.1.patched/surf.c	2021-10-20 02:55:17.426198883 -0400
+@@ -2117,7 +2117,7 @@
  	if (argc > 0)
  		arg.v = argv[0];
  	else
diff --git a/network/surf/patches/searchengines.diff b/network/surf/patches/searchengines.diff
index e4577632e0..7666efbad3 100644
--- a/network/surf/patches/searchengines.diff
+++ b/network/surf/patches/searchengines.diff
@@ -1,70 +1,70 @@
-diff -Naur surf-2.0/config.def.h surf-2.0.patched/config.def.h
---- surf-2.0/config.def.h	2017-03-28 12:17:45.000000000 -0400
-+++ surf-2.0.patched/config.def.h	2017-06-25 02:20:53.529174137 -0400
-@@ -153,6 +153,13 @@
+diff -Naur surf-2.1/config.def.h surf-2.1.patched/config.def.h
+--- surf-2.1/config.def.h	2021-05-09 18:34:33.000000000 -0400
++++ surf-2.1.patched/config.def.h	2021-10-20 02:51:08.497221512 -0400
+@@ -179,6 +179,13 @@
  	{ MODKEY|GDK_SHIFT_MASK, GDK_KEY_m,      toggle,     { .i = Style } },
  };
  
 +static SearchEngine searchengines[] = {
 +  { "d",        "https://duckduckgo.com/html/?q=%s"   },
 +  { "g",        "https://www.google.com/search?q=%s"   },
-+  { "dict",     "http://www.thefreedictionary.com/%s" },
-+  { "sb",       "http://slackbuilds.org/result/?search=%s&sv=@SLACKVER@" },
++  { "dict",     "https://www.thefreedictionary.com/%s" },
++  { "sb",       "https://slackbuilds.org/result/?search=%s&sv=@SLACKVER@" },
 +};
 +
  /* button definitions */
  /* target can be OnDoc, OnLink, OnImg, OnMedia, OnEdit, OnBar, OnSel, OnAny */
  static Button buttons[] = {
-diff -Naur surf-2.0/surf.c surf-2.0.patched/surf.c
---- surf-2.0/surf.c	2017-03-28 12:17:45.000000000 -0400
-+++ surf-2.0.patched/surf.c	2017-06-25 02:04:32.517172473 -0400
-@@ -129,6 +129,11 @@
+diff -Naur surf-2.1/surf.c surf-2.1.patched/surf.c
+--- surf-2.1/surf.c	2021-05-09 18:34:33.000000000 -0400
++++ surf-2.1.patched/surf.c	2021-10-20 02:53:48.600206958 -0400
+@@ -130,6 +130,11 @@
  } Button;
  
  typedef struct {
-+	char *token;
-+	char *uri;
++  char *token;
++  char *uri;
 +} SearchEngine;
 +
 +typedef struct {
  	const char *uri;
  	Parameter config[ParameterLast];
  	regex_t re;
-@@ -202,6 +207,7 @@
- static void download(Client *c, WebKitURIResponse *r);
+@@ -216,6 +221,7 @@
+                                  Client *c);
  static void closeview(WebKitWebView *v, Client *c);
  static void destroywin(GtkWidget* w, Client *c);
 +static gchar *parseuri(const gchar *uri);
  
  /* Hotkeys */
  static void pasteuri(GtkClipboard *clipboard, const char *text, gpointer d);
-@@ -477,7 +483,7 @@
- 		url = g_strdup_printf("file://%s", path);
- 		free(path);
- 	} else {
--		url = g_strdup_printf("http://%s", uri);
-+		url = parseuri(uri);
- 	}
- 
- 	setatom(c, AtomUri, url);
-@@ -1461,6 +1467,22 @@
+@@ -576,7 +582,7 @@
+ 			url = g_strdup_printf("file://%s", path);
+ 			free(path);
+ 		} else {
+-			url = g_strdup_printf("http://%s", uri);
++			url = parseuri(uri);
+ 		}
+ 		if (apath != uri)
+ 			free(apath);
+@@ -1776,6 +1782,22 @@
  		gtk_main_quit();
  }
  
 +gchar *
 +parseuri(const gchar *uri) {
-+	guint i;
++  guint i;
 +
-+	for (i = 0; i < LENGTH(searchengines); i++) {
-+		if (searchengines[i].token == NULL || searchengines[i].uri == NULL ||
-+		    *(uri + strlen(searchengines[i].token)) != ' ')
-+			continue;
-+		if (g_str_has_prefix(uri, searchengines[i].token))
-+			return g_strdup_printf(searchengines[i].uri,
-+					       uri + strlen(searchengines[i].token) + 1);
-+	}
++  for (i = 0; i < LENGTH(searchengines); i++) {
++     if (searchengines[i].token == NULL || searchengines[i].uri == NULL ||
++         *(uri + strlen(searchengines[i].token)) != ' ')
++        continue;
++     if (g_str_has_prefix(uri, searchengines[i].token))
++        return g_strdup_printf(searchengines[i].uri,
++                     uri + strlen(searchengines[i].token) + 1);
++  }
 +
-+	return g_strdup_printf("http://%s", uri);
++  return g_strdup_printf("http://%s", uri);
 +}
 +
  void
diff --git a/network/surf/surf.SlackBuild b/network/surf/surf.SlackBuild
index 98507c6896..092649000c 100644
--- a/network/surf/surf.SlackBuild
+++ b/network/surf/surf.SlackBuild
@@ -1,11 +1,17 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for surf
 
-# 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.
 
+# 20230115 bkw: BUILD=2, strip library.
+# 20211020 bkw:
+# - updated for v2.1.
+# - rework patches again, can't build old versions no more.
+# - embiggen the default window size to 1280x1024.
+
 # 20170625 bkw:
 # - updated for v2.0 (webkit2gtk now required).
 # - re-work searchengines.diff and homepage.diff for v2.0.
@@ -20,10 +26,13 @@
 # - remove patches/startfullscreen.diff as it's integrated into 0.7
 # - update homepage.diff and searchengines.diff for 0.7
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=surf
-VERSION=${VERSION:-2.0}
-BUILD=${BUILD:-1}
+VERSION=${VERSION:-2.1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -33,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,17 +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 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
-
-# Revert upstream commit f9714ab8, which requires gtk+3-3.20.0 or greater.
-# We only have 3.18.9 in Slack 14.2. NB: submission reviewer, please don't
-# move this patch into patches/ (it must always be applied, whether or not
-# PATCH=yes is set).
-patch -p1 < $CWD/getkbdevice.diff
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
 
 # Add a couple of nice patches from upstream, unless disabled. Note that
 # upstream expects users to add patches and edit the source to customize it.
@@ -91,8 +95,8 @@ fi
 TERMINAL=${TERMINAL:-rxvt}
 
 # Default geometry
-WIDTH=${WIDTH:-800}
-HEIGHT=${HEIGHT:-600}
+WIDTH=${WIDTH:-1280}
+HEIGHT=${HEIGHT:-1024}
 
 # Homepage (if browser called with no arguments). No effect if PATCH=no
 HOMEPAGE="${HOMEPAGE:-https://duckduckgo.com/html/}"
@@ -108,11 +112,11 @@ fi
 
 sed -i \
   -e "s,@HOMEPAGE@,$HOMEPAGE,g" \
-  -e "s,\<800\>,$WIDTH," \
-  -e "s,\<600\>,$HEIGHT," \
   $PRGNAM.c
 
 sed -i \
+  -e "s,\<800\>,$WIDTH," \
+  -e "s,\<600\>,$HEIGHT," \
   -e "s,\<st\>,$TERMINAL," \
   -e "s,@SLACKVER@,$SLACKVER," \
   config.def.h
@@ -125,7 +129,7 @@ sed -i \
   config.mk
 
 make
-strip $PRGNAM
+strip $PRGNAM *.so
 make install DESTDIR=$PKG
 gzip -9 $PKG/usr/man/man?/*.?
 
@@ -168,4 +172,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/network/surf/surf.info b/network/surf/surf.info
index ae13a4ab0c..7be94266cb 100644
--- a/network/surf/surf.info
+++ b/network/surf/surf.info
@@ -1,10 +1,10 @@
 PRGNAM="surf"
-VERSION="2.0"
+VERSION="2.1"
 HOMEPAGE="https://surf.suckless.org/"
-DOWNLOAD="https://dl.suckless.org/surf/surf-2.0.tar.gz"
-MD5SUM="11713901fa83c536f3ddfacfc28c3acc"
+DOWNLOAD="https://dl.suckless.org/surf/surf-2.1.tar.gz"
+MD5SUM="b814baf863826cb939a7121eafbb0344"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="webkit2gtk dmenu"
 MAINTAINER="B. Watson"
-EMAIL="yalhcru@gmail.com"
+EMAIL="urchlay@slackware.uk"
diff --git a/network/surfraw/surfraw.SlackBuild b/network/surfraw/surfraw.SlackBuild
index 37eb88548d..15d3609669 100644
--- a/network/surfraw/surfraw.SlackBuild
+++ b/network/surfraw/surfraw.SlackBuild
@@ -1,7 +1,7 @@
-#!/bin/sh
+#!/bin/bash
 # Slackware build script for surfraw
 
-# Copyright 2017-2018 Frédéric Galusik Lyon, France
+# Copyright 2017-2022 Frederic Galusik Bordeaux, France
 # Copyright 2007 Martin Lefebvre <dadexter@slackadelic.com>
 # Copyright 2010-2011 Grigorios Bouzakis <grbzks@xsmail.com>
 # Copyright 2014 Glenn Becker <burningc@sdf.org>
@@ -22,14 +22,26 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20200111 bkw: Modified by SlackBuilds.org (to fix broken man symlinks)
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=surfraw
 VERSION=${VERSION:-2.3.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}
@@ -65,8 +77,10 @@ make install DESTDIR=$PKG
 mv $PKG/etc/xdg/surfraw/conf $PKG/etc/xdg/surfraw/conf.new
 mv $PKG/etc/xdg/surfraw/bookmarks $PKG/etc/xdg/surfraw/bookmarks.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
+# 20200111 bkw: upstream installs over 100 broken symlinks in the man dir,
+# which point to nonexistent gzipped man pages. Turns out, if we gzip the
+# ones that *aren't* symlinks, all is well.
+find -L $PKG/usr/man -type f -exec gzip -9 {} +
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
@@ -79,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/network/surfraw/surfraw.info b/network/surfraw/surfraw.info
index 428d06108e..8de1c28884 100644
--- a/network/surfraw/surfraw.info
+++ b/network/surfraw/surfraw.info
@@ -6,5 +6,5 @@ MD5SUM="6f771c5f23d4a06913142996461d7f59"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Frédéric Galusik"
-EMAIL="slack+SBo@galusik.xyz"
+MAINTAINER="Frederic Galusik"
+EMAIL="f@galusik.fr"
diff --git a/network/suricata/README b/network/suricata/README
deleted file mode 100644
index 86bc3ff21b..0000000000
--- a/network/suricata/README
+++ /dev/null
@@ -1,6 +0,0 @@
-suricata (Network Security Monitoring)
-
-Suricata is a high performance Network IDS, IPS and Network Security
-Monitoring engine.  Open Source and owned by a community run non-profit
-foundation, the Open Information Security Foundation (OISF). Suricata
-is developed by the OISF and its supporting vendors.
diff --git a/network/suricata/doinst.sh b/network/suricata/doinst.sh
deleted file mode 100644
index d74b5bd771..0000000000
--- a/network/suricata/doinst.sh
+++ /dev/null
@@ -1,14 +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
-}
-
-CONFIGS="classification.config reference.config suricata.yaml threshold.config"
-for file in $CONFIGS; do
-    config etc/suricata/${file}.new
-done
diff --git a/network/suricata/rc.suricata b/network/suricata/rc.suricata
deleted file mode 100644
index e4eb06f1a6..0000000000
--- a/network/suricata/rc.suricata
+++ /dev/null
@@ -1,53 +0,0 @@
-#!/bin/sh
-# Start/stop/restart suricata
-# This file written from James Bond <evanton@tut.by>
-
-# This tell suricata which interface to listen on (any for every interface)
-IFACE=${IFACE:-eth0}
-
-# Make sure this matches your IFACE
-PIDFILE=/var/run/suricata_$IFACE.pid
-
-# You probably don't want to change this, but in case you do
-LOGDIR="/var/log/suricata"
-
-# Probably not this either
-CONF=/etc/suricata/suricata.yaml
-
-# Start suricata:
-suricata_start() {
-  CMDLINE="/usr/bin/suricata -D -i $IFACE"
-  echo "Starting Suricata daemon:  $CMDLINE"
-  $CMDLINE --pidfile $PIDFILE -l $LOGDIR -c $CONF
-  echo
-}
-
-# Stop suricata:
-suricata_stop() {
-  echo -n "Stopping Suricata daemon ($IFACE)..."
-  kill $(cat $PIDFILE)
-  echo
-  sleep 1
-  rm -f $PIDFILE
-}
-
-# Restart suricata:
-suricata_restart() {
-  suricata_stop
-  sleep 1
-  suricata_start
-}
-
-case "$1" in
-'start')
-  suricata_start
-  ;;
-'stop')
-  suricata_stop
-  ;;
-'restart')
-  suricata_restart
-  ;;
-*)
-  echo "usage $0 start|stop|restart"
-esac
diff --git a/network/suricata/slack-desc b/network/suricata/slack-desc
deleted file mode 100644
index ebad0dcb9d..0000000000
--- a/network/suricata/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------------------------------------------------------|
-suricata: suricata (Network Security Monitoring)
-suricata:
-suricata: Suricata is a high performance open source Network Security
-suricata: and Intrusion Detection and Prevention Monitoring System for
-suricata: Linux, FreeBSD and Windows. It was designed and owned by a
-suricata: non-profit foundation OISF (Open Information Security Foundation)
-suricata:
-suricata: Homepage: https://suricata-ids.org/
-suricata:
-suricata:
-suricata:
diff --git a/network/suricata/suricata.SlackBuild b/network/suricata/suricata.SlackBuild
deleted file mode 100644
index 30ee71dd7c..0000000000
--- a/network/suricata/suricata.SlackBuild
+++ /dev/null
@@ -1,126 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for suricata
-
-# 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=suricata
-VERSION=${VERSION:-4.1.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 $PKG/etc/$PRGNAM
-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 \
-  --enable-shared=yes \
-  --enable-static=no \
-  --enable-unix-socket \
-  --enable-python \
-  --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
-
-# Fix magic-file path
-sed -i 's/magic-file: \/usr\/share\/file\/magic/magic-file: \/etc\/file\/magic.mgc/' suricata.yaml
-
-# Install config files
-CONFIGS="classification.config reference.config suricata.yaml threshold.config"
-for file in $CONFIGS; do
-    install -D -m644 $file $PKG/etc/suricata/${file}.new
-done
-
-# Include the rc.suricata file
-mkdir -p $PKG/etc/rc.d
-install -D -m0644 $CWD/rc.suricata $PKG/etc/rc.d/rc.suricata.new
-
-# Install rules
-install -D -m644 rules/*.rules $PKG/etc/$PRGNAM
-
-# Create directory for logging
-mkdir -p $PKG/var/log/$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
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a COPYING ChangeLog LICENSE doc/*.txt $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a $PKG/usr/share/doc/$PRGNAM/* $PKG/usr/doc/$PRGNAM-$VERSION
-rm -rf $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
-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/network/suricata/suricata.info b/network/suricata/suricata.info
deleted file mode 100644
index d99c6664e0..0000000000
--- a/network/suricata/suricata.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="suricata"
-VERSION="4.1.2"
-HOMEPAGE="https://suricata-ids.org/"
-DOWNLOAD="https://www.openinfosecfoundation.org/download/suricata-4.1.2.tar.gz"
-MD5SUM="8d50d031fc3848ad9a6694df97adacbe"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="libnet jansson"
-MAINTAINER="Dimitris Zlatanidis"
-EMAIL="d.zlatanidis@gmail.com"
diff --git a/network/surl/README b/network/surl/README
new file mode 100644
index 0000000000..0fe4a8170a
--- /dev/null
+++ b/network/surl/README
@@ -0,0 +1,14 @@
+surl (URL shortener)
+
+surl is a URL shortening command line application that supports
+various sites. It supports stdin or filename input. It grabs the
+URLs, converts them, and returns the same text that was used in the
+input. It is known to work with a few services, such as tinyurl.com,
+is.gd, and others.
+
+surl hasn't been updated in a few years, so not all of the services
+it supports are still functional due to changes in the services' APIs.
+The known non-working services have been disabled in this SlackBuild.
+
+Note: Another "surl" project exists, on github. It's a service, not a
+client like this surl.
diff --git a/network/surl/disable_broken_services.diff b/network/surl/disable_broken_services.diff
new file mode 100644
index 0000000000..a8c3581532
--- /dev/null
+++ b/network/surl/disable_broken_services.diff
@@ -0,0 +1,94 @@
+diff -Naur recipe-0.7.1.1-1~ppa2/docs/surl.1 recipe-0.7.1.1-1~ppa2.patched/docs/surl.1
+--- recipe-0.7.1.1-1~ppa2/docs/surl.1	2013-09-01 08:27:48.000000000 -0400
++++ recipe-0.7.1.1-1~ppa2.patched/docs/surl.1	2020-11-14 00:21:20.723851357 -0500
+@@ -124,16 +124,16 @@
+ .INDENT 0.0
+ .IP \(bu 2
+ .
+-\fCecho \(aqhttp://google.co.uk\(aq | surl \-a myapikey123 \-u example \-s bit.ly\fP
++\fCecho \(aqhttp://google.co.uk\(aq | surl \-a myapikey123 \-u example \-s turl.ca\fP
+ .IP \(bu 2
+ .
+-\fCecho \(aqhttp://www.google.com\(aq | surl \-s tr.im\fP
++\fCecho \(aqhttp://www.google.com\(aq | surl \-s clck.ru\fP
+ .IP \(bu 2
+ .
+-\fCsurl \-c http://www.google.com \-s tr.im\fP
++\fCsurl \-c http://www.google.com \-s is.gd\fP
+ .IP \(bu 2
+ .
+-\fCsurl \-f example.txt \-i \-s tr.im\fP
++\fCsurl \-f example.txt \-i \-s is.gd\fP
+ .UNINDENT
+ .SH BUGS
+ .sp
+diff -Naur recipe-0.7.1.1-1~ppa2/docs/surl.rst recipe-0.7.1.1-1~ppa2.patched/docs/surl.rst
+--- recipe-0.7.1.1-1~ppa2/docs/surl.rst	2013-09-01 08:27:48.000000000 -0400
++++ recipe-0.7.1.1-1~ppa2.patched/docs/surl.rst	2020-11-14 00:19:23.019862057 -0500
+@@ -64,10 +64,10 @@
+ 
+ EXAMPLES
+ ========
+-* ``echo 'http://google.co.uk' | surl -a myapikey123 -u example -s bit.ly``
+-* ``echo 'http://www.google.com' | surl -s tr.im``
+-* ``surl -c http://www.google.com -s tr.im``
+-* ``surl -f example.txt -i -s tr.im``
++* ``echo 'http://google.co.uk' | surl -a myapikey123 -u example -s turl.ca``
++* ``echo 'http://www.google.com' | surl -s clck.ru``
++* ``surl -c http://www.google.com -s is.gd``
++* ``surl -f example.txt -i -s is.gd``
+ 
+ BUGS
+ ====
+diff -Naur recipe-0.7.1.1-1~ppa2/surl/services.py recipe-0.7.1.1-1~ppa2.patched/surl/services.py
+--- recipe-0.7.1.1-1~ppa2/surl/services.py	2013-09-01 08:27:48.000000000 -0400
++++ recipe-0.7.1.1-1~ppa2.patched/surl/services.py	2020-11-14 00:15:04.403885566 -0500
+@@ -29,30 +29,11 @@
+ def supportedServices():
+     """ Returns a dictionary with the supported surl services """
+     dict_service = {
+-        'bit.ly'       : bitly_com('bit.ly'),
+-        'bitly.com'    : bitly_com('bit.ly'),
+-        'j.mp'         : bitly_com('j.mp'),
+         'chilp.it'     : chilp_it(),
+         'clck.ru'      : clck_ru(),
+-        'crum.bs'      : crum_bs(),
+-        'decenturl.com': decenturl_com(),
+-        'goo.gl'       : goo_gl(),
+         'is.gd'        : is_gd(),
+-        'liip.to'      : liip_to(),
+-        'metamark.net' : metamark_net(),
+-        'redir.ec'     : redir_ec(),
+-        'ri.ms'        : tinyarro_ws('ri.ms'),
+-        'ta.gd'        : tinyarro_ws('ta.gd'),
+-        'tinyarro.ws'  : tinyarro_ws('tinyarro.ws'),
+-        'sn.im'        : sn_im('sn.im'),
+-        'snipr.com'    : sn_im('snipr.com'),
+-        'snipurl.com'  : sn_im('snipurl.com'),
+-        'snurl.com'    : sn_im('snurl.com'),
+-        'tiny.cc'      : tiny_cc(),
+         'tinyurl.com'  : tinyurl_com(),
+         'turl.ca'      : turl_ca(),
+-        'twurl.nl'     : twurl_nl(),
+-        'urlx.ru'      : urlx_ru(),
+     }
+     return dict_service
+ 
+diff -Naur recipe-0.7.1.1-1~ppa2/surl/surl.py recipe-0.7.1.1-1~ppa2.patched/surl/surl.py
+--- recipe-0.7.1.1-1~ppa2/surl/surl.py	2013-09-01 08:27:48.000000000 -0400
++++ recipe-0.7.1.1-1~ppa2.patched/surl/surl.py	2020-11-14 00:17:42.283871214 -0500
+@@ -98,10 +98,10 @@
+         print("  -r, --script <path>\t\tThe surlscript to execute")
+         print("\n\nSupported URL shortening services:")
+         print(" %s\n" % ', '.join(service_list))
+-        print("Example:\n  echo 'http://google.co.uk' | surl -a myapikey123 -u example -s bit.ly")
+-        print("  echo 'http://www.google.com' | surl -s tr.im")
+-        print("  surl -c http://www.google.com -s tr.im")
+-        print("  surl -f example.txt -i -s tr.im")
++        print("Example:\n  echo 'http://google.co.uk' | surl -a myapikey123 -u example -s turl.ca")
++        print("  echo 'http://www.google.com' | surl -s clck.ru")
++        print("  surl -c http://www.google.com -s is.gd")
++        print("  surl -f example.txt -i -s is.gd")
+         ps.call("Help()")
+         ps.unload()
+         sys.exit(error)
diff --git a/network/surl/slack-desc b/network/surl/slack-desc
new file mode 100644
index 0000000000..f47efc3aac
--- /dev/null
+++ b/network/surl/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+    |-----handy-ruler------------------------------------------------------|
+surl: surl (URL shortener)
+surl:
+surl: surl is a URL shortening command line application that supports
+surl: various sites. It supports stdin or filename input. It grabs the
+surl: URLs, converts them, and returns the same text that was used in the
+surl: input. It is known to work with a few services, such as tinyurl.com,
+surl: is.gd, and others.
+surl:
+surl:
+surl:
+surl:
diff --git a/network/surl/surl.SlackBuild b/network/surl/surl.SlackBuild
new file mode 100644
index 0000000000..9f065462c0
--- /dev/null
+++ b/network/surl/surl.SlackBuild
@@ -0,0 +1,66 @@
+#!/bin/bash
+
+# Slackware build script for surl
+
+# Written by B. Watson (urchlay@slackware.uk)
+
+# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
+
+# 20230520 bkw: python => python2 (no other changes).
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=surl
+VERSION=${VERSION:-0.7.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}
+
+# Upstream files and directories are weirdly named.
+TARBALL=$CWD/${PRGNAM}_$VERSION-1~ppa2~ubuntu13.10.1.tar.gz
+SRCDIR=recipe-$VERSION-1~ppa2
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $SRCDIR
+tar xvf $TARBALL
+cd $SRCDIR
+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 {} \+
+
+patch -p1 < $CWD/disable_broken_services.diff
+
+sed -i 's,share/man,man,' setup.py
+python2 setup.py install --root=$PKG
+gzip -9 $PKG/usr/man/man1/$PRGNAM.1
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS 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/network/surl/surl.info b/network/surl/surl.info
new file mode 100644
index 0000000000..99b44be5f5
--- /dev/null
+++ b/network/surl/surl.info
@@ -0,0 +1,10 @@
+PRGNAM="surl"
+VERSION="0.7.1.1"
+HOMEPAGE="https://launchpad.net/surl"
+DOWNLOAD="http://ppa.launchpad.net/surl/ppa/ubuntu/pool/main/s/surl/surl_0.7.1.1-1~ppa2~ubuntu13.10.1.tar.gz"
+MD5SUM="a70434fabce4c865edd744dd49786e8a"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="B. Watson"
+EMAIL="urchlay@slackware.uk"
diff --git a/network/swaks/slack-desc b/network/swaks/slack-desc
index f7ad3b1d0c..ec6345a9c4 100644
--- a/network/swaks/slack-desc
+++ b/network/swaks/slack-desc
@@ -13,7 +13,7 @@ swaks: SMTP test tool written and maintained by John Jetmore.
 swaks:
 swaks:
 swaks:
-swaks: website: http://www.jetmore.org/john/code/swaks/
+swaks: website: https://www.jetmore.org/john/code/swaks/
 swaks:
 swaks:
 swaks:
diff --git a/network/swaks/swaks.SlackBuild b/network/swaks/swaks.SlackBuild
index 44a0c49ec0..3b97ccb05a 100644
--- a/network/swaks/swaks.SlackBuild
+++ b/network/swaks/swaks.SlackBuild
@@ -1,17 +1,45 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for swaks
 
-# Petr Kletecka petr@kle.cz <2018>
+# Copyright 2019 Petr Kletecka petr@kle.cz
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=swaks
-VERSION=${VERSION:-20181104.0}
+VERSION=${VERSION:-20190914.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 +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/network/swaks/swaks.info b/network/swaks/swaks.info
index 5ffe6ac085..4cf4a2c46e 100644
--- a/network/swaks/swaks.info
+++ b/network/swaks/swaks.info
@@ -1,8 +1,8 @@
 PRGNAM="swaks"
-VERSION="20181104.0"
+VERSION="20190914.0"
 HOMEPAGE="https://www.jetmore.org/john/code/swaks/"
-DOWNLOAD="https://www.jetmore.org/john/code/swaks/files/swaks-20181104.0.tar.gz"
-MD5SUM="cf684985c9543d81104377801efb59b8"
+DOWNLOAD="https://jetmore.org/john/code/swaks/files/swaks-20190914.0.tar.gz"
+MD5SUM="20e4986476af66923396eaeafb7e2727"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/network/swift/README b/network/swift/README
new file mode 100644
index 0000000000..d0c6f4060b
--- /dev/null
+++ b/network/swift/README
@@ -0,0 +1,5 @@
+swift is a jabber client from the Isode company
+
+Note: swift does not support OMEMO or OTR, as it was designed with
+vendored encryption in mind (not present in the public version). It
+does not support several "modern XMPP" XEPs, so YMMV.
diff --git a/network/swift/doinst.sh b/network/swift/doinst.sh
new file mode 100644
index 0000000000..65c7e2eeb9
--- /dev/null
+++ b/network/swift/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/network/swift/slack-desc b/network/swift/slack-desc
new file mode 100644
index 0000000000..d672a19e72
--- /dev/null
+++ b/network/swift/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description. Line
+# up the first '|' above the ':' following the base package name, and the '|'
+# on the right side marks the last column you can put a 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------------------------------------------------------|
+swift: swift (a Jabber client from Isode)
+swift:
+swift: A jabber client from a commercial company also developing the Isode
+swift: Jabber Server.
+swift:
+swift:
+swift:
+swift:
+swift:
+swift: Homepage: https://swift.im
+swift:
diff --git a/network/swift/swift-4.0.2-boost-1.69-compatibility.patch b/network/swift/swift-4.0.2-boost-1.69-compatibility.patch
new file mode 100644
index 0000000000..a99dc10a2e
--- /dev/null
+++ b/network/swift/swift-4.0.2-boost-1.69-compatibility.patch
@@ -0,0 +1,77 @@
+From a21993d750396d755717df21e331df87af8a0c6a Mon Sep 17 00:00:00 2001
+From: Bruce Stephens <bruce.stephens@isode.com>
+Date: Wed, 9 Jan 2019 16:21:20 +0000
+Subject: [PATCH] Don't assume that tribool has an implicit bool conversion
+
+In boost 1.68.0 the conversion is implicit, but in 1.69.0 it's
+explicit and we must explicitly call it.
+
+Change-Id: I24eb78be7510c89b88342d28c539cad4977f99fd
+---
+ Swiften/Network/PlatformNATTraversalWorker.cpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Swiften/Network/PlatformNATTraversalWorker.cpp b/Swiften/Network/PlatformNATTraversalWorker.cpp
+index f56de0b78b..eaa13b30d3 100644
+--- a/Swiften/Network/PlatformNATTraversalWorker.cpp
++++ b/Swiften/Network/PlatformNATTraversalWorker.cpp
+@@ -157,7 +157,7 @@ NATTraversalInterface* PlatformNATTraversalWorker::getNATTraversalInterface() co
+         miniUPnPInterface = new MiniUPnPInterface();
+         miniUPnPSupported = miniUPnPInterface->isAvailable();
+     }
+-    SWIFT_LOG(debug) << "UPnP NAT traversal supported: " << miniUPnPSupported << std::endl;
++    SWIFT_LOG(debug) << "UPnP NAT traversal supported: " << static_cast<bool>(miniUPnPSupported) << std::endl;
+     if (miniUPnPSupported) {
+         return miniUPnPInterface;
+     }
+@@ -168,7 +168,7 @@ NATTraversalInterface* PlatformNATTraversalWorker::getNATTraversalInterface() co
+         natPMPInterface = new NATPMPInterface();
+         natPMPSupported = natPMPInterface->isAvailable();
+     }
+-    SWIFT_LOG(debug) << "NAT-PMP NAT traversal supported: " << natPMPSupported << std::endl;
++    SWIFT_LOG(debug) << "NAT-PMP NAT traversal supported: " << static_cast<bool>(natPMPSupported) << std::endl;
+     if (natPMPSupported) {
+         return natPMPInterface;
+     }
+From bb3bd8a32b220b9c1ffd566da00bcd0ba546156c Mon Sep 17 00:00:00 2001
+From: Miroslaw Stein <miroslaw.stein@isode.com>
+Date: Fri, 18 Jan 2019 14:30:24 +0000
+Subject: [PATCH] Avoid deprecated boost endianess include
+
+As of Boost 1.69.0, boost/detail/endian.h is deprecated in favour of
+boost/predef/other/endian.h, and BOOST_(LITTLE|BIG)_ENDIAN by
+BOOST_ENDIAN_(LITTLE|BIG)_BYTE.
+
+Test-Information:
+
+Unit tests pass on Debian 9
+
+Change-Id: If7076c559a4e35219ff97603f50b80cfbe05b29b
+---
+ Swiften/Base/Platform.h | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/Swiften/Base/Platform.h b/Swiften/Base/Platform.h
+index 4deba2bdda..22dff30b14 100644
+--- a/Swiften/Base/Platform.h
++++ b/Swiften/Base/Platform.h
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2010 Isode Limited.
++ * Copyright (c) 2010-2019 Isode Limited.
+  * All rights reserved.
+  * See the COPYING file for more information.
+  */
+@@ -43,9 +43,9 @@
+ #endif
+ 
+ // Endianness
+-#include <boost/detail/endian.hpp>
+-#if defined(BOOST_LITTLE_ENDIAN)
++#include <boost/predef/other/endian.h>
++#if defined(BOOST_ENDIAN_LITTLE_BYTE)
+ #define SWIFTEN_LITTLE_ENDIAN
+-#elif defined(BOOST_BIG_ENDIAN)
++#elif defined(BOOST_ENDIAN_BIG_BYTE)
+ #define SWIFTEN_BIG_ENDIAN
+ #endif
diff --git a/network/swift/swift-4.0.2-qt-5.11-compatibility.patch b/network/swift/swift-4.0.2-qt-5.11-compatibility.patch
new file mode 100644
index 0000000000..db633945b4
--- /dev/null
+++ b/network/swift/swift-4.0.2-qt-5.11-compatibility.patch
@@ -0,0 +1,35 @@
+From 1d18148c86377787a8c77042b12ea66f20cb2ca9 Mon Sep 17 00:00:00 2001
+From: Tobias Markmann <tm@ayena.de>
+Date: Thu, 21 Jun 2018 13:04:56 +0200
+Subject: Add missing include for QAbstractItemModel
+
+This fixes building Swift with Qt 5.11.
+
+Test-Information:
+
+Builds and tests pass on macOS 10.13.5 with Qt 5.11.0.
+
+Change-Id: I1be2cd081d8a520ec38ab7cca5ada0d7fc39b777
+
+diff --git a/Swift/QtUI/UserSearch/QtUserSearchWindow.h b/Swift/QtUI/UserSearch/QtUserSearchWindow.h
+index 0714ac1..fe536ab 100644
+--- a/Swift/QtUI/UserSearch/QtUserSearchWindow.h
++++ b/Swift/QtUI/UserSearch/QtUserSearchWindow.h
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2010-2016 Isode Limited.
++ * Copyright (c) 2010-2018 Isode Limited.
+  * All rights reserved.
+  * See the COPYING file for more information.
+  */
+@@ -8,6 +8,7 @@
+ 
+ #include <set>
+ 
++#include <QAbstractItemModel>
+ #include <QWizard>
+ 
+ #include <Swiften/Base/Override.h>
+-- 
+cgit v0.10.2-6-g49f6
+
diff --git a/network/swift/swift-4.0.2-qt-5.15-compatibility.patch b/network/swift/swift-4.0.2-qt-5.15-compatibility.patch
new file mode 100644
index 0000000000..37918db198
--- /dev/null
+++ b/network/swift/swift-4.0.2-qt-5.15-compatibility.patch
@@ -0,0 +1,10 @@
+--- a/Swift/QtUI/Roster/GroupItemDelegate.cpp
++++ b/Swift/QtUI/Roster/GroupItemDelegate.cpp
+@@ -7,6 +7,7 @@
+ #include <Swift/QtUI/Roster/GroupItemDelegate.h>
+ 
+ #include <QPainter>
++#include <QPainterPath>
+ #include <QPen>
+ #include <QtDebug>
+ 
diff --git a/network/swift/swift-gcc11.patch b/network/swift/swift-gcc11.patch
new file mode 100644
index 0000000000..4d94c2d105
--- /dev/null
+++ b/network/swift/swift-gcc11.patch
@@ -0,0 +1,13 @@
+diff --git a/Swift/Controllers/ShowProfileController.h b/Swift/Controllers/ShowProfileController.h
+index 0d01ba1a0..5dc7197ff 100644
+--- a/Swift/Controllers/ShowProfileController.h
++++ b/Swift/Controllers/ShowProfileController.h
+@@ -18,6 +18,8 @@
+ 
+ #include <Swift/Controllers/UIEvents/UIEvent.h>
+ 
++#include <map>
++
+ namespace Swift {
+     class VCardManager;
+     class ProfileWindow;
diff --git a/network/swift/swift-python3.patch b/network/swift/swift-python3.patch
new file mode 100644
index 0000000000..80580e7c93
--- /dev/null
+++ b/network/swift/swift-python3.patch
@@ -0,0 +1,737 @@
+diff --git a/3rdParty/LibIDN/SConscript b/3rdParty/LibIDN/SConscript
+index 90892b0f8..c99aff8ba 100644
+--- a/3rdParty/LibIDN/SConscript
++++ b/3rdParty/LibIDN/SConscript
+@@ -40,13 +40,13 @@ if env.get("LIBIDN_BUNDLED", False) :
+             if conf.CheckFunc("stricmp") :
+                 myenv.Append(CPPDEFINES = [("strcasecmp", "stricmp")])
+             else :
+-                print "Error: Cannot find strcasecmp() or stricmp()"
++                print("Error: Cannot find strcasecmp() or stricmp()")
+                 Exit(1)
+         if not conf.CheckFunc('strncasecmp') :
+             if conf.CheckFunc("strnicmp") :
+                 myenv.Append(CPPDEFINES = [("strncasecmp", "strnicmp")])
+             else :
+-                print "Error: Cannot find strncasecmp() or strnicmp()"
++                print("Error: Cannot find strncasecmp() or strnicmp()")
+                 Exit(1)
+         conf.Finish()
+ 
+diff --git a/BuildTools/CheckHeaders.py b/BuildTools/CheckHeaders.py
+index 79ff85c12..752d2573f 100755
+--- a/BuildTools/CheckHeaders.py
++++ b/BuildTools/CheckHeaders.py
+@@ -36,7 +36,7 @@ for line in file.readlines() :
+         continue
+     for forbiddenInclude, ignores in FORBIDDEN_INCLUDES :
+         if forbiddenInclude in line and len([x for x in ignores if x in filename]) == 0 :
+-            print "Found " + forbiddenInclude + " include in " + filename
++            print("Found " + forbiddenInclude + " include in " + filename)
+             foundBadHeaders = True
+ 
+ sys.exit(foundBadHeaders)
+diff --git a/BuildTools/CheckTranslations.py b/BuildTools/CheckTranslations.py
+index 615f81f1e..0617fbac0 100755
+--- a/BuildTools/CheckTranslations.py
++++ b/BuildTools/CheckTranslations.py
+@@ -41,10 +41,10 @@ for filename in os.listdir("Swift/Translations") :
+             translationText = getText(translation.childNodes)
+             translationPlaceholders = set(re.findall("%\d+%?", translationText))
+             if translationPlaceholders != sourcePlaceholders :
+-                print "[Error] " + filename + ": Placeholder mismatch in translation '" + sourceText + "'"
++                print("[Error] " + filename + ": Placeholder mismatch in translation '" + sourceText + "'")
+         if not finished :
+-                print "[Warning] " + filename + ": Unfinished"
++                print("[Warning] " + filename + ": Unfinished")
+         if language not in desktop_generic_names and language != "en" :
+-                print "[Warning] GenericName field missing in desktop entry for " + language
++                print("[Warning] GenericName field missing in desktop entry for " + language)
+         if language not in desktop_comments and language != "en" :
+-                print "[Warning] Comment field missing in desktop entry for " + language
++                print("[Warning] Comment field missing in desktop entry for " + language)
+diff --git a/BuildTools/Copyright/find-contribs.py b/BuildTools/Copyright/find-contribs.py
+index ac30afb2b..799ae7b45 100755
+--- a/BuildTools/Copyright/find-contribs.py
++++ b/BuildTools/Copyright/find-contribs.py
+@@ -46,12 +46,12 @@ def print_log(full_log):
+ 
+ full_swiften_log = subprocess.check_output(["git", "log", "--", "Swiften"])
+ 
+-print "Contributors for Swiften/ subtree:\n"
++print("Contributors for Swiften/ subtree:\n")
+ print_log(full_swiften_log)
+ 
+ full_all_log = subprocess.check_output(["git", "log"])
+ 
+-print "\n\n\n\n"
++print("\n\n\n\n")
+ 
+-print "Contributors for full tree:\n"
++print("Contributors for full tree:\n")
+ print_log(full_all_log)
+diff --git a/BuildTools/Copyrighter.py b/BuildTools/Copyrighter.py
+index a16050cb1..cfde98f62 100755
+--- a/BuildTools/Copyrighter.py
++++ b/BuildTools/Copyrighter.py
+@@ -122,14 +122,14 @@ def check_copyright(filename, hints) :
+                     return True
+                 else :
+                     if hints :
+-                        print "Copyright block for " + copyrightSetting.author + " does not cover current year in: " + filename
++                        print("Copyright block for " + copyrightSetting.author + " does not cover current year in: " + filename)
+                     return False
+         if hints :
+-            print "Missing copyright block for " + copyrightSetting.author + " in: " + filename
++            print("Missing copyright block for " + copyrightSetting.author + " in: " + filename)
+         return False
+     else :
+         if hints :
+-            print "No copyright found in: " + filename
++            print("No copyright found in: " + filename)
+         return False
+ 
+ def replace_data_in_file(filename, begin, end, replaceWith) :
+@@ -140,7 +140,7 @@ def replace_data_in_file(filename, begin, end, replaceWith) :
+ 
+ def set_or_update_copyright(filename) :
+     if check_copyright(filename, False) :
+-        print "No update required for file: " + filename
++        print("No update required for file: " + filename)
+     else :
+         copyrightBlocks = parse_file_new(filename)
+         username, email = get_userinfo()
+@@ -161,7 +161,7 @@ def set_or_update_copyright(filename) :
+         replace_data_in_file(filename, lastBlock+1, lastBlock+1, "\n" + str(copyrightSetting))
+ 
+ def print_help() :
+-    print """Usage:
++    print("""Usage:
+     Copyrighter.py check-copyright $filename
+         Cheks for the existence of a copyright comment block.
+ 
+@@ -172,7 +172,7 @@ def print_help() :
+         A users license configuration can be set via the SWIFT_LICENSE_CONFIG environment variable 
+         in the format "$copyright holder|$license", e.g. "Jane Doe|mit". Possible values for 
+         $license are default, mit and gpl.
+-    """
++    """)
+ 
+ if sys.argv[1] == "check-copyright" :
+     file = sys.argv[2]
+@@ -183,6 +183,6 @@ elif sys.argv[1] == "set-copyright" :
+     file = sys.argv[2]
+     set_or_update_copyright(file)
+ else :
+-    print "Unknown command: " + sys.argv[1]
++    print("Unknown command: " + sys.argv[1])
+     print_help()
+     sys.exit(-1)
+diff --git a/BuildTools/CrashReportAnalysis/WindowsMinidumpAnalyse.py b/BuildTools/CrashReportAnalysis/WindowsMinidumpAnalyse.py
+index dada92095..92f9b28f1 100644
+--- a/BuildTools/CrashReportAnalysis/WindowsMinidumpAnalyse.py
++++ b/BuildTools/CrashReportAnalysis/WindowsMinidumpAnalyse.py
+@@ -19,11 +19,11 @@ import time
+ 
+ swiftWindowBuildsPathPrefix = os.getenv("SWIFT_DIST")
+ if swiftWindowBuildsPathPrefix == None :
+-    print "Please set the SWIFT_DIST environment variable to a location containing msi and pdb.gz files."
++    print("Please set the SWIFT_DIST environment variable to a location containing msi and pdb.gz files.")
+     sys.exit(1)
+ 
+ if len(sys.argv) != 3:
+-    print "Usage: python WindowsMinidumpAnalyse.py VERSION MINIDUMP_FILE"
++    print("Usage: python WindowsMinidumpAnalyse.py VERSION MINIDUMP_FILE")
+     sys.exit(1)
+ 
+ version = sys.argv[1]
+@@ -93,7 +93,7 @@ def printHumanReadableReport():
+ try:
+     shutil.rmtree(working_folder)
+ except:
+-    print ""
++    print("")
+ 
+ # clone local git repository into dedicated directory
+ call(["git", "clone",  ".", working_folder], shell=True)
+@@ -120,7 +120,7 @@ assert(len(commit) > 0)
+ if not os.path.exists(symbol_cache_path):
+     os.makedirs(symbol_cache_path)
+ 
+-#print "Checking out commit {0}.".format(commit)
++#print("Checking out commit {0}.".format(commit))
+ call(["git", "-C", working_folder, "checkout", commit])
+ 
+ os.chdir(working_folder)
+diff --git a/BuildTools/DocBook/SCons/XSLT.py b/BuildTools/DocBook/SCons/XSLT.py
+index 38e36c533..6a40b62a8 100644
+--- a/BuildTools/DocBook/SCons/XSLT.py
++++ b/BuildTools/DocBook/SCons/XSLT.py
+@@ -8,7 +8,7 @@ import xml.dom.minidom, os, os.path
+ def generate(env) :
+     def generate_actions(source, target, env, for_signature) :
+         if not env.has_key("XSLTSTYLESHEET") :
+-            raise SCons.Errors.UserError, "The XSLTSTYLESHEET construction variable must be defined"
++            raise SCons.Errors.UserError("The XSLTSTYLESHEET construction variable must be defined")
+ 
+         # Process the XML catalog files
+         # FIXME: It's probably not clean to do an ENV assignment globally
+diff --git a/BuildTools/FixIncludes.py b/BuildTools/FixIncludes.py
+index 898494473..e53246455 100755
+--- a/BuildTools/FixIncludes.py
++++ b/BuildTools/FixIncludes.py
+@@ -153,12 +153,12 @@ for line in content[headerStart:headerEnd]:
+             headerGroups[headerType] = [line]
+ 
+ if containsComplexPreprocessorDirectives:
+-    print "Cannot format headers containing preprocessor #if, #pragma, #define or #undef statements!"
++    print("Cannot format headers containing preprocessor #if, #pragma, #define or #undef statements!")
+     exit(1)
+ 
+ if filename_base.endswith(".h"):
+     if not HeaderType.PRAGMA_ONCE in headerGroups:
+-        print "Missing #pragma once!"
++        print("Missing #pragma once!")
+         exit(2)
+     cleanHeaderFile(content, headerStart, headerEnd, headerGroups)
+ elif filename_base.endswith(".cpp") or filename_base.endswith(".mm"):
+diff --git a/BuildTools/GetBuildVersion.py b/BuildTools/GetBuildVersion.py
+index 70fdc5ce5..be7cc03e6 100755
+--- a/BuildTools/GetBuildVersion.py
++++ b/BuildTools/GetBuildVersion.py
+@@ -16,6 +16,6 @@ if only_major :
+     if version_match :
+         print version_match.group(1)
+     else :
+-        print "0"
++        print("0")
+ else :
+     print Version.getBuildVersion(os.path.dirname(sys.argv[0]) + "/..", sys.argv[1])
+diff --git a/BuildTools/Gource/GetGravatars.py b/BuildTools/Gource/GetGravatars.py
+index d1f40a4d6..17198aa13 100755
+--- a/BuildTools/Gource/GetGravatars.py
++++ b/BuildTools/Gource/GetGravatars.py
+@@ -5,7 +5,7 @@ import subprocess, os, sys, hashlib, urllib
+ GRAVATAR_URL = "http://www.gravatar.com/avatar/%(id)s?d=404"
+ 
+ if len(sys.argv) != 2 :
+-    print "Usage: " + sys.argv[0] + " <output-dir>"
++    print("Usage: " + sys.argv[0] + " <output-dir>")
+     sys.exit(-1)
+ 
+ output_dir = sys.argv[1]
+@@ -18,32 +18,32 @@ for line in p.stdout.readlines() :
+     authors[author_components[0]] = author_components[1]
+ p.stdin.close()
+ if p.wait() != 0 :
+-    print "Error"
++    print("Error")
+     sys.exit(-1)
+ 
+ # Get & save the avatars
+ if not os.path.isdir(output_dir) :
+     os.makedirs(output_dir)
+ for email, name in authors.items() :
+-    print "Processing avatar for " + name + " <" + email + ">"
++    print("Processing avatar for " + name + " <" + email + ">")
+     filename = os.path.join(output_dir, name + ".png")
+     if os.path.isfile(filename) :
+-        print "-> Already there. Skipping."
++        print("-> Already there. Skipping.")
+         continue
+ 
+     m = hashlib.md5()
+     m.update(email)
+     url = GRAVATAR_URL % {"id" : m.hexdigest()}
+-    print "- Downloading " + url
++    print("- Downloading " + url)
+     f = urllib.urlopen(url)
+     input = None
+     if f.getcode() == 200 :
+         input = f.read()
+     f.close()
+     if input :
+-        print "- Saving file " + filename
++        print("- Saving file " + filename)
+         f = open(filename, "w")
+         f.write(input)
+         f.close()
+     else :
+-        print "- No Gravatar found"
++        print("- No Gravatar found")
+diff --git a/BuildTools/SCons/SConstruct b/BuildTools/SCons/SConstruct
+index 6d63d5bcf..e40bfb855 100644
+--- a/BuildTools/SCons/SConstruct
++++ b/BuildTools/SCons/SConstruct
+@@ -7,9 +7,9 @@ root = Dir("../..").abspath
+ 
+ # Override SConscript to handle tests
+ oldSConscript = SConscript
+-def SConscript(*arguments, **keywords) :
+-    if not keywords.get("test_only", False) or env["TEST"] :
+-        return apply(oldSConscript, arguments, keywords)
++def SConscript(*args, **kwargs) :
++    if not kwargs.get("test_only", False) or env["TEST"] :
++        return oldSConscript(*args, **kwargs)
+ env.SConscript = SConscript
+ 
+ ################################################################################
+@@ -142,11 +142,11 @@ conf = Configure(conf_env, custom_tests = {
+     })
+ 
+ if not conf.CheckCXX() or not conf.CheckCC() :
+-    print "Error: You need a working compiler"
++    print("Error: You need a working compiler")
+     Exit(1)
+ 
+ if not conf.CheckCpp11Support() :
+-    print "Error: You need a compiler with support for the C++11 standard"
++    print("Error: You need a compiler with support for the C++11 standard")
+     Exit(1)
+ 
+ 
+@@ -170,7 +170,7 @@ if (not zlib_okay) and conf.CheckLib("z") :
+ if zlib_okay :
+     env["ZLIB_FLAGS"] = zlib_flags
+ elif not env.get("zlib_bundled_enable", True) :
+-    print "Error: Zlib not found and zlib_bundled_enable is false"
++    print("Error: Zlib not found and zlib_bundled_enable is false")
+     Exit(1)
+ else :
+     env["ZLIB_BUNDLED"] = True
+@@ -238,7 +238,7 @@ if not env.get("boost_force_bundled") and allLibsPresent :
+         # FIXME: Remove this workaround when UUID is available in most distros
+         env["BOOST_BUNDLED_UUID_ONLY"] = True
+ elif not env.get("boost_bundled_enable", True) :
+-    print "Error: Boost not found and boost_bundled_enable is false"
++    print("Error: Boost not found and boost_bundled_enable is false")
+     Exit(1)
+ else :
+     env["BOOST_BUNDLED"] = True
+@@ -373,7 +373,7 @@ if env.get("try_expat", True) and not env.get("HAVE_LIBXML",0) :
+ # Bundled expat
+ bundledExpat = False
+ if not env.get("HAVE_EXPAT", 0) and not env.get("HAVE_LIBXML", 0) :
+-    print "Expat or LibXML not found. Using bundled Expat"
++    print("Expat or LibXML not found. Using bundled Expat")
+     SConscript("#/3rdParty/Expat/SConscript")
+     env["HAVE_EXPAT"] = 1
+     env["EXPAT_BUNDLED"] = True
+@@ -424,10 +424,10 @@ if not env.get("HAVE_ICU", False) and not env.get("HAVE_LIBIDN", False) :
+         env["HAVE_LIBIDN"] = 1
+         env["LIBIDN_BUNDLED"] = 1
+     elif env.get("need_idn", True):
+-        print "Error: ICU and LIBIDN not found, and libidn_bundled_enable is false"
++        print("Error: ICU and LIBIDN not found, and libidn_bundled_enable is false")
+         Exit(1)
+     else:
+-        print "Proceeding without an IDN library because need_idn was false. This will break all internal binaries"
++        print("Proceeding without an IDN library because need_idn was false. This will break all internal binaries")
+ 
+ # Unbound
+ if env["unbound"] :
+@@ -514,7 +514,7 @@ if not env.get("lua_force_bundled", False) and conf.CheckLibWithHeader(env["lua_
+     if lua_version > 0 :
+         env["LUA_FLAGS"]["LUA_VERSION"] = str(lua_version // 100) + "." + str(lua_version % 100)
+     else :
+-        print "Warning: Unable to determine Lua version. Not installing Lua libraries."
++        print("Warning: Unable to determine Lua version. Not installing Lua libraries.")
+     env["LUA_FLAGS"].update(lua_flags)
+ else :
+     env["LUA_BUNDLED"] = 1
+@@ -666,7 +666,7 @@ try :
+ except SCons.Errors.StopError:
+     env["HAVE_QT"] = False
+ except Exception as e:
+-    print "Info: %s" % str(e)
++    print("Info: %s" % str(e))
+     env["HAVE_QT"] = False
+ 
+ ################################################################################
+@@ -688,7 +688,7 @@ try:
+         if not env.GetOption("clean") and env.get("install_git_hooks", True) :
+             env.Install("#/.git/hooks", Glob("#/BuildTools/Git/Hooks/*"))
+ except TypeError:
+-    print "You seem to be using Swift in a Git submodule. Not installing hooks."
++    print("You seem to be using Swift in a Git submodule. Not installing hooks.")
+ 
+ 
+ ################################################################################
+@@ -752,7 +752,7 @@ modules.append("QA")
+ env["PROJECTS"] = [m for m in modules if m not in ["Documentation", "QA", "SwifTools"] and not m.startswith("3rdParty")]
+ for stage in ["flags", "build"] :
+     env["SCONS_STAGE"] = stage
+-    SConscript(dirs = map(lambda x : root + "/" + x, modules))
++    SConscript(dirs = list(map(lambda x : root + "/" + x, modules)))
+ 
+ # SLOCCount
+ if ARGUMENTS.get("sloccount", False) :
+@@ -764,9 +764,9 @@ if ARGUMENTS.get("sloccount", False) :
+ # Print summary
+ ################################################################################
+ 
+-print
+-print "  Build Configuration"
+-print "  -------------------"
++print("")
++print("  Build Configuration")
++print("  -------------------")
+ 
+ parsers = []
+ if env.get("HAVE_LIBXML", 0):
+@@ -775,14 +775,14 @@ if env.get("HAVE_EXPAT", 0):
+     parsers.append("Expat")
+     if env.get("EXPAT_BUNDLED", False) :
+         parsers.append("(Bundled)")
+-print "  Projects: " + ' '.join(env["PROJECTS"])
+-print ""
+-print "  XML Parsers: " + ' '.join(parsers)
++print("  Projects: " + ' '.join(env["PROJECTS"]))
++print("")
++print("  XML Parsers: " + ' '.join(parsers))
+ 
+-print "  TLS Support: " + (env.get("HAVE_OPENSSL",0) and "OpenSSL" or env.get("HAVE_SECURETRANSPORT",0) and "Secure Transport" or env.get("HAVE_SCHANNEL", 0) and "Schannel" or "Disabled")
+-print "  DNSSD Support: " + (env.get("HAVE_BONJOUR") and "Bonjour" or (env.get("HAVE_AVAHI") and "Avahi" or "Disabled"))
+-print
++print("  TLS Support: " + (env.get("HAVE_OPENSSL",0) and "OpenSSL" or env.get("HAVE_SECURETRANSPORT",0) and "Secure Transport" or env.get("HAVE_SCHANNEL", 0) and "Schannel" or "Disabled"))
++print("  DNSSD Support: " + (env.get("HAVE_BONJOUR") and "Bonjour" or (env.get("HAVE_AVAHI") and "Avahi" or "Disabled")))
++print("")
+ 
+ if not GetOption("help") and not env.get("HAVE_OPENSSL", 0) and not env.get("HAVE_SCHANNEL", 0) and not env.get("HAVE_SECURETRANSPORT", 0):
+-    print "Error: A working TLS backend is required. Please check the documentation for more information."
++    print("Error: A working TLS backend is required. Please check the documentation for more information.")
+     Exit(1)
+diff --git a/BuildTools/SCons/Tools/AppBundle.py b/BuildTools/SCons/Tools/AppBundle.py
+index 337e83f7c..31cfef109 100644
+--- a/BuildTools/SCons/Tools/AppBundle.py
++++ b/BuildTools/SCons/Tools/AppBundle.py
+@@ -34,7 +34,7 @@ def generate(env) :
+     """
+         for key, value in infoDict.items() :
+             plist += "<key>" + key + "</key>\n"
+-            plist += "<string>" + value.encode("utf-8") + "</string>\n"
++            plist += "<string>" + value + "</string>\n"
+         if handlesXMPPURIs :
+             plist += """<key>CFBundleURLTypes</key>
+ <array>
+@@ -50,7 +50,7 @@ def generate(env) :
+ 
+         if sparklePublicDSAKey :
+             plist += "<key>SUPublicDSAKeyFile</key>"
+-            plist += "<string>" + sparklePublicDSAKey.name.encode("utf-8") + "</string>"
++            plist += "<string>" + sparklePublicDSAKey.name + "</string>"
+             env.Install(resourcesDir, sparklePublicDSAKey)
+         plist += """</dict>
+     </plist>
+diff --git a/BuildTools/SCons/Tools/InstallWithSymLinks.py b/BuildTools/SCons/Tools/InstallWithSymLinks.py
+index 23d12ed80..495519210 100644
+--- a/BuildTools/SCons/Tools/InstallWithSymLinks.py
++++ b/BuildTools/SCons/Tools/InstallWithSymLinks.py
+@@ -74,21 +74,21 @@ def scons_copytree(src, dst, symlinks=False):
+             else:
+                 shutil.copy2(srcname, dstname)
+             # XXX What about devices, sockets etc.?
+-        except (IOError, os.error), why:
++        except (IOError, os.error) as why:
+             errors.append((srcname, dstname, str(why)))
+         # catch the CopytreeError from the recursive copytree so that we can
+         # continue with other files
+-        except CopytreeError, err:
++        except CopytreeError as err:
+             errors.extend(err.args[0])
+     try:
+         shutil.copystat(src, dst)
+     except WindowsError:
+         # can't copy file access times on Windows
+         pass
+-    except OSError, why:
++    except OSError as why:
+         errors.extend((src, dst, str(why)))
+     if errors:
+-        raise CopytreeError, errors
++        raise CopytreeError(errors)
+ 
+ 
+ def symlinkBuilderImpl(target, source, env):
+diff --git a/BuildTools/SCons/Tools/qt4.py b/BuildTools/SCons/Tools/qt4.py
+index d5c14e20c..c97e751bc 100644
+--- a/BuildTools/SCons/Tools/qt4.py
++++ b/BuildTools/SCons/Tools/qt4.py
+@@ -137,23 +137,23 @@ class _Automoc:
+         out_sources = source[:]
+ 
+         for obj in source:
+-            if isinstance(obj,basestring):  # big kludge!
+-                print "scons: qt4: '%s' MAYBE USING AN OLD SCONS VERSION AND NOT CONVERTED TO 'File'. Discarded." % str(obj)
++            if isinstance(obj,str):  # big kludge!
++                print("scons: qt4: '%s' MAYBE USING AN OLD SCONS VERSION AND NOT CONVERTED TO 'File'. Discarded." % str(obj))
+                 continue
+             if not obj.has_builder():
+                 # binary obj file provided
+                 if debug:
+-                    print "scons: qt: '%s' seems to be a binary. Discarded." % str(obj)
++                    print("scons: qt: '%s' seems to be a binary. Discarded." % str(obj))
+                 continue
+             cpp = obj.sources[0]
+             if not splitext(str(cpp))[1] in cxx_suffixes:
+                 if debug:
+-                    print "scons: qt: '%s' is no cxx file. Discarded." % str(cpp) 
++                    print("scons: qt: '%s' is no cxx file. Discarded." % str(cpp) )
+                 # c or fortran source
+                 continue
+             #cpp_contents = comment.sub('', cpp.get_contents())
+             try:
+-                cpp_contents = cpp.get_contents()
++                cpp_contents = str(cpp.get_contents())
+             except: continue # may be an still not generated source
+             h=None
+             for h_ext in header_extensions:
+@@ -163,12 +163,12 @@ class _Automoc:
+                 h = find_file(hname, (cpp.get_dir(),), env.File)
+                 if h:
+                     if debug:
+-                        print "scons: qt: Scanning '%s' (header of '%s')" % (str(h), str(cpp))
++                        print("scons: qt: Scanning '%s' (header of '%s')" % (str(h), str(cpp)))
+                     #h_contents = comment.sub('', h.get_contents())
+-                    h_contents = h.get_contents()
++                    h_contents = str(h.get_contents())
+                     break
+             if not h and debug:
+-                print "scons: qt: no header for '%s'." % (str(cpp))
++                print("scons: qt: no header for '%s'." % (str(cpp)))
+             if h and q_object_search.search(h_contents):
+                 # h file with the Q_OBJECT macro found -> add moc_cpp
+                 moc_cpp = env.Moc4(h)
+@@ -176,14 +176,14 @@ class _Automoc:
+                 out_sources.append(moc_o)
+                 #moc_cpp.target_scanner = SCons.Defaults.CScan
+                 if debug:
+-                    print "scons: qt: found Q_OBJECT macro in '%s', moc'ing to '%s'" % (str(h), str(moc_cpp))
++                    print("scons: qt: found Q_OBJECT macro in '%s', moc'ing to '%s'" % (str(h), str(moc_cpp)))
+             if cpp and q_object_search.search(cpp_contents):
+                 # cpp file with Q_OBJECT macro found -> add moc
+                 # (to be included in cpp)
+                 moc = env.Moc4(cpp)
+                 env.Ignore(moc, moc)
+                 if debug:
+-                    print "scons: qt: found Q_OBJECT macro in '%s', moc'ing to '%s'" % (str(cpp), str(moc))
++                    print("scons: qt: found Q_OBJECT macro in '%s', moc'ing to '%s'" % (str(cpp), str(moc)))
+                 #moc.source_scanner = SCons.Defaults.CScan
+         # restore the original env attributes (FIXME)
+         objBuilder.env = objBuilderEnv
+@@ -344,7 +344,7 @@ def generate(env):
+                 else:
+                     result.append(itemPath)
+             return result
+-        contents = node.get_contents()
++        contents = str(node.get_contents())
+         includes = [included[1] for included in qrcinclude_re.findall(contents)]
+         qrcpath = os.path.dirname(node.path)
+         dirs = [included for included in includes if os.path.isdir(os.path.join(qrcpath,included))]
+diff --git a/BuildTools/SCons/Tools/textfile.py b/BuildTools/SCons/Tools/textfile.py
+index cc5866693..c19bdf917 100644
+--- a/BuildTools/SCons/Tools/textfile.py
++++ b/BuildTools/SCons/Tools/textfile.py
+@@ -107,7 +107,7 @@ def _action(target, source, env):
+     # write the file
+     try:
+         fd = open(target[0].get_path(), "wb")
+-    except (OSError,IOError), e:
++    except (OSError,IOError) as e:
+         raise SCons.Errors.UserError("Can't write target file %s" % target[0])
+     # separate lines by 'linesep' only if linesep is not empty
+     lsep = None
+diff --git a/BuildTools/SCons/Version.py b/BuildTools/SCons/Version.py
+index f215a5d6d..9021831f2 100644
+--- a/BuildTools/SCons/Version.py
++++ b/BuildTools/SCons/Version.py
+@@ -6,7 +6,7 @@ def getGitBuildVersion(root, project) :
+         return tag.rstrip()[len(project)+1:]
+     tag = git("describe --tags --match \"" + project + "-*\"", root)
+     if tag :
+-        m = re.match(project + "-(.*)-(.*)-(.*)", tag)
++        m = re.match(project + "-(.*)-(.*)-(.*)", tag.decode('utf-8'))
+         if m :
+             return m.group(1) + "-dev" + m.group(2)
+     return None
+@@ -17,7 +17,7 @@ def git(cmd, root) :
+     gitVersion = p.stdout.read()
+     # error = p.stderr.read()
+     # if error:
+-    #   print "Git error: " + error
++    #   print("Git error: " + error)
+     p.stdin.close()
+     if p.wait() == 0 :
+         return gitVersion
+@@ -163,7 +163,7 @@ class convertToWindowsVersionTest(unittest.TestCase):
+             ('3.0alpha-dev524', (3, 0, 524)),
+             ('3.0alpha-dev515', (3, 0, 515)),
+         ]
+-        windowsVersionMapping = list(map(lambda (x,y): (x, convertToWindowsVersion(x)), versionStringsWithOldVersions))
++        windowsVersionMapping = list(map(lambda x,y: (x, convertToWindowsVersion(x)), versionStringsWithOldVersions))
+ 
+     def testThatBetaIsHigherThanAlpha(self):
+         self.assertTrue(convertToWindowsVersion("3.0beta0") > convertToWindowsVersion("3.0alpha0"))
+@@ -194,8 +194,8 @@ if __name__ == '__main__':
+     if len(sys.argv) == 1:
+         unittest.main()
+     elif len(sys.argv) == 2:
+-        print convertToWindowsVersion(sys.argv[1])
++        print (convertToWindowsVersion(sys.argv[1]))
+         sys.exit(0)
+     else:
+-        print "Error: Simply run the script without arguments or pass a single argument."
++        print ("Error: Simply run the script without arguments or pass a single argument.")
+         sys.exit(-1)
+diff --git a/BuildTools/scons2ninja.py b/BuildTools/scons2ninja.py
+index 6c77c8897..855a1339e 100755
+--- a/BuildTools/scons2ninja.py
++++ b/BuildTools/scons2ninja.py
+@@ -429,7 +429,7 @@ for line in f.stdout :
+         previous_filename = filename
+ 
+ if f.wait() != 0 :
+-    print "Error calling '" + scons_generate_cmd + "'"
++    print("Error calling '" + scons_generate_cmd + "'")
+     print f.stderr.read()
+     exit(-1)
+ 
+diff --git a/Slimber/SConscript b/Slimber/SConscript
+index a41fe0b6d..fa5aa53b2 100644
+--- a/Slimber/SConscript
++++ b/Slimber/SConscript
+@@ -11,10 +11,10 @@ elif env["PLATFORM"] != "darwin" :
+         env["PROJECTS"].remove("Slimber")
+ 
+ if not "Slimber" in env["PROJECTS"] and env["SCONS_STAGE"] == "flags" :
+-        print "Bonjour missing. Not building Slimber."
++        print("Bonjour missing. Not building Slimber.")
+ 
+ if not env.get("HAVE_QT", False) and "Slimber" in env["PROJECTS"] :
+-    print "Qt missing. Not building Slimber."
++    print("Qt missing. Not building Slimber.")
+     env["PROJECTS"].remove("Slimber")
+ 
+ if "Slimber" in env["PROJECTS"] :
+diff --git a/Sluift/SConscript b/Sluift/SConscript
+index de9cab618..af54ece20 100644
+--- a/Sluift/SConscript
++++ b/Sluift/SConscript
+@@ -3,7 +3,7 @@ import Version, os.path
+ Import(["env"])
+ 
+ if env["SCONS_STAGE"] == "build" and not GetOption("help") and not env.get("HAVE_LUA", 0) :
+-    print "Warning: Lua was not found. Sluift will not be built."
++    print("Warning: Lua was not found. Sluift will not be built.")
+     if "Sluift" in env["PROJECTS"] :
+         env["PROJECTS"].remove("Sluift")
+ 
+diff --git a/Swift/Packaging/SConscript b/Swift/Packaging/SConscript
+index 3aa791fa8..556c59652 100644
+--- a/Swift/Packaging/SConscript
++++ b/Swift/Packaging/SConscript
+@@ -25,5 +25,5 @@ if env["SCONS_STAGE"] == "build" :
+             target='$HELP2MAN_DEBIAN_DIR/swift-im.1', source='#/Swift/QtUI/swift-im',
+             action = Action('$HELP2MAN --no-discard-stderr -m "Swift Manual" -S "Swift" -n "swift-im" -N $SOURCE > $TARGET', cmdstr = "$HELP2MANSTR"))
+     else:
+-        print "Enabled help2man but help2man is not in the PATH of the current environment."
++        print("Enabled help2man but help2man is not in the PATH of the current environment.")
+         Exit(1)
+diff --git a/Swift/QtUI/SConscript b/Swift/QtUI/SConscript
+index 54f0450c0..cc51340b3 100644
+--- a/Swift/QtUI/SConscript
++++ b/Swift/QtUI/SConscript
+@@ -22,7 +22,7 @@ Import("env")
+ myenv = env.Clone()
+ 
+ # Disable warnings that affect Qt
+-myenv["CXXFLAGS"] = filter(lambda x : x != "-Wfloat-equal", myenv["CXXFLAGS"])
++myenv["CXXFLAGS"] = list(filter(lambda x : x != "-Wfloat-equal", myenv["CXXFLAGS"]))
+ if "clang" in env["CC"] :
+     myenv.Append(CXXFLAGS = ["-Wno-float-equal", "-Wno-shorten-64-to-32", "-Wno-missing-prototypes", "-Wno-unreachable-code", "-Wno-disabled-macro-expansion", "-Wno-unused-private-field", "-Wno-extra-semi", "-Wno-duplicate-enum", "-Wno-missing-variable-declarations", "-Wno-conversion", "-Wno-undefined-reinterpret-cast"])
+ 
+@@ -496,16 +496,16 @@ if env["PLATFORM"] == "win32" :
+                 def signToolAction(target = None, source = None, env = None):
+                     signresult = 0
+                     for x in range (1, 4) :
+-                        print "Attemping to sign the packages [%s]" % x
++                        print("Attemping to sign the packages [%s]" % x)
+                         signresult = env.Execute('signtool.exe sign /fd SHA256 /f "${SIGNTOOL_KEY_PFX}" /t "${SIGNTOOL_TIMESTAMP_URL}" /d "Swift Installer" ' + str(target[0]))
+                         if signresult != 1 :
+                             break
+                     #If all 3 attemps to sign the package failed, stop the build.
+                     if signresult == 1 :
+-                        print "Error: The build has failed to sign the installer package"
++                        print("Error: The build has failed to sign the installer package")
+                         Exit(1)
+                     if signresult == 2 :
+-                        print "Signing was completed with warnings."
++                        print("Signing was completed with warnings.")
+ 
+                 myenv.AddPostAction(lightTask, signToolAction)
+ 
+diff --git a/Swift/SConscript b/Swift/SConscript
+index b211435ac..30b09e008 100644
+--- a/Swift/SConscript
++++ b/Swift/SConscript
+@@ -7,17 +7,17 @@ SConscript("Controllers/SConscript")
+ if env["SCONS_STAGE"] == "build" :
+     if not GetOption("help") and not env.get("HAVE_QT", 0) :
+         if "Swift" in env["PROJECTS"] :
+-            print "Warning: Swift requires Qt. Not building the Swift Qt application."
++            print("Warning: Swift requires Qt. Not building the Swift Qt application.")
+             env["PROJECTS"].remove("Swift")
+     elif not GetOption("help") and env["target"] == "native" and "Swift" in env["PROJECTS"] :
+         try :
+             SConscript("QtUI/SConscript")
+         except Exception as e:
+-            print "Warning: %s" % str(e)
++            print("Warning: %s" % str(e))
+             env["PROJECTS"].remove("Swift")
+ if "Swift" in env["PROJECTS"] and env["BOOST_1_64_DETECTED"] and not env.get("allow_boost_1_64") and not env.GetOption("clean") :
+     #Version 1.64 has some issues with the serialization of boost::optional, see https://svn.boost.org/trac10/ticket/13050
+-    print "Boost 1.64 has been detected. It is not recommended to use this version due to a regression within the library. Swift has been removed from the current build. You can still use this version by setting allow_boost_1_64 to true, but recent chats and highlighting rules will reset."
++    print("Boost 1.64 has been detected. It is not recommended to use this version due to a regression within the library. Swift has been removed from the current build. You can still use this version by setting allow_boost_1_64 to true, but recent chats and highlighting rules will reset.")
+     env["PROJECTS"].remove("Swift")
+ if env["help2man"]:
+     SConscript("Packaging/SConscript")
+\ No newline at end of file
+diff --git a/BuildTools/SCons/Tools/Flags.py b/BuildTools/SCons/Tools/Flags.py
+index fe0cfcc54..7e0a9723b 100644
+--- a/BuildTools/SCons/Tools/Flags.py
++++ b/BuildTools/SCons/Tools/Flags.py
+@@ -4,7 +4,7 @@ def generate(env) :
+     def useFlags(env, flags) :
+         for flag in flags :
+             if flag in env :
+-                env[flag] = env[flag] + flags[flag]
++                env[flag] = list(env[flag]) + flags[flag]
+             else :
+                 env[flag] = flags[flag]
+     env.AddMethod(useFlags, "UseFlags")
+diff --git a/BuildTools/SCons/Tools/qt4.py b/BuildTools/SCons/Tools/qt4.py
+index d5c14e20c..a19e35e2a 100644
+--- a/BuildTools/SCons/Tools/qt4.py
++++ b/BuildTools/SCons/Tools/qt4.py
+@@ -46,7 +47,7 @@ import SCons.Tool
+ import SCons.Util
+ import SCons.SConf
+ 
+-class ToolQtWarning(SCons.Warnings.Warning):
++class ToolQtWarning(SCons.Warnings.SConsWarning):
+     pass
+ 
+ class GeneratedMocFileNotIncluded(ToolQtWarning):
+diff --git a/BuildTools/SCons/Tools/textfile.py b/BuildTools/SCons/Tools/textfile.py
+index cc5866693..ac9b83f9f 100644
+--- a/BuildTools/SCons/Tools/textfile.py
++++ b/BuildTools/SCons/Tools/textfile.py
+@@ -106,7 +106,7 @@ def _action(target, source, env):
+ 
+     # write the file
+     try:
+-        fd = open(target[0].get_path(), "wb")
++        fd = open(target[0].get_path(), "w")
+     except (OSError,IOError) as e:
+         raise SCons.Errors.UserError("Can't write target file %s" % target[0])
+     # separate lines by 'linesep' only if linesep is not empty
diff --git a/network/swift/swift.SlackBuild b/network/swift/swift.SlackBuild
new file mode 100644
index 0000000000..632f294eb2
--- /dev/null
+++ b/network/swift/swift.SlackBuild
@@ -0,0 +1,125 @@
+#!/bin/bash
+
+# Slackware build script for swift
+
+# 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=swift
+VERSION=${VERSION:-4.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 the variable PRINT_PACKAGE_NAME is set, then this script will report what
+# the name of the created package would be, and then exit. This information
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; 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 {} +
+set -x 
+patch -p1 -i $CWD/swift-4.0.2-boost-1.69-compatibility.patch
+#patch -p1 -i $CWD/swift-4.0.2-qt-5.11-compatibility.patch
+patch -p1 -i $CWD/swift-4.0.2-qt-5.15-compatibility.patch
+patch -p1 -i $CWD/swift-python3.patch
+patch -p1 -i $CWD/swift-gcc11.patch
+sed -i 's/fd.write(_do_subst(s, subs).encode("utf-8"))/fd.write(_do_subst(s, subs))/g' BuildTools/SCons/Tools/textfile.py
+scons \
+      max_jobs=1 \
+      optimize=1 \
+      debug=0 \
+      swiften_dll=1 \
+      cflags="${SLKCFLAGS} -fpermissive" \
+      cxxflags="${SLKCFLAGS} -fpermissive" \
+      install_root=$PKG/usr \
+      prefix=/usr \
+      SWIFT_INSTALLDIR=$PKG/usr \
+      SWIFTEN_INSTALLDIR=$PKG/usr \
+      $PKG \
+ Swift Swiften
+
+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 \
+  COPYING COPYING.gpl DEVELOPMENT.md  README.md COPYING.dependencies  COPYING.thirdparty  Documentation/  \
+  $PKG/usr/doc/$PRGNAM-$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/network/swift/swift.info b/network/swift/swift.info
new file mode 100644
index 0000000000..fd0b5baae3
--- /dev/null
+++ b/network/swift/swift.info
@@ -0,0 +1,10 @@
+PRGNAM="swift"
+VERSION="4.0.3"
+HOMEPAGE="https://swift.im"
+DOWNLOAD="https://swift.im/git/swift/snapshot/swift-4.0.3.tar.bz2"
+MD5SUM="a2e2f93c9b23f8af334910c42d519c7a"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="avahi"
+MAINTAINER="Lockywolf"
+EMAIL="for_sbo.swift_2023-09-23@lockywolf.net"
diff --git a/network/sylpheed/README b/network/sylpheed/README
index 3b53515173..7e6fecd0b5 100644
--- a/network/sylpheed/README
+++ b/network/sylpheed/README
@@ -1,5 +1,5 @@
-Sylpheed is a simple, lightweight but featureful, and easy-to-use e-mail 
-client (mailer, MUA).
+Sylpheed is a simple, lightweight but featureful, and easy-to-use
+e-mail client (mailer, MUA).
 
 Sylpheed has the following features:
 
diff --git a/network/sylpheed/sylpheed.SlackBuild b/network/sylpheed/sylpheed.SlackBuild
index 812659644a..eb0b55c8cd 100644
--- a/network/sylpheed/sylpheed.SlackBuild
+++ b/network/sylpheed/sylpheed.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 #
 # Slackware build script for sylpheed
 #
@@ -24,20 +24,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=sylpheed
 VERSION=${VERSION:-3.7.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}
@@ -47,8 +57,8 @@ DOCS="ABOUT-NLS AUTHORS COPYING COPYING.LIB
 
 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"
@@ -69,10 +79,14 @@ 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 {} \;
+
+# Thanks to archlinux!
+sed -i 's|enchant/|enchant-2/|g' src/compose.c
+sed -i 's| enchant| enchant-2|g' configure
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
@@ -88,6 +102,7 @@ CXXFLAGS="$SLKCFLAGS" \
 
 make
 make install-strip DESTDIR=$PKG
+rm -rf $PKG/usr/lib${LIBDIRSUFFIX}/*.la
 
 # Install desktop file and icon  (we'll use the largest icon available by
 # default - that way, it will scale down just fine for users who need a
@@ -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/network/syncterm/0002-use-sched-yield-53264f2b.diff b/network/syncterm/0002-use-sched-yield-53264f2b.diff
new file mode 100644
index 0000000000..7b18f3659e
--- /dev/null
+++ b/network/syncterm/0002-use-sched-yield-53264f2b.diff
@@ -0,0 +1,38 @@
+diff --git a/3rdp/build/GNUmakefile b/3rdp/build/GNUmakefile
+index fdf54565834a6a418f7267f4f8bf2269b80eab41..804dd76feb1a2d3b0278686f5326f7c2302e5fde 100644
+--- a/3rdp/build/GNUmakefile
++++ b/3rdp/build/GNUmakefile
+@@ -67,7 +67,7 @@
+ $(CRYPT_IDIR): | $(3RDPODIR)
+ 	$(QUIET)$(IFNOTEXIST) mkdir $(CRYPT_IDIR)
+
+-$(CRYPTLIB_BUILD): $(3RDP_ROOT)$(DIRSEP)dist/cryptlib.zip $(3RDP_ROOT)$(DIRSEP)build/terminal-params.patch $(3RDP_ROOT)$(DIRSEP)build/cl-mingw32-static.patch $(3RDP_ROOT)$(DIRSEP)build/cl-ranlib.patch $(3RDP_ROOT)$(DIRSEP)build/cl-win32-noasm.patch $(3RDP_ROOT)$(DIRSEP)build/cl-zz-country.patch $(3RDP_ROOT)$(DIRSEP)build/cl-algorithms.patch $(3RDP_ROOT)$(DIRSEP)build/cl-allow-duplicate-ext.patch $(3RDP_ROOT)$(DIRSEP)build/cl-macosx-minver.patch $(3RDP_ROOT)$(DIRSEP)build/cl-endian.patch $(3RDP_ROOT)$(DIRSEP)build/cl-cryptodev.patch $(3RDP_ROOT)$(DIRSEP)build/cl-posix-me-gently.patch $(3RDP_ROOT)$(DIRSEP)build/cl-tpm-linux.patch $(3RDP_ROOT)$(DIRSEP)build/cl-PAM-noprompts.patch $(3RDP_ROOT)$(DIRSEP)build/cl-zlib.patch $(3RDP_ROOT)$(DIRSEP)build/Dynamic-linked-static-lib.patch $(3RDP_ROOT)$(DIRSEP)build/SSL-fix.patch $(3RDP_ROOT)$(DIRSEP)build/cl-bigger-maxattribute.patch $(3RDP_ROOT)$(DIRSEP)build/cl-vcxproj.patch $(3RDP_ROOT)$(DIRSEP)build/cl-mingw-vcver.patch $(3RDP_ROOT)$(DIRSEP)build/cl-win32-build-fix.patch $(3RDP_ROOT)$(DIRSEP)build/cl-gcc-non-const-time-val.patch $(3RDP_ROOT)$(DIRSEP)build/cl-no-odbc.patch $(3RDP_ROOT)$(DIRSEP)build/cl-noasm-defines.patch $(3RDP_ROOT)$(DIRSEP)build/cl-bn-noasm64-fix.patch $(3RDP_ROOT)$(DIRSEP)build/cl-no-RSA-suites.patch $(3RDP_ROOT)$(DIRSEP)build/cl-fix-ECC-RSA.patch $(3RDP_ROOT)$(DIRSEP)build/cl-prefer-ECC.patch $(3RDP_ROOT)$(DIRSEP)build/cl-prefer-ECC-harder.patch $(3RDP_ROOT)$(DIRSEP)build/cl-more-RSA-ECC-fixes.patch $(3RDP_ROOT)$(DIRSEP)build/cl-DH-key-init.patch $(3RDP_ROOT)$(DIRSEP)build/cl-clear-GCM-flag.patch $(3RDP_ROOT)$(DIRSEP)build/cl-use-ssh-ctr.patch $(3RDP_ROOT)$(DIRSEP)build/cl-ssh-list-ctr-modes.patch $(3RDP_ROOT)$(DIRSEP)build/cl-ssh-incCtr.patch $(3RDP_ROOT)$(DIRSEP)build/cl-ssl-suite-blocksizes.patch $(3RDP_ROOT)$(DIRSEP)build/cl-no-tpm.patch $(3RDP_ROOT)$(DIRSEP)build/cl-no-via-aes.patch $(3RDP_ROOT)$(DIRSEP)build/cl-fix-ssh-ecc-ephemeral.patch $(3RDP_ROOT)$(DIRSEP)/build/cl-just-use-cc.patch $(3RDP_ROOT)$(DIRSEP)/build/cl-learn-numbers.patch | $(CRYPT_SRC) $(CRYPT_IDIR)
++$(CRYPTLIB_BUILD): $(3RDP_ROOT)$(DIRSEP)dist/cryptlib.zip $(3RDP_ROOT)$(DIRSEP)build/terminal-params.patch $(3RDP_ROOT)$(DIRSEP)build/cl-mingw32-static.patch $(3RDP_ROOT)$(DIRSEP)build/cl-ranlib.patch $(3RDP_ROOT)$(DIRSEP)build/cl-win32-noasm.patch $(3RDP_ROOT)$(DIRSEP)build/cl-zz-country.patch $(3RDP_ROOT)$(DIRSEP)build/cl-algorithms.patch $(3RDP_ROOT)$(DIRSEP)build/cl-allow-duplicate-ext.patch $(3RDP_ROOT)$(DIRSEP)build/cl-macosx-minver.patch $(3RDP_ROOT)$(DIRSEP)build/cl-endian.patch $(3RDP_ROOT)$(DIRSEP)build/cl-cryptodev.patch $(3RDP_ROOT)$(DIRSEP)build/cl-posix-me-gently.patch $(3RDP_ROOT)$(DIRSEP)build/cl-tpm-linux.patch $(3RDP_ROOT)$(DIRSEP)build/cl-PAM-noprompts.patch $(3RDP_ROOT)$(DIRSEP)build/cl-zlib.patch $(3RDP_ROOT)$(DIRSEP)build/Dynamic-linked-static-lib.patch $(3RDP_ROOT)$(DIRSEP)build/SSL-fix.patch $(3RDP_ROOT)$(DIRSEP)build/cl-bigger-maxattribute.patch $(3RDP_ROOT)$(DIRSEP)build/cl-vcxproj.patch $(3RDP_ROOT)$(DIRSEP)build/cl-mingw-vcver.patch $(3RDP_ROOT)$(DIRSEP)build/cl-win32-build-fix.patch $(3RDP_ROOT)$(DIRSEP)build/cl-gcc-non-const-time-val.patch $(3RDP_ROOT)$(DIRSEP)build/cl-no-odbc.patch $(3RDP_ROOT)$(DIRSEP)build/cl-noasm-defines.patch $(3RDP_ROOT)$(DIRSEP)build/cl-bn-noasm64-fix.patch $(3RDP_ROOT)$(DIRSEP)build/cl-no-RSA-suites.patch $(3RDP_ROOT)$(DIRSEP)build/cl-fix-ECC-RSA.patch $(3RDP_ROOT)$(DIRSEP)build/cl-prefer-ECC.patch $(3RDP_ROOT)$(DIRSEP)build/cl-prefer-ECC-harder.patch $(3RDP_ROOT)$(DIRSEP)build/cl-more-RSA-ECC-fixes.patch $(3RDP_ROOT)$(DIRSEP)build/cl-DH-key-init.patch $(3RDP_ROOT)$(DIRSEP)build/cl-clear-GCM-flag.patch $(3RDP_ROOT)$(DIRSEP)build/cl-use-ssh-ctr.patch $(3RDP_ROOT)$(DIRSEP)build/cl-ssh-list-ctr-modes.patch $(3RDP_ROOT)$(DIRSEP)build/cl-ssh-incCtr.patch $(3RDP_ROOT)$(DIRSEP)build/cl-ssl-suite-blocksizes.patch $(3RDP_ROOT)$(DIRSEP)build/cl-no-tpm.patch $(3RDP_ROOT)$(DIRSEP)build/cl-no-via-aes.patch $(3RDP_ROOT)$(DIRSEP)build/cl-fix-ssh-ecc-ephemeral.patch $(3RDP_ROOT)$(DIRSEP)/build/cl-just-use-cc.patch $(3RDP_ROOT)$(DIRSEP)/build/cl-learn-numbers.patch $(3RDP_ROOT)/build/cl-linux-yield.patch | $(CRYPT_SRC) $(CRYPT_IDIR)
+ 	@echo Creating $@ ...
+ 	$(QUIET)-rm -rf $(CRYPT_SRC)/*
+ 	$(QUIET)unzip -oa $(3RDPDISTDIR)$(DIRSEP)cryptlib.zip -d $(CRYPT_SRC)
+@@ -112,6 +112,7 @@
+ 	$(QUIET)patch -p0 -d $(CRYPT_SRC) < cl-fix-ssh-ecc-ephemeral.patch
+ 	$(QUIET)patch -p0 -d $(CRYPT_SRC) < cl-just-use-cc.patch
+ 	$(QUIET)patch -p0 -d $(CRYPT_SRC) < cl-learn-numbers.patch
++	$(QUIET)patch -p0 -d $(CRYPT_SRC) < cl-linux-yield.patch
+ ifeq ($(CC),mingw32-gcc)
+ 	$(QUIET)cd $(CRYPT_SRC) && env - PATH="$(PATH)" CC="$(CC)" AR="$(AR)" RANLIB="$(RANLIB)" make directories
+ 	$(QUIET)cd $(CRYPT_SRC) && env - PATH="$(PATH)" CC="$(CC)" AR="$(AR)" RANLIB="$(RANLIB)" make toolscripts
+diff --git a/3rdp/build/cl-linux-yield.patch b/3rdp/build/cl-linux-yield.patch
+new file mode 100644
+index 0000000000000000000000000000000000000000..8cdfc8eafd3fd85f39bf0f8b519f25a31078fee4
+--- /dev/null
++++ b/3rdp/build/cl-linux-yield.patch
+@@ -0,0 +1,11 @@
++--- old/thread.h	2021-10-19 12:34:08.766649958 -0700
+++++ kernel/thread.h	2021-10-19 12:34:43.794072316 -0700
++@@ -3005,7 +3005,7 @@
++   #endif /* Slowaris 5.7 / 7.x or newer */
++ #elif defined( _AIX ) || defined( __Android__ ) || defined( __CYGWIN__ ) || \
++ 	  ( defined( __hpux ) && ( OSVERSION >= 11 ) ) || \
++-	  defined( __NetBSD__ ) || defined( __QNX__ ) || defined( __UCLIBC__ )
+++	  defined( __NetBSD__ ) || defined( __QNX__ ) || defined( __UCLIBC__ ) || defined(__linux__)
++   #define THREAD_YIELD()		sched_yield()
++ #elif defined( __XMK__ )
++   /* The XMK underlying scheduling object is the process context, for which
diff --git a/network/syncterm/README b/network/syncterm/README
new file mode 100644
index 0000000000..1a86f0e9f7
--- /dev/null
+++ b/network/syncterm/README
@@ -0,0 +1,22 @@
+syncterm (BBS-oriented terminal emulator)
+
+syncterm is a terminal emulator that connects to a host via
+dialup modem, raw TCP, telnet, ssh, or rsync. Its user interface is
+similar to ProComm. It's intended for use with BBSes (bulletin board
+systems), and includes support for nonstandard ASCII variants such as
+Atari 8-bit (ATASCII), Commodore 8-bit (PETSCII), and "IBM ANSI" as
+used by MS-DOS.
+
+syncterm can also be used as a local terminal (e.g. like xterm),
+by creating a dialing list entry with address "shell:", command
+"/bin/bash -login" or similar.
+
+Some of the documentation is found only on the website:
+http://syncterm.bbsdev.net/
+
+More information on BBSes can be found here, along with an up-to-date
+list of telnet BBSes:
+https://www.telnetbbsguide.com/
+
+Atari users can download a sycterm.lst full of Atari BBSes here:
+http://sfhqbbs.org/ataribbslist.php
diff --git a/network/syncterm/doinst.sh b/network/syncterm/doinst.sh
new file mode 100644
index 0000000000..65c7e2eeb9
--- /dev/null
+++ b/network/syncterm/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/network/syncterm/extract-icns.sh b/network/syncterm/extract-icns.sh
new file mode 100644
index 0000000000..07c3f41873
--- /dev/null
+++ b/network/syncterm/extract-icns.sh
@@ -0,0 +1,55 @@
+#!/bin/sh
+
+# 20230728 bkw: Extract PNG icons from a mac .icns file, for use
+# with a SlackBuilds.org script.
+
+# They get written to a directory called icons/, with filenames like
+# 32.png, 64.png, etc (the pixel size). After extracting them, you
+# should 'git add icons/*' if you're using git (otherwise, include
+# icons/ in your submission tarball).
+
+# The SlackBuild should include code to install them; see
+# syncterm.SlackBuild for an example. Don't forget to include a
+# doinst.sh.
+
+# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
+# Feel free to use this as part of your own SlackBuild.
+
+# Note that this script shouldn't be included in the package!
+
+die() {
+  echo "$( basename $0 ): $@" 1>&2
+  exit 1
+}
+
+if [ "$1" = "" -o "$2" != "" ]; then
+  die "one argument required, path to *.icns file."
+fi
+
+if ! which icns2png &>/dev/null; then
+  die "icns2png not found in \$PATH. Install libicns."
+fi
+
+if [ -e icons ]; then
+  die "icons/ already exists, not overwriting."
+fi
+
+mkdir -p icons
+cd icons || die "can't create or cd to icons/ dir."
+
+icns2png -x -d 32 "$1" || die "can't extract any icons."
+count=0
+for png in *x32.png; do
+  [ -e $png ] || break
+  size="$( echo $png | cut -d_ -f2 | cut -dx -f1 )"
+  mv $png $size.png
+  : $(( count++ ))
+done
+
+if [ "$count" = "0" ]; then
+  rm -rf ../icons
+  die "failed to extract any icons."
+fi
+
+echo "extracted $count icons:"
+ls
diff --git a/network/syncterm/icons/128.png b/network/syncterm/icons/128.png
new file mode 100644
index 0000000000..eacbee1f6f
--- /dev/null
+++ b/network/syncterm/icons/128.png
diff --git a/network/syncterm/icons/16.png b/network/syncterm/icons/16.png
new file mode 100644
index 0000000000..0be1847afa
--- /dev/null
+++ b/network/syncterm/icons/16.png
diff --git a/network/syncterm/icons/32.png b/network/syncterm/icons/32.png
new file mode 100644
index 0000000000..887b027dfd
--- /dev/null
+++ b/network/syncterm/icons/32.png
diff --git a/network/syncterm/icons/48.png b/network/syncterm/icons/48.png
new file mode 100644
index 0000000000..df9d91f83c
--- /dev/null
+++ b/network/syncterm/icons/48.png
diff --git a/network/syncterm/manpage.diff b/network/syncterm/manpage.diff
new file mode 100644
index 0000000000..7bffad39db
--- /dev/null
+++ b/network/syncterm/manpage.diff
@@ -0,0 +1,55 @@
+diff -Naur syncterm-1.1/src/syncterm/syncterm.man.in syncterm-1.1.patched/src/syncterm/syncterm.man.in
+--- syncterm-1.1/src/syncterm/syncterm.man.in	2020-06-26 19:40:21.000000000 -0400
++++ syncterm-1.1.patched/src/syncterm/syncterm.man.in	2023-07-27 16:48:25.575523339 -0400
+@@ -1,11 +1,14 @@
+-.TH SYNCTERM 1 "27 May 2007"
++.TH SYNCTERM 1 "27 Jul 2023"
+ .SH NAME
+ syncterm \- BBS terminal program
+ .SH SYNOPSIS
+ \fBsyncterm\fP [\-e\fIdly\fP] [\-i\fIifc\fP] [\-l\fIlns\fP] [\-t|\-r|\-h] [\-s] [\fIURL\fP]
+ .SH DESCRIPTION
+ \fBSyncTERM\fP is a terminal program designed specifically for connecting to
+-a Bulletin Board System (\fBBBS\fP)
++a Bulletin Board System (\fBBBS\fP).
++.LP
++[\fIURL\fP] may be an actual URL, a hostname, or the name of
++an entry from the dialing list.
+ .SS Options
+ .IP \fB\-e\fIdly\fR
+ Specify the "escape delay" in milliseconds for curses(3) mode. Since curses
+@@ -96,7 +99,7 @@
+ Specifies the default scheme for \fIURL\fP to be telnet://
+ .IP \fB\-r\fP
+ Specifies the default scheme for \fIURL\fP to be rlogin://
+-.IP \fB\-r\fP
++.IP \fB\-h\fP
+ Specifies the default scheme for \fIURL\fP to be ssh://
+ .IP \fB\-4\fP
+ Only resolve IPv4 addresses
+@@ -112,7 +115,7 @@
+ run-time linking is employed using dlopen(). Using this, it is possible to
+ build a version which will use SDL, and X11 if they are present, but
+ not fail to run if they are not.
+-.SH TEXT MODE CAVAETS
++.SH TEXT MODE CAVEATS
+ When running in one of the text modes such as curses or ANSI, many of the
+ control functions are modified since there is no reliable way to use extra
+ modifier keys. As a result, CTRL-S and CTRL-Q can not be sent to the remote
+@@ -130,12 +133,12 @@
+ a traditional screen mode. As such, filler will be added around the terminal
+ screen. For some display sizes, unpredictable results may occur.
+ .SH FILES
+-.IP \fC%%DESTDIR%%%%PREFIX%%/etc/syncterm.lst\fR
+-The system wide dialing directory.
++.IP /etc/syncterm.lst\fR
++The system wide dialing directory [note: doesn't seem to be used in SyncTERM 1.1].
+ .IP \fC~/.syncterm/syncterm.lst\fR
+-The users dialing directory
++The user's dialing directory
+ .IP \fC~/.syncterm/syncterm.ini\fR
+-The users SyncTERM configuration file
++The user's SyncTERM configuration file
+ .IP \fClibSDL.so\fR
+ When this file exists in the library path, SyncTERM will support the use of SDL
+ for input and output. This file is part of the Simple Directmedia Layer
diff --git a/network/syncterm/slack-desc b/network/syncterm/slack-desc
new file mode 100644
index 0000000000..d0822aa581
--- /dev/null
+++ b/network/syncterm/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+        |-----handy-ruler------------------------------------------------------|
+syncterm: syncterm (BBS-oriented terminal emulator)
+syncterm:
+syncterm: syncterm is a terminal emulator that connects to a host via
+syncterm: dialup modem, raw TCP, telnet, ssh, or rsync. Its user interface is
+syncterm: similar to ProComm. It's intended for use with BBSes (bulletin board
+syncterm: systems), and includes support for nonstandard ASCII variants such as
+syncterm: Atari 8-bit (ATASCII), Commodore 8-bit (PETSCII), and "IBM ANSI" as
+syncterm: used by MS-DOS.
+syncterm:
+syncterm:
+syncterm:
diff --git a/network/syncterm/syncterm.SlackBuild b/network/syncterm/syncterm.SlackBuild
new file mode 100644
index 0000000000..4f746b2568
--- /dev/null
+++ b/network/syncterm/syncterm.SlackBuild
@@ -0,0 +1,159 @@
+#!/bin/bash
+
+# Slackware build script for syncterm
+
+# Written by B. Watson (urchlay@slackware.uk)
+
+# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
+
+# Issues:
+# 1. Figure out why shell: doesn't work on the command line (though
+#    it does, with the ^D "quick connect" option, or by adding it to
+#    the dialing list).
+# 2. How do we use /etc/syncterm.lst? strace shows that syncterm reads it,
+#    but entries there don't show up in the dialing list (not even if there's
+#    no user list). If I could get the system list to work, I'd include an
+#    entry there for a local shell (to work around issue #1). But probably
+#    nobody much cares about using this as an xterm or konsole replacement...
+# Neither of these issues are going to prevent me from submitting this.
+
+# Note: phigan on #atari tells me they're "almost ready" to release 1.2,
+# so this may get updated soon.
+
+# 20240218 bkw: BUILD=2
+# - add compile fix for -current.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=syncterm
+VERSION=${VERSION:-1.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"
+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-src.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 {} +
+
+# Man page: Fix path to dialing list and a couple typos. The path
+# baked into the binary really is /etc/syncterm.lst (not /usr/etc)...
+# although I don't see a way to make syncterm actually use the
+# system-wide dialing list.
+patch -p1 < $CWD/manpage.diff
+
+# 20240218 bkw: fix compilation on -current (or so I am assured). Doesn't
+# hurt anything on 15.0. Patch originally from:
+# https://raw.github.com/nullman/config/master/common/.nixos/pkgs/syncterm/0002-use-sched-yield-53264f2b.diff
+# ...brought to my attention by Joshua E. Roybal via email.
+patch -p1 < $CWD/0002-use-sched-yield-53264f2b.diff
+
+# This is a big hassle: -O3 is hardcoded in a makefile... which is
+# inside a zip file. To force our flags, we have to extract the zip
+# file, mod the makefile, then re-zip it. Using -0 with zip means
+# "store" (for speed).
+cd 3rdp/dist
+unzip -oa cryptlib.zip
+rm -f cryptlib.zip
+sed -i "s,-O3,$SLKCFLAGS," makefile
+zip -0r cryptlib.zip *
+cd -
+
+# Rest of the flags:
+sed -i "s,-O2,$SLKCFLAGS," src/build/Common.gmake
+sed -i "s,-O3,\"$SLKCFLAGS\"," 3rdp/build/GNUmakefile
+
+# Top-level source directory:
+cd src/$PRGNAM
+
+# Lots of make options here:
+# - RELEASE=1 means binary already stripped, man page already gzipped.
+# - WITHOUT_PORTAUDIO=1 to avoid a hidden dependency on portaudio. I
+#   see no advantage to using portaudio anyway (SDL audio works fine).
+# - INSTALL_DATA: install man page with usual Slackware permissions.
+# - SRC_ROOT has to be set because the makefile is dumb...
+# - Use -j1 as the compile always fails if -jN where N>1.
+make -j1 \
+  PREFIX=/usr \
+  MANPREFIX=/usr \
+  SYSTEM_LIST_DIR=/etc \
+  SRC_ROOT="$( realpath .. )" \
+  USE_SDL=1 \
+  USE_SDL_AUDIO=1 \
+  WITHOUT_PORTAUDIO=1 \
+  VERBOSE=1 \
+  RELEASE=1 \
+  DESTDIR=$PKG \
+  INSTALL_DATA="install -m 0644" \
+  all install
+
+# Compile the terminfo entries. Have to run the binary we just built,
+# let's not do it as root.
+su nobody -s /bin/sh -c "$PKG/usr/bin/$PRGNAM -T" | \
+  tic -o $PKG/usr/share/terminfo -
+
+# The 64x64 icon was installed by 'make install', above.
+# Other icons extracted from the Mac .icns file:
+# sh extract-icns.sh /tmp/SBo/syncterm-1.1/src/syncterm/SyncTERM.icns
+# If you're copying this code for use in your own SlackBuild, please
+# don't change the "cat" to "cp -a", below: files copied from $CWD
+# might be owned by anybody (not necessarily root), and have wrong
+# permissions; using "cat >" takes care of both.
+# Also, please don't rewrite this to call icns2png in your script.
+# Otherwise you'd have to add libicns to REQUIRES.
+for png in $CWD/icons/*.png; do
+  px="$( basename $png | cut -d. -f1 )"
+  size=${px}x${px}
+  dir=$PKG/usr/share/icons/hicolor/$size/apps
+  mkdir -p $dir
+  cat $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
+
+PKGDOC=$PKG/usr/doc/$PRGNAM-$VERSION
+mkdir -p $PKGDOC
+cp -a Install-Mozilla.txt CHANGES LICENCE gpl.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
diff --git a/network/syncterm/syncterm.info b/network/syncterm/syncterm.info
new file mode 100644
index 0000000000..188f5794d3
--- /dev/null
+++ b/network/syncterm/syncterm.info
@@ -0,0 +1,10 @@
+PRGNAM="syncterm"
+VERSION="1.1"
+HOMEPAGE="http://syncterm.bbsdev.net/"
+DOWNLOAD="https://downloads.sourceforge.net/project/syncterm/syncterm/syncterm-1.1/syncterm-1.1-src.tgz"
+MD5SUM="f528a1fdbe87a69a52582582d99e4032"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="B. Watson"
+EMAIL="urchlay@slackware.uk"
diff --git a/network/syncthing/README b/network/syncthing/README
index 6037811cca..86b1197e66 100644
--- a/network/syncthing/README
+++ b/network/syncthing/README
@@ -8,8 +8,8 @@ on a local network, or between remote devices over the Internet.
 Before you can build Syncthing, you have to create a syncthing
 user and group (used when running syncthing as a system-wide daemon):
 
-# groupadd -g 307 syncthing
-# useradd -d /var/lib/syncthing -g syncthing -s /bin/bash -u 307 syncthing
+groupadd -g 307 syncthing
+useradd -d /var/lib/syncthing -g syncthing -s /bin/bash -u 307 syncthing
 
 This package includes a rc.syncthing startup script, suitable for
 running Syncthing as a system daemon - such as on a server.
diff --git a/network/syncthing/syncthing.SlackBuild b/network/syncthing/syncthing.SlackBuild
index ab3b0e9a77..c95bf6a272 100644
--- a/network/syncthing/syncthing.SlackBuild
+++ b/network/syncthing/syncthing.SlackBuild
@@ -1,5 +1,7 @@
-#!/bin/sh
+#!/bin/bash
+
 # Slackware build script for syncthing
+
 # Copyright 2015 Lionel Young, United States
 # Copyright 2016 Sebastian Arcus, United Kingdom
 # All rights reserved.
@@ -21,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=syncthing
-VERSION=${VERSION:-1.1.0}
+VERSION=${VERSION:-1.27.3}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -43,7 +48,14 @@ else
 	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}
@@ -89,10 +101,10 @@ cat $CWD/syncthing.logrotate > $PKG/etc/logrotate.d/syncthing.new
 mkdir -p -m 750 $PKG/var/lib/syncthing/config
 mkdir -p -m 750 $PKG/var/log/syncthing
 mkdir -p -m 750 $PKG/var/run/syncthing
-chown -R syncthing.syncthing $PKG/var/{lib,run,log}/syncthing
+chown -R syncthing:syncthing $PKG/var/{lib,run,log}/syncthing
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a *.txt extra/*.pdf $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a *.txt $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
@@ -100,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/network/syncthing/syncthing.info b/network/syncthing/syncthing.info
index f5a8983462..5a459b7d92 100644
--- a/network/syncthing/syncthing.info
+++ b/network/syncthing/syncthing.info
@@ -1,10 +1,10 @@
 PRGNAM="syncthing"
-VERSION="1.1.0"
+VERSION="1.27.3"
 HOMEPAGE="https://syncthing.net"
-DOWNLOAD="https://github.com/syncthing/syncthing/releases/download/v1.1.0/syncthing-linux-386-v1.1.0.tar.gz"
-MD5SUM="ea9136b61f5579b805e773ada06bf451"
-DOWNLOAD_x86_64="https://github.com/syncthing/syncthing/releases/download/v1.1.0/syncthing-linux-amd64-v1.1.0.tar.gz"
-MD5SUM_x86_64="17a98df24d8bdd178fbd8080665e1609"
+DOWNLOAD="https://github.com/syncthing/syncthing/releases/download/v1.27.3/syncthing-linux-386-v1.27.3.tar.gz"
+MD5SUM="77e848ed29495480fd2b5da39a5c0b78"
+DOWNLOAD_x86_64="https://github.com/syncthing/syncthing/releases/download/v1.27.3/syncthing-linux-amd64-v1.27.3.tar.gz"
+MD5SUM_x86_64="e24685e31b730d62eadc50b26abbc7e9"
 REQUIRES=""
 MAINTAINER="Sebastian Arcus"
-EMAIL="s.arcus@open-t.co.uk"
+EMAIL="s [dot] arcus [at] open-t [dot] co [dot] uk"
diff --git a/network/synergy/010_include_dns_sd.diff b/network/synergy/010_include_dns_sd.diff
deleted file mode 100644
index 535acb9bce..0000000000
--- a/network/synergy/010_include_dns_sd.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/gui/gui.pro.orig	2015-05-27 01:56:21.000000000 +1000
-+++ src/gui/gui.pro	2015-06-09 16:52:57.664552976 +1000
-@@ -4,6 +4,8 @@
- TARGET = synergy
- DEPENDPATH += . \
-     res
-+CONFIG += link_pkgconfig
-+PKGCONFIG += avahi-compat-libdns_sd
- INCLUDEPATH += . \
-     src
- FORMS += res/MainWindowBase.ui \
diff --git a/network/synergy/synergy.SlackBuild b/network/synergy/synergy.SlackBuild
index adfcef3e4e..83d53f68fc 100644
--- a/network/synergy/synergy.SlackBuild
+++ b/network/synergy/synergy.SlackBuild
@@ -1,8 +1,9 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for "synergy".
 
 # Copyright 2013-2016 Marcel Saegebarth <marc@mos6581.de>
+# Copyright 2020-2023 Christoph Willing  Brisbane, Australia
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -24,26 +25,37 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=synergy
-VERSION=${VERSION:-1.7.6}
+SRCNAM=synergy-core
+VERSION=${VERSION:-1.14.6.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"
@@ -61,9 +73,10 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$VERSION-stable
-tar xvf $CWD/v$VERSION-stable.tar.gz || tar xvf $CWD/$PRGNAM-$VERSION-stable.tar.gz
-cd $PRGNAM-$VERSION-stable
+rm -rf $SRCNAM-$VERSION-stable
+tar xvf $CWD/$SRCNAM-$VERSION-stable.tar.gz
+cd $SRCNAM-$VERSION-stable
+
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -71,40 +84,47 @@ 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 Christoph Willing
-patch -p0 < $CWD/010_include_dns_sd.diff
-
-sh hm.sh configure --generator=1 --release
-CXXFLAGS="$SLKCFLAGS" sh hm.sh build
+#Remove the submodule pugixml
+sed -i.remove-sub-pugixml -e '/pugixml/ s/^/#/' src/lib/synergy/CMakeLists.txt
+sed -i.add-lib-pugixml -e '/target_link_libraries(synlib arch/ s/target_link_libraries(synlib arch \(.*\))/target_link_libraries(synlib arch \1 pugixml)/' src/lib/synergy/CMakeLists.txt
+
+mkdir -p build
+cd build
+  cmake \
+    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DBUILD_TESTS=false \
+    -DSYNERGY_VERSION_STAGE:STRING=stable \
+    -DCMAKE_BUILD_TYPE=Release ..
+  make
+  make install/strip DESTDIR=$PKG
+  install -s -m 0755 bin/synergyd $PKG/usr/bin/
+cd ..
 
 # installation not implemented
 mkdir -p $PKG/usr/bin $PKG/usr/doc/$PRGNAM-$VERSION $PKG/usr/man/man1 \
 $PKG/usr/share/icons/hicolor/256x256 $PKG/usr/share/applications
 
-for file in synergy synergyc synergyd synergys syntool usynergy ; do
-  install -s -m 0755 $TMP/$PRGNAM-$VERSION-stable/bin/$file $PKG/usr/bin
-done
-
 for file in synergy.conf.example synergy.conf.example-advanced synergy.conf.example-basic ; do
-  install -m 0644 $TMP/$PRGNAM-$VERSION-stable/doc/$file $PKG/usr/doc/$PRGNAM-$VERSION
-done
-
-for file in COMPILE ChangeLog INSTALL LICENSE README ; do
-  install -m 0644 $TMP/$PRGNAM-$VERSION-stable/$file $PKG/usr/doc/$PRGNAM-$VERSION
+  install -m 0644 $TMP/$SRCNAM-$VERSION-stable/doc/$file $PKG/usr/doc/$PRGNAM-$VERSION
 done
 
 for file in synergyc.man synergys.man ; do
-  install -m 0644 $TMP/$PRGNAM-$VERSION-stable/doc/$file $PKG/usr/man/man1
+  install -m 0644 $TMP/$SRCNAM-$VERSION-stable/doc/$file $PKG/usr/man/man1
 done
 find $PKG/usr/man/man1 -type f -name "*.man" -exec rename '.man' '.1' {} \;
 find $PKG/usr/man/man1 -type f -name "*.?" -exec gzip -9f {} \;
 
-install -m 0644 $TMP/$PRGNAM-$VERSION-stable/res/synergy.ico \
+install -m 0644 $TMP/$SRCNAM-$VERSION-stable/res/synergy.ico \
 $PKG/usr/share/icons/hicolor/256x256
 
-install -D -m 0644 $TMP/$PRGNAM-$VERSION-stable/res/synergy.desktop \
+install -D -m 0644 $TMP/$SRCNAM-$VERSION-stable/res/synergy.desktop \
 $PKG/usr/share/applications
 
+for file in ChangeLog LICENSE README.md ; do
+  install -m 0644 $TMP/$SRCNAM-$VERSION-stable/$file $PKG/usr/doc/$PRGNAM-$VERSION
+done
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
@@ -112,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/network/synergy/synergy.info b/network/synergy/synergy.info
index b9cb88632d..f8499de372 100644
--- a/network/synergy/synergy.info
+++ b/network/synergy/synergy.info
@@ -1,10 +1,10 @@
 PRGNAM="synergy"
-VERSION="1.7.6"
+VERSION="1.14.6.19"
 HOMEPAGE="http://synergy-project.org/"
-DOWNLOAD="https://ftp.mirrorservice.org/sites/download.salixos.org/x86_64/extra-14.2/source/network/synergy/v1.7.6-stable.tar.gz"
-MD5SUM="a324798a47445de739a7ed4baf12638f"
+DOWNLOAD="https://github.com/symless/synergy-core/archive/1.14.6.19-stable/synergy-core-1.14.6.19-stable.tar.gz"
+MD5SUM="7a992527f20c874a3c73fec20feace28"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="avahi"
-MAINTAINER="Marcel Saegebarth"
-EMAIL="marc@mos6581.de"
+REQUIRES="avahi pugixml"
+MAINTAINER="Christoph Willing"
+EMAIL="chris.willing@linux.com"
diff --git a/network/t38modem/README b/network/t38modem/README
deleted file mode 100644
index 8b80ff7d18..0000000000
--- a/network/t38modem/README
+++ /dev/null
@@ -1,10 +0,0 @@
-What is t38modem?
-
- * From your fax or voice application view point it's a fax/voice modem pool.
- * From IP network view point it's a H.323/SIP endpoint with T.38 fax support.
- * From your view point it's a gateway between an application and IP network.
-
-This package requires both the OPAL and ptlib packages (both available on
-SlackBuilds.)  After building and installing OPAL package keep the OPAL source
-tree on disk.  This package will point to OPAL source tree and use files created
-during its build processes to create this package.
diff --git a/network/t38modem/slack-desc b/network/t38modem/slack-desc
deleted file mode 100644
index a650441304..0000000000
--- a/network/t38modem/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------------------------------------------------------|
-t38modem: t38modem (H.323/SIP endpoint with T.38 fax support)
-t38modem:
-t38modem: What is t38modem?
-t38modem: * From your fax or voice application view point it's a fax/voice
-t38modem: modem pool
-t38modem: * From IP network view point it's a H.323/SIP endpoint with T.38 fax
-t38modem: support
-t38modem: * From your view point it's a gateway between an application and IP
-t38modem: network
-t38modem:
-t38modem: Homepage: https://sourceforge.net/projects/t38modem/
diff --git a/network/t38modem/t38modem.SlackBuild b/network/t38modem/t38modem.SlackBuild
deleted file mode 100644
index b0690134e9..0000000000
--- a/network/t38modem/t38modem.SlackBuild
+++ /dev/null
@@ -1,110 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for t38modem
-
-# Copyright 2015  Christopher Walker Copperas Cove, TX
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
-#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
-#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (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=t38modem
-VERSION=${VERSION:-2.0.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}
-
-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}.orig.tar.gz
-tar xvf $CWD/${PRGNAM}_${VERSION}-4.debian.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 patches
-#
-patch -p1 <$TMP/debian/patches/t38modem-opal3.10-patch
-patch -p1 <$TMP/debian/patches/spelling-error-fix
-patch -p1 <$TMP/debian/patches/opal-3.10.7.patch
-patch -p1 <$TMP/debian/patches/opal-3.10.9.patch
-
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-PTLIBDIR=/usr/share/ptlib \
-OPALDIR=$TMP/opal-${OPALVER:-3.10.10} \
-  make USE_UNIX98_PTY=1 USE_LEGACY_PTY=1 USE_OPAL=1 opt
-
-# Install binaries, READMEs, etc.,
-mkdir -p $PKG/usr/bin
-install -o root -g root obj_linux_*_opal/t38modem $PKG/usr/bin
-
-# Strip binaries and libraries
-find $PKG -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/HylaFAX
-cp -a \
-  $TMP/$PRGNAM-$VERSION/Changes.txt \
-  $TMP/$PRGNAM-$VERSION/ReadMe.txt \
-  $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
-  $TMP/$PRGNAM-$VERSION/HylaFAX/config.ttyx \
-  $PKG/usr/doc/$PRGNAM-$VERSION/HylaFAX
-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/network/t38modem/t38modem.info b/network/t38modem/t38modem.info
deleted file mode 100644
index bcab7eff84..0000000000
--- a/network/t38modem/t38modem.info
+++ /dev/null
@@ -1,12 +0,0 @@
-PRGNAM="t38modem"
-VERSION="2.0.0"
-HOMEPAGE="https://sourceforge.net/projects/t38modem/"
-DOWNLOAD="http://http.debian.net/debian/pool/main/t/t38modem/t38modem_2.0.0.orig.tar.gz \
-          http://http.debian.net/debian/pool/main/t/t38modem/t38modem_2.0.0-4.debian.tar.gz"
-MD5SUM="ffcb224ac414693f2d0a5af720d4952a \
-        8072c6645a33f2660a58acd6f651d42a"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="opal"
-MAINTAINER="Christopher Walker"
-EMAIL="kris240376@gmail.com"
diff --git a/network/t50/README b/network/t50/README
index e6e317daaa..28bef4771d 100644
--- a/network/t50/README
+++ b/network/t50/README
@@ -1,9 +1,9 @@
-T50 is a tool designed to perform stress testing on a variety of infrastructure
-network devices, covering some regular protocols (ICMP, IGMP, TCP and UDP),
-some infrastructure specific protocols (GRE, IPSec and  RSVP) and some routing
-protocols (RIP, EIGRP and OSPF).
+T50 is a tool designed to perform stress testing on a variety of
+infrastructure network devices, covering some regular protocols (ICMP,
+IGMP, TCP and UDP), some infrastructure specific protocols (GRE, IPSec
+and  RSVP) and some routing protocols (RIP, EIGRP and OSPF).
 
-The main differentiator of T50 is that it is able to send all protocols
-sequentially using one single SOCKET, and it is capable of being used to
-modify network routes, letting IT Security Professionals perform advanced
-tests.
+The main differentiator of T50 is that it is able to send all
+protocols sequentially using one single SOCKET, and it is capable of
+being used to modify network routes, letting IT Security Professionals
+perform advanced tests.
diff --git a/network/t50/t50.SlackBuild b/network/t50/t50.SlackBuild
index 3232fc40ef..f9fd763898 100644
--- a/network/t50/t50.SlackBuild
+++ b/network/t50/t50.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for t50
 
-# Copyright 2013 - Fernando Giannasi - S�o Paulo - Brasil
+# Copyright 2013 - Fernando Giannasi - São Paulo - Brasil
 # 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=t50
 VERSION=${VERSION:-5.4.1_rc1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 SRCVERS=$(echo $VERSION | tr _ -)
 
@@ -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 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/network/tahoe-lafs/README b/network/tahoe-lafs/README
deleted file mode 100644
index 3395839764..0000000000
--- a/network/tahoe-lafs/README
+++ /dev/null
@@ -1,15 +0,0 @@
-Tahoe, the Least-Authority File Store.
-
-Tahoe-LAFS is a secure, decentralized, file store. All of the source code
-is available under a choice of two Free Software, Open Source licences.
-
-The file store is encrypted and spread over multiple peers in such a way
-that it remains available even when some of the peers are unavailable,
-malfunctioning, or malicious.
-
-Tahoe-LAFS now features native Tor and I2P support.
-
-Optional Dependency
-
-In case you'd like proper documentation to be build Sphinx needs to be
-installed at build time.
diff --git a/network/tahoe-lafs/slack-desc b/network/tahoe-lafs/slack-desc
deleted file mode 100644
index 97dfb4e23e..0000000000
--- a/network/tahoe-lafs/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------------------------------------------------------|
-tahoe-lafs: tahoe-lafs (Secure File Store)
-tahoe-lafs:
-tahoe-lafs: Tahoe, the Least-Authority File Store.
-tahoe-lafs: Tahoe-LAFS is a secure, decentralized, file store. The file store
-tahoe-lafs: is encrypted and spread over multiple peers in such a way that it
-tahoe-lafs: remains available even when some of the peers are unavailable,
-tahoe-lafs: malfunctioning, or malicious.
-tahoe-lafs:
-tahoe-lafs: Homepage: https://tahoe-lafs.org/
-tahoe-lafs:
-tahoe-lafs:
diff --git a/network/tahoe-lafs/tahoe-lafs.SlackBuild b/network/tahoe-lafs/tahoe-lafs.SlackBuild
deleted file mode 100644
index 96abf4ec72..0000000000
--- a/network/tahoe-lafs/tahoe-lafs.SlackBuild
+++ /dev/null
@@ -1,99 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for tahoe-lafs
-
-# Copyright 2009 Marco Bonetti <sid77@slackware.it>
-# Copyright 2011-2017 Markus Reichelt, Aachen, 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=tahoe-lafs
-VERSION=${VERSION:-1.12.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.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 {} \;
-
-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 $PKG/usr/man/man1
-cp -a COPYING.* *.txt NEWS.* README.* CREDITS docs misc $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mv $PKG/usr/doc/$PRGNAM-$VERSION/docs/man/man1/tahoe.1 $PKG/usr/man/man1
-gzip -9 $PKG/usr/man/man1/tahoe.1
-rm -drf $PKG/usr/doc/$PRGNAM-$VERSION/docs/man
-
-if [ -e /usr/bin/sphinx-build ]; then
-  cd $TMP/$PRGNAM-$VERSION/docs
-  make html
-  cp -a _build/html $PKG/usr/doc/$PRGNAM-$VERSION
-  rm $PKG/usr/doc/$PRGNAM-$VERSION/html/{.buildinfo,objects.inv}
-  rm -drf $PKG/usr/doc/$PRGNAM-$VERSION/docs
-  rm -drf $PKG/usr/doc/$PRGNAM-$VERSION/html/_sources
-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:-tgz}
diff --git a/network/tahoe-lafs/tahoe-lafs.info b/network/tahoe-lafs/tahoe-lafs.info
deleted file mode 100644
index c6c3e9ed92..0000000000
--- a/network/tahoe-lafs/tahoe-lafs.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="tahoe-lafs"
-VERSION="1.12.1"
-HOMEPAGE="https://tahoe-lafs.org/"
-DOWNLOAD="https://tahoe-lafs.org/downloads/tahoe-lafs-1.12.1.tar.bz2"
-MD5SUM="617d9f33705570ae79795835dff8ff0d"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="txtorcon txi2p simplejson pycrypto pycryptopp zfec service_identity foolscap Nevow"
-MAINTAINER="Markus Reichelt"
-EMAIL="slackbuilds@mareichelt.de"
diff --git a/network/tailscale/README b/network/tailscale/README
new file mode 100644
index 0000000000..a040087e56
--- /dev/null
+++ b/network/tailscale/README
@@ -0,0 +1,18 @@
+Tailscale is a zero config VPN for building secure networks.
+Install on any device in minutes. Remote access from any
+network or physical location.
+
+The service has two parts: tailscaled (daemon) and tailscale.
+Both must run. I use this from a terminal:
+
+daemon --user root tailscaled $exec && tailscale up
+
+The first time, a url will pop up to authenticate.
+
+Once the daemon is running, there's no need to restart it
+until your next session. You can simply run
+
+tailscale up
+tailscale down
+
+to connect and disconnect.
diff --git a/network/tailscale/doinst.sh b/network/tailscale/doinst.sh
new file mode 100644
index 0000000000..57c1cdfc42
--- /dev/null
+++ b/network/tailscale/doinst.sh
@@ -0,0 +1,8 @@
+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
+
diff --git a/network/tailscale/slack-desc b/network/tailscale/slack-desc
new file mode 100644
index 0000000000..572266ea2c
--- /dev/null
+++ b/network/tailscale/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+         |-----handy-ruler------------------------------------------------------|
+tailscale: tailscale (vpn service)
+tailscale:
+tailscale: Tailscale is a zero config VPN for building secure networks. Install
+tailscale: on any device in minutes. Remote access from any network or physical
+tailscale: location.
+tailscale:
+tailscale:
+tailscale:
+tailscale:
+tailscale: Homepage: https://tailscale.com/
+tailscale:
diff --git a/network/tailscale/tailscale.SlackBuild b/network/tailscale/tailscale.SlackBuild
new file mode 100644
index 0000000000..638c7df5c1
--- /dev/null
+++ b/network/tailscale/tailscale.SlackBuild
@@ -0,0 +1,108 @@
+#!/bin/bash
+
+# Slackware build script for brave-browser
+
+# Copyright 2023-2024 Andrew Payne <phalange@komputermatrix.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=tailscale
+DAEMON=tailscaled
+VERSION=${VERSION:-1.62.1}
+ARCHSTR=amd64
+BINDIR=$PRGNAM"_"$VERSION"_"$ARCHSTR
+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}
+
+# Abort build if architecture is not 64-bit.
+if [ "$ARCH" != "x86_64" ]; then
+  echo "$ARCH is not supported."
+  exit 1
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+mkdir -p $PRGNAM-$VERSION
+cd $PRGNAM-$VERSION
+tar -xf $CWD/$BINDIR.tgz
+tar -xf $CWD/$PRGNAM-$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 \
+\( -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/default/$DAEMON
+cp -a $TMP/$PRGNAM-$VERSION/$BINDIR/systemd/$DAEMON.defaults $PKG/etc/default/$DAEMON/
+
+mkdir -p $PKG/lib/systemd/system
+cp -a $TMP/$PRGNAM-$VERSION/$BINDIR/systemd/$DAEMON.service $PKG/lib/systemd/system/
+
+mkdir -p $PKG/opt/$PRGNAM
+cp -a $TMP/$PRGNAM-$VERSION/$BINDIR/$DAEMON $PKG/opt/$PRGNAM/
+
+mkdir -p $PKG/usr/{bin,sbin}
+ln -s /opt/$PRGNAM/$DAEMON $PKG/usr/sbin/$DAEMON
+cp -a $TMP/$PRGNAM-$VERSION/$BINDIR/$PRGNAM $PKG/opt/$PRGNAM/
+ln -s /opt/$PRGNAM/$PRGNAM $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
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+cp -a \
+   $TMP/$PRGNAM-$VERSION/$PRGNAM-$VERSION/{AUTHORS,CODE_OF_CONDUCT.md,LICENSE,PATENTS,README.md,SECURITY.md} \
+   $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/network/tailscale/tailscale.info b/network/tailscale/tailscale.info
new file mode 100644
index 0000000000..ad384e2488
--- /dev/null
+++ b/network/tailscale/tailscale.info
@@ -0,0 +1,12 @@
+PRGNAM="tailscale"
+VERSION="1.62.1"
+HOMEPAGE="https://tailscale.com/"
+DOWNLOAD="UNSUPPORTED"
+MD5SUM=""
+DOWNLOAD_x86_64="https://pkgs.tailscale.com/stable/tailscale_1.62.1_amd64.tgz \
+                 https://github.com/tailscale/tailscale/archive/refs/tags/v1.62.1/tailscale-1.62.1.tar.gz"
+MD5SUM_x86_64="5e8a3b17eddd4954d165c005a9c09967 \
+               7c8acd55eb0b85c05b6b80568a39b9d2"
+REQUIRES=""
+MAINTAINER="Andrew Payne"
+EMAIL="phalange@komputermatrix.com"
diff --git a/network/tcpbench/README b/network/tcpbench/README
new file mode 100644
index 0000000000..3f3179452c
--- /dev/null
+++ b/network/tcpbench/README
@@ -0,0 +1,2 @@
+OpenBSD tcpbench ported to to GNU/Linux.  TCP/UDP benchmarking and
+measurement tool for unidirectional streams.
diff --git a/network/tcpbench/slack-desc b/network/tcpbench/slack-desc
new file mode 100644
index 0000000000..3cbc87e161
--- /dev/null
+++ b/network/tcpbench/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+        |-----handy-ruler------------------------------------------------------|
+tcpbench: tcpbench (TCP/UDP benchmark)
+tcpbench:
+tcpbench: OpenBSD tcpbench ported to to GNU/Linux.  TCP/UDP benchmarking and
+tcpbench: measurement tool for unidirectional streams.
+tcpbench:
+tcpbench:
+tcpbench:
+tcpbench:
+tcpbench:
+tcpbench: https://github.com/bluhm/tcpbench-portable
+tcpbench:
diff --git a/network/tcpbench/tcpbench.SlackBuild b/network/tcpbench/tcpbench.SlackBuild
new file mode 100644
index 0000000000..2a1c810f23
--- /dev/null
+++ b/network/tcpbench/tcpbench.SlackBuild
@@ -0,0 +1,93 @@
+#!/bin/bash
+
+# Slackware build script for tcpbench
+
+# Copyright 2024 Alexander Bluhm, 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.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=tcpbench
+VERSION=${VERSION:-2.02}
+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
+BINDIR=/usr/bin \
+MANDIR=/usr/man/man \
+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
+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/network/tcpbench/tcpbench.info b/network/tcpbench/tcpbench.info
new file mode 100644
index 0000000000..c249d99ccc
--- /dev/null
+++ b/network/tcpbench/tcpbench.info
@@ -0,0 +1,10 @@
+PRGNAM="tcpbench"
+VERSION="2.02"
+HOMEPAGE="https://github.com/bluhm/tcpbench-portable"
+DOWNLOAD="https://github.com/bluhm/tcpbench-portable/releases/download/v2.02/tcpbench-2.02.tar.gz"
+MD5SUM="cf2af2000e34f8e5183961c32ff1d285"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="libbsd pkgconf"
+MAINTAINER="Alexander Bluhm"
+EMAIL="alexander.bluhm@gmx.net"
diff --git a/network/tcpflow/README b/network/tcpflow/README
index b4421a9e36..80cc7672dd 100644
--- a/network/tcpflow/README
+++ b/network/tcpflow/README
@@ -1,12 +1,14 @@
-tcpflow is a program that captures data transmitted as part of TCP connections
-(flows), and stores the data in a way that is convenient for protocol analysis 
-and debugging. Each TCP flow is stored in its own file. Thus, the typical TCP 
-flow will be stored in two files, one for each direction. tcpflow can also 
-process stored 'tcpdump' packet flows.
+tcpflow is a program that captures data transmitted as part of TCP
+connections (flows), and stores the data in a way that is convenient
+for protocol analysis and debugging. Each TCP flow is stored in its
+own file. Thus, the typical TCP flow will be stored in two files,
+one for each direction. tcpflow can also process stored 'tcpdump'
+packet flows.
 
-tcpflow is similar to 'tcpdump', in that both process packets from the wire or 
-from a stored file. But it's different in that it reconstructs the actual data 
-streams and stores each flow in a separate file for later analysis.
+tcpflow is similar to 'tcpdump', in that both process packets from the
+wire or from a stored file. But it's different in that it reconstructs
+the actual data streams and stores each flow in a separate file for
+later analysis.
 
-tcpflow understands sequence numbers and will correctly reconstruct data 
-streams regardless of retransmissions or out-of-order delivery. 
+tcpflow understands sequence numbers and will correctly reconstruct
+data streams regardless of retransmissions or out-of-order delivery.
diff --git a/network/tcpflow/tcpflow.SlackBuild b/network/tcpflow/tcpflow.SlackBuild
index 420da604d6..d244e44e45 100644
--- a/network/tcpflow/tcpflow.SlackBuild
+++ b/network/tcpflow/tcpflow.SlackBuild
@@ -1,34 +1,39 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for tcpflow
 
-# Copyright 2016 Barry J. Grundy <bgrundy@linuxleo.com>
+# Copyright 2016-2022 Barry J. Grundy <bgrundy@linuxleo.com>
 # All rights reserved.
 #
-# Redistribution and use of this script, with or without modification, is
-# 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:
 #
 # 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.
-
-# Initial Slackbuild v1.5.0 August, 2016
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS 
+# OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY 
+# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE 
+# GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, 
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (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 v1.6.1, May 2022
 # Barry J. Grundy <bgrundy(at)linuxleo.com>
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=tcpflow
-VERSION=${VERSION:-1.5.0}
+VERSION=${VERSION:-1.6.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -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}
@@ -90,7 +99,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 ChangeLog INSTALL TODO.txt doc $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS ChangeLog TODO.txt doc $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*
 
@@ -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/network/tcpflow/tcpflow.info b/network/tcpflow/tcpflow.info
index b9a1dbe959..0278833556 100644
--- a/network/tcpflow/tcpflow.info
+++ b/network/tcpflow/tcpflow.info
@@ -1,8 +1,8 @@
 PRGNAM="tcpflow"
-VERSION="1.5.0"
+VERSION="1.6.1"
 HOMEPAGE="https://github.com/simsong/tcpflow/"
-DOWNLOAD="http://digitalcorpora.org/downloads/tcpflow/tcpflow-1.5.0.tar.gz"
-MD5SUM="a2fa359d2f8b74297d276771f2f805ce"
+DOWNLOAD="https://github.com/simsong/tcpflow/releases/download/tcpflow-1.6.1/tcpflow-1.6.1.tar.gz"
+MD5SUM="4946a730747260cbd69e23bb0659b45b"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/network/tcptunnel/tcptunnel.SlackBuild b/network/tcptunnel/tcptunnel.SlackBuild
index 2d85b1481b..65312951aa 100644
--- a/network/tcptunnel/tcptunnel.SlackBuild
+++ b/network/tcptunnel/tcptunnel.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for tcptunnel
 
-# Copyright 2013 - Fernando Giannasi - S�o Paulo - Brasil
+# Copyright 2013 - Fernando Giannasi - São Paulo - Brasil
 # 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=tcptunnel
 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"
@@ -93,4 +103,4 @@ 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/network/tdlib/README b/network/tdlib/README
new file mode 100644
index 0000000000..f1a491f20a
--- /dev/null
+++ b/network/tdlib/README
@@ -0,0 +1,9 @@
+Tdlib is the official Telegram library for the Telegram protocol.
+It can be used to implement unofficial Telegram clients.
+
+In particular, it is required for the Emacs package telega.el to
+work.
+
+NOTE: the build uses a commit, but the version is accurate. The
+reason is that although tdlib developers designate versions, they
+do not write them in github tags.
diff --git a/network/tdlib/slack-desc b/network/tdlib/slack-desc
new file mode 100644
index 0000000000..554e0aa871
--- /dev/null
+++ b/network/tdlib/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+     |-----handy-ruler------------------------------------------------------|
+tdlib: tdlib (bindings for the Telegram protocol)
+tdlib:
+tdlib: Tdlib is the official Telegram library for the Telegram protocol.
+tdlib: It can be used to implement unofficial Telegram clients.
+tdlib:
+tdlib: In particular, it is required for the Emacs package telega.el to
+tdlib: work.
+tdlib:
+tdlib:
+tdlib:
+tdlib:
diff --git a/network/tdlib/tdlib.SlackBuild b/network/tdlib/tdlib.SlackBuild
new file mode 100644
index 0000000000..36033e2afc
--- /dev/null
+++ b/network/tdlib/tdlib.SlackBuild
@@ -0,0 +1,116 @@
+#!/bin/bash
+
+# Slackware build script for tdlib
+
+# 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=tdlib
+VERSION=${VERSION:-1.8.21}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+TARNAM=td
+COMMIT=3870c29b158b75ca5e48e0eebd6b5c3a7994a000
+
+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-$COMMIT
+tar xvf $CWD/$TARNAM-$COMMIT.tar.gz
+cd $TARNAM-$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 build
+cd build
+  cmake \
+    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DLIB_SUFFIX=${LIBDIRSUFFIX} \
+    -DCMAKE_INSTALL_LIBDIR=/usr/lib${LIBDIRSUFFIX} \
+    -DMAN_INSTALL_DIR=/usr/man \
+    -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
+    -DCMAKE_BUILD_TYPE=Release ..
+  make
+  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
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+  example \
+  $PKG/usr/doc/$PRGNAM-$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/network/tdlib/tdlib.info b/network/tdlib/tdlib.info
new file mode 100644
index 0000000000..bbce8cf5ca
--- /dev/null
+++ b/network/tdlib/tdlib.info
@@ -0,0 +1,10 @@
+PRGNAM="tdlib"
+VERSION="1.8.21"
+HOMEPAGE="https://github.com/tdlib/td/"
+DOWNLOAD="https://github.com/tdlib/td/archive/3870c29b158b75ca5e48e0eebd6b5c3a7994a000/td-3870c29b158b75ca5e48e0eebd6b5c3a7994a000.tar.gz"
+MD5SUM="1f605225e804f4986895a6ab062a9c43"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Lockywolf"
+EMAIL="for_sbo.tdlib_2023-11-10@lockywolf.net"
diff --git a/network/teams/README b/network/teams/README
new file mode 100644
index 0000000000..c2dc393bb2
--- /dev/null
+++ b/network/teams/README
@@ -0,0 +1,7 @@
+Microsoft Teams for Linux is your chat-centered workspace in Office 365.
+Instantly access all your team’s content from a single place where
+messages, files, people and tools live together.
+
+This script repackages the Debian package provided by Microsoft.
+
+Only the 64bit version is available.
diff --git a/network/Flootty/doinst.sh b/network/teams/doinst.sh
index 5fb28930db..5fb28930db 100644
--- a/network/Flootty/doinst.sh
+++ b/network/teams/doinst.sh
diff --git a/network/teams/fix_glibc-2.35.patch b/network/teams/fix_glibc-2.35.patch
new file mode 100644
index 0000000000..8741cf5486
--- /dev/null
+++ b/network/teams/fix_glibc-2.35.patch
@@ -0,0 +1,9 @@
+--- usr/bin/teams.old	2022-03-21 18:53:40.958533543 -0300
++++ usr/bin/teams	2022-03-21 18:54:01.813813567 -0300
+@@ -8,5 +8,5 @@
+ 
+ mkdir -p "$TEAMS_LOGS"
+ 
+-nohup "$TEAMS_PATH" "$@" --disable-namespace-sandbox --disable-setuid-sandbox > "$TEAMS_LOGS/teams-startup.log" 2>&1 &
++nohup "$TEAMS_PATH" "$@" --disable-namespace-sandbox --disable-setuid-sandbox --disable-seccomp-filter-sandbox > "$TEAMS_LOGS/teams-startup.log" 2>&1 &
+ 
diff --git a/network/teams/slack-desc b/network/teams/slack-desc
new file mode 100644
index 0000000000..8120f85e15
--- /dev/null
+++ b/network/teams/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+     |-----handy-ruler------------------------------------------------------|
+teams: teams (Microsoft Teams for Linux)
+teams:
+teams: Microsoft Teams for Linux is your chat-centered workspace in Office
+teams: 365. Instantly access all your team's content from a single place
+teams: where messages, files, people and tools live together.
+teams:
+teams: Homepage: https://teams.microsoft.com/downloads
+teams:
+teams:
+teams:
+teams:
diff --git a/network/teams/teams.SlackBuild b/network/teams/teams.SlackBuild
new file mode 100644
index 0000000000..a8b8ff9c73
--- /dev/null
+++ b/network/teams/teams.SlackBuild
@@ -0,0 +1,90 @@
+#!/bin/bash
+
+# Slackware build script for teams
+
+# Copyright 2020, 2022  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.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=teams
+VERSION=${VERSION:-1.5.00.23861}
+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
+  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}_amd64.deb data.tar.xz | tar -xvJ
+
+# Fix the issue with GLIBC 2.35 on Slackware 15.0
+# Upstream issue, not Slackware issue.
+patch -p0 < $CWD/fix_glibc-2.35.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 {} \;
+
+find $PKG -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
+( cd $PKG/usr
+  for i in share/teams/LICENSE* ; do ln -s ../../$i $PKG/usr/doc/$PRGNAM-$VERSION/ ; 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/network/teams/teams.info b/network/teams/teams.info
new file mode 100644
index 0000000000..098d2e3dc3
--- /dev/null
+++ b/network/teams/teams.info
@@ -0,0 +1,10 @@
+PRGNAM="teams"
+VERSION="1.5.00.23861"
+HOMEPAGE="https://teams.microsoft.com/downloads"
+DOWNLOAD="UNSUPPORTED"
+MD5SUM=""
+DOWNLOAD_x86_64="https://mirror.slackware.hr/sources/teams/teams_1.5.00.23861_amd64.deb"
+MD5SUM_x86_64="952ec5dc6976d39a33a06f23767c3104"
+REQUIRES=""
+MAINTAINER="Mario Preksavec"
+EMAIL="mario at slackware dot hr"
diff --git a/network/teamviewer/README b/network/teamviewer/README
index 2e4fd6bd22..679b349dd7 100644
--- a/network/teamviewer/README
+++ b/network/teamviewer/README
@@ -4,8 +4,8 @@ fast and secure remote access to Linux, Windows PCs, and Macs.
 You must give execute permission on /etc/rc.d/rc.teamviewerd and run
 /etc/rc.d/rc.teamviewerd start prior launching TeamViewer application
 
-To make this process repeated on every boot sequence, add this line 
-in your /etc/rc.d/rc.local:
+To make this process repeated on every boot sequence, add this line in
+your /etc/rc.d/rc.local:
 
 if [ -x /etc/rc.d/rc.teamviewerd ]; then
         /etc/rc.d/rc.teamviewerd start
@@ -13,11 +13,15 @@ fi
 
 NOTE:
 1. Newer version of Teamviewer can establish remote control connections
-to older version (version 3 and above), but not in the opposite direction.
-The same things goes to meetings (version 7 and above).
+to older version (version 3 and above), but not in the opposite
+direction.  The same things goes to meetings (version 7 and above).
 
 2. Always stop teamviewerd service and remove the old version before
-attempting to upgrade as the path and configs may change on each major release.
+attempting to upgrade as the path and configs may change on each major
+release.
 
-3. Starting from Teamviewer 13, it has come up with native 64 client package, so
-no multilib is required to use. It uses Qt as a foundation.
+3. Starting from Teamviewer 13, it has come up with native 64 client
+package, so no multilib is required to use. It uses Qt as a foundation.
+
+4. The GUI client only seems to work in runlevel 4. Using runlevel 3 +
+startx/startwayland doesn't work.
diff --git a/network/teamviewer/doinst.sh b/network/teamviewer/doinst.sh
index e8edc2ff3f..2ac42c06ac 100644
--- a/network/teamviewer/doinst.sh
+++ b/network/teamviewer/doinst.sh
@@ -27,3 +27,10 @@ preserve_perms etc/rc.d/rc.teamviewerd.new
 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/network/teamviewer/rc.teamviewerd b/network/teamviewer/rc.teamviewerd
index ae65dcf100..f5812f3945 100644
--- a/network/teamviewer/rc.teamviewerd
+++ b/network/teamviewer/rc.teamviewerd
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 #
 # /etc/rc.d/rc.teamviewerd
 #
diff --git a/network/teamviewer/teamviewer.SlackBuild b/network/teamviewer/teamviewer.SlackBuild
index 91e44071ce..b1819a9c35 100644
--- a/network/teamviewer/teamviewer.SlackBuild
+++ b/network/teamviewer/teamviewer.SlackBuild
@@ -1,9 +1,10 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for teamviewer
 
 # Copyright 2010-2012  Binh Nguyen <binhvng@gmail.com>
 # Copyright 2013-2018 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
+# Copyright 2022-2024 Gregory J. L. Tourte <artourter@gmail.com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -25,10 +26,13 @@
 
 # Modified by Mario Preksavec <mario@slackware.hr>
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=teamviewer
-VERSION=${VERSION:-14.4.2669}
+VERSION=${VERSION:-15.52.3}
 BUILD=${BUILD:-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}
@@ -75,36 +86,39 @@ else
   ar p $CWD/teamviewer_${VERSION}_${DEBARCH}.deb data.tar.xz | tar xJv
 fi
 
+# make all symbolic links relative
+# (code from https://unix.stackexchange.com/a/100955/16829)
+( cd $PKG
+for link in $(find . -lname '/*'); do
+  target=$(readlink "$link")
+  link=${link#./}
+  root=$(echo $link | sed -E 's|[^/](.[^/]*)|..|g'); root=${root#/}; root=${root%..}
+  rm "$link"
+  ln -s "$root${target#/}" "$link"
+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 {} \;
+  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} + -o \
+  \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} +
 
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+# we do not strip te libicudata library as it prevents the package from working.
+find $PKG -print0 | xargs -0 file | grep -v -e 'libicudata' | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
-# Remove the dangling symlink first
-rm -f $PKG/usr/bin/teamviewer
-
-# Re-create the generic executable
-( cd $PKG/usr/bin; ln -s /opt/teamviewer/tv_bin/script/teamviewer teamviewer )
-
 # Link icon to /usr/share/pixmaps
 mkdir -p $PKG/usr/share/pixmaps
-( ln -sf /opt/teamviewer/tv_bin/desktop/teamviewer.png  $PKG/usr/share/pixmaps/teamviewer.png )
+ln -s ../../../opt/teamviewer/tv_bin/desktop/teamviewer_256.png  $PKG/usr/share/pixmaps/TeamViewer.png
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
+mv $PKG/usr/share/applications/com.teamviewer.TeamViewer.desktop $PKG/usr/share/applications/TeamViewer.desktop
+
 # We don't need apt
 rm -rf $PKG/etc/apt/
 
-# Move docs to official place
-mv $PKG/opt/teamviewer/doc/*.txt $PKG/usr/doc/$PRGNAM-$VERSION
-rm -rf $PKG/opt/teamviewer/doc/
-
 mkdir -p $PKG/etc/rc.d/
 install -m 0644 $CWD/rc.teamviewerd $PKG/etc/rc.d/rc.teamviewerd.new
 
@@ -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/network/teamviewer/teamviewer.info b/network/teamviewer/teamviewer.info
index f2aec4ccf3..4718349a69 100644
--- a/network/teamviewer/teamviewer.info
+++ b/network/teamviewer/teamviewer.info
@@ -1,10 +1,10 @@
 PRGNAM="teamviewer"
-VERSION="14.4.2669"
+VERSION="15.52.3"
 HOMEPAGE="https://www.teamviewer.com/"
-DOWNLOAD="https://dl.tvcdn.de/download/linux/version_14x/teamviewer_14.4.2669_i386.deb"
-MD5SUM="609c460517795932a6a8deca0c81ecf7"
-DOWNLOAD_x86_64="https://dl.tvcdn.de/download/linux/version_14x/teamviewer_14.4.2669_amd64.deb"
-MD5SUM_x86_64="474fd9018c50107568a8d294a59b40e6"
-REQUIRES="qt5-webkit"
-MAINTAINER="Willy Sudiarto Raharjo"
-EMAIL="willysr@slackbuilds.org"
+DOWNLOAD="https://dl.teamviewer.com/download/linux/version_15x/teamviewer_15.52.3_i386.deb"
+MD5SUM="2a7e6d6b4928c594ba91735d643f8fad"
+DOWNLOAD_x86_64="https://dl.teamviewer.com/download/linux/version_15x/teamviewer_15.52.3_amd64.deb"
+MD5SUM_x86_64="31556dcdf43ce4e0aed3dd091d2bda41"
+REQUIRES="libminizip"
+MAINTAINER="ArTourter"
+EMAIL="artourter@gmail.com"
diff --git a/network/telegram-cli/README b/network/telegram-cli/README
deleted file mode 100644
index 0dd579cc55..0000000000
--- a/network/telegram-cli/README
+++ /dev/null
@@ -1 +0,0 @@
-Command-line interface for Telegram.
diff --git a/network/telegram-cli/libreadline.patch b/network/telegram-cli/libreadline.patch
deleted file mode 100644
index f06df0b68f..0000000000
--- a/network/telegram-cli/libreadline.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/configure b/configure
-index fa7e189..9beaf07 100755
---- a/configure
-+++ b/configure
-@@ -4622,11 +4622,7 @@ LIBS=$ac_check_lib_save_LIBS
- fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_readline_rl_save_prompt" >&5
- $as_echo "$ac_cv_lib_readline_rl_save_prompt" >&6; }
--if test "x$ac_cv_lib_readline_rl_save_prompt" = xyes; then :
--   EXTRA_LIBS="${EXTRA_LIBS} -lreadline" ;
--else
--  as_fn_error $? "no libreadline found" "$LINENO" 5
--fi
-+EXTRA_LIBS="${EXTRA_LIBS} -lreadline" ;
- 
- 
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libconfig" >&5
diff --git a/network/telegram-cli/slack-desc b/network/telegram-cli/slack-desc
deleted file mode 100644
index 96201efe7c..0000000000
--- a/network/telegram-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------------------------------------------------------|
-telegram-cli: telegram-cli (command-line interface for Telegram.)
-telegram-cli:
-telegram-cli: Command-line interface for Telegram.
-telegram-cli:
-telegram-cli:
-telegram-cli:
-telegram-cli:
-telegram-cli:
-telegram-cli:
-telegram-cli:
-telegram-cli:
diff --git a/network/telegram-cli/telegram-cli.SlackBuild b/network/telegram-cli/telegram-cli.SlackBuild
deleted file mode 100644
index 87e3838b08..0000000000
--- a/network/telegram-cli/telegram-cli.SlackBuild
+++ /dev/null
@@ -1,128 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for telegram-cli
-
-# Copyright 2017 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=telegram-cli
-VERSION=${VERSION:-1.4.1}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-SRCNAM=tg
-SRCVERSION=6547c0b21b977b327b3c5e8142963f4bc246187a
-
-# Git modules
-MODULENAM=(tgl tl-parser)
-MODULEVERSION=(ffb04caca71de0cddf28cd33a4575922900a59ed 36bf1902ff3476c75d0b1f42b34a91e944123b3c)
-
-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.tar.gz || tar xvf $CWD/$SRCVERSION.tar.gz
-cd $SRCNAM-$SRCVERSION
-
-rm -rf ${MODULENAM[0]}
-tar xvf $CWD/${MODULENAM[0]}-${MODULEVERSION[0]}.tar.gz || tar xvf $CWD/${MODULEVERSION[0]}.tar.gz
-mv ${MODULENAM[0]}-${MODULEVERSION[0]} ${MODULENAM[0]}
-
-( cd ${MODULENAM[0]}
-  rm -rf ${MODULENAM[1]}
-  tar xvf $CWD/${MODULENAM[1]}-${MODULEVERSION[1]}.tar.gz || tar xvf $CWD/${MODULEVERSION[1]}.tar.gz
-  mv ${MODULENAM[1]}-${MODULEVERSION[1]} ${MODULENAM[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 {} \;
-
-patch -p1 < $CWD/libreadline.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
-
-install -Dm755 bin/telegram-cli $PKG/usr/bin/telegram-cli
-install -Dm644 tg-server.pub $PKG/etc/telegram-cli/server.pub
-chmod 644 README-Cygwin.md
-
-find $PKG -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-Cygwin.md \
-  README-LUA \
-  README-PY.md \
-  README.es \
-  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/network/telegram-cli/telegram-cli.info b/network/telegram-cli/telegram-cli.info
deleted file mode 100644
index 9e96ba702e..0000000000
--- a/network/telegram-cli/telegram-cli.info
+++ /dev/null
@@ -1,14 +0,0 @@
-PRGNAM="telegram-cli"
-VERSION="1.4.1"
-HOMEPAGE="https://github.com/vysheng/tg"
-DOWNLOAD="https://github.com/vysheng/tg/archive/6547c0b21b977b327b3c5e8142963f4bc246187a.tar.gz \
-          https://github.com/vysheng/tgl/archive/ffb04caca71de0cddf28cd33a4575922900a59ed.tar.gz \
-          https://github.com/vysheng/tl-parser/archive/36bf1902ff3476c75d0b1f42b34a91e944123b3c.tar.gz"
-MD5SUM="599bdbdccdf632251eb696ad7732f4e3 \
-        284a0f059a30d2c04ca5dcdd6643a491 \
-        854f4d66a29a6ab530a11acbcef5542e"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="libconfig lua jansson"
-MAINTAINER="Azure Zanculmarktum"
-EMAIL="zanculmarktum@gmail.com"
diff --git a/network/telegram/README b/network/telegram/README
index 02b7582df6..24724fba9f 100644
--- a/network/telegram/README
+++ b/network/telegram/README
@@ -1,4 +1,4 @@
 Telegram
 
-Telegram is a cloud-based mobile and desktop messaging app with a focus on
-security and speed.
+Telegram is a cloud-based mobile and desktop messaging app with a
+focus on security and speed.
diff --git a/network/telegram/telegram.SlackBuild b/network/telegram/telegram.SlackBuild
index 902ea95b0f..fa74dd617d 100644
--- a/network/telegram/telegram.SlackBuild
+++ b/network/telegram/telegram.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for Telegram
 
@@ -25,12 +25,15 @@
 
 # Modified by Mario Preksavec <mario@slackware.hr>
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=telegram
 SRCNAM=tsetup
 SRCDIR=Telegram
-VERSION=${VERSION:-1.8.1}
+VERSION=${VERSION:-4.16.6}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 case "$( uname -m )" in
   i?86) ARCH=i586 ;;
@@ -38,7 +41,11 @@ case "$( uname -m )" in
      *) ARCH=$( uname -m ) ;;
 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}
@@ -46,11 +53,10 @@ OUTPUT=${OUTPUT:-/tmp}
 case "$ARCH" in
   x86_64)
     SRC="${SRCNAM}"
-    LIBDIRSUFFIX="64"
     ;;
   i586)
     SRC="${SRCNAM}32"
-    LIBDIRSUFFIX=""
+    VERSION=2.4.4
     ;;
   *)
     echo "$ARCH is not supported."
@@ -96,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/network/telegram/telegram.info b/network/telegram/telegram.info
index bf24c59c90..c8c178e9cc 100644
--- a/network/telegram/telegram.info
+++ b/network/telegram/telegram.info
@@ -1,10 +1,10 @@
 PRGNAM="telegram"
-VERSION="1.8.1"
+VERSION="4.16.6"
 HOMEPAGE="https://telegram.org"
-DOWNLOAD="https://updates.tdesktop.com/tlinux32/tsetup32.1.8.1.tar.xz"
-MD5SUM="dd17584264a4241a540a39aba416ea29"
-DOWNLOAD_x86_64="https://updates.tdesktop.com/tlinux/tsetup.1.8.1.tar.xz"
-MD5SUM_x86_64="a6b3315480e4d0d4b8784dcfd1b78830"
+DOWNLOAD="UNSUPPORTED"
+MD5SUM=""
+DOWNLOAD_x86_64="https://updates.tdesktop.com/tlinux/tsetup.4.16.6.tar.xz"
+MD5SUM_x86_64="be51abc04a5896becbb46cffe16028a9"
 REQUIRES=""
 MAINTAINER="Willy Sudiarto Raharjo"
 EMAIL="willysr@slackbuilds.org"
diff --git a/network/telegram/telegram.png b/network/telegram/telegram.png
index ee0756db5e..e127f0f355 100644
--- a/network/telegram/telegram.png
+++ b/network/telegram/telegram.png
diff --git a/network/tgt/README b/network/tgt/README
new file mode 100644
index 0000000000..838e2479b2
--- /dev/null
+++ b/network/tgt/README
@@ -0,0 +1,7 @@
+tgt (SCSI target driver)
+
+SCSI target driver (iSCSI, Fibre Channel, SRP, etc) creation and
+maintenance.
+
+This is the user-space code.  You most probably already have the
+kernel-space code enabled.
diff --git a/network/tgt/doinst.sh b/network/tgt/doinst.sh
new file mode 100644
index 0000000000..65a8251910
--- /dev/null
+++ b/network/tgt/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 cop
+y
+    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/tgt/targets.conf.new
+preserve_perms etc/rc.d/rc.tgtd.new
diff --git a/network/tgt/slack-desc b/network/tgt/slack-desc
new file mode 100644
index 0000000000..175ba0a648
--- /dev/null
+++ b/network/tgt/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+   |-----handy-ruler------------------------------------------------------|
+tgt: tgt (SCSI target driver)
+tgt:
+tgt: SCSI target driver (iSCSI, Fibre Channel, SRP, etc) creation and
+tgt: maintenance.
+tgt:
+tgt: This is the user-space code.  You most probably already have the
+tgt: kernel-space code enabled.
+tgt:
+tgt:
+tgt:
+tgt:
diff --git a/network/tgt/tgt.SlackBuild b/network/tgt/tgt.SlackBuild
new file mode 100644
index 0000000000..b36e4f1464
--- /dev/null
+++ b/network/tgt/tgt.SlackBuild
@@ -0,0 +1,103 @@
+#!/bin/bash
+
+# Slackware build script for tgt
+
+# Copyright 2020 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=tgt
+VERSION=${VERSION:-1.0.79}
+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
+mandir=/usr/man docdir=/usr/doc/$PRGNAM-$VERSION make install DESTDIR=$PKG
+mv $PKG/etc/tgt/targets.conf $PKG/etc/tgt/targets.conf.new
+
+install -D -m 0644 scripts/initd.sample $PKG/etc/rc.d/rc.tgtd.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 \
+  README doc/README.* doc/tmf.txt \
+  $PKG/usr/doc/$PRGNAM-$VERSION
+chmod 0644 $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
+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/network/tgt/tgt.info b/network/tgt/tgt.info
new file mode 100644
index 0000000000..142c1e7a26
--- /dev/null
+++ b/network/tgt/tgt.info
@@ -0,0 +1,10 @@
+PRGNAM="tgt"
+VERSION="1.0.79"
+HOMEPAGE="http://stgt.sourceforge.net/"
+DOWNLOAD="https://github.com/fujita/tgt/archive/v1.0.79/tgt-1.0.79.tar.gz"
+MD5SUM="89483668b4841d740a5f3332a20d6dc9"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Pierre-Philipp Braun"
+EMAIL="pbraun@nethence.com"
diff --git a/network/thorium-browser/README b/network/thorium-browser/README
new file mode 100644
index 0000000000..4b4ef9dcf2
--- /dev/null
+++ b/network/thorium-browser/README
@@ -0,0 +1 @@
+Thorium (The fastest browser on Earth)
diff --git a/network/Free-Cinema/doinst.sh b/network/thorium-browser/doinst.sh
index 5fb28930db..5fb28930db 100644
--- a/network/Free-Cinema/doinst.sh
+++ b/network/thorium-browser/doinst.sh
diff --git a/network/thorium-browser/slack-desc b/network/thorium-browser/slack-desc
new file mode 100644
index 0000000000..e150a0f6ae
--- /dev/null
+++ b/network/thorium-browser/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+               |-----handy-ruler------------------------------------------------------|
+thorium-browser: thorium-browser (The fastest browser on Earth.)
+thorium-browser:
+thorium-browser: Chromium fork for Linux, Windows, MacOS, Android, and Raspberry Pi
+thorium-browser: named after radioactive element No. 90.
+thorium-browser:
+thorium-browser: Compiler optimizations include SSE4.2, AVX, AES, and modifications
+thorium-browser: to CFLAGS, LDFLAGS, thinLTO flags, import_instr_limit flags, and
+thorium-browser: PGO, as well as other compiler flags.
+thorium-browser: LLVM LOOP optimizations as -mllvm flags.
+thorium-browser:
+thorium-browser: Homepage: https://thorium.rocks/
diff --git a/network/thorium-browser/thorium-browser.SlackBuild b/network/thorium-browser/thorium-browser.SlackBuild
new file mode 100644
index 0000000000..db4d193cba
--- /dev/null
+++ b/network/thorium-browser/thorium-browser.SlackBuild
@@ -0,0 +1,100 @@
+#!/bin/bash
+
+# Slackware build script for thorium-browser
+
+# Copyright 2023  Martin Rodriguez, Guadalajara Mexico
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=thorium-browser
+VERSION=${VERSION:-122.0.6261.132}
+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}
+
+case "$ARCH" in
+  x86_64) DEBARCH="amd64" ;;
+  *) echo "Package for $ARCH architecture is not available." ; exit 1 ;;
+esac
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+
+cd $PKG
+ar p $CWD/${PRGNAM}_${VERSION}_$DEBARCH.deb data.tar.xz | tar xJv || exit 1
+cd ..
+
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -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 .
+
+# This needs to be setuid root:
+chmod 4711 $PKG/opt/chromium.org/thorium/chrome-sandbox
+
+# The cron job is for Debian/Ubuntu only:
+rm -rf $PKG/etc
+
+# Strip binaries and libraries
+find $PKG -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
+
+# Install a .desktop launcher:
+sed -i -e "s#Icon=thorium-browser#Icon=/opt/chromium.org/thorium/product_logo_256.png#" \
+  $PKG/usr/share/applications/thorium-browser.desktop
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+mv $PKG/usr/share/doc/$PRGNAM/* $PKG/usr/doc/$PRGNAM-$VERSION
+rm -rf $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/network/thorium-browser/thorium-browser.info b/network/thorium-browser/thorium-browser.info
new file mode 100644
index 0000000000..cc4bb4be0b
--- /dev/null
+++ b/network/thorium-browser/thorium-browser.info
@@ -0,0 +1,10 @@
+PRGNAM="thorium-browser"
+VERSION="122.0.6261.132"
+HOMEPAGE="https://thorium.rocks/"
+DOWNLOAD="UNSUPPORTED"
+MD5SUM=""
+DOWNLOAD_x86_64="https://github.com/Alex313031/thorium/releases/download/M122.0.6261.132/thorium-browser_122.0.6261.132_amd64.deb"
+MD5SUM_x86_64="5e02eb86b7657c1c592ff242f1a8cf12"
+REQUIRES=""
+MAINTAINER="Martin Rodriguez"
+EMAIL="slackmart@gmail.com"
diff --git a/network/thrift/README b/network/thrift/README
index eb5db97653..be9b57369b 100644
--- a/network/thrift/README
+++ b/network/thrift/README
@@ -1,11 +1,13 @@
-Apache Thrift is a software framework for scalable cross-language services
-development. It combines a software stack with a code generation engine to 
-build services that work efficiently and seamlessly among C++, Java, Python, 
-PHP, Ruby, Erlang, Perl, Haskell, C#, Cocoa, Smalltalk, and OCaml.
+Apache Thrift is a software framework for scalable cross-language
+services development. It combines a software stack with a code
+generation engine to build services that work efficiently and
+seamlessly among C++, Java, Python, PHP, Ruby, Erlang, Perl, Haskell,
+C#, Cocoa, Smalltalk, and OCaml.
 
-Other languages are not included because either they are not included in a 
-standard installation of Slackware, or because the standard way of installing 
-Thrift for that language is not via system packages; for example:
+Other languages are not included because either they are not included
+in a standard installation of Slackware, or because the standard way
+of installing Thrift for that language is not via system packages;
+for example:
  - Perl: install from CPAN
  - PHP: bundle the Thrift source in your application
  - Ruby: install with 'gem'
@@ -14,5 +16,9 @@ You will still need the Thrift compiler from this package.
 There are usage examples for more langauges at
 http://wiki.apache.org/thrift/ThriftUsage
 
-libevent is an optional dependency; if it is installed, a C++ non-blocking 
-server library will be built.
+libevent is an optional dependency; if it is installed, a C++
+non-blocking server library will be built.
+
+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/network/thrift/thrift.SlackBuild b/network/thrift/thrift.SlackBuild
index f76fb6b52c..7f9289fd58 100644
--- a/network/thrift/thrift.SlackBuild
+++ b/network/thrift/thrift.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for Apache Thrift
 
@@ -16,26 +16,36 @@
 # 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=thrift
-VERSION=${VERSION:-0.9.2}
-BUILD=${BUILD:-1}
+VERSION=${VERSION:-0.14.2}
+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"
@@ -74,22 +84,26 @@ CXXFLAGS="$SLKCFLAGS" \
   --disable-static \
   --with-c-glib \
   --without-ruby \
+  --without-rs \
   --without-php \
   --without-php_extension \
   --disable-tests \
   --build=$ARCH-slackware-linux
 
+export GO111MODULE="off"
 make
 make install-strip DESTDIR=$PKG
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
-  CHANGES LICENSE NOTICE README.md \
+  CHANGES.md CONTRIBUTING.md LANGUAGES.md LICENSE NOTICE 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/network/thrift/thrift.info b/network/thrift/thrift.info
index ec2179291c..be6bb9c634 100644
--- a/network/thrift/thrift.info
+++ b/network/thrift/thrift.info
@@ -1,8 +1,8 @@
 PRGNAM="thrift"
-VERSION="0.9.2"
+VERSION="0.14.2"
 HOMEPAGE="http://thrift.apache.org"
-DOWNLOAD="http://archive.apache.org/dist/thrift/0.9.2/thrift-0.9.2.tar.gz"
-MD5SUM="89f63cc4d0100912f4a1f8a9dee63678"
+DOWNLOAD="http://archive.apache.org/dist/thrift/0.14.2/thrift-0.14.2.tar.gz"
+MD5SUM="284a48df355aa3910687ee9b894d3ae8"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/network/thttpd/README b/network/thttpd/README
index 786fa7a4aa..b265263b91 100644
--- a/network/thttpd/README
+++ b/network/thttpd/README
@@ -2,15 +2,15 @@ thttpd is a simple, small, portable, fast, and secure HTTP server.
 Simple: It handles only the minimum necessary to implement HTTP/1.1.
 Well, maybe a little more than the minimum. Small: It has a very
 small run-time size, since it does not fork and is very careful about
-memory allocation. Portable: It compiles cleanly on most any
-Unix-like OS. Fast: In typical use it's about as fast as the best
-full-featured servers. Secure: It goes to great lengths to protect
-the web server machine against attacks and breakins from other sites.
+memory allocation. Portable: It compiles cleanly on most any Unix-like
+OS. Fast: In typical use it's about as fast as the best full-featured
+servers. Secure: It goes to great lengths to protect the web server
+machine against attacks and breakins from other sites.
 
 Notes:
 
-By default the directory to serve through HTTP will be '/var/www/thttpd',
-if you want to change it execute the SalckBuild as:
+By default the directory to serve through HTTP will be
+'/var/www/thttpd'. If you want to change it, execute the SlackBuild as:
   # WEBDIR='/opt/www' sh thttpd.SlackBuild
 
 To build and use this package the user/group 'thttpd' is required to
diff --git a/network/thttpd/thttpd.SlackBuild b/network/thttpd/thttpd.SlackBuild
index e8f412a54c..31e062b2a3 100644
--- a/network/thttpd/thttpd.SlackBuild
+++ b/network/thttpd/thttpd.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for thttpd
 
@@ -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=thttpd
 VERSION=${VERSION:-2.29}
 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}
@@ -51,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=""
@@ -162,7 +175,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 FILES INSTALL README TODO scripts $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a FILES README TODO scripts $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
@@ -180,4 +193,4 @@ mv $PKG/usr/man/man1/htpasswd.1.gz $PKG/usr/man/man1/htpasswd-$PRGNAM.1.gz
 mv $PKG/usr/sbin/htpasswd $PKG/usr/sbin/htpasswd-$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/network/tightvnc/README b/network/tightvnc/README
deleted file mode 100644
index e6132561f5..0000000000
--- a/network/tightvnc/README
+++ /dev/null
@@ -1,15 +0,0 @@
-tightvnc (VNC viewing application)
-
-TightVNC is a free remote control software package. With TightVNC, you can
-see the desktop of a remote machine and control it with your local mouse and
-keyboard, just like you would do it sitting in the front of that computer.
-
-TightVNC is:
-
-* free for both personal and commercial usage, with full source code available
-* useful in administration, tech support, education, and many other purposes
-* cross-platform, available for Windows and Unix, with Java client included
-* compatible with standard VNC software, conforming to RFB protocol specs
-
-TightVNC also ships with Xvnc, a headless X server that speaks the VNC
-protocol.
diff --git a/network/tightvnc/slack-desc b/network/tightvnc/slack-desc
deleted file mode 100644
index 11b1fc7f38..0000000000
--- a/network/tightvnc/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------------------------------------------------------|
-tightvnc: tightvnc (VNC viewing application)
-tightvnc:
-tightvnc: TightVNC is a free remote control software package. With TightVNC, you
-tightvnc: can see the desktop of a remote machine and control it with your local
-tightvnc: mouse and keyboard, just like you would do it sitting in the front of
-tightvnc: that computer.
-tightvnc:
-tightvnc:
-tightvnc:
-tightvnc:
-tightvnc:
diff --git a/network/tightvnc/tightvnc.SlackBuild b/network/tightvnc/tightvnc.SlackBuild
deleted file mode 100644
index d6219e6301..0000000000
--- a/network/tightvnc/tightvnc.SlackBuild
+++ /dev/null
@@ -1,106 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for tightvnc
-
-# Copyright 2014 Richard Ellis (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=tightvnc
-VERSION=${VERSION:-1.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 vnc_unixsrc/
-tar xvf $CWD/$PRGNAM-${VERSION}_unixsrc.tar.bz2
-cd vnc_unixsrc/
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-xmkmf
-make World
-
-cd Xvnc
-./configure \
-  --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --sysconfdir=/etc \
-  --localstatedir=/var \
-  --mandir=/usr/man \
-  --docdir=/usr/doc/$PRGNAM-$VERSION \
-  --build=$ARCH-slackware-linux
-make -j1
-
-cd ..
-
-mkdir -p $PKG/usr/bin $PKG/usr/man/man1
-./vncinstall $PKG/usr/bin $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
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION $PKG/usr/doc/$PRGNAM-$VERSION/Xvnc
-cp -a README tightvncserver.conf $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a Xvnc/README $PKG/usr/doc/$PRGNAM-${VERSION}/Xvnc/
-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/network/tightvnc/tightvnc.info b/network/tightvnc/tightvnc.info
deleted file mode 100644
index 9a7f164cf5..0000000000
--- a/network/tightvnc/tightvnc.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="tightvnc"
-VERSION="1.3.10"
-HOMEPAGE="http://www.tightvnc.com/"
-DOWNLOAD="http://www.tightvnc.com/download/1.3.10/tightvnc-1.3.10_unixsrc.tar.bz2"
-MD5SUM="397b35faad32d5246b6d44b142f8304f"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Richard Ellis"
-EMAIL="rellis@dp100.com"
diff --git a/network/tinc/README b/network/tinc/README
index 2878c5d551..c9ee36e370 100644
--- a/network/tinc/README
+++ b/network/tinc/README
@@ -2,8 +2,9 @@ tinc is a Virtual Private Network (VPN) daemon that uses tunnelling and
 encryption to create a secure private network between hosts on the
 Internet.
 
-tinc is Free Software and licensed under the GNU General Public License
-version 2 or later. Because the VPN appears to the IP level network code
-as a normal network device, there is no need to adapt  any existing software.
-This allows VPN sites to share information with each other over the
-Internet without exposing any information to others.
+tinc is Free Software and licensed under the GNU General Public
+License version 2 or later. Because the VPN appears to the IP level
+network code as a normal network device, there is no need to adapt
+any existing software. This allows VPN sites to share information
+with each other over the Internet without exposing any information
+to others.
diff --git a/network/tinc/tinc.SlackBuild b/network/tinc/tinc.SlackBuild
index 62c3ac436e..caf34eeaab 100644
--- a/network/tinc/tinc.SlackBuild
+++ b/network/tinc/tinc.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for tinc
 
@@ -31,10 +31,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=tinc
-VERSION=${VERSION:-1.0.35}
+VERSION=${VERSION:-1.0.36}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -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}
@@ -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/network/tinc/tinc.info b/network/tinc/tinc.info
index a8ea7750a3..8cd88c74d3 100644
--- a/network/tinc/tinc.info
+++ b/network/tinc/tinc.info
@@ -1,8 +1,8 @@
 PRGNAM="tinc"
-VERSION="1.0.35"
+VERSION="1.0.36"
 HOMEPAGE="https://www.tinc-vpn.org/"
-DOWNLOAD="https://www.tinc-vpn.org/packages/tinc-1.0.35.tar.gz"
-MD5SUM="c44f3eaf6264319953d0cff56f2e98d4"
+DOWNLOAD="https://www.tinc-vpn.org/packages/tinc-1.0.36.tar.gz"
+MD5SUM="535b58ee026ec9551954dcc6ed56edca"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/network/tinyirc/README b/network/tinyirc/README
new file mode 100644
index 0000000000..98b30dab40
--- /dev/null
+++ b/network/tinyirc/README
@@ -0,0 +1,11 @@
+tinyirc (tiny IRC client)
+
+A very small, stripped down IRC client. It doesn't have most of the
+more advanced commands in the ircII family of IRC clients, nor does
+it have any color, but it works, and it's tiny. It's a bare bones
+IRC client which has no editing capabilities other than backspace to
+correct typing.
+
+This SlackBuild sets the default IRC server to irc.libera.chat, port
+6667, when tinyirc is run without a server argument. However, you can
+change this by setting SERVER and/or PORT in the environment.
diff --git a/network/tinyirc/slack-desc b/network/tinyirc/slack-desc
new file mode 100644
index 0000000000..84e94f629d
--- /dev/null
+++ b/network/tinyirc/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+       |-----handy-ruler------------------------------------------------------|
+tinyirc: tinyirc (tiny IRC client)
+tinyirc:
+tinyirc: A very small, stripped down IRC client. It doesn't have most of the
+tinyirc: more advanced commands in the ircII family of IRC clients, nor does it
+tinyirc: have any color, but it works, and it's tiny.
+tinyirc:
+tinyirc: Default server and port: @SERVER@:@PORT@
+tinyirc:
+tinyirc:
+tinyirc:
+tinyirc:
diff --git a/network/tinyirc/tinyirc.SlackBuild b/network/tinyirc/tinyirc.SlackBuild
new file mode 100644
index 0000000000..db57c728b0
--- /dev/null
+++ b/network/tinyirc/tinyirc.SlackBuild
@@ -0,0 +1,106 @@
+#!/bin/bash
+
+# Slackware build script for tinyirc
+
+# Written by B. Watson (urchlay@slackware.uk)
+
+# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
+
+# 20210925 bkw: BUILD=2, change default server to libera since
+# freenode has become a bad joke. Also add SERVER and PORT env vars,
+# since someone might not agree with me.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=tinyirc
+VERSION=${VERSION:-1.1_4}
+BUILD=${BUILD:-2}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+SRCVER=${VERSION%_*}.dfsg.1
+DEBVER=${VERSION#*_}
+
+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.orig.tar.gz
+cd $PRGNAM-$SRCVER
+tar xvf $CWD/${PRGNAM}_$SRCVER-$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 {} \+
+
+for i in $( cat debian/patches/series ); do
+  patch -p1 < debian/patches/$i
+done
+
+SERVER="${SERVER:-irc.libera.chat}"
+PORT="${PORT:-6667}"
+
+# Change the default server and port to something people actually use.
+make $PRGNAM \
+  SERVER="$SERVER" \
+  PORT="$PORT" \
+  CFLAGS="$SLKCFLAGS -DPOSIX -DDO_CTCP -DCURSES -DHAVE_NCURSES" \
+  LIBS=-lncurses \
+  CC=${CC:-gcc}
+
+mkdir -p $PKG/usr/bin
+install -m0755 -s $PRGNAM $PKG/usr/bin
+
+# Derp!
+sed -i 's|left, left|left, right|' debian/$PRGNAM.1.pod
+
+mkdir -p $PKG/usr/man/man1
+pod2man -cSlackBuilds.org -s1 -r1.1 -nTINYIRC debian/$PRGNAM.1.pod | \
+  gzip -9c > $PKG/usr/man/man1/$PRGNAM.1.gz
+
+# These are text files, not word docs, don't confuse desktop software.
+rename .doc _doc.txt *.doc
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a COPYING announce *.txt $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+sed -e "s,@SERVER@,$SERVER," \
+    -e "s,@PORT@,$PORT," \
+    $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/network/tinyirc/tinyirc.info b/network/tinyirc/tinyirc.info
new file mode 100644
index 0000000000..85a4f188db
--- /dev/null
+++ b/network/tinyirc/tinyirc.info
@@ -0,0 +1,12 @@
+PRGNAM="tinyirc"
+VERSION="1.1_4"
+HOMEPAGE="https://github.com/nlaredo/tinyirc/"
+DOWNLOAD="https://deb.debian.org/debian/pool/main/t/tinyirc/tinyirc_1.1.dfsg.1.orig.tar.gz \
+          https://deb.debian.org/debian/pool/main/t/tinyirc/tinyirc_1.1.dfsg.1-4.debian.tar.xz"
+MD5SUM="b655596125a525d54f82dba6a96a84b7 \
+        e2c989de71c7324bc86fb6aa45a4d8a3"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="B. Watson"
+EMAIL="urchlay@slackware.uk"
diff --git a/network/tinyproxy/README b/network/tinyproxy/README
index 3b2d1e25ac..8c6e908bd7 100644
--- a/network/tinyproxy/README
+++ b/network/tinyproxy/README
@@ -1,7 +1,8 @@
 tinyproxy (lightweight HTTP proxy)
 
-tinyproxy is a lightweight HTTP proxy licensed under the GPL.  Designed from
-the ground up to be fast and yet small, it is an ideal solution for sites
-where a full-featured HTTP proxy is required, but the system resources
-required to run a more demanding HTTP proxy are unavailable.  tinyproxy is
-fully compatible with all existing web browsers
+tinyproxy is a lightweight HTTP proxy licensed under the GPL.
+Designed from the ground up to be fast and yet small, it is an ideal
+solution for sites where a full-featured HTTP proxy is required,
+but the system resources required to run a more demanding HTTP proxy
+are unavailable. tinyproxy is fully compatible with all existing web
+browsers
diff --git a/network/tinyproxy/tinyproxy.SlackBuild b/network/tinyproxy/tinyproxy.SlackBuild
index bde1315e0e..d47e579a14 100644
--- a/network/tinyproxy/tinyproxy.SlackBuild
+++ b/network/tinyproxy/tinyproxy.SlackBuild
@@ -1,14 +1,35 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for tinyproxy
 
 # Written by Kevin Pulo, kev@pulo.com.au
-# Public domain.
+# Copyright 2020 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=tinyproxy
-VERSION=${VERSION:-1.8.4}
+VERSION=${VERSION:-1.10.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -18,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,10 +105,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
 
-mv $PKG/etc/$PRGNAM.conf $PKG/etc/$PRGNAM.conf.new
+mv $PKG/etc/$PRGNAM/$PRGNAM.conf $PKG/etc/$PRGNAM/$PRGNAM.conf.new
 sed -i -e "s,/usr/share,&/$PRGNAM,g" \
        -e "s,/usr/share/$PRGNAM/$PRGNAM,/usr/share/$PRGNAM,g" \
-  $PKG/etc/tinyproxy.conf.new
+  $PKG/etc/$PRGNAM/tinyproxy.conf.new
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a AUTHORS COPYING ChangeLog NEWS README TODO docs/*.txt \
@@ -93,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/network/tinyproxy/tinyproxy.info b/network/tinyproxy/tinyproxy.info
index 9ed376cc94..51abf64ceb 100644
--- a/network/tinyproxy/tinyproxy.info
+++ b/network/tinyproxy/tinyproxy.info
@@ -1,10 +1,10 @@
 PRGNAM="tinyproxy"
-VERSION="1.8.4"
+VERSION="1.10.0"
 HOMEPAGE="https://tinyproxy.github.io/"
-DOWNLOAD="https://github.com/tinyproxy/tinyproxy/releases/download/1.8.4/tinyproxy-1.8.4.tar.xz"
-MD5SUM="b181e8c78cb31c2bc16b61fcf2425190"
+DOWNLOAD="https://github.com/tinyproxy/tinyproxy/releases/download/1.10.0/tinyproxy-1.10.0.tar.xz"
+MD5SUM="3a1321e4942abb9b6cb370e7c2a3c59e"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Kevin Pulo"
-EMAIL="kev@pulo.com.au"
+MAINTAINER="Michael Edie"
+EMAIL="michael@edie.io"
diff --git a/network/tixati/tixati.SlackBuild b/network/tixati/tixati.SlackBuild
index d1ce1527e6..e74e550dfd 100644
--- a/network/tixati/tixati.SlackBuild
+++ b/network/tixati/tixati.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for tixati
 
-# Copyright 2015-2018  Dimitris Zlatanidis  Orestiada, Greece
+# Copyright 2015-2023  Dimitris Zlatanidis  Orestiada, Greece
 # 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=tixati
-VERSION=${VERSION:-2.57_1}
+VERSION=${VERSION:-3.19_1}
 SRCVER=$(echo $VERSION | tr _ -)
 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}
@@ -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/network/tixati/tixati.info b/network/tixati/tixati.info
index ea8edd63b2..9a0a237b44 100644
--- a/network/tixati/tixati.info
+++ b/network/tixati/tixati.info
@@ -1,10 +1,10 @@
 PRGNAM="tixati"
-VERSION="2.57_1"
+VERSION="3.19_1"
 HOMEPAGE="https://www.tixati.com/"
-DOWNLOAD="https://download2.tixati.com/download/tixati-2.57-1.i686.manualinstall.tar.gz"
-MD5SUM="a09529fb55ed2f324a51603cab805db8"
-DOWNLOAD_x86_64="https://download2.tixati.com/download/tixati-2.57-1.x86_64.manualinstall.tar.gz"
-MD5SUM_x86_64="8b7864ad9a9839c876ac905aa6823ab4"
+DOWNLOAD="https://download2.tixati.com/download/tixati-3.19-1.i686.manualinstall.tar.gz"
+MD5SUM="a158f57f9ddf46c04b0b124a8deab266"
+DOWNLOAD_x86_64="https://download2.tixati.com/download/tixati-3.19-1.x86_64.manualinstall.tar.gz"
+MD5SUM_x86_64="4b7c80172ae7910c9a0db3b009082022"
 REQUIRES=""
 MAINTAINER="Dimitris Zlatanidis"
-EMAIL="d.zlatanidis@gmail.com"
+EMAIL="dslackw@gmail.com"
diff --git a/network/tmate/README b/network/tmate/README
index 8a704c4bfd..32453d49bc 100644
--- a/network/tmate/README
+++ b/network/tmate/README
@@ -1,5 +1,6 @@
-tmate is a fork of tmux. It provides instant terminal sharing (either read-write
-or read-only) through the server at tmate.io, or through your own server.
+tmate is a fork of tmux. It provides instant terminal sharing (either
+read-write or read-only) through the server at tmate.io, or through
+your own server.
 
 You can think of tmate as a reverse ssh tunnel accessible from anywhere.
 
diff --git a/network/tmate/tmate.SlackBuild b/network/tmate/tmate.SlackBuild
index 62847d8aa5..6daeb9ec20 100644
--- a/network/tmate/tmate.SlackBuild
+++ b/network/tmate/tmate.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for tmate
 
@@ -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=tmate
 VERSION=${VERSION:-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 the variable PRINT_PACKAGE_NAME is set, then this script will report what
+# the name of the created package would be, and then exit. This information
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; 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/network/tnfs-fuse/COPYING b/network/tnfs-fuse/COPYING
new file mode 100644
index 0000000000..b2c3b59099
--- /dev/null
+++ b/network/tnfs-fuse/COPYING
@@ -0,0 +1,23 @@
+License for tnfs-fuse:
+
+The MIT License
+
+Copyright (c) 2012 Radu Cristescu
+
+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.
diff --git a/network/tnfs-fuse/README b/network/tnfs-fuse/README
new file mode 100644
index 0000000000..d7eb799f87
--- /dev/null
+++ b/network/tnfs-fuse/README
@@ -0,0 +1,8 @@
+tnfs-fuse (client for trivial network filesystem)
+
+TNFS is a simplified Internet file transfer protocol, designed for
+limited resource usage and ease of implementation on small systems,
+such as 8-bit computers. It's simpler than NFS, SMB, or FTP. It's
+similar to TFTP, but has features TFTP lacks.
+
+This package is the Linux (and Mac, *BSD, etc) client.
diff --git a/network/tnfs-fuse/libdir.diff b/network/tnfs-fuse/libdir.diff
new file mode 100644
index 0000000000..9b1d0f5fa5
--- /dev/null
+++ b/network/tnfs-fuse/libdir.diff
@@ -0,0 +1,19 @@
+diff -Naur spectranet-tnfs-fuse-fd46ffca3281db4a0c60c04dc83c9cf2cb80bc9e/tnfs-fuse.py spectranet-tnfs-fuse-fd46ffca3281db4a0c60c04dc83c9cf2cb80bc9e.patched/tnfs-fuse.py
+--- spectranet-tnfs-fuse-fd46ffca3281db4a0c60c04dc83c9cf2cb80bc9e/tnfs-fuse.py	2013-01-27 13:02:20.000000000 -0500
++++ spectranet-tnfs-fuse-fd46ffca3281db4a0c60c04dc83c9cf2cb80bc9e.patched/tnfs-fuse.py	2022-07-18 14:47:20.902204356 -0400
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python
++#!/usr/bin/python2
+ 
+ # The MIT License
+ #
+@@ -22,6 +22,9 @@
+ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ # THE SOFTWARE.
+ 
++import sys
++sys.path.insert(0, '@LIBDIR@')
++
+ import fuse
+ fuse.fuse_python_api = (0, 2)
+ 
diff --git a/network/tnfs-fuse/slack-desc b/network/tnfs-fuse/slack-desc
new file mode 100644
index 0000000000..a211837aa1
--- /dev/null
+++ b/network/tnfs-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------------------------------------------------------|
+tnfs-fuse: tnfs-fuse (client for trivial network filesystem)
+tnfs-fuse:
+tnfs-fuse: TNFS is a simplified Internet file transfer protocol, designed for
+tnfs-fuse: limited resource usage and ease of implementation on small systems,
+tnfs-fuse: such as 8-bit computers. It's simpler than NFS, SMB, or FTP. It's
+tnfs-fuse: similar to TFTP, but has features TFTP lacks.
+tnfs-fuse:
+tnfs-fuse: This package is the Linux (and Mac, *BSD, etc) client.
+tnfs-fuse:
+tnfs-fuse:
+tnfs-fuse:
diff --git a/network/tnfs-fuse/tnfs-client.1 b/network/tnfs-fuse/tnfs-client.1
new file mode 100644
index 0000000000..86475abdca
--- /dev/null
+++ b/network/tnfs-fuse/tnfs-client.1
@@ -0,0 +1,108 @@
+.\" 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 "TNFS-CLIENT" 1 "2022-08-24" "20130127_fd46ff" "SlackBuilds.org"
+.SH NAME
+tnfs-client \- trivial network filesystem client
+.\" RST source for tnfs-client(1) man page. Convert with:
+.
+.\" rst2man.py tnfs-client.rst > tnfs-client.1
+.
+.\" rst2man.py comes from the SBo development/docutils package.
+.
+.SH SYNOPSIS
+.sp
+\fBtnfs\-client\fP [\fIhost\fP [\fIport\fP]]
+.SH DESCRIPTION
+.sp
+TNFS is a simplified Internet file transfer protocol, designed for
+simplicity and ease of implementation on small systems, such as 8\-bit
+computers. It\(aqs simpler than NFS, SMB, or FTP. It\(aqs similar to TFTP,
+but has features TFTP lacks.
+.sp
+\fBtnfs\-client\fP is a simple client for the TNFS protocol. It uses UDP
+port 16384 by default (standard for TNFS).
+.sp
+\fBtnfs\-client\fP doesn\(aqt mount the TNFS share as a directory (see
+\fBtnfs\-fuse\fP(1) for that). It has a textmode user interface similar
+to \fBftp\fP(1).
+.sp
+If \fBhost\fP is omitted, the default host is \fIvexed4.alioth.net\fP\&. If
+\fBport\fP is omitted, the default port is \fI16384\fP\&.
+.SH COMMANDS
+.sp
+The client supports these commands:
+.INDENT 0.0
+.TP
+.B \fBls\fP [\fI\-l\fP]
+List contents of current directory. With \fI\-l\fP, show details.
+.TP
+.B \fBdir\fP [\fI\-l\fP]
+Synonym for \fBls\fP\&.
+.TP
+.B \fBcd\fP \fIpath\fP
+Change working directory on server to \fIpath\fP\&.
+.TP
+.B \fBpwd\fP
+Print current working directory on server.
+.TP
+.B \fBget\fP \fIremote\-filename\fP [\fIlocal\-filename\fP]
+Download a file.
+.TP
+.B \fBput\fP \fIlocal\-filename\fP [\fIremote\-filename\fP]
+Upload a file.
+.TP
+.B \fBmkdir\fP \fIpath\fP
+Create a directory.
+.TP
+.B \fBrmdir\fP \fIpath\fP
+Delete a directory (which must be empty).
+.TP
+.B \fBquit\fP
+Exit the client.
+.UNINDENT
+.sp
+Note that there\(aqs no \fBrm\fP command, or any other way to delete
+a file. There\(aqs also no \fBlcd\fP command; you can\(aqt change the local
+working directory, so make sure you\(aqre in the right place before you
+start the client.
+.SH COPYRIGHT
+.sp
+See the file /usr/doc/tnfs\-fuse\-20130127_fd46ff/COPYING for license information.
+.SH AUTHORS
+.sp
+tnfs\-client was written by Radu Cristescu.
+.sp
+This man page written for the SlackBuilds.org project
+by B. Watson, and is licensed under the WTFPL.
+.SH SEE ALSO
+.sp
+\fBtnfs\-fuse\fP(1), \fBtnfsd\fP(1), \fBfuse\fP(8)
+.\" Generated by docutils manpage writer.
+.
diff --git a/network/tnfs-fuse/tnfs-client.rst b/network/tnfs-fuse/tnfs-client.rst
new file mode 100644
index 0000000000..216eb6a76d
--- /dev/null
+++ b/network/tnfs-fuse/tnfs-client.rst
@@ -0,0 +1,97 @@
+.. RST source for tnfs-client(1) man page. Convert with:
+..   rst2man.py tnfs-client.rst > tnfs-client.1
+.. rst2man.py comes from the SBo development/docutils package.
+
+.. |version| replace:: 20130127_fd46ff
+.. |date| date::
+
+===========
+tnfs-client
+===========
+
+---------------------------------
+trivial network filesystem client
+---------------------------------
+
+:Manual section: 1
+:Manual group: SlackBuilds.org
+:Date: |date|
+:Version: |version|
+
+SYNOPSIS
+========
+
+**tnfs-client** [*host* [*port*]]
+
+DESCRIPTION
+===========
+
+TNFS is a simplified Internet file transfer protocol, designed for
+simplicity and ease of implementation on small systems, such as 8-bit
+computers. It's simpler than NFS, SMB, or FTP. It's similar to TFTP,
+but has features TFTP lacks.
+
+**tnfs-client** is a simple client for the TNFS protocol. It uses UDP
+port 16384 by default (standard for TNFS).
+
+**tnfs-client** doesn't mount the TNFS share as a directory (see
+**tnfs-fuse**\(1) for that). It has a textmode user interface similar
+to **ftp**\(1).
+
+If **host** is omitted, the default host is *vexed4.alioth.net*. If
+**port** is omitted, the default port is *16384*.
+
+COMMANDS
+========
+
+The client supports these commands:
+
+**ls** [*-l*]
+  List contents of current directory. With *-l*, show details.
+
+**dir** [*-l*]
+  Synonym for **ls**.
+
+**cd** *path*
+  Change working directory on server to *path*.
+
+**pwd**
+  Print current working directory on server.
+
+**get** *remote-filename* [*local-filename*]
+  Download a file.
+
+**put** *local-filename* [*remote-filename*]
+  Upload a file.
+
+**mkdir** *path*
+  Create a directory.
+
+**rmdir** *path*
+  Delete a directory (which must be empty).
+
+**quit**
+  Exit the client.
+
+Note that there's no **rm** command, or any other way to delete
+a file. There's also no **lcd** command; you can't change the local
+working directory, so make sure you're in the right place before you
+start the client.
+
+COPYRIGHT
+=========
+
+See the file /usr/doc/tnfs-fuse-|version|/COPYING for license information.
+
+AUTHORS
+=======
+
+tnfs-client was written by Radu Cristescu.
+
+This man page written for the SlackBuilds.org project
+by B. Watson, and is licensed under the WTFPL.
+
+SEE ALSO
+========
+
+**tnfs-fuse**\(1), **tnfsd**\(1), **fuse**\(8)
diff --git a/network/tnfs-fuse/tnfs-fuse.1 b/network/tnfs-fuse/tnfs-fuse.1
new file mode 100644
index 0000000000..c1c939b013
--- /dev/null
+++ b/network/tnfs-fuse/tnfs-fuse.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 "TNFS-FUSE" 1 "2022-08-24" "20130127_fd46ff" "SlackBuilds.org"
+.SH NAME
+tnfs-fuse \- trivial network filesystem client
+.\" RST source for tnfs-fuse(1) man page. Convert with:
+.
+.\" rst2man.py tnfs-fuse.rst > tnfs-fuse.1
+.
+.\" rst2man.py comes from the SBo development/docutils package.
+.
+.SH SYNOPSIS
+.sp
+tnfs\-fuse \fBdirectory\fP \fB\-o address=host\fP[:\fIport\fP]
+.SH DESCRIPTION
+.sp
+TNFS is a simplified Internet file transfer protocol, designed for
+simplicity and ease of implementation on small systems, such as 8\-bit
+computers. It\(aqs simpler than NFS, SMB, or FTP. It\(aqs similar to TFTP,
+but has features TFTP lacks.
+.sp
+\fBtnfs\-fuse\fP is a client for the TNFS protocol. It uses UDP port
+16384 by default (standard for TNFS).
+.sp
+When working with mounted TNFS directories, some error messages will
+be wrong, e.g. instead of "Permission denied", you may get "Bad file
+descriptor".
+.SH OPTIONS
+.INDENT 0.0
+.TP
+.B \fB\-o address=host\fP[:\fIport\fP]
+The hostname or IP address of the TNFS server to mount. If \fI:port\fP is
+not given, the default TNFS port (16384) is used.
+.TP
+.B \fB\-o ro\fP
+Mount read\-only.
+.UNINDENT
+.sp
+\fBtnfs\-fuse\fP supports the full set of \fBfuse\fP options. See
+\fBfuse\fP(8) or \fBtnfs\-fuse \-\-help\fP for the list.
+.SH EXAMPLE
+.sp
+To mount the TNFS server at \fBfujinet.online\fP:
+.INDENT 0.0
+.INDENT 3.5
+.sp
+.nf
+.ft C
+mkdir fujinet
+tnfs\-fuse fujinet \-o address=fujinet.online
+.ft P
+.fi
+.UNINDENT
+.UNINDENT
+.sp
+Now the contents of the TNFS server are visible under fujinet/ (or
+whatever name you chose). You might also want to add \fB\-o ro\fP to mount
+read\-only.
+.SH COPYRIGHT
+.sp
+See the file /usr/doc/tnfs\-fuse\-20130127_fd46ff/COPYING for license information.
+.SH AUTHORS
+.sp
+tnfs\-fuse was written by Radu Cristescu.
+.sp
+This man page written for the SlackBuilds.org project
+by B. Watson, and is licensed under the WTFPL.
+.SH SEE ALSO
+.sp
+\fBtnfs\-client\fP(1), \fBtnfsd\fP(1), \fBfuse\fP(8)
+.\" Generated by docutils manpage writer.
+.
diff --git a/network/tnfs-fuse/tnfs-fuse.SlackBuild b/network/tnfs-fuse/tnfs-fuse.SlackBuild
new file mode 100644
index 0000000000..adac24633b
--- /dev/null
+++ b/network/tnfs-fuse/tnfs-fuse.SlackBuild
@@ -0,0 +1,113 @@
+#!/bin/bash
+
+# Slackware build script for tnfs-fuse
+
+# Written by B. Watson (urchlay@slackware.uk)
+
+# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
+
+# 20220824 bkw: BUILD=2
+# - fix man page: this client does *not* use TCP, I don't know what
+#   I was smoking when I wrote that...
+# - tnfs_client.py, the library, is also an executable. include
+#   symlink to /usr/bin and man page for it.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=tnfs-fuse
+VERSION=${VERSION:-20130127_fd46ff}
+BUILD=${BUILD:-2}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+SRCVER="$( echo $VERSION | cut -d_ -f2 )"
+SRCNAM="spectranet-tnfs-fuse"
+
+# I didn't make a separate build for python-fuse, because it would
+# conflict with the existing python-fusepy. No idea why there are
+# two incompatible fuse modules for python, and don't care either.
+# This python-fuse will get installed in a private directory so it
+# won't stomp on python-fusepy.
+LIBNAM="python-fuse"
+LIBVER="1.0.5"
+
+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
+
+LIBDIR=/usr/lib$LIBDIRSUFFIX/$PRGNAM
+PKGLIB=$PKG/$LIBDIR
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+mkdir -p $PRGNAM-$VERSION
+cd $PRGNAM-$VERSION
+TOPDIR="$(pwd)"
+tar xvf $CWD/$SRCNAM-$SRCVER*.tar.gz
+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 {} \+
+
+# first the library. remember, private directory.
+cd $LIBNAM-$LIBVER
+python2 setup.py install --root=$PKG
+mkdir -p $PKGLIB
+mv $PKG/usr/lib*/python*/site-packages/* $PKGLIB
+rm -rf $PKG/usr/lib*/python*
+strip $PKGLIB/*/*.so
+
+# now the application (which also has a library)
+cd $TOPDIR/$SRCNAM-$SRCVER*
+patch -p1 < $CWD/libdir.diff
+mkdir -p $PKG/usr/bin
+sed "s,@LIBDIR@,$LIBDIR," < $PRGNAM.py > $PKG/usr/bin/$PRGNAM
+chmod 755 $PKG/usr/bin/$PRGNAM
+install -m0755 tnfs_client.py $PKGLIB
+ln -s ../lib$LIBDIRSUFFIX/$PRGNAM/tnfs_client.py $PKG/usr/bin/tnfs-client
+
+PKGDOC=$PKG/usr/doc/$PRGNAM-$VERSION
+mkdir -p $PKGDOC
+cp -a README.md $PKGDOC
+cat $CWD/$PRGNAM.SlackBuild > $PKGDOC/$PRGNAM.SlackBuild
+
+# upstream didn't include a separate license, so copy/paste the comments.
+cat $CWD/COPYING > $PKGDOC/COPYING
+
+# man pages written for this SlackBuild.
+mkdir -p $PKG/usr/man/man1
+gzip -9c < $CWD/$PRGNAM.1 > $PKG/usr/man/man1/$PRGNAM.1.gz
+gzip -9c < $CWD/tnfs-client.1 > $PKG/usr/man/man1/tnfs-client.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/network/tnfs-fuse/tnfs-fuse.info b/network/tnfs-fuse/tnfs-fuse.info
new file mode 100644
index 0000000000..dc184ba8e3
--- /dev/null
+++ b/network/tnfs-fuse/tnfs-fuse.info
@@ -0,0 +1,12 @@
+PRGNAM="tnfs-fuse"
+VERSION="20130127_fd46ff"
+HOMEPAGE="https://github.com/Uplink03/spectranet-tnfs-fuse"
+DOWNLOAD="https://github.com/Uplink03/spectranet-tnfs-fuse/archive/fd46ff/spectranet-tnfs-fuse-fd46ffca3281db4a0c60c04dc83c9cf2cb80bc9e.tar.gz \
+          https://github.com/libfuse/python-fuse/archive/v1.0.5/python-fuse-1.0.5.tar.gz"
+MD5SUM="d544ceb6cea5df8efa53859bc7c3dba7 \
+        6b79b1dc0be30f21d62996f408cfd397"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="B. Watson"
+EMAIL="urchlay@slackware.uk"
diff --git a/network/tnfs-fuse/tnfs-fuse.rst b/network/tnfs-fuse/tnfs-fuse.rst
new file mode 100644
index 0000000000..66b1862132
--- /dev/null
+++ b/network/tnfs-fuse/tnfs-fuse.rst
@@ -0,0 +1,82 @@
+.. RST source for tnfs-fuse(1) man page. Convert with:
+..   rst2man.py tnfs-fuse.rst > tnfs-fuse.1
+.. rst2man.py comes from the SBo development/docutils package.
+
+.. |version| replace:: 20130127_fd46ff
+.. |date| date::
+
+=========
+tnfs-fuse
+=========
+
+---------------------------------
+trivial network filesystem client
+---------------------------------
+
+:Manual section: 1
+:Manual group: SlackBuilds.org
+:Date: |date|
+:Version: |version|
+
+SYNOPSIS
+========
+
+tnfs-fuse **directory** **-o address=host**\[:*port*]
+
+DESCRIPTION
+===========
+
+TNFS is a simplified Internet file transfer protocol, designed for
+simplicity and ease of implementation on small systems, such as 8-bit
+computers. It's simpler than NFS, SMB, or FTP. It's similar to TFTP,
+but has features TFTP lacks.
+
+**tnfs-fuse** is a client for the TNFS protocol. It uses UDP port
+16384 by default (standard for TNFS).
+
+When working with mounted TNFS directories, some error messages will
+be wrong, e.g. instead of "Permission denied", you may get "Bad file
+descriptor".
+
+OPTIONS
+=======
+
+**-o address=host**\[:*port*]
+  The hostname or IP address of the TNFS server to mount. If *:port* is
+  not given, the default TNFS port (16384) is used.
+
+**-o ro**
+  Mount read-only.
+
+**tnfs-fuse** supports the full set of **fuse** options. See
+**fuse**\(8) or **tnfs-fuse --help** for the list.
+
+EXAMPLE
+=======
+
+To mount the TNFS server at **fujinet.online**::
+
+  mkdir fujinet
+  tnfs-fuse fujinet -o address=fujinet.online
+
+Now the contents of the TNFS server are visible under fujinet/ (or
+whatever name you chose). You might also want to add **-o ro** to mount
+read-only.
+
+COPYRIGHT
+=========
+
+See the file /usr/doc/tnfs-fuse-|version|/COPYING for license information.
+
+AUTHORS
+=======
+
+tnfs-fuse was written by Radu Cristescu.
+
+This man page written for the SlackBuilds.org project
+by B. Watson, and is licensed under the WTFPL.
+
+SEE ALSO
+========
+
+**tnfs-client**\(1), **tnfsd**\(1), **fuse**\(8)
diff --git a/network/tnfsd/COPYING b/network/tnfsd/COPYING
new file mode 100644
index 0000000000..e6bf05a125
--- /dev/null
+++ b/network/tnfsd/COPYING
@@ -0,0 +1,41 @@
+This information copied from the C sources.
+
+License for all tnfsd source files except strlcat.c and strlcpy.c:
+
+  The MIT License
+
+  Copyright (c) 2010 Dylan Smith
+
+  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.
+
+License for strlcat.c and strlcpy.c:
+
+  Copyright (c) 1998 Todd C. Miller <Todd.Miller@courtesan.com>
+ 
+  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.
+ 
+  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.
diff --git a/network/tnfsd/README b/network/tnfsd/README
new file mode 100644
index 0000000000..1bbf964283
--- /dev/null
+++ b/network/tnfsd/README
@@ -0,0 +1,48 @@
+tnfsd (trivial network filesystem server)
+
+TNFS is a simplified Internet file transfer protocol, designed for
+limited resource usage and ease of implementation on small systems,
+such as 8-bit computers. It's simpler than NFS, SMB, or FTP. It's
+similar to TFTP, but has features TFTP lacks.
+
+Since tnfsd has no access control other than file permissions, and
+since we generally don't want clients to have write access, this
+package uses a dedicated user/group for the daemon, and another group
+to control local write access to the shared directory.
+
+Before running this SlackBuild, you must create the tnfsd user and
+the tnfsd and tnfs-files groups. Use these commands:
+
+  groupadd -g 375 tnfsd
+  groupadd -g 376 tnfs-files
+  useradd -u 375 -d /var/tnfs -c "TNFS Daemon User" \
+          -M -g tnfsd tnfsd -s /bin/false
+
+After the package is installed, add any users you want to the tnfs-files
+group. These users will be able to create files in the /var/tnfs
+directory. Example:
+
+  usermod -a -G tnfs-files joeblow
+
+After the above command, the user joeblow will have to log out and
+back in, to join the new group. Once this is done, the user can
+copy files to /var/tnfs (or ~tnfs) and they will be visible to TNFS
+clients.
+
+TNFS uses UDP port 16384, so make sure you allow incoming traffic if
+you have firewall rules.
+
+This package includes the server and an init script for running
+tnfsd as a system daemon. To start tnfsd at boot, first edit
+/etc/rc.d/rc.tnfsd, read the comments, and change the default user and
+directory if needed. Then add this to /etc/rc.d/rc.local:
+
+  [ -x /etc/rc.d/rc.tnfsd ] && /etc/rc.d/rc.tnfsd start
+
+Depending on how you're using tnfsd, it might make more sense to start
+the service as needed, as an unprivileged user, instead of running it
+as a system daemon.
+
+Usage logging is a compile-time option. By default, it's enabled. If
+you find it too chatty, you can rebuild this with USAGELOG=no set in
+the environment.
diff --git a/network/tnfsd/doinst.sh b/network/tnfsd/doinst.sh
new file mode 100644
index 0000000000..c033d262ca
--- /dev/null
+++ b/network/tnfsd/doinst.sh
@@ -0,0 +1,22 @@
+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.tnfsd.new
diff --git a/network/tnfsd/git2tarxz.sh b/network/tnfsd/git2tarxz.sh
new file mode 100644
index 0000000000..751a3f6bc9
--- /dev/null
+++ b/network/tnfsd/git2tarxz.sh
@@ -0,0 +1,75 @@
+#!/bin/sh
+
+# Create source tarball from git repo, with generated version number.
+
+# This is not a generic git2tarxz script, it's specific to tnfsd.
+# Upstream doesn't use tags for version bumps, so the version number
+# is extracted from main.c. Also, the repo contains a bunch of
+# other stuff unrelated to tnfs, which we don't include in our
+# tarball.
+
+# 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:
+PRGNAM=tnfsd
+CLONE_URL=https://github.com/FujiNetWIFI/spectranet/
+## 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 )
+
+# the version hardcoded in main.c includes the date, so
+# don't use this.
+#DATE=$( git log --date=format:%Y%m%d --format=%cd | head -1 )
+#VERSION=${DATE}_${GIT_SHA}
+
+VERMAIN="$( grep 'const  *char  *\*version' tnfs/tnfsd/main.c | cut -d'"' -f2 )"
+VERSION=${VERMAIN}_${GIT_SHA}
+
+rm -rf .git
+find . -name .gitignore -print0 | xargs -0 rm -f
+
+rm -rf tnfs/tnfsd/{vscode_sample,bin/*}
+mv tnfs/*.{md,txt} tnfs/tnfsd
+
+cd "$CWD"
+rm -rf $PRGNAM-$VERSION $PRGNAM-$VERSION.tar.xz
+mv $GITDIR/tnfs/tnfsd $PRGNAM-$VERSION
+rm -rf $GITDIR
+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/network/tnfsd/rc.tnfsd b/network/tnfsd/rc.tnfsd
new file mode 100644
index 0000000000..392856115a
--- /dev/null
+++ b/network/tnfsd/rc.tnfsd
@@ -0,0 +1,48 @@
+#!/bin/sh
+
+# rc.tnfsd, part of SBo tnfsd build, by B. Watson. WTFPL.
+
+# To start tnfsd at boot, make this script executable, then add this code
+# to /etc/rc.d/rc.local:
+#   [ -x /etc/rc.d/rc.tnfsd ] && /etc/rc.d/rc.tnfsd start
+
+# tnfsd will chroot to $TNFS_ROOT and set its user ID to $TNFS_USER,
+# and its group ID to $TNFS_USER's primary group. Since there's no
+# other form of access control, make sure the $TNFS_USER can't wrote
+# to $TNFS_ROOT, unless you want to allow everyone who can connect
+# to write/delete/overwrite everything in $TNFS_ROOT. By default,
+# /var/tnfs is owned by root:tnfs-files.
+
+TNFS_USER=tnfsd
+TNFS_ROOT=/var/tnfs
+
+# Log gets overwritten on startup (no rotation).
+TNFS_LOG=/var/log/tnfsd.log
+
+# If you don't need the log at all. But if tnfsd fails to start, you
+# won't see any error messages from it...
+#TNFS_LOG=/dev/null
+
+kill_tnfsd() {
+  /usr/bin/killall tnfsd && sleep 1
+}
+
+start_tnfsd() {
+  echo "Starting tnfsd."
+  kill_tnfsd &>/dev/null
+  /usr/bin/tnfsd "$TNFS_ROOT" -c "$TNFS_USER" >"$TNFS_LOG" </dev/null 2>&1 &
+}
+
+stop_tnfsd() {
+  echo "Stopping tnfsd."
+  kill_tnfsd
+}
+
+case "$1" in
+  ""|start) start_tnfsd ;;
+  stop)     stop_tnfsd  ;;
+  restart)  stop_tnfsd ; start_tnfsd ;;
+  *) echo "Usage: $0 stop|start|restart" 1&>2; exit 1 ;;
+esac
+
+exit 0
diff --git a/network/tnfsd/remove_broken_tcp_support.diff b/network/tnfsd/remove_broken_tcp_support.diff
new file mode 100644
index 0000000000..010f04baf4
--- /dev/null
+++ b/network/tnfsd/remove_broken_tcp_support.diff
@@ -0,0 +1,168 @@
+diff -Naur tnfsd-23.0207.1_95c5b55/config.h tnfsd-23.0207.1_95c5b55.patched/config.h
+--- tnfsd-23.0207.1_95c5b55/config.h	2023-02-08 13:35:32.000000000 -0500
++++ tnfsd-23.0207.1_95c5b55.patched/config.h	2023-02-08 13:37:37.069280883 -0500
+@@ -28,7 +28,6 @@
+ #define MAX_DHND_PER_CONN 8	/* max open directories per client */
+ #define MAX_CLIENTS	4096	/* maximum number of UDP clients */
+ #define MAX_CLIENTS_PER_IP 4096 /* maximum number of UDP clients from single IP */
+-#define MAX_TCP_CONN	256	/* Maximum number of TCP clients */
+ #define SESSION_TIMEOUT 21600 /* Sessions are thrown out after no contact for this many seconds. 0 = no timeout */
+ #define TNFS_HEADERSZ	4	/* minimum header size */
+ #define TNFS_MAX_PAYLOAD (MAXMSGSZ - TNFS_HEADERSZ - 1) /* Maximum usuable payload in a UDP datagram (-1 for status byte) */
+diff -Naur tnfsd-23.0207.1_95c5b55/datagram.c tnfsd-23.0207.1_95c5b55.patched/datagram.c
+--- tnfsd-23.0207.1_95c5b55/datagram.c	2023-02-08 13:35:32.000000000 -0500
++++ tnfsd-23.0207.1_95c5b55.patched/datagram.c	2023-02-08 13:40:57.701262001 -0500
+@@ -50,7 +50,6 @@
+ #include "tnfs_file.h"
+ 
+ int sockfd;		 /* UDP global socket file descriptor */
+-int tcplistenfd; /* TCP listening socket file descriptor */
+ 
+ tnfs_cmdfunc dircmd[NUM_DIRCMDS] =
+ 	{&tnfs_opendir, &tnfs_readdir, &tnfs_closedir,
+@@ -141,23 +140,6 @@
+ 	if (bind(sockfd, (struct sockaddr *)&servaddr, sizeof(servaddr)) < 0)
+ 		die("Unable to bind");
+ 
+-	/* Create the TCP socket */
+-	tcplistenfd = socket(AF_INET, SOCK_STREAM, 0);
+-	if (tcplistenfd < 0)
+-	{
+-		die("Unable to create TCP socket");
+-	}
+-
+-	memset(&servaddr, 0, sizeof(servaddr));
+-	servaddr.sin_family = AF_INET;
+-	servaddr.sin_addr.s_addr = htons(INADDR_ANY);
+-	servaddr.sin_port = htons(TNFSD_PORT);
+-	if (bind(tcplistenfd, (struct sockaddr *)&servaddr,
+-			 sizeof(servaddr)) < 0)
+-	{
+-		die("Unable to bind TCP socket");
+-	}
+-	listen(tcplistenfd, 5);
+ }
+ 
+ void tnfs_mainloop()
+@@ -165,25 +147,13 @@
+ 	int readyfds, i;
+ 	fd_set fdset;
+ 	fd_set errfdset;
+-	int tcpsocks[MAX_TCP_CONN];
+-
+-	memset(&tcpsocks, 0, sizeof(tcpsocks));
+ 
+ 	while (1)
+ 	{
+ 		FD_ZERO(&fdset);
+ 
+-		/* add UDP socket and TCP listen socket to fdset */
++		/* add UDP socket to fdset */
+ 		FD_SET(sockfd, &fdset);
+-		FD_SET(tcplistenfd, &fdset);
+-
+-		for (i = 0; i < MAX_TCP_CONN; i++)
+-		{
+-			if (tcpsocks[i])
+-			{
+-				FD_SET(tcpsocks[i], &fdset);
+-			}
+-		}
+ 
+ 		FD_COPY(&fdset, &errfdset);
+ 		if ((readyfds = select(FD_SETSIZE, &fdset, NULL, &errfdset, NULL)) != 0)
+@@ -199,55 +169,10 @@
+ 			{
+ 				tnfs_handle_udpmsg();
+ 			}
+-			/* Incoming TCP connection? */
+-			else if (FD_ISSET(tcplistenfd, &fdset))
+-			{
+-				tcp_accept(&tcpsocks[0]);
+-			}
+-			else
+-			{
+-				for (i = 0; i < MAX_TCP_CONN; i++)
+-				{
+-					if (tcpsocks[i])
+-					{
+-						if (FD_ISSET(tcpsocks[i], &fdset))
+-						{
+-							tnfs_handle_tcpmsg(tcpsocks[i]);
+-						}
+-					}
+-				}
+-			}
+ 		}
+ 	}
+ }
+ 
+-void tcp_accept(int *socklist)
+-{
+-	int acc_fd, i;
+-	struct sockaddr_in cli_addr;
+-	socklen_t cli_len = sizeof(cli_addr);
+-	int *fdptr;
+-
+-	acc_fd = accept(tcplistenfd, (struct sockaddr *)&cli_addr, &cli_len);
+-	if (acc_fd < 1)
+-	{
+-		fprintf(stderr, "WARNING: unable to accept TCP connection\n");
+-		return;
+-	}
+-
+-	fdptr = socklist;
+-	for (i = 0; i < MAX_TCP_CONN; i++)
+-	{
+-		if (*fdptr == 0)
+-		{
+-			*fdptr = acc_fd;
+-			return;
+-		}
+-	}
+-
+-	/* tell the client 'too many connections' */
+-}
+-
+ void tnfs_handle_udpmsg()
+ {
+ 	socklen_t len;
+@@ -273,15 +198,6 @@
+ 	*(rxbuf + rxbytes) = 0;
+ }
+ 
+-void tnfs_handle_tcpmsg(int cli_fd)
+-{
+-	char buf[255];
+-	int sz;
+-
+-	sz = read(cli_fd, buf, sizeof(buf));
+-	printf("DEBUG: rx of tcpmsg: %d bytes: %s\n", sz, buf);
+-}
+-
+ void tnfs_decode(struct sockaddr_in *cliaddr, int rxbytes, unsigned char *rxbuf)
+ {
+ 	Header hdr;
+diff -Naur tnfsd-23.0207.1_95c5b55/datagram.h tnfsd-23.0207.1_95c5b55.patched/datagram.h
+--- tnfsd-23.0207.1_95c5b55/datagram.h	2023-02-08 13:35:32.000000000 -0500
++++ tnfsd-23.0207.1_95c5b55.patched/datagram.h	2023-02-08 13:39:55.229267881 -0500
+@@ -51,8 +51,6 @@
+ void tnfs_sockinit();
+ void tnfs_mainloop();
+ void tnfs_handle_udpmsg();
+-void tcp_accept(int *fdlist);
+-void tnfs_handle_tcpmsg(int cli_fd);
+ void tnfs_decode(struct sockaddr_in *cliaddr, 
+ 		int rxbytes, unsigned char *rxbuf);
+ void tnfs_invalidsession(Header *hdr);
+diff -Naur tnfsd-23.0207.1_95c5b55/tnfs.h tnfsd-23.0207.1_95c5b55.patched/tnfs.h
+--- tnfsd-23.0207.1_95c5b55/tnfs.h	2023-02-08 13:35:32.000000000 -0500
++++ tnfsd-23.0207.1_95c5b55.patched/tnfs.h	2023-02-08 13:40:15.637265960 -0500
+@@ -136,7 +136,6 @@
+ #endif
+ 	int lastmsgsz;			/* last message's size inc. hdr */
+ 	uint8_t lastseqno;		/* last sequence number */
+-	uint8_t isTCP;			/* uses the TCP transport */
+ } Session;
+ 
+ typedef struct _header
diff --git a/network/tnfsd/slack-desc b/network/tnfsd/slack-desc
new file mode 100644
index 0000000000..267872fd63
--- /dev/null
+++ b/network/tnfsd/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+     |-----handy-ruler------------------------------------------------------|
+tnfsd: tnfsd (trivial network filesystem server)
+tnfsd:
+tnfsd: TNFS is a simplified Internet file transfer protocol, designed for
+tnfsd: simplicity and ease of implementation on small systems, such as 8-bit
+tnfsd: computers. It's simpler than NFS, SMB, or FTP. It's similar to TFTP,
+tnfsd: but has features TFTP lacks.
+tnfsd:
+tnfsd: TNFS uses UDP port 16384, so make sure you allow incoming traffic if
+tnfsd: you have firewall rules.
+tnfsd:
+tnfsd:
diff --git a/network/tnfsd/tnfsd.1 b/network/tnfsd/tnfsd.1
new file mode 100644
index 0000000000..b8f41d2ed7
--- /dev/null
+++ b/network/tnfsd/tnfsd.1
@@ -0,0 +1,103 @@
+.\" 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 "TNFSD" 1 "2023-02-08" "23.0207.1_95c5b55" "SlackBuilds.org"
+.SH NAME
+tnfsd \- trivial network filesystem daemon
+.\" RST source for tnfsd(1) man page. Convert with:
+.
+.\" rst2man.py tnfsd.rst > tnfsd.1
+.
+.SH SYNOPSIS
+.sp
+tnfsd \fBdirectory\fP [\fB\-c\fP \fIusername\fP]
+.SH DESCRIPTION
+.sp
+TNFS is a simplified Internet file transfer protocol, designed for
+simplicity and ease of implementation on small systems, such as 8\-bit
+computers. It\(aqs simpler than NFS, SMB, or FTP. It\(aqs similar to TFTP,
+but has features TFTP lacks.
+.sp
+\fBtnfsd\fP is the server for the TNFS protocol. It listens for clients
+on UDP port 16384. In theory, the protocol supports TCP connections,
+but this hasn\(aqt been implemented yet.
+.sp
+The mandatory \fBdirectory\fP option is the root of the TNFS filesystem
+tree.
+.sp
+The \fB\-c\fP \fIusername\fP option requires \fBtnfsd\fP to be run as
+\fIroot\fP\&. If given, \fBtnfsd\fP will \fBchroot\fP(2) to the \fIdirectory\fP,
+then drop its root privileges and run as the \fIusername\fP user instead.
+.sp
+Even without \fBchroot\fP, \fBtnfsd\fP will not deliberately allow access
+to files outside the \fIdirectory\fP\&. The \fB\-c\fP option is a safety net,
+in case there\(aqs a bug in \fBtnfsd\fP that allows such access (currently,
+no such bug is known of).
+.sp
+Note that \fBtnfsd\fP can be started by a normal user, since it uses an
+unprivileged UDP port. The \fB\-c\fP option won\(aqt work in this case.
+.sp
+\fBtnfsd\fP logs various information to standard error. If compiled with
+\fI\-DUSAGE_LOG\fP, the log includes all mount, umount, and file transfer
+requests including the client IP addresses.
+.SH LIMITATIONS
+.sp
+\fBtnfsd\fP is designed to be simple, so the following list of
+limitations should not be read as complaints or feature requests.
+.sp
+There is no way to run multiple \fBtnfsd\fP instances on the same
+host, not even on a multi\-homed host. The default UDP port cannot
+be changed; neither can the IP address used for binding (which is
+\fI0.0.0.0\fP, aka \fIINADDR_ANY\fP). Also, there\(aqs no concept of virtual
+hosts. If you \fIreally\fP want to run multiple instances, use containers
+or virtual machines.
+.sp
+There\(aqs no way to limit which hosts may access \fBtnfsd\fP using any
+mechanism such as \fBtcpd\fP(8). Firewall rules may be used instead,
+e.g. \fBiptables\fP(8).
+.sp
+There isn\(aqt a way to share a directory read\-only with the current
+\fBtnfsd\fP implementation. However, filesystem permissions can be used
+to prevent the daemon from writing to the shared directory.
+.SH COPYRIGHT
+.sp
+See the file /usr/doc/tnfsd\-23.0207.1_95c5b55/COPYING for license information.
+.SH AUTHORS
+.sp
+tnfsd was written by Dylan Smith.
+.sp
+This man page written for the SlackBuilds.org project
+by B. Watson, and is licensed under the WTFPL.
+.SH SEE ALSO
+.sp
+\fBtnfs\-fuse\fP(1), \fBfujinet\-pc\fP(1)
+.sp
+/usr/doc/tnfsd\-23.0207.1_95c5b55/tnfs\-protocol.md
+.\" Generated by docutils manpage writer.
+.
diff --git a/network/tnfsd/tnfsd.SlackBuild b/network/tnfsd/tnfsd.SlackBuild
new file mode 100644
index 0000000000..cc841748c9
--- /dev/null
+++ b/network/tnfsd/tnfsd.SlackBuild
@@ -0,0 +1,144 @@
+#!/bin/bash
+
+# Slackware build script for tnfsd
+
+# Written by B. Watson (urchlay@slackware.uk)
+
+# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
+
+# 20230208 bkw: update for v23.0207.1_95c5b55.
+# - this is a security update, see:
+#   https://forums.atariage.com/topic/347648-tnfsd-directory-listing-vulnerability/
+# - use self-hosted source, with the non-tnfsd-related stuff removed.
+
+# 20220818 bkw: BUILD=2
+# - remove TCP support entirely. it's incomplete & thoroughly broken.
+# - mention UDP port 16384 in slack-desc.
+
+# Note to self: tnfs-perl/tnfsd.pl looks interesting, but it lacks
+# the ability to chroot and set a new user ID. Leave it out of
+# the package. The tnfs-fuseclient/ is empty except a README, and
+# tnfsd.test/ looks like an ancient version from 2010.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=tnfsd
+VERSION=${VERSION:-23.0207.1_95c5b55}
+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
+
+uid_gid_err() {
+  cat <<EOF
+Before running this SlackBuild, you must create the tnfsd user and
+the tnfsd and tnfs-files groups. Use these commands:
+
+  groupadd -g 375 tnfsd
+  groupadd -g 376 tnfs-files
+  useradd -u 375 -d /var/tnfs -c "TNFS Daemon User" \
+          -M -g tnfsd tnfsd -s /bin/false
+EOF
+  exit 1
+}
+
+chkgrp() {
+  getent group "$1"  &>/dev/null || uid_gid_err
+}
+
+chkuser() {
+  getent passwd "$1" &>/dev/null || uid_gid_err
+}
+
+chkgrp  tnfsd
+chkgrp  tnfs-files
+chkuser tnfsd
+
+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 {} \+
+
+# 20220818 bkw: After messing with this for a while, I've discovered
+# that TCP *just doesn't work*. It'll listen and accept TCP
+# connections, but it never actually *does* anything with data
+# received via TCP (reads and discards it). Also, it never notices
+# when a TCP connection is closed, instead getting stuck in an
+# infinite loop eating 100% of one core... and logging massive
+# amounts of debug messages to stdout (like 2-3GB per minute). Since
+# it's non-functional anyway, this patch just dikes out TCP support
+# completely. So far as I know, there are no TNFS clients which use
+# TCP anyway.
+# 20230208 bkw: reworked this patch for the new source.
+patch -p1 < $CWD/remove_broken_tcp_support.diff
+
+[ "${USAGELOG:-yes}" = "yes" ] && SLKCFLAGS+=" -DUSAGELOG"
+sed -i "s,-Wall,& $SLKCFLAGS," Makefile
+mkdir -p bin
+make OS=LINUX
+
+PKGDOC=$PKG/usr/doc/$PRGNAM-$VERSION
+PKGBIN=$PKG/usr/bin
+PKGMAN1=$PKG/usr/man/man1
+PKGRCD=$PKG/etc/rc.d
+PKGVAR=$PKG/var/tnfs
+mkdir -p $PKGDOC $PKGBIN $PKGMAN1 $PKGRCD $PKGVAR
+install -s -m0755 bin/tnfsd $PKGBIN/tnfsd
+cp -a *.md *.txt $PKGDOC
+cat $CWD/$PRGNAM.SlackBuild > $PKGDOC/$PRGNAM.SlackBuild
+
+mkdir -p $PKGVAR
+chown root:tnfs-files $PKGVAR
+chmod 1775 $PKGVAR
+
+# upstream license only exists in C comments, so I included this:
+cat $CWD/COPYING > $PKGDOC/COPYING
+
+# man page written for this SlackBuild.
+gzip -9c < $CWD/$PRGNAM.1 > $PKGMAN1/$PRGNAM.1.gz
+
+install -oroot -groot -m0755 $CWD/rc.$PRGNAM $PKGRCD/rc.$PRGNAM.new
+
+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/network/tnfsd/tnfsd.info b/network/tnfsd/tnfsd.info
new file mode 100644
index 0000000000..a8cb27219e
--- /dev/null
+++ b/network/tnfsd/tnfsd.info
@@ -0,0 +1,10 @@
+PRGNAM="tnfsd"
+VERSION="23.0207.1_95c5b55"
+HOMEPAGE="https://github.com/FujiNetWIFI/spectranet/"
+DOWNLOAD="https://slackware.uk/~urchlay/src/tnfsd-23.0207.1_95c5b55.tar.xz"
+MD5SUM="667313c10c9d809e33ad58c6a59998b7"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="B. Watson"
+EMAIL="urchlay@slackware.uk"
diff --git a/network/tnfsd/tnfsd.rst b/network/tnfsd/tnfsd.rst
new file mode 100644
index 0000000000..23dcb6b28b
--- /dev/null
+++ b/network/tnfsd/tnfsd.rst
@@ -0,0 +1,95 @@
+.. RST source for tnfsd(1) man page. Convert with:
+..   rst2man.py tnfsd.rst > tnfsd.1
+
+.. |version| replace:: 23.0207.1_95c5b55
+.. |date| date::
+
+=====
+tnfsd
+=====
+
+---------------------------------
+trivial network filesystem daemon
+---------------------------------
+
+:Manual section: 1
+:Manual group: SlackBuilds.org
+:Date: |date|
+:Version: |version|
+
+SYNOPSIS
+========
+
+tnfsd **directory** [**-c** *username*]
+
+DESCRIPTION
+===========
+
+TNFS is a simplified Internet file transfer protocol, designed for
+simplicity and ease of implementation on small systems, such as 8-bit
+computers. It's simpler than NFS, SMB, or FTP. It's similar to TFTP,
+but has features TFTP lacks.
+
+**tnfsd** is the server for the TNFS protocol. It listens for clients
+on UDP port 16384. In theory, the protocol supports TCP connections,
+but this hasn't been implemented yet.
+
+The mandatory **directory** option is the root of the TNFS filesystem
+tree.
+
+The **-c** *username* option requires **tnfsd** to be run as
+*root*. If given, **tnfsd** will **chroot**\(2) to the *directory*,
+then drop its root privileges and run as the *username* user instead.
+
+Even without **chroot**, **tnfsd** will not deliberately allow access
+to files outside the *directory*. The **-c** option is a safety net,
+in case there's a bug in **tnfsd** that allows such access (currently,
+no such bug is known of).
+
+Note that **tnfsd** can be started by a normal user, since it uses an
+unprivileged UDP port. The **-c** option won't work in this case.
+
+**tnfsd** logs various information to standard error. If compiled with
+*-DUSAGE_LOG*, the log includes all mount, umount, and file transfer
+requests including the client IP addresses.
+
+LIMITATIONS
+===========
+
+**tnfsd** is designed to be simple, so the following list of
+limitations should not be read as complaints or feature requests.
+
+There is no way to run multiple **tnfsd** instances on the same
+host, not even on a multi-homed host. The default UDP port cannot
+be changed; neither can the IP address used for binding (which is
+*0.0.0.0*, aka *INADDR_ANY*). Also, there's no concept of virtual
+hosts. If you *really* want to run multiple instances, use containers
+or virtual machines.
+
+There's no way to limit which hosts may access **tnfsd** using any
+mechanism such as **tcpd**\(8). Firewall rules may be used instead,
+e.g. **iptables**\(8).
+
+There isn't a way to share a directory read-only with the current
+**tnfsd** implementation. However, filesystem permissions can be used
+to prevent the daemon from writing to the shared directory.
+
+COPYRIGHT
+=========
+
+See the file /usr/doc/tnfsd-|version|/COPYING for license information.
+
+AUTHORS
+=======
+
+tnfsd was written by Dylan Smith.
+
+This man page written for the SlackBuilds.org project
+by B. Watson, and is licensed under the WTFPL.
+
+SEE ALSO
+========
+
+**tnfs-fuse**\(1), **fujinet-pc**\(1)
+
+/usr/doc/tnfsd-|version|/tnfs-protocol.md
diff --git a/network/tnftp/tnftp.SlackBuild b/network/tnftp/tnftp.SlackBuild
index 3b6f930511..58b3004221 100644
--- a/network/tnftp/tnftp.SlackBuild
+++ b/network/tnftp/tnftp.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for tnftp
 
@@ -21,18 +21,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.
 
-# Now maintained by B. Watson <yalhcru@gmail.com>.
+# Now maintained by B. Watson <urchlay@slackware.uk>.
 
+# 20230912 bkw: update for v20230507.
+# 20210926 bkw: update for v20210827.
+# 20201024 bkw: update for v20200705.
 # 20180629 bkw:
 # - Take over maintenance.
 # - Add 'todo' to docdir, BUILD=2.
 # - Build with optional SOCKS support if dante is installed.
 # - Script simplification.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=tnftp
-VERSION=${VERSION:-20151004}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-20230507}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -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}
@@ -70,11 +80,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 {} \+
 
 # ./configure --enable-ipv6 --with-socks
 #   configure: WARNING: IPv6 is incompatible with socks, disabling IPv6 support
@@ -83,7 +90,14 @@ find -L . \
 # /usr/bin/tnftp, and tell the user he can call the socks one by name,
 # or replace the symlink.
 
-# These configure options are used for both builds:
+# These configure options are used for both builds. A word about libedit:
+# --enable-editcomplete enables linking with the system libedit (if it
+# exists). If there is no system libedit, it builds and links with the
+# bundled libedit in the tnftp source. To avoid nasty surprises
+# caused by libedit changes (since libedit is not one of my builds),
+# I'm going to force it to use the bundled libedit. The disadvantage
+# is that it doubles the sizes of the binaries, but they're still well
+# under 1MB each.
 runconfig() {
   CFLAGS="$SLKCFLAGS" \
   CXXFLAGS="$SLKCFLAGS" \
@@ -95,6 +109,7 @@ runconfig() {
     --docdir=/usr/doc/$PRGNAM-$VERSION \
     --build=$ARCH-slackware-linux \
     --enable-editcomplete \
+    --with-local-libedit \
     --enable-ssl \
     "$@"
 }
@@ -107,6 +122,7 @@ gzip -9 $PKG/usr/man/man1/$PRGNAM.1
 
 mv $PKG/usr/bin/$PRGNAM $PKG/usr/bin/$PRGNAM.ipv6
 ln -s $PRGNAM.ipv6 $PKG/usr/bin/$PRGNAM
+ln -s $PRGNAM.1.gz $PKG/usr/man/man1/$PRGNAM.ipv6.1.gz
 
 # 2nd build, with socks but no ipv6, if dante is installed and
 # the user hasn't set SOCKS=no. Only the binary needs to be
@@ -117,6 +133,7 @@ if [ "${SOCKS:-yes}" = "yes" -a -e /usr/include/socks.h ]; then
   runconfig --disable-ipv6 --with-socks
   make
   install -s src/$PRGNAM $PKG/usr/bin/$PRGNAM.socks
+  ln -s $PRGNAM.1.gz $PKG/usr/man/man1/$PRGNAM.socks.1.gz
 else
   WITHSOCKS="without"
 fi
@@ -129,4 +146,4 @@ mkdir -p $PKG/install
 sed "s,@WITHSOCKS@,$WITHSOCKS," $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/network/tnftp/tnftp.info b/network/tnftp/tnftp.info
index ab6241890a..0057348131 100644
--- a/network/tnftp/tnftp.info
+++ b/network/tnftp/tnftp.info
@@ -1,10 +1,10 @@
 PRGNAM="tnftp"
-VERSION="20151004"
-HOMEPAGE="ftp://ftp.netbsd.org/pub/NetBSD/misc/lukemftp"
-DOWNLOAD="ftp://ftp.netbsd.org/pub/NetBSD/misc/lukemftp/tnftp-20151004.tar.gz"
-MD5SUM="a49fbe752318d5a7893f900046ea00d5"
+VERSION="20230507"
+HOMEPAGE="https://ftp.netbsd.org/pub/NetBSD/misc/lukemftp"
+DOWNLOAD="https://ftp.netbsd.org/pub/NetBSD/misc/lukemftp/tnftp-20230507.tar.gz"
+MD5SUM="c95e9a8f8808122c5d8ada43bd5db2c7"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
 MAINTAINER="B. Watson"
-EMAIL="yalhcru@gmail.com"
+EMAIL="urchlay@slackware.uk"
diff --git a/network/tntnet/doinst.sh b/network/tntnet/doinst.sh
index 6a3d11314c..8a616bc76c 100644
--- a/network/tntnet/doinst.sh
+++ b/network/tntnet/doinst.sh
@@ -11,17 +11,4 @@ config() {
   # 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/tntnet/mime.conf.new
-config etc/tntnet/tntnet.conf.new
-preserve_perms etc/rc.d/rc.tntnet.new
+config etc/tntnet/tntnet.xml.new
diff --git a/network/tntnet/tntnet.SlackBuild b/network/tntnet/tntnet.SlackBuild
index ea6d7f1d7d..6d3f05a714 100644
--- a/network/tntnet/tntnet.SlackBuild
+++ b/network/tntnet/tntnet.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for tntnet
 
@@ -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=tntnet
-VERSION=${VERSION:-2.2.1}
+VERSION=${VERSION:-3.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"
@@ -85,10 +95,10 @@ CXXFLAGS="$SLKCFLAGS" \
 make
 make install DESTDIR=$PKG
 
+rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la
+
 mv $PKG/etc/$PRGNAM/$PRGNAM.xml{,.new}
 sed -i "s|www-data|apache|" $PKG/etc/$PRGNAM/$PRGNAM.xml.new
-install -m 0755 -D $PKG/etc/init.d/$PRGNAM $PKG/etc/rc.d/rc.$PRGNAM.new
-rm -fr $PKG/etc/init.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
@@ -98,7 +108,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 ChangeLog COPYING INSTALL NEWS README TODO \
+  AUTHORS ChangeLog COPYING INSTALL README \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
@@ -107,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/network/tntnet/tntnet.info b/network/tntnet/tntnet.info
index d320231b69..6b2651354e 100644
--- a/network/tntnet/tntnet.info
+++ b/network/tntnet/tntnet.info
@@ -1,8 +1,8 @@
 PRGNAM="tntnet"
-VERSION="2.2.1"
+VERSION="3.0"
 HOMEPAGE="http://www.tntnet.org/"
-DOWNLOAD="http://www.tntnet.org/download/tntnet-2.2.1.tar.gz"
-MD5SUM="febe799675c1b8b2f7259bad30cf6f23"
+DOWNLOAD="http://www.tntnet.org/download/tntnet-3.0.tar.gz"
+MD5SUM="7119835c4cf978ab321e48ca10bbe421"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="cxxtools"
diff --git a/network/tokodon/README b/network/tokodon/README
new file mode 100644
index 0000000000..d84bd1b3a3
--- /dev/null
+++ b/network/tokodon/README
@@ -0,0 +1,8 @@
+tokodon (Mastodon client for Plasma and Plasma Mobile)
+
+A modern client for Mastodon and other decentralized servers that
+implement its API (such as Pixelfed).
+
+NOTE: This is the latest supported version for Slackware 15.0 unless
+libraries/kirigami-addons can be updated, which requires Plasma
+Framework in Slackware to be updated to 5.91 or higher.
diff --git a/network/tokodon/doinst.sh b/network/tokodon/doinst.sh
new file mode 100644
index 0000000000..65c7e2eeb9
--- /dev/null
+++ b/network/tokodon/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/network/tokodon/slack-desc b/network/tokodon/slack-desc
new file mode 100644
index 0000000000..18a81c984d
--- /dev/null
+++ b/network/tokodon/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+       |-----handy-ruler------------------------------------------------------|
+tokodon: tokodon (Mastodon client for Plasma and Plasma Mobile)
+tokodon:
+tokodon: A modern client for Mastodon and other decentralized servers that
+tokodon: implement its API (such as Pixelfed).
+tokodon:
+tokodon: HOMEPAGE: https://github.com/KDE/tokodon
+tokodon:
+tokodon:
+tokodon:
+tokodon:
+tokodon:
diff --git a/network/tokodon/tokodon.SlackBuild b/network/tokodon/tokodon.SlackBuild
new file mode 100644
index 0000000000..4de5ded079
--- /dev/null
+++ b/network/tokodon/tokodon.SlackBuild
@@ -0,0 +1,111 @@
+#!/bin/bash
+
+# Slackware build script for tokodon
+
+# Copyright 2023 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.
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=tokodon
+VERSION=${VERSION:-22.09}
+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|KWindowSystem::updateStartupId(view);|view->show();|' src/main.cpp
+sed -i 's|KWindowSystem::activateWindow(view)|view->raise();|' src/main.cpp
+
+mkdir -p build
+cd build
+  cmake \
+    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DKDE_INSTALL_LIBDIR=${LIBDIRSUFFIX} \
+    -DKDE_INSTALL_USE_QT_SYS_PATHS=ON \
+    -DCMAKE_BUILD_TYPE=Release ..
+  make
+  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
+
+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
+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/network/tokodon/tokodon.info b/network/tokodon/tokodon.info
new file mode 100644
index 0000000000..036bc82274
--- /dev/null
+++ b/network/tokodon/tokodon.info
@@ -0,0 +1,10 @@
+PRGNAM="tokodon"
+VERSION="22.09"
+HOMEPAGE="https://github.com/KDE/tokodon"
+DOWNLOAD="https://github.com/KDE/tokodon/archive/refs/tags/v22.09/tokodon-22.09.tar.gz"
+MD5SUM="71c1826bb9a6d0c5f042d46613c1f594"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="kirigami-addons"
+MAINTAINER="Jeremy Hansen"
+EMAIL="jebrhansen+SBo@gmail.com"
diff --git a/network/toot/README b/network/toot/README
new file mode 100644
index 0000000000..43f98fab03
--- /dev/null
+++ b/network/toot/README
@@ -0,0 +1 @@
+Toot is a python-based command line and TUI client for Mastodon servers.
diff --git a/network/toot/slack-desc b/network/toot/slack-desc
new file mode 100644
index 0000000000..adcd81fc00
--- /dev/null
+++ b/network/toot/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+    |-----handy-ruler------------------------------------------------------|
+toot: toot (a Mastodon CLI client)
+toot:
+toot: Toot is a CLI and TUI tool for interacting with Mastodon instances
+toot: from the command line.
+toot:
+toot:
+toot:
+toot:
+toot:
+toot:
+toot:
diff --git a/network/toot/toot.SlackBuild b/network/toot/toot.SlackBuild
new file mode 100644
index 0000000000..9d054974c0
--- /dev/null
+++ b/network/toot/toot.SlackBuild
@@ -0,0 +1,72 @@
+#!/bin/bash
+
+# Slackware build script for toot
+
+# Copyright 2022-2024, Kevin Bryant <sultmhoor+SB@gmail.com>, Michigan, 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=toot
+VERSION=${VERSION:-0.41.1}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+ARCH=${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 $PKG/usr/man
+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
+
+rm -rf $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
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/network/toot/toot.info b/network/toot/toot.info
new file mode 100644
index 0000000000..3f62da853f
--- /dev/null
+++ b/network/toot/toot.info
@@ -0,0 +1,10 @@
+PRGNAM="toot"
+VERSION="0.41.1"
+HOMEPAGE="https://github.com/ihabunek/toot"
+DOWNLOAD="https://github.com/ihabunek/toot/releases/download/0.41.1/toot-0.41.1.tar.gz"
+MD5SUM="a6dfd7c8e5bb78571049be71d4eb5445"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="BeautifulSoup4 python3-wcwidth python-urwid python3-tomlkit"
+MAINTAINER="Kevin Bryant"
+EMAIL="sultmhoor+SB@gmail.com"
diff --git a/network/tor-browser/README b/network/tor-browser/README
index 9fc15dbcf5..ca607830de 100644
--- a/network/tor-browser/README
+++ b/network/tor-browser/README
@@ -3,9 +3,4 @@ without needing to install any software.
 It can run off a USB flash drive, comes with a pre-configured web
 browser to protect your anonymity, and is self-contained.
 
-By default, this package will build en-US version.
-If you want to build other language, eg. France, download the
-appropriate source and run :
-PRGLANG=fr ./tor-browser.SlackBuild
-
-Tor Browser 8.x is based on Firefox 60-ESR Release
+Tor Browser 13.x is based on Firefox 115.6-ESR Release
diff --git a/network/tor-browser/tor-browser.SlackBuild b/network/tor-browser/tor-browser.SlackBuild
index 430759d2c8..caf8e795e1 100644
--- a/network/tor-browser/tor-browser.SlackBuild
+++ b/network/tor-browser/tor-browser.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for tor-browser
 
-# Copyright 2014-2019 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
+# Copyright 2014-2023 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,31 +22,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=tor-browser
-VERSION=${VERSION:-8.5.4}
-PRGLANG=${PRGLANG:-en-US}
+VERSION=${VERSION:-13.0.13}
+PRGLANG=${PRGLANG:-ALL}
 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 [ ! -z "${PRINT_PACKAGE_NAME}" ]; 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
-  SRCARCH=64
-else
-  SRCARCH=32
-fi
-
 set -e
 
 rm -rf $PKG
@@ -60,11 +61,11 @@ install -m 0755 $CWD/tor-browser.sh $PKG/usr/bin/tor-browser
 
 sed -i "s/REPL_NAME/$PRGNAM/g" $PKG/usr/bin/tor-browser
 sed -i "s/REPL_VERSION/$VERSION/g" $PKG/usr/bin/tor-browser
-sed -i "s/REPL_LANGUAGE/${PRGLANG}/g" $PKG/usr/bin/tor-browser
+sed -i "s/ARCH/$ARCH/g" $PKG/usr/bin/tor-browser
 
 # We have to copy the original source into the package
 mkdir -p $PKG/opt/$PRGNAM
-install -m 0644 $CWD/${PRGNAM}-linux${SRCARCH}-${VERSION}_${PRGLANG}.tar.xz $PKG/opt/$PRGNAM
+install -m 0644 $CWD/${PRGNAM}-linux-${ARCH}-${VERSION}.tar.xz $PKG/opt/$PRGNAM
 
 mkdir -p $PKG/usr/share/pixmaps
 install -m 0644 $CWD/mozicon128.png $PKG/usr/share/pixmaps/tor-browser.png
@@ -80,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/network/tor-browser/tor-browser.info b/network/tor-browser/tor-browser.info
index 31be5fc678..14c1485f7e 100644
--- a/network/tor-browser/tor-browser.info
+++ b/network/tor-browser/tor-browser.info
@@ -1,10 +1,10 @@
 PRGNAM="tor-browser"
-VERSION="8.5.4"
+VERSION="13.0.13"
 HOMEPAGE="https://www.torproject.org"
-DOWNLOAD="https://dist.torproject.org/torbrowser/8.5.4/tor-browser-linux32-8.5.4_en-US.tar.xz"
-MD5SUM="71a06743ce27080bd40693359af65947"
-DOWNLOAD_x86_64="https://dist.torproject.org/torbrowser/8.5.4/tor-browser-linux64-8.5.4_en-US.tar.xz"
-MD5SUM_x86_64="dd9968c7c6955d6f582530e2b8b7612b"
+DOWNLOAD="https://dist.torproject.org/torbrowser/13.0.13/tor-browser-linux-i686-13.0.13.tar.xz"
+MD5SUM="cd5e586ee526a02e6d05b939ed499ac2"
+DOWNLOAD_x86_64="https://www.torproject.org/dist/torbrowser/13.0.13/tor-browser-linux-x86_64-13.0.13.tar.xz"
+MD5SUM_x86_64="a37b89be94cdf5116f17e1c9cf5f613d"
 REQUIRES=""
 MAINTAINER="Willy Sudiarto Raharjo"
 EMAIL="willysr@slackbuilds.org"
diff --git a/network/tor-browser/tor-browser.sh b/network/tor-browser/tor-browser.sh
index 5986909059..10f9fad0dd 100644
--- a/network/tor-browser/tor-browser.sh
+++ b/network/tor-browser/tor-browser.sh
@@ -24,9 +24,7 @@ set -e
 # filled by the SLACKBUILD
 NAME='REPL_NAME'
 VERSION='REPL_VERSION'
-LANGUAGE="REPL_LANGUAGE"
-
-ARCH=$(getconf LONG_BIT)
+ARCH='ARCH'
 
 notify() {
   local title="$1"
@@ -46,7 +44,7 @@ notify() {
 update() {
 	echo "$0: Extracting files to $INSTALL_DIRECTORY." >> $LOG_FILE
 	rm -rf $INSTALL_DIRECTORY/*
-	tar --strip-components=1 -xJf /opt/$NAME/tor-browser-linux${ARCH}-${VERSION}_${LANGUAGE}.tar.xz \
+	tar --strip-components=1 -xJf /opt/$NAME/tor-browser-linux-${ARCH}-${VERSION}.tar.xz \
 		-C $INSTALL_DIRECTORY >> $LOG_FILE 2>&1 || notify "Error" \
 		"The tor-browser archive could not be extracted to your home directory. \
 		\nCheck permissions of $INSTALL_DIRECTORY. \
diff --git a/network/tor/README b/network/tor/README
index ef4c0eff74..69be208d9c 100644
--- a/network/tor/README
+++ b/network/tor/README
@@ -8,18 +8,20 @@ applications with built-in anonymity, safety, and privacy features.
 This script requires a 'tor' user/group to exist before running.
 The recommended UID/GID is 220. You can create these like so:
   groupadd -g 220 tor
-  useradd -u 220 -g 220 -c "The Onion Router" -d /dev/null -s /bin/false tor
+  useradd -u 220 -g 220 -c "The Onion Router" -d /dev/null \
+  -s /bin/false tor
 
-You can pass another user/group to the script; this is however, less safe:
+You can pass another user/group to the script; this is however, less
+safe:
   TOR_USER=nobody TOR_GROUP=nogroup sh tor.SlackBuild
 
 The following can be used to start/stop tor automatically:
-/etc/rc.d/rc.local
+In file /etc/rc.d/rc.local, add following
   if [ -x /etc/rc.d/rc.tor ]; then
     /etc/rc.d/rc.tor start
   fi
 
-/etc/rc.d/rc.local_shutdown
+In /etc/rc.d/rc.local_shutdown, add following
   if [ -x /etc/rc.d/rc.tor ]; then
     /etc/rc.d/rc.tor stop
   fi
@@ -28,7 +30,6 @@ torsocks is an optional dependency. See README.SLACKWARE for more
 information.
 
 optional dependencies:
-- zstd for better compression ratios.
 - nacl may provide faster performance on 32-bit systems.
 
 Take a look at README.SLACKWARE for important notes and read also very
diff --git a/network/tor/README.SLACKWARE b/network/tor/README.SLACKWARE
index c57309d816..70b0f821d7 100644
--- a/network/tor/README.SLACKWARE
+++ b/network/tor/README.SLACKWARE
@@ -6,3 +6,17 @@ the newer script be sure to check changes to both /etc/rc.d/rc.tor.new and
 /etc/tor/torrc.new as some configurations values are now required and no
 longer passed on the command line. The original TorProject.org torrc
 configuration is always available as /etc/tor/torrc.sample.
+
+Since Tor 0.3.4.1-alpha the directory authority subsystem has been
+modularized and can be disabled by passing --disable-module-dirauth to the
+./configure script. This means that Tor compiled that way cannot run as a
+directory authority or bridge authority.
+
+Starting from Tor 0.4.2.5 this is the default for the tor.SlackBuild.
+
+Also, since Tor 0.4.2.5 contrib/dist/torctl has been removed by upstream.
+Have a look at https://bugs.torproject.org/30550
+
+In case your relay does not start after the upgrade to Tor 0.4.5.6+
+make sure your system is IPv6 ready. Have a look at 
+https://lists.torproject.org/pipermail/tor-relays/2021-February/019299.html
diff --git a/network/tor/rc.tor b/network/tor/rc.tor
index 11daf8a95a..53ab0ed110 100644
--- a/network/tor/rc.tor
+++ b/network/tor/rc.tor
@@ -34,6 +34,8 @@ else
 fi
 
 tor_start() {
+  mkdir -p /var/run/tor
+  chown tor.tor /var/run/tor
   if [ -n "$MAX_FILEDESCRIPTORS" ]; then
     echo -n "Raising maximum number of filedescriptors (ulimit -n) to $MAX_FILEDESCRIPTORS"
     if ulimit -n "$MAX_FILEDESCRIPTORS" ; then
diff --git a/network/tor/tor.SlackBuild b/network/tor/tor.SlackBuild
index 5f00a6e38f..156451c169 100644
--- a/network/tor/tor.SlackBuild
+++ b/network/tor/tor.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 #
 # Slackware build script for tor
 #
@@ -24,11 +24,15 @@
 
 # Updated by Donald Cooley dfc@warpmail.net
 # Updated by Fernando Lopez Jr. fernando.lopezjr@gmail.com
+# Updated by Markus Reichelt slackbuilds@mareichelt.de
+
+cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=tor
-VERSION=${VERSION:-0.4.0.5}
+VERSION=${VERSION:-0.4.8.7}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 # Select tor's default user/group
 TOR_USER=${TOR_USER:-tor}
@@ -44,7 +48,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
+# the name of the created package would be, and then exit. This information
+# could be useful to other scripts.
+if [ ! -z "${PRINT_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,6 +108,7 @@ find -L . \
 
 CFLAGS="$SLKCFLAGS" \
 ./configure \
+  --disable-module-dirauth \
   --prefix=/usr \
   --sysconfdir=/etc \
   --localstatedir=/var \
@@ -115,7 +127,9 @@ mkdir -p $PKG/var/{run,log,lib}/tor
 chown $TOR_USER:$TOR_GROUP $PKG/var/{run,log,lib}/tor
 chmod 0700 $PKG/var/lib/tor
 install -D -m 0755 $CWD/rc.tor $PKG/etc/rc.d/rc.tor.new
-install -D -m 0755 contrib/dist/torctl $PKG/usr/bin/torctl
+# this has been removed in tor-0.4.2.5, uncomment if you need this
+# in earlier Tor versions
+#install -D -m 0755 contrib/dist/torctl $PKG/usr/bin/torctl
 install -D -m 0644 $CWD/torrc $PKG/etc/tor/torrc.new
 mkdir -p $PKG/etc/logrotate.d
 sed -e "s,@USER@,$TOR_USER," -e "s,@GROUP@,$TOR_GROUP," $CWD/logrotate.tor \
@@ -125,7 +139,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/spec
-cp -a ChangeLog INSTALL LICENSE README ReleaseNotes \
+cp -a ChangeLog INSTALL LICENSE README.md ReleaseNotes \
       $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
@@ -135,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/network/tor/tor.info b/network/tor/tor.info
index e9e77a04e2..837fc16dce 100644
--- a/network/tor/tor.info
+++ b/network/tor/tor.info
@@ -1,10 +1,10 @@
 PRGNAM="tor"
-VERSION="0.4.0.5"
+VERSION="0.4.8.7"
 HOMEPAGE="https://www.torproject.org/"
-DOWNLOAD="https://dist.torproject.org/tor-0.4.0.5.tar.gz"
-MD5SUM="23278fc58d0014db22b428cdae3ea966"
+DOWNLOAD="https://dist.torproject.org/tor-0.4.8.7.tar.gz"
+MD5SUM="ce259834ed76e3e65a25438cc42b6281"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Fernando Lopez Jr."
-EMAIL="fernando.lopezjr@gmail.com"
+MAINTAINER="MDrights"
+EMAIL="psychi2009@gmail.com"
diff --git a/network/tornado/tornado.SlackBuild b/network/tornado/tornado.SlackBuild
index c0674de47a..236c89d74e 100644
--- a/network/tornado/tornado.SlackBuild
+++ b/network/tornado/tornado.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for Tornado
 
@@ -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=tornado
 VERSION=${VERSION:-5.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}
@@ -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/network/tornado/tornado.info b/network/tornado/tornado.info
index c43e7254fe..b8432da1e4 100644
--- a/network/tornado/tornado.info
+++ b/network/tornado/tornado.info
@@ -5,6 +5,6 @@ DOWNLOAD="https://github.com/tornadoweb/tornado/archive/v5.1.1/tornado-5.1.1.tar
 MD5SUM="44ca12963dccbc11a97aa0cc92e9bb93"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="backports-abc python-certifi futures singledispatch"
+REQUIRES="backports-abc singledispatch"
 MAINTAINER="Benjamin Trigona-Harany"
 EMAIL="slackbuilds@jaxartes.net"
diff --git a/network/torsocks/torsocks.SlackBuild b/network/torsocks/torsocks.SlackBuild
index c7187f9c8f..bbb95eb27b 100644
--- a/network/torsocks/torsocks.SlackBuild
+++ b/network/torsocks/torsocks.SlackBuild
@@ -1,29 +1,39 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for torsocks
 
 # Written by Vincent Batts, vbatts@hashbangbash.com
 
+# 20240331 bkw: Modified by SlackBuilds.org, BUILD=2:
+# - get generic GNU INSTALL file out of doc dir.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=torsocks
-VERSION=${VERSION:-2.2.0}
-BUILD=${BUILD:-1}
+VERSION=${VERSION:-2.3.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"
@@ -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 \
+  -o -perm 511 \) -exec chmod 755 {} + -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 hardcoded lib path.
 sed -i -e 's|@prefix@/lib|@libdir@|' src/Makefile.am
@@ -80,7 +90,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 INSTALL LICENSE README.md gpl-2.0.txt $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a ChangeLog LICENSE README.md gpl-2.0.txt $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/network/torsocks/torsocks.info b/network/torsocks/torsocks.info
index 36e0c30bcd..9fcc61149f 100644
--- a/network/torsocks/torsocks.info
+++ b/network/torsocks/torsocks.info
@@ -1,8 +1,8 @@
 PRGNAM="torsocks"
-VERSION="2.2.0"
+VERSION="2.3.0"
 HOMEPAGE="https://gitweb.torproject.org/torsocks.git"
-DOWNLOAD="https://github.com/dgoulet/torsocks/archive/v2.2.0.tar.gz"
-MD5SUM="a86d5e5381236a744f6276df4e85333b"
+DOWNLOAD="https://github.com/dgoulet/torsocks/archive/v2.3.0/torsocks-2.3.0.tar.gz"
+MD5SUM="df9a10bc13cbdce04e799c56671fcba5"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/network/toxcore/README b/network/toxcore/README
index 04c079aee5..12a1970334 100644
--- a/network/toxcore/README
+++ b/network/toxcore/README
@@ -1,9 +1,11 @@
-Tox is a free (as in liberty and price) peer to peer, distributed, multimedia
-messenger. Tox can provide a superior instant messaging experience than current
-market offerings by using existing technologies such as dispersed networking
-and strong cryptography. Files can be shared as fast as you and your partner's
-Internet connection allows, audio calls are instantaneous, and there are no
-arbitrary limits to how many people you can have in a group conversation.
+Tox is a free (as in liberty and price) peer to peer, distributed,
+multimedia messenger. Tox can provide a superior instant
+messaging experience than current market offerings by using
+existing technologies such as dispersed networking and strong
+cryptography. Files can be shared as fast as you and your partner's
+Internet connection allows, audio calls are instantaneous, and there
+are no arbitrary limits to how many people you can have in a group
+conversation.
 
 Additional libconfig dependency is needed for tox-bootstrapd daemon,
 together with:
diff --git a/network/toxcore/toxcore.SlackBuild b/network/toxcore/toxcore.SlackBuild
index 33769a32d5..25c2b7e803 100644
--- a/network/toxcore/toxcore.SlackBuild
+++ b/network/toxcore/toxcore.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for toxcore
 
@@ -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=toxcore
 VERSION=${VERSION:-20160928_dcf2aaa}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 DAEMON=${DAEMON:-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}
 
-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"
@@ -109,8 +119,10 @@ mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a COPYING INSTALL.md README.md 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
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/network/toxcore/toxcore.info b/network/toxcore/toxcore.info
index ab5c56f264..080d52107a 100644
--- a/network/toxcore/toxcore.info
+++ b/network/toxcore/toxcore.info
@@ -5,6 +5,6 @@ DOWNLOAD="http://mirror.slackware.hr/sources/toxcore/toxcore-20160928_dcf2aaa.ta
 MD5SUM="16b52c159cff280af101240fabaaa21b"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="libsodium opus"
+REQUIRES=""
 MAINTAINER="Mario Preksavec"
 EMAIL="mario at slackware dot hr"
diff --git a/network/tramp/README b/network/tramp/README
deleted file mode 100644
index 654ee46bef..0000000000
--- a/network/tramp/README
+++ /dev/null
@@ -1,8 +0,0 @@
-After the installation of tramp into your Emacs, you will be able to
-access files on remote machines as though they were local.
-Access to the remote file system for editing files, version control,
-and dired are transparently enabled.
-Your access to the remote machine can be with the rsh, rlogin, telnet
-programs or with any similar connection method. This connection must
-pass ASCII successfully to be usable but need not be 8-bit clean.
-The package provides support also for ssh connections out of the box.
diff --git a/network/tramp/slack-desc b/network/tramp/slack-desc
deleted file mode 100644
index 81c9f86ed9..0000000000
--- a/network/tramp/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------------------------------------------------------|
-tramp: tramp (remote file editing package for Emacs)
-tramp:
-tramp: After the installation of tramp into your Emacs, you will be able to
-tramp: access files on remote machines as though they were local.
-tramp: Access to the remote file system for editing files, version control,
-tramp: and dired are transparently enabled.
-tramp: Your access to the remote machine can be with the rsh, rlogin, telnet
-tramp: programs or with any similar connection method. This connection must
-tramp: pass ASCII successfully to be usable but need not be 8-bit clean.
-tramp: The package provides support also for ssh connections out of the box.
-tramp:
diff --git a/network/tramp/tramp.SlackBuild b/network/tramp/tramp.SlackBuild
deleted file mode 100644
index d5801b0d1d..0000000000
--- a/network/tramp/tramp.SlackBuild
+++ /dev/null
@@ -1,102 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for tramp v.2.2.7 for Emacs
-
-# Copyright 2013 Renato MARTINI - renato.martini AT 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=tramp
-VERSION=${VERSION:-2.2.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.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 \
-  --infodir=/usr/info \
-  --build=$ARCH-slackware-linux \
-  --with-contrib
-
-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 -f $PKG/usr/info/dir
-gzip -9 $PKG/usr/info/tramp
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
-  ChangeLog README CONTRIBUTORS 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}
diff --git a/network/tramp/tramp.info b/network/tramp/tramp.info
deleted file mode 100644
index d9de3b3df2..0000000000
--- a/network/tramp/tramp.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="tramp"
-VERSION="2.2.7"
-HOMEPAGE="http://www.gnu.org/software/tramp/"
-DOWNLOAD="ftp://ftp.gnu.org/gnu/tramp/tramp-2.2.7.tar.gz"
-MD5SUM="1458a7a918c39ad8aa2572979b0f6ace"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Renato Martini"
-EMAIL="renato.martini@gmail.com"
diff --git a/network/transgui/dup-obj-status.patch b/network/transgui/dup-obj-status.patch
new file mode 100644
index 0000000000..04967efd01
--- /dev/null
+++ b/network/transgui/dup-obj-status.patch
@@ -0,0 +1,49 @@
+From 8d63a310cbdc99ff8d565e2429c0740a8be5c3cb Mon Sep 17 00:00:00 2001
+From: Kuzz <Kuzz@ThinkPad.localdomain>
+Date: Wed, 29 Jul 2020 21:24:21 +0300
+Subject: [PATCH] Deduplicate RequestInfo params. #1325
+
+---
+ rpc.pas | 17 ++++++++++++++---
+ 1 file changed, 14 insertions(+), 3 deletions(-)
+
+diff --git a/rpc.pas b/rpc.pas
+index 2cbfeee0..7f9254c8 100644
+--- a/rpc.pas
++++ b/rpc.pas
+@@ -816,21 +816,32 @@ function TRpc.RequestInfo(TorrentId: integer; const Fields: array of const; cons
+   req, args: TJSONObject;
+   _fields: TJSONArray;
+   i: integer;
++  sl: TStringList;
+ begin
+   Result:=nil;
+   req:=TJSONObject.Create;
++  sl:=TStringList.Create;
+   try
+     req.Add('method', 'torrent-get');
+     args:=TJSONObject.Create;
+     if TorrentId <> 0 then
+       args.Add('ids', TJSONArray.Create([TorrentId]));
+-    _fields:=TJSONArray.Create(Fields);
+-    for i:=Low(ExtraFields) to High(ExtraFields) do
+-      _fields.Add(ExtraFields[i]);
++    _fields:=TJSONArray.Create;
++    for i:=Low(Fields) to High(Fields) do
++      if (Fields[i].VType=vtAnsiString) then
++         sl.Add(String(Fields[i].VAnsiString));
++    sl.AddStrings(ExtraFields);
++    sl.Sort;
++    for i:=sl.Count-2 downto 0 do
++      if (sl[i]=sl[i+1]) then
++        sl.Delete(i+1);
++    for i:=0 to sl.Count-1 do
++      _fields.Add(sl[i]);
+     args.Add('fields', _fields);
+     req.Add('arguments', args);
+     Result:=SendRequest(req);
+   finally
++    sl.Free;
+     req.Free;
+   end;
+ end;
diff --git a/network/transgui/transgui.SlackBuild b/network/transgui/transgui.SlackBuild
index 1024c217d9..ca7ad023fc 100644
--- a/network/transgui/transgui.SlackBuild
+++ b/network/transgui/transgui.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for transgui
 
-# Copyright 2016-2018 Jeremy Brent Hansen <jebrhansen+SBo -at- gmail.com>
+# Copyright 2016-2023 Jeremy Brent Hansen <jebrhansen+SBo -at- 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=transgui
-VERSION=${VERSION:-5.17.0}
-BUILD=${BUILD:-1}
+VERSION=${VERSION:-5.18.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}
@@ -69,6 +79,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 {} \;
 
+# Fix "Duplicate object member: status" error
+# Thanks to Ku33ma
+# https://github.com/transmission-remote-gui/transgui/pull/1329
+patch -p1 < $CWD/dup-obj-status.patch
+
 # Build transgui
 lazbuild "transgui.lpi" --lazarusdir=/usr/share/lazarus --widgetset=gtk2
 
@@ -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/network/transgui/transgui.info b/network/transgui/transgui.info
index 139505f684..97e317bf00 100644
--- a/network/transgui/transgui.info
+++ b/network/transgui/transgui.info
@@ -1,8 +1,8 @@
 PRGNAM="transgui"
-VERSION="5.17.0"
+VERSION="5.18.0"
 HOMEPAGE="https://github.com/transmission-remote-gui/transgui"
-DOWNLOAD="https://github.com/transmission-remote-gui/transgui/archive/v5.17.0/transgui-5.17.0.tar.gz"
-MD5SUM="3137a861a633ea9946885ef5b570c0f8"
+DOWNLOAD="https://github.com/transmission-remote-gui/transgui/archive/v5.18.0/transgui-5.18.0.tar.gz"
+MD5SUM="5c5edc65a7cdec92e25091937b2162a2"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="lazarus"
diff --git a/network/translate-shell/README b/network/translate-shell/README
index 7cd3d46a23..9b0307ae35 100644
--- a/network/translate-shell/README
+++ b/network/translate-shell/README
@@ -1,6 +1,6 @@
 Translate Shell (formerly Google Translate CLI) is a command-line
 translator powered by Google Translate (default), Bing Translator,
-Yandex.Translate, DeepL Translator and Apertium.
+Yandex.Translate, and Apertium.
 
 If you prefer zsh over bash:
   $ TARGET=zsh ./translate-shell.SlackBuild
@@ -12,4 +12,4 @@ Recommended Dependencies:
       for readline-style editing and history in the interactive shell
 
 Recommended Fonts:
-  * https://github.com/soimort/translate-shell/wiki/Writing-Systems-and-Fonts#unicode-fonts
+https://github.com/soimort/translate-shell/wiki/Writing-Systems-and-Fonts#unicode-fonts
diff --git a/network/translate-shell/slack-desc b/network/translate-shell/slack-desc
index 102dd6e2b3..955c32dacb 100644
--- a/network/translate-shell/slack-desc
+++ b/network/translate-shell/slack-desc
@@ -10,7 +10,7 @@ translate-shell: translate-shell (a command-line translator)
 translate-shell:
 translate-shell: Translate Shell (formerly Google Translate CLI) is a command-line
 translate-shell: translator powered by Google Translate (default), Bing Translator,
-translate-shell: Yandex.Translate, DeepL Translator and Apertium.
+translate-shell: Yandex.Translate, and Apertium.
 translate-shell:
 translate-shell:
 translate-shell:
diff --git a/network/translate-shell/translate-shell.SlackBuild b/network/translate-shell/translate-shell.SlackBuild
index 712d4e73e1..47817dea45 100644
--- a/network/translate-shell/translate-shell.SlackBuild
+++ b/network/translate-shell/translate-shell.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for translate-shell
 
-# Copyright 2018 Azure Zanculmarktum <zanculmarktum@gmail.com>
+# Copyright 2018, 2019, 2020 Azure Zanculmarktum <zanculmarktum@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=translate-shell
-VERSION=${VERSION:-0.9.6.7}
+VERSION=${VERSION:-0.9.6.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}
@@ -75,6 +85,7 @@ sed -i \
   -e '/^PREFIX/s,\(/usr\)/local,\1,' \
   -e '/^TARGET/s,bash,'"$TARGET"',' \
   -e '/\$(PREFIX)\/share\/man/s/\(\$(PREFIX)\)\/share\(\/man\)/\1\2/' \
+  -e '/install \$(MANDIR)\/\$(COMMAND)\.1/s,install,& -m644,' \
   Makefile
 
 make
@@ -84,11 +95,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 CONTRIBUTING.md LICENSE Makefile README.md README.template.md WAIVER $PKG/usr/doc/$PRGNAM-$VERSION
+cp -p CONTRIBUTING.md LICENSE README.md README.template.md WAIVER $PKG/usr/doc/$PRGNAM-$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/network/translate-shell/translate-shell.info b/network/translate-shell/translate-shell.info
index c9859006a1..fdd3759d71 100644
--- a/network/translate-shell/translate-shell.info
+++ b/network/translate-shell/translate-shell.info
@@ -1,8 +1,8 @@
 PRGNAM="translate-shell"
-VERSION="0.9.6.7"
+VERSION="0.9.6.11"
 HOMEPAGE="https://www.soimort.org/translate-shell/"
-DOWNLOAD="https://github.com/soimort/translate-shell/archive/v0.9.6.7/translate-shell-0.9.6.7.tar.gz"
-MD5SUM="ceed584244a77a9eb3c08d9dea2405ba"
+DOWNLOAD="https://github.com/soimort/translate-shell/archive/v0.9.6.11/translate-shell-0.9.6.11.tar.gz"
+MD5SUM="f40e7b0ee66e30ec15481336df58ecba"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/network/translate/translate.SlackBuild b/network/translate/translate.SlackBuild
index 5d68e006ca..efdb7d28e1 100644
--- a/network/translate/translate.SlackBuild
+++ b/network/translate/translate.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for translate
 
-# Copyright 2014-2016  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=translate
-VERSION=${VERSION:-2.0.0}
+VERSION=${VERSION:-3.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}
@@ -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/network/translate/translate.info b/network/translate/translate.info
index ccf165e509..a4e09be129 100644
--- a/network/translate/translate.info
+++ b/network/translate/translate.info
@@ -1,10 +1,10 @@
 PRGNAM="translate"
-VERSION="2.0.0"
+VERSION="3.6.1"
 HOMEPAGE="https://github.com/terryyin/google-translate-python"
-DOWNLOAD="https://pypi.python.org/packages/source/t/translate/translate-2.0.0.tar.gz"
-MD5SUM="587508223d5baa7aaae8161dd3d26b8f"
+DOWNLOAD="https://files.pythonhosted.org/packages/d1/9d/692066b9e26176a93ce627bf467bca48f198eb0e036337a5180d566c9561/translate-3.6.1.tar.gz"
+MD5SUM="3ebcafb25c270e785c5f18580c4ad0c4"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES=""
+REQUIRES="python3-libretranslatepy python3-lxml click"
 MAINTAINER="Dimitris Zlatanidis"
-EMAIL="d.zlatanidis@gmail.com"
+EMAIL="dslackw@gmail.com"
diff --git a/network/transmission-remote-gtk/README b/network/transmission-remote-gtk/README
index 41c17ca20c..f780e8205b 100644
--- a/network/transmission-remote-gtk/README
+++ b/network/transmission-remote-gtk/README
@@ -1,11 +1,21 @@
+transmission-remote-gtk (transmission remote control GUI)
+
 transmission-remote-gtk is a cross-platform application for remote
-management of the Transmission BitTorrent client using its RPC interface.
+management of the Transmission BitTorrent client using its RPC
+interface.
 
- * Remotely add (file/url), start, stop, remove, remove & delete, verify,
-   reannounce torrents.
+ * Remotely add (file/url), start, stop, remove, remove & delete,
+   verify, reannounce torrents.
  * Works as a .torrent handler (eg. from a web browser).
  * Set torrent properties such as speed, seed, peer limits, file
    priorities, add/edit/remove trackers.
  * Change remote settings like global limits, download directory, and
    connectivity preferences.
- * Russian, Polish, Korean, and German, Spanish, Ukranian translations. 
+ * UI translations for many languages.
+
+Optional dependencies, detected at compile time:
+
+GeoIP - used to display country flags next to IP addresses.
+
+If you want to build without libappindicator (systray and
+notification) support, set NOTIFY=no in the script's environment.
diff --git a/network/transmission-remote-gtk/slack-desc b/network/transmission-remote-gtk/slack-desc
index 78af7c256a..5c44ee8e02 100644
--- a/network/transmission-remote-gtk/slack-desc
+++ b/network/transmission-remote-gtk/slack-desc
@@ -6,14 +6,14 @@
 # customary to leave one space after the ':' except on otherwise blank lines.
 
                        |-----handy-ruler------------------------------------------------------|
-transmission-remote-gtk: transmission-remote-gtk (Transmission Bittorrent remote GUI)
+transmission-remote-gtk: transmission-remote-gtk (transmission remote control GUI)
 transmission-remote-gtk:
-transmission-remote-gtk: transmission-remote-gtk is a GTK applicatoin for remote management of
+transmission-remote-gtk: transmission-remote-gtk is a GTK application for remote management of
 transmission-remote-gtk: the Transmission BitTorrent client via its RPC interface.
 transmission-remote-gtk:
-transmission-remote-gtk: Homepage: http://code.google.com/p/transmission-remote-gtk/
-transmission-remote-gtk:
-transmission-remote-gtk:
-transmission-remote-gtk:
+transmission-remote-gtk: Build options:
+transmission-remote-gtk: @opts@
 transmission-remote-gtk:
+transmission-remote-gtk: Homepage:
+transmission-remote-gtk: https://github.com/transmission-remote-gtk/transmission-remote-gtk/
 transmission-remote-gtk:
diff --git a/network/transmission-remote-gtk/transmission-remote-gtk.SlackBuild b/network/transmission-remote-gtk/transmission-remote-gtk.SlackBuild
index 677e991256..738a1af006 100644
--- a/network/transmission-remote-gtk/transmission-remote-gtk.SlackBuild
+++ b/network/transmission-remote-gtk/transmission-remote-gtk.SlackBuild
@@ -1,8 +1,9 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for transmission-remote-gtk
 
 # Copyright 2012-2016  Chris Walker Copperas Cove, TX
+# Copyright 2020-2023 B. Watson <urchlay@slackware.uk>
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -31,26 +32,50 @@
 # (INCLUDING NEGLIGENCE OR 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 v1.6.0.
+# - new hard dep libsoup3.
+# - no more optional mrss dep (upstream dropped the RSS reader).
+
+# 20220623 bkw: update for v1.5.1.
+# 20210926 bkw: BUILD=2, make NOTIFY=no also disable libappindicator.
+# 20200526 bkw:
+# - take over maintenance
+# - update for v1.4.1
+# - add NOTIFY=no to build --without-libnotify
+# - add README note and slack-desc support for optional deps
+# - fix homepage and typo in slack-desc
+# - build tweaks
+# - get rid of the list of translation languages in README, it's
+#   no longer accurate (several more added) and I can't be bothered
+#   to keep it up-to-date.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=transmission-remote-gtk
-VERSION=${VERSION:-1.2}
+VERSION=${VERSION:-1.6.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"
@@ -69,41 +94,56 @@ 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 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 {} \+
+
+# 20230713 bkw: mangle the meson.build so it works with Slackware
+# 15.0's meson-0.59.x. Eventually this will become difficult or
+# impossible, hopefully by then we have a new Slackware release with a
+# new enough meson.
+sed -i -e '/meson_version:/s,0.60.0,0.59.0,' \
+       -e "s/'ayatana-appindicator3-0.1', //" \
+       meson.build
 
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
-  --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --mandir=/usr/man \
-  --build=$ARCH-slackware-linux
+[ "${NOTIFY:-yes}" = "no" ] && NOTIFYOPT="-Dlibappindicator=disabled"
 
-make V=1
-make install DESTDIR=$PKG
+mkdir build
+cd build
+  CFLAGS="$SLKCFLAGS" \
+  CXXFLAGS="$SLKCFLAGS" \
+  meson .. \
+    $NOTIFYOPT \
+    --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
+gzip -9 $PKG/usr/man/man1/$PRGNAM.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
+# 20200526 bkw: lots of optional deps, let the slack-desc keep track of them
+objdump -p $PKG/usr/bin/$PRGNAM | grep NEEDED > ldd.tmp
+for i in libappindicator GeoIP; do
+  opts+="$i:"
+  grep -q $i ldd.tmp && opts+="yes " || opts+="no "
+done
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
-  AUTHORS COPYING ChangeLog \
-  $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS COPYING 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
+sed "s,@opts@,$opts," $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/network/transmission-remote-gtk/transmission-remote-gtk.info b/network/transmission-remote-gtk/transmission-remote-gtk.info
index 80f1eaffc3..86a5bc7dfb 100644
--- a/network/transmission-remote-gtk/transmission-remote-gtk.info
+++ b/network/transmission-remote-gtk/transmission-remote-gtk.info
@@ -1,10 +1,10 @@
 PRGNAM="transmission-remote-gtk"
-VERSION="1.2"
+VERSION="1.6.0"
 HOMEPAGE="https://github.com/transmission-remote-gtk/transmission-remote-gtk/"
-DOWNLOAD="https://github.com/transmission-remote-gtk/transmission-remote-gtk/releases/download/1.2/transmission-remote-gtk-1.2.tar.gz"
-MD5SUM="dfb485390b49c1f0af5063b44a4fef03"
+DOWNLOAD="https://github.com/transmission-remote-gtk/transmission-remote-gtk/releases/download/1.6.0/transmission-remote-gtk-1.6.0.tar.xz"
+MD5SUM="cd284fab5d3919e11f3d0415d7b75078"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="transmission json-glib"
-MAINTAINER="Christopher Walker"
-EMAIL="kris240376@gmail.com"
+REQUIRES="transmission libsoup3"
+MAINTAINER="B. Watson"
+EMAIL="urchlay@slackware.uk"
diff --git a/network/transmission/README b/network/transmission/README
index cd8bc73444..9c54e443bf 100644
--- a/network/transmission/README
+++ b/network/transmission/README
@@ -1,13 +1,17 @@
+transmission (bittorrent client)
+
 Transmission is a lightweight open source BitTorrent client, providing
-useful functionality without feature bloat. It consists of a daemon, a
-GTK+, Qt and CLI client.
+useful functionality without feature bloat. It consists of a daemon
+and GTK+, Qt, and CLI clients.
 
-By default, all 4 components are built. Specific parts can be disabled
-by setting one or more environment variables:
+By default, everything but the Qt client is built. It can be enabled
+by exporting QT=yes in the environment. The other parts can be
+disabled by exporting one or more environment variables:
 
 GTK=no
-QT=no
 CLI=no
 DAEMON=no
 
-At least one component must be enabled (so all 4 set to "no" won't work).
+Hint: if you use QT=yes, you probably also want GTK=no.
+
+At least one component must be enabled (all 4 set to "no" won't work).
diff --git a/network/transmission/slack-desc b/network/transmission/slack-desc
index b6a5284dc1..30f5ac84ba 100644
--- a/network/transmission/slack-desc
+++ b/network/transmission/slack-desc
@@ -10,10 +10,10 @@ transmission: transmission (bittorrent client)
 transmission:
 transmission: Transmission is a lightweight open source BitTorrent client,
 transmission: providing useful functionality without feature bloat.
-transmission: It consists of a daemon, a GTK+, Qt and CLI client.
+transmission: It consists of a daemon and GTK+, Qt, and CLI clients.
 transmission:
 transmission: This package built with options:
 transmission: @opts@
 transmission:
-transmission: Homepage: http://transmissionbt.com/
+transmission: Homepage: https://transmissionbt.com/
 transmission:
diff --git a/network/transmission/transmission.SlackBuild b/network/transmission/transmission.SlackBuild
index 274d96b02c..5ccebeb9b7 100644
--- a/network/transmission/transmission.SlackBuild
+++ b/network/transmission/transmission.SlackBuild
@@ -1,10 +1,10 @@
-#!/bin/sh
+#!/bin/bash
 # Slackware build script for transmission
 
-# Copyright 2007 Vasilis Papavasileiou <el03020 at mail dot ntua dot gr>
-# Copyright 2008-2011 Iskar Enev <iskar.enev[@]gmail.com>
+# Copyright 2007 Vasilis Papavasileiou <email removed>
+# Copyright 2008-2011 Iskar Enev <email removed>
 # Copyright 2011-2013 Niels Horn, Rio de Janeiro, Brazil
-# Copyright 2015 B. Watson <yalhcru@gmail.com>
+# Copyright 2015 B. Watson <urchlay@slackware.uk>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,25 +24,38 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-# 20180207 bkw: update for v2.93
-
+# 20231219 bkw: update for v4.0.5, minor man page tweaks.
+# 20230912 bkw: update for v4.0.4.
+# 20230510 bkw: update for v4.0.3. remove the warning about D-Bus from README,
+#               it no longer applies (transmission-gtk works without it).
+# 20230320 bkw: update for v4.0.2. add -DREBUILD_WEB=OFF to allow building
+#               without using the network, if nodejs is installed. thanks
+#               to Ruben Schuller for pointing this out.
+# 20230208 bkw: update for v4.0.0, which has only been out for about 5 hours.
+# - Disable the qt5 UI by default. There's no reason to build both GUIs
+#   by default. User can still say GTK=no QT=yes to get only the qt UI.
+# 20210926 bkw: BUILD=2, restore Qt5 build. 15.0 not yet released, but "soon".
+# 20200525 bkw: update for v3.00.
+#               Drop Qt GUI and QT=yes, due to 14.2's old gcc/libstdc++.
+#               It will come back when 15.0 releases.
+# 20180611 bkw: update for v2.94.
+# 20180207 bkw: update for v2.93.
 # 20180116 bkw: security fix, BUILD=2. See:
 #               https://github.com/transmission/transmission/pull/468
 #               Thanks to Freenode user lord_ for pointing this out.
-
-# 20180611 bkw: update for v2.94
-
 # 20170621 bkw: fix build on -current.
-
 # 20150204 bkw: allow user to disable the various components.
 # By default, all are enabled. We can disable transmission-gtk,
 # transmission-qt, transmission-cli, and/or transmission-daemon.
 # But disabling them all is no good.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=transmission
-VERSION=${VERSION:-2.94}
+VERSION=${VERSION:-4.0.5}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -52,13 +65,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}
 
-DOCUMENTATION="AUTHORS COPYING INSTALL NEWS README"
-
 if [ "$ARCH" = "i586" ]; then
   SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
@@ -76,22 +91,29 @@ fi
 set -e
 
 GTK="${GTK:-yes}"
-QT="${QT:-yes}"
+QT="${QT:-no}"
 CLI="${CLI:-yes}"
 DAEMON="${DAEMON:-yes}"
 
-if [ "$GTK" != "yes" -a "$QT" != "yes" -a "$CLI" != "yes" -a "$DAEMON" != "yes" ]; then
+if [ "$GTK" != "yes" -a "$CLI" != "yes" -a "$DAEMON" != "yes" -a "$QT" != "yes" ]; then
   cat <<EOF 1>&2
+
+******************************************************************
 Can't build transmission with everything disabled, at least one of
-GTK QT CLI DAEMON must be 'yes'.
+GTK CLI QT DAEMON must be 'yes'.
+******************************************************************
+
 EOF
   exit 1
 fi
 
-# anything but lowercase "yes" is considered a no!
-[ "$GTK" != "yes" ] && GTKOPT="no" || GTKOPT="yes"
-[ "$CLI" != "yes" ] && CLIOPT="dis" || CLIOPT="en"
-[ "$DAEMON" != "yes" ] && DAEMOPT="dis" || DAEMOPT="en"
+# Anything but lowercase "yes" is considered a no!
+# cmake didn't used to be case-sensitive about on and off.
+# It feels like BDSM, and not in a good way.
+[ "$QT"  != "yes" ]    && QTOPT="OFF"   || QTOPT="ON"
+[ "$GTK" != "yes" ]    && GTKOPT="OFF"  || GTKOPT="ON"
+[ "$CLI" != "yes" ]    && CLIOPT="OFF"  || CLIOPT="ON"
+[ "$DAEMON" != "yes" ] && DAEMOPT="OFF" || DAEMOPT="ON"
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
@@ -101,85 +123,47 @@ mkdir -p $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 {} \;
-
-# Fix CVE-2018-5702 for transmission-2.92. Patch came from:
-# https://github.com/transmission/transmission/files/1624507/transmission-fix-dns-rebinding-vuln.patch.txt
-#patch -p1 < $CWD/transmission-fix-dns-rebinding-vuln.diff
-# Not needed for >= 2.93
-
-sed -i -e 's%-g -O3 -funroll-loops %%g' configure.ac
-sed -i -e 's%-ggdb3 %%g' configure.ac
-
-# fix for -current (does no harm on stable). ref:
-# https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c13b5e88c6e9c7bd2698d844cb5ed127ed809f7e
-rm -f m4/glib-gettext.m4
-
-# Thanks Larry Hajali
-autoreconf -ivf
-
-CC=gcc CXX=g++ \
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
-  --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --sysconfdir=/etc \
-  --localstatedir=/var \
-  --mandir=/usr/man \
-  --disable-static \
-  --verbose \
-  --with-gtk=$GTKOPT \
-  --${CLIOPT}able-cli \
-  --${DAEMOPT}able-daemon \
-  --build=$ARCH-slackware-linux \
-  --host=$ARCH-slackware-linux
-
-# build daemon, GTK and cli client (unless disabled)
-make
-make install DESTDIR=$PKG
-
-if [ "$QT" = "yes" ]; then
-  # build the Qt client (transmission-qt) unless disabled
-  # Fix hard-coded path of man file of Qt client
-  sed -i "s|share/man/|man/|" qt/qtr.pro
-
-  # Needed when using Qt4
-  # https://trac.transmissionbt.com/ticket/5700#comment:2
-  echo "QMAKE_CXXFLAGS += -std=c++11" >> qt/qtr.pro
-
-  cd $TMP/$PRGNAM-$VERSION/qt
-    qmake \
-      QMAKE_CXXFLAGS+="$SLKCFLAGS" \
-      QMAKE_CFLAGS+="$SLKCFLAGS" \
-      qtr.pro
-    sed -i -e 's% -g % %g' Makefile
-    make
-    INSTALL_ROOT=$PKG/usr make install
-
-  mkdir -p $PKG/usr/share/applications $PKG/usr/share/pixmaps
-  install -m644 transmission-qt.desktop $PKG/usr/share/applications/transmission-qt.desktop
-  install -m644 icons/transmission.png  $PKG/usr/share/pixmaps/transmission-qt.png
-  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
-
-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 -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
+
+# 20231219 bkw: make the man pages slightly nicer looking: replace
+# 'BSD General Commands Manual' with 'SlackBuilds.org', and replace
+# the 'BSD' at the bottom with the version number.
+for i in $( find . -maxdepth 2 -name 'transmission*.1' ); do
+  sed -i -e '/^\.Os/d' \
+         -e '/^\.Dt/s,1 *$,\\\&1 "SlackBuilds.org",' \
+         -e '/^\.Dt/a.Os '$VERSION \
+      $i
+done
+
+mkdir -p build
+cd build
+  cmake \
+    -DREBUILD_WEB=OFF \
+    -DENABLE_DAEMON=$DAEMOPT \
+    -DENABLE_QT=$QTOPT \
+    -DENABLE_GTK=$GTKOPT \
+    -DENABLE_CLI=$CLIOPT \
+    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DLIB_SUFFIX=${LIBDIRSUFFIX} \
+    -DCMAKE_INSTALL_MANDIR=/usr/man \
+    -DCMAKE_INSTALL_DOCDIR=/usr/doc/$PRGNAM-$VERSION \
+    -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 $DOCUMENTATION $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
-sed "s,@opts@,GTK=$GTK QT=$QT CLI=$CLI DAEMON=$DAEMON," $CWD/slack-desc > $PKG/install/slack-desc
+sed "s,@opts@,GTK=$GTK QT=$QT CLI=$CLI DAEMON=$DAEMON," \
+  $CWD/slack-desc \
+  > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/network/transmission/transmission.info b/network/transmission/transmission.info
index 6abe22b5a6..89363cfcd1 100644
--- a/network/transmission/transmission.info
+++ b/network/transmission/transmission.info
@@ -1,10 +1,10 @@
 PRGNAM="transmission"
-VERSION="2.94"
-HOMEPAGE="http://www.transmissionbt.com/"
-DOWNLOAD="https://github.com/transmission/transmission-releases/raw/master/transmission-2.94.tar.xz"
-MD5SUM="c92829294edfa391c046407eeb16358a"
+VERSION="4.0.5"
+HOMEPAGE="https://www.transmissionbt.com/"
+DOWNLOAD="https://github.com/transmission/transmission/releases/download/4.0.5/transmission-4.0.5.tar.xz"
+MD5SUM="d3cda868215246644c429b18a30f7e47"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
 MAINTAINER="B. Watson"
-EMAIL="yalhcru@gmail.com"
+EMAIL="urchlay@slackware.uk"
diff --git a/network/tribler/README b/network/tribler/README
deleted file mode 100644
index 3d6c901e68..0000000000
--- a/network/tribler/README
+++ /dev/null
@@ -1,12 +0,0 @@
-tribler (anonymous search engine, video streaming, bittorrent client)
-
-Tribler is a Bittorrent-based video streaming client. You can watch
-video files, while you are still downloading them. It relies on VLC
-for playback of videos. Tribler also includes fast keyword search and
-thumbnail-based navigation. Tribler does not require websites or any
-central server to find and watch interesting content.
-
-Without vlc installed, tribler is a fully functional torrent client
-and search engine. If you want to stream videos, you will need vlc
-installed. This is an optional runtime dependency; you don't need to
-rebuild tribler if you decide to install vlc later on.
diff --git a/network/tribler/doinst.sh b/network/tribler/doinst.sh
deleted file mode 100644
index 5fb28930db..0000000000
--- a/network/tribler/doinst.sh
+++ /dev/null
@@ -1,3 +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/network/tribler/git2tarxz.sh b/network/tribler/git2tarxz.sh
deleted file mode 100644
index a8cec7dc06..0000000000
--- a/network/tribler/git2tarxz.sh
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/sh
-
-# get git tag of of Tribler project release, turn into a src tarball.
-# needed because their source archive release is broken (it's
-# missing some of its own python libraries).
-
-PRGNAM=tribler
-VERSION=6.4.0
-
-GITURL="https://github.com/Tribler/tribler.git"
-
-OUTDIR=$PRGNAM-$VERSION
-TARBALL=$OUTDIR.tar.xz
-
-rm -rf $OUTDIR $TARBALL
-
-git clone --branch v$VERSION --recursive --depth 1 "$GITURL" $OUTDIR
-find $OUTDIR -name '.git*' -print0 | xargs -0 rm -rf
-
-# there is absolutely no reason to include a giant windows executable.
-rm -f $OUTDIR/ffmpeg.exe
-
-tar cvfJ $TARBALL $OUTDIR
-
-# a reminder to myself...
-md5sum $TARBALL
-echo "Don't forget to update the MD5SUM= line in the .info file"
diff --git a/network/tribler/slack-desc b/network/tribler/slack-desc
deleted file mode 100644
index 78da2bd272..0000000000
--- a/network/tribler/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------------------------------------------------------|
-tribler: tribler (anonymous video streaming and bittorrent client)
-tribler:
-tribler: Tribler is a Bittorrent-based video streaming client. You can watch
-tribler: video files, while you are still downloading them. It relies on VLC
-tribler: for playback of videos. Tribler also includes fast keyword search
-tribler: and thumbnail-based navigation. Tribler does not require websites
-tribler: or any central server to find and watch interesting content.
-tribler:
-tribler:
-tribler:
-tribler:
diff --git a/network/tribler/squelch_dht_exceptions.diff b/network/tribler/squelch_dht_exceptions.diff
deleted file mode 100644
index fbc9dba39f..0000000000
--- a/network/tribler/squelch_dht_exceptions.diff
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur tribler-6.4.0/Tribler/Core/Libtorrent/LibtorrentDownloadImpl.py tribler-6.4.0.patched/Tribler/Core/Libtorrent/LibtorrentDownloadImpl.py
---- tribler-6.4.0/Tribler/Core/Libtorrent/LibtorrentDownloadImpl.py	2014-12-21 02:24:05.000000000 -0500
-+++ tribler-6.4.0.patched/Tribler/Core/Libtorrent/LibtorrentDownloadImpl.py	2014-12-21 03:45:45.000000000 -0500
-@@ -845,7 +845,7 @@
-         public = self.tdef and not isinstance(self.tdef, TorrentDefNoMetainfo) and not self.tdef.is_private()
- 
-         result = self.tracker_status.copy()
--        result['[DHT]'] = [dht_peers, 'Working' if ltsession.is_dht_running() and public else 'Disabled']
-+        result['[DHT]'] = [dht_peers, 'Working' if dht_peers > 0 else 'Not Working']
-         result['[PeX]'] = [pex_peers, 'Working' if not self.get_anon_mode() else 'Disabled']
-         return result
- 
diff --git a/network/tribler/tribler.SlackBuild b/network/tribler/tribler.SlackBuild
deleted file mode 100644
index 3919ff1354..0000000000
--- a/network/tribler/tribler.SlackBuild
+++ /dev/null
@@ -1,115 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for tribler
-
-# Written by B. Watson (yalhcru@gmail.com)
-
-# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
-
-# Notes:
-
-# The squelch_dht_exceptions patch is my own. I'm not a Python expert so if
-# you've got a better solution, please let me know.
-
-# Python dependency hell. Of the stuff in REQUIRES=, only gmpy could be
-# optional. However if it's not installed, the application complains about it,
-# and says upstream doesn't actually test their fallback code much.
-
-# I didn't list vlc as a required dep, because without vlc installed, tribler
-# is still a perfectly usable search engine and torrent client. Also vlc
-# can be installed later and will work (it's a runtime dep).
-
-# Don't be put off by the use of a tarball made from a git checkout. The
-# release zipfile on upstream's site is incomplete (is missing the dispersy/
-# subdirectory, for one thing). My source is from their v6.4.0 git tag, not
-# from HEAD. See git2tarxz.sh.
-
-PRGNAM=tribler
-VERSION=${VERSION:-6.4.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.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 stops tribler from spewing 20 or so lines of stack trace
-# every second.
-patch -p1 < $CWD/squelch_dht_exceptions.diff
-
-B=Tribler/Main/Build
-mkdir -p $PKG/usr/share/pixmaps $PKG/usr/share/applications \
-         $PKG/usr/man/man1 $PKG/usr/bin
-cat $B/Ubuntu/${PRGNAM}_big.xpm > $PKG/usr/share/pixmaps/$PRGNAM.xpm
-gzip -9c < $B/Ubuntu/$PRGNAM.1 > $PKG/usr/man/man1/$PRGNAM.1.gz
-
-# make .desktop file validate.
-sed \
-  -e 's,Application;,,' \
-  -e '/\(Categories\|MimeType\)/s,$,;,' \
-  $B/Ubuntu/$PRGNAM.desktop \
-  > $PKG/usr/share/applications/$PRGNAM.desktop
-
-# Upstream's wrapper script wants to redirect stdout to a temp file, and
-# never cleans them up. So /tmp would end up with lots of log files that
-# nobody cares about. I'm getting rid of the redirect, so it just goes
-# to stdout. Users who need the debug output can launch it from a terminal
-# like any other GUI application.
-sed 's, *>.*,,' debian/bin/$PRGNAM > $PKG/usr/bin/$PRGNAM
-chmod 755 $PKG/usr/bin/$PRGNAM
-
-# ditch this stuff, we don't need it in the installed package.
-rm -rf $B debian mac win
-
-# no compiling, pure python.
-mkdir -p $PKG/usr/share/$PRGNAM
-cp -a * $PKG/usr/share/$PRGNAM
-
-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
-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/network/tribler/tribler.info b/network/tribler/tribler.info
deleted file mode 100644
index cf064beca4..0000000000
--- a/network/tribler/tribler.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="tribler"
-VERSION="6.4.0"
-HOMEPAGE="https://www.tribler.org/"
-DOWNLOAD="http://urchlay.naptime.net/~urchlay/src/tribler-6.4.0.tar.xz"
-MD5SUM="979de2e5a22a4c5f13d3e78c77a8bbb2"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="wxPython apsw python-twisted pyasn1 pycrypto python-requests netifaces gmpy libtorrent-rasterbar PyXML"
-MAINTAINER="B. Watson"
-EMAIL="yalhcru@gmail.com"
diff --git a/network/trojita/trojita.SlackBuild b/network/trojita/trojita.SlackBuild
index 0b9f72d426..9a994c0c98 100644
--- a/network/trojita/trojita.SlackBuild
+++ b/network/trojita/trojita.SlackBuild
@@ -1,12 +1,15 @@
-#!/bin/sh
+#!/bin/bash
 # Slackware build script for trojita
 
 # Written by Chris Farrell <timcowchip@gmail.com>
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=trojita
-VERSION=${VERSION:-0.7}
+VERSION=${VERSION:-20201106_b4f24d7}
 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}
@@ -52,6 +62,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 {} \;
 
+# Building with ragel 7 is broken ATM, see https://bugs.kde.org/show_bug.cgi?id=426061
 cmake \
   -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
   -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
@@ -59,6 +70,7 @@ cmake \
   -DCMAKE_BUILD_TYPE=Release \
   -DCMAKE_INSTALL_PREFIX=/usr \
   -DLIB_SUFFIX=${LIBDIRSUFFIX} \
+  -DWITH_RAGEL=OFF \
   .
 make VERBOSE=1
 make install DESTDIR=$PKG
@@ -75,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/network/trojita/trojita.info b/network/trojita/trojita.info
index 20fda82343..79886cf2df 100644
--- a/network/trojita/trojita.info
+++ b/network/trojita/trojita.info
@@ -1,10 +1,10 @@
 PRGNAM="trojita"
-VERSION="0.7"
+VERSION="20201106_b4f24d7"
 HOMEPAGE="http://trojita.flaska.net/index.html"
-DOWNLOAD="http://downloads.sourceforge.net/trojita/trojita-0.7.tar.xz"
-MD5SUM="b2b5720be888ec6298a88798b113ad5f"
+DOWNLOAD="http://ponce.cc/slackware/sources/repo/trojita-20201106_b4f24d7.tar.xz"
+MD5SUM="a1c8978a37ebd817ce0f12a92994986a"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="qt5-webkit"
+REQUIRES=""
 MAINTAINER="Chris Farrell"
 EMAIL="timcowchip@gmail.com"
diff --git a/network/ttcp/README b/network/ttcp/README
index 6ae0c95767..1aff114242 100644
--- a/network/ttcp/README
+++ b/network/ttcp/README
@@ -1,9 +1,10 @@
-TTCP is a benchmarking tool for determining TCP and UDP performance 
+TTCP is a benchmarking tool for determining TCP and UDP performance
 between 2 systems.
 
 The program was created at the US Army Ballistics Research Lab (BRL)
 and is in the public domain.  Feel free to distribute this program,
-but please do leave the credit notices in the source and man page intact.
+but please do leave the credit notices in the source and man page
+intact.
 
 How to get TCP performance numbers:
 receiver:  host1 $  ttcp -r -s
diff --git a/network/ttcp/ttcp.SlackBuild b/network/ttcp/ttcp.SlackBuild
index a13b8ee084..998c98e370 100644
--- a/network/ttcp/ttcp.SlackBuild
+++ b/network/ttcp/ttcp.SlackBuild
@@ -1,29 +1,39 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for ttcp
 
 # Written by Dario Nicodemi dario.sbo@gmail.com
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=ttcp
 VERSION=${VERSION:-1.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 the variable PRINT_PACKAGE_NAME is set, then this script will report what
+# the name of the created package would be, and then exit. This information
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; 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 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/network/ttdnsd/README b/network/ttdnsd/README
index 2f24e6238c..cc9a454851 100644
--- a/network/ttdnsd/README
+++ b/network/ttdnsd/README
@@ -1,30 +1,35 @@
-ttdnsd accepts DNS requests via UDP and forwards the to a resolving nameserver
-via TCP. The actual requests are really just forwarded so one has complete
-access to the nameserver ttdnsd is talking to. -- It's not a very complicated
-process. If there are no problems with the setup it could go as smoothly as
-connecting to the 'net using a mobile broadband dongle.
+ttdnsd accepts DNS requests via UDP and forwards the to a resolving
+nameserver via TCP. The actual requests are really just forwarded so
+one has complete access to the nameserver ttdnsd is talking to.
 
-ttdnsd only connects to the resolving nameserver after receiving a request via
-UDP. For each connection ttdnsd randomly selects one of the nameservers it
-knows about. The connection will be used for forwarding multiple requests in a
-pipelined fashion and is kept open only until no more requests are received
-via UDP. This pipelining is required to overcome the initial connection
-overhead time which is quite long when using Tor.
+It's not a very complicated process. If there are no problems with the
+setup it could go as smoothly as connecting to the 'net using a mobile
+broadband dongle.
 
-To run this service at system startup, edit your rc.local and add this code:
+ttdnsd only connects to the resolving nameserver after receiving
+a request via UDP. For each connection ttdnsd randomly selects one
+of the nameservers it knows about. The connection will be used for
+forwarding multiple requests in a pipelined fashion and is kept open
+only until no more requests are received via UDP. This pipelining is
+required to overcome the initial connection overhead time which is
+quite long when using Tor.
+
+To run this service at system startup, edit your rc.local and add this
+code:
 
 if [ -x /etc/rc.d/rc.ttdsnd ]; then
   /etc/rc.d/rc.ttdsnd start
 fi
 
-after the similar code used to start the Tor service. To stop the service add
-this to your rc.local_shutdown:
+...after the similar code used to start the Tor service. To stop the
+service add this to your rc.local_shutdown:
 
 if [ -x /etc/rc.d/rc.ttdsnd ]; then
   /etc/rc.d/rc.ttdsnd stop
 fi
 
-before the Tor shutdown routines. Remember that this package acts like a DNS
-resolver so it listens by default on port 53. If you're going to run another
-DNS server like bind either as a cache to this server or in parallel, remember
-to modify ttdnsd default port or it will not start.
+...before the Tor shutdown routines. Remember that this package acts
+like a DNS resolver so it listens by default on port 53. If you're
+going to run another DNS server like bind either as a cache to this
+server or in parallel, remember to modify ttdnsd default port or it
+will not start.
diff --git a/network/ttdnsd/ttdnsd.SlackBuild b/network/ttdnsd/ttdnsd.SlackBuild
index f418235f0c..5d176de5f4 100644
--- a/network/ttdnsd/ttdnsd.SlackBuild
+++ b/network/ttdnsd/ttdnsd.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for ttdnsd.
 #
@@ -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=ttdnsd
 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}
@@ -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/network/tucan/tucan.SlackBuild b/network/tucan/tucan.SlackBuild
index 6336d4e7ac..22c92128c1 100644
--- a/network/tucan/tucan.SlackBuild
+++ b/network/tucan/tucan.SlackBuild
@@ -1,15 +1,25 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for tucan
 # Written by Nai (bluedbs@gmail.com)
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=tucan
 VERSION=${VERSION:-0.3.10}
 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}
@@ -50,4 +60,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/network/tunctl/README b/network/tunctl/README
index 86724ecd5e..174ef4f7eb 100644
--- a/network/tunctl/README
+++ b/network/tunctl/README
@@ -1,4 +1,4 @@
-tunctl is used to set up and maintain persistent TUN/TAP network interfaces,
-enabling user applications to simulate network traffic. Such interfaces
-is useful for VPN software, virtualization, emulation, simulation, and a
-number of other applications.
+tunctl is used to set up and maintain persistent TUN/TAP network
+interfaces, enabling user applications to simulate network
+traffic. Such interfaces is useful for VPN software, virtualization,
+emulation, simulation, and a number of other applications.
diff --git a/network/tunctl/tunctl.SlackBuild b/network/tunctl/tunctl.SlackBuild
index 57b881ec63..27818f6f2b 100644
--- a/network/tunctl/tunctl.SlackBuild
+++ b/network/tunctl/tunctl.SlackBuild
@@ -1,29 +1,39 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for tunctl
 
 # Written by Murat D. Kadirov <banderols@gmail.com>
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=tunctl
 VERSION=${VERSION:-1.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 the variable PRINT_PACKAGE_NAME is set, then this script will report what
+# the name of the created package would be, and then exit. This information
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; 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"
@@ -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/network/turbolift/README b/network/turbolift/README
index 9e9bb2247a..8482ae887f 100644
--- a/network/turbolift/README
+++ b/network/turbolift/README
@@ -1,7 +1,8 @@
 OpenStack Swift -Cloud Files- Uploader.
 
-If you have found yourself in a situation where you needed or wanted to upload
-a whole bunch of files to Cloud Files quickly, this is what you are looking for.
+If you have found yourself in a situation where you needed or wanted
+to upload a whole bunch of files to Cloud Files quickly, this is what
+you are looking for.
 
-Turbolift is an assistant for uploading files to the the Rackspace Cloud Files
-Repository with a bunch of options.
+Turbolift is an assistant for uploading files to the the Rackspace
+Cloud Files Repository with a bunch of options.
diff --git a/network/turbolift/turbolift.SlackBuild b/network/turbolift/turbolift.SlackBuild
index ca623ad52c..3d2803a9d3 100644
--- a/network/turbolift/turbolift.SlackBuild
+++ b/network/turbolift/turbolift.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for turbolift
 
@@ -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=turbolift
 VERSION=${VERSION:-2.1.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 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/network/turbolift/turbolift.info b/network/turbolift/turbolift.info
index a5313a33a0..f847d95c26 100644
--- a/network/turbolift/turbolift.info
+++ b/network/turbolift/turbolift.info
@@ -5,6 +5,6 @@ DOWNLOAD="https://pypi.python.org/packages/source/t/turbolift/turbolift-2.1.3.ta
 MD5SUM="3ce022b9719e76b2b8b15546369ad7b9"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="python-requests PrettyTable"
+REQUIRES="PrettyTable"
 MAINTAINER="Dimitris Zlatanidis"
 EMAIL="d.zlatanidis@gmail.com"
diff --git a/network/tut/README b/network/tut/README
new file mode 100644
index 0000000000..25651bcfc1
--- /dev/null
+++ b/network/tut/README
@@ -0,0 +1,7 @@
+Tut is a TUI for Mastodon with vim inspired keys. The program contains
+most of the features from the web client.
+
+Within tut, press "C" (no quotations) to create a new toot and "N" to
+focus on notifications.
+
+Tut also provides mouse support (see the github page for more details).
diff --git a/network/tut/modules.txt b/network/tut/modules.txt
new file mode 100644
index 0000000000..e4f82b433b
--- /dev/null
+++ b/network/tut/modules.txt
@@ -0,0 +1,90 @@
+# github.com/RasmusLindroth/go-mastodon v0.0.21
+## explicit
+github.com/RasmusLindroth/go-mastodon
+# github.com/adrg/xdg v0.4.0
+## explicit
+github.com/adrg/xdg
+# github.com/atotto/clipboard v0.1.4
+## explicit
+github.com/atotto/clipboard
+# github.com/gdamore/tcell/v2 v2.5.4
+## explicit
+github.com/gdamore/tcell/v2
+# github.com/gen2brain/beeep v0.0.0-20220909211152-5a9ec94374f6
+## explicit
+github.com/gen2brain/beeep
+# github.com/gobwas/glob v0.2.3
+## explicit
+github.com/gobwas/glob
+# github.com/icza/gox v0.0.0-20230117093757-93f961aa2755
+## explicit
+github.com/icza/gox/timex
+# github.com/microcosm-cc/bluemonday v1.0.21
+## explicit
+github.com/microcosm-cc/bluemonday
+# github.com/pelletier/go-toml/v2 v2.0.6
+## explicit
+github.com/pelletier/go-toml/v2
+# github.com/rivo/tview v0.0.0-20230104153304-892d1a2eb0da
+## explicit
+github.com/rivo/tview
+# github.com/rivo/uniseg v0.4.3
+## explicit; go 1.18
+github.com/rivo/uniseg
+# github.com/spf13/pflag v1.0.5
+## explicit
+github.com/spf13/pflag
+# golang.org/x/exp v0.0.0-20230125214544-b3c2aaf6208d
+## explicit; go 1.18
+golang.org/x/exp/slices
+# golang.org/x/net v0.5.0
+## explicit
+golang.org/x/net/html
+# mvdan.cc/xurls/v2 v2.4.0
+## explicit
+mvdan.cc/xurls/v2
+# github.com/aymerick/douceur v0.2.0
+## explicit
+github.com/aymerick/douceur/parser
+# github.com/gdamore/encoding v1.0.0
+## explicit
+github.com/gdamore/encoding
+# github.com/go-toast/toast v0.0.0-20190211030409-01e6764cf0a4
+## explicit
+github.com/go-toast/toast
+# github.com/godbus/dbus/v5 v5.1.0
+## explicit
+github.com/godbus/dbus/v5
+# github.com/gorilla/css v1.0.0
+## explicit
+github.com/gorilla/css/scanner
+# github.com/gorilla/websocket v1.5.0
+## explicit
+github.com/gorilla/websocket
+# github.com/lucasb-eyer/go-colorful v1.2.0
+## explicit
+github.com/lucasb-eyer/go-colorful
+# github.com/mattn/go-runewidth v0.0.14
+## explicit
+github.com/mattn/go-runewidth
+# github.com/nu7hatch/gouuid v0.0.0-20131221200532-179d4d0c4d8d
+## explicit
+github.com/nu7hatch/gouuid
+# github.com/tadvi/systray v0.0.0-20190226123456-11a2b8fa57af
+## explicit
+github.com/tadvi/systray
+# github.com/tomnomnom/linkheader v0.0.0-20180905144013-02ca5825eb80
+## explicit
+github.com/tomnomnom/linkheader
+# golang.org/x/sys v0.4.0
+## explicit; go 1.17
+golang.org/x/sys/unix
+golang.org/x/sys/windows/
+golang.org/x/sys/windows/registry
+# golang.org/x/term v0.4.0
+## explicit
+golang.org/x/term
+# golang.org/x/text v0.6.0
+## explicit
+golang.org/x/text/encoding
+golang.org/x/text/transform
diff --git a/network/tut/slack-desc b/network/tut/slack-desc
new file mode 100644
index 0000000000..33288d18f2
--- /dev/null
+++ b/network/tut/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+   |-----handy-ruler------------------------------------------------------|
+tut: tut (a Mastodon TUI)
+tut:
+tut: tut is a TUI for Mastodon with vim inspired keys.
+tut:
+tut:
+tut:
+tut:
+tut:
+tut:
+tut:
+tut:
diff --git a/network/tut/tut.SlackBuild b/network/tut/tut.SlackBuild
new file mode 100644
index 0000000000..1f285068cc
--- /dev/null
+++ b/network/tut/tut.SlackBuild
@@ -0,0 +1,127 @@
+#!/bin/bash
+
+# Slackware build script for tut
+
+# 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=tut
+VERSION=${VERSION:-2.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.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+
+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
+
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -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 tut
+install -Dm755 $PRGNAM $PKG/usr/bin/$PRGNAM
+
+# Install config files
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp config.example.toml $PKG/usr/doc/$PRGNAM-$VERSION/config.example.toml
+cp config/toot.tmpl $PKG/usr/doc/$PRGNAM-$VERSION/toot.tmpl
+cp config/user.tmpl $PKG/usr/doc/$PRGNAM-$VERSION/user.tmpl
+
+# Install themes
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/themes
+cp config/themes/* $PKG/usr/doc/$PRGNAM-$VERSION/themes
+
+# Install and compress man pages
+for i in {1,5,7};
+do
+  mkdir -p $PKG/usr/man/man$i
+  cp -r docs/man/tut.$i $PKG/usr/man/man$i/tut.$i
+done
+gzip -9 $PKG/usr/man/man[0-9]/$PRGNAM.[0-9]
+
+find $PKG -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/network/tut/tut.info b/network/tut/tut.info
new file mode 100644
index 0000000000..a44535b358
--- /dev/null
+++ b/network/tut/tut.info
@@ -0,0 +1,68 @@
+PRGNAM="tut"
+VERSION="2.0.1"
+HOMEPAGE="https://github.com/RasmusLindroth/tut"
+DOWNLOAD="https://github.com/RasmusLindroth/tut/archive/refs/tags/2.0.1/tut-2.0.1.tar.gz \
+          https://github.com/RasmusLindroth/go-mastodon/archive/v0.0.21/go-mastodon-0.0.21.tar.gz \
+          https://github.com/adrg/xdg/archive/v0.4.0/xdg-0.4.0.tar.gz \
+          https://github.com/atotto/clipboard/archive/v0.1.4/clipboard-0.1.4.tar.gz \
+          https://github.com/gdamore/tcell/archive/v2.5.4/tcell-2.5.4.tar.gz \
+          https://github.com/gen2brain/beeep/archive/5a9ec94/beeep-5a9ec94374f60b2b12acc4b615be802c8563a157.tar.gz \
+          https://github.com/gobwas/glob/archive/v0.2.3/glob-0.2.3.tar.gz \
+          https://github.com/icza/gox/archive/93f961a/gox-93f961aa27557b111564e0889e52eb9dd94b81a9.tar.gz \
+          https://github.com/microcosm-cc/bluemonday/archive/v1.0.21/bluemonday-1.0.21.tar.gz \
+          https://github.com/pelletier/go-toml/archive/v2.0.6/go-toml-2.0.6.tar.gz \
+          https://github.com/rivo/tview/archive/892d1a2/tview-892d1a2eb0daab1296492b2087fff46240799382.tar.gz \
+          https://github.com/rivo/uniseg/archive/v0.4.3/uniseg-0.4.3.tar.gz \
+          https://github.com/spf13/pflag/archive/v1.0.5/pflag-1.0.5.tar.gz \
+          https://github.com/golang/exp/archive/b3c2aaf/exp-b3c2aaf6208dd245d356334775d544edb2fa3040.tar.gz \
+          https://github.com/golang/net/archive/v0.5.0/net-0.5.0.tar.gz \
+          https://github.com/mvdan/xurls/archive/v2.4.0/xurls-2.4.0.tar.gz \
+          https://github.com/aymerick/douceur/archive/v0.2.0/douceur-0.2.0.tar.gz \
+          https://github.com/gdamore/encoding/archive/v1.0.0/encoding-1.0.0.tar.gz \
+          https://github.com/go-toast/toast/archive/01e6764/toast-01e6764cf0a44209189b7981cdc34284936f6891.tar.gz \
+          https://github.com/godbus/dbus/archive/v5.1.0/dbus-5.1.0.tar.gz \
+          https://github.com/gorilla/css/archive/v1.0.0/css-1.0.0.tar.gz \
+          https://github.com/gorilla/websocket/archive/v1.5.0/websocket-1.5.0.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-runewidth/archive/v0.0.14/go-runewidth-0.0.14.tar.gz \
+          https://github.com/nu7hatch/gouuid/archive/179d4d0/gouuid-179d4d0c4d8d407a32af483c2354df1d2c91e6c3.tar.gz \
+          https://github.com/tadvi/systray/archive/11a2b8f/systray-11a2b8fa57afff744b2e66a9b05f173c78f20dc6.tar.gz \
+          https://github.com/tomnomnom/linkheader/archive/02ca582/linkheader-02ca5825eb8097f10d9cc53da78481a85ad84e04.tar.gz \
+          https://github.com/golang/sys/archive/v0.4.0/sys-0.4.0.tar.gz \
+          https://github.com/golang/term/archive/v0.4.0/term-0.4.0.tar.gz \
+          https://github.com/golang/text/archive/v0.6.0/text-0.6.0.tar.gz"
+MD5SUM="7192cf56bfeb294fad290eb98e0a1e64 \
+        910805b0bcbc402c021ab9e90dfe3dbe \
+        8bc50248d26e66e5e29e65f3f051342a \
+        9020b8bb980f0b59e12f7c4e0dc53a88 \
+        0c62c60df9d5def197b42b03455ae530 \
+        0e254919fc79e73a4ff09c45689e1ab8 \
+        5d6cceb33b2e69ec12b5fb8c1f57cafe \
+        938a1fbb88141d94d356a447025dd242 \
+        bc87b962386014b2ebffefcf19958f58 \
+        2a91e4190a1d0bb7348c83e29e26e03e \
+        4e785a105923de0b560cefe68794e28c \
+        5fb9fa6f45d1bd701f0eca1e699d3c1d \
+        b31b2da1e91e337f3afdd49c8851b1a0 \
+        5567341126e060622851745978b5397c \
+        cea041eef3f83f69cef05835fe23c4e2 \
+        0ce250780135f41fcb4d84123c1582fe \
+        48d2b40c0bc69a5c19b5fad8a8d1ab1b \
+        fbadc383bc1ace79fa769fe2de36b87b \
+        c8b7381250dc50b40879d08a3bfea178 \
+        d456df1207b7ba6a073d9ab1dd82ad2d \
+        adb82396cd821ca82a8d96b68552e748 \
+        11f202db2e908f83270784cf85032b4b \
+        191fe5cfcb58e480ff4045c82a06091a \
+        c41abbf9dc5def08ef8e6999efbe2c8c \
+        3c71dda45c74b210d6b86cdcaebd3ed6 \
+        aa33e322338a67f3b3950bc0f77397e4 \
+        972d6a64ac3a22ae16ac80447bccd06f \
+        2450b5e79ce8b41cb65a6d99af8bf89f \
+        44d06b8aa75102668295863b1f94632e \
+        0811ecc6a90a1a52ed96a0ff843bd343"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="google-go-lang"
+MAINTAINER="Isaac Yu"
+EMAIL="isaacyu@protonmail.com"
diff --git a/network/twine/README b/network/twine/README
index 51ccce7629..5558b34c2b 100644
--- a/network/twine/README
+++ b/network/twine/README
@@ -1,2 +1,4 @@
-Twine is a utility for interacting with PyPI.
-Currently it only supports registering projects and uploading distributions.
+Twine is a utility for publishing Python packages on PyPI.
+
+It provides build system independent uploads of source and 
+binary distribution artifacts for both new and existing projects.
diff --git a/network/twine/slack-desc b/network/twine/slack-desc
index c215519b8e..c13a32d637 100644
--- a/network/twine/slack-desc
+++ b/network/twine/slack-desc
@@ -8,9 +8,9 @@
      |-----handy-ruler------------------------------------------------------|
 twine: twine (Utilities for interacting with PyPI)
 twine:
-twine: Twine is a utility for interacting with PyPI.
-twine: Currently it only supports registering projects and uploading
-twine: distributions.
+twine: Twine is a utility for publishing Python packages on PyPI.
+twine: It provides build system independent uploads of source and binary
+twine: distribution artifacts for both new and existing projects.
 twine:
 twine: Homepage: https://github.com/pypa/twine
 twine:
diff --git a/network/twine/twine.SlackBuild b/network/twine/twine.SlackBuild
index 0284c8ea58..77ff78a50d 100644
--- a/network/twine/twine.SlackBuild
+++ b/network/twine/twine.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for twine
 
-# Copyright 2016-2018  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,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=twine
-VERSION=${VERSION:-1.11.0}
+VERSION=${VERSION:-5.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}
@@ -69,7 +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 {} \;
 
-python setup.py install --root=$PKG
+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 +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/network/twine/twine.info b/network/twine/twine.info
index 1be03fcc6d..129d42dbd5 100644
--- a/network/twine/twine.info
+++ b/network/twine/twine.info
@@ -1,10 +1,10 @@
 PRGNAM="twine"
-VERSION="1.11.0"
+VERSION="5.0.0"
 HOMEPAGE="https://github.com/pypa/twine"
-DOWNLOAD="https://files.pythonhosted.org/packages/9e/89/2971f240b9fc102b2e56ee8b0a9d7c9c3a7cf081b851eb02d85891de20d1/twine-1.11.0.tar.gz"
-MD5SUM="1b4de33b45225a30f5f04b118f92c09b"
+DOWNLOAD="https://files.pythonhosted.org/packages/d3/cc/8025ad5102a5c754023092143b8b511e184ec087dfbfb357d7d88fb82bff/twine-5.0.0.tar.gz"
+MD5SUM="692f628c3708beca5f9073b0988e8f8f"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="tqdm pkginfo requests-toolbelt"
+REQUIRES="pkginfo requests-toolbelt readme_renderer python3-keyring python-importlib_metadata python3-rfc3986 python3-rich"
 MAINTAINER="Dimitris Zlatanidis"
-EMAIL="d.zlatanidis@gmail.com"
+EMAIL="dslackw@gmail.com"
diff --git a/network/twinkle/README b/network/twinkle/README
new file mode 100644
index 0000000000..25868e0e96
--- /dev/null
+++ b/network/twinkle/README
@@ -0,0 +1,4 @@
+Twinkle is a softphone for your voice over IP and instant messaging
+communcations using the SIP protocol. You can use it for direct IP
+phone to IP phone communication or in a network using a SIP proxy
+to route your calls and messages.
diff --git a/network/twinkle/doinst.sh b/network/twinkle/doinst.sh
new file mode 100644
index 0000000000..65c7e2eeb9
--- /dev/null
+++ b/network/twinkle/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/network/twinkle/slack-desc b/network/twinkle/slack-desc
new file mode 100644
index 0000000000..62e4efc693
--- /dev/null
+++ b/network/twinkle/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.  Line
+# up the first '|' above the ':' following the base package name, and the '|' on
+# the right side marks the last column you can put a 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------------------------------------------------------|
+twinkle: twinkle (softphone for voice over IP)
+twinkle:
+twinkle: Twinkle is a softphone for your voice over IP and instant messaging
+twinkle: communcations using the SIP protocol. You can use it for direct IP
+twinkle: phone to IP phone communication or in a network using a SIP proxy
+twinkle: to route your calls and messages.
+twinkle:
+twinkle: http://twinkle.dolezel.info/
+twinkle:
+twinkle:
+twinkle:
diff --git a/network/twinkle/twinkle.SlackBuild b/network/twinkle/twinkle.SlackBuild
new file mode 100644
index 0000000000..77aca3ed37
--- /dev/null
+++ b/network/twinkle/twinkle.SlackBuild
@@ -0,0 +1,110 @@
+#!/bin/bash
+
+# Slackware build script for twinkle
+
+# Copyright 2008 Mauro Giachero
+# Copyright 2022-2023 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.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=twinkle
+VERSION=${VERSION:-1.10.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"
+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 {} +
+
+# iLBC from SBo is not recognized
+#-DWITH_ILBC=On \
+mkdir -p build
+cd build
+  cmake \
+    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DWITH_ZRTP=On \
+    -DWITH_SPEEX=On \
+    -DWITH_GSM=On \
+    -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
+
+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 \
+  NEWS README.md sip.protocol AUTHORS THANKS TODO 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/network/twinkle/twinkle.info b/network/twinkle/twinkle.info
new file mode 100644
index 0000000000..739106f04d
--- /dev/null
+++ b/network/twinkle/twinkle.info
@@ -0,0 +1,10 @@
+PRGNAM="twinkle"
+VERSION="1.10.3"
+HOMEPAGE="http://twinkle.dolezel.info/"
+DOWNLOAD="https://github.com/LubosD/twinkle/archive/refs/tags/v1.10.3/twinkle-1.10.3.tar.gz"
+MD5SUM="1bc38c16af7b78ac047646766083888a"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="libzrtpcpp gsm"
+MAINTAINER="Johannes Schoepfer"
+EMAIL="slackbuilds@schoepfer.info"
diff --git a/network/twitter/twitter.SlackBuild b/network/twitter/twitter.SlackBuild
index 96a206bcb3..828245900c 100644
--- a/network/twitter/twitter.SlackBuild
+++ b/network/twitter/twitter.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for twitter
 
-# Copyright 2014-2019  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=twitter
-VERSION=${VERSION:-1.18.0}
+VERSION=${VERSION:-1.19.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,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/network/twitter/twitter.info b/network/twitter/twitter.info
index 2f978c65e6..a0d126b34a 100644
--- a/network/twitter/twitter.info
+++ b/network/twitter/twitter.info
@@ -1,8 +1,8 @@
 PRGNAM="twitter"
-VERSION="1.18.0"
+VERSION="1.19.3"
 HOMEPAGE="https://mike.verdone.ca/twitter/"
-DOWNLOAD="https://files.pythonhosted.org/packages/8a/9d/cea0ec784ba05d56fbd8a56a674ca12d9b012487528ce91e0064b19224f7/twitter-1.18.0.tar.gz"
-MD5SUM="22aa581b0c463963ae577e62e1a72158"
+DOWNLOAD="https://files.pythonhosted.org/packages/39/ae/1df3708172d04371b1a3efd9d1d790ec4c5eef6da548a9ef85d86f216ab1/twitter-1.19.3.tar.gz"
+MD5SUM="cba038224bb5e20a15463d8794623e4f"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/network/uTox/uTox.SlackBuild b/network/uTox/uTox.SlackBuild
index 5680ff5829..c0422ed525 100644
--- a/network/uTox/uTox.SlackBuild
+++ b/network/uTox/uTox.SlackBuild
@@ -1,9 +1,9 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for uTox
 #
 # Copyright 2015 Gethyn ThomasQuail <gethyn@bloodbathsoftworks.com>
-# Copyright 2016-2018 Christoph Willing  Brisbane, Australia
+# Copyright 2016-2021 Christoph Willing  Brisbane, Australia
 # All rights reserved.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
@@ -18,10 +18,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=uTox
-VERSION=${VERSION:-0.17.0}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-0.18.1}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -31,7 +34,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
+# the name of the created package would be, and then exit. This information
+# could be useful to other scripts.
+if [ ! -z "${PRINT_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/network/uTox/uTox.info b/network/uTox/uTox.info
index 6410fd5b68..7728394bfe 100644
--- a/network/uTox/uTox.info
+++ b/network/uTox/uTox.info
@@ -1,10 +1,10 @@
 PRGNAM="uTox"
-VERSION="0.17.0"
+VERSION="0.18.1"
 HOMEPAGE="https://github.com/uTox/uTox"
-DOWNLOAD="https://github.com/uTox/uTox/releases/download/v0.17.0/uTox-0.17.0-full.tar.gz"
-MD5SUM="eddb67c2348e66d791512c7662ceb76a"
+DOWNLOAD="https://github.com/uTox/uTox/releases/download/v0.18.1/uTox-0.18.1-full.tar.gz"
+MD5SUM="add2df145292ffe0a30965bdf3e8a3d6"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="c-toxcore libfilteraudio check"
+REQUIRES="c-toxcore libfilteraudio"
 MAINTAINER="Christoph Willing"
 EMAIL="chris.willing@linux.com"
diff --git a/network/ubertooth/README b/network/ubertooth/README
new file mode 100644
index 0000000000..3332d759e2
--- /dev/null
+++ b/network/ubertooth/README
@@ -0,0 +1,6 @@
+Project Ubertooth is an open source wireless development platform
+suitable for Bluetooth experimentation. Ubertooth ships with a capable
+BLE (Bluetooth Smart) sniffer and can sniff some data from Basic Rate
+(BR) Bluetooth Classic connections.
+
+ubertooth-specan-ui requires PySide2
diff --git a/network/ubertooth/slack-desc b/network/ubertooth/slack-desc
new file mode 100644
index 0000000000..acf38e1574
--- /dev/null
+++ b/network/ubertooth/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+         |-----handy-ruler------------------------------------------------------|
+ubertooth: ubertooth (wireless development platform)
+ubertooth:
+ubertooth: Project Ubertooth is an open source wireless development platform
+ubertooth: suitable for Bluetooth experimentation. Ubertooth ships with
+ubertooth: a capable BLE (Bluetooth Smart) sniffer and can sniff some data
+ubertooth: from Basic Rate (BR) Bluetooth Classic connections.
+ubertooth:
+ubertooth:
+ubertooth:
+ubertooth: Homepage: https://github.com/greatscottgadgets/ubertooth
+ubertooth:
diff --git a/network/ubertooth/ubertooth.SlackBuild b/network/ubertooth/ubertooth.SlackBuild
new file mode 100644
index 0000000000..9dea75916b
--- /dev/null
+++ b/network/ubertooth/ubertooth.SlackBuild
@@ -0,0 +1,112 @@
+#!/bin/bash
+
+# Slackware build script for ubertooth
+
+# 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.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=ubertooth
+VERSION=${VERSION:-2020.12.R1}
+SRCVERSION=$(echo $VERSION |tr . -)
+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-$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 {} \;
+
+mkdir -p host/build
+cd host/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 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 README.md TRADEMARK 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/network/ubertooth/ubertooth.info b/network/ubertooth/ubertooth.info
new file mode 100644
index 0000000000..122a587f46
--- /dev/null
+++ b/network/ubertooth/ubertooth.info
@@ -0,0 +1,10 @@
+PRGNAM="ubertooth"
+VERSION="2020.12.R1"
+HOMEPAGE="https://github.com/greatscottgadgets/ubertooth"
+DOWNLOAD="https://github.com/greatscottgadgets/ubertooth/archive/2020-12-R1/ubertooth-2020-12-R1.tar.gz"
+MD5SUM="4dd2d6539cfc694f3d63424c65b28394"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="libbtbb"
+MAINTAINER="pyllyukko"
+EMAIL="pyllyukko@maimed.org"
diff --git a/network/ucarp/getopt.patch b/network/ucarp/getopt.patch
new file mode 100644
index 0000000000..c6221ac220
--- /dev/null
+++ b/network/ucarp/getopt.patch
@@ -0,0 +1,12 @@
+diff -ru ucarp-1.5.2.orig/src/ucarp_p.h ucarp-1.5.2/src/ucarp_p.h
+--- ucarp-1.5.2.orig/src/ucarp_p.h	2009-05-27 21:39:23.000000000 +0000
++++ ucarp-1.5.2/src/ucarp_p.h	2020-02-09 17:57:05.816000000 +0000
+@@ -1,7 +1,7 @@
+ #ifndef __CARP_P_H__
+ #define __CARP_P_H__ 1
+ 
+-static const char *GETOPT_OPTIONS = "i:s:v:p:Pa:hb:k:x:nu:d:r:zf:BoSM";
++static const char *GETOPT_OPTIONS = "i:s:v:p:Pa:hb:k:x:nu:d:r:zf:Bo:SM";
+ 
+ static struct option long_options[] = {
+     { "interface", 1, NULL, 'i' },
diff --git a/network/ucarp/ucarp.SlackBuild b/network/ucarp/ucarp.SlackBuild
index 2e23d888a6..3e7d283ae7 100644
--- a/network/ucarp/ucarp.SlackBuild
+++ b/network/ucarp/ucarp.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for ucarp
 
-# Copyright 2017 Wayne Cuddy, Fairfax, VA (USA)
+# Copyright 2020 Wayne Cuddy, Fairfax, VA (USA)
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,10 +22,21 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+#
+# 2017
+# Initial release.
+#
+# 2020-02-10
+# Patch release to correct a bug that prevents the '-o' flag from working.
+#
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=ucarp
 VERSION=${VERSION:-1.5.2}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-3}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,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}
@@ -69,7 +87,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" \
+patch -p1 <$CWD/getopt.patch
+
+CFLAGS="$SLKCFLAGS -fcommon" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
@@ -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/network/ucspi-ssl/README b/network/ucspi-ssl/README
deleted file mode 100644
index b48310e67e..0000000000
--- a/network/ucspi-ssl/README
+++ /dev/null
@@ -1,5 +0,0 @@
-ucspi-ssl (ssl tcp client-server command-line tools)
-
-sslserver and sslclient are command-line tools for building SSL 
-client-server applications. They conform to the UNIX Client-Server 
-Program Interface, UCSPI.
diff --git a/network/ucspi-ssl/slack-desc b/network/ucspi-ssl/slack-desc
deleted file mode 100644
index ba1a1878d5..0000000000
--- a/network/ucspi-ssl/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------------------------------------------------------|
-ucspi-ssl: ucspi-ssl (ssl tcp client-server command-line tools)
-ucspi-ssl:
-ucspi-ssl: sslserver and sslclient are command-line tools for building SSL
-ucspi-ssl: client-server applications. They conform to the UNIX Client-Server
-ucspi-ssl: Program Interface, UCSPI.
-ucspi-ssl:
-ucspi-ssl:
-ucspi-ssl:
-ucspi-ssl:
-ucspi-ssl:
-ucspi-ssl:
diff --git a/network/ucspi-ssl/ucspi-ssl-0.70.SlackBuild.patch b/network/ucspi-ssl/ucspi-ssl-0.70.SlackBuild.patch
deleted file mode 100644
index 73d22f1857..0000000000
--- a/network/ucspi-ssl/ucspi-ssl-0.70.SlackBuild.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-diff -ur ucspi-ssl-0.70.old/package/command-ln ucspi-ssl-0.70/package/command-ln
---- ucspi-ssl-0.70.old/package/command-ln	2005-07-17 18:59:02.000000000 -0500
-+++ ucspi-ssl-0.70/package/command-ln	2009-05-16 20:28:13.000000000 -0500
-@@ -1,5 +1,3 @@
--/package/host/superscript.com/command
--/usr/local/bin
- 
- Directories to soft link commands into, one per line.
- The first empty line terminates the list.
-Only in ucspi-ssl-0.70/package: command-ln~
-diff -ur ucspi-ssl-0.70.old/package/upgrade ucspi-ssl-0.70/package/upgrade
---- ucspi-ssl-0.70.old/package/upgrade	2009-05-16 20:20:29.000000000 -0500
-+++ ucspi-ssl-0.70/package/upgrade	2009-05-16 20:19:25.000000000 -0500
-@@ -62,14 +62,14 @@
- 
- [ "X$targets" = "X" ] && barf "no targets"
- 
--version="`head -1 package/version`"
--here="`pwd`"
--command="`echo $here | sed -e 's/-'$version'$//'`/command"
--package="`basename $here | sed -e 's/-'$version'$//'`"
--echo "symlink $package -> $package-$version"
--safe rm -f $package
--safe ln -s $package-$version $package
--safe mv -f $package ..
-+#version="`head -1 package/version`"
-+#here="`pwd`"
-+#command="`echo $here | sed -e 's/-'$version'$//'`/command"
-+#package="`basename $here | sed -e 's/-'$version'$//'`"
-+#echo "symlink $package -> $package-$version"
-+#safe rm -f $package
-+#safe ln -s $package-$version $package
-+#safe mv -f $package ..
- 
- commands=
- for i in $targets
-diff -ur ucspi-ssl-0.70.old/src/conf-cadir ucspi-ssl-0.70/src/conf-cadir
---- ucspi-ssl-0.70.old/src/conf-cadir	2005-07-17 18:59:02.000000000 -0500
-+++ ucspi-ssl-0.70/src/conf-cadir	2009-05-16 20:13:51.000000000 -0500
-@@ -1,4 +1,4 @@
--/usr/local/ssl/certs
-+/etc/ssl/certs
- 
- This is the ucspi-ssl CA directory.
- An empty name means no certificate directory is compiled in.
-diff -ur ucspi-ssl-0.70.old/src/conf-dhfile ucspi-ssl-0.70/src/conf-dhfile
---- ucspi-ssl-0.70.old/src/conf-dhfile	2005-07-17 18:59:02.000000000 -0500
-+++ ucspi-ssl-0.70/src/conf-dhfile	2009-05-16 20:23:04.000000000 -0500
-@@ -1,3 +1,3 @@
--/usr/local/ssl/pem/dh1024.pem
-+/etc/ssl/pem/dh1024.pem
- 
- This is the sslserver DH parameter file.
-diff -ur ucspi-ssl-0.70.old/src/conf-tcpbin ucspi-ssl-0.70/src/conf-tcpbin
---- ucspi-ssl-0.70.old/src/conf-tcpbin	2005-07-17 18:59:02.000000000 -0500
-+++ ucspi-ssl-0.70/src/conf-tcpbin	2009-05-16 20:17:25.000000000 -0500
-@@ -1,4 +1,4 @@
--/usr/local/bin
-+/usr/bin
- 
- This is the ucspi-tcp bin directory.  The ucspi-tcp executables
- should appear in it.
diff --git a/network/ucspi-ssl/ucspi-ssl.SlackBuild b/network/ucspi-ssl/ucspi-ssl.SlackBuild
deleted file mode 100644
index e8ec09b575..0000000000
--- a/network/ucspi-ssl/ucspi-ssl.SlackBuild
+++ /dev/null
@@ -1,76 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for ucspi-ssl
-
-# Written by David Miller dave@frop.net
-# This script is released into the public domain
-
-PRGNAM=ucspi-ssl
-VERSION=${VERSION:-0.70}
-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
-mv host/superscript.com/net/$PRGNAM-$VERSION ./
-rm -r host
-cd $PRGNAM-$VERSION
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 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 {} \;
-
-echo gcc $SLKCFLAGS > src/conf-cc
-echo $PKG/usr/bin > package/command-cp
-
-patch -p1 < $CWD/$PRGNAM-$VERSION.SlackBuild.patch
-
-./package/compile
-./package/install
-
-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 package/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/network/ucspi-ssl/ucspi-ssl.info b/network/ucspi-ssl/ucspi-ssl.info
deleted file mode 100644
index 051f50dcd2..0000000000
--- a/network/ucspi-ssl/ucspi-ssl.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="ucspi-ssl"
-VERSION="0.70"
-HOMEPAGE="http://www.superscript.com/ucspi-ssl/"
-DOWNLOAD="http://ponce.cc/slackware/sources/repo/ucspi-ssl-0.70.tar.gz"
-MD5SUM="22a2ebd0c6905726811c615286bac875"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="David Miller"
-EMAIL="dave@frop.net"
diff --git a/network/ucspi-tcp/README b/network/ucspi-tcp/README
index fd31488d97..dc236642eb 100644
--- a/network/ucspi-tcp/README
+++ b/network/ucspi-tcp/README
@@ -6,6 +6,6 @@ it provides useful environment variables, resource limits, and access
 control features. tcpclient makes a TCP connection and runs a program of
 your choice. It sets up the same environment variables as tcpserver.
 
-Also included are recordio, a tool that monitors all the input and output
-of a server, and several sample clients built on top of tcpclient: who@,
-date@, finger@, http@, tcpcat, and mconnect.
+Also included are recordio, a tool that monitors all the input
+and output of a server, and several sample clients built on top of
+tcpclient: who@, date@, finger@, http@, tcpcat, and mconnect.
diff --git a/network/ucspi-tcp/ucspi-tcp.SlackBuild b/network/ucspi-tcp/ucspi-tcp.SlackBuild
index b79cd54e0f..39947370ad 100644
--- a/network/ucspi-tcp/ucspi-tcp.SlackBuild
+++ b/network/ucspi-tcp/ucspi-tcp.SlackBuild
@@ -1,30 +1,40 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for ucspi-tcp
 
 # Written by David Miller dave@frop.net
 # This script is released into the public domain
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=ucspi-tcp
 VERSION=${VERSION:-0.88}
 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
@@ -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/network/udns/udns.SlackBuild b/network/udns/udns.SlackBuild
index a5254927d0..fc39e5fb56 100644
--- a/network/udns/udns.SlackBuild
+++ b/network/udns/udns.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for udns
 
@@ -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=udns
 VERSION=${VERSION:-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 the variable PRINT_PACKAGE_NAME is set, then this script will report what
+# the name of the created package would be, and then exit. This information
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; 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/network/udpbench/README b/network/udpbench/README
new file mode 100644
index 0000000000..8ae64ff080
--- /dev/null
+++ b/network/udpbench/README
@@ -0,0 +1,3 @@
+Measure UDP send and receive performance.  Be very careful that the
+data is reliable.  Avoid unnecessary system calls that may affect
+the result.
diff --git a/network/udpbench/slack-desc b/network/udpbench/slack-desc
new file mode 100644
index 0000000000..35f8932e73
--- /dev/null
+++ b/network/udpbench/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+        |-----handy-ruler------------------------------------------------------|
+udpbench: udpbench (UDP network benchmarking tool)
+udpbench:
+udpbench: Measure UDP send and receive performance.  Be very careful that the
+udpbench: data is reliable.  Avoid unnecessary system calls that may affect
+udpbench: the result.
+udpbench:
+udpbench:
+udpbench:
+udpbench:
+udpbench: https://github.com/bluhm/udpbench
+udpbench:
diff --git a/network/udpbench/udpbench.SlackBuild b/network/udpbench/udpbench.SlackBuild
new file mode 100644
index 0000000000..95aa0c85c1
--- /dev/null
+++ b/network/udpbench/udpbench.SlackBuild
@@ -0,0 +1,93 @@
+#!/bin/bash
+
+# Slackware build script for udpbench
+
+# Copyright 2024 Alexander Bluhm, 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.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=udpbench
+VERSION=${VERSION:-1.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"
+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
+BINDIR=/usr/bin \
+MANDIR=/usr/man/man \
+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
+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/network/udpbench/udpbench.info b/network/udpbench/udpbench.info
new file mode 100644
index 0000000000..78b37a2244
--- /dev/null
+++ b/network/udpbench/udpbench.info
@@ -0,0 +1,10 @@
+PRGNAM="udpbench"
+VERSION="1.10"
+HOMEPAGE="https://github.com/bluhm/udpbench"
+DOWNLOAD="https://github.com/bluhm/udpbench/releases/download/v1.10/udpbench-1.10.tar.gz"
+MD5SUM="af96d4cb8e8910c571032bf58b99c5ca"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="libbsd pkgconf"
+MAINTAINER="Alexander Bluhm"
+EMAIL="alexander.bluhm@gmx.net"
diff --git a/network/udpcast/README b/network/udpcast/README
index 9ec666a3ef..f56989ef6a 100644
--- a/network/udpcast/README
+++ b/network/udpcast/README
@@ -1,3 +1,3 @@
-Udpcast is a commandline program for transmitting or receiving files over
-the network using the UDP protocol. This way, you get a higher bandwidth
-than via TCP and you can send it to many clients at once.
+Udpcast is a commandline program for transmitting or receiving files
+over the network using the UDP protocol. This way, you get a higher
+bandwidth than via TCP and you can send it to many clients at once.
diff --git a/network/udpcast/udpcast.SlackBuild b/network/udpcast/udpcast.SlackBuild
index 2f3860c312..ec74d0a0d4 100644
--- a/network/udpcast/udpcast.SlackBuild
+++ b/network/udpcast/udpcast.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for udpcast
 
-# Copyright 2007-2013 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=udpcast
-VERSION=${VERSION:-20120424}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-20200328}
+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 missing include
-patch -p1 -i $CWD/udpcast_include.patch
-
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
@@ -99,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/network/udpcast/udpcast.info b/network/udpcast/udpcast.info
index 4e5a0c1769..62d21ff6f4 100644
--- a/network/udpcast/udpcast.info
+++ b/network/udpcast/udpcast.info
@@ -1,10 +1,10 @@
 PRGNAM="udpcast"
-VERSION="20120424"
+VERSION="20200328"
 HOMEPAGE="http://udpcast.linux.lu"
-DOWNLOAD="http://udpcast.linux.lu/download/udpcast-20120424.tar.gz"
-MD5SUM="b9b67a577ca5659a93bcb9e43f298fb2"
+DOWNLOAD="http://udpcast.linux.lu/download/udpcast-20200328.tar.gz"
+MD5SUM="e862a18c3facd59ea016752ee1e6a85a"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
 MAINTAINER="Heinz Wiesinger"
-EMAIL="pprkut@liwjatan.at"
+EMAIL="pprkut@slackbuilds.org"
diff --git a/network/udpcast/udpcast_include.patch b/network/udpcast/udpcast_include.patch
deleted file mode 100644
index b911950408..0000000000
--- a/network/udpcast/udpcast_include.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/console.h	2013-02-21 16:12:39.418426558 +0100
-+++ b/console.h	2013-02-21 16:12:26.998596846 +0100
-@@ -6,6 +6,8 @@
- #include <winbase.h>
- #endif /* __MINGW32__ */
- 
-+#include <sys/select.h>
-+
- #define prepareConsole udpc_prepareConsole
- #define getConsoleFd udpc_getConsoleFd
- #define restoreConsole udpc_restoreConsole
diff --git a/network/udpxy/udpxy.SlackBuild b/network/udpxy/udpxy.SlackBuild
index 7cdfc69d81..ac545b2b78 100644
--- a/network/udpxy/udpxy.SlackBuild
+++ b/network/udpxy/udpxy.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for udpxy
 
@@ -24,26 +24,36 @@
 
 # Modified by the SlackBuilds.org project
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=udpxy
 VERSION=${VERSION:-1.0.23_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"
@@ -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/network/ufw/README b/network/ufw/README
index 4bd36b3621..54d8cd35bf 100644
--- a/network/ufw/README
+++ b/network/ufw/README
@@ -1,17 +1,17 @@
-Ufw (Uncomplicated Firewall) is program for managing a netfilter firewall.
-It provides a command line interface and aims to be uncomplicated and easy
-to use.
+Ufw (Uncomplicated Firewall) is program for managing a netfilter
+firewall.  It provides a command line interface and aims to be
+uncomplicated and easy to use.
 
-Add the following code to /etc/rc.local to start Ufw at boot time:
+Add the following code to /etc/rc.d/rc.local to start Ufw at boot time:
 
 if [ -x /lib/ufw/ufw-init ]; then
   /lib/ufw/ufw-init start
 fi
 
-Ufw comes with a number of common application profiles.  Create additional
-application profiles under /etc/ufw/applications.d.  Each profile should
-contain a list of rules which include a title, description, and port(s) or
-port range.
+Ufw comes with a number of common application profiles.  Create
+additional application profiles under /etc/ufw/applications.d.
+Each profile should contain a list of rules which include a title,
+description, and port(s) or port range.
 
 A custom application profile should look similar to this:
 
diff --git a/network/ufw/ufw.SlackBuild b/network/ufw/ufw.SlackBuild
index 0ce87b08aa..f3b65a2a13 100644
--- a/network/ufw/ufw.SlackBuild
+++ b/network/ufw/ufw.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for ufw
 
@@ -6,6 +6,7 @@
 # Copyright 2013 Ricardson Williams <ricardsonwilliams@gmail.com>
 # Copyright 2014-2015 Rodolfo Gouveia <rgouveia@cosmico.net>
 # Copyright 2016 Brenton Earl <brent@exitstatusone.com>
+# Copyright 2023 Jay Lanagan <j@lngn.net>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -25,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=ufw
-VERSION=${VERSION:-0.35}
+VERSION=${VERSION:-0.36.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -38,25 +42,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
@@ -73,17 +67,31 @@ find -L . \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 patch -p1 --verbose < $CWD/ufw.conf.patch
-patch -p1 --verbose < $CWD/ufw-0.35-fix-iptables-path.patch
 
-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
 
 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
+# 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/etc/rc.d
+cat $TMP/$PRGNAM-$VERSION/doc/initscript.example > $PKG/etc/rc.d/rc.ufw
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a AUTHORS ChangeLog* COPYING README* TODO doc/*.example $PKG/usr/doc/$PRGNAM-$VERSION
@@ -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/network/ufw/ufw.conf.patch b/network/ufw/ufw.conf.patch
index 0b085ae82b..eda9b184e1 100644
--- a/network/ufw/ufw.conf.patch
+++ b/network/ufw/ufw.conf.patch
@@ -1,5 +1,5 @@
---- ufw-0.33.orig/conf/ufw.conf	2012-08-18 05:12:49.000000000 +0800
-+++ ufw-0.33/conf/ufw.conf	2013-07-16 04:18:44.365425697 +0800
+--- a/conf/ufw.conf
++++ b/conf/ufw.conf
 @@ -3,7 +3,7 @@
  
  # Set to yes to start on boot. If setting this remotely, be sure to add a rule
@@ -9,3 +9,4 @@
  
  # Please use the 'ufw' command to set the loglevel. Eg: 'ufw logging medium'.
  # See 'man ufw' for details.
+
diff --git a/network/ufw/ufw.info b/network/ufw/ufw.info
index a65a7c07a8..b2d57c2680 100644
--- a/network/ufw/ufw.info
+++ b/network/ufw/ufw.info
@@ -1,10 +1,10 @@
 PRGNAM="ufw"
-VERSION="0.35"
+VERSION="0.36.2"
 HOMEPAGE="https://launchpad.net/ufw"
-DOWNLOAD="https://launchpad.net/ufw/0.35/0.35/+download/ufw-0.35.tar.gz"
-MD5SUM="b7cd2dd4e4e98e46df125fee06edff92"
+DOWNLOAD="https://launchpad.net/ufw/0.36/0.36.2/+download/ufw-0.36.2.tar.gz"
+MD5SUM="4a1c52b7da2b25e66e91b5f16a7d032d"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Brenton Earl"
-EMAIL="brent@exitstatusone.com"
+MAINTAINER="Jay Lanagan"
+EMAIL="j@lngn.net"
diff --git a/network/uget-chrome-wrapper/README b/network/uget-chrome-wrapper/README
index a1cabbad2a..598d48f19c 100644
--- a/network/uget-chrome-wrapper/README
+++ b/network/uget-chrome-wrapper/README
@@ -1,2 +1,3 @@
-Integrate the famous FOSS uGet Download Manager with Google Chrome in Linux systems. 
-With this tool, uGet can interrupt and catch your downloads from Google Chrome.
+Integrate the famous FOSS uGet Download Manager with Google Chrome
+in Linux systems. With this tool, uGet can interrupt and catch your
+downloads from Google Chrome.
diff --git a/network/uget-chrome-wrapper/uget-chrome-wrapper.SlackBuild b/network/uget-chrome-wrapper/uget-chrome-wrapper.SlackBuild
index 6ac934d1ff..7cbc686736 100644
--- a/network/uget-chrome-wrapper/uget-chrome-wrapper.SlackBuild
+++ b/network/uget-chrome-wrapper/uget-chrome-wrapper.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for uget-chrome-wrapper
 
@@ -22,22 +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=uget-chrome-wrapper
 VERSION=${VERSION:-2.0.4}
 BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
-# Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
     i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
-    # Unless $ARCH is already set, use uname -m for all other archs:
        *) 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}
@@ -91,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/network/uget-chrome-wrapper/uget-chrome-wrapper.info b/network/uget-chrome-wrapper/uget-chrome-wrapper.info
index eefd9cad37..d4172b424a 100644
--- a/network/uget-chrome-wrapper/uget-chrome-wrapper.info
+++ b/network/uget-chrome-wrapper/uget-chrome-wrapper.info
@@ -9,6 +9,6 @@ MD5SUM="d824ef742a548a5613caadbad78475f2 \
         4806bc4553389cc0610e642b12510246"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="uget python3"
+REQUIRES="uget"
 MAINTAINER="Macius Kuzmin"
 EMAIL="szczecinska.duma@gmail.com"
diff --git a/network/uget-integrator/README b/network/uget-integrator/README
new file mode 100644
index 0000000000..f2399f5d95
--- /dev/null
+++ b/network/uget-integrator/README
@@ -0,0 +1,15 @@
+Integrate the famous FOSS uGet Download Manager with Google Chrome
+in Linux systems.  With this tool, uGet can interrupt and catch your
+downloads from Google Chrome.
+
+After you install uget-integrator, you must install your browser's
+extension.
+
+For chrome/chromium/vivaldi:
+https://chrome.google.com/webstore/detail/uget-integration/efjgjleilhflffpbnkaofpmdnajdpepi
+
+For firefox:
+https://addons.mozilla.org/en-US/firefox/addon/ugetintegration/
+
+For opera:
+https://addons.opera.com/en/extensions/details/uget-integration
diff --git a/network/uget-integrator/slack-desc b/network/uget-integrator/slack-desc
new file mode 100644
index 0000000000..f88ce4b926
--- /dev/null
+++ b/network/uget-integrator/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+               |-----handy-ruler------------------------------------------------------|
+uget-integrator: uget-integrator (download manager)
+uget-integrator:
+uget-integrator: Integrate uGet Download Manager with Google Chrome, Chromium,
+uget-integrator: Vivaldi, Opera and Firefox
+uget-integrator:
+uget-integrator:
+uget-integrator:
+uget-integrator: Homepage: https://github.com/ugetdm/uget-integrator/
+uget-integrator:
+uget-integrator:
+uget-integrator:
diff --git a/network/uget-integrator/uget-integrator.SlackBuild b/network/uget-integrator/uget-integrator.SlackBuild
new file mode 100644
index 0000000000..2600a8f189
--- /dev/null
+++ b/network/uget-integrator/uget-integrator.SlackBuild
@@ -0,0 +1,112 @@
+#!/bin/bash
+
+# Slackware build script for uget-integrator
+
+# Copyright 2020 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=uget-integrator
+VERSION=${VERSION:-1.0.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 the variable PRINT_PACKAGE_NAME is set, then this script will report what
+# the name of the created package would be, and then exit. This information
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; 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 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
+ -exec chmod 644 {} \;
+
+mkdir -p "$PKG/usr/bin"
+
+# reference: https://developer.chrome.com/apps/nativeMessaging
+# Chromium
+install -Dm775 bin/uget-integrator "$PKG"/usr/bin
+mkdir -p "$PKG/etc/chromium/native-messaging-hosts"
+install -Dm775 conf/com.ugetdm.chrome.json "$PKG"/etc/chromium/native-messaging-hosts/
+
+# Chrome
+#mkdir -p "$PKG/etc/opt/chrome/native-messaging-hosts/"
+#install -Dm775 bin/uget-integrator "$PKG"/usr/bin
+#install -Dm775 conf/com.ugetdm.chrome.json "$PKG"/etc/opt/chrome/native-messaging-hosts/
+
+# Firefox
+#mkdir -p "$PKG/usr/lib${LIBDIRSUFFIX}/mozilla/native-messaging-hosts"
+#install -Dm775 bin/uget-integrator "$PKG"/usr/bin
+#install -Dm775 conf/com.ugetdm.firefox.json "$PKG"/usr/lib${LIBDIRSUFFIX}/mozilla/native-messaging-hosts
+
+# Opera
+# - work in progress -
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a LICENSE README.md 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
diff --git a/network/uget-integrator/uget-integrator.info b/network/uget-integrator/uget-integrator.info
new file mode 100644
index 0000000000..c250109431
--- /dev/null
+++ b/network/uget-integrator/uget-integrator.info
@@ -0,0 +1,10 @@
+PRGNAM="uget-integrator"
+VERSION="1.0.0"
+HOMEPAGE="https://github.com/ugetdm/uget-integrator/"
+DOWNLOAD="https://github.com/ugetdm/uget-integrator/archive/v1.0.0/uget-integrator-1.0.0.tar.gz"
+MD5SUM="fc08f3efd2c60c730ae02b45c26123c8"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="uget"
+MAINTAINER="Fernando Lopez Jr."
+EMAIL="fernando.lopezjr@gmail.com"
diff --git a/network/uget/README b/network/uget/README
index d69d37d419..5d0677faef 100644
--- a/network/uget/README
+++ b/network/uget/README
@@ -5,11 +5,11 @@ uGet is a Free and Open Source download manager.
 It allows for queuing downloads, file type-based classification of
 downloads, and is lightweight.
 
-By default, uGet uses curl for downloads. If desired, uGet can use aria2
-instead. To do this, install aria2, then launch uGet and choose "Edit =>
-Settings => Plug-in => Plug-in matching order", and select "aria2". There's
-no need to rebuild uGet after installing aria2: it's an optional run-time
-dependency.
+By default, uGet uses curl for downloads. If desired, uGet can use
+aria2 instead. To do this, install aria2, then launch uGet and choose
+"Edit => Settings => Plug-in => Plug-in matching order", and select
+"aria2". There's no need to rebuild uGet after installing aria2: it's
+an optional run-time dependency.
 
 uGet can be compiled without support for notifications, since some users
 find them annoying. To do this, pass LIBNOTIFY=no to the script.
@@ -21,7 +21,7 @@ pass GSTREAMER=no to the script.
 If you're upgrading from uGet 1.x, run "uget-gtk-1to2" to convert your
 old settings in ~/.config/uGet to the format used by uGet 2.x.
 
-The status line at the top of the uGet window is intended to announce new
-releases of uGet, but it's currently "stuck" and claims that 2.0.8 is a
-"new stable release". Upstream is working on the problem; please just
-ignore the status line for now.
+The status line at the top of the uGet window is intended to announce
+new releases of uGet, but it's currently "stuck" and claims that 2.0.8
+is a "new stable release". Upstream is working on the problem; please
+just ignore the status line for now.
diff --git a/network/uget/uget.SlackBuild b/network/uget/uget.SlackBuild
index cda99f41d8..faf76f9149 100644
--- a/network/uget/uget.SlackBuild
+++ b/network/uget/uget.SlackBuild
@@ -1,11 +1,14 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for uget
 # Originally written by Morten Juhl-Johansen Zölde-Fejér <email removed>
-# Updated and now maintained by B. Watson <yalhcru@gmail.com>
+# Updated and now maintained by B. Watson <urchlay@slackware.uk>
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
+# 20210926 bkw: BUILD=2, fix build on -current/15.0
+# 20200223 bkw: update for 2.2.3_1
+# 20191130 bkw: update for 2.2.2
 # 20180612 bkw: update for 2.2.1
 
 # 20180109 bkw:
@@ -15,15 +18,13 @@
 #   Slackware these days. Add GSTREAMER variable to disable it.
 # - update README and slack-desc
 
-# 20170827 bkw:
-# - update for 2.0.10
+# 20170827 bkw: update for 2.0.10
 
 # 20170324 bkw:
 # - update for 2.0.9
 # - AUTHORS no longer empty, include in package
 
-# 20160727 bkw:
-# - upgrade to 2.0.8
+# 20160727 bkw: upgrade to 2.0.8
 
 # 20150910 bkw:
 # - upgrade to 2.0.1
@@ -35,10 +36,20 @@
 # - install developer docs doc/*.txt
 # - don't install empty AUTHORS and ChangeLog
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=uget
-VERSION=${VERSION:-2.2.1}
-BUILD=${BUILD:-1}
+VERSION=${VERSION:-2.2.3_1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+# Tarball filename version number doesn't match top-level dir inside
+# tarball, and neither matches VERSION 'cause we can't use hyphens.
+# This stuff can safely be left in place: if VERSION contains no _
+# character, TARVER == DIRVER == VERSION.
+TARVER=${VERSION/_/-}
+DIRVER="$( echo $VERSION | cut -d_ -f1 )"
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -48,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}
@@ -72,15 +87,12 @@ 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-$DIRVER
+tar xvf $CWD/$PRGNAM-$TARVER.tar.gz
+cd $PRGNAM-$DIRVER
 chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -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 {} \+
 
 LIBNOTIFY="${LIBNOTIFY:-yes}"
 GSTREAMER="${GSTREAMER:-yes}"
@@ -88,6 +100,8 @@ GSTREAMER="${GSTREAMER:-yes}"
 [ "$LIBNOTIFY" = "no" ] && NOTIFYFLAG="--disable-notify"
 [ "$GSTREAMER" = "no" ] && GSTFLAG="--disable-gstreamer"
 
+SLKCFLAGS+=" -fcommon"
+
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
@@ -111,4 +125,4 @@ sed -e "s,@A,$GSTREAMER," \
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/network/uget/uget.info b/network/uget/uget.info
index 9ea53a9d58..be53c23c2f 100644
--- a/network/uget/uget.info
+++ b/network/uget/uget.info
@@ -1,10 +1,10 @@
 PRGNAM="uget"
-VERSION="2.2.1"
+VERSION="2.2.3_1"
 HOMEPAGE="https://ugetdm.com"
-DOWNLOAD="http://downloads.sourceforge.net/project/urlget/uget%20%28stable%29/2.2.1/uget-2.2.1.tar.gz"
-MD5SUM="ef00e0d9a63051d553c4699192274db2"
+DOWNLOAD="https://downloads.sourceforge.net/project/urlget/uget%20%28stable%29/2.2.3/uget-2.2.3-1.tar.gz"
+MD5SUM="ac623b972ec13909a05bc5d098c5254a"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
 MAINTAINER="B. Watson"
-EMAIL="yalhcru@gmail.com"
+EMAIL="urchlay@slackware.uk"
diff --git a/network/unbound/README b/network/unbound/README
index 96200ae268..52fdc7c21a 100644
--- a/network/unbound/README
+++ b/network/unbound/README
@@ -13,9 +13,3 @@ not conflict with anything else on SlackBuilds:
   groupadd -g 304 unbound
   useradd -r -u 304 -g unbound -d /etc/unbound/ -s /sbin/nologin -c \
   'Unbound DNS resolver' unbound
-
-Optional DNSCrypt support is provided. To enable:
-
-  DNSCRYPT=yes ./unbound.SlackBuild
-
-This will require libsodium which is available at SlackBuilds
diff --git a/network/unbound/README.SLACKWARE b/network/unbound/README.SLACKWARE
new file mode 100644
index 0000000000..f3718b1e61
--- /dev/null
+++ b/network/unbound/README.SLACKWARE
@@ -0,0 +1,64 @@
+--------
+Welcome and background
+--------
+
+Unbound SlackBuild script was rewritten as of version 1.16.2.
+
+As of version 1.16.2 rc.unbound script was made from scratch 
+to work like other SysVinit scripts. The previous versions 
+included Red Hat style init script. If for some reason you still
+want to use that one, it can be found from the source tarball
+contrib directory. It's not supported by this SlackBuild, though.
+
+--------
+Configuration
+--------
+
+The main configuration file is located at /etc/unbound/unbound.conf.
+
+To make the setup as easy as possible, the SlackBuild makes some 
+changes to the original file so you don't have to spend time 
+changing some obvious settings, like disabling systemd socket 
+activation and other stuff that's required for proper functionality
+on Slackware. The upstream configuration file is saved to 
+unbound.conf.upstream.
+
+Threading is supported by Unbound but disabled by default. The
+script will set num-threads to the value of nproc. Just uncomment
+num-threads in unbound.conf to enable threading.
+
+By default, we turn on "remote control" which enables the 
+functionality of unbound-control command. Despite its name, it 
+binds to localhost (by default) and cannot be used by unprivileged
+users as certificate files aren't readable by them. It also allows
+logrotating to work properly.
+
+The logs are kept in /var/log/unbound/. The default settings log
+just very basic things (i.e. unbound started or stopped).
+
+The script also installs a logrotate script to /etc/logrotate.d
+
+As for resolving and caching, you'll probably want to add 
+something like this to your /etc/resolv.conf:
+
+   nameserver ::1
+   nameserver 127.0.0.1
+   options trust-ad
+
+--------
+Automatic starting/stopping upon system start/shutdown
+--------
+
+To start Unbound automatically when system is booted,
+add the following lines to /etc/rc.d/rc.local:
+
+   if [ -x /etc/rc.d/rc.unbound ]; then
+       /etc/rc.d/rc.unbound start
+   fi
+
+To stop Unbound on system shutdown, add following lines
+to /etc/rc.d/rc.local_shutdown
+
+   if [ -x /etc/rc.d/rc.unbound ]; then
+       /etc/rc.d/rc.unbound stop
+   fi
diff --git a/network/unbound/doinst.sh b/network/unbound/doinst.sh
index 2914d5783b..a1aece44fe 100644
--- a/network/unbound/doinst.sh
+++ b/network/unbound/doinst.sh
@@ -24,3 +24,29 @@ preserve_perms() {
 
 preserve_perms etc/rc.d/rc.unbound.new
 config etc/unbound/unbound.conf.new
+config etc/logrotate.d/unbound.new
+
+if [ -r /etc/logrotate.d/unbound ] && [ $(stat -c "%U:%G" "/etc/logrotate.d/unbound") != "root:root" ]; then
+ echo "Incorrect permissions detected on /etc/logrotate.d/unbound !"
+ echo "This will prevent Unbound logrotate script from working."
+ echo ""
+ echo "Previous Unbound SlackBuild scripts didn't set this correctly."
+ echo ""
+ echo "To fix it, simply run:"
+ echo "# chown root:root /etc/logrotate.d/unbound"
+fi
+
+echo "----------------------------"
+echo "As of Unbound SlackBuild 1.18.0-2 DNSSEC is enabled by default."
+echo
+echo "You have two options:"
+echo
+echo "1) Run the following command to setup the root trust anchor (RECOMMENDED!)"
+echo "# sudo -u unbound unbound-anchor -f /etc/resolv.conf -R -a /var/lib/unbound/root.key"
+echo
+echo "2) Disable DNSSEC and unbound-anchor functionality."
+echo "Edit /etc/unbound/unbound.conf, and erase or comment the following line:"
+echo 'auto-trust-anchor-file: "/var/lib/unbound/root.key"'
+echo
+echo "This is a suitable option if you plan to use Unbound simply as a forwarding resolver."
+echo "----------------------------"
diff --git a/network/unbound/rc.unbound b/network/unbound/rc.unbound
index 49a6c991e8..3c31faf4ef 100644
--- a/network/unbound/rc.unbound
+++ b/network/unbound/rc.unbound
@@ -1,118 +1,147 @@
-#!/bin/sh
+#!/bin/bash
 #
-# unbound       This shell script takes care of starting and stopping
-#               unbound (DNS server).
-#
-# chkconfig:   - 14 86
-# description:  unbound is a Domain Name Server (DNS) \
-#               that is used to resolve host names to IP addresses.
-
-### BEGIN INIT INFO
-# Provides: unbound
-# Required-Start: $network $local_fs
-# Required-Stop: $network $local_fs
-# Default-Start:
-# Default-Stop: 0 1 2 3 4 5 6
-# Should-Start: $syslog
-# Should-Stop: $syslog
-# Short-Description: unbound recursive Domain Name Server.
-# Description:  unbound is a Domain Name Server (DNS) 
-#               that is used to resolve host names to IP addresses.
-### END INIT INFO
+# Slackware initialization script for Unbound.
 
-# Source function library.
-. /etc/rc.d/init.d/functions
 
-exec="/usr/sbin/unbound"
-config="/etc/unbound/unbound.conf"
-pidfile="/var/run/unbound/unbound.pid"
-piddir=`dirname $pidfile`
+UNBOUND=/usr/sbin/unbound
+CONFIG=/etc/unbound/unbound.conf
+PIDFILE=/run/unbound/unbound.pid
+LOGDIR=/var/log/unbound
+KEYFILE=/var/lib/unbound/root.key
 
-[ -x /usr/sbin/dnssec-configure ] && [ -r "$config" ] &&
-  [ /etc/sysconfig/dnssec -nt "$config" ] && \
-    /usr/sbin/dnssec-configure -u --norestart --dnssec="$DNSSEC" --dlv="$DLV"
+# Unbound-control is useful but I'm not going to cram it
+# down your throat. Set this to "yes" to disable unbound-control
+# initial setup. Note that you'll need to disable control port
+# in unbound.conf so Unbound will actually start.
+DISABLE_UNBOUND_CONTROL="no"
 
-start() {
-    [ -x $exec ] || exit 5
-    [ -f $config ] || exit 6
-    # /var/run could (and should) be tmpfs
-    [ -d $piddir ] || mkdir $piddir
+# As part of the initial checks, the script makes sure that
+# $LOGDIR exists. It's mostly for cases where admin accidentally
+# deletes the entire log folder rather than individual logs.
+# If you don't use logging at all, have a custom setup or
+# just want to skip these checks, set this to "yes".
+DISABLE_LOGDIR_CHECKS="no"
 
-    if [ -f /var/lib/unbound/root.anchor -a -f /usr/sbin/unbound-anchor ]
-    then
-        /sbin/runuser --command="/usr/sbin/unbound-anchor -a /var/lib/unbound/root.anchor -c /etc/unbound/icannbundle.pem" --shell /bin/sh unbound
+initchecks() {
+   # If auto-trust-anchor-file is enabled and the keyfile doesn't exists in
+   # /var/lib/unbound, we won't start the daemon. Most(?) errors can be caught
+   # by /usr/sbin/unbound executable but this one actually allows Unbound to start -
+   # - only for it to crash a moment later. Running unbound-checkconf on every start up
+   # would be useful, but it would make noise every time the daemon starts up.
+   if [ ! -z "$(unbound-checkconf -o auto-trust-anchor-file)" ] && [ ! -e "$KEYFILE" ]; then
+     echo "ERROR: $KEYFILE not found, yet auto-trust-anchor-file is enabled in $CONFIG"
+     echo "ERROR: Refusing to start because Unbound would crash."
+     echo "ERROR: Please generate Unbound Anchor file with the following command:"
+     echo "       # sh /etc/rc.d/rc.unbound generate-key"
+     echo
+     echo "...or comment out auto-trust-anchor-file in $CONFIG."
+     exit 1
+   fi
+   # Look out for a stale pidfile. If there's one, remove it.
+   # This shouldn't be necessary unless the system was shutdown uncleanly
+   # or if Unbound crashes.
+   if [ -e $PIDFILE ] && [ ! $(pidof unbound) ]; then
+      echo "Looks like Unbound isn't running but there's a stale pid file."
+      echo "Removing $PIDFILE"
+      rm -vf $PIDFILE
+   fi
+   # Check that /run/unbound exists. If not, create and chown it.
+    if [ ! -e $(dirname $PIDFILE) ]; then
+        mkdir -p $(dirname $PIDFILE)
+        chown unbound:unbound $(dirname $PIDFILE)
     fi
-
-    if [ ! -f /etc/unbound/unbound_control.key ]
+    # Run the initial setup for unbound-control unless it's disabled.
+    # Mostly relevant for the first time run.
+    if [ ! -e $(dirname $CONFIG)/unbound_server.pem ] && [ "$DISABLE_UNBOUND_CONTROL" == "no" ]; then
+        echo "Unbound-control: unbound_server.pem not found."
+        echo "This is normal for the first run."
+        echo "Running initial setup to generate certificates: /usr/sbin/unbound-control-setup"
+        /usr/sbin/unbound-control-setup || exit 1
+        echo "Actually... no need to do anything. It's enabled by default on Slackware :-)"
+    fi
+    # Deleted the entire log directory by accident? Oh well, bound to happen.
+    # Let's fix that right away.
+    if [ "$DISABLE_LOGDIR_CHECKS" == "no" ]
     then
-        echo -n $"Generating unbound control key and certificate: "
-        /usr/sbin/unbound-control-setup -d /etc/unbound/ > /dev/null 2> /dev/null
-        chgrp unbound /etc/unbound/unbound_*key /etc/unbound/unbound_*pem
-        [ -x /usr/sbin/selinuxenabled ] && /usr/sbin/selinuxenabled && \
-            [ -x /sbin/restorecon ] && /sbin/restorecon /etc/unbound/*
-        echo
-    else
-        # old init script created these as root instead of unbound.
-        if [ -G /etc/unbound/unbound_control.key ]
-        then
-            chgrp unbound /etc/unbound/unbound_*key /etc/unbound/unbound_*pem
-            [ -x /usr/sbin/selinuxenabled ] && /usr/sbin/selinuxenabled && \
-                [ -x /sbin/restorecon ] && /sbin/restorecon /etc/unbound/*
-            echo
+        if [ ! -d "$LOGDIR" ]; then
+        echo -n "Unbound log directory not found. Attempting to recreate it... "
+        mkdir $LOGDIR && echo "Success!"
+        fi
+        if [ $(stat -c "%U:%G" "$LOGDIR") != "unbound:unbound" ]; then
+        echo -n "Fixing permissions on the log folder $LOGDIR... "
+        chown -R unbound:unbound $LOGDIR && echo "Success!"
         fi
     fi
+}
 
+anchorkeygen() {
+     echo "Generating Unbound Anchor keyfile..."
+     sudo -u unbound unbound-anchor -f /etc/resolv.conf -R -a /var/lib/unbound/root.key
+     echo "Done"
+}
 
-    unbound-checkconf $config > /dev/null
-    RETVAL=$?
-    if [ $RETVAL != 0 ]
-    then
-        echo "Error in /etc/unbound/unbound.conf, aborted"
-        exit 6
-    fi
-
-    echo -n $"Starting unbound: "
+checkconfig() {
+    echo "Checking Unbound configuration file: $CONFIG"
+    echo "This will run the command: /usr/sbin/unbound-checkconf"
+    echo "-----START unbound-checkconf output-----"
+    /usr/sbin/unbound-checkconf
+    echo "-----END unbound-checkconf output-----"
 
-    # if not running, start it up here
-    daemon --pidfile=$pidfile $exec -c $config
-    echo
 }
 
-stop() {
-    echo -n $"Stopping unbound: "
-    # stop it here, often "killproc unbound"
-    killproc -p $pidfile unbound
-    echo
+start() {
+    initchecks
+    if [ -r $PIDFILE ]; then
+        echo 'Unbound is already running!'
+        return
+    else
+	echo "Starting Unbound..."
+        $UNBOUND -c $CONFIG || echo "Failed to start! The error messages above might help."
+    fi
 }
 
-restart() {
-    unbound-checkconf $config > /dev/null
-    RETVAL=$?
-    if [ $RETVAL != 0 ]
-    then
-        echo "Error in /etc/unbound/unbound.conf, aborted"
-        exit 6
+stop() {
+    if [ ! -r $PIDFILE ]; then
+        echo 'Unbound is not running.'
+        return
     fi
-    stop
-    start
+    echo "Stopping Unbound..."
+    kill `cat $PIDFILE`
+    rm -f $PIDFILE
 }
 
 reload() {
-    restart
+    if [ ! -r $PIDFILE ]; then
+        echo 'Unbound is not running.'
+        return
+    fi
+    echo "Sending SIGHUP to Unbound..."
+    kill -HUP `cat $PIDFILE`
 }
 
 case "$1" in
-    start)
+    'start')
         start
         ;;
-    stop)
+    'stop')
         stop
         ;;
-    restart)
-        restart
+    'restart')
+        stop
+	sleep 1
+        start
+        ;;
+    'generate-key')
+        anchorkeygen
+        ;;
+    'check-config')
+        checkconfig
+        ;;
+    'reload')
+        reload
         ;;
     *)
-        echo $"Usage: $0 {start|stop|restart}"
-        exit 2
+        echo "Usage: $0 {start|stop|reload|restart|generate-key|check-config}"
+        exit 1
+        ;;
 esac
-exit $?
diff --git a/network/unbound/root.hints b/network/unbound/root.hints
new file mode 100644
index 0000000000..280ab06683
--- /dev/null
+++ b/network/unbound/root.hints
@@ -0,0 +1,92 @@
+;       This file holds the information on root name servers needed to 
+;       initialize cache of Internet domain name servers
+;       (e.g. reference this file in the "cache  .  <file>"
+;       configuration file of BIND domain name servers). 
+; 
+;       This file is made available by InterNIC 
+;       under anonymous FTP as
+;           file                /domain/named.cache 
+;           on server           FTP.INTERNIC.NET
+;       -OR-                    RS.INTERNIC.NET
+;
+;       last update:     March 25, 2024
+;       related version of root zone:     2024032501
+; 
+; FORMERLY NS.INTERNIC.NET 
+;
+.                        3600000      NS    A.ROOT-SERVERS.NET.
+A.ROOT-SERVERS.NET.      3600000      A     198.41.0.4
+A.ROOT-SERVERS.NET.      3600000      AAAA  2001:503:ba3e::2:30
+; 
+; FORMERLY NS1.ISI.EDU 
+;
+.                        3600000      NS    B.ROOT-SERVERS.NET.
+B.ROOT-SERVERS.NET.      3600000      A     170.247.170.2
+B.ROOT-SERVERS.NET.      3600000      AAAA  2801:1b8:10::b
+; 
+; FORMERLY C.PSI.NET 
+;
+.                        3600000      NS    C.ROOT-SERVERS.NET.
+C.ROOT-SERVERS.NET.      3600000      A     192.33.4.12
+C.ROOT-SERVERS.NET.      3600000      AAAA  2001:500:2::c
+; 
+; FORMERLY TERP.UMD.EDU 
+;
+.                        3600000      NS    D.ROOT-SERVERS.NET.
+D.ROOT-SERVERS.NET.      3600000      A     199.7.91.13
+D.ROOT-SERVERS.NET.      3600000      AAAA  2001:500:2d::d
+; 
+; FORMERLY NS.NASA.GOV
+;
+.                        3600000      NS    E.ROOT-SERVERS.NET.
+E.ROOT-SERVERS.NET.      3600000      A     192.203.230.10
+E.ROOT-SERVERS.NET.      3600000      AAAA  2001:500:a8::e
+; 
+; FORMERLY NS.ISC.ORG
+;
+.                        3600000      NS    F.ROOT-SERVERS.NET.
+F.ROOT-SERVERS.NET.      3600000      A     192.5.5.241
+F.ROOT-SERVERS.NET.      3600000      AAAA  2001:500:2f::f
+; 
+; FORMERLY NS.NIC.DDN.MIL
+;
+.                        3600000      NS    G.ROOT-SERVERS.NET.
+G.ROOT-SERVERS.NET.      3600000      A     192.112.36.4
+G.ROOT-SERVERS.NET.      3600000      AAAA  2001:500:12::d0d
+; 
+; FORMERLY AOS.ARL.ARMY.MIL
+;
+.                        3600000      NS    H.ROOT-SERVERS.NET.
+H.ROOT-SERVERS.NET.      3600000      A     198.97.190.53
+H.ROOT-SERVERS.NET.      3600000      AAAA  2001:500:1::53
+; 
+; FORMERLY NIC.NORDU.NET
+;
+.                        3600000      NS    I.ROOT-SERVERS.NET.
+I.ROOT-SERVERS.NET.      3600000      A     192.36.148.17
+I.ROOT-SERVERS.NET.      3600000      AAAA  2001:7fe::53
+; 
+; OPERATED BY VERISIGN, INC.
+;
+.                        3600000      NS    J.ROOT-SERVERS.NET.
+J.ROOT-SERVERS.NET.      3600000      A     192.58.128.30
+J.ROOT-SERVERS.NET.      3600000      AAAA  2001:503:c27::2:30
+; 
+; OPERATED BY RIPE NCC
+;
+.                        3600000      NS    K.ROOT-SERVERS.NET.
+K.ROOT-SERVERS.NET.      3600000      A     193.0.14.129
+K.ROOT-SERVERS.NET.      3600000      AAAA  2001:7fd::1
+; 
+; OPERATED BY ICANN
+;
+.                        3600000      NS    L.ROOT-SERVERS.NET.
+L.ROOT-SERVERS.NET.      3600000      A     199.7.83.42
+L.ROOT-SERVERS.NET.      3600000      AAAA  2001:500:9f::42
+; 
+; OPERATED BY WIDE
+;
+.                        3600000      NS    M.ROOT-SERVERS.NET.
+M.ROOT-SERVERS.NET.      3600000      A     202.12.27.33
+M.ROOT-SERVERS.NET.      3600000      AAAA  2001:dc3::35
+; End of file
\ No newline at end of file
diff --git a/network/unbound/unbound.SlackBuild b/network/unbound/unbound.SlackBuild
index 5847d5c0d9..9a2dc3ce59 100644
--- a/network/unbound/unbound.SlackBuild
+++ b/network/unbound/unbound.SlackBuild
@@ -1,8 +1,10 @@
-#!/bin/sh
+#!/bin/bash
 
-# Slackware build script for unbound
+# Slackware build script for Unbound
 
-# Copyright 2018 Gerardo Zamudio <gerardo.zamudio@linux.com> Mexico City, Mexico
+# Copyright 2024 Badchay <badchay@protonmail.com>
+# All rights reserved.
+# Copyright 2020 Gerardo Zamudio <gerardo.zamudio@linux.com> Mexico City, Mexico
 # 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=unbound
-VERSION=${VERSION:-1.8.2}
-BUILD=${BUILD:-1}
+VERSION=${VERSION:-1.19.3}
+BUILD=${BUILD:-2}
 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}
@@ -71,6 +83,12 @@ if ! grep -q ^"$UB_USER": /etc/passwd ; then
   exit 1
 fi
 
+# This needs to be set. Otherwise Unbound will build
+# against Python 2 on Slackware 15.0.
+# Setting this to "3" allows Unbound to build with
+# Python 3.9 and 3.11, depending which one is installed.
+UNB_PY_VERSION=${UNB_PY_VERSION:-3}
+
 set -e
 
 rm -rf $PKG
@@ -86,14 +104,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 {} \;
 
-if [ "${DNSCRYPT:-no}" == "yes" ]; then
-  DNSCRYPT="--enable-dnscrypt"
-else
-  DNSCRYPT=""
-fi
-
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
+PYTHON_VERSION="$UNB_PY_VERSION" \
 ./configure \
   --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
@@ -103,14 +116,23 @@ CXXFLAGS="$SLKCFLAGS" \
   --docdir=/usr/doc/$PRGNAM-$VERSION \
   --with-libevent \
   --with-ssl \
+  --enable-dnscrypt \
+  --disable-static \
+  --enable-sha2 \
+  --enable-subnet \
+  --with-pythonmodule \
+  --with-pyunbound \
   --with-username=$UB_USER \
-  --with-pidfile=/var/run/unbound/unbound.pid \
+  --with-pidfile=/run/unbound/unbound.pid \
+  --with-rootkey-file=/var/lib/unbound/root.key \
   --build=$ARCH-slackware-linux \
-  $DNSCRYPT 
+  --host=$ARCH-slackware-linux \
 
 make
 make install DESTDIR=$PKG
 
+rm -f --verbose $PKG/usr/lib${LIBDIRSUFFIX}/libunbound.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
 
@@ -118,17 +140,67 @@ 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 doc/CREDITS doc/FEATURES doc/LICENSE doc/README* $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/var/run/unbound
-chown $USER:$GROUP $PKG/var/run/unbound/
-install -m 0640 -D doc/example.conf.in $PKG/etc/unbound/unbound.conf.new
+cp -a doc/README* doc/FEATURES doc/CREDITS doc/TODO $PKG/usr/doc/$PRGNAM-$VERSION
+
+# Shorten the Changelog and restore its timestamp
+head -n 500 doc/Changelog > $PKG/usr/doc/$PRGNAM-$VERSION/Changelog
+touch -r doc/Changelog $PKG/usr/doc/$PRGNAM-$VERSION/Changelog
+
+# Save the upstream unbound.conf and set some reasonable defaults:
+# 1) Set the default log path to /var/log/unbound/
+# 2) Enable Unbound control interface. It's used for logrotate script
+#    but also gives you the power to control your process without
+#    restarts/reloads. It binds to localhost and cannot be used by
+#    unprivileged users.
+# 3) Change timestamps to ASCII format (from Epoch).
+# 4) Turn off chroot.
+# 5) Disable systemd socket activation.
+# 6) Set num-threads to $(nproc).
+# 7) Use root-hints file.
+# 8) Set DNS prefetch to "yes".
+# 9) Harden against out of zone rrsets (harden-glue).
+# 10) Harden against receiving dnssec-stripped data (harden-dnssec-stripped).
+# 11) Enable aggressive NSEC, root-key-sentinel and RFC8145 (trust anchor
+# signaling).
+cp -a $PKG/etc/unbound/unbound.conf $PKG/etc/unbound/unbound.conf.upstream
+sed -i \
+-e 's/# control-interface:/control-interface:/g' \
+-e 's/# control-enable: no/control-enable: yes/g' \
+-e 's/# log-time-ascii: no/log-time-ascii: yes/g' \
+-e 's/# use-systemd: no/use-systemd: no/g' \
+-e 's/# logfile: ""/logfile: "\/var\/log\/unbound\/unbound.log"/g' \
+-e 's/# chroot: "\/etc\/unbound"/chroot: ""/g' \
+-e 's/# num-threads: 1/num-threads: '$(nproc)' # Set to the value of nproc by SlackBuild/g' \
+-e 's/# root-hints: ""/root-hints: "\/var\/lib\/unbound\/root.hints"/g' \
+-e 's/# prefetch: no/prefetch: yes/g' \
+-e 's/# harden-glue: yes/harden-glue: yes/g' \
+-e 's/# harden-dnssec-stripped: yes/harden-dnssec-stripped: yes/g' \
+-e 's/# aggressive-nsec: yes/aggressive-nsec: yes/g' \
+-e 's/# trust-anchor-signaling: yes/trust-anchor-signaling: yes/g' \
+-e 's/# root-key-sentinel: yes/root-key-sentinel: yes/g' \
+-e '/# auto-trust-anchor-file: ".*/a\        auto-trust-anchor-file: "/var/lib/unbound/root.key"' \
+$PKG/etc/unbound/unbound.conf \
+
+mkdir -p $PKG/run/unbound
+mkdir -p $PKG/var/log/unbound
+mkdir -p $PKG/var/lib/unbound
+mkdir -p $PKG/etc/logrotate.d
+
+chown $UB_USER:$UB_GROUP $PKG/run/unbound/
+chown $UB_USER:$UB_GROUP $PKG/var/log/unbound/
+chown $UB_USER:$UB_GROUP $PKG/var/lib/unbound/
+
+cp -a $CWD/unbound.logrotate $PKG/etc/logrotate.d/unbound.new
+cp -a $CWD/root.hints $PKG/var/lib/unbound/root.hints
+chown $UB_USER:$UB_GROUP $PKG/var/lib/unbound/root.hints
+chown root:root $PKG/etc/logrotate.d/unbound.new
+mv $PKG/etc/unbound/unbound.conf $PKG/etc/unbound/unbound.conf.new
 install -m 0644 -D $CWD/rc.unbound $PKG/etc/rc.d/rc.unbound.new
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
+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:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/network/unbound/unbound.info b/network/unbound/unbound.info
index 9eeaf61441..d17666a509 100644
--- a/network/unbound/unbound.info
+++ b/network/unbound/unbound.info
@@ -1,10 +1,10 @@
 PRGNAM="unbound"
-VERSION="1.8.2"
+VERSION="1.19.3"
 HOMEPAGE="https://nlnetlabs.nl/projects/unbound/about/"
-DOWNLOAD="https://nlnetlabs.nl/downloads/unbound/unbound-1.8.2.tar.gz"
-MD5SUM="3b2f1024df47ccc59a8100c3b40c6dc1"
+DOWNLOAD="https://www.nlnetlabs.nl/downloads/unbound/unbound-1.19.3.tar.gz"
+MD5SUM="00bf61460c87c2542bcb68d52a2e5195"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="ldns"
-MAINTAINER="Gerardo Zamudio"
-EMAIL="gerardo.zamudio@linux.com"
+REQUIRES=""
+MAINTAINER="Badchay"
+EMAIL="badchay@protonmail.com"
diff --git a/network/unbound/unbound.logrotate b/network/unbound/unbound.logrotate
new file mode 100644
index 0000000000..a00c8f0951
--- /dev/null
+++ b/network/unbound/unbound.logrotate
@@ -0,0 +1,11 @@
+/var/log/unbound/unbound.log {
+    su unbound unbound
+    notifempty
+    missingok
+    rotate 7
+    postrotate
+         # Try using unbound-control to start a new log
+         # On fail, fall back to using a HUP signal
+         /usr/sbin/unbound-control log_reopen || bash /etc/rc.d/rc.unbound reload
+    endscript
+}
diff --git a/network/unicornscan/unicornscan.SlackBuild b/network/unicornscan/unicornscan.SlackBuild
index 7c625a8490..d6aa2c22ea 100644
--- a/network/unicornscan/unicornscan.SlackBuild
+++ b/network/unicornscan/unicornscan.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for unicornscan
 # Happy Birthday Jack! :)
@@ -23,29 +23,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=unicornscan
 VERSION=${VERSION:-0.4.7_2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 SRCVER=$(echo $VERSION | tr _ -)
 SHORTVER=$(echo $VERSION | sed 's/_.*//')
 
 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"
@@ -114,4 +124,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/network/unicornscan/unicornscan.info b/network/unicornscan/unicornscan.info
index 22affc3aeb..adecec5e28 100644
--- a/network/unicornscan/unicornscan.info
+++ b/network/unicornscan/unicornscan.info
@@ -1,10 +1,10 @@
 PRGNAM="unicornscan"
 VERSION="0.4.7_2"
 HOMEPAGE="https://sectools.org/tool/unicornscan/"
-DOWNLOAD="ftp://sourceforge.mirrorservice.org/sites/downloads.sourceforge.net/o/os/osace/unicornscan/unicornscan%20-%200.4.7%20source/unicornscan-0.4.7-2.tar.bz2"
+DOWNLOAD="https://sourceforge.net/projects/osace/files/unicornscan/unicornscan%20-%200.4.7%20source/unicornscan-0.4.7-2.tar.bz2"
 MD5SUM="4c5f272eb38c333c0094c32317edf758"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="postgresql GeoIP php-pgsql"
+REQUIRES="GeoIP php-pgsql"
 MAINTAINER="Robert E. Lee"
 EMAIL="robert_at_loveathome.us"
diff --git a/network/uredir/README b/network/uredir/README
new file mode 100644
index 0000000000..561e234c61
--- /dev/null
+++ b/network/uredir/README
@@ -0,0 +1,12 @@
+uredir (userspace UDP port redirector)
+
+uredir is a small tool to redirect UDP traffic. It can be used as a
+poor man's filtering tool, e.g. for small multihomed embedded systems
+without a built-in firewall.
+
+uredir forwards packets to a specified destination, remembering the
+sender's address. Any packets received from the destination are in
+turn forwarded to the sender.
+
+uredir can be run standalone or via inetd. See uredir's man page for
+details.
diff --git a/network/uredir/slack-desc b/network/uredir/slack-desc
new file mode 100644
index 0000000000..f65eb0c5ec
--- /dev/null
+++ b/network/uredir/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+      |-----handy-ruler------------------------------------------------------|
+uredir: uredir (userspace UDP port redirector)
+uredir:
+uredir: uredir is a small tool to redirect UDP traffic. It can be used as a
+uredir: poor man's filtering tool, e.g. for small multihomed embedded systems
+uredir: without a built-in firewall.
+uredir:
+uredir: uredir forwards packets to a specified destination, remembering the
+uredir: sender's address. Any packets received from the destination are in
+uredir: turn forwarded to the sender.
+uredir:
+uredir:
diff --git a/network/uredir/uredir.SlackBuild b/network/uredir/uredir.SlackBuild
new file mode 100644
index 0000000000..70b51e4b0b
--- /dev/null
+++ b/network/uredir/uredir.SlackBuild
@@ -0,0 +1,110 @@
+#!/bin/bash
+
+# Slackware build script for uredir
+
+# 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=uredir
+VERSION=${VERSION:-3.3}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+# This thing depends on a library nothing else uses, just bundle it.
+LIBNAM=libuev
+LIBVER=${LIBVER:-2.4.0}
+
+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
+TOPDIR="$(pwd)"
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+tar xvf $CWD/$LIBNAM-$LIBVER.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 {} \+
+
+# First the library (static build):
+cd $LIBNAM-$LIBVER
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --enable-static \
+  --disable-shared \
+  --prefix="$TOPDIR/libinst" \
+  --disable-doxygen-doc \
+  --disable-examples \
+  --build=$ARCH-slackware-linux
+make
+make install-strip
+
+# Now use it to build the main program:
+cd $TOPDIR/$PRGNAM-$VERSION
+
+PKG_CONFIG_PATH="$TOPDIR/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
+gzip -9 $PKG/usr/man/man*/*.?
+
+PKGDOC=$PKG/usr/doc/$PRGNAM-$VERSION
+mkdir -p $PKGDOC
+cp -a 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
diff --git a/network/uredir/uredir.info b/network/uredir/uredir.info
new file mode 100644
index 0000000000..ad848d55fc
--- /dev/null
+++ b/network/uredir/uredir.info
@@ -0,0 +1,12 @@
+PRGNAM="uredir"
+VERSION="3.3"
+HOMEPAGE="https://github.com/troglobit/uredir"
+DOWNLOAD="https://github.com/troglobit/uredir/releases/download/v3.3/uredir-3.3.tar.gz \
+          https://github.com/troglobit/libuev/releases/download/v2.4.0/libuev-2.4.0.tar.xz"
+MD5SUM="a42ee27e84de2e08e35ee733508bb6ea \
+        707fac6253f3a4f662ec3848798ae63f"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="B. Watson"
+EMAIL="urchlay@slackware.uk"
diff --git a/network/urlgrabber/README b/network/urlgrabber/README
index 748e0faf99..f3ca7d636c 100644
--- a/network/urlgrabber/README
+++ b/network/urlgrabber/README
@@ -1,7 +1,7 @@
-urlgrabber is a pure python package that drastically simplifies the fetching of
-files. It is designed to be used in programs that need common (but not
-necessarily simple) url-fetching features. It is extremely simple to drop into
-an existing program and provides a clean interface to protocol-independant
-file-access. Best of all, urlgrabber takes care of all those pesky
-file-fetching details, and lets you focus on whatever it is that your program
-is written to do!
+urlgrabber is a pure python package that drastically simplifies the
+fetching of files. It is designed to be used in programs that need
+common (but not necessarily simple) url-fetching features. It is
+extremely simple to drop into an existing program and provides a clean
+interface to protocol-independent file-access. Best of all, urlgrabber
+takes care of all those pesky file-fetching details, and lets you
+focus on whatever it is that your program is written to do!
diff --git a/network/urlgrabber/urlgrabber.SlackBuild b/network/urlgrabber/urlgrabber.SlackBuild
index c49952cba5..74a5811ee2 100644
--- a/network/urlgrabber/urlgrabber.SlackBuild
+++ b/network/urlgrabber/urlgrabber.SlackBuild
@@ -1,8 +1,9 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for urlgrabber
 
 # Copyright (c) 2007 Daniel de Kok <moc.mikciat@leinad>
+# Copyright 2020 Ricardo J. Barberis <ricardo.barberis@gmail.com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,10 +25,13 @@
 
 # modified by Javier Rojas to fit urlgrabber
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=urlgrabber
 VERSION=${VERSION:-3.10}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -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}
@@ -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/network/urlgrabber/urlgrabber.info b/network/urlgrabber/urlgrabber.info
index ac9096d1c5..d0394d72f6 100644
--- a/network/urlgrabber/urlgrabber.info
+++ b/network/urlgrabber/urlgrabber.info
@@ -6,5 +6,5 @@ MD5SUM="7cff064649619355d329b26d75872f60"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Javier Rojas"
-EMAIL="jerojasro@devnull.li"
+MAINTAINER="Ricardo J. Barberis"
+EMAIL="ricardo.barberis@gmail.com"
diff --git a/network/urlscan/README b/network/urlscan/README
new file mode 100644
index 0000000000..c3273d2e2a
--- /dev/null
+++ b/network/urlscan/README
@@ -0,0 +1,29 @@
+Urlscan parses an email message or file and scans it for URLs and
+email addresses. It then displays the URLs and their context within
+the message, and allows you to choose one or more URLs to send to your
+Web browser. Alternatively, it send a list of all URLs to stdout.
+
+Relative to urlview, urlscan has the following additional features:
+
+* Support for emails in quoted-printable and base64 encodings.
+  No more stripping out =40D from URLs by hand!
+* The context of each URL is provided along with the URL.
+  For HTML mails, a crude parser is used to render the HTML into text.
+  Context view can be toggled on/off with c.
+* URLs are shortened by default to fit on one line.
+  Viewing full URL (for one or all) is toggled with s or S.
+* Jump to a URL by typing the number.
+* Incremental case-insensitive search with /.
+* Execute an arbitrary function (for example, copy URL to clipboard)
+  instead of opening URL in a browser.
+* Use l to cycle through whether URLs are opened using the Python
+  webbrowser module (default), xdg-open (if installed) or opened by
+  a function passed on the command line with --run.
+* Configure colors and keybindings via ~/.config/urlscan/config.json.
+  Generate default config file for editing by running urlscan -g.
+  Cycle through available palettes with p.
+* Copy URL to clipboard with C or to primary selection with P.
+  Requires xsel or xclip.
+* Run a command with the selected URL as the argument or pipe the
+  selected URL to a command.
+* Show complete help menu with F1. Hide header on startup with --nohelp.
diff --git a/network/urlscan/slack-desc b/network/urlscan/slack-desc
new file mode 100644
index 0000000000..89995441c0
--- /dev/null
+++ b/network/urlscan/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+       |-----handy-ruler------------------------------------------------------|
+urlscan: urlscan (Replacement for urlview, a web browser launcher for mutt)
+urlscan:
+urlscan: Urlscan is a small program that is designed
+urlscan: to integrate with the "mutt" mailreader to allow you to easily 
+urlscan: launch a Web browser for URLs contained in email messages.
+urlscan: It is a replacement for the "urlview" program.
+urlscan:
+urlscan:
+urlscan:
+urlscan:
+urlscan:
diff --git a/network/urlscan/urlscan.SlackBuild b/network/urlscan/urlscan.SlackBuild
new file mode 100644
index 0000000000..87f2633700
--- /dev/null
+++ b/network/urlscan/urlscan.SlackBuild
@@ -0,0 +1,107 @@
+#!/bin/bash
+
+# Slackware build script for urlscan
+# Copyright 2020 abooksigun <abooksigun09@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=urlscan
+VERSION=${VERSION:-0.9.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 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
+ -exec chmod 644 {} \;
+
+python3 setup.py 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
+
+cp -r $PKG/usr/share/man $PKG/usr
+rm -r $PKG/usr/share
+
+for man in $( find $PKG/usr/man -type f ); do
+  gzip -9 $man
+done
+
+for man in $( find $PKG/usr/man -type l ); do
+  ln -s $( readlink $man ).gz $man.gz
+  rm $man
+done
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -t $PKG/usr/doc/$PRGNAM-$VERSION README.rst COPYING requirements.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
diff --git a/network/urlscan/urlscan.info b/network/urlscan/urlscan.info
new file mode 100644
index 0000000000..26329755bd
--- /dev/null
+++ b/network/urlscan/urlscan.info
@@ -0,0 +1,10 @@
+PRGNAM="urlscan"
+VERSION="0.9.5"
+HOMEPAGE="https://github.com/firecat53/urlscan"
+DOWNLOAD="https://github.com/firecat53/urlscan/archive/0.9.5/urlscan-0.9.5.tar.gz"
+MD5SUM="6b9434208dbcfd12dd4dde74b4b41b21"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="python-urwid"
+MAINTAINER="abooksigun"
+EMAIL="abooksigun09@gmail.com"
diff --git a/network/urlview/README b/network/urlview/README
index a89983e2c4..79360f7388 100644
--- a/network/urlview/README
+++ b/network/urlview/README
@@ -2,9 +2,9 @@ urlview is a curses program for extracting URLs from text files and
 displaying a menu from which you can select a specific URL to view using
 your favorite browser program.
 
-It was originally part of mutt. See /etc/urlview.conf on how to configure
-mutt, tin, or your default browser.
+It was originally part of mutt. See /etc/urlview.conf on how to
+configure mutt, tin, or your default browser.
 
-Please be aware that /etc/urlview.conf and /usr/bin/url_handler.sh are 
-configuration files, so they are not overwritten on upgrades.  Be sure to
-merge/move the .new files after each upgrade.
+Please be aware that /etc/urlview.conf and /usr/bin/url_handler.sh are
+configuration files, so they are not overwritten on upgrades. Be sure
+to merge/move the .new files after each upgrade.
diff --git a/network/urlview/urlview.SlackBuild b/network/urlview/urlview.SlackBuild
index 4e3beb4772..c85b2b77c6 100644
--- a/network/urlview/urlview.SlackBuild
+++ b/network/urlview/urlview.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 # 
 # Slackware build script for urlview
 # (C) 2007 Michael Wagner <lapinours@web.de>
@@ -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=urlview
 VERSION=${VERSION:-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/network/urlwatch/README b/network/urlwatch/README
index 79df2edbaf..35a5465268 100644
--- a/network/urlwatch/README
+++ b/network/urlwatch/README
@@ -5,6 +5,3 @@ The change notification will include the URL that has changed and
 a unified diff of what has changed.
 
 Optional dependencies: chump
-
-NOTE:
-Please install python3 first before installing all other requirements.
diff --git a/network/urlwatch/urlwatch.SlackBuild b/network/urlwatch/urlwatch.SlackBuild
index 40544787b4..ecbfa90494 100644
--- a/network/urlwatch/urlwatch.SlackBuild
+++ b/network/urlwatch/urlwatch.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for urlwatch
 
-# Copyright 2014-2018  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=urlwatch
-VERSION=${VERSION:-2.12}
+VERSION=${VERSION:-2.28}
 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}
@@ -78,7 +88,7 @@ mv $PKG/usr/share/man $PKG/usr
 find $PKG/usr/man -type f -name "*.?" -exec gzip -9f {} \;
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a COPYING ChangeLog PKG-INFO $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a COPYING CHANGELOG.md README.md PKG-INFO $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
@@ -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/network/urlwatch/urlwatch.info b/network/urlwatch/urlwatch.info
index aa22192376..1928730232 100644
--- a/network/urlwatch/urlwatch.info
+++ b/network/urlwatch/urlwatch.info
@@ -1,10 +1,10 @@
 PRGNAM="urlwatch"
-VERSION="2.12"
+VERSION="2.28"
 HOMEPAGE="https://thp.io/2008/urlwatch/"
-DOWNLOAD="https://files.pythonhosted.org/packages/26/33/b8e646660776965f46bc8de7f3182e1a18d369da6206954a8556c32ae246/urlwatch-2.12.tar.gz"
-MD5SUM="92bd607954eb8ce43166a114c3ab6bf2"
+DOWNLOAD="https://files.pythonhosted.org/packages/ef/6d/28df22a0912d40e294cfde709ead82e36441018ff9c0137c9e768ce9084e/urlwatch-2.28.tar.gz"
+MD5SUM="a6cd0d5e84c2f4748a7e3b5da2bd9ed6"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="python3-PyYAML minidb python-requests python-keyring python3-appdirs pycodestyle"
+REQUIRES="minidb python3-keyring pycodestyle"
 MAINTAINER="Dimitris Zlatanidis"
-EMAIL="d.zlatanidis@gmail.com"
+EMAIL="dslackw@gmail.com"
diff --git a/network/uudeview/README b/network/uudeview/README
index 788e19beab..4ab3d1aa98 100644
--- a/network/uudeview/README
+++ b/network/uudeview/README
@@ -1,8 +1,8 @@
-UUDeview is a program that helps you transmit and receive binary files over
-the Internet, using electronic mail or newsgroups The UUDeview package
-includes both an encoder and a decoder. The decoder automatically detects
-the type of encoding used, offering MIME's Base64 and BinHex as well as the
-popular uuencoding and the less frequently used xxencoding methods.
-Recently, support for the popular yEnc encoding was also added. The encoder
-runs the other way around and encodes a binary file for sending it by mail
-or news. 
+UUDeview is a program that helps you transmit and receive binary
+files over the Internet, using electronic mail or newsgroups The
+UUDeview package includes both an encoder and a decoder. The decoder
+automatically detects the type of encoding used, offering MIME's
+Base64 and BinHex as well as the popular uuencoding and the less
+frequently used xxencoding methods.  Recently, support for the popular
+yEnc encoding was also added. The encoder runs the other way around
+and encodes a binary file for sending it by mail or news.
diff --git a/network/uudeview/patches/025_CAN-2004-2265.diff b/network/uudeview/patches/025_CAN-2004-2265.diff
new file mode 100644
index 0000000000..d89ef9a098
--- /dev/null
+++ b/network/uudeview/patches/025_CAN-2004-2265.diff
@@ -0,0 +1,42 @@
+Description: CAN-2004-2265
+ Fix possible (but highly unlikely) race in temporary file generation
+ (CAN-2004-2265), by passing the "x" (O_EXCL) flag to fopen when opening
+ such files. (Closes: #320541)
+ 0.5.20-2.1
+Author: Steinar H. Gunderson <sesse@debian.org>
+Bug-Debian: http://bugs.debian.org/320541
+
+--- a/unix/uudeview.c
++++ b/unix/uudeview.c
+@@ -454,7 +454,7 @@ proc_stdin (void)
+     return 0;
+   }
+ 
+-  if ((target = fopen (stdfile, "wb")) == NULL) {
++  if ((target = fopen (stdfile, "wbx")) == NULL) {
+     fprintf (stderr, "proc_stdin: cannot open temp file %s for writing: %s\n",
+ 	     stdfile, strerror (errno));
+     _FP_free (stdfile);
+--- a/uulib/uunconc.c
++++ b/uulib/uunconc.c
+@@ -1325,9 +1325,9 @@ UUDecode (uulist *data)
+     return UURET_NODATA;
+ 
+   if (data->uudet == PT_ENCODED)
+-    mode = "wt";	/* open text files in text mode */
++    mode = "wtx";	/* open text files in text mode */
+   else
+-    mode = "wb";	/* otherwise in binary          */
++    mode = "wbx";	/* otherwise in binary          */
+ 
+   if ((data->binfile = tempnam (NULL, "uu")) == NULL) {
+     UUMessage (uunconc_id, __LINE__, UUMSG_ERROR,
+@@ -1502,7 +1502,7 @@ UUDecode (uulist *data)
+       progress.action = 0;
+       return UURET_NOMEM;
+     }
+-    if ((datain = fopen (data->binfile, "rb")) == NULL) {
++    if ((datain = fopen (data->binfile, "rbx")) == NULL) {
+       UUMessage (uunconc_id, __LINE__, UUMSG_ERROR,
+ 		 uustring (S_NOT_OPEN_FILE),
+ 		 data->binfile, strerror (uu_errno = errno));
diff --git a/network/uudeview/patches/034_do_not_ignore_special_chars.diff b/network/uudeview/patches/034_do_not_ignore_special_chars.diff
new file mode 100644
index 0000000000..4ee32469fb
--- /dev/null
+++ b/network/uudeview/patches/034_do_not_ignore_special_chars.diff
@@ -0,0 +1,22 @@
+Description: Don't ignore special chars when parsing MIME.
+ 0.5.20-3
+Author: Chris Hanson
+Bug-Debian: https://bugs.debian.org/341440
+
+--- a/uulib/uuscan.c
++++ b/uulib/uuscan.c
+@@ -387,10 +387,10 @@ ParseValue (char *attribute)
+ 	   *attribute != '(' && *attribute != ')' &&
+ 	   *attribute != '<' && *attribute != '>' &&
+ 	   *attribute != '@' && *attribute != ',' &&
+-	   /* *attribute != ';' && */ *attribute != ':' &&
+-	   *attribute != '\\' &&*attribute != '"' &&
+-	   *attribute != '/' && /* *attribute != '[' &&
+-	   *attribute != ']' && */ *attribute != '?' &&
++	   *attribute != ';' && *attribute != ':' &&
++	   *attribute != '\\' && *attribute != '"' &&
++	   *attribute != '/' && *attribute != '[' &&
++	   *attribute != ']' && *attribute != '?' &&
+ 	   *attribute != '=' && length < 255) {
+       *ptr++ = *attribute++;
+       length++;
diff --git a/network/uudeview/patches/037_CVE-2008-2266_symlink.diff b/network/uudeview/patches/037_CVE-2008-2266_symlink.diff
new file mode 100644
index 0000000000..7a74e4792c
--- /dev/null
+++ b/network/uudeview/patches/037_CVE-2008-2266_symlink.diff
@@ -0,0 +1,182 @@
+Description: Fixed a classical tempfile symlink attack vulnerability in libuu.
+ See Version: 0.5.20-3.1.
+Author: Nico Golde <nion@debian.org>
+Bug-Debian: http://bugs.debian.org/480972
+
+--- a/uulib/uunconc.c
++++ b/uulib/uunconc.c
+@@ -1311,6 +1311,11 @@ UUDecode (uulist *data)
+   char *mode, *ntmp;
+   uufile *iter;
+   size_t bytes;
++#ifdef HAVE_MKSTEMP
++  int tmpfd;
++  const char *tmpprefix = "uuXXXXXX";
++  char *tmpdir = NULL;
++#endif /* HAVE_MKSTEMP */
+ 
+   if (data == NULL || data->thisfile == NULL)
+     return UURET_ILLVAL;
+@@ -1329,13 +1334,35 @@ UUDecode (uulist *data)
+   else
+     mode = "wbx";	/* otherwise in binary          */
+ 
++#ifdef HAVE_MKSTEMP
++  if ((getuid()==geteuid()) && (getgid()==getegid())) {
++	  tmpdir=getenv("TMPDIR");
++  }
++
++  if (!tmpdir) {
++	  tmpdir = "/tmp";
++  }
++  data->binfile = malloc(strlen(tmpdir)+strlen(tmpprefix)+2);
++
++  if (!data->binfile) {
++#else
+   if ((data->binfile = tempnam (NULL, "uu")) == NULL) {
++#endif /* HAVE_MKSTEMP */
+     UUMessage (uunconc_id, __LINE__, UUMSG_ERROR,
+ 	       uustring (S_NO_TEMP_NAME));
+     return UURET_NOMEM;
+   }
+ 
++#ifdef HAVE_MKSTEMP
++  strcpy(data->binfile, tmpdir);
++  strcat(data->binfile, "/");
++  strcat(data->binfile, tmpprefix);
++
++  if ((tmpfd = mkstemp(data->binfile)) == -1 || 
++	  (dataout = fdopen(tmpfd, mode)) == NULL) {
++#else
+   if ((dataout = fopen (data->binfile, mode)) == NULL) {
++#endif /* HAVE_MKSTEMP */
+     /*
+      * we couldn't create a temporary file. Usually this means that TMP
+      * and TEMP aren't set
+@@ -1343,6 +1370,12 @@ UUDecode (uulist *data)
+     UUMessage (uunconc_id, __LINE__, UUMSG_ERROR,
+ 	       uustring (S_WR_ERR_TARGET),
+ 	       data->binfile, strerror (uu_errno = errno));
++#ifdef HAVE_MKSTEMP
++	if (tmpfd != -1) {
++		unlink(data->binfile);
++		close(tmpfd);
++    }
++#endif /* HAVE_MKSTEMP */
+     _FP_free (data->binfile);
+     data->binfile = NULL;
+     uu_errno = errno;
+@@ -1499,7 +1532,13 @@ UUDecode (uulist *data)
+    */
+ 
+   if (data->uudet == BH_ENCODED && data->binfile) {
++#ifdef HAVE_MKSTEMP
++	  ntmp = malloc(strlen(tmpdir)+strlen(tmpprefix)+2);
++	  
++	  if (ntmp == NULL) {
++#else
+     if ((ntmp = tempnam (NULL, "uu")) == NULL) {
++#endif /* HAVE_MKSTEMP */
+       UUMessage (uunconc_id, __LINE__, UUMSG_ERROR,
+ 		 uustring (S_NO_TEMP_NAME));
+       progress.action = 0;
+@@ -1513,15 +1552,31 @@ UUDecode (uulist *data)
+       free (ntmp);
+       return UURET_IOERR;
+     }
++
++#ifdef HAVE_MKSTEMP
++    strcpy(ntmp, tmpdir);
++    strcat(ntmp, "/");
++    strcat(ntmp, tmpprefix); 
++    if ((tmpfd = mkstemp(ntmp)) == -1 ||
++		(dataout = fdopen(tmpfd, "wb")) == NULL) {
++#else
+     if ((dataout = fopen (ntmp, "wb")) == NULL) {
++#endif /* HAVE_MKSTEMP */
+       UUMessage (uunconc_id, __LINE__, UUMSG_ERROR,
+ 		 uustring (S_NOT_OPEN_TARGET),
+ 		 ntmp, strerror (uu_errno = errno));
+       progress.action = 0;
+       fclose (datain);
++#ifdef HAVE_MKSTEMP
++	  if (tmpfd != -1) {
++		  unlink(ntmp);
++		  close(tmpfd);
++	  }
++#endif /* HAVE_MKSTEMP */
+       free   (ntmp);
+       return UURET_IOERR;
+     }
++
+     /*
+      * read fork lengths. remember they're in Motorola format
+      */
+--- a/uulib/configure.in
++++ b/uulib/configure.in
+@@ -41,6 +41,7 @@ AC_CHECK_HEADERS(io.h sys/time.h)
+ AC_CHECK_FUNCS(gettimeofday)
+ 
+ AC_CHECK_FUNC(tempnam,,AC_DEFINE(tempnam,_FP_tempnam))
++AC_CHECK_FUNCS([mkstemp])
+ 
+ #
+ # strerror might be internally defined. this would cause a
+--- a/unix/uudeview.c
++++ b/unix/uudeview.c
+@@ -443,18 +443,45 @@ proc_stdin (void)
+   FILE *target;
+   size_t bytes;
+   int res;
++#ifdef HAVE_MKSTEMP
++  int tmpfd;
++  const char *tmpprefix = "uuXXXXXX";
++  char *tmpdir = NULL;
++#endif /* HAVE_MKSTEMP */
+ 
+   if (stdinput) {
+     fprintf (stderr, "proc_stdin: cannot process stdin twice\n");
+     return 0;
+   }
+ 
++#ifdef HAVE_MKSTEMP
++  if ((getuid()==geteuid()) && (getgid()==getegid())) {
++	tmpdir=getenv("TMPDIR");
++  }
++
++  if (!tmpdir) {
++	tmpdir = "/tmp";
++  }
++  stdfile = malloc(strlen(tmpdir)+strlen(tmpprefix)+2);
++
++  if (!stdfile) {
++#else
+   if ((stdfile = tempnam (NULL, "uu")) == NULL) {
++#endif
+     fprintf (stderr, "proc_stdin: cannot get temporary file\n");
+     return 0;
+   }
+ 
++#ifdef HAVE_MKSTEMP
++  strcpy(stdfile, tmpdir);
++  strcat(stdfile, "/");
++  strcat(stdfile, tmpprefix);
++
++  if ((tmpfd = mkstemp(stdfile)) == -1 ||
++	  (target = fdopen(tmpfd, "wbx")) == NULL) {
++#else
+   if ((target = fopen (stdfile, "wbx")) == NULL) {
++#endif
+     fprintf (stderr, "proc_stdin: cannot open temp file %s for writing: %s\n",
+ 	     stdfile, strerror (errno));
+     _FP_free (stdfile);
+--- a/configure.in
++++ b/configure.in
+@@ -510,6 +510,7 @@ AC_CHECK_HEADERS(io.h sys/time.h)
+ AC_CHECK_FUNCS(getcwd popen gettimeofday isatty)
+ 
+ AC_CHECK_FUNC(tempnam,,AC_DEFINE(tempnam,_FP_tempnam))
++AC_CHECK_FUNCS([mkstemp])
+ 
+ #
+ # strerror might be internally defined. this would cause a
diff --git a/network/uudeview/patches/043_string_format_issue.diff b/network/uudeview/patches/043_string_format_issue.diff
new file mode 100644
index 0000000000..7cbc584f5b
--- /dev/null
+++ b/network/uudeview/patches/043_string_format_issue.diff
@@ -0,0 +1,24 @@
+Description: Fix potential security issue (arbitrary string being passed
+ as a format string to fprintf).
+Author: Andrew Shadura <andrewsh@debian.org>
+
+--- a/unix/uuenview.c
++++ b/unix/uuenview.c
+@@ -310,7 +310,7 @@ SendMkCommand (char **rcptlist, char *to
+   }
+ 
+   if ((*rcptlist = (char *) malloc (strlen (towhom) + 16)) == NULL) {
+-    fprintf (stderr, "error: Out of memory allocating %d bytes\n",
++    fprintf (stderr, "error: Out of memory allocating %zd bytes\n",
+ 	     strlen (towhom)+16);
+     _FP_free (command);
+     return NULL;
+@@ -483,7 +483,7 @@ AttachFiles (char *towhom, char *subject
+       if (_FP_stristr (input, "multipart") != NULL) {
+ 	/* it is already a multipart posting. grab the boundary */
+ 	if ((ptr = _FP_stristr (input, "boundary=")) != NULL) {
+-	  fprintf(thepipe,  input);
++	  fprintf(thepipe,  "%s", input);
+ 	  strcpy (boundary, ParseValue (ptr));
+ 	  hadmulti = 1;
+ 	}
diff --git a/network/uudeview/patches/049_glibc_2.27.diff b/network/uudeview/patches/049_glibc_2.27.diff
new file mode 100644
index 0000000000..1c41fd5c3c
--- /dev/null
+++ b/network/uudeview/patches/049_glibc_2.27.diff
@@ -0,0 +1,20 @@
+Description: Remove a hack for Sun that causes FTBFS with glibc >= 2.27
+Author: Adrian Bunk <bunk@debian.org>
+
+--- uudeview-0.5.20.orig/tcl/uutcl.c
++++ uudeview-0.5.20/tcl/uutcl.c
+@@ -48,14 +48,6 @@
+ #include <tcl.h>
+ #endif
+ 
+-/*
+- * The following variable is a special hack that is needed in order for
+- * Sun shared libraries to be used for Tcl.
+- */
+-
+-extern int matherr();
+-int *tclDummyMathPtr = (int *) matherr;
+-
+ #include <uudeview.h>
+ #include <uuint.h>
+ #include <fptools.h>
diff --git a/network/uudeview/uudeview.SlackBuild b/network/uudeview/uudeview.SlackBuild
index f550902a6b..f9b72291be 100644
--- a/network/uudeview/uudeview.SlackBuild
+++ b/network/uudeview/uudeview.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for uudeview
 
@@ -7,26 +7,38 @@
 # Released into the public domain
 # V1 - Slackware 13.37 - November 13, 2011
 
+# 20220319 bkw: Modified by SlackBuilds.org, BUILD=2:
+# - fix build on 32-bit.
+# - fix Tcl/Tk autodetection on 64-bit.
+# - add some security patches from Debian.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=uudeview
 VERSION=${VERSION:-0.5.20}
-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"
@@ -50,9 +62,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 \
+ -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 {} \+
+
+# 20220319 bkw: These patches came from: https://packages.debian.org/sid/uudeview
+for i in $CWD/patches/*.diff; do
+  patch -p1 < $i
+done
 
 # NOTE - uudeview does not honor the DESTDIR variable, which is why the $PKG
 # location is prefixed below when running configure
@@ -62,6 +79,8 @@ CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=$PKG/usr \
   --mandir=$PKG/usr/man \
+  --enable-tcl=/usr/lib$LIBDIRSUFFIX \
+  --enable-tk=/usr/lib$LIBDIRSUFFIX \
   --build=$ARCH-slackware-linux
 
 make
@@ -83,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/network/uwsgi/README b/network/uwsgi/README
index 237dee5845..1f418583da 100644
--- a/network/uwsgi/README
+++ b/network/uwsgi/README
@@ -10,6 +10,5 @@ uWSGI is designed to be fully modular.  This means that different
 plugins can be used in order to add compatibility with tons of different
 technology on top of the same core.
 
-This script builds plugins for Python 2.x, Python 3.x (optional, pass
-PYTHON3=yes to enable; requires python3 to be installed), Perl PSGI, and
+This script builds plugins for Python 2.x, Python 3.x, Perl PSGI, and
 Ruby Rack.
diff --git a/network/uwsgi/uwsgi.SlackBuild b/network/uwsgi/uwsgi.SlackBuild
index 1fb3e662f3..04c2630c3e 100644
--- a/network/uwsgi/uwsgi.SlackBuild
+++ b/network/uwsgi/uwsgi.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for uwsgi
 
@@ -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=uwsgi
-VERSION=${VERSION:-2.0.15}
+VERSION=${VERSION:-2.0.24}
 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}
@@ -49,17 +59,19 @@ 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
 
-# Build Python 2.x plugin.
-PYTHON=${PYTHON:-yes}
+# Python2 plugin.
+PYTHON2=${PYTHON2:-yes}
 
-# Set this to "yes" if you want to build a plugin for Python 3.x.  Requires
-# python3 to be installed.
-PYTHON3=${PYTHON3:-no}
+# Python3 plugin.
+PYTHON3=${PYTHON3:-yes}
 
 # Perl PSGI plugin.
 PSGI=${PSGI:-yes}
@@ -92,7 +104,7 @@ EOF
 
 # Build uWSGI core.
 CFLAGS="$SLKCFLAGS" \
-python uwsgiconfig.py --build package
+python3 uwsgiconfig.py --build package
 install -D -m 0755 uwsgi $PKG/usr/bin/uwsgi
 
 # Create directory for plugins.
@@ -105,17 +117,20 @@ sed -i "s|= /usr|= $PKG/usr|" buildconf/package.ini
 PLUGINS="cache ping rpc corerouter fastrouter http ugreen signal syslog"
 
 # Decide which language plugins to build.
-[ "$PYTHON" = "yes" ] && PLUGINS="$PLUGINS python"
 [ "$PSGI" = "yes" ] && PLUGINS="$PLUGINS psgi"
 [ "$RACK" = "yes" ] && PLUGINS="$PLUGINS rack"
 
 # Build plugins.
 for PLUGIN in $PLUGINS ; do
   CFLAGS="$SLKCFLAGS" \
-  python uwsgiconfig.py --plugin plugins/$PLUGIN package
+  python3 uwsgiconfig.py --plugin plugins/$PLUGIN package
 done
-
-# Use python3 to build plugin for it.
+# Use python2 to build python2 plugin
+if [ "$PYTHON2" = "yes" ]; then
+  CFLAGS="$SLKCFLAGS" \
+  python2 uwsgiconfig.py --plugin plugins/python package python
+fi
+# Use python3 to build python3 plugin
 if [ "$PYTHON3" = "yes" ]; then
   CFLAGS="$SLKCFLAGS" \
   python3 uwsgiconfig.py --plugin plugins/python package python3
@@ -123,7 +138,7 @@ fi
 
 # Create a few symlinks for automatic plugin loading.
 ( cd $PKG/usr/bin
-  [ "$PYTHON" = "yes" ] && ln -sf uwsgi uwsgi_python || true
+  [ "$PYTHON2" = "yes" ] && ln -sf uwsgi uwsgi_python || true
   [ "$PYTHON3" = "yes" ] && ln -sf uwsgi uwsgi_python3 || true
   [ "$PSGI" = "yes" ] && ln -sf uwsgi uwsgi_psgi || true
   [ "$RACK" = "yes" ] && ln -sf uwsgi uwsgi_rack || true
@@ -140,4 +155,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/network/uwsgi/uwsgi.info b/network/uwsgi/uwsgi.info
index 99428dd085..4d3ea5c256 100644
--- a/network/uwsgi/uwsgi.info
+++ b/network/uwsgi/uwsgi.info
@@ -1,8 +1,8 @@
 PRGNAM="uwsgi"
-VERSION="2.0.15"
+VERSION="2.0.24"
 HOMEPAGE="https://uwsgi-docs.readthedocs.io/"
-DOWNLOAD="https://projects.unbit.it/downloads/uwsgi-2.0.15.tar.gz"
-MD5SUM="fc50bd9e83b7602fa474b032167010a7"
+DOWNLOAD="https://files.pythonhosted.org/packages/source/u/uwsgi/uwsgi-2.0.24.tar.gz"
+MD5SUM="73ec5b418bc5fa5ca90b2c07b8ac69a8"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/network/vacuum-im/README b/network/vacuum-im/README
deleted file mode 100644
index e834ad94fc..0000000000
--- a/network/vacuum-im/README
+++ /dev/null
@@ -1,7 +0,0 @@
-Vacuum IM - it is a free cross-platform Jabber-client
-written in Qt4. The fundamental difference from other 
-cross-platform client is open, modular architecture,
-which allows the user to customize the functionality
-to meet specific needs, as well as use of the existing
-modules to develop your own.
-
diff --git a/network/vacuum-im/clientinfo.patch b/network/vacuum-im/clientinfo.patch
deleted file mode 100644
index 619f00d7db..0000000000
--- a/network/vacuum-im/clientinfo.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-Index: src/plugins/clientinfo/clientinfo.cpp
-===================================================================
---- src/plugins/clientinfo/clientinfo.cpp	(revision 1887)
-+++ src/plugins/clientinfo/clientinfo.cpp	(working copy)
-@@ -2,6 +2,8 @@
- 

- #include <QDir>

- #include <QProcess>

-+#include <QFile>

-+#include <QIODevice>

- #include <QFileInfo>

- #include <QTextStream>

- 

-@@ -434,8 +436,23 @@
- 			}

- 		}

- 

-+// Slackware detect

- 		if (osver.isEmpty())

- 		{

-+			QFile slackwarever("/etc/slackware-version");

-+			if (!slackwarever.open(QIODevice::ReadOnly | QIODevice::Text));

-+			QTextStream slackin(&slackwarever);

-+			while (!slackin.atEnd())

-+			{

-+				QString slackline = slackin.readLine();

-+				QString slackprocess_line(slackline);

-+				osver.append(slackprocess_line);

-+			}

-+			slackwarever.close();

-+		}

-+

-+		if (osver.isEmpty())

-+		{

- 			utsname buf;

- 			if (uname(&buf) != -1)

- 			{

diff --git a/network/vacuum-im/doinst.sh b/network/vacuum-im/doinst.sh
deleted file mode 100644
index 5fb28930db..0000000000
--- a/network/vacuum-im/doinst.sh
+++ /dev/null
@@ -1,3 +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/network/vacuum-im/slack-desc b/network/vacuum-im/slack-desc
deleted file mode 100644
index daed5906c5..0000000000
--- a/network/vacuum-im/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------------------------------------------------------|
-vacuum-im: vacuum-im (free cross-platform Jabber-client)
-vacuum-im:
-vacuum-im: written in Qt4. The fundamental difference from other
-vacuum-im: cross-platform client is open, modular architecture,
-vacuum-im: which allows the user to customize the functionality
-vacuum-im: to meet specific needs, as well as use of the existing
-vacuum-im: modules to develop your own.
-vacuum-im:
-vacuum-im: homepage: http://www.vacuum-im.org
-vacuum-im:
-vacuum-im:
diff --git a/network/vacuum-im/vacuum-im.SlackBuild b/network/vacuum-im/vacuum-im.SlackBuild
deleted file mode 100644
index f1aa966a37..0000000000
--- a/network/vacuum-im/vacuum-im.SlackBuild
+++ /dev/null
@@ -1,103 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for vacuum-im
-
-# Copyright 2013-2016  Oleg A. Deordiev  Ukraine
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
-#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
-#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (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=vacuum-im
-SRCNAM=vacuum
-VERSION=${VERSION:-1.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 -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 capabilities to read file /etc/slackware-version
-# for determine slackware version
-patch -p0 < $CWD/clientinfo.patch
-
-mkdir -p build
-cd build
-  cmake \
-    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
-    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DINSTALL_LIB_DIR=lib${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
-mv $PKG/usr/share/doc/$SRCNAM $PKG/usr/doc/$PRGNAM-$VERSION
-rm -fr $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:-tgz}
diff --git a/network/vacuum-im/vacuum-im.info b/network/vacuum-im/vacuum-im.info
deleted file mode 100644
index 3a003de8e3..0000000000
--- a/network/vacuum-im/vacuum-im.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="vacuum-im"
-VERSION="1.2.5"
-HOMEPAGE="http://www.vacuum-im.org"
-DOWNLOAD="https://github.com/Vacuum-IM/vacuum-im/archive/1.2.5/vacuum-im-1.2.5.tar.gz"
-MD5SUM="2004a882c95207b3244aadf77e822b9a"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Oleg A. Deordiev"
-EMAIL="admin@ifconfig.com.ua"
diff --git a/network/valknut/README b/network/valknut/README
deleted file mode 100644
index 432b9006fe..0000000000
--- a/network/valknut/README
+++ /dev/null
@@ -1 +0,0 @@
-Valknut is an open source cross platform client for the Direct Connect network.
diff --git a/network/valknut/dcoptions.patch b/network/valknut/dcoptions.patch
deleted file mode 100644
index 1d218cc2ed..0000000000
--- a/network/valknut/dcoptions.patch
+++ /dev/null
@@ -1,55 +0,0 @@
---- valknut/dcoptions.cpp.orig	2014-12-02 20:28:59.039798842 +0100
-+++ valknut/dcoptions.cpp	2014-12-02 22:25:06.352312671 +0100
-@@ -808,15 +808,18 @@
- {
- 	PushButton_GETINTERNETIP->setEnabled(false);
- 	
--	QHttpRequestHeader header( "GET", "/ip.php" );
--	header.setValue( "Host", "wxdcgui.sourceforge.net" );
-+  //QHttpRequestHeader header( "GET", "/ip.php" );
-+	QHttpRequestHeader header( "GET", "/" );
-+  //header.setValue( "Host", "wxdcgui.sourceforge.net" );
-+	header.setValue( "Host", "www.myip.se" );
- 	QString useragent = QString("Valknut/") + PACKAGE_VERSION;
- 	//printf("User-Agent=%s\n", useragent.toAscii().constData());
- 	header.setValue( "User-Agent", useragent );
- 	
- 	m_pHttp = new QHttp();
- 	connect( m_pHttp, SIGNAL(done(bool)), this, SLOT(slotGotInternetIP(bool)) );
--	m_pHttp->setHost( "wxdcgui.sourceforge.net" );
-+	//m_pHttp->setHost( "wxdcgui.sourceforge.net" );
-+	m_pHttp->setHost( "www.myip.se" );
- 	m_pHttp->request( header );
- }
- 
-@@ -834,20 +837,25 @@
- 	else
- 	{
- 		QString html = QString(m_pHttp->readAll());
--		int start = html.indexOf("&lt;ip&gt;");
--		int end = html.indexOf("&lt;/ip&gt;",start);
--		
-+       
-+		int start = html.indexOf("<b>");
-+    // We need the 2nd "bold" (<b>) attribute
-+		start = html.indexOf("<b>",start+3);
-+		int end = html.indexOf("</b>",start);
-+ 
- 		if ( ( start == -1 ) || ( end < start ) )
- 		{
- 			QMessageBox::warning(
- 				this,
- 				tr("Get Internet IP"),
--				tr("Unexpected response from ") + "http://wxdcgui.sourceforge.net"
-+				tr("Unexpected response from ") + "http://www.myip.se"
-+         // tr("Unexpected response from ") + "http://wxdcgui.sourceforge.net"
- 			);
- 		}
- 		else
- 		{
--			start += 10;
-+			//start += 10; // wxgui.sourceforge.net
-+			start += 21;   // www.myip.se
- 			QString ip = html.mid( start, end - start );
- 			
- 			if ( QHostAddress().setAddress(ip) )
diff --git a/network/valknut/doinst.sh b/network/valknut/doinst.sh
deleted file mode 100644
index 5fb28930db..0000000000
--- a/network/valknut/doinst.sh
+++ /dev/null
@@ -1,3 +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/network/valknut/main.patch b/network/valknut/main.patch
deleted file mode 100644
index 8106bbd384..0000000000
--- a/network/valknut/main.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- valknut/main.cpp.orig	2013-09-29 13:55:16.194456921 +0200
-+++ valknut/main.cpp	2013-09-29 13:55:30.942159705 +0200
-@@ -338,7 +338,7 @@
- 		delete dbg;
- 		printf("exit\n");
- 		delete qApp;
--		_exit(0);
-+		exit(0);
- 	}
- 
- #ifndef WIN32
diff --git a/network/valknut/slack-desc b/network/valknut/slack-desc
deleted file mode 100644
index a922461f1e..0000000000
--- a/network/valknut/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------------------------------------------------------|
-valknut: valknut (Neomodus DC Client)
-valknut:
-valknut: Valknut is an open source cross platform client for the
-valknut: Direct Connect network.
-valknut:
-valknut:
-valknut:
-valknut:
-valknut:
-valknut: Website: http://wxdcgui.sourceforge.net/
-valknut:
diff --git a/network/valknut/valknut.SlackBuild b/network/valknut/valknut.SlackBuild
deleted file mode 100644
index 84745603f2..0000000000
--- a/network/valknut/valknut.SlackBuild
+++ /dev/null
@@ -1,107 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for valknut
-
-# Copyright 2014 Kevin Paulus <goarilla@gmail.com>, Belgium
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
-#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
-#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (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=valknut
-VERSION=${VERSION:-0.4.9}
-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 xjvf $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 {} \;
-
-# Main patch
-patch -p0 < "$CWD"/main.patch valknut/main.cpp
-
-# Dcoptions (myip) patch
-patch -p0 < "$CWD"/dcoptions.patch valknut/dcoptions.cpp
-
-CFLAGS="$SLKCFLAGS" \
-./configure \
- --prefix=/usr \
- --libdir=/usr/lib"${LIBDIRSUFFIX}" \
- --mandir=/usr/man \
- --sysconfdir=/etc \
- --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 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
-
-rm $PKG/usr/share/valknut/COPYING
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/network/valknut/valknut.info b/network/valknut/valknut.info
deleted file mode 100644
index 5ff1233ab6..0000000000
--- a/network/valknut/valknut.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="valknut"
-VERSION="0.4.9"
-HOMEPAGE="http://wxdcgui.sourceforge.net"
-DOWNLOAD="http://downloads.sourceforge.net/project/wxdcgui/valknut-qt4/0.4.9/valknut-0.4.9.tar.bz2"
-MD5SUM="c25d68c447cb9deb4262befdde9fccea"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="dclib"
-MAINTAINER="Kevin Paulus"
-EMAIL="goarilla@gmail.com"
diff --git a/network/varnish/README b/network/varnish/README
index d8c1194ce9..4d742ff527 100644
--- a/network/varnish/README
+++ b/network/varnish/README
@@ -4,5 +4,3 @@ HTTP and configure it to cache the contents.
 
 Varnish is free software licensed under a two-clause BSD licence, also
 known as the FreeBSD licence.  The project was initiated in 2005.
-
-Homepage: https://www.varnish-cache.org/
diff --git a/network/varnish/rc.varnishd b/network/varnish/rc.varnishd
index b6354687f7..b8e0d16c5a 100644
--- a/network/varnish/rc.varnishd
+++ b/network/varnish/rc.varnishd
@@ -33,11 +33,13 @@ VARNISH_OPTS="-f $CONF \
               -T $ADMIN_IP:${ADMIN_PORT} \
               -a $HTTP_IP:${HTTP_PORT} \
               -t $DEFAULT_TTL \
-              -w${MIN_THREADS},${MAX_THREADS},${THREAD_TIMEOUT} \
               -P $PID"
 
-VARNISH_PARAMS="-p http_headers=$HTTP_HEADERS \
-               -p connect_timeout=$CONNECT_TIMEOUT"
+VARNISH_PARAMS="-p http_max_hdr=$HTTP_HEADERS \
+              -p thread_pool_min=${MIN_THREADS} \
+              -p thread_pool_max=${MAX_THREADS} \
+              -p thread_pool_timeout=${THREAD_TIMEOUT} \
+              -p connect_timeout=$CONNECT_TIMEOUT"
 
 varnish_start() {
 	if [ -e $PID ];then
@@ -51,7 +53,7 @@ varnish_start() {
 	fi
 	ulimit -n $FILE_DESCRIPTORS
 	echo "starting varnish..."
-	$BIN $VARNISH_OPTS $VARNISH_PARAMS
+  $BIN $VARNISH_OPTS $VARNISH_PARAMS
 }
 varnish_stop() {
 	echo "stopping varnish..."
diff --git a/network/varnish/varnish.SlackBuild b/network/varnish/varnish.SlackBuild
index 950474649c..2b76da61da 100644
--- a/network/varnish/varnish.SlackBuild
+++ b/network/varnish/varnish.SlackBuild
@@ -1,29 +1,40 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for varnish-cache
 
 # Written by Matt Schurenko <matt.schurenko@gmail.com>
+# Updated by Emmanuel N. Millan
+
+cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=varnish
-VERSION=${VERSION:-4.0.3}
+VERSION=${VERSION:-7.5.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"
@@ -36,14 +47,16 @@ 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.gz
+tar xvf $CWD/$PRGNAM-$VERSION.tgz
 cd $PRGNAM-$VERSION
+#patch -p1 -i $CWD/0051cbe3b9cc24586e0ad99cff72041c6df944b8.patch
+#patch -p1 -i $CWD/f04d7df6e6d5b350740e01d24749a3930390b7a0.patch
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -67,6 +80,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
 
@@ -82,9 +97,9 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 mkdir -p $PKG/etc/varnish/
-cp $PKG/usr/doc/$PRGNAM-$VERSION/example.vcl $PKG/etc/varnish/default.vcl.new
+cat $PKG/usr/doc/$PRGNAM-$VERSION/example.vcl > $PKG/etc/varnish/default.vcl.new
 mkdir -p $PKG/etc/rc.d/
-cp -p $CWD/rc.varnishd $PKG/etc/rc.d/rc.varnishd.new
+cat $CWD/rc.varnishd > $PKG/etc/rc.d/rc.varnishd.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/network/varnish/varnish.info b/network/varnish/varnish.info
index 00200b4073..92c8b03f7c 100644
--- a/network/varnish/varnish.info
+++ b/network/varnish/varnish.info
@@ -1,10 +1,10 @@
 PRGNAM="varnish"
-VERSION="4.0.3"
+VERSION="7.5.0"
 HOMEPAGE="https://www.varnish-cache.org/"
-DOWNLOAD="http://ponce.cc/slackware/sources/repo/varnish-4.0.3.tar.gz"
-MD5SUM="16a683f2e41f7d80219cec5d4649380c"
+DOWNLOAD="https://varnish-cache.org/downloads/varnish-7.5.0.tgz"
+MD5SUM="160a9a1f5cb8bae594490567ee39bd4b"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="docutils"
-MAINTAINER="Matt Schurenko"
-EMAIL="matt.schurenko@gmail.com"
+REQUIRES="Sphinx"
+MAINTAINER="Emmanuel N. Millan"
+EMAIL="emmanueln@gmail.com"
diff --git a/network/vblade/vblade.SlackBuild b/network/vblade/vblade.SlackBuild
index 7209a570f4..4382e0fc17 100644
--- a/network/vblade/vblade.SlackBuild
+++ b/network/vblade/vblade.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for vblade
 #
@@ -19,10 +19,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=vblade
-VERSION=${VERSION:-21}
+VERSION=${VERSION:-25}
 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}
@@ -56,9 +66,9 @@ 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 $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 \
@@ -89,4 +99,4 @@ cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 find $PKG/usr/doc -type f -exec chmod 0644 {} \;
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/network/vblade/vblade.info b/network/vblade/vblade.info
index 0ffe7fec3e..9728d1d56d 100644
--- a/network/vblade/vblade.info
+++ b/network/vblade/vblade.info
@@ -1,8 +1,8 @@
 PRGNAM="vblade"
-VERSION="21"
+VERSION="25"
 HOMEPAGE="http://aoetools.sourceforge.net/"
-DOWNLOAD="http://downloads.sourceforge.net/aoetools/vblade-21.tgz"
-MD5SUM="0a2a257737a808d8f2fbfa5de3172337"
+DOWNLOAD="https://github.com/OpenAoE/vblade/archive/vblade-25/vblade-vblade-25.tar.gz"
+MD5SUM="e1a98724eebed5fd1cb5f625f7ca236c"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/network/vcspull/vcspull.SlackBuild b/network/vcspull/vcspull.SlackBuild
index 14ac5140e9..b857eb09b0 100644
--- a/network/vcspull/vcspull.SlackBuild
+++ b/network/vcspull/vcspull.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for vcspull
 
-# 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=vcspull
-VERSION=${VERSION:-0.9.0}
+VERSION=${VERSION:-1.25.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,17 +79,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 {} \;
 
-python setup.py install --root=$PKG
+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 CHANGES LICENSE PKG-INFO README.rst doc/* $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a LICENSE PKG-INFO README.md docs/*.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/network/vcspull/vcspull.info b/network/vcspull/vcspull.info
index b43f48fc92..21e3561389 100644
--- a/network/vcspull/vcspull.info
+++ b/network/vcspull/vcspull.info
@@ -1,10 +1,10 @@
 PRGNAM="vcspull"
-VERSION="0.9.0"
+VERSION="1.25.0"
 HOMEPAGE="https://github.com/tony/vcspull/"
-DOWNLOAD="http://ponce.cc/slackware/sources/repo/vcspull-0.9.0.tar.gz"
-MD5SUM="30a82abdff974446aa3b96a7734043af"
+DOWNLOAD="https://files.pythonhosted.org/packages/75/d7/f4e3c1c71a5a6df182b71a4dd657e4f4ea3fb0a906c7e464a2c0b82b2a25/vcspull-1.25.0.tar.gz"
+MD5SUM="90c2d41337157407f77314eb2b32dbd4"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="kaptan PyYAML argcomplete colorama"
+REQUIRES="python3-libvcs colorama"
 MAINTAINER="Dimitris Zlatanidis"
-EMAIL="d.zlatanidis@gmail.com"
+EMAIL="dslackw@gmail.com"
diff --git a/network/vde2/vde2.SlackBuild b/network/vde2/vde2.SlackBuild
index f0d9d64035..938256d74c 100644
--- a/network/vde2/vde2.SlackBuild
+++ b/network/vde2/vde2.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for vde2
 
@@ -24,10 +24,13 @@
 
 # Modified by Antonio Hernández Blas <hba.nihilismus@gmail.com>
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=vde2
 VERSION=${VERSION:-2.3.2}
-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}
@@ -71,6 +81,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 to build against openssl-1.1.x - thanks archlinux!
+patch -p1 < $CWD/vde_cryptcab-compile-against-openssl-1.1.0.patch
+
 EXPERIMENTAL=${EXPERIMENTAL:-false}
 OPTIONS=""
 
@@ -113,6 +126,8 @@ cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 mkdir -p $PKG/etc/rc.d
 install -m 0755 $CWD/rc.vde2 $PKG/etc/rc.d/rc.vde2
 
+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
@@ -130,4 +145,4 @@ do
 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/network/vde2/vde_cryptcab-compile-against-openssl-1.1.0.patch b/network/vde2/vde_cryptcab-compile-against-openssl-1.1.0.patch
new file mode 100644
index 0000000000..227312eabb
--- /dev/null
+++ b/network/vde2/vde_cryptcab-compile-against-openssl-1.1.0.patch
@@ -0,0 +1,92 @@
+--- a/src/vde_cryptcab/cryptcab.c	2011-11-23 16:41:17.000000000 +0000
++++ b/src/vde_cryptcab/cryptcab.c	2017-03-20 22:54:20.452975075 +0000
+@@ -22,7 +22,7 @@
+ 	exit(1);
+ }
+ 	
+-static EVP_CIPHER_CTX ctx;
++static EVP_CIPHER_CTX *ctx;
+ static int ctx_initialized = 0;
+ static int encryption_disabled = 0;
+ static int nfd;
+@@ -30,6 +30,10 @@
+ static struct vde_open_args open_args={.port=0,.group=NULL,.mode=0700};
+ static int verbose = 0;
+ 
++#if OPENSSL_VERSION_NUMBER < 0x10100000
++#define EVP_CIPHER_CTX_reset(x)	EVP_CIPHER_CTX_cleanup(x)
++#endif
++
+ void vc_printlog(int priority, const char *format, ...)
+ {
+ 	va_list arg;
+@@ -103,19 +107,21 @@
+ 	}
+ 
+ 	if (!ctx_initialized) {
+-		EVP_CIPHER_CTX_init (&ctx);
++		ctx = EVP_CIPHER_CTX_new ();
++		if (!ctx)
++			return -1;
+ 		ctx_initialized = 1;
+ 	}
+ 	
+-	EVP_EncryptInit (&ctx, EVP_bf_cbc (), p->key, p->iv);
+-	if (EVP_EncryptUpdate (&ctx, dst, &olen, src, len) != 1)
++	EVP_EncryptInit (ctx, EVP_bf_cbc (), p->key, p->iv);
++	if (EVP_EncryptUpdate (ctx, dst, &olen, src, len) != 1)
+ 	{
+ 		fprintf (stderr,"error in encrypt update\n");
+ 		olen = -1;
+ 		goto cleanup;
+ 	}
+ 
+-	if (EVP_EncryptFinal (&ctx, dst + olen, &tlen) != 1)
++	if (EVP_EncryptFinal (ctx, dst + olen, &tlen) != 1)
+ 	{
+ 		fprintf (stderr,"error in encrypt final\n");
+ 		olen = -1;
+@@ -124,7 +130,7 @@
+ 	olen += tlen;
+ 
+ cleanup:
+-	EVP_CIPHER_CTX_cleanup(&ctx);	
++	EVP_CIPHER_CTX_reset(ctx);
+ 	return olen;
+ }
+ 
+@@ -138,19 +144,21 @@
+ 	}
+ 	
+ 	if (!ctx_initialized) {
+-		EVP_CIPHER_CTX_init (&ctx);
++		ctx = EVP_CIPHER_CTX_new ();
++		if (!ctx)
++			return -1;
+ 		ctx_initialized = 1;
+ 	}
+ 
+-	EVP_DecryptInit (&ctx, EVP_bf_cbc (), p->key, p->iv);
+-	if (EVP_DecryptUpdate (&ctx, dst, &olen, src, len) != 1)
++	EVP_DecryptInit (ctx, EVP_bf_cbc (), p->key, p->iv);
++	if (EVP_DecryptUpdate (ctx, dst, &olen, src, len) != 1)
+ 	{
+ 		fprintf (stderr,"error in decrypt update\n");
+ 		olen = -1;
+ 		goto cleanup;
+ 	}
+ 
+-	if (EVP_DecryptFinal (&ctx, dst + olen, &tlen) != 1)
++	if (EVP_DecryptFinal (ctx, dst + olen, &tlen) != 1)
+ 	{
+ 		fprintf (stderr,"error in decrypt final\n");
+ 		olen = -1;
+@@ -159,7 +167,7 @@
+ 	olen += tlen;
+ 
+ cleanup:
+-	EVP_CIPHER_CTX_cleanup(&ctx);	
++	EVP_CIPHER_CTX_reset (ctx);
+ 	return olen;
+ }
+ 
diff --git a/network/vdirsyncer/README b/network/vdirsyncer/README
new file mode 100644
index 0000000000..2ef8216db4
--- /dev/null
+++ b/network/vdirsyncer/README
@@ -0,0 +1,7 @@
+Vdirsyncer is a command-line tool for synchronizing calendars and
+addressbooks between a variety of servers and the local filesystem.
+
+It can also be used to synchronize calendars and/or addressbooks
+between two servers directly.
+
+It aims to be for calendars & contacts what OfflineIMAP is for emails.
diff --git a/network/vdirsyncer/slack-desc b/network/vdirsyncer/slack-desc
new file mode 100644
index 0000000000..60656df86c
--- /dev/null
+++ b/network/vdirsyncer/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+          |-----handy-ruler------------------------------------------------------|
+vdirsyncer: vdirsyncer (cli tool to sync calendars and adessbooks)
+vdirsyncer:
+vdirsyncer: Vdirsyncer is a command-line tool for synchronizing calendars and
+vdirsyncer: addressbooks between a variety of servers and the local filesystem.
+vdirsyncer:
+vdirsyncer: It aims to be for calendars and contacts what OfflineIMAP
+vdirsyncer: is for emails.
+vdirsyncer:
+vdirsyncer:
+vdirsyncer:
+vdirsyncer:
diff --git a/network/vdirsyncer/vdirsyncer.SlackBuild b/network/vdirsyncer/vdirsyncer.SlackBuild
new file mode 100644
index 0000000000..42cb7e5cb4
--- /dev/null
+++ b/network/vdirsyncer/vdirsyncer.SlackBuild
@@ -0,0 +1,98 @@
+#!/bin/bash
+
+# Slackware build script for vdirsyncer
+
+# Copyright 2022 Tonus Paris
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=vdirsyncer
+VERSION=${VERSION:-0.19.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 {} \;
+
+  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 \
+  *.rst docs/* \
+  $PKG/usr/doc/$PRGNAM-$VERSION
+chmod =755 $PKG/usr/doc/$PRGNAM-$VERSION/tutorials
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+# Remove empty directory
+rm -rf $PKG/usr/doc/$PRGNAM-$VERSION/_static/
+
+mkdir -p $PKG/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/network/vdirsyncer/vdirsyncer.info b/network/vdirsyncer/vdirsyncer.info
new file mode 100644
index 0000000000..98f279ade4
--- /dev/null
+++ b/network/vdirsyncer/vdirsyncer.info
@@ -0,0 +1,10 @@
+PRGNAM="vdirsyncer"
+VERSION="0.19.2"
+HOMEPAGE="https://github.com/pimutils/vdirsyncer"
+DOWNLOAD="https://files.pythonhosted.org/packages/81/fb/6fbb7f1d102a59db275811a0de756d6f5bb55c624ba4bdf918b3fbd2ddc0/vdirsyncer-0.19.2.tar.gz"
+MD5SUM="243ecfc93cdcf61908fc786af4017540"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="click click-log click-threading requests-toolbelt python-urwid python3-aiohttp python3-aiostream python3-atomicwrites"
+MAINTAINER="Tonus"
+EMAIL="tonus1@free.fr"
diff --git a/network/verlihub/README b/network/verlihub/README
index a722cfe6f2..982153614b 100644
--- a/network/verlihub/README
+++ b/network/verlihub/README
@@ -1,9 +1,10 @@
 Verlihub - Direct Connect server
 
-Verlihub is a Direct Connect protocol server that runs on Linux OS, written
-in C++; Many features are available: MySQL database, very low use of CPU,
-RAM & Bandwidth, deflood integrated protection, plugins (LUA, forbidden,
-ip-log, funny, messenger & chatroom) and MORE, MORE AND MORE...
+Verlihub is a Direct Connect protocol server that runs on Linux OS,
+written in C++; Many features are available: MySQL database, very low
+use of CPU, RAM & Bandwidth, deflood integrated protection, plugins
+(LUA, forbidden, ip-log, funny, messenger & chatroom) and MORE, MORE
+AND MORE...
 
-If you don't want to run verlihub as root and still use port 411, get the
-optional dependency authbind.
+If you don't want to run verlihub as root and still use port 411, get
+the optional dependency authbind.
diff --git a/network/verlihub/verlihub-gcc7.patch b/network/verlihub/verlihub-gcc7.patch
new file mode 100644
index 0000000000..4b2ede4d42
--- /dev/null
+++ b/network/verlihub/verlihub-gcc7.patch
@@ -0,0 +1,18 @@
+diff -Naur verlihub-0.9.8e-r2.orig/src/script_api.cpp verlihub-0.9.8e-r2/src/script_api.cpp
+--- verlihub-0.9.8e-r2.orig/src/script_api.cpp	2009-05-16 16:42:07.000000000 +0200
++++ verlihub-0.9.8e-r2/src/script_api.cpp	2017-06-01 20:33:58.923440440 +0200
+@@ -218,12 +218,12 @@
+ 	cServerDC *server = GetCurrentVerlihub();
+ 	if(!server) {
+ 		cerr << "Server verlihub is unfortunately not running or not found." << endl;
+-		return false;
++		return NULL;
+ 	}
+ 	cUser *usr = GetUser((char *) server->mC.hub_security.c_str());
+ 	printf("%p\n", usr);
+ 	printf("%p", usr->mxConn);
+-	if ((!usr) || (usr && !usr->mxConn)) return false;
++	if ((!usr) || (usr && !usr->mxConn)) return NULL;
+ 	cout << "here" << endl;
+ 	if (!server->mP.ParseForCommands(command_line, usr->mxConn)) {
+ 		// unknown command	
diff --git a/network/verlihub/verlihub.SlackBuild b/network/verlihub/verlihub.SlackBuild
index 25c0729a42..7610c91df4 100644
--- a/network/verlihub/verlihub.SlackBuild
+++ b/network/verlihub/verlihub.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for verlihub
 
@@ -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=verlihub
 VERSION=${VERSION:-0.9.8e_r2}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 SRCVER=${SRCVER:-0.9.8e-r2}
 
 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"
@@ -71,6 +81,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://gcc.gnu.org/gcc-7/porting_to.html
+patch -p1 < $CWD/verlihub-gcc7.patch
+
 patch -p1 < $CWD/verlihub-header.patch
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
@@ -96,8 +109,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/network/verm/README b/network/verm/README
deleted file mode 100644
index 86aef43f9a..0000000000
--- a/network/verm/README
+++ /dev/null
@@ -1,21 +0,0 @@
-Verm is a WORM (write-once, read-many) file store to make it easy to reliably
-store and replicate files.
-
-This script requires a 'verm' user/group to exist before running.
-
-The recommended UID/GID is 346. You can create these like so:
-    groupadd -g 346 verm
-    useradd -u 346 -g 346 -m -d /var/lib/verm verm
-
-The following can be used to start/stop verm automatically:
-/etc/rc.d/rc.local
-    if [ -x /etc/rc.d/rc.verm ]; then
-        /etc/rc.d/rc.verm start
-    fi
-
-/etc/rc.d/rc.local_shutdown
-    if [ -x /etc/rc.d/rc.verm ]; then
-        /etc/rc.d/rc.verm stop
-    fi
-
-NOTE: google-go-lang is only needed at compile time - not needed for runtime.
diff --git a/network/verm/doinst.sh b/network/verm/doinst.sh
deleted file mode 100644
index 52dac08ac3..0000000000
--- a/network/verm/doinst.sh
+++ /dev/null
@@ -1,23 +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
-}
-
-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/logrotate.d/verm.new
-preserve_perms etc/rc.d/rc.verm.new
diff --git a/network/verm/rc.verm b/network/verm/rc.verm
deleted file mode 100644
index ca4895df18..0000000000
--- a/network/verm/rc.verm
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/bin/bash
-
-PORT=${PORT:-3404}
-LISTEN=${LISTEN:-localhost}
-PIDDIR=/var/run/verm
-LOGDIR=/var/log/verm
-PIDFILE=$PIDDIR/verm.pid
-
-. /etc/rc.d/init.d/functions
-
-runuser() {
-  su "$@"
-}
-
-verm_start() {
-  mkdir -p $PIDDIR $LOGDIR
-  chown -R verm:verm $PIDDIR $LOGDIR
-  action "Starting verm: " daemon --pidfile $PIDFILE --user verm "bash -c 'verm -port \"$PORT\" -listen \"$LISTEN\" >> $LOGDIR/verm.log 2>> $LOGDIR/verm_err.log & echo \$! > $PIDFILE'"
-}
-
-verm_stop() {
-  action "Stopping verm: " killproc -p $PIDFILE "verm"
-}
-
-verm_restart() {
-  verm_stop
-  verm_start
-}
-
-case "$1" in
-'start')
-  verm_start
-  ;;
-'stop')
-  verm_stop
-  ;;
-'restart')
-  verm_restart
-  ;;
-*)
-  echo "usage $0 start|stop|restart"
-esac
diff --git a/network/verm/slack-desc b/network/verm/slack-desc
deleted file mode 100644
index 95fe0c0c88..0000000000
--- a/network/verm/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------------------------------------------------------|
-verm: verm (An immutable, WORM filestore accessible by HTTP)
-verm:
-verm: Verm is a WORM (write-once, read-many) file store to make it easy to
-verm: reliably store and replicate files.
-verm:
-verm:
-verm: https://github.com/willbryant/verm
-verm:
-verm:
-verm:
-verm:
diff --git a/network/verm/verm.SlackBuild b/network/verm/verm.SlackBuild
deleted file mode 100644
index 7cf47f213e..0000000000
--- a/network/verm/verm.SlackBuild
+++ /dev/null
@@ -1,107 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for verm
-
-# Copyright 2016-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=verm
-VERSION=${VERSION:-1.5.1}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-VERM_UID=${VERM_UID:-346}
-VERM_GID=${VERM_GID:-346}
-VERM_PORT=${VERM_PORT:-3404}
-
-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}
-
-# Bail out if user or group isn't valid on your system
-# For slackbuilds.org, assigned verm uid/gid are 346/346
-# See http://slackbuilds.org/uid_gid.txt
-if ! getent group verm > /dev/null 2>&1 ; then
-  echo "  You must have a verm group to run this script."
-  echo "    # groupadd -g $VERM_GID verm"
-  exit 1
-elif ! getent passwd verm > /dev/null 2>&1 ; then
-  echo "  You must have a verm user to run this script."
-  echo "    # useradd -u $VERM_UID -g $VERM_GID -m -d /var/lib/verm verm"
-  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.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 {} \;
-
-SRCDIR="$(pwd)"
-export GOPATH="$SRCDIR"
-mkdir -p src/github.com/willbryant
-( cd src/github.com/willbryant && ln -s "$GOPATH" verm)
-
-go build -ldflags "-X main.compiled_version=$VERSION -X main.compiled_root_data_directory=/var/lib/verm" "github.com/willbryant/verm"
-
-mkdir -p $PKG/usr/bin
-install -m0755 -oroot -groot verm $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 *.md $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-mkdir -p $PKG/etc/rc.d
-
-cat $CWD/slack-desc > $PKG/install/slack-desc
-cat $CWD/doinst.sh > $PKG/install/doinst.sh
-sed "s/@VERM_PORT/$VERM_PORT/" $CWD/rc.verm > $PKG/etc/rc.d/rc.verm.new
-chmod 0755 $PKG/etc/rc.d/rc.verm.new
-
-mkdir -p $PKG/etc/logrotate.d
-cat $CWD/verm.logrotate > $PKG/etc/logrotate.d/verm.new
-
-mkdir -p $PKG/var/log/verm
-chown -R verm:verm $PKG/var/log/verm
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/network/verm/verm.info b/network/verm/verm.info
deleted file mode 100644
index dbe359a680..0000000000
--- a/network/verm/verm.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="verm"
-VERSION="1.5.1"
-HOMEPAGE="https://github.com/willbryant/verm"
-DOWNLOAD="https://github.com/willbryant/verm/archive/1.5.1/verm-1.5.1.tar.gz"
-MD5SUM="18b7c847dda5c52a74bb49ecd35a447a"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="google-go-lang"
-MAINTAINER="Andrew Clemons"
-EMAIL="andrew.clemons@gmail.com"
diff --git a/network/verm/verm.logrotate b/network/verm/verm.logrotate
deleted file mode 100644
index 66f131207d..0000000000
--- a/network/verm/verm.logrotate
+++ /dev/null
@@ -1,9 +0,0 @@
-/var/log/verm/*.log {
-  su verm verm
-  rotate 12
-  weekly
-  compress
-  missingok
-  notifempty
-  copytruncate
-}
diff --git a/network/viber/README b/network/viber/README
index ad9e2bb245..c7c9e2f810 100644
--- a/network/viber/README
+++ b/network/viber/README
@@ -1,6 +1,8 @@
-Viber is a mobile application that allows you to make phone calls
-and send text messages to all other Viber users for free!
+Viber: Free and secure calls and messages to anyone, anywhere.
 
-Viber is available over WiFi or 3G.
+With Viber on your desktop, you can send and receive messages, enjoy
+group calls, create stickers, and more, as your devices seamlessly sync.
 
-There's only available the 64bit version.
+NOTE!
+Viber for Desktop is synced to your mobile account. To activate Viber
+for Desktop, you will need an active Viber account on your mobile phone.
diff --git a/network/viber/slack-desc b/network/viber/slack-desc
index 126fc3cb47..c37dccfc3e 100644
--- a/network/viber/slack-desc
+++ b/network/viber/slack-desc
@@ -6,13 +6,13 @@
 # customary to leave one space after the ':' except on otherwise blank lines.
 
      |-----handy-ruler------------------------------------------------------|
-viber: viber (mobile messaging application)
-viber:
-viber: Viber is a mobile application that allows you to make phone
-viber: calls and send text messages to all other Viber users for free!
-viber:
+viber: viber (Free and secure calls and messages)
 viber:
+viber: With Viber on your desktop, you can send and receive messages,
+viber: enjoy group calls, create stickers, and more, as your devices
+viber: seamlessly sync.
 viber:
+viber: https://www.viber.com/
 viber:
 viber:
 viber:
diff --git a/network/viber/viber.SlackBuild b/network/viber/viber.SlackBuild
index 0283403e20..81a497720a 100644
--- a/network/viber/viber.SlackBuild
+++ b/network/viber/viber.SlackBuild
@@ -1,7 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 #
 # Slackware build script for Viber
 
+# Copyright 2023 Petar Petrov, slackalaxy@gmail.com
 # Copyright 2009-2017  Roberto Metere, Newcastle Upon Tyne, UK
 # All rights reserved.
 #
@@ -22,69 +23,66 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=viber
-VERSION=${VERSION:-7.0.0.1035}
+VERSION=${VERSION:-21.0.0.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+if [ -z "$ARCH" ]; then
+  ARCH=$( uname -m )
+fi
 
-case "$(uname -m)" in
-  i?86) DEBARCH="i386" ; LIBDIRSUFFIX="" ; ARCH=i386 ;;
-  x86_64) DEBARCH="amd64" ; LIBDIRSUFFIX="64" ; ARCH=x86_64 ;;
-  *) echo "Package for $(uname -m) architecture is not available." ; exit 1 ;;
-esac
+if [ "$ARCH" != "x86_64" ]; then
+  echo "$ARCH architecture is unsupported." >/dev/stderr
+  exit 1
+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 -eu
-
-# Get the real version
-REAL_VER=$(ar p ${PRGNAM}.deb control.tar.gz | tar zxO ./control | grep Version | awk '{print $2}' | cut -d- -f1)
+set -e
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $PKG
-ar p $CWD/${PRGNAM}.deb data.tar.xz | xz -d | tar xv
-# Move to standard place
-mv $PKG/opt/viber/* $PKG/usr/share/viber
-rm -r $PKG/opt
-# Fix desktop launcher
-sed -i 's/\/opt\/viber\/Viber/\/usr\/bin\/ViberPC/' $PKG/usr/share/applications/viber.desktop
-
-#
-# Make a shell launcher
-#
-# In my opinion, it's a bug... that is, Viber must be called from installation path
-# or with complete path to installation path, because it looks for other files.
-# Any symbolic link or hard copy of main binary to /usr/bin would yield a
-# non-working launcher.
-#
-# ViberPC is the name of the window (it is better to call it as such for a better
-# integration with docks, like cairo-dock)
-# Anyway for compatibility with previous version a link to /usr/bin/viber is created.
-#
-mkdir -p $PKG/usr/bin
-printf "#!/bin/sh\n/usr/share/viber/Viber\n" > $PKG/usr/bin/ViberPC
-ln -s ViberPC $PKG/usr/bin/viber
-
-# Adjust ownerships and permissions
+ar p $CWD/$PRGNAM.deb data.tar.xz | xz -d | tar xv
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
   -o -perm 511 \) -exec chmod 755 {} \; -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/ViberPC
-cd
 
-mkdir -p $PKG/usr/doc/$PRGNAM-$REAL_VER
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$REAL_VER/$PRGNAM.SlackBuild
+mkdir -p $PKG/usr/bin
+cd $PKG/usr/bin
+ln -s ../../opt/viber/Viber .
+
+# make libs executable
+find $PKG -name *.so -exec chmod 755 {} \;
+find $PKG -name *.so.* -exec chmod 755 {} \;
+
+# fix path
+sed -i 's:/opt/viber/::' $PKG/usr/share/applications/$PRGNAM.desktop
+sed -i 's:/usr/share/pixmaps/viber.png:viber:' $PKG/usr/share/applications/$PRGNAM.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
+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-$REAL_VER-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/network/viber/viber.info b/network/viber/viber.info
index 53c5a04a16..efc5945b88 100644
--- a/network/viber/viber.info
+++ b/network/viber/viber.info
@@ -1,10 +1,10 @@
 PRGNAM="viber"
-VERSION="7.0.0.1035"
-HOMEPAGE="https://www.viber.com/products/linux"
+VERSION="21.0.0.1"
+HOMEPAGE="https://www.viber.com/"
 DOWNLOAD="UNSUPPORTED"
 MD5SUM=""
 DOWNLOAD_x86_64="http://download.cdn.viber.com/cdn/desktop/Linux/viber.deb"
-MD5SUM_x86_64="4e6f4759fbaef187765190c8d6adaa72"
-REQUIRES="qt5"
-MAINTAINER="Roberto Metere"
-EMAIL="roberto@metere.it"
+MD5SUM_x86_64="7e93a64efebd9112df3ac7f8dc0c4580"
+REQUIRES="snappy tslib"
+MAINTAINER="Petar Petrov"
+EMAIL="slackalaxy@gmail.com"
diff --git a/network/vimb/vimb.SlackBuild b/network/vimb/vimb.SlackBuild
index b96b5c2545..e62c7acc5b 100644
--- a/network/vimb/vimb.SlackBuild
+++ b/network/vimb/vimb.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for vimb
 
@@ -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=vimb
-VERSION=${VERSION:-3.2.0}
+VERSION=${VERSION:-3.7.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}
@@ -85,9 +92,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
 
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp *.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:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/network/vimb/vimb.info b/network/vimb/vimb.info
index 8f03b4d82b..d5c1cb95aa 100644
--- a/network/vimb/vimb.info
+++ b/network/vimb/vimb.info
@@ -1,8 +1,8 @@
 PRGNAM="vimb"
-VERSION="3.2.0"
+VERSION="3.7.0"
 HOMEPAGE="https://fanglingsu.github.io/vimb"
-DOWNLOAD="https://github.com/fanglingsu/vimb/archive/3.2.0/vimb-3.2.0.tar.gz"
-MD5SUM="c0848041b6f6d618d5d4d0e169c1ea5c"
+DOWNLOAD="https://github.com/fanglingsu/vimb/archive/3.7.0/vimb-3.7.0.tar.gz"
+MD5SUM="4052a71111eb31e5b5a39a75c460d441"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="webkit2gtk"
diff --git a/network/vimfx/README b/network/vimfx/README
new file mode 100644
index 0000000000..b67bb891b4
--- /dev/null
+++ b/network/vimfx/README
@@ -0,0 +1,19 @@
+VimFx is a Firefox extension which adds short, Vim-style keyboard
+shortcuts for browsing and navigation, for a near mouseless
+experience.
+
+One of key tenets of VimFx is that the standard Firefox features are
+always preferable to re-implementing similar functionality.
+
+VimFx is a legacy extension as opposite to WebExtensions. It works on
+modern versions of Firefox thanks to a shim called LegacyFox, which is
+also included in this script. Unlike WebExtensions this legacy one
+works on incompletely loaded, blank, and system pages.
+
+This script will install VimFx for all users on the system. When
+starting Firefox, users will see a yellow warning triangle above the
+hamburger menu (a button with three horizontal lines) and will be
+prompted to activate the extension.
+
+README.SBo contains details on building the package for a Firefox
+different from the stock Slackware mozilla-firefox.
diff --git a/network/vimfx/README.SBo b/network/vimfx/README.SBo
new file mode 100644
index 0000000000..4118b56713
--- /dev/null
+++ b/network/vimfx/README.SBo
@@ -0,0 +1,19 @@
+To build the package for a Firefox different from the stock Slackware
+mozilla-firefox, pass to the script the variable FFDIR that contains
+the Firefox installation directory as in
+FFDIR=/usr/lib64/firefox-latest
+
+In this case it may also be advisable to update LegacyFox, check the
+release list on the VimFx homepage. The LegacyFox version can be
+passed to the script in the variable LFVERSION.
+
+For non ESR Firefox the VimFx xpi-file
+$FFDIR/browser/extensions/VimFx-unlisted@akhodakivskiy.github.com.xpi
+must be copied or symlinked to the directory
+~/.mozilla/firefox/<profile name>/extensions/
+for every Firefox user (and for every profile).
+
+Also, for non ESR Firefox the about:addons page shows a red banner
+with the text "VimFx could not be verified for use in Firefox and has
+been disabled". It is wrong and can be ignored; VimFx will work
+regardless.
diff --git a/network/vimfx/slack-desc b/network/vimfx/slack-desc
new file mode 100644
index 0000000000..8b00563a99
--- /dev/null
+++ b/network/vimfx/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+     |-----handy-ruler------------------------------------------------------|
+vimfx: vimfx (Vim keybindings for Firefox)
+vimfx:
+vimfx: VimFx is a Firefox extension which adds short, Vim-style keyboard
+vimfx: shortcuts for browsing and navigation, for a near mouseless
+vimfx: experience.
+vimfx:
+vimfx: One of key tenets of VimFx is that the standard Firefox features are
+vimfx: always preferable to re-implementing similar functionality.
+vimfx:
+vimfx: Homepage: https://github.com/akhodakivskiy/VimFx
+vimfx:
diff --git a/network/vimfx/vimfx.SlackBuild b/network/vimfx/vimfx.SlackBuild
new file mode 100644
index 0000000000..ba98c70c6b
--- /dev/null
+++ b/network/vimfx/vimfx.SlackBuild
@@ -0,0 +1,103 @@
+#!/bin/bash
+
+# Slackware build script for vimfx
+
+# Copyright 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=vimfx
+VERSION=${VERSION:-0.27.1}
+LFVERSION=${LFVERSION:-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" = "x86_64" ]; then
+  LIBDIRSUFFIX="64"
+elif [ "$ARCH" = "aarch64" ]; then
+  LIBDIRSUFFIX="64"
+else
+  LIBDIRSUFFIX=""
+fi
+
+FFDIR=${FFDIR:-/usr/lib${LIBDIRSUFFIX}/firefox}
+
+set -e
+
+case $FFDIR in
+  /*) if ! /usr/bin/pathchk -p -- "$FFDIR"; then
+        echo "invalid FFDIR"
+        exit 1
+      fi
+      ;;
+   *) echo "FFDIR isn't an absolute path"
+      exit 1
+      ;;
+esac
+
+rm -rf $PKG
+mkdir -p $TMP $PKG$FFDIR/browser/extensions $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/*v$LFVERSION*.tar.gz
+mv *v$LFVERSION* $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 install DESTDIR=$PKG$FFDIR
+
+install -m 0644 -o root -g root $CWD/VimFx.xpi \
+  $PKG$FFDIR/browser/extensions/VimFx-unlisted@akhodakivskiy.github.com.xpi
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cat README > $PKG/usr/doc/$PRGNAM-$VERSION/README-LegacyFox
+cd $CWD
+for f in CHANGELOG.md PEOPLE.md README.md $PRGNAM.SlackBuild; do \
+  cat $f > $PKG/usr/doc/$PRGNAM-$VERSION/$f; done
+
+mkdir -p $PKG/install
+cat slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/network/vimfx/vimfx.info b/network/vimfx/vimfx.info
new file mode 100644
index 0000000000..ddcf2b425e
--- /dev/null
+++ b/network/vimfx/vimfx.info
@@ -0,0 +1,18 @@
+PRGNAM="vimfx"
+VERSION="0.27.1"
+HOMEPAGE="https://github.com/akhodakivskiy/VimFx"
+DOWNLOAD="https://github.com/akhodakivskiy/VimFx/releases/download/v0.27.1/VimFx.xpi \
+          https://raw.githubusercontent.com/akhodakivskiy/VimFx/v0.27.1/README.md \
+          https://raw.githubusercontent.com/akhodakivskiy/VimFx/v0.27.1/CHANGELOG.md \
+          https://raw.githubusercontent.com/akhodakivskiy/VimFx/v0.27.1/PEOPLE.md \
+          https://git.gir.st/LegacyFox.git/snapshot/v3.3.tar.gz"
+MD5SUM="66567d440fb1f37cd61ae594446548e3 \
+        237b1aac5c13b65297d7a19cd29ddb6b \
+        d30337da8ffade3fad582f3bb927ab8f \
+        34b9e545905fa6d00e2421a6c1a81a5a \
+        3e2e2fc0c42d6f008706e74754d01731"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Alexander Verbovetsky"
+EMAIL="alik@ejik.org"
diff --git a/network/vivaldi/README b/network/vivaldi/README
index bcb75575c6..a6b095a1b1 100644
--- a/network/vivaldi/README
+++ b/network/vivaldi/README
@@ -1,9 +1,7 @@
 vivaldi (web browser).
 
-A Browser for Our Friends. An advanced browser made with the power user
-in mind. Finally you can surf your way.
+Experience the web in a whole new way with Vivaldi.
 
-pepperflash-plugin, ffmpeg, vivaldi-codecs-ffmpeg-extra are optional
-dependencies.
-
-Vivaldi for ARM can be downloaded at https://vivaldi.com/download/
+Vivaldi is a browser that has the features you need, a style that fits
+and values you can stand by. Your browser matters. Take control with
+Vivaldi.
diff --git a/network/vivaldi/README.SBo b/network/vivaldi/README.SBo
index 13e8edce7d..91f83743fa 100644
--- a/network/vivaldi/README.SBo
+++ b/network/vivaldi/README.SBo
@@ -1,4 +1,38 @@
-This SlackBuild used to support a variable CUSTOM_CSS that made it
-possible to customize the user interface using a css file.
+# Proprietary media support
 
-Now the same can be done via vivaldi://experiments/
+Vivaldi does not directly bundle any library with support for
+"proprietary media" (H.264/AAC), since this would make redistribution of
+the output package difficult (due to software patent licensing).
+Instead, the script '/opt/vivaldi/update-ffmpeg' fetches a suitable lib
+from a third party (and verifies it). This can be run in two ways.
+
+## System-wide install
+
+The recommended method is for the user to run it as root (with no
+arguments) immediately after installing (or upgrading) Vivaldi, but
+before first run. The file will then be placed in '/var/opt/vivaldi' and
+found by Vivaldi when you launch it afterwards.
+
+Files installed this way will even be cleaned up automatically on
+uninstall by 'douninst.sh'. Alternatively running 'update-ffmpeg' again
+(as root) with '--undo' will also remove the lib and associated
+directories.
+
+## Per-user install
+
+If you do not run the 'update-ffmpeg' as root before first run, Vivaldi
+will call this script itself, automatically on first launch (with the
+option '--user'). In this case the lib will be installed into
+'~/.local/lib/vivaldi' (for each user who launches Vivaldi) and will
+then be available, from the next restart (of the browser).
+
+If you wish to remove the file from '~/.local/lib/vivaldi', you can run
+'update-ffmpeg' as follows:
+
+    /opt/vivaldi/update-ffmpeg --user --undo
+
+Alternatively look in '~/.local/lib/vivaldi' and remove the files
+manually.
+
+NOTE: Keep in mind the lib will be automatically reinstalled in
+'~/.local/lib/vivaldi' if any user on the system launches Vivaldi again.
diff --git a/network/vivaldi/douninst.sh b/network/vivaldi/douninst.sh
new file mode 100644
index 0000000000..879cbcec64
--- /dev/null
+++ b/network/vivaldi/douninst.sh
@@ -0,0 +1,11 @@
+# Remove any lib fetched by '/opt/vivaldi/update-ffmpeg' that was
+# installed system-wide into '/var/opt'
+rm -f /var/opt/vivaldi/media-codecs-*/libffmpeg.so
+if [ -d /var/opt/vivaldi ]; then
+  # This removes directory trees that are empty or only populated by other
+  # empty directories.
+  find /var/opt/vivaldi -depth -type d -empty -exec rmdir {} \;
+  # '/var/opt' is not part of the default Slackware install, so we will
+  # remove it, if it is now empty (following the above).
+  rmdir --ignore-fail-on-non-empty /var/opt
+fi
diff --git a/network/vivaldi/slack-desc b/network/vivaldi/slack-desc
index fb2335b9c7..9d1efaa13e 100644
--- a/network/vivaldi/slack-desc
+++ b/network/vivaldi/slack-desc
@@ -8,12 +8,12 @@
        |-----handy-ruler------------------------------------------------------|
 vivaldi: vivaldi (web browser)
 vivaldi:
-vivaldi: A Browser for Our Friends.
+vivaldi: Experience the web in a whole new way with Vivaldi.
 vivaldi:
-vivaldi: An advanced browser made with the power user in mind. Finally you
-vivaldi: can surf your way.
+vivaldi: Vivaldi is a browser that has the features you need, a style that fits
+vivaldi: and values you can stand by. Your browser matters. Take control with
+vivaldi: Vivaldi.
 vivaldi:
 vivaldi: Home Page: https://vivaldi.com
 vivaldi:
 vivaldi:
-vivaldi:
diff --git a/network/vivaldi/vivaldi.SlackBuild b/network/vivaldi/vivaldi.SlackBuild
index fbec3572e3..0b8ba3e053 100644
--- a/network/vivaldi/vivaldi.SlackBuild
+++ b/network/vivaldi/vivaldi.SlackBuild
@@ -1,9 +1,10 @@
-#!/bin/sh
+#!/bin/bash
 #
 # Slackware build script for vivaldi.
 #
 # Copyright 2015-2017  Edinaldo P. Silva, Rio de Janeiro, Brazil.
 # Copyright 2017-2019, Alexander Verbovetsky, Moscow, Russia
+# Copyright 2019-2024, Ruari Oedegaard, Oslo, Norway
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,29 +24,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=vivaldi
-VERSION=${VERSION:-2.6.1566.51}
-WIDEVINE_VERSION="4.10.1440.18"
+VERSION=${VERSION:-6.6.3271.61}
 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) BITS="i386" ; WIDEVINE_BITS="ia32" ;;
-  x86_64) BITS="amd64" ; WIDEVINE_BITS="x64" ;;
-    arm*) BITS="armhf" ;;
-       *) echo "$ARCH is not supported."
-          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}
@@ -54,15 +52,9 @@ set -e
 
 rm -rf $PKG $TMP/$PRGNAM
 mkdir -p $TMP/$PRGNAM $PKG $OUTPUT
-
 cd $TMP/$PRGNAM
-ar p $CWD/${PRGNAM}-stable_${VERSION}-*_${BITS}.deb data.tar.xz | tar xvJ
-if [ "x$BITS" = "xarmhf" ] ; then
-  echo "This script does not support Widevine on ARM."
-else
-  unzip -oq $CWD/${WIDEVINE_VERSION}-linux-${WIDEVINE_BITS}.zip \
-    libwidevinecdm.so -d opt/vivaldi
-fi
+ar p $CWD/${PRGNAM}-stable_${VERSION}-*.deb data.tar.xz | tar xJ ./opt ./usr
+
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -70,13 +62,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 {} \;
 
-rm -r opt/vivaldi/cron
+rm -r opt/vivaldi/cron usr/share/doc
 mv opt usr $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
 
-ln -sf /opt/vivaldi/vivaldi $PKG/usr/bin/vivaldi
+# Create relative symlinks (first removing any potentially non-relative
+# ones).
+
+rm -f $PKG/usr/bin/vivaldi* $PKG/opt/vivaldi/WidevineCdm
+ln -s ../../opt/vivaldi/vivaldi $PKG/usr/bin/vivaldi
+ln -s ../../opt/vivaldi/vivaldi $PKG/usr/bin/vivaldi-stable
+
+# This following may appear as a broken/dangling symlink but it actually
+# can be used by Vivaldi as a fallback source for Widevine in cases
+# where, Google Chrome is also installed (it bundles Widevine at the
+# linked location) and the components system in the browser
+# (vivaldi://components) is non-functional.
+
+ln -s ../google/chrome/WidevineCdm $PKG/opt/vivaldi/WidevineCdm
 
 for res in 16 22 24 32 48 64 128 256; do
    install -Dm644 "$PKG/opt/vivaldi/product_logo_${res}.png" \
@@ -89,16 +94,15 @@ sed \
   > $PKG/usr/share/applications/vivaldi.desktop
 rm $PKG/usr/share/applications/vivaldi-stable.desktop
 
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-gzip -dc $PKG/usr/share/doc/vivaldi-stable/changelog.gz > \
-  $PKG/usr/doc/$PRGNAM-$VERSION/ChangeLog
-rm -rf $PKG/usr/share/doc
-cat $CWD/README > $PKG/usr/doc/$PRGNAM-$VERSION/README
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+for doc in README README.SBo $PRGNAM.SlackBuild; do
+  install -Dm644 $CWD/$doc $PKG/usr/doc/$PRGNAM-$VERSION/$doc
+done
+lynx -dump file://$CWD/${VERSION}.html > $PKG/usr/doc/$PRGNAM-$VERSION/ChangeLog
 
 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:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/network/vivaldi/vivaldi.info b/network/vivaldi/vivaldi.info
index 9de7f6d001..2dddcfae85 100644
--- a/network/vivaldi/vivaldi.info
+++ b/network/vivaldi/vivaldi.info
@@ -1,14 +1,12 @@
 PRGNAM="vivaldi"
-VERSION="2.6.1566.51"
+VERSION="6.6.3271.61"
 HOMEPAGE="https://vivaldi.com"
-DOWNLOAD="https://downloads.vivaldi.com/stable/vivaldi-stable_2.6.1566.51-1_i386.deb \
-          https://dl.google.com/widevine-cdm/4.10.1440.18-linux-ia32.zip"
-MD5SUM="17ea040a70deee7d683f48ea6381ca59 \
-        c151f6314712678ac81b6298bc36c997"
-DOWNLOAD_x86_64="https://downloads.vivaldi.com/stable/vivaldi-stable_2.6.1566.51-1_amd64.deb \
-                 https://dl.google.com/widevine-cdm/4.10.1440.18-linux-x64.zip"
-MD5SUM_x86_64="66479720d69ae457b89195a9eded1686 \
-               fc6cf66cdff7c57d367b317505f086d1"
+DOWNLOAD="UNSUPPORTED"
+MD5SUM=""
+DOWNLOAD_x86_64="https://downloads.vivaldi.com/stable/vivaldi-stable_6.6.3271.61-1_amd64.deb \
+                 https://update.vivaldi.com/update/1.0/relnotes/6.6.3271.61.html"
+MD5SUM_x86_64="8f5399008b3ce407841768b2e88d84cf \
+               5dcbd276bf780eb1106b8ac254e2a223"
 REQUIRES=""
-MAINTAINER="Alexander Verbovetsky"
-EMAIL="alik@ejik.org"
+MAINTAINER="Ruari Oedegaard"
+EMAIL="sbo@ruari.com"
diff --git a/network/vmware-horizon-client/README b/network/vmware-horizon-client/README
index 87bcbbceb5..5548d422ea 100644
--- a/network/vmware-horizon-client/README
+++ b/network/vmware-horizon-client/README
@@ -1,18 +1,21 @@
-The VMware Horizon Client for Linux, allowing you to use your Slackware box as a
-thin client and lets you connect to your company's Virtual Desktop
-Infrastructure using the proprietary VMware View 6 PCoIP protocol.
+The VMware Horizon Client for Linux, allowing you to use your
+Slackware box as a thin client and lets you connect to your company's
+Virtual Desktop Infrastructure using the proprietary VMware View 6
+PCoIP protocol.
 
-*ATTENTION*: This build script installs binary, proprietary software. Only use
-it if you need the proprietary parts and you are ok with installing and using
-proprietary software. By installing this SlackBuild you agree to the EULA you'll
-find installed in /usr/doc/vmware-horizon-client-4.3.0/. If you do not agree,
-uninstall the package.
+*ATTENTION*: This build script installs binary, proprietary
+software. Only use it if you need the proprietary parts and you are
+OK with installing and using proprietary software. By installing
+this SlackBuild you agree to the EULA you'll find installed in
+/usr/doc/vmware-horizon-client-4.3.0/. If you do not agree, uninstall
+the package.
 
-This SlackBuild installs multiple components. At the moment only the PCoIP and
-the Smart Card component seem to work. USB redirection and Virtual Printing
-won't work. 
+This SlackBuild installs multiple components. At the moment only the
+PCoIP and the Smart Card component seem to work. USB redirection and
+Virtual Printing won't work.
 
-To deactivate one of the working components, use the installation options
+To deactivate one of the working components, use the installation
+options
 
 PCOIP="NO"
 
@@ -20,9 +23,9 @@ and
 
 SMARTCRD="NO"
 
-You could try to activate USB support by setting USB="YES". But there will be a
-problem with libcrypto. If you find a fix, please email me.
+You could try to activate USB support by setting USB="YES". But there
+will be a problem with libcrypto. If you find a fix, please email me.
 
-This application is a 32bit application. It won't work on a Slackware64 system
-without multilib capability. But it has been tested and works with a multilib
-setup.
+This application is a 32bit application. It won't work on a
+Slackware64 system without multilib capability. But it has been tested
+and works with a multilib setup.
diff --git a/network/vmware-horizon-client/vmware-horizon-client.SlackBuild b/network/vmware-horizon-client/vmware-horizon-client.SlackBuild
index 15f2e2a220..d8c70d3605 100644
--- a/network/vmware-horizon-client/vmware-horizon-client.SlackBuild
+++ b/network/vmware-horizon-client/vmware-horizon-client.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for vmware-horizon-client
 
@@ -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=vmware-horizon-client
 VERSION=${VERSION:-3.4.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
-ARCH=i486
+PKGTYPE=${PKGTYPE:-tgz}
+ARCH=i586
 _BUILD=2769709
 
 # Install PCOIP component
@@ -43,7 +46,14 @@ RTAV=${RTAV:-YES}
 echo $PCOIP
 break
 
-CWD=$(pwd)
+# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
+# the name of the created package would be, and then exit. This information
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -157,4 +167,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/network/vnstat/README b/network/vnstat/README
index 8d2164349a..73cbc51c7a 100644
--- a/network/vnstat/README
+++ b/network/vnstat/README
@@ -8,25 +8,5 @@ so vnStat can be used without root permissions.
 This program is open source (GPL) and can be installed in 'single' and 
 'root' mode. 
 
-Note that you can run vnstat either from cron or as a daemon from /etc/rc.d.
-
-To run vnstat from cron, add the following line to your crontab:
-  0-55/5 * * * * if [[ -x /usr/bin/vnstat && $(ls /var/lib/vnstat/ | wc -l) -ge 1 ]]; then /usr/bin/vnstat -u; fi
-
-To run vnstat from /etc/rc.d:
-  chmod +x /etc/rc.d/rc.vnstat
-  
-Note that to have vnstat start automatically this way it should be called from
-rc.local (and optionally rc.local_shutdown) like so:
-
-  In rc.local:
-  # Start vnstat
-  if [ -x /etc/rc.d/rc.vnstat ]; then
-    /etc/rc.d/rc.vnstat start
-  fi
-
-  In rc.local_shutdown:
-  # Stop vnstat
-  if [ -x /etc/rc.d/rc.vnstat ]; then
-    /etc/rc.d/rc.vnstat stop
-  fi
+Note that you can run vnstat either from cron or as a daemon from
+/etc/rc.d. See README.SBo for post-install configuration.
diff --git a/network/vnstat/README.SBo b/network/vnstat/README.SBo
new file mode 100644
index 0000000000..31fc8fdf3d
--- /dev/null
+++ b/network/vnstat/README.SBo
@@ -0,0 +1,21 @@
+To run vnstat from cron, add the following line to your crontab:
+
+  0-55/5 * * * * if [[ -x /usr/bin/vnstat && $(ls /var/lib/vnstat/ | wc -l) -ge 1 ]]; then /usr/bin/vnstat -u; fi
+
+To run vnstat from /etc/rc.d:
+  chmod +x /etc/rc.d/rc.vnstat
+
+Note that to have vnstat start automatically this way it should be
+called from rc.local (and optionally rc.local_shutdown) like so:
+
+  In rc.local:
+  # Start vnstat
+  if [ -x /etc/rc.d/rc.vnstat ]; then
+    /etc/rc.d/rc.vnstat start
+  fi
+
+  In rc.local_shutdown:
+  # Stop vnstat
+  if [ -x /etc/rc.d/rc.vnstat ]; then
+    /etc/rc.d/rc.vnstat stop
+  fi
diff --git a/network/vnstat/vnstat.SlackBuild b/network/vnstat/vnstat.SlackBuild
index a721caa12c..829a53c1ca 100644
--- a/network/vnstat/vnstat.SlackBuild
+++ b/network/vnstat/vnstat.SlackBuild
@@ -1,9 +1,9 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for vnstat
 
 # Copyright 2017-2019  Michiel van Wessem, Manchester, United Kingdom.
-# Copyright 2019 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
+# Copyright 2019-2024 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=vnstat
-VERSION=${VERSION:-2.3}
+VERSION=${VERSION:-2.12}
 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}
@@ -108,4 +115,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/network/vnstat/vnstat.info b/network/vnstat/vnstat.info
index 9190a67f26..09eb1780d8 100644
--- a/network/vnstat/vnstat.info
+++ b/network/vnstat/vnstat.info
@@ -1,8 +1,8 @@
 PRGNAM="vnstat"
-VERSION="2.3"
+VERSION="2.12"
 HOMEPAGE="https://humdi.net/vnstat/"
-DOWNLOAD="https://humdi.net/vnstat/vnstat-2.3.tar.gz"
-MD5SUM="8b2d961d53784af85478d587a40acfe4"
+DOWNLOAD="https://humdi.net/vnstat/vnstat-2.12.tar.gz"
+MD5SUM="98bab6e04f123cfd9f605c579bce8ae7"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/network/vpnc/vpnc.SlackBuild b/network/vpnc/vpnc.SlackBuild
index e99eeb10dc..52f8b6d5bb 100644
--- a/network/vpnc/vpnc.SlackBuild
+++ b/network/vpnc/vpnc.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for vpnc
 
@@ -34,26 +34,36 @@
 # Modified by the SlackBuilds.org Project.
 # sources are from http://svn.unix-ag.uni-kl.de/vpnc/branches/vpnc-nortel
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=vpnc
 VERSION=${VERSION:-r550}
 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"
@@ -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/network/vpnc/vpnc.info b/network/vpnc/vpnc.info
index 553dbfc0f5..e524643206 100644
--- a/network/vpnc/vpnc.info
+++ b/network/vpnc/vpnc.info
@@ -6,5 +6,5 @@ MD5SUM="53f94e10df6b192c3ab1cdf4735fef45"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="alkos333"
-EMAIL="me@alkos333.net"
+MAINTAINER="Robby Workman"
+EMAIL="rworkman@slackbuilds.org"
diff --git a/network/vrrpd/README b/network/vrrpd/README
index 9dbf7a280e..d0ce0adc19 100644
--- a/network/vrrpd/README
+++ b/network/vrrpd/README
@@ -1,34 +1,35 @@
-VRRP daemon (vrrpd) is an RFC 2338 compliant implementation of the 
-Virtual Router Redundancy Protocol (VRRP). The Virtual Router Redundancy
-Protocol is designed to eliminate the single point of failure associated
-with statically routed networks by automatically providing failover using
-multiple LAN paths through alternate routers.
+VRRP daemon (vrrpd) is an RFC 2338 compliant implementation of
+the Virtual Router Redundancy Protocol (VRRP). The Virtual Router
+Redundancy Protocol is designed to eliminate the single point of
+failure associated with statically routed networks by automatically
+providing failover using multiple LAN paths through alternate routers.
 
-As specified in RFC 2338, VRRP uses an election protocol that dynamically
-assigns responsibility for a virtual router to one of the VRRP routers on
-a LAN. When a VRRP router controls the IP address(es) associated with a
-virtual router, it is called the Master. The Master continues to forward
-packets sent to these IP addresses until it has a problem that causes the
-VRRP routers to hold an election. The election process provides dynamic
-failover by electing a new Master should the existing Master become
-unavailable.
+As specified in RFC 2338, VRRP uses an election protocol that
+dynamically assigns responsibility for a virtual router to one of the
+VRRP routers on a LAN. When a VRRP router controls the IP address(es)
+associated with a virtual router, it is called the Master. The Master
+continues to forward packets sent to these IP addresses until it has a
+problem that causes the VRRP routers to hold an election. The election
+process provides dynamic failover by electing a new Master should the
+existing Master become unavailable.
 
-The virtual router associated with each alternate path under VRRP uses the
-same IP address and MAC address as the routers for other paths. As a result,
-the host's gateway information does not change, no matter what path is used.
-Because of this design, VRRP-based redundancy significantly reduces
-administrative overhead when compared to redundancy schemes that require
-hosts to be configured with multiple default gateways.
+The virtual router associated with each alternate path under VRRP uses
+the same IP address and MAC address as the routers for other paths. As
+a result, the host's gateway information does not change, no matter
+what path is used.  Because of this design, VRRP-based redundancy
+significantly reduces administrative overhead when compared to
+redundancy schemes that require hosts to be configured with multiple
+default gateways.
 
-The primary function of the Virtual Router Redundancy Protocol is to provide
-routing redundancy for specific IP addresses. In addition to this primary
-function, RFC 2338 also states that the protocol should:
+The primary function of the Virtual Router Redundancy Protocol is to
+provide routing redundancy for specific IP addresses. In addition to
+this primary function, RFC 2338 also states that the protocol should:
 
  * Minimize the duration of black holes.
- * Minimize the steady state bandwidth overhead and processing complexity.
- * Function over a variety of multiaccess LAN technologies that support IP
-    traffic.
- * Provide for election of multiple virtual routers on a network for load
-    balancing.
+ * Minimize the steady state bandwidth overhead and processing
+   complexity.
+ * Function over a variety of multiaccess LAN technologies that support
+   IP traffic.
+ * Provide for election of multiple virtual routers on a network for
+   load balancing.
  * Support multiple logical IP subnets on a single LAN segment. 
-
diff --git a/network/vrrpd/vrrpd.SlackBuild b/network/vrrpd/vrrpd.SlackBuild
index e64cade1af..d0a05408fb 100644
--- a/network/vrrpd/vrrpd.SlackBuild
+++ b/network/vrrpd/vrrpd.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for vrrpd
 
@@ -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=vrrpd
 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"
@@ -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/network/vuze/vuze.SlackBuild b/network/vuze/vuze.SlackBuild
index d7fca4f6b4..05cecc6abc 100644
--- a/network/vuze/vuze.SlackBuild
+++ b/network/vuze/vuze.SlackBuild
@@ -1,21 +1,31 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for Azureus/Vuze
 # Written by Chris Lawrence <selivanow@gmail.com>
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=vuze
 VERSION=${VERSION:-4604}
 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 ;;
        *) 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}
@@ -26,7 +36,7 @@ if [ "$ARCH" = "x86_64" ]; then
   LIBDIRSUFFIX="64"
   ARCHIVE=Vuze_${VERSION}_linux-$ARCH.tar.bz2
 else
-  ARCH=i486
+  ARCH=i586
   LIBDIRSUFFIX=""
   ARCHIVE=Vuze_${VERSION}_linux.tar.bz2
 fi
@@ -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/network/vuze/vuze.info b/network/vuze/vuze.info
index 6b9b9b712d..93f97ef96f 100644
--- a/network/vuze/vuze.info
+++ b/network/vuze/vuze.info
@@ -5,6 +5,6 @@ DOWNLOAD="http://downloads.sourceforge.net/project/azureus/vuze/Vuze_4604/Vuze_4
 MD5SUM="a771446146ddb5c13132858d36ff22cc"
 DOWNLOAD_x86_64="http://downloads.sourceforge.net/project/azureus/vuze/Vuze_4604/Vuze_4604_linux-x86_64.tar.bz2"
 MD5SUM_x86_64="6797e922a255a80ff435f98b2b87a3a6"
-REQUIRES="jdk xulrunner"
+REQUIRES="zulu-openjdk8"
 MAINTAINER="Chris Lawrence"
 EMAIL="selivanow@gmail.com"
diff --git a/network/w3af/README b/network/w3af/README
index 24143b24cc..6c29bc35b0 100644
--- a/network/w3af/README
+++ b/network/w3af/README
@@ -1,5 +1,5 @@
-w3af is a Web Application Attack and Audit Framework. The project's goal is
-to create a framework to find and exploit web application vulnerabilities
-that is easy to use and extend.
+w3af is a Web Application Attack and Audit Framework. The project's
+goal is to create a framework to find and exploit web application
+vulnerabilities that is easy to use and extend.
 
 Take a look at README.SLACKWARE for additional information.
diff --git a/network/w3af/w3af.SlackBuild b/network/w3af/w3af.SlackBuild
index 8385a5a80b..2d825037e2 100644
--- a/network/w3af/w3af.SlackBuild
+++ b/network/w3af/w3af.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for w3af.
 
@@ -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=w3af
 VERSION=${VERSION:-1.0}
 ARCH=noarch
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 SRCVERSION="1.0-stable"
 
-CWD=$(pwd)
+# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
+# the name of the created package would be, and then exit. This information
+# could be useful to other scripts.
+if [ ! -z "${PRINT_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/network/w3af/w3af.info b/network/w3af/w3af.info
index 0ff05405b3..48f2ac0d7f 100644
--- a/network/w3af/w3af.info
+++ b/network/w3af/w3af.info
@@ -5,6 +5,6 @@ DOWNLOAD="http://downloads.sourceforge.net/project/w3af/w3af/w3af%201.0-stable/w
 MD5SUM="4ac1fb2cfcbbefb8c0caa813dd822723"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="SOAPpy graphviz lxml nltk pyOpenSSL pygtksourceview pysvn scapy"
+REQUIRES="SOAPpy graphviz python2-lxml python3-nltk pyOpenSSL pygtksourceview pysvn scapy"
 MAINTAINER="Marco Bonetti"
 EMAIL="sid77@slackware.it"
diff --git a/network/w3m/README b/network/w3m/README
index 3230f813a3..9246f5d791 100644
--- a/network/w3m/README
+++ b/network/w3m/README
@@ -1,29 +1,23 @@
 w3m is a World Wide Web (WWW) text based client.
 
-Help is avaliable in English, German and Japanese.  There is
-an option menu which can be configured for the chosen
-lanugage.
-
-It will display hypertext markup language (HTML) documents
-containing links to files residing on the local system, as
-well as files residing on remote systems. It can display
-HTML tables, frames, and images, and supports tabbed
-browsing. In addition, it can be used as a "pager" in much
-the same manner as "more" or "less".  w3m can display images
-in both the framebuffer, in supported terminals, and the X
-server.
-
-Supported consoles for image display are st, urxvt
-(rxvt-unicode) and termite (via a patch), including inside
-screen (untested with tmux).
+Help is avaliable in English, German and Japanese.  There is an option
+menu which can be configured for the chosen lanugage.
 
-Optional dependency: compface
+It will display hypertext markup language (HTML) documents containing
+links to files residing on the local system, as well as files residing
+on remote systems. It can display HTML tables, frames, and images, and
+supports tabbed browsing. In addition, it can be used as a "pager" in
+much the same manner as "more" or "less".  w3m can display images in
+both the framebuffer, in supported terminals, and the X server.
 
-(Compface converts 48x48x1 images to and from a compressed
-format.  The purpose is to allow the inclusion of face
-images within mail headers using the field name 'X-face:'.)
+Supported consoles for image display are st, urxvt (rxvt-unicode) and
+termite (via a patch), including inside screen (untested with tmux).
 
+Optional dependency: compface
 
+(Compface converts 48x48x1 images to and from a compressed format.  The
+purpose is to allow the inclusion of face images within mail headers
+using the field name 'X-face:'.)
 
 SlackBuild Options:
 
@@ -32,14 +26,13 @@ NOMAILER=1                         disable w3mmailer
 GUIBROWSER=/path/to/browser        set the GUI browser
 EDITOR=/path/to/editor             set external editor
 
-EG:
+E.G.:
 
 NOMOUSE=1 ./w3m.SlackBuild
 NOMAILER=1 ./w3m.SlackBuild
 GUIBROWSER=/usr/bin/qutebrowser ./w3m.SlackBuild
 
-Or combine any of them together.  By default GUIBROWSER
-is set to /usr/bin/firefox.  EDITOR will be picked up from
-the environment if set.
+Or combine any of them together.  By default GUIBROWSER is set to
+/usr/bin/firefox.  EDITOR will be picked up from the environment if set.
 
 These are also settable via the options menu.
diff --git a/network/w3m/doinst.sh b/network/w3m/doinst.sh
deleted file mode 100644
index 17f9dccd7e..0000000000
--- a/network/w3m/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/w3m/config.new
-config etc/w3m/mailcap.new
diff --git a/network/w3m/patches/w3m-0.5.2-gc72.patch b/network/w3m/patches/w3m-0.5.2-gc72.patch
deleted file mode 100644
index f2df44f06b..0000000000
--- a/network/w3m/patches/w3m-0.5.2-gc72.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff -Naurb w3m-0.5.2.orig/main.c w3m-0.5.2/main.c
---- w3m-0.5.2.orig/main.c	2007-05-31 10:19:50.000000000 +0900
-+++ w3m-0.5.2/main.c	2009-11-09 08:20:02.184953443 +0900
-@@ -312,7 +312,11 @@
- 	    lock = 0;
- 	}
-     }
-+#if GC_VERSION_MAJOR >= 7 && GC_VERSION_MINOR >= 2
-+    else if (orig_GC_warn_proc = GC_get_warn_proc())
-+#else
-     else if (orig_GC_warn_proc)
-+#endif
- 	orig_GC_warn_proc(msg, arg);
-     else
- 	fprintf(stderr, msg, (unsigned long)arg);
-@@ -842,7 +846,11 @@
-     mySignal(SIGPIPE, SigPipe);
- #endif
- 
-+#if GC_VERSION_MAJOR >= 7 && GC_VERSION_MINOR >= 2
-+    GC_set_warn_proc(wrap_GC_warn_proc);
-+#else
-     orig_GC_warn_proc = GC_set_warn_proc(wrap_GC_warn_proc);
-+#endif
-     err_msg = Strnew();
-     if (load_argc == 0) {
- 	/* no URL specified */
diff --git a/network/w3m/patches/w3m-0.5.3-button.patch b/network/w3m/patches/w3m-0.5.3-button.patch
deleted file mode 100644
index a645e25637..0000000000
--- a/network/w3m/patches/w3m-0.5.3-button.patch
+++ /dev/null
@@ -1,439 +0,0 @@
-Description: Support the button element as defined in HTML 4.01
-Origin: upstream, http://www.sic.med.tohoku.ac.jp/~satodai/w3m-dev/201009.month/4411.html
-Bug-Debian: http://bugs.debian.org/136810
-
-Index: file.c
-===================================================================
-RCS file: /cvsroot/w3m/w3m/file.c,v
-retrieving revision 1.264
-diff -u -r1.264 file.c
---- w3m.orig/file.c	3 Aug 2010 10:02:16 -0000	1.264
-+++ w3m/file.c	17 Sep 2010 12:18:55 -0000
-@@ -2467,6 +2467,7 @@
-     bcopy((void *)&obuf->anchor, (void *)&obuf->bp.anchor,
- 	  sizeof(obuf->anchor));
-     obuf->bp.img_alt = obuf->img_alt;
-+    obuf->bp.input_alt = obuf->input_alt;
-     obuf->bp.in_bold = obuf->in_bold;
-     obuf->bp.in_italic = obuf->in_italic;
-     obuf->bp.in_under = obuf->in_under;
-@@ -2484,6 +2485,7 @@
-     bcopy((void *)&obuf->bp.anchor, (void *)&obuf->anchor,
- 	  sizeof(obuf->anchor));
-     obuf->img_alt = obuf->bp.img_alt;
-+    obuf->input_alt = obuf->bp.input_alt;
-     obuf->in_bold = obuf->bp.in_bold;
-     obuf->in_italic = obuf->bp.in_italic;
-     obuf->in_under = obuf->bp.in_under;
-@@ -2727,7 +2729,7 @@
-     Str line = obuf->line, pass = NULL;
-     char *hidden_anchor = NULL, *hidden_img = NULL, *hidden_bold = NULL,
- 	*hidden_under = NULL, *hidden_italic = NULL, *hidden_strike = NULL,
--	*hidden_ins = NULL, *hidden = NULL;
-+	*hidden_ins = NULL, *hidden_input, *hidden = NULL;
- 
- #ifdef DEBUG
-     if (w3m_debug) {
-@@ -2759,6 +2761,12 @@
- 		hidden = hidden_img;
- 	}
-     }
-+    if (obuf->input_alt.in) {
-+	if ((hidden_input = has_hidden_link(obuf, HTML_INPUT_ALT)) != NULL) {
-+	    if (!hidden || hidden_input < hidden)
-+		hidden = hidden_input;
-+	}
-+    }
-     if (obuf->in_bold) {
- 	if ((hidden_bold = has_hidden_link(obuf, HTML_B)) != NULL) {
- 	    if (!hidden || hidden_bold < hidden)
-@@ -2810,6 +2818,8 @@
- 	Strcat_charp(line, "</a>");
-     if (obuf->img_alt && !hidden_img)
- 	Strcat_charp(line, "</img_alt>");
-+    if (obuf->input_alt.in && !hidden_input)
-+	Strcat_charp(line, "</input_alt>");
-     if (obuf->in_bold && !hidden_bold)
- 	Strcat_charp(line, "</b>");
-     if (obuf->in_italic && !hidden_italic)
-@@ -3020,6 +3030,18 @@
- 	Strcat_charp(tmp, "\">");
- 	push_tag(obuf, tmp->ptr, HTML_IMG_ALT);
-     }
-+    if (!hidden_input && obuf->input_alt.in) {
-+	Str tmp;
-+	if (obuf->input_alt.hseq > 0)
-+	    obuf->input_alt.hseq = - obuf->input_alt.hseq;
-+	tmp = Sprintf("<INPUT_ALT hseq=\"%d\" fid=\"%d\" name=\"%s\" type=\"%s\" value=\"%s\">",
-+		     obuf->input_alt.hseq,
-+		     obuf->input_alt.fid,
-+		     obuf->input_alt.name->ptr,
-+		     obuf->input_alt.type->ptr,
-+		     obuf->input_alt.value->ptr);
-+	push_tag(obuf, tmp->ptr, HTML_INPUT_ALT);
-+    }
-     if (!hidden_bold && obuf->in_bold)
- 	push_tag(obuf, "<B>", HTML_B);
-     if (!hidden_italic && obuf->in_italic)
-@@ -3730,6 +3752,63 @@
- }
- 
- Str
-+process_button(struct parsed_tag *tag)
-+{
-+    Str tmp = NULL;
-+    char *p, *q, *r, *qq = NULL;
-+    int qlen, v;
-+
-+    if (cur_form_id < 0) {
-+       char *s = "<form_int method=internal action=none>";
-+       tmp = process_form(parse_tag(&s, TRUE));
-+    }
-+    if (tmp == NULL)
-+       tmp = Strnew();
-+
-+    p = "submit";
-+    parsedtag_get_value(tag, ATTR_TYPE, &p);
-+    q = NULL;
-+    parsedtag_get_value(tag, ATTR_VALUE, &q);
-+    r = "";
-+    parsedtag_get_value(tag, ATTR_NAME, &r);
-+
-+    v = formtype(p);
-+    if (v == FORM_UNKNOWN)
-+       return NULL;
-+
-+    if (!q) {
-+       switch (v) {
-+       case FORM_INPUT_SUBMIT:
-+       case FORM_INPUT_BUTTON:
-+           q = "SUBMIT";
-+           break;
-+       case FORM_INPUT_RESET:
-+           q = "RESET";
-+           break;
-+       }
-+    }
-+    if (q) {
-+       qq = html_quote(q);
-+       qlen = strlen(q);
-+    }
-+
-+    //    Strcat_charp(tmp, "<pre_int>");
-+    Strcat(tmp, Sprintf("<input_alt hseq=\"%d\" fid=\"%d\" type=%s "
-+                       "name=\"%s\" value=\"%s\">",
-+                       cur_hseq++, cur_form_id, p, html_quote(r), qq));
-+    return tmp;
-+}
-+
-+Str
-+process_n_button(void)
-+{
-+    Str tmp = Strnew();
-+    Strcat_charp(tmp, "</input_alt>");
-+    //    Strcat_charp(tmp, "</pre_int>");
-+    return tmp;
-+}
-+
-+Str
- process_select(struct parsed_tag *tag)
- {
-     Str tmp = NULL;
-@@ -4859,7 +4938,35 @@
- 	    if (i > obuf->bottom_margin)
- 		obuf->bottom_margin = i;
- 	}
-+	if (parsedtag_get_value(tag, ATTR_HSEQ, &hseq)) {
-+	    obuf->input_alt.hseq = hseq;
-+	}
-+	if (parsedtag_get_value(tag, ATTR_FID, &i)) {
-+	    obuf->input_alt.fid = i;
-+	}
-+	if (parsedtag_get_value(tag, ATTR_TYPE, &p)) {
-+	    obuf->input_alt.type = Strnew_charp(p);
-+	}
-+	if (parsedtag_get_value(tag, ATTR_VALUE, &p)) {
-+	    obuf->input_alt.value = Strnew_charp(p);
-+	}
-+	if (parsedtag_get_value(tag, ATTR_NAME, &p)) {
-+	    obuf->input_alt.name = Strnew_charp(p);
-+	}
-+	obuf->input_alt.in = 1;
- 	return 0;
-+    case HTML_N_INPUT_ALT:
-+	if (obuf->input_alt.in) {
-+	    if (!close_effect0(obuf, HTML_INPUT_ALT))
-+		push_tag(obuf, "</input_alt>", HTML_N_INPUT_ALT);
-+	    obuf->input_alt.hseq = 0;
-+	    obuf->input_alt.fid = -1;
-+	    obuf->input_alt.in = 0;
-+	    obuf->input_alt.type = NULL;
-+	    obuf->input_alt.name = NULL;
-+	    obuf->input_alt.value = NULL;
-+	}
-+	return 1;
-     case HTML_TABLE:
- 	close_anchor(h_env, obuf);
- 	obuf->table_level++;
-@@ -4968,6 +5075,16 @@
-     case HTML_INPUT:
- 	close_anchor(h_env, obuf);
- 	tmp = process_input(tag);
-+       if (tmp)
-+           HTMLlineproc1(tmp->ptr, h_env);
-+       return 1;
-+    case HTML_BUTTON:
-+       tmp = process_button(tag);
-+       if (tmp)
-+           HTMLlineproc1(tmp->ptr, h_env);
-+       return 1;
-+    case HTML_N_BUTTON:
-+       tmp = process_n_button();
- 	if (tmp)
- 	    HTMLlineproc1(tmp->ptr, h_env);
- 	return 1;
-@@ -5680,6 +5797,21 @@
- 				putHmarker(buf->hmarklist, currentLn(buf),
- 					   hpos, hseq - 1);
- 			}
-+			else if (hseq < 0) {
-+			    int h = -hseq - 1;
-+			    int hpos = pos;
-+			    if (*str == '[')
-+				hpos++;
-+			    if (buf->hmarklist &&
-+				h < buf->hmarklist->nmark &&
-+				buf->hmarklist->marks[h].invalid) {
-+				buf->hmarklist->marks[h].pos = hpos;
-+				buf->hmarklist->marks[h].line = currentLn(buf);
-+				buf->hmarklist->marks[h].invalid = 0;
-+				hseq = -hseq;
-+			    }
-+			}
-+
- 			if (!form->target)
- 			    form->target = buf->baseTarget;
- 			if (a_textarea &&
-@@ -6747,6 +6879,12 @@
-     obuf->nobr_level = 0;
-     bzero((void *)&obuf->anchor, sizeof(obuf->anchor));
-     obuf->img_alt = 0;
-+    obuf->input_alt.hseq = 0;
-+    obuf->input_alt.fid = -1;
-+    obuf->input_alt.in = 0;
-+    obuf->input_alt.type = NULL;
-+    obuf->input_alt.name = NULL;
-+    obuf->input_alt.value = NULL;
-     obuf->in_bold = 0;
-     obuf->in_italic = 0;
-     obuf->in_under = 0;
-@@ -6782,6 +6920,15 @@
- 	push_tag(obuf, "</img_alt>", HTML_N_IMG_ALT);
- 	obuf->img_alt = NULL;
-     }
-+    if (obuf->input_alt.in) {
-+	push_tag(obuf, "</input_alt>", HTML_N_INPUT_ALT);
-+	obuf->input_alt.hseq = 0;
-+	obuf->input_alt.fid = -1;
-+	obuf->input_alt.in = 0;
-+	obuf->input_alt.type = NULL;
-+	obuf->input_alt.name = NULL;
-+	obuf->input_alt.value = NULL;
-+    }
-     if (obuf->in_bold) {
- 	push_tag(obuf, "</b>", HTML_N_B);
- 	obuf->in_bold = 0;
-Index: fm.h
-===================================================================
-RCS file: /cvsroot/w3m/w3m/fm.h,v
-retrieving revision 1.149
-diff -u -r1.149 fm.h
---- w3m.orig/fm.h	20 Aug 2010 09:47:09 -0000	1.149
-+++ w3m/fm.h	17 Sep 2010 12:18:55 -0000
-@@ -562,6 +562,13 @@
- #define INIT_BUFFER_WIDTH ((_INIT_BUFFER_WIDTH > 0) ? _INIT_BUFFER_WIDTH : 0)
- #define FOLD_BUFFER_WIDTH (FoldLine ? (INIT_BUFFER_WIDTH + 1) : -1)
- 
-+struct input_alt_attr {
-+  int hseq;
-+  int fid;
-+  int in;
-+  Str type, name, value;
-+};
-+
- typedef struct {
-     int pos;
-     int len;
-@@ -569,6 +576,7 @@
-     long flag;
-     Anchor anchor;
-     Str img_alt;
-+    struct input_alt_attr input_alt;
-     char fontstat[FONTSTAT_SIZE];
-     short nobr_level;
-     Lineprop prev_ctype;
-@@ -591,6 +599,7 @@
-     short nobr_level;
-     Anchor anchor;
-     Str img_alt;
-+    struct input_alt_attr input_alt;
-     char fontstat[FONTSTAT_SIZE];
-     char fontstat_stack[FONT_STACK_SIZE][FONTSTAT_SIZE];
-     int fontstat_sp;
-Index: html.c
-===================================================================
-RCS file: /cvsroot/w3m/w3m/html.c,v
-retrieving revision 1.32
-diff -u -r1.32 html.c
---- w3m.orig/html.c	14 Aug 2010 01:29:40 -0000	1.32
-+++ w3m/html.c	17 Sep 2010 12:18:55 -0000
-@@ -56,6 +56,9 @@
-     ATTR_CORE
- };
- #define MAXA_INPUT      MAXA_CORE + 12
-+unsigned char ALST_BUTTON[] =
-+    { ATTR_TYPE, ATTR_VALUE, ATTR_NAME, ATTR_CORE };
-+#define MAXA_BUTTON	MAXA_CORE + 3
- unsigned char ALST_TEXTAREA[] =
-     { ATTR_COLS, ATTR_ROWS, ATTR_NAME, ATTR_READONLY, ATTR_CORE };
- #define MAXA_TEXTAREA   MAXA_CORE + 4
-@@ -247,24 +250,24 @@
-     {"/bdo", NULL, 0, TFLG_END},	/* 121 HTML_N_BDO */
-     {"big", ALST_NOP, MAXA_NOP, 0},		/* 122 HTML_BIG */
-     {"/big", NULL, 0, TFLG_END},	/* 123 HTML_N_BIG */
--    {"button", ALST_NOP, MAXA_NOP, 0},		/* 124 HTML_BUTTON */
--    {"fieldset", ALST_NOP, MAXA_NOP, 0},	        /* 125 HTML_FIELDSET */
--    {"/fieldset", NULL, 0, TFLG_END},	/* 126 HTML_N_FIELDSET */
--    {"iframe", ALST_NOP, MAXA_NOP, 0},		/* 127 HTML_IFRAME */
--    {"label", ALST_NOP, MAXA_NOP, 0}, 		/* 128 HTML_LABEL */
--    {"/label", NULL, 0, TFLG_END},	/* 129 HTML_N_LABEL */
--    {"legend", ALST_NOP, MAXA_NOP, 0},		/* 130 HTML_LEGEND */
--    {"/legend", NULL, 0, TFLG_END},	/* 131 HTML_N_LEGEND */
--    {"noscript", ALST_NOP, MAXA_NOP, 0},	        /* 132 HTML_NOSCRIPT */
--    {"/noscript", NULL, 0, TFLG_END},	/* 133 HTML_N_NOSCRIPT */
--    {"object", ALST_NOP, MAXA_NOP, 0},		/* 134 HTML_OBJECT */
--    {"optgroup", ALST_NOP, MAXA_NOP, 0},	        /* 135 HTML_OPTGROUP */
--    {"/optgroup", NULL, 0, TFLG_END},	/* 136 HTML_N_OPTGROUP */
--    {"param", ALST_NOP, MAXA_NOP, 0},		/* 137 HTML_PARAM */
--    {"small", ALST_NOP, MAXA_NOP, 0}, 		/* 138 HTML_SMALL */
--    {"/small", NULL, 0, TFLG_END},	/* 139 HTML_N_SMALL */
-+    {"button", ALST_BUTTON, MAXA_BUTTON, 0},	/* 124 HTML_BUTTON */
-+    {"/button", NULL, 0, TFLG_END},	/* 125 HTML_N_BUTTON */
-+    {"fieldset", ALST_NOP, MAXA_NOP, 0},	/* 126 HTML_FIELDSET */
-+    {"/fieldset", NULL, 0, TFLG_END},	/* 127 HTML_N_FIELDSET */
-+    {"iframe", ALST_NOP, MAXA_NOP, 0},		/* 128 HTML_IFRAME */
-+    {"label", ALST_NOP, MAXA_NOP, 0}, 		/* 129 HTML_LABEL */
-+    {"/label", NULL, 0, TFLG_END},	/* 130 HTML_N_LABEL */
-+    {"legend", ALST_NOP, MAXA_NOP, 0},		/* 131 HTML_LEGEND */
-+    {"/legend", NULL, 0, TFLG_END},	/* 132 HTML_N_LEGEND */
-+    {"noscript", ALST_NOP, MAXA_NOP, 0},	        /* 133 HTML_NOSCRIPT */
-+    {"/noscript", NULL, 0, TFLG_END},	/* 134 HTML_N_NOSCRIPT */
-+    {"object", ALST_NOP, MAXA_NOP, 0},		/* 135 HTML_OBJECT */
-+    {"optgroup", ALST_NOP, MAXA_NOP, 0},	        /* 136 HTML_OPTGROUP */
-+    {"/optgroup", NULL, 0, TFLG_END},	/* 137 HTML_N_OPTGROUP */
-+    {"param", ALST_NOP, MAXA_NOP, 0},		/* 138 HTML_PARAM */
-+    {"small", ALST_NOP, MAXA_NOP, 0}, 		/* 139 HTML_SMALL */
-+    {"/small", NULL, 0, TFLG_END},	/* 140 HTML_N_SMALL */
- 
--    {NULL, NULL, 0, 0},		/* 140 Undefined */
-     {NULL, NULL, 0, 0},		/* 141 Undefined */
-     {NULL, NULL, 0, 0},		/* 142 Undefined */
-     {NULL, NULL, 0, 0},		/* 143 Undefined */
-Index: html.h
-===================================================================
-RCS file: /cvsroot/w3m/w3m/html.h,v
-retrieving revision 1.31
-diff -u -r1.31 html.h
---- w3m.orig/html.h	14 Aug 2010 01:29:40 -0000	1.31
-+++ w3m/html.h	17 Sep 2010 12:18:55 -0000
-@@ -214,21 +214,22 @@
- #define HTML_BIG        122
- #define HTML_N_BIG      123
- #define HTML_BUTTON     124
--#define HTML_FIELDSET   125
--#define HTML_N_FIELDSET 126
--#define HTML_IFRAME     127
--#define HTML_LABEL      128
--#define HTML_N_LABEL    129
--#define HTML_LEGEND     130
--#define HTML_N_LEGEND   131
--#define HTML_NOSCRIPT   132
--#define HTML_N_NOSCRIPT 133
--#define HTML_OBJECT     134
--#define HTML_OPTGROUP   135
--#define HTML_N_OPTGROUP 136
--#define HTML_PARAM      137
--#define HTML_SMALL      138
--#define HTML_N_SMALL    139
-+#define HTML_N_BUTTON   125
-+#define HTML_FIELDSET   126
-+#define HTML_N_FIELDSET 127
-+#define HTML_IFRAME     128
-+#define HTML_LABEL      129
-+#define HTML_N_LABEL    130
-+#define HTML_LEGEND     131
-+#define HTML_N_LEGEND   132
-+#define HTML_NOSCRIPT   133
-+#define HTML_N_NOSCRIPT 134
-+#define HTML_OBJECT     135
-+#define HTML_OPTGROUP   136
-+#define HTML_N_OPTGROUP 137
-+#define HTML_PARAM      138
-+#define HTML_SMALL      139
-+#define HTML_N_SMALL    140
- 
-    /* pseudo tag */
- #define HTML_SELECT_INT     160
-Index: proto.h
-===================================================================
-RCS file: /cvsroot/w3m/w3m/proto.h,v
-retrieving revision 1.104
-diff -u -r1.104 proto.h
---- w3m.orig/proto.h	25 Jul 2010 09:55:05 -0000	1.104
-+++ w3m/proto.h	17 Sep 2010 12:18:55 -0000
-@@ -207,6 +207,8 @@
- extern Str process_img(struct parsed_tag *tag, int width);
- extern Str process_anchor(struct parsed_tag *tag, char *tagbuf);
- extern Str process_input(struct parsed_tag *tag);
-+extern Str process_button(struct parsed_tag *tag);
-+extern Str process_n_button(void);
- extern Str process_select(struct parsed_tag *tag);
- extern Str process_n_select(void);
- extern void feed_select(char *str);
-Index: table.c
-===================================================================
-RCS file: /cvsroot/w3m/w3m/table.c,v
-retrieving revision 1.58
-diff -u -r1.58 table.c
---- w3m.orig/table.c	9 Aug 2010 11:59:19 -0000	1.58
-+++ w3m/table.c	17 Sep 2010 12:18:55 -0000
-@@ -2878,6 +2878,14 @@
- 	tmp = process_input(tag);
- 	feed_table1(tbl, tmp, mode, width);
- 	break;
-+    case HTML_BUTTON:
-+       tmp = process_button(tag);
-+       feed_table1(tbl, tmp, mode, width);
-+       break;
-+    case HTML_N_BUTTON:
-+       tmp = process_n_button();
-+       feed_table1(tbl, tmp, mode, width);
-+       break;
-     case HTML_SELECT:
- 	tmp = process_select(tag);
- 	if (tmp)
-Index: tagtable.tab
-===================================================================
-RCS file: /cvsroot/w3m/w3m/tagtable.tab,v
-retrieving revision 1.14
-diff -u -r1.14 tagtable.tab
---- w3m.orig/tagtable.tab	14 Aug 2010 01:29:40 -0000	1.14
-+++ w3m/tagtable.tab	17 Sep 2010 12:18:55 -0000
-@@ -176,6 +176,7 @@
- big		HTML_BIG
- /big		HTML_N_BIG
- button		HTML_BUTTON
-+/button		HTML_N_BUTTON
- fieldset	HTML_FIELDSET
- /fieldset	HTML_N_FIELDSET
- iframe		HTML_IFRAME
diff --git a/network/w3m/patches/w3m-0.5.3-gdk-pixbuf.patch b/network/w3m/patches/w3m-0.5.3-gdk-pixbuf.patch
deleted file mode 100644
index d41a699633..0000000000
--- a/network/w3m/patches/w3m-0.5.3-gdk-pixbuf.patch
+++ /dev/null
@@ -1,46 +0,0 @@
---- a/w3mimg/x11/x11_w3mimg.c	2004-11-08 18:14:06.000000000 +0100
-+++ b/w3mimg/x11/x11_w3mimg.c	2012-05-19 06:31:08.908783927 +0200
-@@ -14,7 +14,7 @@
- #elif defined(USE_GDKPIXBUF)
- #if defined(USE_GTK2)
- #include <glib-object.h>
--#include <gdk/gdk.h>
-+#include <gdk-pixbuf/gdk-pixbuf.h>
- #include <gdk-pixbuf-xlib/gdk-pixbuf-xlib.h>
- #else
- #include <gdk-pixbuf/gdk-pixbuf-xlib.h>
---- a/w3mimg/fb/fb_gdkpixbuf.c	2004-11-08 18:14:06.000000000 +0100
-+++ b/w3mimg/fb/fb_gdkpixbuf.c	2012-05-20 05:06:07.744816661 +0200
-@@ -6,7 +6,7 @@
- #include "config.h"
- #if defined(USE_GTK2)
- #include <glib-object.h>
--#include <gdk/gdk.h>
-+#include <gdk-pixbuf/gdk-pixbuf.h>
- #endif
- #include <gdk-pixbuf/gdk-pixbuf.h>
- #include "fb.h"
---- a/acinclude.m4	2011-01-04 10:22:18.000000000 +0100
-+++ b/acinclude.m4	2012-05-20 05:15:36.158981506 +0200
-@@ -705,8 +705,8 @@ AC_DEFUN([AC_W3M_IMAGE],
-      IMGTARGETS="x11"    
-      AC_DEFINE(USE_GDKPIXBUF)
-      AC_DEFINE(USE_GTK2)
--     IMGX11CFLAGS="`${PKG_CONFIG} --cflags gdk-pixbuf-2.0 gdk-pixbuf-xlib-2.0 gtk+-2.0`"
--     IMGX11LDFLAGS="`${PKG_CONFIG} --libs gdk-pixbuf-2.0 gdk-pixbuf-xlib-2.0 gtk+-2.0`"
-+     IMGX11CFLAGS="`${PKG_CONFIG} --cflags gdk-pixbuf-2.0 gdk-pixbuf-xlib-2.0`"
-+     IMGX11LDFLAGS="`${PKG_CONFIG} --libs gdk-pixbuf-2.0 gdk-pixbuf-xlib-2.0`"
-    elif test x"$have_gdkpixbuf" = xyes; then
-      AC_DEFINE(USE_W3MIMG_X11)
-      IMGOBJS="$IMGOBJS x11/x11_w3mimg.o"
-@@ -740,8 +740,8 @@ AC_DEFUN([AC_W3M_IMAGE],
-      IMGTARGETS="${IMGTARGETS} fb"
-      AC_DEFINE(USE_GDKPIXBUF)
-      AC_DEFINE(USE_GTK2)
--     IMGFBCFLAGS="`${PKG_CONFIG} --cflags gdk-pixbuf-2.0 gtk+-2.0`"
--     IMGFBLDFLAGS="`${PKG_CONFIG} --libs gdk-pixbuf-2.0 gtk+-2.0`"
-+     IMGFBCFLAGS="`${PKG_CONFIG} --cflags gdk-pixbuf-2.0`"
-+     IMGFBLDFLAGS="`${PKG_CONFIG} --libs gdk-pixbuf-2.0`"
-    elif test x"$have_gdkpixbuf" = xyes; then
-      AC_DEFINE(USE_W3MIMG_FB)
-      IMGOBJS="$IMGOBJS fb/fb_w3mimg.o fb/fb.o fb/fb_img.o"
diff --git a/network/w3m/patches/w3m-0.5.3-glibc214.patch b/network/w3m/patches/w3m-0.5.3-glibc214.patch
deleted file mode 100644
index 84ab9d7d88..0000000000
--- a/network/w3m/patches/w3m-0.5.3-glibc214.patch
+++ /dev/null
@@ -1,58 +0,0 @@
---- a/istream.c.~1.27.~	2011-01-04 18:22:22.000000000 +0900
-+++ a/istream.c	2011-06-24 08:15:23.522990618 +0900
-@@ -22,8 +22,8 @@
- static void basic_close(int *handle);
- static int basic_read(int *handle, char *buf, int len);
- 
--static void file_close(struct file_handle *handle);
--static int file_read(struct file_handle *handle, char *buf, int len);
-+static void file_close(struct afile_handle *handle);
-+static int file_read(struct afile_handle *handle, char *buf, int len);
- 
- static int str_read(Str handle, char *buf, int len);
- 
-@@ -114,7 +114,7 @@
-     stream = New(union input_stream);
-     init_base_stream(&stream->base, STREAM_BUF_SIZE);
-     stream->file.type = IST_FILE;
--    stream->file.handle = New(struct file_handle);
-+    stream->file.handle = New(struct afile_handle);
-     stream->file.handle->f = f;
-     if (closep)
- 	stream->file.handle->close = closep;
-@@ -658,13 +658,13 @@
- }
- 
- static void
--file_close(struct file_handle *handle)
-+file_close(struct afile_handle *handle)
- {
-     handle->close(handle->f);
- }
- 
- static int
--file_read(struct file_handle *handle, char *buf, int len)
-+file_read(struct afile_handle *handle, char *buf, int len)
- {
-     return fread(buf, 1, len, handle->f);
- }
---- a/istream.h.~1.12.~	2003-10-21 01:41:56.000000000 +0900
-+++ a/istream.h	2011-06-24 08:15:54.392991144 +0900
-@@ -20,7 +20,7 @@
- 
- typedef struct stream_buffer *StreamBuffer;
- 
--struct file_handle {
-+struct afile_handle {
-     FILE *f;
-     void (*close) ();
- };
-@@ -53,7 +53,7 @@
- 
- struct file_stream {
-     struct stream_buffer stream;
--    struct file_handle *handle;
-+    struct afile_handle *handle;
-     char type;
-     char iseos;
-     int (*read) ();
diff --git a/network/w3m/patches/w3m-0.5.3-underlinking.patch b/network/w3m/patches/w3m-0.5.3-underlinking.patch
deleted file mode 100644
index 1b034b46cb..0000000000
--- a/network/w3m/patches/w3m-0.5.3-underlinking.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Description: Explicitly link w3mimgdisplay with -lX11 to build with gcc 4.5
-Author: Martin Pitt <martin.pitt@ubuntu.com>
-Bug: https://sourceforge.net/tracker/?func=detail&aid=3126430&group_id=39518&atid=425441
-
---- w3m-0.5.3.orig/Makefile.in	2011-01-04 18:22:18.000000000 +0900
-+++ w3m-0.5.3/Makefile.in	2011-02-06 12:05:40.000000000 +0900
-@@ -199,7 +199,7 @@
- 	$(CC) $(CFLAGS) -DDUMMY -c -o $@ $?
- 
- $(IMGDISPLAY): w3mimgdisplay.o $(ALIB) w3mimg/w3mimg.a
--	$(IMGLINK) $(CFLAGS) -o $(IMGDISPLAY) w3mimgdisplay.o w3mimg/w3mimg.a $(LDFLAGS) $(LIBS) $(IMGLDFLAGS)
-+	$(IMGLINK) $(CFLAGS) -o $(IMGDISPLAY) w3mimgdisplay.o w3mimg/w3mimg.a $(LDFLAGS) $(LIBS) -lX11 $(IMGLDFLAGS)
- 
- w3mimgdisplay.o: w3mimgdisplay.c w3mimg/w3mimg.h
- 	$(CC) $(CFLAGS) $(IMGCFLAGS) -o $@ -c $(srcdir)/w3mimgdisplay.c
diff --git a/network/w3m/w3m.SlackBuild b/network/w3m/w3m.SlackBuild
index ca8a3dec0e..022239d2ba 100644
--- a/network/w3m/w3m.SlackBuild
+++ b/network/w3m/w3m.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 # Slackware build script for w3m
 
 # Copyright 2011 Grigorios Bouzakis <grbzks@imap.cc>
@@ -19,16 +19,17 @@
 # (INCLUDING NEGLIGENCE OR 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@tty1.uk> (2018)
+# Now maintained by Dave Woodfall <dave@slackbuilds.org> (2018)
 # Much appreciation to the debian maintainers for keeping w3m alive and
 # patched https://packages.debian.org/stretch/w3m
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=w3m
-VERSION=${VERSION:-0.5.3_37}
-PATCHVERSION=${VERSION//_/-}
-SRCVERSION=${SRCVERSION:-0.5.3}
+VERSION=${VERSION:-0.5.3+git20230121}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -38,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}
@@ -62,17 +70,10 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$SRCVERSION
+rm -rf $PRGNAM-$VERSION
 # source
-tar xvf $CWD/${PRGNAM}_${SRCVERSION}.orig.tar.gz
-cd $PRGNAM-$SRCVERSION
-# patches
-tar xvf $CWD/${PRGNAM}_$PATCHVERSION.debian.tar.xz
-
-# patches from debian
-while read patch; do
-  patch -p1 --verbose < debian/patches/$patch
-done < debian/patches/series
+tar xvf $CWD/${PRGNAM}_${VERSION}.orig.tar.xz
+cd $PRGNAM-$VERSION
 
 chown -R root:root .
 find -L . \
@@ -104,7 +105,7 @@ CXXFLAGS="$SLKCFLAGS" \
   --enable-unicode \
   --enable-nls \
   --enable-m17n \
-  --with-imagelib="gtk2 gdk-pixbuf2 imlib2" \
+  --with-imagelib="gtk2 gdk-pixbuf2" \
   --with-termlib="terminfo ncurses" \
   $mouse \
   $mailer \
@@ -124,19 +125,11 @@ find Bonus -type f | while read f; do
 done
 
 mkdir -p $PKG/etc/w3m
-install -m 644 debian/w3mconfig $PKG/etc/w3m/config.new
-install -m 644 debian/mailcap $PKG/etc/w3m/mailcap.new
 
 DOCS="ChangeLog NEWS doc* ABOUT-NLS README TODO"
-DEBDOCS="changelog copyright mailcap w3mconfig"
 
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/debian
 cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION
 
-for doc in $DEBDOCS; do
-  cp -a debian/$doc $PKG/usr/doc/$PRGNAM-$VERSION/debian
-done
-
 mv $PKG/usr/doc/$PRGNAM-$VERSION/examples/Bonus/README \
   $PKG/usr/doc/$PRGNAM-$VERSION/examples/Bonus/README.ja
 
@@ -174,7 +167,6 @@ for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz \
 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/network/w3m/w3m.info b/network/w3m/w3m.info
index d28ff7f97a..bc33b0bb43 100644
--- a/network/w3m/w3m.info
+++ b/network/w3m/w3m.info
@@ -1,12 +1,10 @@
 PRGNAM="w3m"
-VERSION="0.5.3_37"
-HOMEPAGE="http://w3m.sourceforge.net/"
-DOWNLOAD="http://deb.debian.org/debian/pool/main/w/w3m/w3m_0.5.3.orig.tar.gz \
-          http://deb.debian.org/debian/pool/main/w/w3m/w3m_0.5.3-37.debian.tar.xz"
-MD5SUM="1b845a983a50b8dec0169ac48479eacc \
-        2d7fb8723f68a0dde14203e38a008a6e"
+VERSION="0.5.3+git20230121"
+HOMEPAGE="https://w3m.sourceforge.net/"
+DOWNLOAD="https://deb.debian.org/debian/pool/main/w/w3m/w3m_0.5.3+git20230121.orig.tar.xz"
+MD5SUM="32d66f63a695915961a276f9c02a992b"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="imlib2"
-MAINTAINER="Dave Woodfall"
-EMAIL="dave@tty1.uk"
+REQUIRES=""
+MAINTAINER="D Woodfall"
+EMAIL="dave@slackbuilds.org"
diff --git a/network/wakeonlan/wakeonlan.SlackBuild b/network/wakeonlan/wakeonlan.SlackBuild
index b3f34ea2b3..90df9c426e 100644
--- a/network/wakeonlan/wakeonlan.SlackBuild
+++ b/network/wakeonlan/wakeonlan.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for wakeonlan
 
-# Copyright 2014-2016  Dimitris Zlatanidis  Orestiada, Greece
+# Copyright 2014-2020  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=wakeonlan
 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}
@@ -69,7 +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 {} \;
 
-python setup.py install --root=$PKG
+python3 setup.py install --root=$PKG
+
+mkdir -p $PKG/usr/bin
+mv $PKG/usr/bin/wol $PKG/usr/bin/wakeonlan
 
 find $PKG -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/network/waterfox/README b/network/waterfox/README
deleted file mode 100644
index b3c73f191f..0000000000
--- a/network/waterfox/README
+++ /dev/null
@@ -1,23 +0,0 @@
-Waterfox was one of the first widely distributed 64-Bit browsers on
-the Web and quickly gained a loyal following. At one time, Waterfox
-had one thing in mind - speed. But now Waterfox also attempts to be an
-ethical, user-oriented browser.
-
-Features:
-
-    Disabled Encrypted Media Extensions (EME)
-    Disabled Web Runtime (deprecated as of 2015)
-    Removed Pocket
-    Removed Telemetry
-    Removed data collection
-    Removed startup profiling
-    Allow running of all 64-Bit NPAPI plugins
-    Allow running of unsigned extensions
-    Removal of Sponsored Tiles on New Tab Page
-    Addition of Duplicate Tab option
-    Locale selector in about:preferences > General
-
-Waterfox is only available for the x86-64 architecture.
-
-This SlackBuild just repackages the binary package provided by the project.
-It doesn't attempt to build the browser from source.
diff --git a/network/waterfox/slack-desc b/network/waterfox/slack-desc
deleted file mode 100644
index ea56f854e3..0000000000
--- a/network/waterfox/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------------------------------------------------------|
-waterfox: waterfox (Web browser)
-waterfox:
-waterfox: Waterfox was one of the first widely distributed 64-Bit browsers on
-waterfox: the Web and quickly gained a loyal following. At one time, Waterfox
-waterfox: had one thing in mind - speed. But now Waterfox also attempts to be an
-waterfox: ethical, user-oriented browser
-waterfox:
-waterfox:
-waterfox:
-waterfox: Homepage: https://www.waterfox.net
-waterfox:
diff --git a/network/waterfox/waterfox.SlackBuild b/network/waterfox/waterfox.SlackBuild
deleted file mode 100644
index a1c2976335..0000000000
--- a/network/waterfox/waterfox.SlackBuild
+++ /dev/null
@@ -1,95 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for waterfox
-# Copyright 2017-2019 Donald Cooley South Haven, Indiana USA
-
-# Based on the pale moon SlackBuilds by:
-# Copyright 2015 pomfland
-# Copyright 2017 skaendo <skaendo at excite 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=waterfox
-VERSION=${VERSION:-56.2.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}
-
-# Check and then abort if the architecture is not 64-bit.
-if [ "$ARCH" != "x86_64" ]; then
-  echo "$ARCH is unsupported"
-  exit 1
-fi
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM
-tar xvf $CWD/$PRGNAM-$VERSION.en-US.linux-$ARCH.tar.?z*
-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 {} \;
-
-# Install waterfox into /opt
-mkdir -p $PKG/opt/waterfox
-cp -vr * $PKG/opt/waterfox
-
-# Link Waterfox binary to /usr/bin
-mkdir -p $PKG/usr/bin
-ln -s /opt/waterfox/waterfox $PKG/usr/bin/waterfox
-
-# Install .desktop file
-mkdir -p $PKG/usr/share/applications
-cp $CWD/$PRGNAM.desktop $PKG/usr/share/applications
-
-# Icon
-mkdir -p $PKG/usr/share/pixmaps/
-#cp $PKG/opt/$PRGNAM/browser/icons/mozicon128.png $PKG/usr/share/pixmaps/waterfox-icon.png
-cp $PKG/opt/$PRGNAM/browser/chrome/icons/default/default128.png $PKG/usr/share/pixmaps/waterfox-icon.png
-
-find $PKG -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
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/network/waterfox/waterfox.desktop b/network/waterfox/waterfox.desktop
deleted file mode 100644
index 66c468c68f..0000000000
--- a/network/waterfox/waterfox.desktop
+++ /dev/null
@@ -1,13 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Name=Waterfox Web Browser
-Comment=Browse the World Wide Web
-Keywords=Internet;WWW;Browser;Web;Explorer
-Exec=waterfox %u
-Terminal=false
-X-MultipleArgs=false
-Type=Application
-Icon=waterfox
-Categories=Network;WebBrowser;
-MimeType=text/html;text/xml;application/xhtml+xml;application/xml;application/rss+xml;application/rdf+xml;image/gif;image/jpeg;image/png;x-scheme-handler/http;x-scheme-handler/https;x-scheme-handler/ftp;x-scheme-handler/chrome;video/webm;application/x-xpinstall;
-StartupNotify=true
diff --git a/network/waterfox/waterfox.info b/network/waterfox/waterfox.info
deleted file mode 100644
index 48354ef08c..0000000000
--- a/network/waterfox/waterfox.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="waterfox"
-VERSION="56.2.12"
-HOMEPAGE="https://www.waterfox.net"
-DOWNLOAD="UNSUPPORTED"
-MD5SUM=""
-DOWNLOAD_x86_64="https://storage-waterfox.netdna-ssl.com/releases/linux64/installer/waterfox-56.2.12.en-US.linux-x86_64.tar.bz2"
-MD5SUM_x86_64="20d2c6f0e4ea02942e0168c847e96f77"
-REQUIRES=""
-MAINTAINER="Donald Cooley"
-EMAIL="chytraeu@sdf.org"
diff --git a/network/wavemon/README b/network/wavemon/README
index f1f5ddfffd..3d1a5c51a6 100644
--- a/network/wavemon/README
+++ b/network/wavemon/README
@@ -11,5 +11,6 @@ It was originally developed by Jan Morgenstern.
 
 If you use a filesystem that supports posix capabilities, an easy way to
 start wavemon as a normal user, while still providing it with all of the
-access permissions it requires, is by issuing the following command as root:
+access permissions it requires, is by issuing the following command as
+root:
 # setcap cap_net_admin=eip /usr/bin/wavemon
diff --git a/network/wavemon/wavemon.SlackBuild b/network/wavemon/wavemon.SlackBuild
index e9c8499483..4b77204663 100644
--- a/network/wavemon/wavemon.SlackBuild
+++ b/network/wavemon/wavemon.SlackBuild
@@ -1,15 +1,18 @@
-#!/bin/sh
+#!/bin/bash
 
 # Wavemon Copyright 2012 Vliegendehuiskat, Netherlands
 
 # Slackware build script for <wavemon>
-# Written by Nick Warne <nick@linicks.net> 2019...
+# Written by Nick Warne <warne.nick@gmail.com> 2019...
 # Licensed under the WTFPL <http://sam.zoy.org/wtfpl/COPYING>
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=wavemon
-VERSION=${VERSION:-0.9.0}
+VERSION=${VERSION:-0.9.3}
 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}
@@ -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/network/wavemon/wavemon.info b/network/wavemon/wavemon.info
index ceb1cfe7bc..0774583082 100644
--- a/network/wavemon/wavemon.info
+++ b/network/wavemon/wavemon.info
@@ -1,10 +1,10 @@
 PRGNAM="wavemon"
-VERSION="0.9.0"
+VERSION="0.9.3"
 HOMEPAGE="https://github.com/uoaerg/wavemon"
-DOWNLOAD=" https://github.com/uoaerg/wavemon/archive/v0.9.0/wavemon-0.9.0.tar.gz"
-MD5SUM="7276dd648da5463798f3662d33c29ecc"
+DOWNLOAD="https://github.com/uoaerg/wavemon/archive/v0.9.3/wavemon-0.9.3.tar.gz"
+MD5SUM="57879ea3bd68381f5e13c721d285f588"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
 MAINTAINER="Nick Warne"
-EMAIL="nick@linicks.net"
+EMAIL="warne.nick@gmail.com"
diff --git a/network/weathercli/weathercli.SlackBuild b/network/weathercli/weathercli.SlackBuild
index a8071cde86..12cd688468 100644
--- a/network/weathercli/weathercli.SlackBuild
+++ b/network/weathercli/weathercli.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for weathercli
 
@@ -23,10 +23,13 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=weathercli
 VERSION=${VERSION:-2.3.1}
 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}
@@ -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/network/webalizer/README b/network/webalizer/README
index a4fd77e826..227ae436b6 100644
--- a/network/webalizer/README
+++ b/network/webalizer/README
@@ -1,3 +1,5 @@
 The Webalizer is a fast, free web server log file analysis program. 
 It produces highly detailed, easily configurable usage reports in 
 HTML format, for viewing with a standard web browser. 
+
+Optional at build-time detected dependency: GeoIP
diff --git a/network/webalizer/gcc10.patch b/network/webalizer/gcc10.patch
new file mode 100644
index 0000000000..66f4363d5d
--- /dev/null
+++ b/network/webalizer/gcc10.patch
@@ -0,0 +1,19 @@
+diff -Naur webalizer-2.23-08.orig/dns_resolv.c webalizer-2.23-08/dns_resolv.c
+--- webalizer-2.23-08.orig/dns_resolv.c	2013-02-26 06:37:27.000000000 +0100
++++ webalizer-2.23-08/dns_resolv.c	2021-03-23 20:18:10.825092000 +0100
+@@ -78,11 +78,11 @@
+ 
+ struct   dns_child child[MAXCHILD];            /* DNS child pipe data      */
+ 
+-DNODEPTR host_table[MAXHASH];                  /* hostname/ip hash table   */
++extern DNODEPTR host_table[MAXHASH];           /* hostname/ip hash table   */
+ 
+-char     buffer[BUFSIZE];                      /* log file record buffer   */
+-char     tmp_buf[BUFSIZE];                     /* used to temp save above  */
+-struct   utsname system_info;                  /* system info structure    */
++extern char     buffer[BUFSIZE];               /* log file record buffer   */
++extern char     tmp_buf[BUFSIZE];              /* used to temp save above  */
++extern struct   utsname system_info;           /* system info structure    */
+ 
+ int      raiseSigChild = 1;
+ 
diff --git a/network/webalizer/slack-desc b/network/webalizer/slack-desc
index 3da9de19b0..98a31f2654 100644
--- a/network/webalizer/slack-desc
+++ b/network/webalizer/slack-desc
@@ -12,7 +12,7 @@ webalizer: The Webalizer is a fast, free web server log file analysis program.
 webalizer: It produces highly detailed, easily configurable usage reports in
 webalizer: HTML format, for viewing with a standard web browser.
 webalizer:
-webalizer: Homepage: http://webalizer.com/
+webalizer: https://webalizer.net/
 webalizer:
 webalizer:
 webalizer:
diff --git a/network/webalizer/webalizer.SlackBuild b/network/webalizer/webalizer.SlackBuild
index a4fa981af5..e6d3e5469f 100644
--- a/network/webalizer/webalizer.SlackBuild
+++ b/network/webalizer/webalizer.SlackBuild
@@ -1,8 +1,9 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for webalizer
 
-# Copyright 2010, Steven King <kingrst@gmail.com>
+# Copyright 2010, Steven King
+# Copyright 2023 Johannes Schoepfer, Germany
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,28 +23,41 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20220330 bkw: Modified by SlackBuilds.org, BUILD=2:
+# - install man pages to /usr/man/man1 (not /usr/man)!
+# - fix download URL.
+# - i486 => i586.
+# - no INSTALL in doc dor.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=webalizer
 VERSION=${VERSION:-2.23_08}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 SRC_VERSION=$(printf $VERSION | 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
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; 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 +81,11 @@ cd $PRGNAM-$SRC_VERSION
 chown -R root: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/gcc10.patch
 
 CFLAGS="$SLKCFLAGS" \
 CXFLAGS="$SLKCFLAGS" \
@@ -82,17 +98,18 @@ CXFLAGS="$SLKCFLAGS" \
   --mandir=/usr/man \
   --build=$ARCH-slackware-linux
 
-make MANDIR=/usr/man
-make install MANDIR=/usr/man DESTDIR=$PKG
+make MANDIR=/usr/man/man1
+make install MANDIR=/usr/man/man1 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 {} \;
+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 COPYING DNS.README README README.FIRST INSTALL \
+  CHANGES Copyright COPYING DNS.README README README.FIRST \
     $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
@@ -101,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/network/webalizer/webalizer.info b/network/webalizer/webalizer.info
index 6f5f21f680..fc51dda7c1 100644
--- a/network/webalizer/webalizer.info
+++ b/network/webalizer/webalizer.info
@@ -1,10 +1,10 @@
 PRGNAM="webalizer"
 VERSION="2.23_08"
-HOMEPAGE="http://webalizer.com"
-DOWNLOAD="ftp://ftp.mrunix.net/pub/webalizer/webalizer-2.23-08-src.tgz"
+HOMEPAGE="https://webalizer.net/"
+DOWNLOAD="http://distcache.freebsd.org/ports-distfiles/webalizer-2.23-08-src.tgz"
 MD5SUM="00f1f18bd5ed462ea43bf98d867e7966"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="GeoIP"
-MAINTAINER="Steven King"
-EMAIL="kingrst@gmail.com"
+REQUIRES=""
+MAINTAINER="Johannes Schoepfer"
+EMAIL="slackbuilds@schoepfer.info"
diff --git a/network/webex/README b/network/webex/README
new file mode 100644
index 0000000000..2b187d9e76
--- /dev/null
+++ b/network/webex/README
@@ -0,0 +1,5 @@
+The all new Webex App is one easy-to-use and secure app you can use to
+call, message, meet, and get work done.
+
+This script will repackage the debian binary.  Cisco doesn't version
+their downloads, so the MD5SUM and VERSION numbers might not match.
diff --git a/network/deis/doinst.sh b/network/webex/doinst.sh
index 5fb28930db..5fb28930db 100644
--- a/network/deis/doinst.sh
+++ b/network/webex/doinst.sh
diff --git a/network/webex/slack-desc b/network/webex/slack-desc
new file mode 100644
index 0000000000..03d7a771a5
--- /dev/null
+++ b/network/webex/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+     |-----handy-ruler------------------------------------------------------|
+webex: webex (Webex for Linux)
+webex:
+webex: The all new Webex App is one easy-to-use and secure app you can use to
+webex: call, message, meet, and get work done.
+webex:
+webex: Homepage: https://www.webex.com
+webex:
+webex:
+webex:
+webex:
+webex:
diff --git a/network/webex/webex.SlackBuild b/network/webex/webex.SlackBuild
new file mode 100644
index 0000000000..4e80deb996
--- /dev/null
+++ b/network/webex/webex.SlackBuild
@@ -0,0 +1,97 @@
+#!/bin/bash
+
+# Slackware build script for webex
+
+# Copyright 2022-2023  Eugene Wissner, Mannheim, 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.
+
+# 20230701 bkw: Modified by SlackBuilds.org, BUILD=2:
+# - +x permission for shared libs.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=webex
+VERSION=${VERSION:-43.11.0.27795}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+if [ -z "$ARCH" ]; then
+  ARCH=$( uname -m )
+fi
+
+if [ "$ARCH" != "x86_64" ]; then
+  echo "$ARCH architecture is unsupported." >/dev/stderr
+  exit 1
+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 $PKG
+ar p $CWD/Webex.deb data.tar.xz | tar xJv || 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 {} +
+
+# Install a .desktop launcher:
+# * Version should be the version of the desktop entry specification, not application version.
+# * "Application" category is deprecated.
+mkdir -p $PKG/usr/share/applications
+cat $PKG/opt/Webex/bin/webex.desktop | ruby -ne '
+  unless $_.start_with? %q{Version=}
+    puts $_.sub(/^Comment=.+/, %q{Comment=Video conferencing})
+      .sub(/^Categories=.+/, %q{Categories=Network})
+  end
+' > $PKG/usr/share/applications/webex.desktop
+
+rm $PKG/opt/Webex/bin/webex.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
+
+find $PKG -type f -a -name '*.so*' -exec chmod 755 {} +
+
+# Link the binary:
+mkdir -p $PKG/usr/bin
+( cd $PKG/usr/bin; ln -s ../../opt/Webex/bin/CiscoCollabHost webex )
+
+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/network/webex/webex.info b/network/webex/webex.info
new file mode 100644
index 0000000000..6c167e3a62
--- /dev/null
+++ b/network/webex/webex.info
@@ -0,0 +1,10 @@
+PRGNAM="webex"
+VERSION="43.11.0.27795"
+HOMEPAGE="https://www.webex.com"
+DOWNLOAD="UNSUPPORTED"
+MD5SUM=""
+DOWNLOAD_x86_64="https://binaries.webex.com/WebexDesktop-Ubuntu-Official-Package/Webex.deb"
+MD5SUM_x86_64="e85297138729c7504ab5bd82592880da"
+REQUIRES=""
+MAINTAINER="Eugene Wissner"
+EMAIL="belka@caraus.de"
diff --git a/network/webhook/README b/network/webhook/README
new file mode 100644
index 0000000000..dc45c82167
--- /dev/null
+++ b/network/webhook/README
@@ -0,0 +1,26 @@
+webhook is a lightweight configurable tool written in Go, that allows
+you to easily create HTTP endpoints (hooks) on your server, which you
+can use to execute configured commands. You can also pass data from
+the HTTP request (such as headers, payload or query variables) to your
+commands. webhook also allows you to specify rules which have to be
+satisfied in order for the hook to be triggered.
+
+For example, if you're using Github or Bitbucket, you can use webhook
+to set up a hook that runs a redeploy script for your project on your
+staging server, whenever you push changes to the master branch of your
+project.
+
+If you use Mattermost or Slack, you can set up an "Outgoing webhook
+integration" or "Slash command" to run various commands on your
+server, which can then report back directly to you or your channels
+using the "Incoming webhook integrations", or the appropriate response
+body.
+
+webhook aims to do nothing more than it should do, and that is:
+1. receive the request,
+2. parse the headers, payload and query variables,
+3. check if the specified rules for the hook are satisfied,
+4. and finally, pass the specified arguments to the specified command
+   via command line arguments or via environment variables.
+
+Everything else is the responsibility of the command's author.
diff --git a/network/webhook/doinst.sh b/network/webhook/doinst.sh
new file mode 100644
index 0000000000..e950dd1594
--- /dev/null
+++ b/network/webhook/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
+}
+
+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.webhook.new
+config etc/webhook/hooks.json.new
+config etc/default/webhook.new
+config etc/logrotate.d/webhook.new
diff --git a/network/webhook/slack-desc b/network/webhook/slack-desc
new file mode 100644
index 0000000000..2a1ad2be85
--- /dev/null
+++ b/network/webhook/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+       |-----handy-ruler------------------------------------------------------|
+webhook: webhook (Webhook tool)
+webhook:
+webhook: Webhook is a lightweight configurable tool written in Go, that allows
+webhook: you to easily create HTTP endpoints (hooks) on your server, which you
+webhook: can use to execute configured commands. You can also pass data from
+webhook: the HTTP request (such as headers, payload or query variables) to
+webhook: your commands. webhook also allows you to specify rules which have to
+webhook: be satisfied in order for the hook to be triggered.
+webhook: service providing container.
+webhook:
+webhook: Homepage: https://github.com/adnanh/webhook/
diff --git a/network/webhook/webhook-wrapper.sh b/network/webhook/webhook-wrapper.sh
new file mode 100644
index 0000000000..6d69c5911a
--- /dev/null
+++ b/network/webhook/webhook-wrapper.sh
@@ -0,0 +1,36 @@
+#!/bin/bash
+#
+# This is wrapper for webhook. This script required only in order to properly
+# start and stop this daemon, because webhook does not set pid file and unable
+# to run as specific user.
+
+ME=$0
+BINARY=/usr/sbin/webhook
+CONFIG=/etc/default/webhook
+
+source "$CONFIG"
+getent passwd ${USER} >/dev/null 2>&1
+
+if [ $? != 0 ]; then
+	echo "Create user '${USER}' before running ${ME}"
+	exit 1
+fi
+
+if [ -z $URLPREFIX ]; then
+	URLPREFIX=""
+else
+	URLPREFIX="-urlprefix=${URLPREFIX}"
+fi
+
+if [ ! -z $PIDFILE ]; then
+	if [ ! -d "$(dirname ${PIDFILE})" ]; then
+		mkdir -p "$(dirname ${PIDFILE})"
+	fi
+
+	echo "$$" >$PIDFILE
+fi
+
+OPTIONS="-hooks ${HOOKS} -ip ${IPADDR} -port ${PORT} ${URLPREFIX} ${OPTS}"
+exec sudo -u $USER "${BINARY}" $OPTIONS
+
+# vim: ft=sh noet ai ts=4 sw=4 sts=4:
diff --git a/network/webhook/webhook.SlackBuild b/network/webhook/webhook.SlackBuild
new file mode 100644
index 0000000000..e8b3dacf02
--- /dev/null
+++ b/network/webhook/webhook.SlackBuild
@@ -0,0 +1,95 @@
+#!/bin/bash
+
+# Slackware build script for webhook
+
+# Copyright 2019 Sergei Fedosoff <eleksir@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=webhook
+VERSION=${VERSION:-2.6.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}
+
+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 {} \;
+
+# Huh, some magic for native go build system
+cd ..
+mv $PRGNAM-$VERSION $PRGNAM
+mkdir -p $PRGNAM-$VERSION/build
+mv $PRGNAM/vendor $PRGNAM-$VERSION/build/src
+mkdir -p $PRGNAM-$VERSION/build/src/github.com/adnanh
+mv $PRGNAM $PRGNAM-$VERSION/build/src/github.com/adnanh
+cd $PRGNAM-$VERSION
+GO111MODULE=auto GOPATH=$(pwd)/build go build -o $PKG/usr/sbin/webhook github.com/adnanh/$PRGNAM
+strip -s $PKG/usr/sbin/webhook
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a build/src/github.com/adnanh/$PRGNAM/{CONTRIBUTING.md,LICENSE,README.md} $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/docs
+cp -rp build/src/github.com/adnanh/$PRGNAM/docs $PKG/usr/doc/$PRGNAM-$VERSION
+install -Dpm 0755 $CWD/webhook-wrapper.sh $PKG/usr/sbin/webhook-wrapper.sh
+#install -Dpm 0644 $CWD/hooks.json $PKG/etc/webhook/hooks.json.new
+install -Dpm 0644 $CWD/webhook.init $PKG/etc/rc.d/rc.webhook.new
+install -Dpm 0644 $CWD/webhook.sysconfig $PKG/etc/default/webhook.new
+install -Dpm 0644 $CWD/webhook.logrotate $PKG/etc/logrotate.d/webhook.new
+
+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/network/webhook/webhook.info b/network/webhook/webhook.info
new file mode 100644
index 0000000000..1153ffe7e9
--- /dev/null
+++ b/network/webhook/webhook.info
@@ -0,0 +1,10 @@
+PRGNAM="webhook"
+VERSION="2.6.11"
+HOMEPAGE="https://github.com/adnanh/webhook"
+DOWNLOAD="https://github.com/adnanh/webhook/archive/2.6.11/webhook-2.6.11.tar.gz"
+MD5SUM="c4ca240ae1cd17b4aa288b7cb332cab5"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="google-go-lang"
+MAINTAINER="Sergei Fedosoff"
+EMAIL="eleksir@gmail.com"
diff --git a/network/webhook/webhook.init b/network/webhook/webhook.init
new file mode 100644
index 0000000000..7b809260ae
--- /dev/null
+++ b/network/webhook/webhook.init
@@ -0,0 +1,69 @@
+#!/bin/sh
+# Start/stop/restart webhook.
+
+. /etc/default/webhook
+
+__start() {
+	if [ -z "$PIDFILE" ]; then
+		echo "WebHook will start but please set PIDFILE in /etc/default/webhook"
+	else
+		if [ -f "$PIDFILE" ]; then
+			echo "WebHook daemon is already running as PID $(< ${PIDFILE}) " >&2
+			exit 3
+		fi
+	fi
+
+	if [ -x /usr/sbin/webhook-wrapper.sh ]; then
+		echo "Starting WebHook daemon:  /usr/sbin/webhook-wrapper.sh &"
+
+		if [ -z "$LOG" ]; then
+			/usr/sbin/webhook-wrapper.sh > /dev/null 2>&1 &
+		else
+			/usr/sbin/webhook-wrapper.sh >> "$LOG" 2>&1 &
+		fi
+	fi
+}
+
+__stop() {
+	if [ -f "$PIDFILE" ]; then
+		kill "$(< ${PIDFILE})"
+		rm -f "${PIDFILE}"
+	else
+		if [ -z "$PIDFILE" ]; then
+			killall -9 webhook-wrapper.sh
+			killall -9 webhook
+		else
+			echo "Webhook is not running"
+		fi
+	fi
+}
+
+__restart() {
+	__stop
+	if [ -z "$PIDFILE" ]; then
+		sleep 1
+	else
+		while [ -f "$PIDFILE" ]; do
+			sleep 1
+		done
+	fi
+	__start
+}
+
+
+case "$1" in
+	'start')
+		__start
+		;;
+	'stop')
+		__stop
+		;;
+	'restart')
+		__restart
+		;;
+	*)
+		echo "usage $0 start|stop|restart"
+		exit 2
+esac
+
+# vim: ft=sh noet ai ts=4 sw=4 sts=4:
diff --git a/network/webhook/webhook.logrotate b/network/webhook/webhook.logrotate
new file mode 100644
index 0000000000..59e770a224
--- /dev/null
+++ b/network/webhook/webhook.logrotate
@@ -0,0 +1,6 @@
+/var/log/webhook.log {
+    daily
+    rotate 7
+    compress
+    missingok
+}
diff --git a/network/webhook/webhook.sysconfig b/network/webhook/webhook.sysconfig
new file mode 100644
index 0000000000..73f8681241
--- /dev/null
+++ b/network/webhook/webhook.sysconfig
@@ -0,0 +1,23 @@
+# Path to webhook config
+HOOKS="/etc/webhook/hooks.json"
+
+# IP Address webhook listen to
+IPADDR="127.0.0.1"
+
+# Port webhook binds to
+PORT="9080"
+
+# where to log stderr and stdout of webhook
+LOG="/var/log/webhook.log"
+
+# webhook wrapper' pidfile
+PIDFILE="/var/run/webhook/webhook.pid"
+
+# effective user
+USER=nobody
+
+# protocol://yourserver:port/URLPREFIX/:hook-id (default "hooks")
+URLPREFIX="hooks"
+
+# Other options
+OPTS="-hotreload -nopanic -verbose"
diff --git a/network/weboob/README b/network/weboob/README
deleted file mode 100644
index fa3f535370..0000000000
--- a/network/weboob/README
+++ /dev/null
@@ -1,2 +0,0 @@
-weboob (Web Out Of Browsers) provides several applications to
-interact with a lot of websites. 
diff --git a/network/weboob/slack-desc b/network/weboob/slack-desc
deleted file mode 100644
index 2985003e0f..0000000000
--- a/network/weboob/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------------------------------------------------------|
-weboob: weboob (applications to interact with websites)
-weboob:
-weboob: weboob (Web Out Of Browsers) provides several applications to
-weboob: interact with a lot of websites.
-weboob:
-weboob: Homepage: http://symlink.me/projects/weboob
-weboob:
-weboob:
-weboob:
-weboob:
-weboob:
diff --git a/network/weboob/weboob.SlackBuild b/network/weboob/weboob.SlackBuild
deleted file mode 100644
index 7652566c9d..0000000000
--- a/network/weboob/weboob.SlackBuild
+++ /dev/null
@@ -1,77 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for weboob
-
-# Copyright (C) 2011,  Brice Lopez <brice@lopez.banh-bao.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.
-
-PRGNAM=weboob
-VERSION=${VERSION:-0.a}
-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}
-
-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 {} \;
-
-PYTHONPATH=$PKG/usr
-sed -i -e "s|share/man|man|g" 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
-
-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 INSTALL MANIFEST.in README 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/network/weboob/weboob.info b/network/weboob/weboob.info
deleted file mode 100644
index 38feeabdd3..0000000000
--- a/network/weboob/weboob.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="weboob"
-VERSION="0.a"
-HOMEPAGE="http://weboob.org/"
-DOWNLOAD="https://symlink.me/attachments/download/165/weboob-0.a.tar.gz"
-MD5SUM="15568485fd2bea4c53b69a6edb8c7e45"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="PyYAML feedparser html2text lxml mechanize nose python-dateutil rtmpdump"
-MAINTAINER="Brandon Soonaye"
-EMAIL="brandonsoonaye@live.fr"
diff --git a/network/weechat/README b/network/weechat/README
index 559b831967..0acafadeb3 100644
--- a/network/weechat/README
+++ b/network/weechat/README
@@ -1,16 +1,27 @@
-weechat (IRC client)
+weechat: weechat (IRC client)
 
-WeeChat is a light & fast multilingual curses-based multiplatform IRC client.
+WeeChat is a light, fast, multilingual, curses-based multiplatform
+IRC client.
 
 WeeChat supports:
-    DCC files and chats, multi-server connections, background connections,
-    IPv6, SSL, proxy, auto-reconnection, DCC2, nicklist, window splitting,
-    FIFO pipe for remote control, Aspell, JavaScript, Perl, Python, Ruby,
-    nick auto-completion, lag indication, auto-logging and client upgrades
-    without dropping connections.
+- DCC files and chats, multi-server connections, background connections.
+- IPv6, SSL, proxy, auto-reconnection, DCC2, nicklist, window splitting.
+- FIFO pipe for remote control; Aspell; scripting in Perl, Python 3,
+  Ruby, Tcl, Scheme, Lua[1], JavaScript[2], PHP[3]; nick
+  auto-completion; lag indication; auto-logging; and client upgrades
+  without dropping connections.
 
-WeeChat will be built with support for Perl, Python and Ruby scripting. If Lua
-is installed, it will be auto-detected and scripting support will also be
-included.
+WeeChat will be built with support for Perl, Python 3, Guile, Ruby,
+and Tcl scripting[1]. Once WeeChat is running, you can install scripts
+using the built-in script manager ("/help script" to get started).
 
-WeeChat man pages will be built if rubygem-asciidoctor is installed.
+[1] To enable Lua scripting, install one of these optional dependencies:
+    lua53, lua52, or lua. The highest-numbered version of lua will be
+    used, if multiple versions are installed.
+
+[2] JavaScript is not currently supported in this build of WeeChat. It
+    also isn't supported in Debian's set of weechat packages, for what
+    that's worth.
+
+[3] PHP is not supported in this SlackBuild because Slackware's php
+    package isn't built with --enable-embed.
diff --git a/network/weechat/doinst.sh b/network/weechat/doinst.sh
new file mode 100644
index 0000000000..3e5691a052
--- /dev/null
+++ b/network/weechat/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/network/weechat/slack-desc b/network/weechat/slack-desc
index 5a6a83cdc6..e474469472 100644
--- a/network/weechat/slack-desc
+++ b/network/weechat/slack-desc
@@ -11,9 +11,9 @@ weechat:
 weechat: WeeChat is a fast & light multilingual curses-based multiplatform
 weechat: IRC client written from scratch and released under the GPL.
 weechat:
-weechat: Homepage: http://www.weechat.org
-weechat:
+weechat: Homepage: https://www.weechat.org
 weechat:
+weechat: This package was built @WITHLUA@ lua scripting support.
 weechat:
 weechat:
 weechat:
diff --git a/network/weechat/weechat.SlackBuild b/network/weechat/weechat.SlackBuild
index b7f3d537de..d0fa7ad59c 100644
--- a/network/weechat/weechat.SlackBuild
+++ b/network/weechat/weechat.SlackBuild
@@ -1,8 +1,9 @@
-#!/bin/sh
+#!/bin/bash
 
-# Originally written by hollywoodb (hollywoodb@fastmail.fm)
-# Maintained 2011-2016 by sero (firebird209 at gmail dot com)
-# Maintained 2017-2019 by Benjamin Trigona-Harany <slackbuilds@jaxartes.net>
+# Originally written by hollywoodb (email removed)
+# Maintained 2011-2016 by sero (email removed)
+# Maintained 2017-2021 by Benjamin Trigona-Harany (email removed)
+# Maintained 2021-? by B. Watson <urchlay@slackware.uk>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,10 +23,34 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20240213 bkw: update for v4.2.1.
+# 20231219 bkw: update for v4.1.2.
+# 20231111 bkw: update for v4.1.1.
+# 20230907 bkw: update for v4.0.4.
+# 20230104 bkw: update for v3.7.1.
+
+# 20211019 bkw:
+# - take over maintenance.
+# - update for v3.3.
+# - always docs/manpages, now that Slackware has rubygem-asciidoctor.
+# - add doinst.sh, since we have .desktop and icons.
+# - include old-style icon.
+# - mention optional lua deps.
+# - mention the fact that Tcl and Guile are supported scripting langs.
+# - get rid of external stylesheets/fonts/JS in HTML docs, as this
+#   is a privacy issue.
+
+# I considered including the contents of Debian's weechat-scripts
+# package here, but weechat's set up to download scripts from a remote
+# server, not a local directory, so probly nobody'd ever use them.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=weechat
-VERSION=${VERSION:-2.5}
+VERSION=${VERSION:-4.2.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,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}
@@ -60,14 +89,42 @@ 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 \
- \( -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 {} +
+
+# 20211019 bkw: patch from Debian: Build html documentation without
+# requiring data (javascript, fonts) on external websites (potential
+# privacy breach). Patch was slightly modified for Slackware.
+# 20230104 bkw: patch updated, used as-is from Debian this time.
+# 20240213 bkw: patch no longer applies, it's a one-liner, just use sed.
+sed -i 's,icons=font,icons=text,' doc/CMakeLists.txt
+
+# 20211019 bkw: hardcoded paths suck.
+DOC=/usr/doc/$PRGNAM-$VERSION
+PKGDOC=$PKG/$DOC
+sed -i \
+  '/install(/s,\(DESTINATION\) *"\$.DATAROOTDIR.*,\1 '$DOC'/html),' \
+  doc/CMakeLists.txt
+
+# 20211019 bkw:
+# -DENABLE_PHP=OFF because Slackware's php isn't built with --enable-embed.
+# -DENABLE_JAVASCRIPT=OFF because neither SBo nor Slackware provides a
+# v8 package. Looks like this is where you'd get the source: https://v8.dev/
+
+# lua isn't auto-disabled if it's missing, so help it out a little.
+LUAOPT=OFF; WITHLUA=WITHOUT
+for i in lua5.3 lua5.2 lua; do
+  if [ -x /usr/bin/$i ]; then
+    LUAOPT=ON; WITHLUA=WITH
+  fi
+done
+
+# Everything else is autodetected and/or included in a full Slackware
+# install. Have to enable "incomplete docs" in 4.0.x, so it won't
+# complain about disabled plugins.
 
 mkdir build
 cd build
@@ -75,32 +132,30 @@ cd build
     -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
     -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
     -DCMAKE_INSTALL_PREFIX=/usr \
-    -DENABLE_MAN=ON \
+    -DENABLE_LUA="$LUAOPT" \
+    -DENABLE_JAVASCRIPT=OFF \
     -DENABLE_PHP=OFF \
-    -DENABLE_PYTHON3=ON \
-    -DENABLE_DOC=OFF \
+    -DENABLE_DOC=ON \
+    -DENABLE_DOC_INCOMPLETE=ON \
+    -DENABLE_MAN=ON \
+    -DMANDIR=/usr/man \
     -DLIBDIR=/usr/lib${LIBDIRSUFFIX} \
     -DCMAKE_BUILD_TYPE=Release \
     ..
-  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
+gzip -9 $PKG/usr/man/man1/* $PKG/usr/man/*/man1/*
 
-if [ -e $PKG/usr/share/man ]; then
-  mv $PKG/usr/share/man $PKG/usr/man
-  find $PKG/usr/man -type f -exec gzip -9 {} \;
-fi
+mkdir -p $PKG/usr/share/pixmaps
+ln -s ../icons/hicolor/32x32/apps/$PRGNAM.png $PKG/usr/share/pixmaps/$PRGNAM.png
 
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
-  AUTHORS.adoc COPYING ChangeLog.adoc README.adoc ReleaseNotes.adoc \
-  $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+cp -a *.adoc COPYING $PKGDOC
+cat $CWD/$PRGNAM.SlackBuild > $PKGDOC/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
+sed "s,@WITHLUA@,$WITHLUA," $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/network/weechat/weechat.info b/network/weechat/weechat.info
index d86e56c653..85db3dc94f 100644
--- a/network/weechat/weechat.info
+++ b/network/weechat/weechat.info
@@ -1,10 +1,10 @@
 PRGNAM="weechat"
-VERSION="2.5"
-HOMEPAGE="http://www.weechat.org"
-DOWNLOAD="http://weechat.org/files/src/weechat-2.5.tar.bz2"
-MD5SUM="3785694d3129989cc72d6eeb162447f3"
+VERSION="4.2.1"
+HOMEPAGE="https://www.weechat.org"
+DOWNLOAD="https://weechat.org/files/src/weechat-4.2.1.tar.xz"
+MD5SUM="1d6fe2613e1e33a3cb8fc11a0c6d322a"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="python3"
-MAINTAINER="Benjamin Trigona-Harany"
-EMAIL="slackbuilds@jaxartes.net"
+REQUIRES=""
+MAINTAINER="B. Watson"
+EMAIL="urchlay@slackware.uk"
diff --git a/network/weetwit/weetwit.SlackBuild b/network/weetwit/weetwit.SlackBuild
index ae12d5564a..c6e83d5fd0 100644
--- a/network/weetwit/weetwit.SlackBuild
+++ b/network/weetwit/weetwit.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for weetwit
 
@@ -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=weetwit
 VERSION=${VERSION:-0.10.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/network/wego/README b/network/wego/README
new file mode 100644
index 0000000000..80aa78d7db
--- /dev/null
+++ b/network/wego/README
@@ -0,0 +1,4 @@
+wego is a weather app for the terminal.
+
+Usage requires registering for an API (ex. OpenWeatherMap).
+See the github page for more details.
diff --git a/network/wego/modules.txt b/network/wego/modules.txt
new file mode 100644
index 0000000000..4d9a71a0fc
--- /dev/null
+++ b/network/wego/modules.txt
@@ -0,0 +1,18 @@
+# github.com/mattn/go-colorable v0.1.13
+## explicit
+github.com/mattn/go-colorable 
+# github.com/mattn/go-runewidth v0.0.14
+## explicit
+github.com/mattn/go-runewidth
+# github.com/schachmat/ingo v0.0.0-20170403011506-a4bdc0729a3f
+## explicit
+github.com/schachmat/ingo
+# github.com/mattn/go-isatty v0.0.19
+## explicit
+github.com/mattn/go-isatty 
+# github.com/rivo/uniseg v0.4.4
+## explicit; go 1.18
+github.com/rivo/uniseg 
+# golang.org/x/sys v0.8.0
+## explicit; go 1.17 
+golang.org/x/sys/unix 
diff --git a/network/wego/slack-desc b/network/wego/slack-desc
new file mode 100644
index 0000000000..aaf253caeb
--- /dev/null
+++ b/network/wego/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+    |-----handy-ruler------------------------------------------------------|
+wego: wego (Go weather app)
+wego:
+wego: wego is a weather app for the terminal.
+wego:
+wego:
+wego:
+wego:
+wego:
+wego:
+wego:
+wego:
diff --git a/network/wego/wego.SlackBuild b/network/wego/wego.SlackBuild
new file mode 100644
index 0000000000..daf93fb7b0
--- /dev/null
+++ b/network/wego/wego.SlackBuild
@@ -0,0 +1,106 @@
+#!/bin/bash
+
+# Slackware build script for wego
+
+# 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=wego
+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
+
+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 -Dm755 wego $PKG/usr/bin/wego
+strip --strip-unneeded $PKG/usr/bin/wego
+
+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/network/wego/wego.info b/network/wego/wego.info
new file mode 100644
index 0000000000..6469f342fd
--- /dev/null
+++ b/network/wego/wego.info
@@ -0,0 +1,22 @@
+PRGNAM="wego"
+VERSION="2.2"
+HOMEPAGE="https://github.com/schachmat/wego"
+DOWNLOAD="https://github.com/schachmat/wego/archive/2.2/wego-2.2.tar.gz \
+          https://github.com/mattn/go-colorable/archive/v0.1.13/go-colorable-0.1.13.tar.gz \
+          https://github.com/mattn/go-runewidth/archive/v0.0.14/go-runewidth-0.0.14.tar.gz \
+          https://github.com/schachmat/ingo/archive/a4bdc07/ingo-a4bdc0729a3fda62cc4069b6e490fc657fd54e33.tar.gz \
+          https://github.com/mattn/go-isatty/archive/v0.0.19/go-isatty-0.0.19.tar.gz \
+          https://github.com/rivo/uniseg/archive/v0.4.4/uniseg-0.4.4.tar.gz \
+          https://github.com/golang/sys/archive/v0.8.0/sys-0.8.0.tar.gz"
+MD5SUM="c62b99d7bfc2901dedf571de859799c3 \
+        ac74020d881d4966e33ab6580f509aeb \
+        c41abbf9dc5def08ef8e6999efbe2c8c \
+        6077da012ebc665f84b9baf79b56c0b6 \
+        e10ea58c2288fbef0d8ea37dea93718a \
+        4e272ceb8899ee895e425f16347d10a6 \
+        4bd786fbbcf550e794db58cc7ece443c"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="google-go-lang"
+MAINTAINER="Isaac Yu"
+EMAIL="isaacyu@protonmail.com"
diff --git a/network/weighmail/README b/network/weighmail/README
index 8503b63316..0067d0e43d 100644
--- a/network/weighmail/README
+++ b/network/weighmail/README
@@ -1,6 +1,7 @@
 An application to label your Gmail messages according to size.
 
-Weighmail is a program that analyzes your Gmail and applies labels to your
-messages according to their size. This is useful if you are close to reaching
-your quota as it allows you to quickly identify large messages. You have
-complete control over the rules used to create the labels.
+Weighmail is a program that analyzes your Gmail and applies labels to
+your messages according to their size. This is useful if you are close
+to reaching your quota as it allows you to quickly identify large
+messages. You have complete control over the rules used to create the
+labels.
diff --git a/network/weighmail/weighmail.SlackBuild b/network/weighmail/weighmail.SlackBuild
index 4a898f3fb9..76ba7f42cd 100644
--- a/network/weighmail/weighmail.SlackBuild
+++ b/network/weighmail/weighmail.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for weighmail
 
@@ -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=weighmail
 VERSION=${VERSION:-0.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}
@@ -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/network/wendzelnntpd/README b/network/wendzelnntpd/README
new file mode 100644
index 0000000000..ec444c9b28
--- /dev/null
+++ b/network/wendzelnntpd/README
@@ -0,0 +1,12 @@
+WendzelNNTPd is an IPv6-ready Usenet server (NNTP daemon) with the
+main goal to maximize usability on the console level. WendzelNNTPd
+achieves this by breaking down complicated things into an easy-to-use
+configuration file and tool. The server is portable (Linux/*BSD/
+*nix), supports AUTHINFO authentication, contains support for Access
+Control Lists (ACL), Role-based Access Control (RBAC) and supports
+invisible newsgroups. It currently supports MySQL and SQLite backends.
+
+Note: This package is compiled without MYSQL support and uses
+      sqlite3 instead.
+      If you want to use MySQL instead of sqlite3, remove the
+      "MYSQL=NO" before ./configure in wendzelnntpd.Slackbuild.
diff --git a/network/wendzelnntpd/doinst.sh b/network/wendzelnntpd/doinst.sh
new file mode 100644
index 0000000000..203ca9ad9f
--- /dev/null
+++ b/network/wendzelnntpd/doinst.sh
@@ -0,0 +1,44 @@
+#!/bin/sh
+
+UDBFILE=/var/spool/news/wendzelnntpd/usenet.db
+
+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}
+}
+
+# Keep same perms when installing rc.httpd.new:
+preserve_perms etc/rc.d/rc.wendzelnntpd.new
+
+# Backup old Usenet DB file if existent; if necessary, this allows to provide multiple copies; because after 2x replacing an existing with a .new file, we would lose all postings! However, replacing an existing usenet.db file is necessary since the database format might change and an old file might become incompatible with a newer one.
+if [ -f $UDBFILE ]; then mv $UDBFILE ${UDBFILE}.`date +"%m-%d-%y-%H:%M"`.bkp; chmod 0600 ${UDBFILE}.`date +"%m-%d-%y-%H:%M"`.bkp; echo "***Your old usenet database was backuped!***"; fi
+
+# install config file
+config var/spool/news/wendzelnntpd/usenet.db.new
+
+# Handle config files.  Unless this is a fresh installation, the
+# admin will have to move the .new files into place to complete
+# the package installation, as we don't want to clobber files that
+# may contain local customizations.
+config etc/wendzelnntpd.conf.new
+
+# create a first standard newsgroup so that server is directly usable after install
+/usr/sbin/wendzelnntpadm addgroup alt.wendzelnntpd.test y
diff --git a/network/wendzelnntpd/slack-desc b/network/wendzelnntpd/slack-desc
new file mode 100644
index 0000000000..fa06852729
--- /dev/null
+++ b/network/wendzelnntpd/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description. Line
+# up the first '|' above the ':' following the base package name, and the '|'
+# on the right side marks the last column you can put a 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------------------------------------------------------|
+wendzelnntpd: wendzelnntpd (Easy-to-use NNTP Server)
+wendzelnntpd:
+wendzelnntpd: WendzelNNTPd is an IPv6-ready Usenet server (NNTP daemon) with the
+wendzelnntpd: main goal to maximize usability on the console level. WendzelNNTPd
+wendzelnntpd: achieves this by breaking down complicated things into an easy-to-use
+wendzelnntpd: configuration file and tool. The server is portable (Linux/*BSD/
+wendzelnntpd: *nix), supports AUTHINFO authentication, contains support for Access
+wendzelnntpd: Control Lists (ACL), Role-based Access Control (RBAC) and supports
+wendzelnntpd: invisible newsgroups. It currently supports MySQL and SQLite backends.
+wendzelnntpd: Note: This package is compiled without MYSQL support and uses
+wendzelnntpd:       sqlite3 instead.
diff --git a/network/wendzelnntpd/wendzelnntpd.SlackBuild b/network/wendzelnntpd/wendzelnntpd.SlackBuild
new file mode 100644
index 0000000000..2dc13cab8e
--- /dev/null
+++ b/network/wendzelnntpd/wendzelnntpd.SlackBuild
@@ -0,0 +1,155 @@
+#!/bin/bash
+
+# Slackware build script for WendzelNNTPd
+#
+# Copyright 2021 Steffen Wendzel, https://www.wendzel.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.
+#
+# This script was written using the one from slackbuilds.org as a reference.
+# Thanks to Patrick Volkerding and Adis Nezirovic for the original work.
+
+# 20230515 bkw: Modified by SlackBuilds.org, BUILD=4:
+# - define and use SLKCFLAGS
+# - get rid of duplicate *broken* PRINT_PACKAGE_NAME section
+# - use correct TMP
+# - include SlackBuild in doc dir
+# - fix doc dir permissions
+# - get rid of useless INSTALL from doc dir
+# - symlink index.html -> docs.html (identical files)
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=wendzelnntpd
+VERSION=${VERSION:-2.1.2}
+TGZ_DIRNAME=cdpxe-WendzelNNTPd-5ea53d6 # for v2.1.2
+BUILD=${BUILD:-4}
+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" = "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 $TGZ_DIRNAME
+tar -xvf $CWD/v$VERSION.tar.gz
+cd $TGZ_DIRNAME
+
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \+ -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:
+CFLAGS="$SLKCFLAGS" \
+MYSQL=NO \
+DESTDIR=/usr \
+CONFDIR=/etc \
+  ./configure
+
+# Build and install:
+make
+
+# spool dir + usenet database
+mkdir -p $PKG/var/spool/news/wendzelnntpd
+
+# og-rwx since the passwords are stored in the database too!
+install -d -m 0700 -o 0 -g 0 $PKG/var/spool/news/wendzelnntpd
+cp database/usenet.db $PKG/var/spool/news/wendzelnntpd/usenet.db.new
+chmod 600 $PKG/var/spool/news/wendzelnntpd/usenet.db.new
+
+# add the rc.d script ; also fix URL of the deamon binary
+mkdir -p $PKG/etc/rc.d
+cat scripts/startup/init.d_script | sed 's/^DAEMON=.*$/DAEMON=\/usr\/sbin\/wendzelnntpd/' > $PKG/etc/rc.d/rc.wendzelnntpd.new
+chmod 644 $PKG/etc/rc.d/rc.wendzelnntpd.new
+
+# add the binaries
+mkdir -p $PKG/usr/sbin
+chmod 0755 $PKG/usr/sbin/
+cp -v bin/wendzelnntpd bin/wendzelnntpadm $PKG/usr/sbin/
+chmod 755 $PKG/usr/sbin/*
+
+# rename config file to .new
+cp -v wendzelnntpd.conf $PKG/etc/wendzelnntpd.conf.new
+chmod 644 $PKG/etc/wendzelnntpd.conf.new
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
+# add version number to doc directory and also put it in /usr/doc
+# instead of /usr/share/doc
+PKGDOC=$PKG/usr/doc/$PRGNAM-$VERSION
+mkdir -p $PKGDOC
+cp -vr docs/docs $PKGDOC
+cp -v docs/docs.pdf $PKGDOC/docs.pdf
+cp -v AUTHOR CHANGELOG HISTORY README.md LICENSE \
+      database/usenet.db_struct database/mysql_db_struct.sql \
+      $PKGDOC
+cat $CWD/$PRGNAM.SlackBuild > $PKGDOC/$PRGNAM.SlackBuild
+
+# 20230515 bkw: duplicate file, use symlink
+rm -f $PKGDOC/docs/index.html
+ln -s docs.html $PKGDOC/docs/index.html
+
+# 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
+
+# This is kept for the case that wendzelnntpd will contain a manpage in the future.
+#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
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/network/wendzelnntpd/wendzelnntpd.info b/network/wendzelnntpd/wendzelnntpd.info
new file mode 100644
index 0000000000..53e888a969
--- /dev/null
+++ b/network/wendzelnntpd/wendzelnntpd.info
@@ -0,0 +1,10 @@
+PRGNAM="wendzelnntpd"
+VERSION="2.1.2"
+HOMEPAGE="https://cdpxe.github.io/WendzelNNTPd/"
+DOWNLOAD="https://downloads.sourceforge.net/project/wendzelnntpd/v2.1.2/v2.1.2.tar.gz"
+MD5SUM="3cbeeca74d5e6ddb7e3bb99e99f86ddf"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Steffen Wendzel"
+EMAIL="wendzel@hs-worms.de"
diff --git a/network/whalebird/README b/network/whalebird/README
new file mode 100644
index 0000000000..f138e940fa
--- /dev/null
+++ b/network/whalebird/README
@@ -0,0 +1,4 @@
+Whalebird is an Electron based Mastodon, Pleroma and Misskey client.
+
+This SlackBuild repackages the upstream rpm package. This rpm is only
+available for 64-bit systems.
diff --git a/network/whalebird/doinst.sh b/network/whalebird/doinst.sh
new file mode 100644
index 0000000000..65c7e2eeb9
--- /dev/null
+++ b/network/whalebird/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/network/whalebird/slack-desc b/network/whalebird/slack-desc
new file mode 100644
index 0000000000..aabc50859c
--- /dev/null
+++ b/network/whalebird/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+         |-----handy-ruler------------------------------------------------------|
+whalebird: whalebird (Mastondon, Pleroma and Misskey client)
+whalebird:
+whalebird: Whalebird is an Electron based Mastodon, Pleroma and Misskey client. 
+whalebird:
+whalebird: Homepage https://whalebird.social
+whalebird:
+whalebird:
+whalebird:
+whalebird:
+whalebird:
+whalebird:
diff --git a/network/whalebird/whalebird.SlackBuild b/network/whalebird/whalebird.SlackBuild
new file mode 100644
index 0000000000..d62a3b3377
--- /dev/null
+++ b/network/whalebird/whalebird.SlackBuild
@@ -0,0 +1,91 @@
+#!/bin/bash
+
+# Slackware build script for whalebird
+
+# 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=whalebird
+VERSION=${VERSION:-6.1.0}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+SRCNAM=Whalebird
+
+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 for $PRGNAM-$VERSION." >&2
+  exit 1
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $PKG
+bsdtar -xvf $CWD/${SRCNAM}-${VERSION}-linux-${ARCH}.rpm
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -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
+
+# Fix sbopkglint gripes - icon resolution directory should be 310x150 rather than 310x310
+mv $PKG/usr/share/icons/hicolor/310x310 $PKG/usr/share/icons/hicolor/310x150
+
+# Remove extraneous /usr/lib directory (it only contains /usr/lib/.build-id)
+rm -r $PKG/usr/lib/
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+  $PKG/opt/Whalebird/LICENSE.electron.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/network/whalebird/whalebird.info b/network/whalebird/whalebird.info
new file mode 100644
index 0000000000..d92c1e92f9
--- /dev/null
+++ b/network/whalebird/whalebird.info
@@ -0,0 +1,10 @@
+PRGNAM="whalebird"
+VERSION="6.1.0"
+HOMEPAGE="https://whalebird.social"
+DOWNLOAD="UNSUPPORTED"
+MD5SUM=""
+DOWNLOAD_x86_64="https://github.com/h3poteto/whalebird-desktop/releases/download/v6.1.0/Whalebird-6.1.0-linux-x86_64.rpm"
+MD5SUM_x86_64="c9b2fa4ee6cef61b4b84a6d59571fea9"
+REQUIRES=""
+MAINTAINER="Antonio Leal"
+EMAIL="antonioleal@yahoo.com"
diff --git a/network/wifi-radar/README b/network/wifi-radar/README
index 6609097e64..583a7f1442 100644
--- a/network/wifi-radar/README
+++ b/network/wifi-radar/README
@@ -1,8 +1,9 @@
-WiFi Radar is a Python/PyGTK2 utility for managing WiFi profiles on GNU/Linux.
+WiFi Radar is a Python/PyGTK2 utility for managing WiFi profiles on
+GNU/Linux.
 
-It enables you to scan for available networks and create profiles for your
-preferred networks. You can drag and drop your preferred networks to arrange
-the profile priority.
+It enables you to scan for available networks and create profiles for
+your preferred networks. You can drag and drop your preferred networks
+to arrange the profile priority.
 
 WiFi Radar is tested to work with an Intel iwlagn 6300 on Slackware but
 should work just the same for any iwconfig interface.
diff --git a/network/wifi-radar/wifi-radar.SlackBuild b/network/wifi-radar/wifi-radar.SlackBuild
index ff0388b9c1..76a088e43a 100644
--- a/network/wifi-radar/wifi-radar.SlackBuild
+++ b/network/wifi-radar/wifi-radar.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for wifi-radar
 
-# Copyright 2010  David Woodfall <dave@dawoodfall.net>
+# Copyright 2010  David Woodfall <dave@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=wifi-radar
 VERSION=${VERSION:-2.0.s10}
 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 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/network/wifi-radar/wifi-radar.info b/network/wifi-radar/wifi-radar.info
index 2453167d1c..f79b531c33 100644
--- a/network/wifi-radar/wifi-radar.info
+++ b/network/wifi-radar/wifi-radar.info
@@ -6,5 +6,5 @@ MD5SUM="f29993d2af69e0c23e6a188f83a77578"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="David Woodfall"
-EMAIL="dave@dawoodfall.net"
+MAINTAINER="D Woodfall"
+EMAIL="dave@slackbuilds.org"
diff --git a/network/wifite/wifite.SlackBuild b/network/wifite/wifite.SlackBuild
index c46f6f85e7..23cb180d56 100644
--- a/network/wifite/wifite.SlackBuild
+++ b/network/wifite/wifite.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for wifite
 
@@ -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=wifite
 VERSION=${VERSION:-20150525_edbdedd}
 COMMIT=${COMMIT:-edbdedd149254f58a99d2f53e5e9b8105c4c61bb}
 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 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/network/wildfly/README b/network/wildfly/README
index 13ea6db2fc..c7f40c6ac5 100644
--- a/network/wildfly/README
+++ b/network/wildfly/README
@@ -1,12 +1,21 @@
-WildFly is a free, open source, Java EE certified platform for developing and
-deploying enterprise Java applications, Web applications, and Portals,
-WildFly Application Server provides the full range of Java EE 7 features as
-well as extended enterprise services including clustering, caching, and
-persistence.
+WildFly is a free, open source, Java EE certified platform
+for developing and deploying enterprise Java applications, Web
+applications, and Portals, WildFly Application Server provides the
+full range of Jakarta EE 10 features as well as extended enterprise
+services including clustering, caching, and persistence.
 
-WildFly requires a "wildfly" user and group; create these before running the
-SlackBuild script. Examples:
+WildFly requires a "wildfly" user and group; create these before
+running the SlackBuild script. Examples:
 
 # groupadd -g 282 -r wildfly
 # useradd -u 282 -M -r -s /bin/bash -d /usr/share/wildfly \
     -c "WildFly Application Server" -g wildfly wildfly
+
+Read the documentation https://docs.wildfly.org
+
+This script created a default installation so the application
+is available at http://localhost:8080 and the administration
+console at http://localhost:9990/console.
+To connect to the console, you need to create an admin user with
+
+# /sbin/add-user.sh -m -u wildfly -p **secret**
diff --git a/network/wildfly/rc.wildfly b/network/wildfly/rc.wildfly
index 4ca3936bb6..4c13f4e2fe 100644
--- a/network/wildfly/rc.wildfly
+++ b/network/wildfly/rc.wildfly
@@ -2,7 +2,7 @@
 
 # Start/stop/restart wildfly.
 
-# Copyright 2017 Giorgio Peron <giorgio.peron@gmail.com>, Belluno, Italy
+# Copyright 2023 Giorgio Peron <giorgio.peron@gmail.com>, Belluno, Italy
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -36,20 +36,22 @@ export LAUNCH_WILDFLY_IN_BACKGROUND=yes
 
 # define the script to use to start standalone wildfly
 WILDFLY_START_STANDALONE=${WILDFLY_START_STANDALONE:-"$WILDFLY_HOME/bin/standalone.sh "}
+WILDFLY_START_DOMAIN=${WILDFLY_START_DOMAIN:-"$WILDFLY_HOME/bin/domain.sh "}
 
 # define the script to use to shutdown wildfly
 # change host and port as need
 WILDFLY_STOP_STANDALONE=${WILDFLY_STOP_STANDALONE:-"$WILDFLY_HOME/bin/jboss-cli.sh --connect controller=127.0.0.1:9990 command=:shutdown"}
+WILDFLY_STOP_DOMAIN=${WILDFLY_STOP_DOMAIN:-"$WILDFLY_HOME/bin/jboss-cli.sh --connect controller=127.0.0.1:9990 command=/host=primary:shutdown"}
 
 # define log file
-WILDFLY_CONSOLE="/var/log/wildfly/wildfly.log"
-WILDFLY_DOMAIN_CONSOLE="/var/log/wildfly/wildfly_domain.log"
+WILDFLY_CONSOLE="/var/log/wildfly/standalone/console.log"
+WILDFLY_DOMAIN_CONSOLE="/var/log/wildfly/domain/console.log"
 
 if [ -n "$WILDFLY_CONSOLE" -a ! -d "$WILDFLY_CONSOLE" ]; then
   # ensure the file exists
   touch $WILDFLY_CONSOLE
   if [ "$WILDFLYUS" != "RUNASIS" ]; then
-    chown -R $WILDFLYUS.$WILDFLYUS $WILDFLY_CONSOLE
+    chown -R $WILDFLYUS:$WILDFLYUS $WILDFLY_CONSOLE
   fi
 fi
 
@@ -66,7 +68,7 @@ if [ -n "$WILDFLY_DOMAIN_CONSOLE" -a ! -d "$WILDFLY_DOMAIN_CONSOLE" ]; then
   # ensure the file exists
   touch $WILDFLY_DOMAIN_CONSOLE
   if [ "$WILDFLYUS" != "RUNASIS" ]; then
-    chown -R $WILDFLYUS.$WILDFLYUS $WILDFLY_DOMAIN_CONSOLE
+    chown -R $WILDFLYUS:$WILDFLYUS $WILDFLY_DOMAIN_CONSOLE
   fi
 fi
 
@@ -82,6 +84,9 @@ WILDFLY_DOMAIN_CONSOLE=${WILDFLY_DOMAIN_CONSOLE:-"/dev/null"}
 CMD_START_STANDALONE="cd $WILDFLY_HOME/bin; $WILDFLY_START_STANDALONE" 
 CMD_STOP_STANDALONE="cd $WILDFLY_HOME/bin; $WILDFLY_STOP_STANDALONE"
 
+CMD_START_DOMAIN="cd $WILDFLY_HOME/bin; $WILDFLY_START_DOMAIN" 
+CMD_STOP_DOMAIN="cd $WILDFLY_HOME/bin; $WILDFLY_STOP_DOMAIN"
+
 if [ "$WILDFLYUS" = "RUNASIS" ]; then
   SUBIT=""
 else
diff --git a/network/wildfly/slack-desc b/network/wildfly/slack-desc
index 1bdf5cf2eb..aefdbb391d 100644
--- a/network/wildfly/slack-desc
+++ b/network/wildfly/slack-desc
@@ -6,12 +6,12 @@
 # customary to leave one space after the ':' except on otherwise blank lines.
 
        |-----handy-ruler------------------------------------------------------|
-wildfly: wildfly (Application Runtime)
+wildfly: wildfly (Application Server)
 wildfly:
-wildfly: WildFly is a free, open source, Java EE 7 platform for
+wildfly: WildFly is a free, open source, Jakarta EE 10 platform for
 wildfly: developing and deploying enterprise Java applications, Web
-wildfly: applications, and Portals, Wildfly provides the full
-wildfly: range of Java EE 7 features as well as extended enterprise services
+wildfly: applications, and Portals, Wildfly provides the full range of
+wildfly: Jakarta EE 10 features as well as extended enterprise services
 wildfly: including clustering, caching, and persistence.
 wildfly:
 wildfly:
diff --git a/network/wildfly/wildfly.SlackBuild b/network/wildfly/wildfly.SlackBuild
index 030d42c8fe..1d12665839 100644
--- a/network/wildfly/wildfly.SlackBuild
+++ b/network/wildfly/wildfly.SlackBuild
@@ -1,7 +1,7 @@
-#!/bin/sh
+#!/bin/bash
 # Slackware build script for WildFly
 
-# Copyright 2019 Giorgio Peron <giorgio.peron@gmail.com>, Belluno, Italy
+# Copyright 2023 Giorgio Peron <giorgio.peron@gmail.com>, Belluno, Italy
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -21,16 +21,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=wildfly
-VERSION=${VERSION:-16.0.0}
+VERSION=${VERSION:-30.0.1}
 MINORVER=${MINORVER:-.Final}
 
 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}
@@ -54,7 +64,7 @@ tar xvzf $CWD/$PRGNAM-$VERSION$MINORVER.tar.gz
 mkdir -p $PKG/usr/share/$PRGNAM
 mv $TMP/$PRGNAM-$VERSION$MINORVER/* $PKG/usr/share/$PRGNAM
 cd $PKG/usr/share/$PRGNAM
-chown -R root:root .
+chown -R wildfly:wildfly .
 
 # Move the docs to our standard location first
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
@@ -81,8 +91,16 @@ cd $PKG/var/lib/$PRGNAM/domain
 ln -sf ../../../../etc/$PRGNAM/domain/configuration configuration
 mkdir -p $PKG/var/{log,tmp}/$PRGNAM/standalone
 cd $PKG/var/lib/$PRGNAM/standalone
+mv $PKG/var/lib/$PRGNAM/standalone/tmp/* $PKG/var/tmp/$PRGNAM/standalone/
+rm -rf $PKG/var/lib/$PRGNAM/standalone/tmp
 ln -sf ../../../log/$PRGNAM/standalone log
 ln -sf ../../../tmp/$PRGNAM/standalone tmp
+mkdir -p $PKG/var/{log,tmp}/$PRGNAM/domain
+cd $PKG/var/lib/$PRGNAM/domain
+mv $PKG/var/lib/$PRGNAM/domain/tmp/* $PKG/var/tmp/$PRGNAM/domain/
+rm -rf $PKG/var/lib/$PRGNAM/domain/tmp
+ln -sf ../../../log/$PRGNAM/domain log
+ln -sf ../../../tmp/$PRGNAM/domain tmp
 
 mv $PKG/usr/share/$PRGNAM/bin/standalone.conf $PKG/etc/$PRGNAM/standalone/
 mv $PKG/usr/share/$PRGNAM/bin/domain.conf $PKG/etc/$PRGNAM/domain/
@@ -122,19 +140,10 @@ chmod 0755 $PKG/usr/share/$PRGNAM/bin/*.sh
 
 mkdir -p $PKG/sbin
 cd $PKG/sbin
-ln -sf ../usr/share/$PRGNAM/bin/add-user.sh
-ln -sf ../usr/share/$PRGNAM/bin/appclient.sh
-ln -sf ../usr/share/$PRGNAM/bin/common.sh
-ln -sf ../usr/share/$PRGNAM/bin/domain.sh
-ln -sf ../usr/share/$PRGNAM/bin/elytron-tool.sh
-ln -sf ../usr/share/$PRGNAM/bin/jboss-cli.sh
-ln -sf ../usr/share/$PRGNAM/bin/jconsole.sh
-ln -sf ../usr/share/$PRGNAM/bin/jdr.sh
-ln -sf ../usr/share/$PRGNAM/bin/standalone.sh
-ln -sf ../usr/share/$PRGNAM/bin/vault.sh
-ln -sf ../usr/share/$PRGNAM/bin/wsconsume.sh
-ln -sf ../usr/share/$PRGNAM/bin/wsprovide.sh
-
+for filename in ../usr/share/$PRGNAM/bin/*.sh; do
+  echo $filename
+  ln -sf $filename
+done
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
@@ -157,4 +166,4 @@ for cf in $( find etc/$PRGNAM/ -type f ); do
   echo "config $cf.new" >> install/doinst.sh
 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/network/wildfly/wildfly.info b/network/wildfly/wildfly.info
index d0a8b57678..dbc73de7e2 100644
--- a/network/wildfly/wildfly.info
+++ b/network/wildfly/wildfly.info
@@ -1,10 +1,10 @@
 PRGNAM="wildfly"
-VERSION="16.0.0"
-HOMEPAGE="http://wildfly.org"
-DOWNLOAD="http://download.jboss.org/wildfly/16.0.0.Final/wildfly-16.0.0.Final.tar.gz"
-MD5SUM="f64a2631b7a8b59f8a1200a5967f199c"
+VERSION="30.0.1"
+HOMEPAGE="https://wildfly.org"
+DOWNLOAD="https://github.com/wildfly/wildfly/releases/download/30.0.1.Final/wildfly-30.0.1.Final.tar.gz"
+MD5SUM="c6d6ac6d8adfd41ec88cb0cc45adf4d6"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="jdk"
+REQUIRES="zulu-openjdk17"
 MAINTAINER="Giorgio Peron"
 EMAIL="giorgio.peron@gmail.com"
diff --git a/network/windscribe/README b/network/windscribe/README
new file mode 100644
index 0000000000..d9a9bd4fcd
--- /dev/null
+++ b/network/windscribe/README
@@ -0,0 +1,18 @@
+Windscribe VPN is a Canada-based provider that promises to help you 
+browse the web privately. It contains a set of tools that work 
+together to block ad trackers and web beacons, restore access to 
+blocked content and help you safeguard your privacy online.
+You can use Windscribe for free, for as long as you like.
+With a confirmed email address you get 10GB/month of data
+and access to over 10 countries.
+
+The following can be used to start/stop Windscribe automatically:
+/etc/rc.d/rc.local
+  if [ -x /etc/rc.d/rc.windscribe ]; then
+    /etc/rc.d/rc.windscribe start
+  fi
+
+/etc/rc.d/rc.local_shutdown
+  if [ -x /etc/rc.d/rc.windscribe ]; then
+    /etc/rc.d/rc.windscribe stop
+  fi
diff --git a/network/windscribe/doinst.sh b/network/windscribe/doinst.sh
new file mode 100644
index 0000000000..b4c067fd2e
--- /dev/null
+++ b/network/windscribe/doinst.sh
@@ -0,0 +1,17 @@
+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 [ -x /etc/rc.d/rc.windscribe ]; then
+    /etc/rc.d/rc.windscribe restart
+fi
diff --git a/network/windscribe/open_source_licenses.txt b/network/windscribe/open_source_licenses.txt
new file mode 100644
index 0000000000..9c5b1fce3f
--- /dev/null
+++ b/network/windscribe/open_source_licenses.txt
@@ -0,0 +1,1137 @@
+Windscribe uses the following open source software:
+- Markus F.X.J. Oberhumer's LZO (GPLv2)
+- Qt framework (LGPLv3)
+- Michal Trojnara's Stunnel (GPL)
+- Daniel Stenberg's c-ares (MIT)
+- Jason A. Donenfeld's Wireguard (MIT)
+- Jason A. Donenfeld's Wintun (GPLv2)
+- OpenVPN (GPLv2)
+- OpenVPN Technologies, Inc's TAP-Win32/TAP-Win64 (GPLv2)
+- NSIS zlib/libpng
+- OpenSSL Project's OpenSSL + SSLeay 
+
+
+============================ LICENSES BELOW ==============================
+
+LZO
+http://www.oberhumer.com/opensource/lzo/
+##########################################
+
+                    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 Lesser 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
+
+-----------------------------------------------------------------------------
+
+Qt
+https://www.qt.io/
+##########################################
+The Qt Toolkit is Copyright (C) 2018 The Qt Company Ltd. and other contributors.
+
+             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.
+
+-----------------------------------------------------------------------------
+
+Stunnel
+https://www.stunnel.org/
+##########################################
+Copyright (C) 1998-2021 Michal Trojnara
+
+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, see http://www.gnu.org/licenses.
+
+Linking stunnel statically or dynamically with other modules is making a combined work based on stunnel. Thus, the terms and conditions of the GNU General Public License cover the whole combination.
+
+In addition, as a special exception, the copyright holder of stunnel gives you permission to combine stunnel with free software programs or libraries that are released under the GNU LGPL and with code included in the standard release of OpenSSL under the OpenSSL License (or modified versions of such code, with unchanged license). You may copy and distribute such a system following the terms of the GNU GPL for stunnel and the licenses of the other code concerned.
+
+Note that people who make modified versions of stunnel are not obligated to grant this special exception for their modified versions; it is their choice whether to do so. The GNU General Public License gives permission to release a modified version without this exception; this exception also makes it possible to release a modified version which carries forward this exception.
+
+-----------------------------------------------------------------------------
+
+c-ares
+https://github.com/c-ares/c-ares
+##########################################
+Copyright (c) 2007 - 2018, Daniel Stenberg with many contributors, see AUTHORS file.
+
+Copyright 1998 by the Massachusetts Institute of Technology.
+
+Permission to use, copy, modify, and distribute this software and its documentation for any purpose and without fee is hereby granted, provided that the above copyright notice appear in all copies and that both that copyright notice and this permission notice appear in supporting documentation, and that the name of M.I.T. not be used in advertising or publicity pertaining to distribution of the software without specific, written prior permission. M.I.T. makes no representations about the suitability of this software for any purpose. It is provided "as is" without express or implied warranty.
+
+-----------------------------------------------------------------------------
+
+Wireguard
+https://www.wireguard.com/
+##########################################
+Copyright (C) 2017-2021 WireGuard LLC. 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.
+
+-----------------------------------------------------------------------------
+
+Wintun
+https://www.wintun.net/
+##########################################
+This program is Copyright (C) 2018-2021 WireGuard LLC.
+
+                    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 Lesser 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
+
+
+-----------------------------------------------------------------------------
+
+OpenVPN
+https://github.com/OpenVPN/openvpn
+##########################################
+OpenVPN (TM) -- An Open Source VPN daemon
+
+Copyright (C) 2002-2021 OpenVPN Inc <sales@openvpn.net>
+
+This distribution contains multiple components, some
+of which fall under different licenses.  By using OpenVPN
+or any of the bundled components enumerated below, you
+agree to be bound by the conditions of the license for
+each respective component.
+
+OpenVPN trademark
+-----------------
+
+  "OpenVPN" is a trademark of OpenVPN Inc
+
+
+OpenVPN license:
+----------------
+
+  OpenVPN is distributed under the GPL license version 2 (see Below).
+
+  Special exception for linking OpenVPN with OpenSSL:
+
+  In addition, as a special exception, OpenVPN Inc gives
+  permission to link the code of this program with the OpenSSL
+  library (or with modified versions of OpenSSL that use the same
+  license as OpenSSL), and distribute linked combinations including
+  the two.  You must obey the GNU General Public License in all
+  respects for all of the code used other than OpenSSL.  If you modify
+  this file, you may extend this exception to your version of the
+  file, but you are not obligated to do so.  If you do not wish to
+  do so, delete this exception statement from your version.
+
+LZO license:
+------------
+
+  LZO is Copyright (C) Markus F.X.J. Oberhumer,
+  and is licensed under the GPL.
+
+  Special exception for linking OpenVPN with both OpenSSL and LZO:
+
+  Hereby I grant a special exception to the OpenVPN project 
+  (http://openvpn.net/) to link the LZO library with 
+  the OpenSSL library (http://www.openssl.org).
+ 
+  Markus F.X.J. Oberhumer
+
+TAP-Win32/TAP-Win64 Driver license:
+-----------------------------------
+
+  This device driver was inspired by the CIPE-Win32 driver by
+  Damion K. Wilson.
+
+  The source and object code of the TAP-Win32/TAP-Win64 driver
+  is Copyright (C) 2002-2018 OpenVPN Inc, and is released under
+  the GPL version 2.
+
+Windows DDK Samples:
+--------------------
+
+  The Windows binary distribution includes devcon.exe, a
+  Microsoft DDK sample which is redistributed under the terms
+  of the DDK EULA.
+
+NSIS License:
+-------------
+
+  Copyright (C) 2002-2003 Joost Verburg
+
+  This software is provided 'as-is', without any express or implied
+  warranty. In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute
+  it freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; 
+     you must not claim that you wrote the original software.
+     If you use this software in a product, an acknowledgment in the
+     product documentation would be appreciated but is not required.
+  2. Altered versions must be plainly marked as such,
+     and must not be misrepresented as being the original software.
+  3. This notice may not be removed or altered from any distribution.
+
+OpenSSL License:
+----------------
+
+  The OpenSSL toolkit stays under a dual license, i.e. both the conditions of
+  the OpenSSL License and the original SSLeay license apply to the toolkit.
+  See below for the actual license texts. Actually both licenses are BSD-style
+  Open Source licenses. In case of any license issues related to OpenSSL
+  please contact openssl-core@openssl.org.
+
+/* ====================================================================
+ * Copyright (c) 1998-2003 The OpenSSL Project.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer. 
+ *
+ * 2. 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.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ *    software must display the following acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
+ *
+ * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For written permission, please contact
+ *    openssl-core@openssl.org.
+ *
+ * 5. Products derived from this software may not be called "OpenSSL"
+ *    nor may "OpenSSL" appear in their names without prior written
+ *    permission of the OpenSSL Project.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``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 OpenSSL PROJECT OR
+ * ITS 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.
+ * ====================================================================
+ *
+ * This product includes cryptographic software written by Eric Young
+ * (eay@cryptsoft.com).  This product includes software written by Tim
+ * Hudson (tjh@cryptsoft.com).
+ *
+ */
+
+ Original SSLeay License
+ -----------------------
+
+/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
+ * All rights reserved.
+ *
+ * This package is an SSL implementation written
+ * by Eric Young (eay@cryptsoft.com).
+ * The implementation was written so as to conform with Netscapes SSL.
+ * 
+ * This library is free for commercial and non-commercial use as long as
+ * the following conditions are aheared to.  The following conditions
+ * apply to all code found in this distribution, be it the RC4, RSA,
+ * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
+ * included with this distribution is covered by the same copyright terms
+ * except that the holder is Tim Hudson (tjh@cryptsoft.com).
+ * 
+ * Copyright remains Eric Young's, and as such any Copyright notices in
+ * the code are not to be removed.
+ * If this package is used in a product, Eric Young should be given attribution
+ * as the author of the parts of the library used.
+ * This can be in the form of a textual message at program startup or
+ * in documentation (online or textual) provided with the package.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. 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.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *    "This product includes cryptographic software written by
+ *     Eric Young (eay@cryptsoft.com)"
+ *    The word 'cryptographic' can be left out if the rouines from the library
+ *    being used are not cryptographic related :-).
+ * 4. If you include any Windows specific code (or a derivative thereof) from 
+ *    the apps directory (application code) you must include an acknowledgement:
+ *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
+ * 
+ * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR 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.
+ * 
+ * The licence and distribution terms for any publically available version or
+ * derivative of this code cannot be changed.  i.e. this code cannot simply be
+ * copied and put under another distribution licence
+ * [including the GNU Public Licence.]
+ */
+
+GNU Public License (GPL)
+------------------------
+
+  OpenVPN, LZO, and the TAP-Win32 distributions are
+  licensed under the GPL version 2 (see COPYRIGHT.GPL).
+
+  In the Windows binary distribution of OpenVPN, the
+  GPL is reproduced below.
+
+-----------------------------------------------------------------------------
+
+TAP-Win32/TAP-Win64
+https://github.com/OpenVPN/tap-windows6
+##########################################
+The source and object code of the tap-windows6 project
+is Copyright (C) 2002-2014 OpenVPN Technologies, Inc. The
+NSIS installer is Copyright (C) 2014 OpenVPN Technologies,
+Inc. and (C) 2012 Alon Bar-Lev. The installer.dll MSI helper
+is Copyright (C) 2018-2019 WireGuard LLC. All are released
+under the GPL version 2. See COPYRIGHT.GPL for the full GPL
+license. The licensors also make the following statement
+borrowed from the SPICE project:
+
+With respect to binaries built using the Microsoft(R)
+Windows Driver Kit (WDK), GPLv2 does not extend to any code
+contained in or derived from the WDK ("WDK Code").  As to
+WDK Code, by using or distributing such binaries you agree
+to be bound by the Microsoft Software License Terms for the
+WDK.  All WDK Code is considered by the GPLv2 licensors to
+qualify for the special exception stated in section 3 of
+GPLv2 (commonly known as the system library exception).
+
+The tap-windows.h file has been released under the MIT
+license (see COPYRIGHT.MIT) as well as under GPLv2 (see
+COPYRIGHT.GPL). This has been done to allow the use of the
+header file in non-GPLv2 compatible projects.
+
+-----------------------------------------------------------------------------
+
+NSIS zlib/libpng
+https://nsis.sourceforge.io/License
+##########################################
+This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software.
+
+Permission is granted to anyone to use this software for any purpose, including commercial applications, and to alter it and redistribute it freely, subject to the following restrictions:
+
+The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+This notice may not be removed or altered from any source distribution.
+
+-----------------------------------------------------------------------------
+
+OpenSSL Project's OpenSSL + SSLeay 
+https://www.openssl.org/
+##########################################
+/* ====================================================================
+ * Copyright (c) 1998-2019 The OpenSSL Project.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ * 2. 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.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ *    software must display the following acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
+ *
+ * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For written permission, please contact
+ *    openssl-core@openssl.org.
+ *
+ * 5. Products derived from this software may not be called "OpenSSL"
+ *    nor may "OpenSSL" appear in their names without prior written
+ *    permission of the OpenSSL Project.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``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 OpenSSL PROJECT OR
+ * ITS 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.
+ * ====================================================================
+ *
+ * This product includes cryptographic software written by Eric Young
+ * (eay@cryptsoft.com).  This product includes software written by Tim
+ * Hudson (tjh@cryptsoft.com).
+ *
+ */
diff --git a/network/windscribe/rc.windscribe b/network/windscribe/rc.windscribe
new file mode 100644
index 0000000000..dc3b523ffd
--- /dev/null
+++ b/network/windscribe/rc.windscribe
@@ -0,0 +1,79 @@
+#!/usr/bin/env bash
+
+
+
+PRGNAM=helper
+PID=/var/run/$PRGNAM.pid
+DAEMON=/opt/windscribe/helper
+
+
+#
+# Function that starts the daemon
+#
+windscribe_start()
+{
+  if [ -s $PID ]; then
+    echo "Windscribe is already running: $(cat $PID)"
+    exit 1
+  fi
+
+  if [ -x $DAEMON ]; then
+    $DAEMON &
+    pidof $DAEMON > $PID
+  fi
+}
+
+#
+# Function that stops the daemon
+#
+windscribe_stop()
+{
+  if [ -s $PID ]; then
+    kill $(cat $PID)
+    rm -rf $PID
+  else
+    echo "Windscribe is not running."
+  fi
+}
+
+#
+# Function that restarts the daemon
+#
+windscribe_restart()
+{
+  windscribe_stop
+  sleep 1
+  windscribe_start
+}
+
+#
+# Function that shows the current status of the daemon
+#
+windscribe_status()
+{
+  if [ -s $PID ]; then
+    echo "Windscribe is running: $(cat $PID)"
+  else
+    echo "Windscribe is not running."
+  fi
+}
+
+
+case "$1" in
+  start)
+    windscribe_start
+    ;;
+  stop)
+    windscribe_stop
+    ;;
+  restart)
+    windscribe_restart
+    ;;
+  status)
+    windscribe_status
+    ;;
+  *)
+    echo $"Usage: $0 {start|stop|restart|status}"
+    exit 1
+    ;;
+esac
diff --git a/network/windscribe/slack-desc b/network/windscribe/slack-desc
new file mode 100644
index 0000000000..44efc4ade4
--- /dev/null
+++ b/network/windscribe/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+          |-----handy-ruler------------------------------------------------------|
+windscribe: windscribe (Browse the web privately.)
+windscribe:
+windscribe: Windscribe VPN is a Canada-based provider that promises to help you 
+windscribe: browse the web privately. It contains a set of tools that work 
+windscribe: together to block ad trackers and web beacons, restore access to 
+windscribe: blocked content and help you safeguard your privacy online.
+windscribe: You can use Windscribe for free, for as long as you like. With a
+windscribe: confirmed email address you get 10GB/month of data.
+windscribe:
+windscribe: https://www.windscribe.com/
+windscribe:
diff --git a/network/windscribe/windscribe.SlackBuild b/network/windscribe/windscribe.SlackBuild
new file mode 100644
index 0000000000..633915265c
--- /dev/null
+++ b/network/windscribe/windscribe.SlackBuild
@@ -0,0 +1,91 @@
+#!/bin/bash
+#
+# Slackware build script for Windscribe.
+#
+# Copyright 2020 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.
+
+# Modified by Pouria Rezaei <Pouria.rz@outlook.com>
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=windscribe
+VERSION=${VERSION:-2.9.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
+
+if [ "$ARCH" = "x86_64" ]; then
+  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
+rm -rf $PRGNAM-$VERSION
+mkdir -p $PRGNAM-$VERSION
+
+cd $PRGNAM-$VERSION
+rpm2cpio $CWD/${PRGNAM}_${VERSION}_${ARCH}.rpm | cpio -idmv
+rm -fR etc/{systemd,windscribe/update-systemd-resolved} usr/local
+
+mv * $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/polkit-1 $PKG/usr/share/
+chmod 644 $PKG/usr/share/applications/windscribe.desktop
+chmod 644 $PKG/usr/share/icons/hicolor/*/apps/windscribe.png
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
+mkdir -p $PKG/etc/rc.d/
+install -m 0755 $CWD/rc.$PRGNAM $PKG/etc/rc.d/rc.$PRGNAM
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/network/windscribe/windscribe.info b/network/windscribe/windscribe.info
new file mode 100644
index 0000000000..c29e8824a0
--- /dev/null
+++ b/network/windscribe/windscribe.info
@@ -0,0 +1,10 @@
+PRGNAM="windscribe"
+VERSION="2.9.9"
+HOMEPAGE="https://www.windscribe.com/"
+DOWNLOAD="UNSUPPORTED"
+MD5SUM=""
+DOWNLOAD_x86_64="https://github.com/Windscribe/Desktop-App/releases/download/v2.9.9/windscribe_2.9.9_x86_64.rpm"
+MD5SUM_x86_64="1a4a27e99d31e82d7fcff3794dc30137"
+REQUIRES=""
+MAINTAINER="Reza Talebi"
+EMAIL="reza.talebi.73@outlook.com"
diff --git a/network/wire/README b/network/wire/README
index 40cff1e57c..930951df16 100644
--- a/network/wire/README
+++ b/network/wire/README
@@ -4,9 +4,9 @@ Our personal and professional data is at the center of a new economy.
 The information we share on social networks, via email, and messaging
 services is being used to build profiles. These profiles are in turn
 used to sell us products and services through targeted advertising and
-suggestion. The data collected is vast, detailed, and often very personal.
-Vast resources are being spent to refine the profiles, all without
-transparency, policy or oversight.
+suggestion. The data collected is vast, detailed, and often very
+personal.  Vast resources are being spent to refine the profiles, all
+without transparency, policy or oversight.
 
 Our personal and professional online communications should not be part
 of this economy. In the physical world we talk with each other directly.
diff --git a/network/wire/wire.SlackBuild b/network/wire/wire.SlackBuild
index 160bd830cf..3c7eb878a3 100644
--- a/network/wire/wire.SlackBuild
+++ b/network/wire/wire.SlackBuild
@@ -1,8 +1,9 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for wire
 
-# Copyright 2016-2019  Dimitris Zlatanidis  Orestiada, Greece
+# Copyright 2016-2019 Dimitris Zlatanidis  Orestiada, Greece
+# Copyright 2020 David O'Shaughnessy
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,43 +23,56 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=wire
-VERSION=${VERSION:-3.5.2881}
+VERSION=${VERSION:-3.26.2941}
 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
+    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
 
-CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
 if [ "$ARCH" = "i586" ]; then
-  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
-  LIBDIRSUFFIX=""
+    SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+    LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-  LIBDIRSUFFIX=""
+    SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+    LIBDIRSUFFIX=""
 elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
+    SLKCFLAGS="-O2 -fPIC"
+    LIBDIRSUFFIX="64"
 else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
+    SLKCFLAGS="-O2"
+    LIBDIRSUFFIX=""
 fi
 
 set -e
 
-DEBARCH="i386"
+# Upstream only has binary support for x86_64.
 if [ "$ARCH" = "x86_64" ]; then
     DEBARCH="amd64"
+else
+    echo "Sorry, the Wire binary is only available for x86_64."
+    exit 1
 fi
 
 rm -rf $PKG
@@ -66,26 +80,26 @@ mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
 mkdir -p $PRGNAM-$VERSION && cd $PRGNAM-$VERSION
-ar p $CWD/$PRGNAM\_$VERSION\_$DEBARCH.deb data.tar.xz | tar xJv
+ar p $CWD/${PRGNAM^}-$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 {} \;
+     \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+     -o -perm 511 \) -exec chmod 755 {} \; -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 data
 mkdir -p $PKG/opt/${PRGNAM^}
 cp -rf opt/${PRGNAM^}/* $PKG/opt/${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
+    | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 # Create soft link for launcher
 mkdir -p $PKG/usr/bin
 (
- cd $PKG/usr/bin
- ln -sf /opt/${PRGNAM^}/$PRGNAM-desktop $PRGNAM-desktop
+    cd $PKG/usr/bin
+    ln -sf /opt/${PRGNAM^}/$PRGNAM-desktop $PRGNAM-desktop
 )
 
 # Install .desktop file
@@ -96,12 +110,12 @@ cat usr/share/applications/$PRGNAM-desktop.desktop > \
 # Install .desktop icon
 mkdir -p $PKG/usr/share/pixmaps
 install -D -m0644 usr/share/icons/hicolor/32x32/apps/$PRGNAM-desktop.png \
-    $PKG/usr/share/pixmaps/$PRGNAM-desktop.png
+	$PKG/usr/share/pixmaps/$PRGNAM-desktop.png
 
 gunzip usr/share/doc/$PRGNAM-desktop/changelog.gz
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a usr/share/doc/$PRGNAM-desktop/changelog opt/${PRGNAM^}/LICENSE* \
-    $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
@@ -109,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/network/wire/wire.info b/network/wire/wire.info
index 5bb7ae21fa..e0d4d681aa 100644
--- a/network/wire/wire.info
+++ b/network/wire/wire.info
@@ -1,10 +1,10 @@
 PRGNAM="wire"
-VERSION="3.5.2881"
+VERSION="3.26.2941"
 HOMEPAGE="https://wire.com/"
-DOWNLOAD="https://wire-app.wire.com/linux/debian/pool/main/wire_3.5.2881_i386.deb"
-MD5SUM="8482c67aef41b11637cb655bc52ad843"
-DOWNLOAD_x86_64="https://wire-app.wire.com/linux/debian/pool/main/wire_3.5.2881_amd64.deb"
-MD5SUM_x86_64="3737d3b06ef0daa378ae6de06f76373a"
+DOWNLOAD="UNSUPPORTED"
+MD5SUM=""
+DOWNLOAD_x86_64="https://wire-app.wire.com/linux/Wire-3.26.2941_amd64.deb"
+MD5SUM_x86_64="51c67571c8cc8ee37f322cbb90e6a5c3"
 REQUIRES=""
-MAINTAINER="Dimitris Zlatanidis"
-EMAIL="d.zlatanidis@gmail.com"
+MAINTAINER="David O'Shaughnessy"
+EMAIL="dev@osh.id.au"
diff --git a/network/wireshark/README b/network/wireshark/README
index 65c3490f74..7b9f4a600b 100644
--- a/network/wireshark/README
+++ b/network/wireshark/README
@@ -1,22 +1,43 @@
-Wireshark (aka Ethereal) is a free packet sniffer computer application.  It 
-is used for network troubleshooting, analysis, software and communications
-protocol development, and education.  In June 2006, the project was renamed 
-from Ethereal due to trademark issues.
-
-The functionality Wireshark provides is very similar to tcpdump, but it has
-a graphical front-end and many more information sorting and filtering
-options.  It allows the user to see all traffic being passed over the network
-(usually an Ethernet network but support is being added for others) by
-putting the network interface into promiscuous mode.
-
-Wireshark uses the cross-platform Qt5 widget toolkit.  Its powerful features
-make it the tool of choice for network troubleshooting, protocol development,
-and education worldwide.
-
-If you use a filesystem that supports posix capabilities, an easy way to 
-start wireshark as a normal user, while still providing it with all of the 
-access permissions it requires, is by issuing the following command:
-  $ setcap cap_net_raw,cap_net_admin=eip /usr/bin/dumpcap
+Wireshark (aka Ethereal) is a free packet sniffer computer
+application.  It is used for network troubleshooting, analysis,
+software and communications protocol development, and education.
+In June 2006, the project was renamed from Ethereal due to trademark
+issues.
+
+The functionality Wireshark provides is very similar to tcpdump, but
+it has a graphical front-end and many more information sorting and
+filtering options.  It allows the user to see all traffic being passed
+over the network (usually an Ethernet network but support is being
+added for others) by putting the network interface into promiscuous
+mode.
+
+Wireshark uses the cross-platform Qt5 widget toolkit.  Its powerful
+features make it the tool of choice for network troubleshooting,
+protocol development, and education worldwide.
+
+If you use a filesystem that supports posix capabilities, an easy way
+to start wireshark as a normal user, while still providing it with
+all of the access permissions it requires, is by issuing the following
+command as root:
+  # setcap cap_net_raw,cap_net_admin=ep /usr/bin/dumpcap
+
+One may also test if things are ok running this command as a normal
+user:
+
+  $ dumpcap -L
+
+You may also create a special group (wireshark) and include users
+allowed to monitor networks in that group:
+
+  # groupadd wireshark
+  # usermod -a -G wireshark <user>
+  # chgrp wireshark /usr/bin/dumpcap
+  # chmod 750 /usr/bin/dumpcap
+  # setcap cap_net_raw,cap_net_admin=eip /usr/bin/dumpcap
+  $ newgrp wireshark
+
+Other users not in the group wireshark can still open files with
+previously saved monitorings and inspect them.
 
 You will need to remove any already-installed wireshark package before 
 building this one or else the new one will not work (the new build will
@@ -24,15 +45,13 @@ link libraries present in the old package, which will then be removed
 when upgrading).
 
 Optional dependencies:
-- c-ares
-- krb5
-- nghttp2
 - spandsp
 - snappy
-- lz4
 - libsmi
+- libminizip
+- libilbc
 
-NOTE: Wireshark 3.0 no longer support legacy GTK+ UI.
+NOTE: Wireshark 3.0 no longer supports legacy GTK+ UI.
 
 NOTE: Although lua is listed as a requirement, it's possible to build
 using lua52. This may be needed for some third-party Lua plugins (but,
diff --git a/network/wireshark/wireshark.SlackBuild b/network/wireshark/wireshark.SlackBuild
index 23ab980b04..dee353ae35 100644
--- a/network/wireshark/wireshark.SlackBuild
+++ b/network/wireshark/wireshark.SlackBuild
@@ -1,9 +1,9 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for wireshark
 
 # Copyright 2008-2014  Michiel van Wessem, Leicester, United Kingdom
-# Copyright 2017-2019 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
+# Copyright 2017-2024 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
 # Originally written by Jick Nan (jick.nan@gmail.com)
 # All rights reserved.
 #
@@ -27,12 +27,15 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 # Modified by Mario Preksavec <mario@slackware.hr>
-# Modified by B. Watson <yalhcru@gmail.com> to add lua52 support.
+# Modified by B. Watson <urchlay@slackware.uk> to add lua52 support.
+
+cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=wireshark
-VERSION=${VERSION:-3.0.3}
+VERSION=${VERSION:-4.2.4}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -42,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}
@@ -96,7 +103,10 @@ cd build
     -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
     -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
     -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_INSTALL_MANDIR=/usr/man \
+    -DCMAKE_INSTALL_DOCDIR=/usr/doc/$PRGNAM-$VERSION \
     -DLIB_SUFFIX=${LIBDIRSUFFIX} \
+    -DUSE_qt6=OFF \
     -DCMAKE_BUILD_TYPE=Release ..
   make
   make install DESTDIR=$PKG
@@ -105,25 +115,29 @@ 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/include/$PRGNAM/{epan/{crypt,dfilter,dissectors,ftypes,wmem},wiretap,wsutil}
-install -m644 ws_diag_control.h ws_symbol_export.h $PKG/usr/include/$PRGNAM
-  for d in epan epan/crypt epan/dfilter epan/dissectors epan/ftypes epan/wmem; do
+install -m644 include/ws_diag_control.h include/ws_symbol_export.h $PKG/usr/include/$PRGNAM
+  for d in epan epan/crypt epan/dfilter epan/dissectors epan/ftypes; do
     install -m644 $d/*.h $PKG/usr/include/$PRGNAM/$d
   done
 
 mkdir -p $PKG/usr/share/applications
-cp $PRGNAM.desktop $PKG/usr/share/applications
+cp resources/freedesktop/org.wireshark.Wireshark.desktop $PKG/usr/share/applications
+
+mkdir -p $PKG/usr/share/mime/packages
+cp resources/freedesktop/org.wireshark.Wireshark-mime.xml $PKG/usr/share/mime/packages
+
+mkdir -p $PKG/usr/share/metainfo
+cp resources/freedesktop/org.wireshark.Wireshark.metainfo.xml $PKG/usr/share/metainfo
 
 # Remove any .la files
 rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS* COPYING ChangeLog INSTALL NEWS README* doc/READM* \
+cp -a AUTHORS* COPYING ChangeLog NEWS README* doc/READM* \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
@@ -132,4 +146,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/network/wireshark/wireshark.info b/network/wireshark/wireshark.info
index efa9b4ca59..c3f620160f 100644
--- a/network/wireshark/wireshark.info
+++ b/network/wireshark/wireshark.info
@@ -1,10 +1,10 @@
 PRGNAM="wireshark"
-VERSION="3.0.3"
+VERSION="4.2.4"
 HOMEPAGE="https://www.wireshark.org/"
-DOWNLOAD="https://1.as.dl.wireshark.org/src/wireshark-3.0.3.tar.xz"
-MD5SUM="e945d76a57db2c3e6cf776f95da2cf0e"
+DOWNLOAD="https://2.na.dl.wireshark.org/src/wireshark-4.2.4.tar.xz"
+MD5SUM="cebb012489563a8eb9c3829cdcb0579c"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="qt5 lua python3"
+REQUIRES="lua"
 MAINTAINER="Willy Sudiarto Raharjo"
 EMAIL="willysr@slackbuilds.org"
diff --git a/network/wmget/README b/network/wmget/README
index 045a6c0deb..dec999299d 100644
--- a/network/wmget/README
+++ b/network/wmget/README
@@ -1,11 +1,9 @@
+wmget is a dock app for the GNU Window Maker window manager which
+makes it more convenient to perform long downloads in the background.
 
-wmget is a dock app for the GNU Window Maker window manager which makes it more
-convenient to perform long downloads in the background.
-
-This is useful if you tend to have dozens of windows open at a time and tend to
-do a lot of routine downloading. Just copy the link from your browser, middle-
-click on the wmget dockapp, and the download will start. No download windows or
-terminals required, and you can monitor the progress and stop the transfer if
-desired without opening or raising any windows or even changing desktops.
-
-NOTE: This SlackBuild Script PATCH for fixing a compile problem.
+This is useful if you tend to have dozens of windows open at a time
+and tend to do a lot of routine downloading. Just copy the link from
+your browser, middle-click on the wmget dockapp, and the download will
+start. No download windows or terminals required, and you can monitor
+the progress and stop the transfer if desired without opening or
+raising any windows or even changing desktops.
diff --git a/network/wmget/wmget.SlackBuild b/network/wmget/wmget.SlackBuild
index e648d951a4..6a293da726 100644
--- a/network/wmget/wmget.SlackBuild
+++ b/network/wmget/wmget.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for wmget
 
@@ -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=wmget
 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=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 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/network/wmnd/README b/network/wmnd/README
index a346f7e3e1..479b9edccc 100644
--- a/network/wmnd/README
+++ b/network/wmnd/README
@@ -1,3 +1,5 @@
+wmnd (WindowMaker Network Devices DockApp)
+
 WMND is a dockapp for monitoring network interfaces under WindowMaker
 and other compatible window managers. WMND currently works on Linux,
 FreeBSD, NetBSD, Solaris, OpenSolaris, Darwin and IRIX.
@@ -8,6 +10,6 @@ display modes and can also monitor remote interfaces through SNMP.
 An optional dep is "Trend" (not on SBo) which can be used to zoom in on
 the bars inside the dockapp.
 
-Note: This dockapp has an automatically generated RC file in
-~/.wmnd FIXME You can see an example of how to customize it in
-/usr/doc/wmnd-0.4.17/examples/wmndrc
+Note: This dockapp uses a config file "~/.wmndrc". If it's not found,
+an empty one is created. You can see an example of how to customize it
+in: /usr/doc/wmnd-0.4.18/examples/wmndrc
diff --git a/network/wmnd/wmnd.SlackBuild b/network/wmnd/wmnd.SlackBuild
index a996f95b74..3f5fa43554 100644
--- a/network/wmnd/wmnd.SlackBuild
+++ b/network/wmnd/wmnd.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for wmnd
 #
@@ -25,8 +25,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>
 
+# 20210926 bkw: update for v0.4.18.
 # 20160816 bkw:
 # - take over maintenance
 # - BUILD=2
@@ -36,10 +37,13 @@
 # - don't install INSTALL in docdir
 # - fix path to example config in man page
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=wmnd
-VERSION=${VERSION:-0.4.17}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-0.4.18}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -49,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}
@@ -77,14 +85,12 @@ 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 \
-  "s,/usr/share/doc/$PRGNAM/,/usr/doc/$PRGNAM-$VERSION/${PRGNAM}rc," \
+  -e "s,/usr/share/doc/$PRGNAM/,/usr/doc/$PRGNAM-$VERSION/${PRGNAM}rc," \
+  -e "s,it's outer,its outer," \
   doc/$PRGNAM.1
 
 CFLAGS="$SLKCFLAGS" \
@@ -104,7 +110,7 @@ make install-strip DESTDIR=$PKG
 gzip -9 $PKG/usr/man/man1/$PRGNAM.1
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS ChangeLog* COPYING examples/${PRGNAM}rc NEWS README THANKS TODO \
+cp -a ChangeLog* examples/${PRGNAM}rc *.rst \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
@@ -112,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/network/wmnd/wmnd.info b/network/wmnd/wmnd.info
index ab516c2634..6e87b4aade 100644
--- a/network/wmnd/wmnd.info
+++ b/network/wmnd/wmnd.info
@@ -1,10 +1,10 @@
 PRGNAM="wmnd"
-VERSION="0.4.17"
-HOMEPAGE="http://www.thregr.org/~wavexx/software/wmnd/"
-DOWNLOAD="http://www.thregr.org/~wavexx/software/wmnd/releases/wmnd-0.4.17.tar.gz"
-MD5SUM="dbf6d6c42ab3e036388d261d2e7bea16"
+VERSION="0.4.18"
+HOMEPAGE="https://www.thregr.org/~wavexx/software/wmnd/"
+DOWNLOAD="https://www.thregr.org/~wavexx/software/wmnd/releases/wmnd-0.4.18.tar.gz"
+MD5SUM="729d0208a7acc5ff185735f51020eefe"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
 MAINTAINER="B. Watson"
-EMAIL="yalhcru@gmail.com"
+EMAIL="urchlay@slackware.uk"
diff --git a/network/wmnotify/README b/network/wmnotify/README
index 0ae836bf12..b2cdbbd4b5 100644
--- a/network/wmnotify/README
+++ b/network/wmnotify/README
@@ -13,12 +13,12 @@ bell. For simplicity reasons, wmnotify doesn't support multiple POP3
 accounts.
 
 But by starting a new instance of wmnotify and specifying an alternate
-configuration file on the command line, you can effectively check multiple
-POP3 accounts.
+configuration file on the command line, you can effectively check
+multiple POP3 accounts.
 
-NOTE: There's a patch inside the package to replace the non-stop animation
-      to a static image for incomming e-mails. Just edit the building script 
-      and set the "PATCH" variable to "yes" or pass a parameter to the build
-      script:
+NOTE: There's a patch inside the package to replace the non-stop
+animation to a static image for incomming e-mails. Just edit the
+building script and set the "PATCH" variable to "yes" or pass a
+parameter to the build script:
 
       PATCH=yes ./wmnotify.SlackBuild
diff --git a/network/wmnotify/wmnotify.SlackBuild b/network/wmnotify/wmnotify.SlackBuild
index d5c1dd4f4f..7cf30cbc15 100644
--- a/network/wmnotify/wmnotify.SlackBuild
+++ b/network/wmnotify/wmnotify.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for wmnotify
 
@@ -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=wmnotify
 VERSION=${VERSION:-1.0.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 PATCH=${PATCH:-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}
 
-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,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/network/wol/wol.SlackBuild b/network/wol/wol.SlackBuild
index 6924eaac03..0f41e2b836 100644
--- a/network/wol/wol.SlackBuild
+++ b/network/wol/wol.SlackBuild
@@ -1,32 +1,39 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for wol
 
 # Written by Brian Muramatsu (btmura@gmail.com)
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=wol
 VERSION=${VERSION:-0.7.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" = "i386" ]; then
-  SLKCFLAGS="-O2 -march=i386 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
@@ -84,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/network/wp-cli/README b/network/wp-cli/README
new file mode 100644
index 0000000000..8371a06419
--- /dev/null
+++ b/network/wp-cli/README
@@ -0,0 +1,11 @@
+WP-CLI is a set of command-line tools for managing WordPress
+installations.
+
+WP-CLI need phar extension to build and to work
+
+Enable the phar extension in your php.ini and
+disable the readonly setting for the phar extension:
+   Set phar.readonly to Off
+
+Also disable open_basedir
+because likely to cause errors with wp-cli
diff --git a/network/wp-cli/files/LICENSE b/network/wp-cli/files/LICENSE
new file mode 100644
index 0000000000..017ee0bf17
--- /dev/null
+++ b/network/wp-cli/files/LICENSE
@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (C) 2011-2019 WP-CLI Development Group (https://github.com/wp-cli/wp-cli/contributors)
+
+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.
diff --git a/network/wp-cli/files/wp-completion.bash b/network/wp-cli/files/wp-completion.bash
new file mode 100644
index 0000000000..9df572b6d6
--- /dev/null
+++ b/network/wp-cli/files/wp-completion.bash
@@ -0,0 +1,23 @@
+# bash completion for the `wp` command
+
+_wp_complete() {
+	local OLD_IFS="$IFS"
+	local cur=${COMP_WORDS[COMP_CWORD]}
+
+	IFS=$'\n';  # want to preserve spaces at the end
+	local opts="$(wp cli completions --line="$COMP_LINE" --point="$COMP_POINT")"
+
+	if [[ "$opts" =~ \<file\>\s* ]]
+	then
+		COMPREPLY=( $(compgen -f -- $cur) )
+	elif [[ $opts = "" ]]
+	then
+		COMPREPLY=( $(compgen -f -- $cur) )
+	else
+		COMPREPLY=( ${opts[*]} )
+	fi
+
+	IFS="$OLD_IFS"
+	return 0
+}
+complete -o nospace -F _wp_complete wp
diff --git a/network/wp-cli/slack-desc b/network/wp-cli/slack-desc
new file mode 100644
index 0000000000..4687cb903d
--- /dev/null
+++ b/network/wp-cli/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.  Line
+# up the first '|' above the ':' following the base package name, and the '|'
+# on the right side marks the last column you can put a character in.  You must
+# make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+      |-----handy-ruler------------------------------------------------------|
+wp-cli: wp-cli (A command line interface for WordPress)
+wp-cli:
+wp-cli: WP-CLI is a set of command-line tools for managing WordPress 
+wp-cli: installations.
+wp-cli:
+wp-cli: http://wp-cli.org
+wp-cli:
+wp-cli:
+wp-cli:
+wp-cli:
+wp-cli:
diff --git a/network/wp-cli/wp-cli.SlackBuild b/network/wp-cli/wp-cli.SlackBuild
new file mode 100644
index 0000000000..e68654632f
--- /dev/null
+++ b/network/wp-cli/wp-cli.SlackBuild
@@ -0,0 +1,65 @@
+#!/bin/bash
+#
+# Slackware build script for wp-cli
+#
+# Copyright 2016-2023 Corrado Franco (https://corradofranco.it)
+# 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
+# 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/>.
+#
+
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=wp-cli
+VERSION=${VERSION:-2.10.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 $PKG $OUTPUT
+
+install -Dm755 $CWD/$PRGNAM-$VERSION.phar $PKG/usr/bin/wp
+
+# Install bash completion
+install -Dm644 $CWD/files/wp-completion.bash $PKG/usr/share/bash-completion/completions/wp
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp $CWD/files/LICENSE $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
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/network/wp-cli/wp-cli.info b/network/wp-cli/wp-cli.info
new file mode 100644
index 0000000000..d8b1e3338f
--- /dev/null
+++ b/network/wp-cli/wp-cli.info
@@ -0,0 +1,10 @@
+PRGNAM="wp-cli"
+VERSION="2.10.0"
+HOMEPAGE="http://wp-cli.org/"
+DOWNLOAD="https://github.com/wp-cli/wp-cli/releases/download/v2.10.0/wp-cli-2.10.0.phar"
+MD5SUM="6710e90c3ed173925acd35ce5fe5aaf9"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="composer"
+MAINTAINER="Corrado Franco"
+EMAIL="conraid (at) linux (dot) it"
diff --git a/network/wpa-cute/README b/network/wpa-cute/README
new file mode 100644
index 0000000000..bbaab47a47
--- /dev/null
+++ b/network/wpa-cute/README
@@ -0,0 +1,2 @@
+wpa-cute is a qt graphical wpa_supplicant front end. It is a fork from
+wpa_gui, shipped with wpa_supplicant version 2.6.
diff --git a/network/httpie/doinst.sh b/network/wpa-cute/doinst.sh
index 5fb28930db..5fb28930db 100644
--- a/network/httpie/doinst.sh
+++ b/network/wpa-cute/doinst.sh
diff --git a/network/wpa-cute/slack-desc b/network/wpa-cute/slack-desc
new file mode 100644
index 0000000000..fd6f6d4552
--- /dev/null
+++ b/network/wpa-cute/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+        |-----handy-ruler------------------------------------------------------|
+wpa-cute: wpa-cute (graphical wpa_supplicant front end)
+wpa-cute:
+wpa-cute:
+wpa-cute: wpa-cute is a qt graphical wpa_supplicant front end.
+wpa-cute: It is a fork from wpa_gui, shipped with wpa_supplicant version 2.6.
+wpa-cute:
+wpa-cute:
+wpa-cute: Homepage: https://github.com/loh-tar/wpa-cute
+wpa-cute:
+wpa-cute:
+wpa-cute:
diff --git a/network/wpa-cute/wpa-cute.SlackBuild b/network/wpa-cute/wpa-cute.SlackBuild
new file mode 100644
index 0000000000..0eef3b9316
--- /dev/null
+++ b/network/wpa-cute/wpa-cute.SlackBuild
@@ -0,0 +1,100 @@
+#!/bin/bash
+
+# Slackware build script for wpa-cute
+
+# 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=wpa-cute
+VERSION=${VERSION:-0.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}
+
+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 src
+qmake QMAKE_CFLAGS="$SLKCFLAGS" QMAKE_CXXFLAGS="$SLKCFLAGS" wpa_gui.pro
+make
+
+install -sDm755 wpa-cute $PKG/usr/bin/wpa-cute
+install -Dm644 icons/wpa_gui.svg $PKG/usr/share/pixmaps/wpa-cute.svg
+install -Dm644 wpa-cute.desktop $PKG/usr/share/applications/wpa-cute.desktop
+
+cd ..
+mkdir -p $PKG/usr/man/man8
+cat doc/wpa-cute.8 | gzip -9 > $PKG/usr/man/man8/wpa-cute.8.gz
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a CONTRIBUTIONS 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/network/wpa-cute/wpa-cute.info b/network/wpa-cute/wpa-cute.info
new file mode 100644
index 0000000000..1604f7ae31
--- /dev/null
+++ b/network/wpa-cute/wpa-cute.info
@@ -0,0 +1,10 @@
+PRGNAM="wpa-cute"
+VERSION="0.8.5"
+HOMEPAGE="https://github.com/loh-tar/wpa-cute"
+DOWNLOAD="https://github.com/loh-tar/wpa-cute/archive/v0.8.5/wpa-cute-0.8.5.tar.gz"
+MD5SUM="f5a1827d37d89df5fc190c8b3264bde1"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Alexander Verbovetsky"
+EMAIL="alik@ejik.org"
diff --git a/network/wput/README b/network/wput/README
index 6c1fd72a3d..bdc9324ad7 100644
--- a/network/wput/README
+++ b/network/wput/README
@@ -1,5 +1,5 @@
-wput - A utility for putting files using the FTP protocol from the 
-       command line. 
+wput (wget-like FTP uploader)
 
-wput is a tiny program that looks like wget and is designed to upload 
-files or whole directories to remote ftp-servers.
+wput is a tiny program that looks like wget and is designed to upload
+files or whole directories to remote FTP servers. It uses ~/.netrc for
+login names and passwords.
diff --git a/network/wput/doinst.sh b/network/wput/doinst.sh
new file mode 100644
index 0000000000..40da7bd48e
--- /dev/null
+++ b/network/wput/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/wputrc.new
diff --git a/network/wput/manpages.diff b/network/wput/manpages.diff
new file mode 100644
index 0000000000..ca30238907
--- /dev/null
+++ b/network/wput/manpages.diff
@@ -0,0 +1,86 @@
+diff -Naur wput-0.6.2+git20130413/doc/wdel.1 wput-0.6.2+git20130413.patched/doc/wdel.1
+--- wput-0.6.2+git20130413/doc/wdel.1	2013-07-14 18:05:50.000000000 -0400
++++ wput-0.6.2+git20130413.patched/doc/wdel.1	2021-09-26 15:51:18.582864729 -0400
+@@ -12,7 +12,7 @@
+ .PP
+ Wdel supports connections through proxies, allowing you to use it in an
+ environment that can access the internet only via a proxy or to provide
+-anonymity by hiding your ip\-address to the server.
++anonymity by hiding your ip\-address from the server.
+ For SOCKSv5\-proxies Wdel supports also listening mode, allowing you to use
+ port-mode ftp through a proxy (useful if the remote ftp is behind a firewall
+ or a gateway).
+@@ -40,7 +40,7 @@
+ Many options can be set in a wputrc file. For its documentation consult the
+ sample file provided by Wput.
+ .PP
+-wput(1) describes all setable options. Not all apply for wdel too though.
++wput(1) describes all settable options. Not all apply for wdel too though.
+ .SH "AUTHOR"
+ .IX Header "AUTHOR"
+ Wdel is written by Hagen Fritsch <fritsch+wdel-man@in.tum.de>
+diff -Naur wput-0.6.2+git20130413/doc/wput.1 wput-0.6.2+git20130413.patched/doc/wput.1
+--- wput-0.6.2+git20130413/doc/wput.1	2021-09-26 15:50:42.259868954 -0400
++++ wput-0.6.2+git20130413.patched/doc/wput.1	2021-09-26 16:00:43.263799042 -0400
+@@ -20,7 +20,7 @@
+ .PP
+ Wput supports connections through proxies, allowing you to use it in an
+ environment that can access the internet only via a proxy or to provide
+-anonymity by hiding your ip\-address to the server.
++anonymity by hiding your ip\-address from the server.
+ For SOCKSv5\-proxies Wput supports also listening mode, allowing you to use
+ port-mode ftp through a proxy (useful if the remote ftp is behind a firewall
+ or a gateway).
+@@ -30,6 +30,11 @@
+ .PP
+ The upload-rate of Wput can be restricted, so that Wput won't eat all available
+ bandwidth.
++.PP
++Wput does not prompt for any usernames or passwords. It uses \fB~/.netrc\fR
++for login credentials. See \fBnetrc\fR(5). It's also possible to include
++the username and password in the URL, though this is highly discouraged
++since the password would be visible in \fBps\fR output.
+ .SS "URL\-Input\-Handling"
+ URLs are recognized by the ftp://\-prefix
+ .PP
+@@ -77,7 +82,7 @@
+ 
+ Do \fBnot\fR do things like \fIfind | wput ftp://host/ \-i \-\fR!
+ Wput would upload all files from the current directory (since the first output
+-of find will be '.') and afterwards each file again (since find postes its name to Wput. And further problematic is that Wput will upload each directory that
++of find will be '.') and afterwards each file again (since find posts its name to Wput. And further problematic is that Wput will upload each directory that
+ is given by find and since find itself recurses all directories, the files
+ would be uploaded three times (or even more often for further subdirectories).
+ Use \fIwput ftp://host/\fR to upload everything from the local directory.
+@@ -86,7 +91,7 @@
+ .TP
+ .BR \-I " \fIcommand\fP, " \-\-input\-pipe= \fIcommand\fP
+ If no file/directory can be "guessed" (see "Guessing Local File") from the URL,
+-the output of \fIcommand\fB is taken as file-input. command is invoked as follows:
++the output of \fIcommand\fR is taken as file-input. command is invoked as follows:
+ 
+ \&       command ftp "username" "ip/hostname" port "remote_directory" "remote_filename"
+ 
+@@ -145,6 +150,7 @@
+ specified as a hostname or \s-1IP\s0 address. This option can be
+ useful if your machine is bound to multiple
+ IPs.
++.TP
+ .BR \-\-force\-tls
+ If this flag is specified and Wput is linked with the OpenSSL-library, the flag
+ enforces the usage of TLS: If no TLS\-connection can be established the process
+@@ -262,11 +268,13 @@
+ install]) and use this debug-dump.
+ 
+ .SH "SEE ALSO"
++.BR \fBnetrc\fR(5)
++.PP
+ .IX Header "SEE ALSO"
+ Many options can be set in a wputrc file. For its documentation consult the
+ sample file provided by Wput.
+ .PD 0
+-There are some USAGE.* files in the doc/ directory of Wput. These contain
++There are some USAGE.* files in \fB/usr/doc/wput-@VERSION@\fR. These contain
+ further information and samples on how to use Wput.
+ 
+ .SH "AUTHOR"
diff --git a/network/wput/slack-desc b/network/wput/slack-desc
index 57415caf83..4ae6ad2eed 100644
--- a/network/wput/slack-desc
+++ b/network/wput/slack-desc
@@ -6,11 +6,11 @@
 # customary to leave one space after the ':' except on otherwise blank lines.
 
     |-----handy-ruler------------------------------------------------------|
-wput: wput (utility for putting files using the FTP protocol)
+wput: wput (wget-like FTP uploader)
 wput:
 wput: wput is a tiny program that looks like wget and is designed to upload
-wput: files or whole directories to remote ftp-servers.
-wput:
+wput: files or whole directories to remote FTP servers. It uses ~/.netrc for
+wput: login names and passwords.
 wput:
 wput:
 wput:
diff --git a/network/wput/wput.SlackBuild b/network/wput/wput.SlackBuild
index 604d70765a..c930ea0488 100644
--- a/network/wput/wput.SlackBuild
+++ b/network/wput/wput.SlackBuild
@@ -1,28 +1,19 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for wput
 
-# Originally written by Chris Abela <chris.abela@maltats.com> May 2009
-
-# 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.
+# Originally written by Chris Abela <email removed>.
+# Formerly maintained by Ryan P.C. McQuen.
+# Now maintained by B. Watson <urchlay@slackware.uk>.
+
+# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
+
+# 20210926 bkw:
+# - update for v0.6.2+git20130413_11, for parity with Debian.
+# - install /etc/wputrc.new (also add doinst.sh).
+# - relicense as WTFPL with permission from Ryan P.C. McQuen (he's the one
+#   who added the license; the original author didn't include one).
+# - add mention of ~/.netrc to the man page and our README.
 
 # 20180103 bkw: update for v0.6.2. Which is from 9+ years ago...
 
@@ -31,10 +22,13 @@
 # - i486 => i586
 # - minor tweaks
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=wput
-VERSION=${VERSION:-0.6.2}
+VERSION=${VERSION:-0.6.2+git20130413_11}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -44,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,43 +63,66 @@ fi
 
 set -e
 
+TARVER=${VERSION%_*}
+DEBVER=${VERSION#*_}
+
 rm -rf $PKG
-mkdir -p $TMP $OUTPUT $PKG/usr/bin $PKG/usr/man/man1
+mkdir -p $TMP $OUTPUT $PKG
 cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tgz
-cd $PRGNAM-$VERSION
+rm -rf $PRGNAM-$TARVER
+tar xvf $CWD/${PRGNAM}_${TARVER}.orig.tar.bz2
+cd $PRGNAM-$TARVER
+tar xvf $CWD/${PRGNAM}_${TARVER}-${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. These include security fixes, compile
+# fixes, typo/spelling fixes, etc.
+for i in $( cat debian/patches/series ); do
+  patch -p1 < debian/patches/$i
+done
+
+# Further typo/grammar/spelling fixes for man pages. Also mention
+# netrc(5) in wput.1, since it's not obvious.
+patch -p1 < $CWD/manpages.diff
+
+sed -i "s,@VERSION@,$VERSION," doc/*.1
+
+# Note to self: on 64-bit, we can ignore this warning from configure:
+#   checking Large File System support: no
+# What it really means is that, on 64-bit, we don't need any extra
+# CFLAGS to enable large file (64-bit off_t) support. On 32-bit,
+# we get "yes", and the appropriate flags are used automatically.
+# If this were to fail on 32-bit, wput wouldn't be able to handle
+# files >= 2GB. Quite possibly, nobody would ever notice...
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
-  --prefix=$PKG/usr \
+  --prefix=/usr \
+  --mandir=/usr/man \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
   --build=$ARCH-slackware-linux \
   --host=$ARCH-slackware-linux
 
-# Maximum compression for the man file:
-sed -i 's/gzip/gzip -9/' doc/Makefile
-# Unable to set --datadir for configure script:
-sed -i 's/^datadir *= $(prefix)\/share/datadir     = $(prefix)/' Makefile
-
 make
-make install
+make install DESTDIR=$PKG
 strip $PKG/usr/bin/$PRGNAM
 
+# The shipped wputrc has everything commented out, so there's no reason
+# not to install it in /etc (used to be in the doc dir).
+mkdir -p $PKG/etc
+cp -a doc/wputrc $PKG/etc/wputrc.new
+
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a ABOUT-NLS C* TODO doc/USAGE.* doc/passwordfile doc/wputrc \
+cp -a ABOUT-NLS C* TODO doc/USAGE.* doc/passwordfile \
       $PKG/usr/doc/$PRGNAM-$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/network/wput/wput.info b/network/wput/wput.info
index 9091147f16..404ef75bd0 100644
--- a/network/wput/wput.info
+++ b/network/wput/wput.info
@@ -1,10 +1,12 @@
 PRGNAM="wput"
-VERSION="0.6.2"
-HOMEPAGE="http://wput.sourceforge.net/"
-DOWNLOAD="http://sourceforge.net/projects/wput/files/wput/0.6.2/wput-0.6.2.tgz"
-MD5SUM="a14c4c13d91d04d6119bdc977e8a8bdf"
+VERSION="0.6.2+git20130413_11"
+HOMEPAGE="https://wput.sourceforge.net/"
+DOWNLOAD="https://deb.debian.org/debian/pool/main/w/wput/wput_0.6.2+git20130413.orig.tar.bz2 \
+          https://deb.debian.org/debian/pool/main/w/wput/wput_0.6.2+git20130413-11.debian.tar.xz"
+MD5SUM="8b4ff475940532ae086d37e3ba548b49 \
+        3854d64196d39b119720e15dec01b4ce"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
 MAINTAINER="B. Watson"
-EMAIL="yalhcru@gmail.com"
+EMAIL="urchlay@slackware.uk"
diff --git a/network/wrk/README b/network/wrk/README
index 3194c9b6ce..47874b9c33 100644
--- a/network/wrk/README
+++ b/network/wrk/README
@@ -1,11 +1,12 @@
 wrk (HTTP benchmarking tool)
 
-A modern HTTP benchmarking tool capable of generating significant load when run 
-on a single multi-core CPU. It combines a multithreaded design with scalable 
-event notification systems such as epoll and kqueue.
+A modern HTTP benchmarking tool capable of generating significant
+load when run on a single multi-core CPU. It combines a multithreaded
+design with scalable event notification systems such as epoll and
+kqueue.
 
 An optional LuaJIT script can perform HTTP request generation, response 
 processing, and custom reporting.
 
-Note: Lua and LuaJIT are not required here; wrk is statically-linked against 
-the LuaJIT version bundled in the upstream tarball.
+Note: Lua and LuaJIT are not required here; wrk is statically-linked
+against the LuaJIT version bundled in the upstream tarball.
diff --git a/network/wrk/wrk.SlackBuild b/network/wrk/wrk.SlackBuild
index 8f08b38ac5..157d1a326c 100644
--- a/network/wrk/wrk.SlackBuild
+++ b/network/wrk/wrk.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for wrk.
 
@@ -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=wrk
 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}
 
-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/network/wrk/wrk.info b/network/wrk/wrk.info
index 03be669eef..38cbe22a3b 100644
--- a/network/wrk/wrk.info
+++ b/network/wrk/wrk.info
@@ -1,7 +1,7 @@
 PRGNAM="wrk"
 VERSION="3.1.1"
 HOMEPAGE="https://github.com/wg/wrk"
-DOWNLOAD="https://github.com/wg/wrk/archive/3.1.1.tar.gz"
+DOWNLOAD="https://github.com/wg/wrk/archive/3.1.1/wrk-3.1.1.tar.gz"
 MD5SUM="bf25e174845bad36fefd66f9be71889e"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/network/wsdd2/README b/network/wsdd2/README
new file mode 100644
index 0000000000..d164e3196a
--- /dev/null
+++ b/network/wsdd2/README
@@ -0,0 +1,34 @@
+wsdd2 (WSD/LLMNR Discovery/Name Service Daemon)
+
+Provides samba share discovery for clients who don't support netbios
+or are running ip6 (which netbios does not support).
+This is based on the NETGEAR implimentation.
+
+NOTE: make sure you allow local ip6 connections in your samba config
+otherwise there will be no shares found. if you use "hosts allow"
+in smb.conf then add     fc00::/7 fe80::/64 ::1
+to the list of your local ip4 addresses so that local ip6 pcs can
+use your shares.
+
+NOTE2: The following ports/addresses also need to be open if you are
+using a firewall:
+tcp port 3702 (unicast), and
+udp ports 3702 ( multicast on ports 239.255.255.250 / ff02::c )
+tcp port 5355 (unicast), and
+udp on ports 224.0.0.252 / ff02::1:3  (multicast)
+
+to get wsdd2 to run automatically on startup add the following lines
+in /etc/rc.d/rc.local
+
+#start wsdd2 daemon if samba is configured
+if [ -x /etc/rc.d/rc.wsdd2 ]; then
+   /etc/rc.d/rc.wsdd2 start
+fi
+
+and to stop it on shutdown, add the following to
+samba section in /etc/rc.d/rc.local_shutdown
+
+#stop wsdd2 daemon
+if [ -x /etc/rc.d/rc.wsdd2 ]; then
+   /etc/rc.d/rc.wsdd2 stop
+fi
diff --git a/network/wsdd2/README.allowip6 b/network/wsdd2/README.allowip6
new file mode 100644
index 0000000000..85009e9325
--- /dev/null
+++ b/network/wsdd2/README.allowip6
@@ -0,0 +1,17 @@
+It may be obvious, but its easy to forget; to access samba shares
+using ip6 you need to allow ip6 addresses access to the server. If
+you want to limit access to local ip6 addresses and you are using
+the "hosts allow" option in smb.conf then add the following
+address/masks to the end of any ip4 addresses you alread have listed
+
+ fc00::/7 fe80::/64 ::1
+
+this will allow link-local, unique-local, and local loop ip6 addresses
+
+Even if a machine has a public ip6 address, it will also have a
+link-local one for ip6 sublayer operations of the Neighbor Discovery
+Protocol as well as for some other protocols such as DHCPv6
+
+if you are using a firewall, don't forget to allow access to port
+5357 (tcp) and 3702 (udp) otherwise wsdd2 will not work.
+
diff --git a/network/wsdd2/doinst.sh b/network/wsdd2/doinst.sh
new file mode 100644
index 0000000000..194630ea25
--- /dev/null
+++ b/network/wsdd2/doinst.sh
@@ -0,0 +1,26 @@
+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
+    chmod +x $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.wsdd2.new
diff --git a/network/wsdd2/rc.wsdd2 b/network/wsdd2/rc.wsdd2
new file mode 100644
index 0000000000..1fcf58f995
--- /dev/null
+++ b/network/wsdd2/rc.wsdd2
@@ -0,0 +1,58 @@
+#!/bin/sh
+#
+# /etc/rc.d/rc.wsdd2
+#
+# start/stop/restart the wsdd2 daemon.
+#
+# To make wsdd2 start automatically at boot make sure this
+# file is executable, and add the following entry to rc.local
+# (uncommented)
+
+# if [ -x /etc/rc.d/rc.wsdd2 ]; then
+#   /etc/rc.d/rc.wsdd2 start
+# fi
+
+# you may also add the following entry to rc.local_shutdown
+# (uncommented)
+
+# if [ -x /etc/rc.d/rc.wsdd2 ]; then
+#   /etc/rc.d/rc.wsdd2 stop
+# fi
+
+wsdd2_start() {
+  if [ -r /etc/samba/smb.conf -a -x /etc/rc.d/rc.samba -a -x /usr/sbin/wsdd2 ]; then
+    echo "Starting wsdd2: /usr/bin/wsdd2 -d"
+    /usr/sbin/wsdd2 -d
+  elif [ ! -r /etc/samba/smb.conf ]; then
+    echo "ERROR: samba not configured, so wsdd2 has no service to advertise"
+  fi
+}
+wsdd2_stop() {
+  #check something is running before trying to kill it.
+  if [ "x`ps -A|grep ' wsdd2'|wc -l`" != "x0" ]; then
+    killall wsdd2
+  fi
+}
+wsdd2_restart() {
+  wsdd2_stop
+  sleep 1
+  wsdd2_start
+}
+case "$1" in
+'start')
+  #we don't want to run this more than once,
+  #so kill off any instance already running
+  wsdd2_stop
+  wsdd2_start
+  ;;
+'stop')
+  wsdd2_stop
+  ;;
+'restart')
+  wsdd2_restart
+  ;;
+*)
+  # default is start
+  wsdd2_start
+esac
+
diff --git a/network/wsdd2/slack-desc b/network/wsdd2/slack-desc
new file mode 100644
index 0000000000..41cfbcc117
--- /dev/null
+++ b/network/wsdd2/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+     |-----handy-ruler------------------------------------------------------|
+wsdd2: wsdd2 (WSD/LLMNR Discovery/Name Service Daemon)
+wsdd2:
+wsdd2: Provides samba share browsing for clients who don't support netbios
+wsdd2: or are running ip6 (which netbios does not support).
+wsdd2: This is based on the NETGEAR implimentation.
+wsdd2:
+wsdd2: Don't forget to allow local ip6 connections in your smb.conf file,
+wsdd2: specifically,  fc00::/7 fe80::/64 ::1
+wsdd2: Also in your firewall, make sure ports 3702 and 5355 are open.
+wsdd2:
+wsdd2: Home Page https://github.com/Netgear/wsdd2
diff --git a/network/wsdd2/wsdd2.SlackBuild b/network/wsdd2/wsdd2.SlackBuild
new file mode 100644
index 0000000000..072cf3d55d
--- /dev/null
+++ b/network/wsdd2/wsdd2.SlackBuild
@@ -0,0 +1,112 @@
+#!/bin/bash
+
+# Slackware build script for wsdd2
+
+# Copyright 2020,2022 Tim Dickson Scotland
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=wsdd2
+VERSION=${VERSION:-1.8.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 the variable PRINT_PACKAGE_NAME is set, then this script will report what
+# the name of the created package would be, and then exit. This information
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; 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 are going to have to fix Makefile as we don't want systemd stuff
+sed -i "/systemd/d" Makefile
+
+#patch the source to remove generally useless warning
+# ie. warning about missing (entirely optional) parameters in smb.conf
+patch wsdd2.c <${CWD}/wsdd2.patch
+#note: hopefully upstream will fix this. https://github.com/Netgear/wsdd2/issues/39
+
+make CFLAGS="$SLKCFLAGS" CXXFLAGS="$SLKCFLAGS"
+make install debug_W=-1 debug_L=-1 DESTDIR=$PKG MANDIR="/usr/man" INSTALLPREFIX="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
+
+#copy over the rc file
+mkdir -p $PKG/etc/rc.d
+cp -a $CWD/rc.${PRGNAM} $PKG/etc/rc.d/rc.${PRGNAM}.new
+chown root:root $PKG/etc/rc.d/rc.${PRGNAM}.new
+# now for docs
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a LICENSE README.md $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/README.allowip6 > $PKG/usr/doc/$PRGNAM-$VERSION/README.allowip6
+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/network/wsdd2/wsdd2.info b/network/wsdd2/wsdd2.info
new file mode 100644
index 0000000000..a839c31ffe
--- /dev/null
+++ b/network/wsdd2/wsdd2.info
@@ -0,0 +1,10 @@
+PRGNAM="wsdd2"
+VERSION="1.8.7"
+HOMEPAGE="https://github.com/Netgear/wsdd2"
+DOWNLOAD="https://github.com/Netgear/wsdd2/archive/1.8.7/wsdd2-1.8.7.tar.gz"
+MD5SUM="6f59c63f07c8f42f05469d8020c0a604"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Tim Dickson"
+EMAIL="dickson.tim@googlemail.com"
diff --git a/network/wsdd2/wsdd2.patch b/network/wsdd2/wsdd2.patch
new file mode 100644
index 0000000000..aec9c4baaa
--- /dev/null
+++ b/network/wsdd2/wsdd2.patch
@@ -0,0 +1,11 @@
+--- wsdd2.c	2021-08-09 20:22:46.000000000 +0100
++++ wsdd2u.c	2022-04-22 11:22:12.125000000 +0100
+@@ -601,7 +601,7 @@
+ 
+ 	char buf[PAGE_SIZE];
+ 	if (!fgets(buf, sizeof(buf), pp) || !buf[0]  || buf[0] == '\n') {
+-		DEBUG(0, W, "cannot read %s from testparm", name);
++		DEBUG(1, W, "cannot read %s from testparm", name);
+ 		result = strdup(_default);
+ 	} else { // trim whitespace
+ 		char *p;
diff --git a/network/wvdial/README b/network/wvdial/README
index b3332bc689..2aeeef889f 100644
--- a/network/wvdial/README
+++ b/network/wvdial/README
@@ -1,4 +1,4 @@
-WvDial is a program that makes it easy to connect your Linux workstation 
-to the Internet via modem lines. It will automatically detect your modem, and it
-can log into almost any Internet provider's server without any special
-configuration.
+WvDial is a program that makes it easy to connect your Linux
+workstation to the Internet via modem lines. It will automatically
+detect your modem, and it can log into almost any Internet provider's
+server without any special configuration.
diff --git a/network/wvdial/wvdial.SlackBuild b/network/wvdial/wvdial.SlackBuild
index 21e5e634cd..38bad74d12 100644
--- a/network/wvdial/wvdial.SlackBuild
+++ b/network/wvdial/wvdial.SlackBuild
@@ -1,30 +1,40 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for wvdial
 
 # Previously maintained by Vincent Batts, vbatts@batts.mine.nu (Thank you!)
 # Currently maintained by Moritz Wilhelmy, moritz+slackware@wzff.de
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=wvdial
 VERSION=${VERSION:-1.61}
 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"
@@ -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/network/x11spice/README b/network/x11spice/README
new file mode 100644
index 0000000000..1883e4c9b0
--- /dev/null
+++ b/network/x11spice/README
@@ -0,0 +1,17 @@
+x11spice connects a running X server as a Spice server.
+
+It owes a debt to the excellent x11vnc project, from the libvncserver
+project. That project proved that this could be done, and done well.
+Some of the logic, notably that of scan.c, was inspired by the code
+in x11vnc.
+
+Example: launch a spice server on a remote pc (where x11spice is
+installed) via ssh, redirect the output locally and connect to it with
+spicy
+
+  ssh $remote_host -L 5900:localhost:5900 \
+    "x11spice --allow-control --display :0 --password=whatever"
+
+and then locally
+
+  spicy -h localhost -p 5900
diff --git a/network/x11spice/slack-desc b/network/x11spice/slack-desc
new file mode 100644
index 0000000000..e47dfab248
--- /dev/null
+++ b/network/x11spice/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+        |-----handy-ruler------------------------------------------------------|
+x11spice: x11spice (export X via spice)
+x11spice:
+x11spice: x11spice connects a running X server as a Spice server.
+x11spice:
+x11spice: It owes a debt to the excellent x11vnc project, from the libvncserver
+x11spice: project. That project proved that this could be done, and done well.
+x11spice: Some of the logic, notably that of scan.c, was inspired  by the code
+x11spice: in x11vnc.
+x11spice:
+x11spice: homepage: https://gitlab.freedesktop.org/spice/x11spice
+x11spice:
diff --git a/network/x11spice/x11spice.SlackBuild b/network/x11spice/x11spice.SlackBuild
new file mode 100644
index 0000000000..ccc39649e7
--- /dev/null
+++ b/network/x11spice/x11spice.SlackBuild
@@ -0,0 +1,114 @@
+#!/bin/bash
+
+# Slackware build script for x11spice
+
+# Copyright 2018-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=x11spice
+VERSION=${VERSION:-20230803_33a9af7}
+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 ChangeLog NEWS README"
+
+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 {} \;
+
+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 \
+  --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/network/x11spice/x11spice.info b/network/x11spice/x11spice.info
new file mode 100644
index 0000000000..4ebda8d76a
--- /dev/null
+++ b/network/x11spice/x11spice.info
@@ -0,0 +1,10 @@
+PRGNAM="x11spice"
+VERSION="20230803_33a9af7"
+HOMEPAGE="https://gitlab.freedesktop.org/spice/x11spice"
+DOWNLOAD="http://ponce.cc/slackware/sources/repo/x11spice-20230803_33a9af7.tar.xz"
+MD5SUM="ad829eb4184cf5d5cdfdfb6e84ba8274"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="spice"
+MAINTAINER="Matteo Bernardini"
+EMAIL="ponce@slackbuilds.org"
diff --git a/network/x11vnc/README b/network/x11vnc/README
index a6e28943c9..956624d509 100644
--- a/network/x11vnc/README
+++ b/network/x11vnc/README
@@ -1,7 +1,7 @@
-x11vnc allows one to view remotely and interact with real X displays 
-(i.e. a display corresponding to a physical monitor, keyboard, and mouse) 
-with any VNC viewer. In this way it plays the role for Unix/X11 that 
-WinVNC plays for Windows.
+x11vnc allows one to view remotely and interact with real X displays
+(i.e. a display corresponding to a physical monitor, keyboard, and
+mouse) with any VNC viewer. In this way it plays the role for Unix/X11
+that WinVNC plays for Windows.
 
 It has built-in SSL encryption and authentication, UNIX account and 
 password support, server-side scaling, single port HTTPS and VNC, mDNS 
diff --git a/network/x11vnc/gcc10.patch b/network/x11vnc/gcc10.patch
new file mode 100644
index 0000000000..4934633860
--- /dev/null
+++ b/network/x11vnc/gcc10.patch
@@ -0,0 +1,42 @@
+From a48b0b1cd887d7f3ae67f525d7d334bd2feffe60 Mon Sep 17 00:00:00 2001
+From: Alexander Tsoy <alexander@tsoy.me>
+Date: Tue, 28 Jan 2020 22:21:01 +0300
+Subject: [PATCH] Fix build with -fno-common
+
+GCC 10 defaults to -fno-common
+---
+ src/util.c | 3 +++
+ src/util.h | 6 +++---
+ 2 files changed, 6 insertions(+), 3 deletions(-)
+
+diff --git a/src/util.c b/src/util.c
+index a82a1a4..6a52ebf 100644
+--- a/src/util.c
++++ b/src/util.c
+@@ -47,6 +47,9 @@ int hxl = 0;
+ #ifdef LIBVNCSERVER_HAVE_LIBPTHREAD
+ MUTEX(x11Mutex);
+ MUTEX(scrollMutex);
++MUTEX(clientMutex);
++MUTEX(inputMutex);
++MUTEX(pointerMutex);
+ #endif
+ 
+ int nfix(int i, int n);
+diff --git a/src/util.h b/src/util.h
+index 35c1afd..99b5dd1 100644
+--- a/src/util.h
++++ b/src/util.h
+@@ -102,9 +102,9 @@ extern struct timeval _mysleep;
+ #ifdef LIBVNCSERVER_HAVE_LIBPTHREAD
+ extern MUTEX(x11Mutex);
+ extern MUTEX(scrollMutex);
+-MUTEX(clientMutex);
+-MUTEX(inputMutex);
+-MUTEX(pointerMutex);
++extern MUTEX(clientMutex);
++extern MUTEX(inputMutex);
++extern MUTEX(pointerMutex);
+ #endif
+ 
+ #define X_INIT INIT_MUTEX(x11Mutex)
diff --git a/network/x11vnc/x11vnc.SlackBuild b/network/x11vnc/x11vnc.SlackBuild
index 53048bb837..dca9d17bea 100644
--- a/network/x11vnc/x11vnc.SlackBuild
+++ b/network/x11vnc/x11vnc.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackbuild for x11vnc.
 #       Original script for version 0.9.3 10/11/2007
@@ -32,10 +32,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=x11vnc
 VERSION=${VERSION:-0.9.16}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -45,7 +48,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
+# the name of the created package would be, and then exit. This information
+# could be useful to other scripts.
+if [ ! -z "${PRINT_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,6 +88,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/gcc10.patch
+
 autoreconf -i
 CFLAGS="$SLKCFLAGS" \
 ./configure \
@@ -107,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/network/x2goclient/x2goclient.SlackBuild b/network/x2goclient/x2goclient.SlackBuild
index 488474a305..8fb5f09e1a 100644
--- a/network/x2goclient/x2goclient.SlackBuild
+++ b/network/x2goclient/x2goclient.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for x2goclient
 
@@ -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=x2goclient
-VERSION=${VERSION:-4.1.2.1}
+VERSION=${VERSION:-4.1.2.2}
 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 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/network/x2goclient/x2goclient.info b/network/x2goclient/x2goclient.info
index 699c3abc5d..c360e03d0d 100644
--- a/network/x2goclient/x2goclient.info
+++ b/network/x2goclient/x2goclient.info
@@ -1,8 +1,8 @@
 PRGNAM="x2goclient"
-VERSION="4.1.2.1"
+VERSION="4.1.2.2"
 HOMEPAGE="http://www.x2go.org"
-DOWNLOAD="https://code.x2go.org/releases/source/x2goclient/x2goclient-4.1.2.1.tar.gz"
-MD5SUM="0ed3b974ffec4e3bb1db40fb0be7b6d0"
+DOWNLOAD="https://code.x2go.org/releases/source/x2goclient/x2goclient-4.1.2.2.tar.gz"
+MD5SUM="1390b794b0a10f0a885dd7cf00f2acef"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="nx-libs"
diff --git a/network/x2goserver/README b/network/x2goserver/README
index 36b61c6c01..bdcddf1f05 100644
--- a/network/x2goserver/README
+++ b/network/x2goserver/README
@@ -14,16 +14,19 @@ This script requires a 'x2gouser' user/group to exist before running.
 You can create these using:
 
   groupadd -g 290 x2gouser
-  useradd -u 290 -g 290 -c "X2Go Remote Desktop" -M -d /var/lib/x2go -s /bin/false x2gouser
+  useradd -u 290 -g 290 -c "X2Go Remote Desktop" -M \
+          -d /var/lib/x2go -s /bin/false x2gouser
   groupadd -g 291 x2goprint
-  useradd -u 291 -g 291 -c "X2Go Remote Desktop" -m -d /var/spool/x2goprint -s /bin/false x2goprint
+  useradd -u 291 -g 291 -c "X2Go Remote Desktop" -m \
+          -d /var/spool/x2goprint -s /bin/false x2goprint
   chown x2goprint:x2goprint /var/spool/x2goprint
   chmod 0770 /var/spool/x2goprint
 
 Before running the server, you have to initialize the internal database:
   x2godbadmin --createdb
 
-If you want to run the server at boot include it in your /etc/rc.d/rc.local:
+If you want to run the server at boot include it in your
+/etc/rc.d/rc.local:
 
 if [ -x /etc/rc.d/rc.x2goserver ]; then
   /etc/rc.d/rc.x2goserver start
diff --git a/network/x2goserver/x2goserver.SlackBuild b/network/x2goserver/x2goserver.SlackBuild
index ba82397547..caa42c4eaa 100644
--- a/network/x2goserver/x2goserver.SlackBuild
+++ b/network/x2goserver/x2goserver.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for x2goserver
 
@@ -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=x2goserver
-VERSION=${VERSION:-20190625_b3ec119}
+VERSION=${VERSION:-20201227_08aa5e6}
 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 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/network/x2goserver/x2goserver.info b/network/x2goserver/x2goserver.info
index 9e20cd4df2..7dfbf73d3a 100644
--- a/network/x2goserver/x2goserver.info
+++ b/network/x2goserver/x2goserver.info
@@ -1,8 +1,8 @@
 PRGNAM="x2goserver"
-VERSION="20190625_b3ec119"
+VERSION="20201227_08aa5e6"
 HOMEPAGE="http://www.x2go.org"
-DOWNLOAD="http://ponce.cc/slackware/sources/repo/x2goserver-20190625_b3ec119.tar.xz"
-MD5SUM="031e3d92dfd06f22de3052360c524367"
+DOWNLOAD="http://ponce.cc/slackware/sources/repo/x2goserver-20201227_08aa5e6.tar.xz"
+MD5SUM="46aad829313b85218841e1f818244a06"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="nx-libs perl-Config-Simple perl-File-ReadBackwards perl-DBD-SQLite perl-Capture-Tiny perl-Try-Tiny perl-Unix-Syslog perl-file-basedir perl-Switch"
diff --git a/network/xaric/README b/network/xaric/README
new file mode 100644
index 0000000000..ec0d41cd8f
--- /dev/null
+++ b/network/xaric/README
@@ -0,0 +1,5 @@
+xaric (simple colorful IRC client)
+
+Xaric is a UNIX irc client similar to (and forked from) BitchX and
+ircII. The purpose of xaric is to remove all of the bogus, broken crap
+and silly features from BitchX and have a nice colorful client.
diff --git a/network/xaric/doinst.sh b/network/xaric/doinst.sh
new file mode 100644
index 0000000000..9424ce43ff
--- /dev/null
+++ b/network/xaric/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 usr/share/icons/hicolor >/dev/null 2>&1
+  fi
+fi
diff --git a/network/xaric/slack-desc b/network/xaric/slack-desc
new file mode 100644
index 0000000000..adabe1fb53
--- /dev/null
+++ b/network/xaric/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+     |-----handy-ruler------------------------------------------------------|
+xaric: xaric (simple colorful IRC client)
+xaric:
+xaric: Xaric is a UNIX irc client similar to (and forked from) BitchX and
+xaric: ircII. The purpose of xaric is to remove all of the bogus, broken crap
+xaric: and silly features from BitchX and have a nice colorful client.
+xaric:
+xaric:
+xaric:
+xaric:
+xaric:
+xaric:
diff --git a/network/xaric/xaric.SlackBuild b/network/xaric/xaric.SlackBuild
new file mode 100644
index 0000000000..4daad2c0a1
--- /dev/null
+++ b/network/xaric/xaric.SlackBuild
@@ -0,0 +1,116 @@
+#!/bin/bash
+
+# Slackware build script for xaric
+
+# Written by B. Watson (urchlay@slackware.uk)
+
+# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
+
+# 20210926 bkw:
+# - update for v0.13.9.
+# - minor man page fixes.
+# - change default server to irc.libera.chat. Nobody should ever connect
+#   to the ruins of freenode, not even by accident.
+# 20201122 bkw: BUILD=2, install icons to the right place.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=xaric
+VERSION=${VERSION:-0.13.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}
+
+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 {} \+
+
+# Do not connect to that lunatic's network by default.
+sed -i 's,irc\.freenode\.net,irc.libera.chat,' defaults.h
+
+# Clean up man page a bit.
+sed -i -e 's,/usr/local,/usr,' \
+       -e '/^\\fB\\-b/s,^,.TP\n,' \
+       -e '/-L file/s,$, [\\fInickname\\fP] [\\fIirc\\-server\\fP ...],' \
+       -e 's,\<wont\>,won'\''t,' \
+    $PRGNAM.1
+
+CFLAGS="$SLKCFLAGS -fcommon" \
+./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
+
+# .desktop file ripped off (from hexchat.desktop) by SlackBuild
+# author. Normally I don't do these for purely console applications,
+# but upstream provided a nice icon, so might as well make use of it.
+mkdir -p $PKG/usr/share/applications $PKG/usr/share/pixmaps
+cat $CWD/$PRGNAM.desktop > $PKG/usr/share/applications/$PRGNAM.desktop
+cp -a $PRGNAM.xpm $PKG/usr/share/pixmaps
+for i in 16 32 48; do
+  dir=$PKG/usr/share/icons/hicolor/${i}x${i}/apps
+  mkdir -p $dir
+  convert $PRGNAM.xpm -resize ${i}x${i}! $dir/$PRGNAM.png
+done
+
+mkdir -p $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
+
+# Don't need 2 copies of the GPL
+rm -f $PKG/usr/share/$PRGNAM/help/copying
+ln -s ../../../doc/$PRGNAM-$VERSION/COPYING $PKG/usr/share/$PRGNAM/help/copying
+
+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/network/xaric/xaric.desktop b/network/xaric/xaric.desktop
new file mode 100644
index 0000000000..d8bafcd7c5
--- /dev/null
+++ b/network/xaric/xaric.desktop
@@ -0,0 +1,55 @@
+[Desktop Entry]
+Name=Xaric
+GenericName=IRC Client
+Comment=Chat with other people online
+Comment[ca]=Parla amb altres persones en línia.
+Comment[cs]=Chatujte online s ostatními lidmi
+Comment[da]=Chat med andre personer online
+Comment[de]=Online mit anderen Menschen chatten
+Comment[en_GB]=Chat with other people online
+Comment[es]=Chatea con otras personas en línea
+Comment[et]=Vestle teiste kasutajatega internetis
+Comment[fi]=Keskustele muiden kanssa verkossa
+Comment[fr]=Parlez avec d'autres personnes en ligne
+Comment[id]=Mengobrol dengan orang lain daring
+Comment[it]=Chiacchiera con altri utenti online
+Comment[ja_JP]=他の人とオンラインチャットをします
+Comment[ko]=온라인에 있는 사람들과 대화합니다
+Comment[lt]=Kalbėkite su kitais prisijungusiais žmonėmis
+Comment[nb]=Prat med andre folk på nettet
+Comment[pl]=Rozmawiaj z innymi ludźmi przez internet
+Comment[pt]=Conversa com outras pessoas online
+Comment[pt_BR]=Converse com outras pessoas na rede
+Comment[sq]=Bisedoni në linjë me persona të tjerë
+Comment[sr]=Ћаскајте са пријатељима онлајн
+Comment[sv]=Chatta med andra människor online
+Comment[zh_CN]=与其他人在线聊天
+Keywords=IM;Chat;
+Keywords[ca]=MI;Xat;
+Keywords[da]=IM;Chat;
+Keywords[de]=IM;Chat;
+Keywords[en_GB]=IM;Chat;
+Keywords[es]=IM;Chat;
+Keywords[eu]=IM;Chat;Txat;
+Keywords[fi]=IM;Chat;pikaviestin;keskustelu;
+Keywords[fr]=IM;Chat;
+Keywords[id]=IM;Obrolan;
+Keywords[it]=IM;Chat;Messaggistica Istantanea;IRC;
+Keywords[ko]=IM;인스턴트 메신저;Chat;대화;
+Keywords[lt]=IM;Pokalbiai;
+Keywords[nb]=IM;Chat;
+Keywords[pl]=IM;Chat;
+Keywords[pt]=IM;Chat;
+Keywords[pt_BR]=IM;Chat;
+Keywords[ru]=IM;Чат;
+Keywords[sq]=IM;Fjalosje;
+Keywords[sr]=ИМ;Ћаскање;
+Keywords[sv]=IM;Chatt;
+Keywords[zh_CN]=IM;聊天;
+Exec=xaric
+Icon=xaric
+Terminal=true
+Type=Application
+Categories=Network;IRCClient;
+StartupNotify=false
+MimeType=x-scheme-handler/irc;x-scheme-handler/ircs;
diff --git a/network/xaric/xaric.info b/network/xaric/xaric.info
new file mode 100644
index 0000000000..bb6739b7c3
--- /dev/null
+++ b/network/xaric/xaric.info
@@ -0,0 +1,10 @@
+PRGNAM="xaric"
+VERSION="0.13.9"
+HOMEPAGE="https://xaric.org/"
+DOWNLOAD="https://xaric.org/software/xaric/releases/xaric-0.13.9.tar.gz"
+MD5SUM="09555effce003019724d2e0e123885e3"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="B. Watson"
+EMAIL="urchlay@slackware.uk"
diff --git a/network/xbuffy/xbuffy.SlackBuild b/network/xbuffy/xbuffy.SlackBuild
index 25c4cae4a3..80c24997b2 100644
--- a/network/xbuffy/xbuffy.SlackBuild
+++ b/network/xbuffy/xbuffy.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for xbuffy
 # $Id: xbuffy.SlackBuild,v 1.1 2018/08/09 15:22:52 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=xbuffy
 VERSION=${VERSION:-3.3.bl.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}
@@ -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/network/xdman/README b/network/xdman/README
index 86f6c702c4..16b865c23e 100644
--- a/network/xdman/README
+++ b/network/xdman/README
@@ -1,25 +1,5 @@
-xdman (download manager)
-
-Xtreme Download Manager is a powerful tool to increase download speed
-up-to 500%, save videos from video sharing sites and integration with
-ANY browser.
-
-For Browser integration.
-
-Firefox:
-https://subhra74.github.io/xdm-firefox/firefox.html
-
-Chrome | Chromium | Opera | Vivaldi:
-https://chrome.google.com/webstore/detail/xdm-browser-monitor/bgpkelneombgembocnickiddlbebmica
-
-For other browsers, go to Tools/Browser Integration.
-
-Some features present in Xtreme Download Manager are:
-
- * Superfast speed;
- * Save video from any website;
- * Supports any browser;
- * Runs on any Operating system;
- * Free, No-Adware and Open source.
-
-Note: p7zip is build-time dependency, not runtime dependency.
+xdman is an open source download manager and accelerator.
+It can resume broken or dead downloads and save videos from
+popular streaming websites.It also integrates with
+Google Chrome, Mozilla Firefox, Opera, Vivaldi and 
+other Chroumium and Firefox based browsers.
diff --git a/network/xdman/changelog b/network/xdman/changelog
new file mode 100644
index 0000000000..31a8185eaa
--- /dev/null
+++ b/network/xdman/changelog
@@ -0,0 +1,20 @@
+Changelog for xdman SlackBuild Script
+--------------------------------------------------------------------
+
+25/05/2023:
+
+Submitted to slackbuilds.org
+
+26/05/2023:
+
+Resubmitted to SBo.
+Fixed the SlackBuild script and added the url for
+the license file in the info file.
+
+27/05/2023:
+
+Added to SBo
+
+29/09/2023:
+
+updated to version 8.0.29
diff --git a/network/xdman/doinst.sh b/network/xdman/doinst.sh
index aea0f894eb..5b35a0a29e 100644
--- a/network/xdman/doinst.sh
+++ b/network/xdman/doinst.sh
@@ -6,8 +6,9 @@ if [ -x /usr/bin/update-mime-database ]; then
   /usr/bin/update-mime-database usr/share/mime >/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
+    /usr/bin/gtk-update-icon-cache usr/share/icons/hicolor >/dev/null 2>&1
   fi
 fi
diff --git a/network/xdman/slack-desc b/network/xdman/slack-desc
index 225bfb6c6f..0cf34a6575 100644
--- a/network/xdman/slack-desc
+++ b/network/xdman/slack-desc
@@ -6,14 +6,14 @@
 # customary to leave one space after the ':' except on otherwise blank lines.
 
      |-----handy-ruler------------------------------------------------------|
-xdman: xdman (download manager)
+xdman: xdman (Xtreme Download Manager)
 xdman:
-xdman: Xtreme Download Manager is a powerful tool to increase download speed
-xdman: up-to 500%, save videos from video sharing sites and integration
-xdman: with ANY browser.
-xdman:
-xdman: Home page: https://sourceforge.net/projects/xdman
+xdman: xdman is an open source download manager and accelerator.
+xdman: It can resume broken or dead downloads and save videos from
+xdman: popular streaming websites.It also integrates very nicely
+xdman: with Firefox and Chrome.
 xdman:
 xdman:
+xdman: Homepage:https://github.com/subhra74
 xdman:
 xdman:
diff --git a/network/xdman/xdm-app.desktop b/network/xdman/xdm-app.desktop
new file mode 100644
index 0000000000..5009de519b
--- /dev/null
+++ b/network/xdman/xdm-app.desktop
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Version=1.0
+Exec=env GTK_USE_PORTAL=1 /opt/xdman/xdm-app %U
+Type=Application
+Terminal=false
+Name=Xtreme Download Manager
+Comment=Download Manager
+Categories=Network;
+Icon=/opt/xdman/xdm-logo.svg
+MimeType=application/xdm-app;x-scheme-handler/xdm-app;
+StartupNotify=true
diff --git a/network/xdman/xdman b/network/xdman/xdman
deleted file mode 100644
index 7958054e1a..0000000000
--- a/network/xdman/xdman
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash
-if [ $EUID -eq 0 ];then
-	echo "It's not recomended to run XDM  as root, as it can cause problems"
-fi
-java -Dsun.java2d.xrender=false -jar /opt/xdman/xdman.jar
diff --git a/network/xdman/xdman.SlackBuild b/network/xdman/xdman.SlackBuild
index 62cc10ba4e..83820b7e34 100644
--- a/network/xdman/xdman.SlackBuild
+++ b/network/xdman/xdman.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
-#
-# Slackware build script for xdman.
-#
-# Copyright 2015-2018  Edinaldo P. Silva, Rio de Janeiro, Brazil.
+#!/bin/bash
+
+# Slackware build script for xdman
+
+# Copyright 2023 Vijay Marcel
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,59 +22,50 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=xdman
-VERSION=${VERSION:-2018.7.2.8}
+VERSION=${VERSION:-8.0.29}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+sys_arch=${sys_arch:-$(uname -m)}
+SRCNAM=${SRCNAM:-xdman_gtk_}
 
-if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-    i?86) ARCH=i586 ;;
-    arm*) ARCH=arm ;;
-       *) ARCH=$( uname -m ) ;;
-  esac
+case "$sys_arch" in
+	x86_64)
+	 DEBARCH=amd64
+         ARCH=x86_64
+         LIBDIRSUFFIX="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
 
-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
-
-SRCNAM=${SRCNAM:-xdm-2018}
+trap 'echo "$0 FAILED at line $LINENO!" | tee -a  $OUTPUT/error-${PRGNAM}.log' ERR
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
-rm -rf $TMP/$PRGNAM-$VERSION
 cd $TMP
-
-mkdir -p $PRGNAM-$VERSION
-
-if [ "$ARCH" = "i586" ] || [ "$ARCH" = "i686" ]; then
-   tar xvf $CWD/$SRCNAM-x86.tar.xz -C $PRGNAM-$VERSION
-elif [ "$ARCH" = "x86_64" ]; then
-   tar xvf $CWD/$SRCNAM-x64.tar.xz -C $PRGNAM-$VERSION
-else
-  echo "$ARCH is not supported."
-  exit 1
-fi
-
+rm -rf $PRGNAM-$VERSION
+mkdir -pv $PRGNAM-$VERSION
+ar -x  $CWD/$SRCNAM${VERSION}_${DEBARCH}.deb  --output $TMP/$PRGNAM-$VERSION
 cd $PRGNAM-$VERSION
+tar xvf data.tar.xz -C $PKG
+cd .. && cd $PKG
+
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -82,22 +73,40 @@ 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 {} \;
 
-7z x -y install.sh
-install -d -m755 $PKG/opt/xdman
-install -D -m644 xdman.jar $PKG/opt/xdman/xdman.jar
-install -D -m775 $CWD/xdman $PKG/opt/xdman
-install -D -m644 xdman.desktop $PKG/usr/share/applications/xdman.desktop
-install -D -m644 icon.png $PKG/usr/share/pixmaps/icon.png
+chmod 0750 $PKG/opt/xdman/libmscordaccore.so
+chmod 0750 $PKG/opt/xdman/libhostfxr.so
+chmod 0750 $PKG/opt/xdman/libmscordbi.so
+chmod 0750 $PKG/opt/xdman/libcoreclr.so
+chmod 0750 $PKG/opt/xdman/libSystem.Globalization.Native.so
+chmod 0750 $PKG/opt/xdman/SQLite.Interop.dll
+chmod 0750 $PKG/opt/xdman/libSystem.Native.so
+chmod 0750 $PKG/opt/xdman/libhostpolicy.so
+chmod 0750 $PKG/opt/xdman/libcoreclrtraceptprovider.so
+chmod 0750 $PKG/opt/xdman/libSystem.Security.Cryptography.Native.OpenSsl.so
+chmod 0750 $PKG/opt/xdman/createdump
+chmod 0750 $PKG/opt/xdman/libSystem.Net.Security.Native.so
+chmod 0750 $PKG/opt/xdman/libSystem.IO.Compression.Native.so
+chmod 0750 $PKG/opt/xdman/libdbgshim.so
+chmod 0750 $PKG/opt/xdman/libclrjit.so
+
+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 -rvf $PKG/usr/share/applications/xdm-app.destop
+install -m0644 $CWD/xdm-app.desktop -t $PKG/usr/share/applications/
+
+enscript -B -o $TMP/GPL-2.0.ps $CWD/gpl-2.0.txt
+
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM-SlackBuild
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+cp -a $TMP/GPL-2.0.ps $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
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/network/xdman/xdman.info b/network/xdman/xdman.info
index d2c01872c5..568341b8a6 100644
--- a/network/xdman/xdman.info
+++ b/network/xdman/xdman.info
@@ -1,10 +1,12 @@
 PRGNAM="xdman"
-VERSION="2018.7.2.8"
-HOMEPAGE="https://sourceforge.net/projects/xdman"
-DOWNLOAD="https://sourceforge.net/projects/xdman/files/xdm-2018-x86.tar.xz"
-MD5SUM="e4c83df8298682def2fa44944b183d0e"
-DOWNLOAD_x86_64="https://sourceforge.net/projects/xdman/files/xdm-2018-x64.tar.xz"
-MD5SUM_x86_64="a92cf4d15fa79964b8480f44e6bd93fd"
-REQUIRES="jdk p7zip"
-MAINTAINER="Edinaldo P. Silva"
-EMAIL="edps.mundognu@gmail.com"
+VERSION="8.0.29"
+HOMEPAGE="https://github.com/subhra74"
+DOWNLOAD="UNSUPPORTED"
+MD5SUM=""
+DOWNLOAD_x86_64="https://github.com/subhra74/xdm/releases/download/8.0.29/xdman_gtk_8.0.29_amd64.deb \
+                 https://www.gnu.org/licenses/gpl-2.0.txt"
+MD5SUM_x86_64="3a67fa5716036948e044296e34e5347e \
+               b234ee4d69f5fce4486a80fdaf4a4263"
+REQUIRES="yt-dlp"
+MAINTAINER="Vijay Marcel"
+EMAIL="vijaymarcel@outlook.com"
diff --git a/network/xinetd/README b/network/xinetd/README
index 8c50f8775b..84a8eae259 100644
--- a/network/xinetd/README
+++ b/network/xinetd/README
@@ -1,22 +1,24 @@
-Xinetd is a powerful inetd replacement.  Xinetd has access control mechanisms,
-extensive logging capabilities, the ability to make services available based
-on time, can place limits on the number of servers that can be started,
-and has a configurable defence mechanisms to protect against port scanners,
-among other things.
+xinetd (a better inetd)
 
-Before starting xinetd, you may wish to switch inetd off if it is running.
-To do this:
+Xinetd is a powerful inetd replacement. Xinetd has access control
+mechanisms, extensive logging capabilities, the ability to make
+services available based on time, can place limits on the number of
+servers that can be started, and has configurable defence mechanisms
+to protect against port scanners, among other things.
 
-Do a "ps x" as root and look up the pid of inetd. Then do "kill <pid of inetd>"
+Before starting xinetd, you may wish to switch inetd off if it is
+running. To do this: killall inetd
 
-Stop inetd from starting at boot:  chmod 0644 /etc/rc.d/rc.inetd
-Start xinetd on boot by adding the following lines to /etc/rc.d/rc.local:
+Stop inetd from starting at boot: chmod 0644 /etc/rc.d/rc.inetd
+
+Start xinetd on boot by adding the following lines to
+/etc/rc.d/rc.local:
 
   if [ ! -x /etc/rc.d/rc.inetd ] &&  [ -x /etc/rc.d/rc.xinetd ]; then 
     /etc/rc.d/rc.xinetd start
   fi
+
 Ensure that /etc/rc.d/{rc.local,rc.xinetd} have executable permissions.
 
 Alternatively, you can avoid all of the edits to rc.local:
 mv /etc/rc.d/rc.xinetd /etc/rc.d/rc.inetd 
-
diff --git a/network/xinetd/slack-desc b/network/xinetd/slack-desc
index 51563e374d..5e7b2cadf7 100644
--- a/network/xinetd/slack-desc
+++ b/network/xinetd/slack-desc
@@ -11,7 +11,7 @@ xinetd:
 xinetd: Xinetd is a powerful inetd replacement. Xinetd has access control
 xinetd: mechanisms, extensive logging capabilities, the ability to make
 xinetd: services available based on time, can place limits on the number of
-xinetd: servers that can be started, and has a configurable defence mechanisms
+xinetd: servers that can be started, and has configurable defence mechanisms
 xinetd: to protect against port scanners, among other things.
 xinetd:
 xinetd: Homepage: http://xinetd.org
diff --git a/network/xinetd/xinetd.SlackBuild b/network/xinetd/xinetd.SlackBuild
index cd3713d13a..4da22df787 100644
--- a/network/xinetd/xinetd.SlackBuild
+++ b/network/xinetd/xinetd.SlackBuild
@@ -1,10 +1,11 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for xinetd
 
 # Copyright 2012 Chris Abela, Malta
-# Copyright 2014  Ryan P.C. McQuen, WA, ryanpcmcquen@member.fsf.org
-# Copyright 2017-2019  Aaditya Bagga <aaditya_gnulinux@zoho.com>
+# Copyright 2014 Ryan P.C. McQuen, WA
+# Copyright 2017-2019 Aaditya
+# Copyright 2023 B. Watson
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,10 +25,22 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20231222 bkw:
+# - take over maintenance.
+# - fix #@$@% github download URL.
+# - tweak README and slack-desc slightly.
+# Note: I'm taking this over just to keep it from being removed from SBo.
+# I don't use it, and I'm not likely to spend much time on it. If you see
+# that I've let this get out of date and would like to take over maintenance,
+# please do (just email me).
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=xinetd
 VERSION=${VERSION:-2.3.15.4}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -37,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}
@@ -62,15 +79,11 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz || tar xvf $CWD/$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 {} +
 
 ./autogen.sh
 
@@ -87,34 +100,26 @@ CXXFLAGS="$SLKCFLAGS" \
   --build=$ARCH-slackware-linux
 
 make
-make install DESTDIR=$PKG
+make install-strip DESTDIR=$PKG
+gzip -9 $PKG/usr/man/man*/*
 
-# Install the Slackware init script
 mkdir -p $PKG/etc/rc.d
 cat $CWD/rc.xinetd > $PKG/etc/rc.d/rc.xinetd.new
 chmod 0755 $PKG/etc/rc.d/rc.xinetd.new
 
-# Backup config files
 mv "$PKG/etc/xinetd.conf" "$PKG/etc/xinetd.conf.new"
 for file in "$PKG"/etc/xinetd.d/*; do
   mv "${file}" "${file}.new"
 done
 
-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 COPYRIGHT README.md \
-  $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 CHANGELOG COPYRIGHT README.md $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/network/xinetd/xinetd.info b/network/xinetd/xinetd.info
index 9b81acc6ea..6c4591d74e 100644
--- a/network/xinetd/xinetd.info
+++ b/network/xinetd/xinetd.info
@@ -1,10 +1,10 @@
 PRGNAM="xinetd"
 VERSION="2.3.15.4"
 HOMEPAGE="https://github.com/openSUSE/xinetd"
-DOWNLOAD="https://github.com/openSUSE/xinetd/archive/2.3.15.4.tar.gz"
+DOWNLOAD="https://github.com/openSUSE/xinetd/archive/2.3.15.4/xinetd-2.3.15.4.tar.gz"
 MD5SUM="c2ca87367a7017a8f736a32e18be38e5"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Aaditya Bagga"
-EMAIL="aaditya_gnulinux@zoho.com"
+MAINTAINER="B. Watson"
+EMAIL="urchlay@slackware.uk"
diff --git a/network/xl2tpd/README b/network/xl2tpd/README
index 212a1a374f..0fd9ad3548 100644
--- a/network/xl2tpd/README
+++ b/network/xl2tpd/README
@@ -1,20 +1,20 @@
-xl2tpd is an implementation of the Layer 2 Tunnelling Protocol (RFC 2661).
-L2TP allows you to tunnel PPP over UDP. Some ISPs use L2TP to tunnel user
-sessions from dial-in servers (modem banks, ADSL DSLAMs) to back-end PPP
-servers. Another important application is Virtual Private Networks where
-the IPsec protocol is used to secure the L2TP connection (L2TP/IPsec,
-RFC 3193). The L2TP/IPsec protocol is mainly used by Windows and
-Mac OS X clients. On Linux, xl2tpd can be used in combination with IPsec
-implementations such as Openswan.
+xl2tpd is an implementation of the Layer 2 Tunnelling Protocol
+(RFC 2661). L2TP allows you to tunnel PPP over UDP. Some ISPs use
+L2TP to tunnel user sessions from dial-in servers (modem banks, ADSL
+DSLAMs) to back-end PPP servers. Another important application is
+Virtual Private Networks where the IPsec protocol is used to secure
+the L2TP connection (L2TP/IPsec, RFC 3193). The L2TP/IPsec protocol
+is mainly used by Windows and Mac OS X clients. On Linux, xl2tpd can
+be used in combination with IPsec implementations such as Openswan.
 Example configuration files for such a setup are included in this RPM.
 
 xl2tpd works by opening a pseudo-tty for communicating with pppd.
 It runs completely in userspace but supports kernel mode L2TP. 
 
-xl2tpd supports IPsec SA Reference tracking to enable overlapping internak
-NAT'ed IP's by different clients (eg all clients connecting from their
-linksys internal IP 192.168.1.101) as well as multiple clients behind
-the same NAT router.
+xl2tpd supports IPsec SA Reference tracking to enable overlapping
+internak NAT'ed IP's by different clients (eg all clients connecting
+from their linksys internal IP 192.168.1.101) as well as multiple
+clients behind the same NAT router.
 
 xl2tpd supports the pppol2tp kernel mode operations on 2.6.23 or higher,
 or via a patch in contrib for 2.4.x kernels. Note that kernel mode and
diff --git a/network/xl2tpd/xl2tpd.SlackBuild b/network/xl2tpd/xl2tpd.SlackBuild
index ea6583de6f..ca3dab80af 100644
--- a/network/xl2tpd/xl2tpd.SlackBuild
+++ b/network/xl2tpd/xl2tpd.SlackBuild
@@ -1,30 +1,40 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for xl2tpd
 
 # written by gshep <shepelev.georgy@googlemail.com>
 # modified by the SlackBuilds.org project
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=xl2tpd
-VERSION=${VERSION:-1.3.2}
+VERSION=${VERSION:-1.3.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"
@@ -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/network/xl2tpd/xl2tpd.info b/network/xl2tpd/xl2tpd.info
index ae33ca09ef..e2595f92d1 100644
--- a/network/xl2tpd/xl2tpd.info
+++ b/network/xl2tpd/xl2tpd.info
@@ -1,10 +1,10 @@
 PRGNAM="xl2tpd"
-VERSION="1.3.2"
+VERSION="1.3.16"
 HOMEPAGE="http://www.xelerance.com/software/xl2tpd/"
-DOWNLOAD="http://ponce.cc/slackware/sources/repo/xl2tpd-1.3.2.tar.gz"
-MD5SUM="d1e44ad0055a02ac89a32b2a6eeb0719"
+DOWNLOAD="https://github.com/xelerance/xl2tpd/archive/v1.3.16/xl2tpd-1.3.16.tar.gz"
+MD5SUM="6b2fb8f7f1666ae0b80f0e178f04c944"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="gshep"
-EMAIL="shepelev.georgy@googlemail.com"
+MAINTAINER="Mario Preksavec"
+EMAIL="mario at slackware dot hr"
diff --git a/network/xmrig/README b/network/xmrig/README
new file mode 100644
index 0000000000..347099144c
--- /dev/null
+++ b/network/xmrig/README
@@ -0,0 +1,100 @@
+XMRig is a high performance, open source, cross platform RandomX,
+KawPow, CryptoNight and GhostRider unified CPU/GPU miner and
+RandomX benchmark. Official binaries are available for Windows,
+Linux, macOS and FreeBSD.
+
+Mining Backends:
+* CPU (x64/ARMv7/ARMv8)
+* OpenCL for AMD GPUs
+(CUDA for NVIDIA GPUs requires an external CUDA plugin "xmrig-cuda"
+as a dependency; for the time being, you will have to compile this
+yourself)
+
+Usage:
+The preferred way to configure the miner is the JSON config file,
+as it is more flexible and human friendly. The command line interface
+does not cover all features, such as mining profiles for different
+algorithms. Important options can be changed during runtime without
+miner restart by editing the config file or executing API calls.
+
+Config File:
+An online wizard (located at https://xmrig.com/wizard) can be used
+to help create an initial configuration for the miner. The resulting
+config file must be placed as either .xmrig.json or .config/xmrig.json
+in your user home directory.
+
+Donations:
+Donations are the percentage of your hashing power that you want to
+donate to the developer, and are used to support XMRig Development.
+Default donation 1% (1 minute in 100 minutes) can be increased via
+command line option --donate-level or disabled in the source code.
+Alternatively, pass the option "DONATE=no" to the script to disable
+donations altogether (although a one-time donation to the developers
+is recommended if you choose to do this).
+
+Algorithms:
+Various algorithms can be enabled/disabled by passing variables to the
+script (VAR=yes/no ./feather.SlackBuild) These algorithms include:
+WITH_CN_LITE=yes|no (default: yes)
+    (disable all CryptoNight-Lite algorithms (cn-lite/*))
+WITH_CN_HEAVY=yes|no (default: yes)
+    (disable all CryptoNight-Heavy algorithms (cn-heavy/*))
+WITH_CN_PICO=yes|no (default: yes)
+    (disable CryptoNight-Pico algorithms (cn-pico and cn-pico/tlo))
+WITH_CN_FEMTO=yes|no (default: yes)
+    (disable CryptoNight-UPX2 algorithm)
+WITH_RANDOMX=yes|no (default: yes)
+    (disable RandomX algorithms (rx/*))
+WITH_ARGON2=yes|no (default: yes)
+    (disable Argon2 algorithms (argon2/*)
+WITH_KAWPOW=yes|no (default: yes)
+    (disable KawPow algorithm (kawpow)
+WITH_GHOSTRIDER=yes|no (default: yes)
+    (disable GhostRider algorithm (gr)
+
+Features:
+Various features can be enabled/disabled by passing variables to the
+script (VAR=yes/no ./feather.SlackBuild) These features include:
+WITH_HWLOC=yes|no (default: yes)
+    (disable hwloc support. Disabling this feature is not recommended
+     in most cases. This feature adds an external dependency to
+     libhwloc (1.10.0+))
+WITH_LIBCPUID=yes|no (default: yes)
+    (disable built-in libcpuid support. This feature is always disabled
+     if hwloc is enabled. If both hwloc and libcpuid are disabled, auto
+     configuration for CPU will be very limited.)
+WITH_HTTP=yes|no (default: yes)
+    (disable built-in HTTP support. This feature is used for HTTP API
+     and daemon (solo mining) support)
+WITH_TLS=yes|no (default: yes)
+    (disable SSL/TLS support (secure connections to pool). This feature
+     adds an external dependency to OpenSSL (included in Slackware by
+     default))
+WITH_ASM=yes|no (default: yes)
+    (disable assembly optimisations for modern CryptoNight algorithms)
+WITH_EMBEDDED_CONFIG=yes|no (default: no)
+    (enable embedded config support)
+WITH_OPENCL=yes|no (default: yes)
+    (disable OpenCL backend)
+WITH_CUDA=yes|no (default: no)
+    (enable NVIDIA CUDA backend; requires xmrig-cuda dependency)
+WITH_NVML=yes|no (default: no)
+    (disable NVML (NVIDIA Management Library) support. This feature is
+     only available if CUDA is enabled)
+WITH_MSR=yes|no (default: yes)
+    (disable MSR mod & 1st-gen Ryzen fix)
+WITH_ADL=yes|no (default: yes)
+    (disable ADL (AMD Display Library) or sysfs support. Tihs feature
+     is only available if OpenCL is enabled)
+WITH_PROFILING=yes|no (default: no)
+    (enable profiling for developers)
+WITH_SSE4_1=yes|no (default: yes)
+    (disable SSE 4.1 for Blake2)
+WITH_BENCHMARK=yes|no (default: yes)
+    (disable builtin RandomX benchmark and stress test)
+WITH_SECURE_JIT=yes|no (default: no)
+    (enable secure access to JIT memory. Off by default on all OS,
+     except for macOS with ARM CPU)
+WITH_DMI=yes|no (default: yes)
+    (disable DMI/SMBIOS reader)
+
diff --git a/network/xmrig/donate.patch b/network/xmrig/donate.patch
new file mode 100644
index 0000000000..e2ca7ef48e
--- /dev/null
+++ b/network/xmrig/donate.patch
@@ -0,0 +1,13 @@
+--- donate.h	2023-07-03 06:42:00.000000000 +0100
++++ donate0.h	2023-07-19 13:30:36.907129259 +0100
+@@ -37,8 +37,8 @@
+  * If you plan on changing donations to 0%, please consider making a one-off donation to my wallet:
+  * XMR: 48edfHu7V9Z84YzzMa6fUueoELZ9ZRXq9VetWzYGzKt52XU5xvqgzYnDK9URnRoJMk1j8nLwEVsaSWJ4fhdUyZijBGUicoD
+  */
+-constexpr const int kDefaultDonateLevel = 1;
+-constexpr const int kMinimumDonateLevel = 1;
++constexpr const int kDefaultDonateLevel = 0;
++constexpr const int kMinimumDonateLevel = 0;
+ 
+ 
+ #endif // XMRIG_DONATE_H
diff --git a/network/xmrig/slack-desc b/network/xmrig/slack-desc
new file mode 100644
index 0000000000..3bd5fc5aa6
--- /dev/null
+++ b/network/xmrig/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+     |-----handy-ruler------------------------------------------------------|
+xmrig: xmrig (unified CPU/GPU cryptocurrency miner)
+xmrig:
+xmrig: XMRig is a high performance, open source, cross platform RandomX,
+xmrig: KawPow, CryptoNight and GhostRider unified CPU/GPU miner and RandomX
+xmrig: benchmark. Official binaries are available for Windows, Linux, macOS
+xmrig: and FreeBSD.
+xmrig:
+xmrig: Homepage: https://xmrig.com/
+xmrig:
+xmrig:
+xmrig:
diff --git a/network/xmrig/xmrig.SlackBuild b/network/xmrig/xmrig.SlackBuild
new file mode 100644
index 0000000000..6f182923cd
--- /dev/null
+++ b/network/xmrig/xmrig.SlackBuild
@@ -0,0 +1,162 @@
+#!/bin/bash
+
+# Slackware build script for xmrig
+
+# Copyright 2023-2024 Bloyburt
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=xmrig
+VERSION=${VERSION:-6.21.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 {} \;
+
+# Donations can be enabled/disabled here
+[ "${DONATE:-yes}" = no ] && patch src/donate.h < $CWD/donate.patch
+
+# Algorithms can be enabled/disabled here
+[ "${WITH_CN_LITE:-yes}" = no ] && WITH_CN_LITE='-DWITH_CN_LITE=OFF'
+[ "${WITH_CN_HEAVY:-yes}" = no ] && WITH_CN_HEAVY='-DWITH_CN_HEAVY=OFF'
+[ "${WITH_CN_PICO:-yes}" = no ] && WITH_CN_PICO='-DWITH_CN_PICO=OFF'
+[ "${WITH_CN_FEMTO:-yes}" = no ] && WITH_CN_FEMTO='-DWITH_CN_FEMTO=OFF'
+[ "${WITH_RANDOMX:-yes}" = no ] && WITH_RANDOMX='-DWITH_RANDOMX=OFF'
+[ "${WITH_ARGON2:-yes}" = no ] && WITH_ARGON2='-DWITH_ARGON2=OFF'
+[ "${WITH_KAPOW:-yes}" = no ] && WITH_KAPOW='-DWITH_KAPOW=OFF'
+[ "${WITH_GHOSTRIDER:-yes}" = no ] && WITH_GHOSTRIDER='-DWITH_GHOSTRIDER=OFF'
+
+# Features can be enabled/disabled here
+[ "${WITH_HWLOC:-yes}" = no ] && WITH_HWLOC='-DWITH_HWLOC=OFF'
+[ "${WITH_LIBCPUID:-yes}" = no ] && WITH_LIBCPUID='-DWITH_LIBCPUID=OFF'
+[ "${WITH_HTTP:-yes}" = no ] && WITH_HTTP='-DWITH_HTTP=OFF'
+[ "${WITH_TLS:-yes}" = no ] && WITH_TLS='-DWITH_TLS=OFF'
+[ "${WITH_ASM:-yes}" = no ] && WITH_ASM='-DWITH_ASM=OFF'
+[ "${WITH_EMBEDDED_CONFIG:-no}" = yes ] && WITH_EMBEDDED_CONFIG='-DWITH_EMBEDDED_CONFIG=ON'
+[ "${WITH_OPENCL:-yes}" = no ] && WITH_OPENCL='-DWITH_OPENCL=OFF'
+[ "${WITH_CUDA:-no}" = yes ] && WITH_CUDA='-DWITH_CUDA=ON'
+[ "${WITH_NVML:-no}" = yes ] && WITH_NVML='-DWITH_NVML=ON'
+[ "${WITH_MSR:-yes}" = no ] && WITH_MSR='-DWITH_MSR=OFF'
+[ "${WITH_ADL:-yes}" = no ] && WITH_ADL='-DWITH_ADL=OFF'
+[ "${WITH_PROFILING:-no}" = yes ] && WITH_PROFILING='-DWITH_PROFILING=ON'
+[ "${WITH_SSE4_1:-yes}" = no ] && WITH_SSE4_1='-DWITH_SSE4_1=OFF'
+[ "${WITH_BENCHMARK:-yes}" = no ] && WITH_BENCHMARK='-DWITH_BENCHMARK=OFF'
+[ "${WITH_SECURE_JIT:-no}" = yes ] && WITH_SECURE_JIT='-DWITH_SECURE_JIT=ON'
+[ "${WITH_DMI:-yes}" = no ] && WITH_DMI='-DWITH_DMI=OFF'
+
+mkdir -p build
+cd build
+  cmake \
+    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+    $WITH_CN_LITE \
+    $WITH_CN_HEAVY \
+    $WITH_CN_PICO \
+    $WITH_CN_FEMTO \
+    $WITH_RANDOMX \
+    $WITH_ARGON2 \
+    $WITH_KAPOW \
+    $WITH_GHOSTRIDER \
+    $WITH_HWLOC \
+    $WITH_LIBCPUID \
+    $WITH_HTTP \
+    $WITH_TLS \
+    $WITH_ASM \
+    $WITH_EMBEDDED_CONFIG \
+    $WITH_OPENCL \
+    $WITH_CUDA \
+    $WITH_NVML \
+    $WITH_MSR \
+    $WITH_ADL \
+    $WITH_PROFILING \
+    $WITH_SSE4_1 \
+    $WITH_BENCHMARK \
+    $WITH_SECURE_JIT \
+    $WITH_DMI \
+    -DCMAKE_BUILD_TYPE=Release ..
+  make
+cd ..
+
+mkdir -p $PKG/usr/bin
+cp -a build/$PRGNAM $PKG/usr/bin/$PRGNAM
+
+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 doc *.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/network/xmrig/xmrig.info b/network/xmrig/xmrig.info
new file mode 100644
index 0000000000..e2ea65a269
--- /dev/null
+++ b/network/xmrig/xmrig.info
@@ -0,0 +1,10 @@
+PRGNAM="xmrig"
+VERSION="6.21.1"
+HOMEPAGE="https://xmrig.com/"
+DOWNLOAD="https://github.com/xmrig/xmrig/archive/v6.21.1/xmrig-6.21.1.tar.gz"
+MD5SUM="072d9a86308243368a89c43c2e5d7ed4"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="%README% hwloc"
+MAINTAINER="Bloyburt"
+EMAIL="alexpen@startmail.com"
diff --git a/network/xnetload/README b/network/xnetload/README
index e1514e205f..477199e9c2 100644
--- a/network/xnetload/README
+++ b/network/xnetload/README
@@ -1,8 +1,8 @@
 Xnetload displays a count and a graph of the traffic over a specified
 network connection.
 
-It either displays bytes/second or packets/second, based on the capabilities
-of the kernel. On 2.1.x and later kernels (including the 2.2.x and 2.4.x
-series) it displays bytes/s. It requires the /proc file system, or rather
-/proc/net/dev which is only found in Linux.  So AFAIK this program is Linux
-specific.
+It either displays bytes/second or packets/second, based on the
+capabilities of the kernel. On 2.1.x and later kernels (including the
+2.2.x and 2.4.x series) it displays bytes/s. It requires the /proc
+file system, or rather /proc/net/dev which is only found in Linux.
+So AFAIK this program is Linux specific.
diff --git a/network/xnetload/xnetload.SlackBuild b/network/xnetload/xnetload.SlackBuild
index 426552c8ac..83a631d761 100644
--- a/network/xnetload/xnetload.SlackBuild
+++ b/network/xnetload/xnetload.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for xnetload
 
@@ -6,26 +6,36 @@
 
 # Released into the public domain June 9, 2009
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=xnetload
 VERSION=${VERSION:-1.11.3}
 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"
@@ -72,5 +82,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/network/xtables-addons/README b/network/xtables-addons/README
index 5cd17a5da5..597f4dc18b 100644
--- a/network/xtables-addons/README
+++ b/network/xtables-addons/README
@@ -1,8 +1,12 @@
 xtables-addons (additions for iptables/xtables)
 
-Xtables-addons is the proclaimed successor to patch-o-matic(-ng). 
-It contains extensions that are not in the main Xtables package,
-including TARPIT and SYSRQ.
+Xtables-addons is a set of additional extensions for the Xtables packet
+filter that is present in the Linux kernel (which is loosely known by
+its administrative commands iptables/ip6tables/etc.).
+
+Xtables-addons succeeds the older patch-o-matic and patch-o-matic-ng
+packages. Likewise, it contains extensions that were not, or are not
+yet, accepted in the main kernel/iptables packages.
 
 This package builds some kernel modules, so it will need to be
 rebuilt any time you change kernels.
diff --git a/network/xtables-addons/slack-desc b/network/xtables-addons/slack-desc
index 6d42731891..15538736eb 100644
--- a/network/xtables-addons/slack-desc
+++ b/network/xtables-addons/slack-desc
@@ -8,11 +8,11 @@
               |-----handy-ruler------------------------------------------------------|
 xtables-addons: xtables-addons (additions for iptables/xtables)
 xtables-addons:
-xtables-addons: Xtables-addons is the proclaimed successor to
-xtables-addons: patch-o-matic(-ng). It contains extensions that
-xtables-addons: were not accepted in the main Xtables package.
+xtables-addons: Xtables-addons is a set of additional extensions for the Xtables
+xtables-addons: packet filter that is present in the Linux kernel (which is loosely
+xtables-addons: known by its administrative commands iptables/ip6tables/etc.).
 xtables-addons:
-xtables-addons: Homepage: http://xtables-addons.sf.net/
+xtables-addons: Homepage: https://inai.de/projects/xtables-addons/
 xtables-addons:
 xtables-addons:
 xtables-addons:
diff --git a/network/xtables-addons/xtables-addons.SlackBuild b/network/xtables-addons/xtables-addons.SlackBuild
index ca6a849131..f55c27abb3 100644
--- a/network/xtables-addons/xtables-addons.SlackBuild
+++ b/network/xtables-addons/xtables-addons.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for xtables-addons
 
-# Copyright 2008-2017  Robby Workman, Tuscaloosa, 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,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=xtables-addons
-VERSION=${VERSION:-2.14}
-BUILD=${BUILD:-1}
+VERSION=${VERSION:-3.18}
+BUILD=${BUILD:-2}
 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}
@@ -94,9 +104,11 @@ mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a INSTALL LICENSE 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-$PKGVER-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$PKGVER-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/network/xtables-addons/xtables-addons.info b/network/xtables-addons/xtables-addons.info
index 46577b4eba..acca5bb4bb 100644
--- a/network/xtables-addons/xtables-addons.info
+++ b/network/xtables-addons/xtables-addons.info
@@ -1,8 +1,8 @@
 PRGNAM="xtables-addons"
-VERSION="2.14"
-HOMEPAGE="http://xtables-addons.sf.net/"
-DOWNLOAD="http://download.sourceforge.net/xtables-addons/xtables-addons-2.14.tar.xz"
-MD5SUM="ebb073119a5f250dbfe6b855fcad56fd"
+VERSION="3.18"
+HOMEPAGE="https://inai.de/projects/xtables-addons/"
+DOWNLOAD="https://inai.de/files/xtables-addons/xtables-addons-3.18.tar.xz"
+MD5SUM="755471b1dc6808f274f914fa11552698"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/network/yadifa/README b/network/yadifa/README
index 718a975704..41b0ded884 100644
--- a/network/yadifa/README
+++ b/network/yadifa/README
@@ -1,15 +1,16 @@
-Lightweight authoritative Name Server with DNSSEC capabilities. Developed by
-the passionate people behind the .eu top-level domain, YADIFA has been built
-from scratch to face today’s DNS challenges, with no compromise on security,
-speed and stability, to offer a better and safer Internet experience.
+Lightweight authoritative Name Server with DNSSEC
+capabilities. Developed by the passionate people behind the .eu
+top-level domain, YADIFA has been built from scratch to face today’s
+DNS challenges, with no compromise on security, speed and stability,
+to offer a better and safer Internet experience.
 
-Package binaries and shared objects linked here dynamically, but by-default
-configure script links it statically, for performance consideration. Static
-linking makes sence only on heavy loaded environment (10+ Mbit DNS traffic,
-5000+ queries/second per server).
+Package binaries and shared objects linked here dynamically, but
+by-default configure script links it statically, for performance
+consideration. Static linking makes sence only on heavy loaded
+environment (10+ Mbit DNS traffic, 5000+ queries/second per server).
 
-YADIFA requires its own user in order to run securely. It is not advised to
-run services as root user without special reason.
+YADIFA requires its own user in order to run securely. It is not
+advised to run services as root user without special reason.
 
 
 To add yadifa user in system run as root:
@@ -21,17 +22,17 @@ To add yadifa user in system run as root:
 In order to run YADIFA during boot process, add to /etc/rc.d/rc.local :
 
 if [ -x /etc/rc.d/rc.yadifa ]; then
-	/etc/rc.d/rc.yadifa start
+   /etc/rc.d/rc.yadifa start
 fi
 
-By default this package compiles as shared binaries, but if required it is
-possible to build it statically. YADIFA' source by default links staticaly,
-because of performance considerations, but in pracatice it takes less effort
-to support shared linked binaries. But if you really need it just set
-environment variable and run SlackBuild:
+By default this package compiles as shared binaries, but if required
+it is possible to build it statically. YADIFA's source by default links
+statically, because of performance considerations, but in practice it
+takes less effort to support shared linked binaries. But if you really
+need it just set environment variable and run SlackBuild:
 
 USESTATIC=yes ./yadifa.SlackBuild
 
-In case of using static build of YADIFA, you should re-build and re-install
-yadifa package each time openssl recieves update to keep your installation
-secure.
\ No newline at end of file
+If you use a static build of YADIFA, you should re-build and
+re-install the yadifa package each time openssl recieves an update,
+to keep your installation secure.
diff --git a/network/yadifa/rc.yadifa b/network/yadifa/rc.yadifa
index 63a35376ed..fdc1cecf6e 100644
--- a/network/yadifa/rc.yadifa
+++ b/network/yadifa/rc.yadifa
@@ -5,6 +5,10 @@
 
 do_start() {
   if [ -x /usr/sbin/yadifad ]; then
+    if [ ! -d /run/yadifa ]; then
+      mkdir -p /run/yadifa
+      chown yadifa:yadifa /run/yadifa
+    fi
     echo -n "Starting YADIFA DNS Server:  /usr/sbin/yadifad -c /etc/yadifa/yadifad.conf --daemon... "
     /usr/sbin/yadifad -c /etc/yadifa/yadifad.conf --daemon 2> /dev/null
     echo "done."
diff --git a/network/yadifa/slack-desc b/network/yadifa/slack-desc
index a665097633..ef719c6b91 100644
--- a/network/yadifa/slack-desc
+++ b/network/yadifa/slack-desc
@@ -10,7 +10,7 @@ yadifa: yadifa (Yet Another DNS Implementation For All)
 yadifa:
 yadifa: yadifa is a lightweight authoritative Name Server with DNSSEC
 yadifa: capabilities. Developed by the passionate people behind the .eu
-yadifa: top-level domain, yadifa has been built from scratch to face today’s
+yadifa: top-level domain, yadifa has been built from scratch to face today's
 yadifa: DNS challenges, with no compromise on security, speed and stability,
 yadifa: to offer a better and safer Internet experience.
 yadifa:
diff --git a/network/yadifa/yadifa.SlackBuild b/network/yadifa/yadifa.SlackBuild
index 0b27ad7745..d284cd8108 100644
--- a/network/yadifa/yadifa.SlackBuild
+++ b/network/yadifa/yadifa.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for YADIFA, Authoritative DNS server
 
-# Copyright (c) 2016, Sergey Fedosov <eleksir@gmail.com>
+# Copyright (c) 2016-2020 Sergey Fedosov <eleksir@gmail.com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,24 +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=yadifa
-VERSION=${VERSION:-2.3.8}
-VSUFFIX=${VSUFFIX:-7713}
+VERSION=${VERSION:-2.5.3}
+VSUFFIX=${VSUFFIX:-10333}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+SRCVERSION=$(echo $VERSION-$VSUFFIX | tr _ -)
 
 if ! grep -q "^yadifa:" /etc/group; then
-        echo "$0: Error: $PRGNAM group (yadifa) doesn't exist."
-        echo "$0: Try creating one with:"
-        echo " # groupadd -g 332 yadifa"
-        exit 1
+  echo "$0: Error: $PRGNAM group (yadifa) doesn't exist."
+  echo "$0: Try creating one with:"
+  echo " # groupadd -g 332 yadifa"
+  exit 1
 fi
 
 if ! grep -q "^yadifa:" /etc/passwd; then
-        echo "$0: Error: $PRGNAM user (yadifa) doesn't exist."
-        echo "$0: Try creating one with:"
-        echo " # useradd -u 332 -d /var/lib/yadifa -g yadifa -s /bin/false yadifa"
-        exit 1
+  echo "$0: Error: $PRGNAM user (yadifa) doesn't exist."
+  echo "$0: Try creating one with:"
+  echo " # useradd -u 332 -d /var/lib/yadifa -g yadifa -s /bin/false yadifa"
+  exit 1
 fi
 
 if [ -z "$ARCH" ]; then
@@ -50,7 +55,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
+# the name of the created package would be, and then exit. This information
+# could be useful to other scripts.
+if [ ! -z "${PRINT_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,9 +96,9 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf yadifa-$VERSION-${VSUFFIX}
-tar xvf $CWD/yadifa-$VERSION-${VSUFFIX}.tar.gz || tar xvf  $CWD/$VERSION-${VSUFFIX}.tar.gz
-cd yadifa-$VERSION-${VSUFFIX}
+rm -rf yadifa-$SRCVERSION
+tar xvf $CWD/yadifa-$SRCVERSION.tar.gz || tar xvf  $CWD/$SRCVERSION.tar.gz
+cd yadifa-$SRCVERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -100,7 +112,7 @@ find -L . \
   --libdir=/usr/lib/yadifa \
   --localstatedir=/var/lib/yadifa \
   --mandir=/usr/man \
-  --docdir=/usr/doc/$PRGNAM-$VERSION-${VSUFFIX} \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
   --with-logdir=/var/log/yadifa \
   --enable-silent-rules \
   --enable-shared=$SHARED \
@@ -115,8 +127,9 @@ 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-${VSUFFIX}
-install --mode=644 $CWD/$PRGNAM.SlackBuild $PKG/usr/doc/$PRGNAM-$VERSION-${VSUFFIX}/$PRGNAM.SlackBuild
+find $PKG/usr/man -type f -exec gzip -9 {} \+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+install --mode=644 $CWD/$PRGNAM.SlackBuild $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 install --mode=644 $CWD/slack-desc $PKG/install/slack-desc
@@ -125,9 +138,6 @@ install --mode=755 $CWD/doinst.sh  $PKG/install/doinst.sh
 mkdir -p $PKG/etc/rc.d
 install --mode=755 $CWD/rc.yadifa  $PKG/etc/rc.d/rc.yadifa.new
 
-mkdir -p $PKG/var/run/yadifa
-chown yadifa:yadifa $PKG/var/run/yadifa
-
 mkdir -p $PKG/var/log/yadifa
 chown yadifa:yadifa $PKG/var/log/yadifa
 
@@ -142,8 +152,9 @@ install --mode=644 $CWD/zones.conf   $PKG/etc/yadifa/zones.conf.new
 mkdir -p $PKG/etc/logrotate.d
 install --mode=644 $CWD/yadifa.logrotate $PKG/etc/logrotate.d/yadifa.new
 
-# remove empty file
+# remove empty files
 rm -rf $PKG/etc/yadifa/yadifad.conf
+rm -rf $PKG/etc/yadifa/yakeyrolld.conf
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-${VERSION}_${VSUFFIX}-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/network/yadifa/yadifa.info b/network/yadifa/yadifa.info
index 14fc0d9ea8..93d83aeca8 100644
--- a/network/yadifa/yadifa.info
+++ b/network/yadifa/yadifa.info
@@ -1,8 +1,8 @@
 PRGNAM="yadifa"
-VERSION="2.3.8-7713"
-HOMEPAGE="https://www.yadifa.eu/home"
-DOWNLOAD="https://cdn.yadifa.eu/sites/default/files/releases/yadifa-2.3.8-7713.tar.gz"
-MD5SUM="90c67ebf2f4eb6add43191be93610b2f"
+VERSION="2.5.3"
+HOMEPAGE="https://www.yadifa.eu"
+DOWNLOAD="https://www.yadifa.eu/sites/default/files/releases/yadifa-2.5.3-10333.tar.gz"
+MD5SUM="107fe4bf6eb6d1c8da8bd185bcec5d46"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/network/yadifa/yadifa.logrotate b/network/yadifa/yadifa.logrotate
index 93cdd2ee13..a920e093ca 100644
--- a/network/yadifa/yadifa.logrotate
+++ b/network/yadifa/yadifa.logrotate
@@ -1,6 +1,8 @@
 /var/log/yadifa/*.log {
   daily
   rotate 14
+  create 0644 yadifa yadifa
+  su yadifa yadifa
   notifempty
   missingok
   compress
diff --git a/network/yandex-browser-beta/README b/network/yandex-browser-beta/README
deleted file mode 100644
index 25b4949a43..0000000000
--- a/network/yandex-browser-beta/README
+++ /dev/null
@@ -1,4 +0,0 @@
-yandex-browser-beta (The web browser from Yandex)
-
-Yandex Browser is a browser that combines a minimal design with
-sophisticated technology to make the web faster, safer, and easier.
diff --git a/network/yandex-browser-beta/doinst.sh b/network/yandex-browser-beta/doinst.sh
deleted file mode 100644
index e4e6459838..0000000000
--- a/network/yandex-browser-beta/doinst.sh
+++ /dev/null
@@ -1,8 +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
-
diff --git a/network/yandex-browser-beta/slack-desc b/network/yandex-browser-beta/slack-desc
deleted file mode 100644
index 7dd9a7af1a..0000000000
--- a/network/yandex-browser-beta/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------------------------------------------------------|
-yandex-browser-beta: yandex-browser-beta (The web browser from Yandex)
-yandex-browser-beta:
-yandex-browser-beta: Yandex Browser is a browser that combines a minimal design with
-yandex-browser-beta: sophisticated technology to make the web faster, safer, and easier.
-yandex-browser-beta:
-yandex-browser-beta: Home Page: https://browser.yandex.com/
-yandex-browser-beta:
-yandex-browser-beta:
-yandex-browser-beta:
-yandex-browser-beta:
-yandex-browser-beta:
diff --git a/network/yandex-browser-beta/yandex-browser-beta.SlackBuild b/network/yandex-browser-beta/yandex-browser-beta.SlackBuild
deleted file mode 100644
index a5176350cc..0000000000
--- a/network/yandex-browser-beta/yandex-browser-beta.SlackBuild
+++ /dev/null
@@ -1,105 +0,0 @@
-#!/bin/sh
-#
-# Slackware build script for yandex-browser-beta.
-#
-# Copyright 2017-2019  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=yandex-browser-beta
-VERSION=${VERSION:-19.6.2.594}
-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=""
-  BITS="i386"
-  echo "This package is currently only available for 64bit."
-  exit 1
-elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-  LIBDIRSUFFIX=""
-  BITS="i386"
-  echo "This package is currently only available for 64bit."
-  exit 1
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
-  BITS="amd64"
-else
-  echo "Package for $ARCH architecture is not available."
-  exit 1
-fi
-
-SRCVER=${SRCVER:-$VERSION-1}
-
-set -e
-
-rm -rf $PKG $TMP/$PRGNAM
-mkdir -p $TMP/$PRGNAM $PKG $OUTPUT
-
-cd $TMP/$PRGNAM
-ar p $CWD/${PRGNAM}_${SRCVER}_${BITS}.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 {} \;
-
-rm -r etc usr/share/gnome-control-center
-cp -dr --no-preserve=ownership opt usr $PKG/
-
-chmod 4755 $PKG/opt/yandex/browser-beta/yandex_browser-sandbox
-chown root $PKG/opt/yandex/browser-beta/yandex_browser-sandbox
-
-install -D -m0644 $PKG/opt/yandex/browser-beta/product_logo_128.png $PKG/usr/share/pixmaps/$PRGNAM.png
-
-find $PKG -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
-gzip -dc $PKG/usr/share/doc/$PRGNAM/changelog.gz > $PKG/usr/doc/$PRGNAM-$VERSION/ChangeLog
-rm -rf $PKG/usr/share/doc
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-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/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/network/yandex-browser-beta/yandex-browser-beta.info b/network/yandex-browser-beta/yandex-browser-beta.info
deleted file mode 100644
index 47aaa29c39..0000000000
--- a/network/yandex-browser-beta/yandex-browser-beta.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="yandex-browser-beta"
-VERSION="19.6.2.594"
-HOMEPAGE="https://browser.yandex.com/"
-DOWNLOAD="UNSUPPORTED"
-MD5SUM=""
-DOWNLOAD_x86_64="http://repo.yandex.ru/yandex-browser/deb/pool/main/y/yandex-browser-beta/yandex-browser-beta_19.6.2.594-1_amd64.deb"
-MD5SUM_x86_64="47db3402492c3b0210daa9143285e4fc"
-REQUIRES=""
-MAINTAINER="Edinaldo P. Silva"
-EMAIL="edps.mundognu@gmail.com"
diff --git a/network/yate/README b/network/yate/README
index 70293624b8..ec6dd4c5f3 100644
--- a/network/yate/README
+++ b/network/yate/README
@@ -1,10 +1,11 @@
-Yate is a next-generation telephony engine; while currently focused on Voice
-over Internet Protocol (VoIP) and PSTN, its power lies in its ability to be
-easily extended. Voice, video, data and instant messenging can all be unified
-under Yate's flexible routing engine, maximizing communications efficiency
-and minimizing infrastructure costs for businesses.
+Yate is a next-generation telephony engine; while currently focused
+on Voice over Internet Protocol (VoIP) and PSTN, its power lies in
+its ability to be easily extended. Voice, video, data and instant
+messenging can all be unified under Yate's flexible routing engine,
+maximizing communications efficiency and minimizing infrastructure
+costs for businesses.
 
-Optional dependencies: postgresql, speex, amrnb
+Optional dependencies: postgresql, amrnb
 
 To build with SSE2 instructions, set the option SSE2=yes:
 
diff --git a/network/yate/yate.SlackBuild b/network/yate/yate.SlackBuild
index 820212106e..c0d4fca208 100644
--- a/network/yate/yate.SlackBuild
+++ b/network/yate/yate.SlackBuild
@@ -1,12 +1,15 @@
-#!/bin/sh
+#!/bin/bash
 # Slackware build script for yate
 #
 # Michales (clavisound) Michaloudes korgie@gmail.com <2013, 2017>
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=yate
-VERSION=${VERSION:-5.5.0_1}
+VERSION=${VERSION:-6.4.0_1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 SRCVER=$(echo $VERSION | tr _ -)
 
@@ -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}
@@ -74,7 +84,6 @@ make -j1
 make install DESTDIR=$PKG
 
 rm -rf $PKG/usr/lib/menu
-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
@@ -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/network/yate/yate.info b/network/yate/yate.info
index 9aa13d48fd..3fe98a9018 100644
--- a/network/yate/yate.info
+++ b/network/yate/yate.info
@@ -1,10 +1,10 @@
 PRGNAM="yate"
-VERSION="5.5.0_1"
+VERSION="6.4.0_1"
 HOMEPAGE="http://yate.null.ro/"
-DOWNLOAD="http://yate.null.ro/tarballs/yate5/yate-5.5.0-1.tar.gz"
-MD5SUM="c433b3df08a5993e16fadaac279e39a0"
+DOWNLOAD="http://yate.null.ro/tarballs/yate6/yate-6.4.0-1.tar.gz"
+MD5SUM="6bb5d706ebe601ad8fcbb950f45b69d8"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES=""
+REQUIRES="qt4"
 MAINTAINER="Michales Michaloudes"
 EMAIL="korgie@gmail.com"
diff --git a/network/yle-dl/README b/network/yle-dl/README
index c38646071b..22d3ad5ec1 100644
--- a/network/yle-dl/README
+++ b/network/yle-dl/README
@@ -1,5 +1,8 @@
 yle-dl is a tool for downloading media files from the video streaming
 services of the Finnish national broadcasting company Yle.
 
-rtmpdump is an optional dependency.  It's needed for downloading some Elävä
-Arkisto streams.
+xattr is an optional dependency.  It adds support for writing metadata
+to extended attributes of video files.
+
+python3-psutil is an optional dependency.  It adds support for detecting
+if the destination filesystem requires a restricted character set.
diff --git a/network/yle-dl/yle-dl.SlackBuild b/network/yle-dl/yle-dl.SlackBuild
index beb8a33022..3fd8edb8af 100644
--- a/network/yle-dl/yle-dl.SlackBuild
+++ b/network/yle-dl/yle-dl.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for yle-dl
 
@@ -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=yle-dl
-VERSION=${VERSION:-20190614}
+VERSION=${VERSION:-20240130}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,25 +38,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}
 
-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,14 +65,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 {} \;
 
-python setup.py install --root=$PKG
+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 \
-  ChangeLog COPYING README.fi README.md \
+  ChangeLog COPYING README.fi.md README.md README.sv.md \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
@@ -84,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/network/yle-dl/yle-dl.info b/network/yle-dl/yle-dl.info
index f896f58d7f..a8a5fb60e2 100644
--- a/network/yle-dl/yle-dl.info
+++ b/network/yle-dl/yle-dl.info
@@ -1,10 +1,10 @@
 PRGNAM="yle-dl"
-VERSION="20190614"
+VERSION="20240130"
 HOMEPAGE="https://aajanki.github.io/yle-dl/"
-DOWNLOAD="https://github.com/aajanki/yle-dl/archive/20190614/yle-dl-20190614.tar.gz"
-MD5SUM="2b6b6b0e711783184e77ab8c780e6a50"
+DOWNLOAD="https://github.com/aajanki/yle-dl/archive/20240130/yle-dl-20240130.tar.gz"
+MD5SUM="4ea36e5fab2dd1b255e39d7a7bff3dcd"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="attrs ffmpeg lxml mini-amf pycryptodome python-configargparse python-future python-requests"
+REQUIRES="python3-lxml python3-configargparse"
 MAINTAINER="Markus Rinne"
 EMAIL="markus.ka.rinne@gmail.com"
diff --git a/network/yoda/README b/network/yoda/README
deleted file mode 100644
index 1db7e41eb6..0000000000
--- a/network/yoda/README
+++ /dev/null
@@ -1 +0,0 @@
-Multiple repositories management.
diff --git a/network/yoda/doinst.sh b/network/yoda/doinst.sh
deleted file mode 100644
index 5fb28930db..0000000000
--- a/network/yoda/doinst.sh
+++ /dev/null
@@ -1,3 +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/network/yoda/slack-desc b/network/yoda/slack-desc
deleted file mode 100644
index cfff2745ac..0000000000
--- a/network/yoda/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------------------------------------------------------|
-yoda: yoda (Multiple repositories management)
-yoda:
-yoda: Multiple repositories management.
-yoda:
-yoda: Homepage: https://github.com/Numergy/yoda
-yoda:
-yoda:
-yoda:
-yoda:
-yoda:
-yoda:
diff --git a/network/yoda/yoda.SlackBuild b/network/yoda/yoda.SlackBuild
deleted file mode 100644
index ceb5dd5194..0000000000
--- a/network/yoda/yoda.SlackBuild
+++ /dev/null
@@ -1,86 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for yoda
-
-# 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=yoda
-VERSION=${VERSION:-0.1.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 {} \;
-
-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/network/yoda/yoda.info b/network/yoda/yoda.info
deleted file mode 100644
index c89ef5b8b8..0000000000
--- a/network/yoda/yoda.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="yoda"
-VERSION="0.1.5"
-HOMEPAGE="https://github.com/Numergy/yoda"
-DOWNLOAD="https://pypi.python.org/packages/source/y/yoda/yoda-0.1.5.tar.gz"
-MD5SUM="061e633a900c5f6557e8ce13f71e0f71"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="PyYAML PyColorizer PrettyTable argcomplete"
-MAINTAINER="Dimitris Zlatanidis"
-EMAIL="d.zlatanidis@gmail.com"
diff --git a/network/you-get/setup.patch b/network/you-get/setup.patch
new file mode 100644
index 0000000000..c07de8362a
--- /dev/null
+++ b/network/you-get/setup.patch
@@ -0,0 +1,25 @@
+--- you-get-0.4.1555/setup.orig	2022-02-19 21:42:45.164326941 +0200
++++ you-get-0.4.1555/setup.py	2022-02-19 21:51:29.199363227 +0200
+@@ -5,7 +5,7 @@
+ 
+ PROJ_METADATA = '%s.json' % PROJ_NAME
+ 
+-import os, json, imp
++import os, json
+ here = os.path.abspath(os.path.dirname(__file__))
+ proj_info = json.loads(open(os.path.join(here, PROJ_METADATA), encoding='utf-8').read())
+ try:
+@@ -13,12 +13,11 @@
+ except:
+     README = ""
+ CHANGELOG = open(os.path.join(here, 'CHANGELOG.rst'), encoding='utf-8').read()
+-VERSION = imp.load_source('version', os.path.join(here, 'src/%s/version.py' % PACKAGE_NAME)).__version__
+ 
+ from setuptools import setup, find_packages
+ setup(
+     name = proj_info['name'],
+-    version = VERSION,
++    version = '0.4.1620',
+ 
+     author = proj_info['author'],
+     author_email = proj_info['author_email'],
diff --git a/network/you-get/you-get.SlackBuild b/network/you-get/you-get.SlackBuild
index 5f0ca62e16..076f6c5069 100644
--- a/network/you-get/you-get.SlackBuild
+++ b/network/you-get/you-get.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for you-get
 
-# Copyright 2014-2019  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=you-get
-VERSION=${VERSION:-0.4.1270}
+VERSION=${VERSION:-0.4.1620}
 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/setup.patch
+
 python3 setup.py install --root=$PKG
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
@@ -83,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/network/you-get/you-get.info b/network/you-get/you-get.info
index eae0d2c543..fbedbaacf5 100644
--- a/network/you-get/you-get.info
+++ b/network/you-get/you-get.info
@@ -1,10 +1,10 @@
 PRGNAM="you-get"
-VERSION="0.4.1270"
+VERSION="0.4.1620"
 HOMEPAGE="http://www.soimort.org/you-get/"
-DOWNLOAD="https://files.pythonhosted.org/packages/35/67/7b157e3dacedd97959595a817367dfbe14a6e1096c370a6333f2dc685a84/you-get-0.4.1270.tar.gz"
-MD5SUM="9a34368f70a6315fe7f67623c3fd58d6"
+DOWNLOAD="https://github.com/soimort/you-get/releases/download/v0.4.1620/you-get-0.4.1620.tar.gz"
+MD5SUM="98cba7d92ce5831b7eea5650f8eedf3f"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="python3"
+REQUIRES=""
 MAINTAINER="Dimitris Zlatanidis"
 EMAIL="d.zlatanidis@gmail.com"
diff --git a/network/youtube-dl-gui/README b/network/youtube-dl-gui/README
index ee8c9b9b5b..e7373480c4 100644
--- a/network/youtube-dl-gui/README
+++ b/network/youtube-dl-gui/README
@@ -1 +1,2 @@
-A cross platform front-end GUI of the popular youtube-dl written in wxPython.
+A cross platform front-end GUI of the popular youtube-dl written in
+wxPython.
diff --git a/network/youtube-dl-gui/doinst.sh b/network/youtube-dl-gui/doinst.sh
index 5fb28930db..65c7e2eeb9 100644
--- a/network/youtube-dl-gui/doinst.sh
+++ b/network/youtube-dl-gui/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/network/youtube-dl-gui/youtube-dl-gui.SlackBuild b/network/youtube-dl-gui/youtube-dl-gui.SlackBuild
index 7ee727270f..da5d45fc67 100644
--- a/network/youtube-dl-gui/youtube-dl-gui.SlackBuild
+++ b/network/youtube-dl-gui/youtube-dl-gui.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for youtube-dl-gui
 
@@ -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:
+# - add gtk-update-icon-cache to doinst.sh.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=youtube-dl-gui
 VERSION=${VERSION:-0.3.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}
@@ -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/network/youtube-dl-gui/youtube-dl-gui.info b/network/youtube-dl-gui/youtube-dl-gui.info
index f1077c0794..2e5c85d627 100644
--- a/network/youtube-dl-gui/youtube-dl-gui.info
+++ b/network/youtube-dl-gui/youtube-dl-gui.info
@@ -1,7 +1,7 @@
 PRGNAM="youtube-dl-gui"
 VERSION="0.3.8"
 HOMEPAGE="https://github.com/MrS0m30n3/youtube-dl-gui"
-DOWNLOAD="https://github.com/MrS0m30n3/youtube-dl-gui/archive/0.3.8.tar.gz"
+DOWNLOAD="https://github.com/MrS0m30n3/youtube-dl-gui/archive/0.3.8/youtube-dl-gui-0.3.8.tar.gz"
 MD5SUM="ddd774b5a0b0abb8f21b5bba2a80139f"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/network/youtube-dl-server/youtube-dl-server.SlackBuild b/network/youtube-dl-server/youtube-dl-server.SlackBuild
index d8debfacd5..4643daa0bf 100644
--- a/network/youtube-dl-server/youtube-dl-server.SlackBuild
+++ b/network/youtube-dl-server/youtube-dl-server.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for youtube-dl-server
 
@@ -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=youtube-dl-server
 SRCNAM=$(echo $PRGNAM | tr - _)
 VERSION=${VERSION:-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}
@@ -70,7 +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 {} \;
 
-python setup.py install --root=$PKG
+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
@@ -84,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/network/youtube-dl/README b/network/youtube-dl/README
index 523d072dda..28e3e9f8a6 100644
--- a/network/youtube-dl/README
+++ b/network/youtube-dl/README
@@ -4,5 +4,3 @@ interpreter, version 2.6, 2.7, or 3.2+, and it is not platform
 specific. It should work on your Unix box, on Windows or on
 Mac OS X. It is released to the public domain, which means you
 can modify it, redistribute it or use it however you like.
-
-Optional dependency: python3
diff --git a/network/youtube-dl/doinst.sh b/network/youtube-dl/doinst.sh
deleted file mode 100644
index 5fb28930db..0000000000
--- a/network/youtube-dl/doinst.sh
+++ /dev/null
@@ -1,3 +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/network/youtube-dl/setup.patch b/network/youtube-dl/setup.patch
index 3d35bf5abb..8efe6fe530 100644
--- a/network/youtube-dl/setup.patch
+++ b/network/youtube-dl/setup.patch
@@ -1,5 +1,5 @@
---- youtube-dl-2018.06.25/setup.py.orig	2018-06-30 08:56:35.007072725 +0200
-+++ youtube-dl-2018.06.25/setup.py	2018-06-30 08:56:54.365073186 +0200
+--- youtube-dl-2021.12.17+20230618_07af47960/setup.py.orig	2023-06-20 20:26:26.955075970 +0300
++++ youtube-dl-2021.12.17+20230618_07af47960/setup.py	2023-06-20 20:40:25.308003694 +0300
 @@ -59,10 +59,10 @@
      params = py2exe_params
  else:
@@ -8,7 +8,7 @@
 -        ('etc/fish/completions', ['youtube-dl.fish']),
 -        ('share/doc/youtube_dl', ['README.txt']),
 -        ('share/man/man1', ['youtube-dl.1'])
-+        ('/etc/bash_completion.d', ['youtube-dl.bash-completion']),
++        ('/usr/share/bash-completion/completions', ['youtube-dl.bash-completion']),
 +        ('/etc/fish/completions', ['youtube-dl.fish']),
 +        ('doc/youtube_dl', ['README.txt']),
 +        ('man/man1', ['youtube-dl.1'])
diff --git a/network/youtube-dl/slack-desc b/network/youtube-dl/slack-desc
index 96f5c77fe3..29efeb4334 100644
--- a/network/youtube-dl/slack-desc
+++ b/network/youtube-dl/slack-desc
@@ -9,9 +9,9 @@
 youtube-dl: youtube-dl (YouTube video download utility)
 youtube-dl:
 youtube-dl: youtube-dl is a small command-line program to download videos
-youtube-dl: from YouTube.com.  It's licensed under the MIT License.
+youtube-dl: from YouTube.com and a few more sites.
 youtube-dl:
-youtube-dl: Homepage: http://www.yt-dl.org/
+youtube-dl: Homepage: https://github.com/ytdl-org/youtube-dl
 youtube-dl:
 youtube-dl:
 youtube-dl:
diff --git a/network/youtube-dl/youtube-dl.1 b/network/youtube-dl/youtube-dl.1
new file mode 100644
index 0000000000..9161f3b727
--- /dev/null
+++ b/network/youtube-dl/youtube-dl.1
@@ -0,0 +1,2522 @@
+.\" Automatically generated by Pandoc 3.1.3
+.\"
+.\" Define V font for inline verbatim, using C font in formats
+.\" that render this, and otherwise B font.
+.ie "\f[CB]x\f[]"x" \{\
+. ftr V B
+. ftr VI BI
+. ftr VB B
+. ftr VBI BI
+.\}
+.el \{\
+. ftr V CR
+. ftr VI CI
+. ftr VB CB
+. ftr VBI CBI
+.\}
+.TH "YOUTUBE-DL" "1" "" "" ""
+.hy
+.SH NAME
+.PP
+youtube-dl - download videos from youtube.com or other video platforms
+.SH SYNOPSIS
+.PP
+\f[B]youtube-dl\f[R] [OPTIONS] URL [URL\&...]
+.SH DESCRIPTION
+.PP
+\f[B]youtube-dl\f[R] is a command-line program to download videos from
+YouTube.com and a few more sites.
+It requires the Python interpreter, version 2.6, 2.7, or 3.2+, and it is
+not platform specific.
+It should work on your Unix box, on Windows or on macOS.
+It is released to the public domain, which means you can modify it,
+redistribute it or use it however you like.
+.SH OPTIONS
+.TP
+-h, \[en]help
+Print this help text and exit
+.TP
+\[en]version
+Print program version and exit
+.TP
+-U, \[en]update
+Update this program to latest version.
+Make sure that you have sufficient permissions (run with sudo if needed)
+.TP
+-i, \[en]ignore-errors
+Continue on download errors, for example to skip unavailable videos in a
+playlist
+.TP
+\[en]abort-on-error
+Abort downloading of further videos (in the playlist or the command
+line) if an error occurs
+.TP
+\[en]dump-user-agent
+Display the current browser identification
+.TP
+\[en]list-extractors
+List all supported extractors
+.TP
+\[en]extractor-descriptions
+Output descriptions of all supported extractors
+.TP
+\[en]force-generic-extractor
+Force extraction to use the generic extractor
+.TP
+\[en]default-search \f[I]PREFIX\f[R]
+Use this prefix for unqualified URLs.
+For example \[lq]gvsearch2:\[rq] downloads two videos from google videos
+for youtube- dl \[lq]large apple\[rq].
+Use the value \[lq]auto\[rq] to let youtube-dl guess
+(\[lq]auto_warning\[rq] to emit a warning when guessing).
+\[lq]error\[rq] just throws an error.
+The default value \[lq]fixup_error\[rq] repairs broken URLs, but emits
+an error if this is not possible instead of searching.
+.TP
+\[en]ignore-config
+Do not read configuration files.
+When given in the global configuration file /etc/youtube-dl.conf: Do not
+read the user configuration in \[ti]/.config/youtube-dl/config
+(%APPDATA%/youtube-dl/config.txt on Windows)
+.TP
+\[en]config-location \f[I]PATH\f[R]
+Location of the configuration file; either the path to the config or its
+containing directory.
+.TP
+\[en]flat-playlist
+Do not extract the videos of a playlist, only list them.
+.TP
+\[en]mark-watched
+Mark videos watched (YouTube only)
+.TP
+\[en]no-mark-watched
+Do not mark videos watched (YouTube only)
+.TP
+\[en]no-color
+Do not emit color codes in output
+.SS Network Options:
+.TP
+\[en]proxy \f[I]URL\f[R]
+Use the specified HTTP/HTTPS/SOCKS proxy.
+To enable SOCKS proxy, specify a proper scheme.
+For example socks5://127.0.0.1:1080/.
+Pass in an empty string (\[en]proxy \[lq]\[lq]) for direct connection
+.TP
+\[en]socket-timeout \f[I]SECONDS\f[R]
+Time to wait before giving up, in seconds
+.TP
+\[en]source-address \f[I]IP\f[R]
+Client-side IP address to bind to
+.TP
+-4, \[en]force-ipv4
+Make all connections via IPv4
+.TP
+-6, \[en]force-ipv6
+Make all connections via IPv6
+.SS Geo Restriction:
+.TP
+\[en]geo-verification-proxy \f[I]URL\f[R]
+Use this proxy to verify the IP address for some geo-restricted sites.
+The default proxy specified by \[en]proxy (or none, if the option is not
+present) is used for the actual downloading.
+.TP
+\[en]geo-bypass
+Bypass geographic restriction via faking X-Forwarded-For HTTP header
+.TP
+\[en]no-geo-bypass
+Do not bypass geographic restriction via faking X-Forwarded-For HTTP
+header
+.TP
+\[en]geo-bypass-country \f[I]CODE\f[R]
+Force bypass geographic restriction with explicitly provided two-letter
+ISO 3166-2 country code
+.TP
+\[en]geo-bypass-ip-block \f[I]IP_BLOCK\f[R]
+Force bypass geographic restriction with explicitly provided IP block in
+CIDR notation
+.SS Video Selection:
+.TP
+\[en]playlist-start \f[I]NUMBER\f[R]
+Playlist video to start at (default is 1)
+.TP
+\[en]playlist-end \f[I]NUMBER\f[R]
+Playlist video to end at (default is last)
+.TP
+\[en]playlist-items \f[I]ITEM_SPEC\f[R]
+Playlist video items to download.
+Specify indices of the videos in the playlist separated by commas like:
+\[lq]\[en] playlist-items 1,2,5,8\[rq] if you want to download videos
+indexed 1, 2, 5, 8 in the playlist.
+You can specify range: \[rq] \[en]playlist-items 1-3,7,10-13\[rq], it
+will download the videos at index 1, 2, 3, 7, 10, 11, 12 and 13.
+.TP
+\[en]match-title \f[I]REGEX\f[R]
+Download only matching titles (regex or caseless sub-string)
+.TP
+\[en]reject-title \f[I]REGEX\f[R]
+Skip download for matching titles (regex or caseless sub-string)
+.TP
+\[en]max-downloads \f[I]NUMBER\f[R]
+Abort after downloading NUMBER files
+.TP
+\[en]min-filesize \f[I]SIZE\f[R]
+Do not download any videos smaller than SIZE (e.g.\ 50k or 44.6m)
+.TP
+\[en]max-filesize \f[I]SIZE\f[R]
+Do not download any videos larger than SIZE (e.g.\ 50k or 44.6m)
+.TP
+\[en]date \f[I]DATE\f[R]
+Download only videos uploaded in this date
+.TP
+\[en]datebefore \f[I]DATE\f[R]
+Download only videos uploaded on or before this date (i.e.\ inclusive)
+.TP
+\[en]dateafter \f[I]DATE\f[R]
+Download only videos uploaded on or after this date (i.e.\ inclusive)
+.TP
+\[en]min-views \f[I]COUNT\f[R]
+Do not download any videos with less than COUNT views
+.TP
+\[en]max-views \f[I]COUNT\f[R]
+Do not download any videos with more than COUNT views
+.TP
+\[en]match-filter \f[I]FILTER\f[R]
+Generic video filter.
+Specify any key (see the \[lq]OUTPUT TEMPLATE\[rq] for a list of
+available keys) to match if the key is present, !key to check if the key
+is not present, key > NUMBER (like \[lq]comment_count > 12\[rq], also
+works with >=, <, <=, !=, =) to compare against a number, key =
+`LITERAL' (like \[lq]uploader = `Mike Smith'\[rq], also works with !=)
+to match against a string literal and & to require multiple matches.
+Values which are not known are excluded unless you put a question mark
+(?)
+after the operator.
+For example, to only match videos that have been liked more than 100
+times and disliked less than 50 times (or the dislike functionality is
+not available at the given service), but who also have a description,
+use \[en]match-filter \[lq]like_count > 100 & dislike_count <?
+50 & description\[rq] .
+.TP
+\[en]no-playlist
+Download only the video, if the URL refers to a video and a playlist.
+.TP
+\[en]yes-playlist
+Download the playlist, if the URL refers to a video and a playlist.
+.TP
+\[en]age-limit \f[I]YEARS\f[R]
+Download only videos suitable for the given age
+.TP
+\[en]download-archive \f[I]FILE\f[R]
+Download only videos not listed in the archive file.
+Record the IDs of all downloaded videos in it.
+.TP
+\[en]include-ads
+Download advertisements as well (experimental)
+.SS Download Options:
+.TP
+-r, \[en]limit-rate \f[I]RATE\f[R]
+Maximum download rate in bytes per second (e.g.\ 50K or 4.2M)
+.TP
+-R, \[en]retries \f[I]RETRIES\f[R]
+Number of retries (default is 10), or \[lq]infinite\[rq].
+.TP
+\[en]fragment-retries \f[I]RETRIES\f[R]
+Number of retries for a fragment (default is 10), or \[lq]infinite\[rq]
+(DASH, hlsnative and ISM)
+.TP
+\[en]skip-unavailable-fragments
+Skip unavailable fragments (DASH, hlsnative and ISM)
+.TP
+\[en]abort-on-unavailable-fragment
+Abort downloading when some fragment is not available
+.TP
+\[en]keep-fragments
+Keep downloaded fragments on disk after downloading is finished;
+fragments are erased by default
+.TP
+\[en]buffer-size \f[I]SIZE\f[R]
+Size of download buffer (e.g.\ 1024 or 16K) (default is 1024)
+.TP
+\[en]no-resize-buffer
+Do not automatically adjust the buffer size.
+By default, the buffer size is automatically resized from an initial
+value of SIZE.
+.TP
+\[en]http-chunk-size \f[I]SIZE\f[R]
+Size of a chunk for chunk-based HTTP downloading (e.g.\ 10485760 or 10M)
+(default is disabled).
+May be useful for bypassing bandwidth throttling imposed by a webserver
+(experimental)
+.TP
+\[en]playlist-reverse
+Download playlist videos in reverse order
+.TP
+\[en]playlist-random
+Download playlist videos in random order
+.TP
+\[en]xattr-set-filesize
+Set file xattribute ytdl.filesize with expected file size
+.TP
+\[en]hls-prefer-native
+Use the native HLS downloader instead of ffmpeg
+.TP
+\[en]hls-prefer-ffmpeg
+Use ffmpeg instead of the native HLS downloader
+.TP
+\[en]hls-use-mpegts
+Use the mpegts container for HLS videos, allowing to play the video
+while downloading (some players may not be able to play it)
+.TP
+\[en]external-downloader \f[I]COMMAND\f[R]
+Use the specified external downloader.
+Currently supports aria2c,avconv,axel,c url,ffmpeg,httpie,wget
+.TP
+\[en]external-downloader-args \f[I]ARGS\f[R]
+Give these arguments to the external downloader
+.SS Filesystem Options:
+.TP
+-a, \[en]batch-file \f[I]FILE\f[R]
+File containing URLs to download (`-' for stdin), one URL per line.
+Lines starting with `#', `;' or `]' are considered as comments and
+ignored.
+.TP
+\[en]id
+Use only video ID in file name
+.TP
+-o, \[en]output \f[I]TEMPLATE\f[R]
+Output filename template, see the \[lq]OUTPUT TEMPLATE\[rq] for all the
+info
+.TP
+\[en]output-na-placeholder \f[I]PLACEHOLDER\f[R]
+Placeholder value for unavailable meta fields in output filename
+template (default is \[lq]NA\[rq])
+.TP
+\[en]autonumber-start \f[I]NUMBER\f[R]
+Specify the start value for %(autonumber)s (default is 1)
+.TP
+\[en]restrict-filenames
+Restrict filenames to only ASCII characters, and avoid \[lq]&\[rq] and
+spaces in filenames
+.TP
+-w, \[en]no-overwrites
+Do not overwrite files
+.TP
+-c, \[en]continue
+Force resume of partially downloaded files.
+By default, youtube-dl will resume downloads if possible.
+.TP
+\[en]no-continue
+Do not resume partially downloaded files (restart from beginning)
+.TP
+\[en]no-part
+Do not use .part files - write directly into output file
+.TP
+\[en]no-mtime
+Do not use the Last-modified header to set the file modification time
+.TP
+\[en]write-description
+Write video description to a .description file
+.TP
+\[en]write-info-json
+Write video metadata to a .info.json file
+.TP
+\[en]write-annotations
+Write video annotations to a .annotations.xml file
+.TP
+\[en]load-info-json \f[I]FILE\f[R]
+JSON file containing the video information (created with the
+\[lq]\[en]write- info-json\[rq] option)
+.TP
+\[en]cookies \f[I]FILE\f[R]
+File to read cookies from and dump cookie jar in
+.TP
+\[en]cache-dir \f[I]DIR\f[R]
+Location in the filesystem where youtube-dl can store some downloaded
+information permanently.
+By default $XDG_CACHE_HOME/youtube-dl or \[ti]/.cache/youtube-dl .
+At the moment, only YouTube player files (for videos with obfuscated
+signatures) are cached, but that may change.
+.TP
+\[en]no-cache-dir
+Disable filesystem caching
+.TP
+\[en]rm-cache-dir
+Delete all filesystem cache files
+.SS Thumbnail Options:
+.TP
+\[en]write-thumbnail
+Write thumbnail image to disk
+.TP
+\[en]write-all-thumbnails
+Write all thumbnail image formats to disk
+.TP
+\[en]list-thumbnails
+Simulate and list all available thumbnail formats
+.SS Verbosity / Simulation Options:
+.TP
+-q, \[en]quiet
+Activate quiet mode
+.TP
+\[en]no-warnings
+Ignore warnings
+.TP
+-s, \[en]simulate
+Do not download the video and do not write anything to disk
+.TP
+\[en]skip-download
+Do not download the video
+.TP
+-g, \[en]get-url
+Simulate, quiet but print URL
+.TP
+-e, \[en]get-title
+Simulate, quiet but print title
+.TP
+\[en]get-id
+Simulate, quiet but print id
+.TP
+\[en]get-thumbnail
+Simulate, quiet but print thumbnail URL
+.TP
+\[en]get-description
+Simulate, quiet but print video description
+.TP
+\[en]get-duration
+Simulate, quiet but print video length
+.TP
+\[en]get-filename
+Simulate, quiet but print output filename
+.TP
+\[en]get-format
+Simulate, quiet but print output format
+.TP
+-j, \[en]dump-json
+Simulate, quiet but print JSON information.
+See the \[lq]OUTPUT TEMPLATE\[rq] for a description of available keys.
+.TP
+-J, \[en]dump-single-json
+Simulate, quiet but print JSON information for each command-line
+argument.
+If the URL refers to a playlist, dump the whole playlist information in
+a single line.
+.TP
+\[en]print-json
+Be quiet and print the video information as JSON (video is still being
+downloaded).
+.TP
+\[en]newline
+Output progress bar as new lines
+.TP
+\[en]no-progress
+Do not print progress bar
+.TP
+\[en]console-title
+Display progress in console titlebar
+.TP
+-v, \[en]verbose
+Print various debugging information
+.TP
+\[en]dump-pages
+Print downloaded pages encoded using base64 to debug problems (very
+verbose)
+.TP
+\[en]write-pages
+Write downloaded intermediary pages to files in the current directory to
+debug problems
+.TP
+\[en]print-traffic
+Display sent and read HTTP traffic
+.TP
+-C, \[en]call-home
+Contact the youtube-dl server for debugging
+.TP
+\[en]no-call-home
+Do NOT contact the youtube-dl server for debugging
+.SS Workarounds:
+.TP
+\[en]encoding \f[I]ENCODING\f[R]
+Force the specified encoding (experimental)
+.TP
+\[en]no-check-certificate
+Suppress HTTPS certificate validation
+.TP
+\[en]prefer-insecure
+Use an unencrypted connection to retrieve information about the video.
+(Currently supported only for YouTube)
+.TP
+\[en]user-agent \f[I]UA\f[R]
+Specify a custom user agent
+.TP
+\[en]referer \f[I]URL\f[R]
+Specify a custom referer, use if the video access is restricted to one
+domain
+.TP
+\[en]add-header \f[I]FIELD:VALUE\f[R]
+Specify a custom HTTP header and its value, separated by a colon `:'.
+You can use this option multiple times
+.TP
+\[en]bidi-workaround
+Work around terminals that lack bidirectional text support.
+Requires bidiv or fribidi executable in PATH
+.TP
+\[en]sleep-interval \f[I]SECONDS\f[R]
+Number of seconds to sleep before each download when used alone or a
+lower bound of a range for randomized sleep before each download
+(minimum possible number of seconds to sleep) when used along with
+\[en]max-sleep-interval.
+.TP
+\[en]max-sleep-interval \f[I]SECONDS\f[R]
+Upper bound of a range for randomized sleep before each download
+(maximum possible number of seconds to sleep).
+Must only be used along with \[en]min- sleep-interval.
+.SS Video Format Options:
+.TP
+-f, \[en]format \f[I]FORMAT\f[R]
+Video format code, see the \[lq]FORMAT SELECTION\[rq] for all the info
+.TP
+\[en]all-formats
+Download all available video formats
+.TP
+\[en]prefer-free-formats
+Prefer free video formats unless a specific one is requested
+.TP
+-F, \[en]list-formats
+List all available formats of requested videos
+.TP
+\[en]youtube-skip-dash-manifest
+Do not download the DASH manifests and related data on YouTube videos
+.TP
+\[en]merge-output-format \f[I]FORMAT\f[R]
+If a merge is required (e.g.
+bestvideo+bestaudio), output to given container format.
+One of mkv, mp4, ogg, webm, flv.
+Ignored if no merge is required
+.SS Subtitle Options:
+.TP
+\[en]write-sub
+Write subtitle file
+.TP
+\[en]write-auto-sub
+Write automatically generated subtitle file (YouTube only)
+.TP
+\[en]all-subs
+Download all the available subtitles of the video
+.TP
+\[en]list-subs
+List all available subtitles for the video
+.TP
+\[en]sub-format \f[I]FORMAT\f[R]
+Subtitle format, accepts formats preference, for example: \[lq]srt\[rq]
+or \[lq]ass/srt/best\[rq]
+.TP
+\[en]sub-lang \f[I]LANGS\f[R]
+Languages of the subtitles to download (optional) separated by commas,
+use \[en]list-subs for available language tags
+.SS Authentication Options:
+.TP
+-u, \[en]username \f[I]USERNAME\f[R]
+Login with this account ID
+.TP
+-p, \[en]password \f[I]PASSWORD\f[R]
+Account password.
+If this option is left out, youtube-dl will ask interactively.
+.TP
+-2, \[en]twofactor \f[I]TWOFACTOR\f[R]
+Two-factor authentication code
+.TP
+-n, \[en]netrc
+Use .netrc authentication data
+.TP
+\[en]video-password \f[I]PASSWORD\f[R]
+Video password (vimeo, youku)
+.SS Adobe Pass Options:
+.TP
+\[en]ap-mso \f[I]MSO\f[R]
+Adobe Pass multiple-system operator (TV provider) identifier, use
+\[en]ap-list-mso for a list of available MSOs
+.TP
+\[en]ap-username \f[I]USERNAME\f[R]
+Multiple-system operator account login
+.TP
+\[en]ap-password \f[I]PASSWORD\f[R]
+Multiple-system operator account password.
+If this option is left out, youtube-dl will ask interactively.
+.TP
+\[en]ap-list-mso
+List all supported multiple-system operators
+.SS Post-processing Options:
+.TP
+-x, \[en]extract-audio
+Convert video files to audio-only files (requires ffmpeg/avconv and
+ffprobe/avprobe)
+.TP
+\[en]audio-format \f[I]FORMAT\f[R]
+Specify audio format: \[lq]best\[rq], \[lq]aac\[rq], \[lq]flac\[rq],
+\[lq]mp3\[rq], \[lq]m4a\[rq], \[lq]opus\[rq], \[lq]vorbis\[rq], or
+\[lq]wav\[rq]; \[lq]best\[rq] by default; No effect without -x
+.TP
+\[en]audio-quality \f[I]QUALITY\f[R]
+Specify ffmpeg/avconv audio quality, insert a value between 0 (better)
+and 9 (worse) for VBR or a specific bitrate like 128K (default 5)
+.TP
+\[en]recode-video \f[I]FORMAT\f[R]
+Encode the video to another format if necessary (currently supported:
+mp4|flv|ogg|webm|mkv|avi)
+.TP
+\[en]postprocessor-args \f[I]ARGS\f[R]
+Give these arguments to the postprocessor
+.TP
+-k, \[en]keep-video
+Keep the video file on disk after the post-processing; the video is
+erased by default
+.TP
+\[en]no-post-overwrites
+Do not overwrite post-processed files; the post-processed files are
+overwritten by default
+.TP
+\[en]embed-subs
+Embed subtitles in the video (only for mp4, webm and mkv videos)
+.TP
+\[en]embed-thumbnail
+Embed thumbnail in the audio as cover art
+.TP
+\[en]add-metadata
+Write metadata to the video file
+.TP
+\[en]metadata-from-title \f[I]FORMAT\f[R]
+Parse additional metadata like song title / artist from the video title.
+The format syntax is the same as \[en]output.
+Regular expression with named capture groups may also be used.
+The parsed parameters replace existing values.
+Example: \[en]metadata-from-title \[lq]%(artist)s - %(title)s\[rq]
+matches a title like \[lq]Coldplay - Paradise\[rq].
+Example (regex): \[en]metadata-from-title \[lq](?P.+?)
+- (?P
+.RS
+\&.+)\[rq]
+.RE
+.TP
+\[en]xattrs
+Write metadata to the video file\[cq]s xattrs (using dublin core and xdg
+standards)
+.TP
+\[en]fixup \f[I]POLICY\f[R]
+Automatically correct known faults of the file.
+One of never (do nothing), warn (only emit a warning), detect_or_warn
+(the default; fix file if we can, warn otherwise)
+.TP
+\[en]prefer-avconv
+Prefer avconv over ffmpeg for running the postprocessors
+.TP
+\[en]prefer-ffmpeg
+Prefer ffmpeg over avconv for running the postprocessors (default)
+.TP
+\[en]ffmpeg-location \f[I]PATH\f[R]
+Location of the ffmpeg/avconv binary; either the path to the binary or
+its containing directory.
+.TP
+\[en]exec \f[I]CMD\f[R]
+Execute a command on the file after downloading and post-processing,
+similar to find\[cq]s -exec syntax.
+Example: \[en]exec `adb push {} /sdcard/Music/ && rm {}'
+.TP
+\[en]convert-subs \f[I]FORMAT\f[R]
+Convert the subtitles to other format (currently supported:
+srt|ass|vtt|lrc)
+.SH CONFIGURATION
+.PP
+You can configure youtube-dl by placing any supported command line
+option to a configuration file.
+On Linux and macOS, the system wide configuration file is located at
+\f[V]/etc/youtube-dl.conf\f[R] and the user wide configuration file at
+\f[V]\[ti]/.config/youtube-dl/config\f[R].
+On Windows, the user wide configuration file locations are
+\f[V]%APPDATA%\[rs]youtube-dl\[rs]config.txt\f[R] or
+\f[V]C:\[rs]Users\[rs]<user name>\[rs]youtube-dl.conf\f[R].
+Note that by default configuration file may not exist so you may need to
+create it yourself.
+.PP
+For example, with the following configuration file youtube-dl will
+always extract the audio, not copy the mtime, use a proxy and save all
+videos under \f[V]Movies\f[R] directory in your home directory:
+.IP
+.nf
+\f[C]
+# Lines starting with # are comments
+
+# Always extract audio
+-x
+
+# Do not copy the mtime
+--no-mtime
+
+# Use this proxy
+--proxy 127.0.0.1:3128
+
+# Save all videos under Movies directory in your home directory
+-o \[ti]/Movies/%(title)s.%(ext)s
+\f[R]
+.fi
+.PP
+Note that options in configuration file are just the same options aka
+switches used in regular command line calls thus there \f[B]must be no
+whitespace\f[R] after \f[V]-\f[R] or \f[V]--\f[R], e.g.\ \f[V]-o\f[R] or
+\f[V]--proxy\f[R] but not \f[V]- o\f[R] or \f[V]-- proxy\f[R].
+.PP
+You can use \f[V]--ignore-config\f[R] if you want to disable the
+configuration file for a particular youtube-dl run.
+.PP
+You can also use \f[V]--config-location\f[R] if you want to use custom
+configuration file for a particular youtube-dl run.
+.SS Authentication with \f[V].netrc\f[R] file
+.PP
+You may also want to configure automatic credentials storage for
+extractors that support authentication (by providing login and password
+with \f[V]--username\f[R] and \f[V]--password\f[R]) in order not to pass
+credentials as command line arguments on every youtube-dl execution and
+prevent tracking plain text passwords in the shell command history.
+You can achieve this using a \f[V].netrc\f[R]
+file (https://stackoverflow.com/tags/.netrc/info) on a per extractor
+basis.
+For that you will need to create a \f[V].netrc\f[R] file in your
+\f[V]$HOME\f[R] and restrict permissions to read/write by only you:
+.IP
+.nf
+\f[C]
+touch $HOME/.netrc
+chmod a-rwx,u+rw $HOME/.netrc
+\f[R]
+.fi
+.PP
+After that you can add credentials for an extractor in the following
+format, where \f[I]extractor\f[R] is the name of the extractor in
+lowercase:
+.IP
+.nf
+\f[C]
+machine <extractor> login <login> password <password>
+\f[R]
+.fi
+.PP
+For example:
+.IP
+.nf
+\f[C]
+machine youtube login myaccount\[at]gmail.com password my_youtube_password
+machine twitch login my_twitch_account_name password my_twitch_password
+\f[R]
+.fi
+.PP
+To activate authentication with the \f[V].netrc\f[R] file you should
+pass \f[V]--netrc\f[R] to youtube-dl or place it in the configuration
+file.
+.PP
+On Windows you may also need to setup the \f[V]%HOME%\f[R] environment
+variable manually.
+For example:
+.IP
+.nf
+\f[C]
+set HOME=%USERPROFILE%
+\f[R]
+.fi
+.SH OUTPUT TEMPLATE
+.PP
+The \f[V]-o\f[R] option allows users to indicate a template for the
+output file names.
+.PP
+\f[B]tl;dr:\f[R] navigate me to examples.
+.PP
+The basic usage is not to set any template arguments when downloading a
+single file, like in
+\f[V]youtube-dl -o funny_video.flv \[dq]https://some/video\[dq]\f[R].
+However, it may contain special sequences that will be replaced when
+downloading each video.
+The special sequences may be formatted according to python string
+formatting
+operations (https://docs.python.org/2/library/stdtypes.html#string-formatting).
+For example, \f[V]%(NAME)s\f[R] or \f[V]%(NAME)05d\f[R].
+To clarify, that is a percent symbol followed by a name in parentheses,
+followed by formatting operations.
+Allowed names along with sequence type are:
+.IP \[bu] 2
+\f[V]id\f[R] (string): Video identifier
+.IP \[bu] 2
+\f[V]title\f[R] (string): Video title
+.IP \[bu] 2
+\f[V]url\f[R] (string): Video URL
+.IP \[bu] 2
+\f[V]ext\f[R] (string): Video filename extension
+.IP \[bu] 2
+\f[V]alt_title\f[R] (string): A secondary title of the video
+.IP \[bu] 2
+\f[V]display_id\f[R] (string): An alternative identifier for the video
+.IP \[bu] 2
+\f[V]uploader\f[R] (string): Full name of the video uploader
+.IP \[bu] 2
+\f[V]license\f[R] (string): License name the video is licensed under
+.IP \[bu] 2
+\f[V]creator\f[R] (string): The creator of the video
+.IP \[bu] 2
+\f[V]release_date\f[R] (string): The date (YYYYMMDD) when the video was
+released
+.IP \[bu] 2
+\f[V]timestamp\f[R] (numeric): UNIX timestamp of the moment the video
+became available
+.IP \[bu] 2
+\f[V]upload_date\f[R] (string): Video upload date (YYYYMMDD)
+.IP \[bu] 2
+\f[V]uploader_id\f[R] (string): Nickname or id of the video uploader
+.IP \[bu] 2
+\f[V]channel\f[R] (string): Full name of the channel the video is
+uploaded on
+.IP \[bu] 2
+\f[V]channel_id\f[R] (string): Id of the channel
+.IP \[bu] 2
+\f[V]location\f[R] (string): Physical location where the video was
+filmed
+.IP \[bu] 2
+\f[V]duration\f[R] (numeric): Length of the video in seconds
+.IP \[bu] 2
+\f[V]view_count\f[R] (numeric): How many users have watched the video on
+the platform
+.IP \[bu] 2
+\f[V]like_count\f[R] (numeric): Number of positive ratings of the video
+.IP \[bu] 2
+\f[V]dislike_count\f[R] (numeric): Number of negative ratings of the
+video
+.IP \[bu] 2
+\f[V]repost_count\f[R] (numeric): Number of reposts of the video
+.IP \[bu] 2
+\f[V]average_rating\f[R] (numeric): Average rating give by users, the
+scale used depends on the webpage
+.IP \[bu] 2
+\f[V]comment_count\f[R] (numeric): Number of comments on the video
+.IP \[bu] 2
+\f[V]age_limit\f[R] (numeric): Age restriction for the video (years)
+.IP \[bu] 2
+\f[V]is_live\f[R] (boolean): Whether this video is a live stream or a
+fixed-length video
+.IP \[bu] 2
+\f[V]start_time\f[R] (numeric): Time in seconds where the reproduction
+should start, as specified in the URL
+.IP \[bu] 2
+\f[V]end_time\f[R] (numeric): Time in seconds where the reproduction
+should end, as specified in the URL
+.IP \[bu] 2
+\f[V]format\f[R] (string): A human-readable description of the format
+.IP \[bu] 2
+\f[V]format_id\f[R] (string): Format code specified by
+\f[V]--format\f[R]
+.IP \[bu] 2
+\f[V]format_note\f[R] (string): Additional info about the format
+.IP \[bu] 2
+\f[V]width\f[R] (numeric): Width of the video
+.IP \[bu] 2
+\f[V]height\f[R] (numeric): Height of the video
+.IP \[bu] 2
+\f[V]resolution\f[R] (string): Textual description of width and height
+.IP \[bu] 2
+\f[V]tbr\f[R] (numeric): Average bitrate of audio and video in KBit/s
+.IP \[bu] 2
+\f[V]abr\f[R] (numeric): Average audio bitrate in KBit/s
+.IP \[bu] 2
+\f[V]acodec\f[R] (string): Name of the audio codec in use
+.IP \[bu] 2
+\f[V]asr\f[R] (numeric): Audio sampling rate in Hertz
+.IP \[bu] 2
+\f[V]vbr\f[R] (numeric): Average video bitrate in KBit/s
+.IP \[bu] 2
+\f[V]fps\f[R] (numeric): Frame rate
+.IP \[bu] 2
+\f[V]vcodec\f[R] (string): Name of the video codec in use
+.IP \[bu] 2
+\f[V]container\f[R] (string): Name of the container format
+.IP \[bu] 2
+\f[V]filesize\f[R] (numeric): The number of bytes, if known in advance
+.IP \[bu] 2
+\f[V]filesize_approx\f[R] (numeric): An estimate for the number of bytes
+.IP \[bu] 2
+\f[V]protocol\f[R] (string): The protocol that will be used for the
+actual download
+.IP \[bu] 2
+\f[V]extractor\f[R] (string): Name of the extractor
+.IP \[bu] 2
+\f[V]extractor_key\f[R] (string): Key name of the extractor
+.IP \[bu] 2
+\f[V]epoch\f[R] (numeric): Unix epoch when creating the file
+.IP \[bu] 2
+\f[V]autonumber\f[R] (numeric): Number that will be increased with each
+download, starting at \f[V]--autonumber-start\f[R]
+.IP \[bu] 2
+\f[V]playlist\f[R] (string): Name or id of the playlist that contains
+the video
+.IP \[bu] 2
+\f[V]playlist_index\f[R] (numeric): Index of the video in the playlist
+padded with leading zeros according to the total length of the playlist
+.IP \[bu] 2
+\f[V]playlist_id\f[R] (string): Playlist identifier
+.IP \[bu] 2
+\f[V]playlist_title\f[R] (string): Playlist title
+.IP \[bu] 2
+\f[V]playlist_uploader\f[R] (string): Full name of the playlist uploader
+.IP \[bu] 2
+\f[V]playlist_uploader_id\f[R] (string): Nickname or id of the playlist
+uploader
+.PP
+Available for the video that belongs to some logical chapter or section:
+.IP \[bu] 2
+\f[V]chapter\f[R] (string): Name or title of the chapter the video
+belongs to
+.IP \[bu] 2
+\f[V]chapter_number\f[R] (numeric): Number of the chapter the video
+belongs to
+.IP \[bu] 2
+\f[V]chapter_id\f[R] (string): Id of the chapter the video belongs to
+.PP
+Available for the video that is an episode of some series or programme:
+.IP \[bu] 2
+\f[V]series\f[R] (string): Title of the series or programme the video
+episode belongs to
+.IP \[bu] 2
+\f[V]season\f[R] (string): Title of the season the video episode belongs
+to
+.IP \[bu] 2
+\f[V]season_number\f[R] (numeric): Number of the season the video
+episode belongs to
+.IP \[bu] 2
+\f[V]season_id\f[R] (string): Id of the season the video episode belongs
+to
+.IP \[bu] 2
+\f[V]episode\f[R] (string): Title of the video episode
+.IP \[bu] 2
+\f[V]episode_number\f[R] (numeric): Number of the video episode within a
+season
+.IP \[bu] 2
+\f[V]episode_id\f[R] (string): Id of the video episode
+.PP
+Available for the media that is a track or a part of a music album:
+.IP \[bu] 2
+\f[V]track\f[R] (string): Title of the track
+.IP \[bu] 2
+\f[V]track_number\f[R] (numeric): Number of the track within an album or
+a disc
+.IP \[bu] 2
+\f[V]track_id\f[R] (string): Id of the track
+.IP \[bu] 2
+\f[V]artist\f[R] (string): Artist(s) of the track
+.IP \[bu] 2
+\f[V]genre\f[R] (string): Genre(s) of the track
+.IP \[bu] 2
+\f[V]album\f[R] (string): Title of the album the track belongs to
+.IP \[bu] 2
+\f[V]album_type\f[R] (string): Type of the album
+.IP \[bu] 2
+\f[V]album_artist\f[R] (string): List of all artists appeared on the
+album
+.IP \[bu] 2
+\f[V]disc_number\f[R] (numeric): Number of the disc or other physical
+medium the track belongs to
+.IP \[bu] 2
+\f[V]release_year\f[R] (numeric): Year (YYYY) when the album was
+released
+.PP
+Each aforementioned sequence when referenced in an output template will
+be replaced by the actual value corresponding to the sequence name.
+Note that some of the sequences are not guaranteed to be present since
+they depend on the metadata obtained by a particular extractor.
+Such sequences will be replaced with placeholder value provided with
+\f[V]--output-na-placeholder\f[R] (\f[V]NA\f[R] by default).
+.PP
+For example for \f[V]-o %(title)s-%(id)s.%(ext)s\f[R] and an mp4 video
+with title \f[V]youtube-dl test video\f[R] and id
+\f[V]BaW_jenozKcj\f[R], this will result in a
+\f[V]youtube-dl test video-BaW_jenozKcj.mp4\f[R] file created in the
+current directory.
+.PP
+For numeric sequences you can use numeric related formatting, for
+example, \f[V]%(view_count)05d\f[R] will result in a string with view
+count padded with zeros up to 5 characters, like in \f[V]00042\f[R].
+.PP
+Output templates can also contain arbitrary hierarchical path,
+e.g.\ \f[V]-o \[aq]%(playlist)s/%(playlist_index)s - %(title)s.%(ext)s\[aq]\f[R]
+which will result in downloading each video in a directory corresponding
+to this path template.
+Any missing directory will be automatically created for you.
+.PP
+To use percent literals in an output template use \f[V]%%\f[R].
+To output to stdout use \f[V]-o -\f[R].
+.PP
+The current default template is \f[V]%(title)s-%(id)s.%(ext)s\f[R].
+.PP
+In some cases, you don\[cq]t want special characters such as 中, spaces,
+or &, such as when transferring the downloaded filename to a Windows
+system or the filename through an 8bit-unsafe channel.
+In these cases, add the \f[V]--restrict-filenames\f[R] flag to get a
+shorter title.
+.SS Output template and Windows batch files
+.PP
+If you are using an output template inside a Windows batch file then you
+must escape plain percent characters (\f[V]%\f[R]) by doubling, so that
+\f[V]-o \[dq]%(title)s-%(id)s.%(ext)s\[dq]\f[R] should become
+\f[V]-o \[dq]%%(title)s-%%(id)s.%%(ext)s\[dq]\f[R].
+However you should not touch \f[V]%\f[R]\[cq]s that are not plain
+characters, e.g.\ environment variables for expansion should stay
+intact:
+\f[V]-o \[dq]C:\[rs]%HOMEPATH%\[rs]Desktop\[rs]%%(title)s.%%(ext)s\[dq]\f[R].
+.SS Output template examples
+.PP
+Note that on Windows you may need to use double quotes instead of
+single.
+.IP
+.nf
+\f[C]
+$ youtube-dl --get-filename -o \[aq]%(title)s.%(ext)s\[aq] BaW_jenozKc
+youtube-dl test video \[aq]\[aq]_ä↭𝕐.mp4    # All kinds of weird characters
+
+$ youtube-dl --get-filename -o \[aq]%(title)s.%(ext)s\[aq] BaW_jenozKc --restrict-filenames
+youtube-dl_test_video_.mp4          # A simple file name
+
+# Download YouTube playlist videos in separate directory indexed by video order in a playlist
+$ youtube-dl -o \[aq]%(playlist)s/%(playlist_index)s - %(title)s.%(ext)s\[aq] https://www.youtube.com/playlist?list=PLwiyx1dc3P2JR9N8gQaQN_BCvlSlap7re
+
+# Download all playlists of YouTube channel/user keeping each playlist in separate directory:
+$ youtube-dl -o \[aq]%(uploader)s/%(playlist)s/%(playlist_index)s - %(title)s.%(ext)s\[aq] https://www.youtube.com/user/TheLinuxFoundation/playlists
+
+# Download Udemy course keeping each chapter in separate directory under MyVideos directory in your home
+$ youtube-dl -u user -p password -o \[aq]\[ti]/MyVideos/%(playlist)s/%(chapter_number)s - %(chapter)s/%(title)s.%(ext)s\[aq] https://www.udemy.com/java-tutorial/
+
+# Download entire series season keeping each series and each season in separate directory under C:/MyVideos
+$ youtube-dl -o \[dq]C:/MyVideos/%(series)s/%(season_number)s - %(season)s/%(episode_number)s - %(episode)s.%(ext)s\[dq] https://videomore.ru/kino_v_detalayah/5_sezon/367617
+
+# Stream the video being downloaded to stdout
+$ youtube-dl -o - BaW_jenozKc
+\f[R]
+.fi
+.SH FORMAT SELECTION
+.PP
+By default youtube-dl tries to download the best available quality,
+i.e.\ if you want the best quality you \f[B]don\[cq]t need\f[R] to pass
+any special options, youtube-dl will guess it for you by
+\f[B]default\f[R].
+.PP
+But sometimes you may want to download in a different format, for
+example when you are on a slow or intermittent connection.
+The key mechanism for achieving this is so-called \f[I]format
+selection\f[R] based on which you can explicitly specify desired format,
+select formats based on some criterion or criteria, setup precedence and
+much more.
+.PP
+The general syntax for format selection is \f[V]--format FORMAT\f[R] or
+shorter \f[V]-f FORMAT\f[R] where \f[V]FORMAT\f[R] is a \f[I]selector
+expression\f[R], i.e.\ an expression that describes format or formats
+you would like to download.
+.PP
+\f[B]tl;dr:\f[R] navigate me to examples.
+.PP
+The simplest case is requesting a specific format, for example with
+\f[V]-f 22\f[R] you can download the format with format code equal to
+22.
+You can get the list of available format codes for particular video
+using \f[V]--list-formats\f[R] or \f[V]-F\f[R].
+Note that these format codes are extractor specific.
+.PP
+You can also use a file extension (currently \f[V]3gp\f[R],
+\f[V]aac\f[R], \f[V]flv\f[R], \f[V]m4a\f[R], \f[V]mp3\f[R],
+\f[V]mp4\f[R], \f[V]ogg\f[R], \f[V]wav\f[R], \f[V]webm\f[R] are
+supported) to download the best quality format of a particular file
+extension served as a single file, e.g.\ \f[V]-f webm\f[R] will download
+the best quality format with the \f[V]webm\f[R] extension served as a
+single file.
+.PP
+You can also use special names to select particular edge case formats:
+.IP \[bu] 2
+\f[V]best\f[R]: Select the best quality format represented by a single
+file with video and audio.
+.IP \[bu] 2
+\f[V]worst\f[R]: Select the worst quality format represented by a single
+file with video and audio.
+.IP \[bu] 2
+\f[V]bestvideo\f[R]: Select the best quality video-only format
+(e.g.\ DASH video).
+May not be available.
+.IP \[bu] 2
+\f[V]worstvideo\f[R]: Select the worst quality video-only format.
+May not be available.
+.IP \[bu] 2
+\f[V]bestaudio\f[R]: Select the best quality audio only-format.
+May not be available.
+.IP \[bu] 2
+\f[V]worstaudio\f[R]: Select the worst quality audio only-format.
+May not be available.
+.PP
+For example, to download the worst quality video-only format you can use
+\f[V]-f worstvideo\f[R].
+.PP
+If you want to download multiple videos and they don\[cq]t have the same
+formats available, you can specify the order of preference using
+slashes.
+Note that slash is left-associative, i.e.\ formats on the left hand side
+are preferred, for example \f[V]-f 22/17/18\f[R] will download format 22
+if it\[cq]s available, otherwise it will download format 17 if it\[cq]s
+available, otherwise it will download format 18 if it\[cq]s available,
+otherwise it will complain that no suitable formats are available for
+download.
+.PP
+If you want to download several formats of the same video use a comma as
+a separator, e.g.\ \f[V]-f 22,17,18\f[R] will download all these three
+formats, of course if they are available.
+Or a more sophisticated example combined with the precedence feature:
+\f[V]-f 136/137/mp4/bestvideo,140/m4a/bestaudio\f[R].
+.PP
+You can also filter the video formats by putting a condition in
+brackets, as in \f[V]-f \[dq]best[height=720]\[dq]\f[R] (or
+\f[V]-f \[dq][filesize>10M]\[dq]\f[R]).
+.PP
+The following numeric meta fields can be used with comparisons
+\f[V]<\f[R], \f[V]<=\f[R], \f[V]>\f[R], \f[V]>=\f[R], \f[V]=\f[R]
+(equals), \f[V]!=\f[R] (not equals):
+.IP \[bu] 2
+\f[V]filesize\f[R]: The number of bytes, if known in advance
+.IP \[bu] 2
+\f[V]width\f[R]: Width of the video, if known
+.IP \[bu] 2
+\f[V]height\f[R]: Height of the video, if known
+.IP \[bu] 2
+\f[V]tbr\f[R]: Average bitrate of audio and video in KBit/s
+.IP \[bu] 2
+\f[V]abr\f[R]: Average audio bitrate in KBit/s
+.IP \[bu] 2
+\f[V]vbr\f[R]: Average video bitrate in KBit/s
+.IP \[bu] 2
+\f[V]asr\f[R]: Audio sampling rate in Hertz
+.IP \[bu] 2
+\f[V]fps\f[R]: Frame rate
+.PP
+Also filtering work for comparisons \f[V]=\f[R] (equals),
+\f[V]\[ha]=\f[R] (starts with), \f[V]$=\f[R] (ends with), \f[V]*=\f[R]
+(contains) and following string meta fields:
+.IP \[bu] 2
+\f[V]ext\f[R]: File extension
+.IP \[bu] 2
+\f[V]acodec\f[R]: Name of the audio codec in use
+.IP \[bu] 2
+\f[V]vcodec\f[R]: Name of the video codec in use
+.IP \[bu] 2
+\f[V]container\f[R]: Name of the container format
+.IP \[bu] 2
+\f[V]protocol\f[R]: The protocol that will be used for the actual
+download, lower-case (\f[V]http\f[R], \f[V]https\f[R], \f[V]rtsp\f[R],
+\f[V]rtmp\f[R], \f[V]rtmpe\f[R], \f[V]mms\f[R], \f[V]f4m\f[R],
+\f[V]ism\f[R], \f[V]http_dash_segments\f[R], \f[V]m3u8\f[R], or
+\f[V]m3u8_native\f[R])
+.IP \[bu] 2
+\f[V]format_id\f[R]: A short description of the format
+.IP \[bu] 2
+\f[V]language\f[R]: Language code
+.PP
+Any string comparison may be prefixed with negation \f[V]!\f[R] in order
+to produce an opposite comparison, e.g.\ \f[V]!*=\f[R] (does not
+contain).
+.PP
+Note that none of the aforementioned meta fields are guaranteed to be
+present since this solely depends on the metadata obtained by particular
+extractor, i.e.\ the metadata offered by the video hoster.
+.PP
+Formats for which the value is not known are excluded unless you put a
+question mark (\f[V]?\f[R]) after the operator.
+You can combine format filters, so
+\f[V]-f \[dq][height <=? 720][tbr>500]\[dq]\f[R] selects up to 720p
+videos (or videos where the height is not known) with a bitrate of at
+least 500 KBit/s.
+.PP
+You can merge the video and audio of two formats into a single file
+using \f[V]-f <video-format>+<audio-format>\f[R] (requires ffmpeg or
+avconv installed), for example \f[V]-f bestvideo+bestaudio\f[R] will
+download the best video-only format, the best audio-only format and mux
+them together with ffmpeg/avconv.
+.PP
+Format selectors can also be grouped using parentheses, for example if
+you want to download the best mp4 and webm formats with a height lower
+than 480 you can use \f[V]-f \[aq](mp4,webm)[height<480]\[aq]\f[R].
+.PP
+Since the end of April 2015 and version 2015.04.26, youtube-dl uses
+\f[V]-f bestvideo+bestaudio/best\f[R] as the default format selection
+(see #5447 (https://github.com/ytdl-org/youtube-dl/issues/5447),
+#5456 (https://github.com/ytdl-org/youtube-dl/issues/5456)).
+If ffmpeg or avconv are installed this results in downloading
+\f[V]bestvideo\f[R] and \f[V]bestaudio\f[R] separately and muxing them
+together into a single file giving the best overall quality available.
+Otherwise it falls back to \f[V]best\f[R] and results in downloading the
+best available quality served as a single file.
+\f[V]best\f[R] is also needed for videos that don\[cq]t come from
+YouTube because they don\[cq]t provide the audio and video in two
+different files.
+If you want to only download some DASH formats (for example if you are
+not interested in getting videos with a resolution higher than 1080p),
+you can add \f[V]-f bestvideo[height<=?1080]+bestaudio/best\f[R] to your
+configuration file.
+Note that if you use youtube-dl to stream to \f[V]stdout\f[R] (and most
+likely to pipe it to your media player then), i.e.\ you explicitly
+specify output template as \f[V]-o -\f[R], youtube-dl still uses
+\f[V]-f best\f[R] format selection in order to start content delivery
+immediately to your player and not to wait until \f[V]bestvideo\f[R] and
+\f[V]bestaudio\f[R] are downloaded and muxed.
+.PP
+If you want to preserve the old format selection behavior (prior to
+youtube-dl 2015.04.26), i.e.\ you want to download the best available
+quality media served as a single file, you should explicitly specify
+your choice with \f[V]-f best\f[R].
+You may want to add it to the configuration file in order not to type it
+every time you run youtube-dl.
+.SS Format selection examples
+.PP
+Note that on Windows you may need to use double quotes instead of
+single.
+.IP
+.nf
+\f[C]
+# Download best mp4 format available or any other best if no mp4 available
+$ youtube-dl -f \[aq]bestvideo[ext=mp4]+bestaudio[ext=m4a]/best[ext=mp4]/best\[aq]
+
+# Download best format available but no better than 480p
+$ youtube-dl -f \[aq]bestvideo[height<=480]+bestaudio/best[height<=480]\[aq]
+
+# Download best video only format but no bigger than 50 MB
+$ youtube-dl -f \[aq]best[filesize<50M]\[aq]
+
+# Download best format available via direct link over HTTP/HTTPS protocol
+$ youtube-dl -f \[aq](bestvideo+bestaudio/best)[protocol\[ha]=http]\[aq]
+
+# Download the best video format and the best audio format without merging them
+$ youtube-dl -f \[aq]bestvideo,bestaudio\[aq] -o \[aq]%(title)s.f%(format_id)s.%(ext)s\[aq]
+\f[R]
+.fi
+.PP
+Note that in the last example, an output template is recommended as
+bestvideo and bestaudio may have the same file name.
+.SH VIDEO SELECTION
+.PP
+Videos can be filtered by their upload date using the options
+\f[V]--date\f[R], \f[V]--datebefore\f[R] or \f[V]--dateafter\f[R].
+They accept dates in two formats:
+.IP \[bu] 2
+Absolute dates: Dates in the format \f[V]YYYYMMDD\f[R].
+.IP \[bu] 2
+Relative dates: Dates in the format
+\f[V](now|today)[+-][0-9](day|week|month|year)(s)?\f[R]
+.PP
+Examples:
+.IP
+.nf
+\f[C]
+# Download only the videos uploaded in the last 6 months
+$ youtube-dl --dateafter now-6months
+
+# Download only the videos uploaded on January 1, 1970
+$ youtube-dl --date 19700101
+
+$ # Download only the videos uploaded in the 200x decade
+$ youtube-dl --dateafter 20000101 --datebefore 20091231
+\f[R]
+.fi
+.SH FAQ
+.SS How do I update youtube-dl?
+.PP
+If you\[cq]ve followed our manual installation
+instructions (https://ytdl-org.github.io/youtube-dl/download.html), you
+can simply run \f[V]youtube-dl -U\f[R] (or, on Linux,
+\f[V]sudo youtube-dl -U\f[R]).
+.PP
+If you have used pip, a simple \f[V]sudo pip install -U youtube-dl\f[R]
+is sufficient to update.
+.PP
+If you have installed youtube-dl using a package manager like
+\f[I]apt-get\f[R] or \f[I]yum\f[R], use the standard system update
+mechanism to update.
+Note that distribution packages are often outdated.
+As a rule of thumb, youtube-dl releases at least once a month, and often
+weekly or even daily.
+Simply go to https://yt-dl.org to find out the current version.
+Unfortunately, there is nothing we youtube-dl developers can do if your
+distribution serves a really outdated version.
+You can (and should) complain to your distribution in their bugtracker
+or support forum.
+.PP
+As a last resort, you can also uninstall the version installed by your
+package manager and follow our manual installation instructions.
+For that, remove the distribution\[cq]s package, with a line like
+.IP
+.nf
+\f[C]
+sudo apt-get remove -y youtube-dl
+\f[R]
+.fi
+.PP
+Afterwards, simply follow our manual installation
+instructions (https://ytdl-org.github.io/youtube-dl/download.html):
+.IP
+.nf
+\f[C]
+sudo wget https://yt-dl.org/downloads/latest/youtube-dl -O /usr/local/bin/youtube-dl
+sudo chmod a+rx /usr/local/bin/youtube-dl
+hash -r
+\f[R]
+.fi
+.PP
+Again, from then on you\[cq]ll be able to update with
+\f[V]sudo youtube-dl -U\f[R].
+.SS youtube-dl is extremely slow to start on Windows
+.PP
+Add a file exclusion for \f[V]youtube-dl.exe\f[R] in Windows Defender
+settings.
+.SS I\[cq]m getting an error \f[V]Unable to extract OpenGraph title\f[R] on YouTube playlists
+.PP
+YouTube changed their playlist format in March 2014 and later on, so
+you\[cq]ll need at least youtube-dl 2014.07.25 to download all YouTube
+videos.
+.PP
+If you have installed youtube-dl with a package manager, pip, setup.py
+or a tarball, please use that to update.
+Note that Ubuntu packages do not seem to get updated anymore.
+Since we are not affiliated with Ubuntu, there is little we can do.
+Feel free to report
+bugs (https://bugs.launchpad.net/ubuntu/+source/youtube-dl/+filebug) to
+the Ubuntu packaging
+people (mailto:ubuntu-motu@lists.ubuntu.com?subject=outdated%20version%20of%20youtube-dl)
+- all they have to do is update the package to a somewhat recent
+version.
+See above for a way to update.
+.SS I\[cq]m getting an error when trying to use output template: \f[V]error: using output template conflicts with using title, video ID or auto number\f[R]
+.PP
+Make sure you are not using \f[V]-o\f[R] with any of these options
+\f[V]-t\f[R], \f[V]--title\f[R], \f[V]--id\f[R], \f[V]-A\f[R] or
+\f[V]--auto-number\f[R] set in command line or in a configuration file.
+Remove the latter if any.
+.SS Do I always have to pass \f[V]-citw\f[R]?
+.PP
+By default, youtube-dl intends to have the best options (incidentally,
+if you have a convincing case that these should be different, please
+file an issue where you explain that (https://yt-dl.org/bug)).
+Therefore, it is unnecessary and sometimes harmful to copy long option
+strings from webpages.
+In particular, the only option out of \f[V]-citw\f[R] that is regularly
+useful is \f[V]-i\f[R].
+.SS Can you please put the \f[V]-b\f[R] option back?
+.PP
+Most people asking this question are not aware that youtube-dl now
+defaults to downloading the highest available quality as reported by
+YouTube, which will be 1080p or 720p in some cases, so you no longer
+need the \f[V]-b\f[R] option.
+For some specific videos, maybe YouTube does not report them to be
+available in a specific high quality format you\[cq]re interested in.
+In that case, simply request it with the \f[V]-f\f[R] option and
+youtube-dl will try to download it.
+.SS I get HTTP error 402 when trying to download a video. What\[cq]s this?
+.PP
+Apparently YouTube requires you to pass a CAPTCHA test if you download
+too much.
+We\[cq]re considering to provide a way to let you solve the
+CAPTCHA (https://github.com/ytdl-org/youtube-dl/issues/154), but at the
+moment, your best course of action is pointing a web browser to the
+youtube URL, solving the CAPTCHA, and restart youtube-dl.
+.SS Do I need any other programs?
+.PP
+youtube-dl works fine on its own on most sites.
+However, if you want to convert video/audio, you\[cq]ll need
+avconv (https://libav.org/) or ffmpeg (https://www.ffmpeg.org/).
+On some sites - most notably YouTube - videos can be retrieved in a
+higher quality format without sound.
+youtube-dl will detect whether avconv/ffmpeg is present and
+automatically pick the best option.
+.PP
+Videos or video formats streamed via RTMP protocol can only be
+downloaded when rtmpdump (https://rtmpdump.mplayerhq.hu/) is installed.
+Downloading MMS and RTSP videos requires either
+mplayer (https://mplayerhq.hu/) or mpv (https://mpv.io/) to be
+installed.
+.SS I have downloaded a video but how can I play it?
+.PP
+Once the video is fully downloaded, use any video player, such as
+mpv (https://mpv.io/), vlc (https://www.videolan.org/) or
+mplayer (https://www.mplayerhq.hu/).
+.SS I extracted a video URL with \f[V]-g\f[R], but it does not play on another machine / in my web browser.
+.PP
+It depends a lot on the service.
+In many cases, requests for the video (to download/play it) must come
+from the same IP address and with the same cookies and/or HTTP headers.
+Use the \f[V]--cookies\f[R] option to write the required cookies into a
+file, and advise your downloader to read cookies from that file.
+Some sites also require a common user agent to be used, use
+\f[V]--dump-user-agent\f[R] to see the one in use by youtube-dl.
+You can also get necessary cookies and HTTP headers from JSON output
+obtained with \f[V]--dump-json\f[R].
+.PP
+It may be beneficial to use IPv6; in some cases, the restrictions are
+only applied to IPv4.
+Some services (sometimes only for a subset of videos) do not restrict
+the video URL by IP address, cookie, or user-agent, but these are the
+exception rather than the rule.
+.PP
+Please bear in mind that some URL protocols are \f[B]not\f[R] supported
+by browsers out of the box, including RTMP.
+If you are using \f[V]-g\f[R], your own downloader must support these as
+well.
+.PP
+If you want to play the video on a machine that is not running
+youtube-dl, you can relay the video content from the machine that runs
+youtube-dl.
+You can use \f[V]-o -\f[R] to let youtube-dl stream a video to stdout,
+or simply allow the player to download the files written by youtube-dl
+in turn.
+.SS ERROR: no fmt_url_map or conn information found in video info
+.PP
+YouTube has switched to a new video info format in July 2011 which is
+not supported by old versions of youtube-dl.
+See above for how to update youtube-dl.
+.SS ERROR: unable to download video
+.PP
+YouTube requires an additional signature since September 2012 which is
+not supported by old versions of youtube-dl.
+See above for how to update youtube-dl.
+.SS Video URL contains an ampersand and I\[cq]m getting some strange output \f[V][1] 2839\f[R] or \f[V]\[aq]v\[aq] is not recognized as an internal or external command\f[R]
+.PP
+That\[cq]s actually the output from your shell.
+Since ampersand is one of the special shell characters it\[cq]s
+interpreted by the shell preventing you from passing the whole URL to
+youtube-dl.
+To disable your shell from interpreting the ampersands (or any other
+special characters) you have to either put the whole URL in quotes or
+escape them with a backslash (which approach will work depends on your
+shell).
+.PP
+For example if your URL is
+https://www.youtube.com/watch?t=4&v=BaW_jenozKc you should end up with
+following command:
+.PP
+\f[V]youtube-dl \[aq]https://www.youtube.com/watch?t=4&v=BaW_jenozKc\[aq]\f[R]
+.PP
+or
+.PP
+\f[V]youtube-dl https://www.youtube.com/watch?t=4\[rs]&v=BaW_jenozKc\f[R]
+.PP
+For Windows you have to use the double quotes:
+.PP
+\f[V]youtube-dl \[dq]https://www.youtube.com/watch?t=4&v=BaW_jenozKc\[dq]\f[R]
+.SS ExtractorError: Could not find JS function u\[cq]OF\[cq]
+.PP
+In February 2015, the new YouTube player contained a character sequence
+in a string that was misinterpreted by old versions of youtube-dl.
+See above for how to update youtube-dl.
+.SS HTTP Error 429: Too Many Requests or 402: Payment Required
+.PP
+These two error codes indicate that the service is blocking your IP
+address because of overuse.
+Usually this is a soft block meaning that you can gain access again
+after solving CAPTCHA.
+Just open a browser and solve a CAPTCHA the service suggests you and
+after that pass cookies to youtube-dl.
+Note that if your machine has multiple external IPs then you should also
+pass exactly the same IP you\[cq]ve used for solving CAPTCHA with
+\f[V]--source-address\f[R].
+Also you may need to pass a \f[V]User-Agent\f[R] HTTP header of your
+browser with \f[V]--user-agent\f[R].
+.PP
+If this is not the case (no CAPTCHA suggested to solve by the service)
+then you can contact the service and ask them to unblock your IP
+address, or - if you have acquired a whitelisted IP address already -
+use the \f[V]--proxy\f[R] or \f[V]--source-address\f[R] options to
+select another IP address.
+.SS SyntaxError: Non-ASCII character
+.PP
+The error
+.IP
+.nf
+\f[C]
+File \[dq]youtube-dl\[dq], line 2
+SyntaxError: Non-ASCII character \[aq]\[rs]x93\[aq] ...
+\f[R]
+.fi
+.PP
+means you\[cq]re using an outdated version of Python.
+Please update to Python 2.6 or 2.7.
+.SS What is this binary file? Where has the code gone?
+.PP
+Since June 2012
+(#342 (https://github.com/ytdl-org/youtube-dl/issues/342)) youtube-dl is
+packed as an executable zipfile, simply unzip it (might need renaming to
+\f[V]youtube-dl.zip\f[R] first on some systems) or clone the git
+repository, as laid out above.
+If you modify the code, you can run it by executing the
+\f[V]__main__.py\f[R] file.
+To recompile the executable, run \f[V]make youtube-dl\f[R].
+.SS The exe throws an error due to missing \f[V]MSVCR100.dll\f[R]
+.PP
+To run the exe you need to install first the Microsoft Visual C++ 2010
+Service Pack 1 Redistributable Package
+(x86) (https://download.microsoft.com/download/1/6/5/165255E7-1014-4D0A-B094-B6A430A6BFFC/vcredist_x86.exe).
+.SS On Windows, how should I set up ffmpeg and youtube-dl? Where should I put the exe files?
+.PP
+If you put youtube-dl and ffmpeg in the same directory that you\[cq]re
+running the command from, it will work, but that\[cq]s rather
+cumbersome.
+.PP
+To make a different directory work - either for ffmpeg, or for
+youtube-dl, or for both - simply create the directory (say,
+\f[V]C:\[rs]bin\f[R], or
+\f[V]C:\[rs]Users\[rs]<User name>\[rs]bin\f[R]), put all the executables
+directly in there, and then set your PATH environment
+variable (https://www.java.com/en/download/help/path.xml) to include
+that directory.
+.PP
+From then on, after restarting your shell, you will be able to access
+both youtube-dl and ffmpeg (and youtube-dl will be able to find ffmpeg)
+by simply typing \f[V]youtube-dl\f[R] or \f[V]ffmpeg\f[R], no matter
+what directory you\[cq]re in.
+.SS How do I put downloads into a specific folder?
+.PP
+Use the \f[V]-o\f[R] to specify an output template, for example
+\f[V]-o \[dq]/home/user/videos/%(title)s-%(id)s.%(ext)s\[dq]\f[R].
+If you want this for all of your downloads, put the option into your
+configuration file.
+.SS How do I download a video starting with a \f[V]-\f[R]?
+.PP
+Either prepend \f[V]https://www.youtube.com/watch?v=\f[R] or separate
+the ID from the options with \f[V]--\f[R]:
+.IP
+.nf
+\f[C]
+youtube-dl -- -wNyEUrxzFU
+youtube-dl \[dq]https://www.youtube.com/watch?v=-wNyEUrxzFU\[dq]
+\f[R]
+.fi
+.SS How do I pass cookies to youtube-dl?
+.PP
+Use the \f[V]--cookies\f[R] option, for example
+\f[V]--cookies /path/to/cookies/file.txt\f[R].
+.PP
+In order to extract cookies from browser use any conforming browser
+extension for exporting cookies.
+For example, Get cookies.txt
+LOCALLY (https://chrome.google.com/webstore/detail/get-cookiestxt-locally/cclelndahbckbenkjhflpdbgdldlbecc)
+(for Chrome) or
+cookies.txt (https://addons.mozilla.org/en-US/firefox/addon/cookies-txt/)
+(for Firefox).
+.PP
+Note that the cookies file must be in Mozilla/Netscape format and the
+first line of the cookies file must be either
+\f[V]# HTTP Cookie File\f[R] or \f[V]# Netscape HTTP Cookie File\f[R].
+Make sure you have correct newline
+format (https://en.wikipedia.org/wiki/Newline) in the cookies file and
+convert newlines if necessary to correspond with your OS, namely
+\f[V]CRLF\f[R] (\f[V]\[rs]r\[rs]n\f[R]) for Windows and \f[V]LF\f[R]
+(\f[V]\[rs]n\f[R]) for Unix and Unix-like systems (Linux, macOS, etc.).
+\f[V]HTTP Error 400: Bad Request\f[R] when using \f[V]--cookies\f[R] is
+a good sign of invalid newline format.
+.PP
+Passing cookies to youtube-dl is a good way to workaround login when a
+particular extractor does not implement it explicitly.
+Another use case is working around
+CAPTCHA (https://en.wikipedia.org/wiki/CAPTCHA) some websites require
+you to solve in particular cases in order to get access (e.g.\ YouTube,
+CloudFlare).
+.SS How do I stream directly to media player?
+.PP
+You will first need to tell youtube-dl to stream media to stdout with
+\f[V]-o -\f[R], and also tell your media player to read from stdin (it
+must be capable of this for streaming) and then pipe former to latter.
+For example, streaming to vlc (https://www.videolan.org/) can be
+achieved with:
+.IP
+.nf
+\f[C]
+youtube-dl -o - \[dq]https://www.youtube.com/watch?v=BaW_jenozKcj\[dq] | vlc -
+\f[R]
+.fi
+.SS How do I download only new videos from a playlist?
+.PP
+Use download-archive feature.
+With this feature you should initially download the complete playlist
+with \f[V]--download-archive /path/to/download/archive/file.txt\f[R]
+that will record identifiers of all the videos in a special file.
+Each subsequent run with the same \f[V]--download-archive\f[R] will
+download only new videos and skip all videos that have been downloaded
+before.
+Note that only successful downloads are recorded in the file.
+.PP
+For example, at first,
+.IP
+.nf
+\f[C]
+youtube-dl --download-archive archive.txt \[dq]https://www.youtube.com/playlist?list=PLwiyx1dc3P2JR9N8gQaQN_BCvlSlap7re\[dq]
+\f[R]
+.fi
+.PP
+will download the complete \f[V]PLwiyx1dc3P2JR9N8gQaQN_BCvlSlap7re\f[R]
+playlist and create a file \f[V]archive.txt\f[R].
+Each subsequent run will only download new videos if any:
+.IP
+.nf
+\f[C]
+youtube-dl --download-archive archive.txt \[dq]https://www.youtube.com/playlist?list=PLwiyx1dc3P2JR9N8gQaQN_BCvlSlap7re\[dq]
+\f[R]
+.fi
+.SS Should I add \f[V]--hls-prefer-native\f[R] into my config?
+.PP
+When youtube-dl detects an HLS video, it can download it either with the
+built-in downloader or ffmpeg.
+Since many HLS streams are slightly invalid and ffmpeg/youtube-dl each
+handle some invalid cases better than the other, there is an option to
+switch the downloader if needed.
+.PP
+When youtube-dl knows that one particular downloader works better for a
+given website, that downloader will be picked.
+Otherwise, youtube-dl will pick the best downloader for general
+compatibility, which at the moment happens to be ffmpeg.
+This choice may change in future versions of youtube-dl, with
+improvements of the built-in downloader and/or ffmpeg.
+.PP
+In particular, the generic extractor (used when your website is not in
+the list of supported sites by
+youtube-dl (https://ytdl-org.github.io/youtube-dl/supportedsites.html)
+cannot mandate one specific downloader.
+.PP
+If you put either \f[V]--hls-prefer-native\f[R] or
+\f[V]--hls-prefer-ffmpeg\f[R] into your configuration, a different
+subset of videos will fail to download correctly.
+Instead, it is much better to file an issue (https://yt-dl.org/bug) or a
+pull request which details why the native or the ffmpeg HLS downloader
+is a better choice for your use case.
+.SS Can you add support for this anime video site, or site which shows current movies for free?
+.PP
+As a matter of policy (as well as legality), youtube-dl does not include
+support for services that specialize in infringing copyright.
+As a rule of thumb, if you cannot easily find a video that the service
+is quite obviously allowed to distribute (i.e.\ that has been uploaded
+by the creator, the creator\[cq]s distributor, or is published under a
+free license), the service is probably unfit for inclusion to
+youtube-dl.
+.PP
+A note on the service that they don\[cq]t host the infringing content,
+but just link to those who do, is evidence that the service should
+\f[B]not\f[R] be included into youtube-dl.
+The same goes for any DMCA note when the whole front page of the service
+is filled with videos they are not allowed to distribute.
+A \[lq]fair use\[rq] note is equally unconvincing if the service shows
+copyright-protected videos in full without authorization.
+.PP
+Support requests for services that \f[B]do\f[R] purchase the rights to
+distribute their content are perfectly fine though.
+If in doubt, you can simply include a source that mentions the
+legitimate purchase of content.
+.SS How can I speed up work on my issue?
+.PP
+(Also known as: Help, my important issue not being solved!)
+The youtube-dl core developer team is quite small.
+While we do our best to solve as many issues as possible, sometimes that
+can take quite a while.
+To speed up your issue, here\[cq]s what you can do:
+.PP
+First of all, please do report the issue at our issue
+tracker (https://yt-dl.org/bugs).
+That allows us to coordinate all efforts by users and developers, and
+serves as a unified point.
+Unfortunately, the youtube-dl project has grown too large to use
+personal email as an effective communication channel.
+.PP
+Please read the bug reporting instructions below.
+A lot of bugs lack all the necessary information.
+If you can, offer proxy, VPN, or shell access to the youtube-dl
+developers.
+If you are able to, test the issue from multiple computers in multiple
+countries to exclude local censorship or misconfiguration issues.
+.PP
+If nobody is interested in solving your issue, you are welcome to take
+matters into your own hands and submit a pull request (or coerce/pay
+somebody else to do so).
+.PP
+Feel free to bump the issue from time to time by writing a small comment
+(\[lq]Issue is still present in youtube-dl version \&...from France, but
+fixed from Belgium\[rq]), but please not more than once a month.
+Please do not declare your issue as \f[V]important\f[R] or
+\f[V]urgent\f[R].
+.SS How can I detect whether a given URL is supported by youtube-dl?
+.PP
+For one, have a look at the list of supported sites.
+Note that it can sometimes happen that the site changes its URL scheme
+(say, from https://example.com/video/1234567 to
+https://example.com/v/1234567 ) and youtube-dl reports an URL of a
+service in that list as unsupported.
+In that case, simply report a bug.
+.PP
+It is \f[I]not\f[R] possible to detect whether a URL is supported or
+not.
+That\[cq]s because youtube-dl contains a generic extractor which matches
+\f[B]all\f[R] URLs.
+You may be tempted to disable, exclude, or remove the generic extractor,
+but the generic extractor not only allows users to extract videos from
+lots of websites that embed a video from another service, but may also
+be used to extract video from a service that it\[cq]s hosting itself.
+Therefore, we neither recommend nor support disabling, excluding, or
+removing the generic extractor.
+.PP
+If you want to find out whether a given URL is supported, simply call
+youtube-dl with it.
+If you get no videos back, chances are the URL is either not referring
+to a video or unsupported.
+You can find out which by examining the output (if you run youtube-dl on
+the console) or catching an \f[V]UnsupportedError\f[R] exception if you
+run it from a Python program.
+.SH Why do I need to go through that much red tape when filing bugs?
+.PP
+Before we had the issue template, despite our extensive bug reporting
+instructions, about 80% of the issue reports we got were useless, for
+instance because people used ancient versions hundreds of releases old,
+because of simple syntactic errors (not in youtube-dl but in general
+shell usage), because the problem was already reported multiple times
+before, because people did not actually read an error message, even if
+it said \[lq]please install ffmpeg\[rq], because people did not mention
+the URL they were trying to download and many more simple, easy-to-avoid
+problems, many of whom were totally unrelated to youtube-dl.
+.PP
+youtube-dl is an open-source project manned by too few volunteers, so
+we\[cq]d rather spend time fixing bugs where we are certain none of
+those simple problems apply, and where we can be reasonably confident to
+be able to reproduce the issue without asking the reporter repeatedly.
+As such, the output of \f[V]youtube-dl -v YOUR_URL_HERE\f[R] is really
+all that\[cq]s required to file an issue.
+The issue template also guides you through some basic steps you can do,
+such as checking that your version of youtube-dl is current.
+.SH DEVELOPER INSTRUCTIONS
+.PP
+Most users do not need to build youtube-dl and can download the
+builds (https://ytdl-org.github.io/youtube-dl/download.html) or get them
+from their distribution.
+.PP
+To run youtube-dl as a developer, you don\[cq]t need to build anything
+either.
+Simply execute
+.IP
+.nf
+\f[C]
+python -m youtube_dl
+\f[R]
+.fi
+.PP
+To run the test, simply invoke your favorite test runner, or execute a
+test file directly; any of the following work:
+.IP
+.nf
+\f[C]
+python -m unittest discover
+python test/test_download.py
+nosetests
+\f[R]
+.fi
+.PP
+See item 6 of new extractor tutorial for how to run extractor specific
+test cases.
+.PP
+If you want to create a build of youtube-dl yourself, you\[cq]ll need
+.IP \[bu] 2
+python
+.IP \[bu] 2
+make (only GNU make is supported)
+.IP \[bu] 2
+pandoc
+.IP \[bu] 2
+zip
+.IP \[bu] 2
+nosetests
+.SS Adding support for a new site
+.PP
+If you want to add support for a new site, first of all \f[B]make
+sure\f[R] this site is \f[B]not dedicated to copyright
+infringement\f[R].
+youtube-dl does \f[B]not support\f[R] such sites thus pull requests
+adding support for them \f[B]will be rejected\f[R].
+.PP
+After you have ensured this site is distributing its content legally,
+you can follow this quick list (assuming your service is called
+\f[V]yourextractor\f[R]):
+.IP " 1." 4
+Fork this repository (https://github.com/ytdl-org/youtube-dl/fork)
+.IP " 2." 4
+Check out the source code with:
+.RS 4
+.IP
+.nf
+\f[C]
+ git clone git\[at]github.com:YOUR_GITHUB_USERNAME/youtube-dl.git
+\f[R]
+.fi
+.RE
+.IP " 3." 4
+Start a new git branch with
+.RS 4
+.IP
+.nf
+\f[C]
+ cd youtube-dl
+ git checkout -b yourextractor
+\f[R]
+.fi
+.RE
+.IP " 4." 4
+Start with this simple template and save it to
+\f[V]youtube_dl/extractor/yourextractor.py\f[R]:
+.RS 4
+.IP
+.nf
+\f[C]
+# coding: utf-8
+from __future__ import unicode_literals
+
+from .common import InfoExtractor
+
+
+class YourExtractorIE(InfoExtractor):
+    _VALID_URL = r\[aq]https?://(?:www\[rs].)?yourextractor\[rs].com/watch/(?P<id>[0-9]+)\[aq]
+    _TEST = {
+        \[aq]url\[aq]: \[aq]https://yourextractor.com/watch/42\[aq],
+        \[aq]md5\[aq]: \[aq]TODO: md5 sum of the first 10241 bytes of the video file (use --test)\[aq],
+        \[aq]info_dict\[aq]: {
+            \[aq]id\[aq]: \[aq]42\[aq],
+            \[aq]ext\[aq]: \[aq]mp4\[aq],
+            \[aq]title\[aq]: \[aq]Video title goes here\[aq],
+            \[aq]thumbnail\[aq]: r\[aq]re:\[ha]https?://.*\[rs].jpg$\[aq],
+            # TODO more properties, either as:
+            # * A value
+            # * MD5 checksum; start the string with md5:
+            # * A regular expression; start the string with re:
+            # * Any Python type (for example int or float)
+        }
+    }
+
+    def _real_extract(self, url):
+        video_id = self._match_id(url)
+        webpage = self._download_webpage(url, video_id)
+
+        # TODO more code goes here, for example ...
+        title = self._html_search_regex(r\[aq]<h1>(.+?)</h1>\[aq], webpage, \[aq]title\[aq])
+
+        return {
+            \[aq]id\[aq]: video_id,
+            \[aq]title\[aq]: title,
+            \[aq]description\[aq]: self._og_search_description(webpage),
+            \[aq]uploader\[aq]: self._search_regex(r\[aq]<div[\[ha]>]+id=\[dq]uploader\[dq][\[ha]>]*>([\[ha]<]+)<\[aq], webpage, \[aq]uploader\[aq], fatal=False),
+            # TODO more properties (see youtube_dl/extractor/common.py)
+        }
+\f[R]
+.fi
+.RE
+.IP " 5." 4
+Add an import in
+\f[V]youtube_dl/extractor/extractors.py\f[R] (https://github.com/ytdl-org/youtube-dl/blob/master/youtube_dl/extractor/extractors.py).
+.IP " 6." 4
+Run
+\f[V]python test/test_download.py TestDownload.test_YourExtractor\f[R].
+This \f[I]should fail\f[R] at first, but you can continually re-run it
+until you\[cq]re done.
+If you decide to add more than one test (actually, test case) then
+rename \f[V]_TEST\f[R] to \f[V]_TESTS\f[R] and make it into a list of
+dictionaries.
+The tests will then be named \f[V]TestDownload.test_YourExtractor\f[R],
+\f[V]TestDownload.test_YourExtractor_1\f[R],
+\f[V]TestDownload.test_YourExtractor_2\f[R], etc.
+Note:
+.RS 4
+.IP \[bu] 2
+the test names use the extractor class name \f[B]without the trailing
+\f[VB]IE\f[B]\f[R]
+.IP \[bu] 2
+tests with \f[V]only_matching\f[R] key in test\[cq]s dict are not
+counted.
+.RE
+.IP " 7." 4
+Have a look at
+\f[V]youtube_dl/extractor/common.py\f[R] (https://github.com/ytdl-org/youtube-dl/blob/master/youtube_dl/extractor/common.py)
+for possible helper methods and a detailed description of what your
+extractor should and may
+return (https://github.com/ytdl-org/youtube-dl/blob/7f41a598b3fba1bcab2817de64a08941200aa3c8/youtube_dl/extractor/common.py#L94-L303).
+Add tests and code for as many as you want.
+.IP " 8." 4
+Make sure your code follows youtube-dl coding conventions and check the
+code with
+flake8 (https://flake8.pycqa.org/en/latest/index.html#quickstart):
+.RS 4
+.IP
+.nf
+\f[C]
+ $ flake8 youtube_dl/extractor/yourextractor.py
+\f[R]
+.fi
+.RE
+.IP " 9." 4
+Make sure your code works under all Python (https://www.python.org/)
+versions claimed supported by youtube-dl, namely 2.6, 2.7, and 3.2+.
+.IP "10." 4
+When the tests pass, add (https://git-scm.com/docs/git-add) the new
+files and commit (https://git-scm.com/docs/git-commit) them and
+push (https://git-scm.com/docs/git-push) the result, like this:
+.RS 4
+.IP
+.nf
+\f[C]
+$ git add youtube_dl/extractor/extractors.py
+$ git add youtube_dl/extractor/yourextractor.py
+$ git commit -m \[aq][yourextractor] Add new extractor\[aq]
+$ git push origin yourextractor
+\f[R]
+.fi
+.RE
+.IP "11." 4
+Finally, create a pull
+request (https://help.github.com/articles/creating-a-pull-request).
+We\[cq]ll then review and merge it.
+.PP
+In any case, thank you very much for your contributions!
+.SS youtube-dl coding conventions
+.PP
+This section introduces a guide lines for writing idiomatic, robust and
+future-proof extractor code.
+.PP
+Extractors are very fragile by nature since they depend on the layout of
+the source data provided by 3rd party media hosters out of your control
+and this layout tends to change.
+As an extractor implementer your task is not only to write code that
+will extract media links and metadata correctly but also to minimize
+dependency on the source\[cq]s layout and even to make the code foresee
+potential future changes and be ready for that.
+This is important because it will allow the extractor not to break on
+minor layout changes thus keeping old youtube-dl versions working.
+Even though this breakage issue is easily fixed by emitting a new
+version of youtube-dl with a fix incorporated, all the previous versions
+become broken in all repositories and distros\[cq] packages that may not
+be so prompt in fetching the update from us.
+Needless to say, some non rolling release distros may never receive an
+update at all.
+.SS Mandatory and optional metafields
+.PP
+For extraction to work youtube-dl relies on metadata your extractor
+extracts and provides to youtube-dl expressed by an information
+dictionary (https://github.com/ytdl-org/youtube-dl/blob/7f41a598b3fba1bcab2817de64a08941200aa3c8/youtube_dl/extractor/common.py#L94-L303)
+or simply \f[I]info dict\f[R].
+Only the following meta fields in the \f[I]info dict\f[R] are considered
+mandatory for a successful extraction process by youtube-dl:
+.IP \[bu] 2
+\f[V]id\f[R] (media identifier)
+.IP \[bu] 2
+\f[V]title\f[R] (media title)
+.IP \[bu] 2
+\f[V]url\f[R] (media download URL) or \f[V]formats\f[R]
+.PP
+In fact only the last option is technically mandatory (i.e.\ if you
+can\[cq]t figure out the download location of the media the extraction
+does not make any sense).
+But by convention youtube-dl also treats \f[V]id\f[R] and
+\f[V]title\f[R] as mandatory.
+Thus the aforementioned metafields are the critical data that the
+extraction does not make any sense without and if any of them fail to be
+extracted then the extractor is considered completely broken.
+.PP
+Any
+field (https://github.com/ytdl-org/youtube-dl/blob/7f41a598b3fba1bcab2817de64a08941200aa3c8/youtube_dl/extractor/common.py#L188-L303)
+apart from the aforementioned ones are considered \f[B]optional\f[R].
+That means that extraction should be \f[B]tolerant\f[R] to situations
+when sources for these fields can potentially be unavailable (even if
+they are always available at the moment) and \f[B]future-proof\f[R] in
+order not to break the extraction of general purpose mandatory fields.
+.SS Example
+.PP
+Say you have some source dictionary \f[V]meta\f[R] that you\[cq]ve
+fetched as JSON with HTTP request and it has a key \f[V]summary\f[R]:
+.IP
+.nf
+\f[C]
+meta = self._download_json(url, video_id)
+\f[R]
+.fi
+.PP
+Assume at this point \f[V]meta\f[R]\[cq]s layout is:
+.IP
+.nf
+\f[C]
+{
+    ...
+    \[dq]summary\[dq]: \[dq]some fancy summary text\[dq],
+    ...
+}
+\f[R]
+.fi
+.PP
+Assume you want to extract \f[V]summary\f[R] and put it into the
+resulting info dict as \f[V]description\f[R].
+Since \f[V]description\f[R] is an optional meta field you should be
+ready that this key may be missing from the \f[V]meta\f[R] dict, so that
+you should extract it like:
+.IP
+.nf
+\f[C]
+description = meta.get(\[aq]summary\[aq])  # correct
+\f[R]
+.fi
+.PP
+and not like:
+.IP
+.nf
+\f[C]
+description = meta[\[aq]summary\[aq]]  # incorrect
+\f[R]
+.fi
+.PP
+The latter will break extraction process with \f[V]KeyError\f[R] if
+\f[V]summary\f[R] disappears from \f[V]meta\f[R] at some later time but
+with the former approach extraction will just go ahead with
+\f[V]description\f[R] set to \f[V]None\f[R] which is perfectly fine
+(remember \f[V]None\f[R] is equivalent to the absence of data).
+.PP
+Similarly, you should pass \f[V]fatal=False\f[R] when extracting
+optional data from a webpage with \f[V]_search_regex\f[R],
+\f[V]_html_search_regex\f[R] or similar methods, for instance:
+.IP
+.nf
+\f[C]
+description = self._search_regex(
+    r\[aq]<span[\[ha]>]+id=\[dq]title\[dq][\[ha]>]*>([\[ha]<]+)<\[aq],
+    webpage, \[aq]description\[aq], fatal=False)
+\f[R]
+.fi
+.PP
+With \f[V]fatal\f[R] set to \f[V]False\f[R] if \f[V]_search_regex\f[R]
+fails to extract \f[V]description\f[R] it will emit a warning and
+continue extraction.
+.PP
+You can also pass \f[V]default=<some fallback value>\f[R], for example:
+.IP
+.nf
+\f[C]
+description = self._search_regex(
+    r\[aq]<span[\[ha]>]+id=\[dq]title\[dq][\[ha]>]*>([\[ha]<]+)<\[aq],
+    webpage, \[aq]description\[aq], default=None)
+\f[R]
+.fi
+.PP
+On failure this code will silently continue the extraction with
+\f[V]description\f[R] set to \f[V]None\f[R].
+That is useful for metafields that may or may not be present.
+.SS Provide fallbacks
+.PP
+When extracting metadata try to do so from multiple sources.
+For example if \f[V]title\f[R] is present in several places, try
+extracting from at least some of them.
+This makes it more future-proof in case some of the sources become
+unavailable.
+.SS Example
+.PP
+Say \f[V]meta\f[R] from the previous example has a \f[V]title\f[R] and
+you are about to extract it.
+Since \f[V]title\f[R] is a mandatory meta field you should end up with
+something like:
+.IP
+.nf
+\f[C]
+title = meta[\[aq]title\[aq]]
+\f[R]
+.fi
+.PP
+If \f[V]title\f[R] disappears from \f[V]meta\f[R] in future due to some
+changes on the hoster\[cq]s side the extraction would fail since
+\f[V]title\f[R] is mandatory.
+That\[cq]s expected.
+.PP
+Assume that you have some another source you can extract \f[V]title\f[R]
+from, for example \f[V]og:title\f[R] HTML meta of a \f[V]webpage\f[R].
+In this case you can provide a fallback scenario:
+.IP
+.nf
+\f[C]
+title = meta.get(\[aq]title\[aq]) or self._og_search_title(webpage)
+\f[R]
+.fi
+.PP
+This code will try to extract from \f[V]meta\f[R] first and if it fails
+it will try extracting \f[V]og:title\f[R] from a \f[V]webpage\f[R].
+.SS Regular expressions
+.SS Don\[cq]t capture groups you don\[cq]t use
+.PP
+Capturing group must be an indication that it\[cq]s used somewhere in
+the code.
+Any group that is not used must be non capturing.
+.SS Example
+.PP
+Don\[cq]t capture id attribute name here since you can\[cq]t use it for
+anything anyway.
+.PP
+Correct:
+.IP
+.nf
+\f[C]
+r\[aq](?:id|ID)=(?P<id>\[rs]d+)\[aq]
+\f[R]
+.fi
+.PP
+Incorrect:
+.IP
+.nf
+\f[C]
+r\[aq](id|ID)=(?P<id>\[rs]d+)\[aq]
+\f[R]
+.fi
+.SS Make regular expressions relaxed and flexible
+.PP
+When using regular expressions try to write them fuzzy, relaxed and
+flexible, skipping insignificant parts that are more likely to change,
+allowing both single and double quotes for quoted values and so on.
+.SS Example
+.PP
+Say you need to extract \f[V]title\f[R] from the following HTML code:
+.IP
+.nf
+\f[C]
+<span style=\[dq]position: absolute; left: 910px; width: 90px; float: right; z-index: 9999;\[dq] class=\[dq]title\[dq]>some fancy title</span>
+\f[R]
+.fi
+.PP
+The code for that task should look similar to:
+.IP
+.nf
+\f[C]
+title = self._search_regex(
+    r\[aq]<span[\[ha]>]+class=\[dq]title\[dq][\[ha]>]*>([\[ha]<]+)\[aq], webpage, \[aq]title\[aq])
+\f[R]
+.fi
+.PP
+Or even better:
+.IP
+.nf
+\f[C]
+title = self._search_regex(
+    r\[aq]<span[\[ha]>]+class=([\[dq]\[rs]\[aq]])title\[rs]1[\[ha]>]*>(?P<title>[\[ha]<]+)\[aq],
+    webpage, \[aq]title\[aq], group=\[aq]title\[aq])
+\f[R]
+.fi
+.PP
+Note how you tolerate potential changes in the \f[V]style\f[R]
+attribute\[cq]s value or switch from using double quotes to single for
+\f[V]class\f[R] attribute:
+.PP
+The code definitely should not look like:
+.IP
+.nf
+\f[C]
+title = self._search_regex(
+    r\[aq]<span style=\[dq]position: absolute; left: 910px; width: 90px; float: right; z-index: 9999;\[dq] class=\[dq]title\[dq]>(.*?)</span>\[aq],
+    webpage, \[aq]title\[aq], group=\[aq]title\[aq])
+\f[R]
+.fi
+.SS Long lines policy
+.PP
+There is a soft limit to keep lines of code under 80 characters long.
+This means it should be respected if possible and if it does not make
+readability and code maintenance worse.
+.PP
+For example, you should \f[B]never\f[R] split long string literals like
+URLs or some other often copied entities over multiple lines to fit this
+limit:
+.PP
+Correct:
+.IP
+.nf
+\f[C]
+\[aq]https://www.youtube.com/watch?v=FqZTN594JQw&list=PLMYEtVRpaqY00V9W81Cwmzp6N6vZqfUKD4\[aq]
+\f[R]
+.fi
+.PP
+Incorrect:
+.IP
+.nf
+\f[C]
+\[aq]https://www.youtube.com/watch?v=FqZTN594JQw&list=\[aq]
+\[aq]PLMYEtVRpaqY00V9W81Cwmzp6N6vZqfUKD4\[aq]
+\f[R]
+.fi
+.SS Inline values
+.PP
+Extracting variables is acceptable for reducing code duplication and
+improving readability of complex expressions.
+However, you should avoid extracting variables used only once and moving
+them to opposite parts of the extractor file, which makes reading the
+linear flow difficult.
+.SS Example
+.PP
+Correct:
+.IP
+.nf
+\f[C]
+title = self._html_search_regex(r\[aq]<title>([\[ha]<]+)</title>\[aq], webpage, \[aq]title\[aq])
+\f[R]
+.fi
+.PP
+Incorrect:
+.IP
+.nf
+\f[C]
+TITLE_RE = r\[aq]<title>([\[ha]<]+)</title>\[aq]
+# ...some lines of code...
+title = self._html_search_regex(TITLE_RE, webpage, \[aq]title\[aq])
+\f[R]
+.fi
+.SS Collapse fallbacks
+.PP
+Multiple fallback values can quickly become unwieldy.
+Collapse multiple fallback values into a single expression via a list of
+patterns.
+.SS Example
+.PP
+Good:
+.IP
+.nf
+\f[C]
+description = self._html_search_meta(
+    [\[aq]og:description\[aq], \[aq]description\[aq], \[aq]twitter:description\[aq]],
+    webpage, \[aq]description\[aq], default=None)
+\f[R]
+.fi
+.PP
+Unwieldy:
+.IP
+.nf
+\f[C]
+description = (
+    self._og_search_description(webpage, default=None)
+    or self._html_search_meta(\[aq]description\[aq], webpage, default=None)
+    or self._html_search_meta(\[aq]twitter:description\[aq], webpage, default=None))
+\f[R]
+.fi
+.PP
+Methods supporting list of patterns are: \f[V]_search_regex\f[R],
+\f[V]_html_search_regex\f[R], \f[V]_og_search_property\f[R],
+\f[V]_html_search_meta\f[R].
+.SS Trailing parentheses
+.PP
+Always move trailing parentheses after the last argument.
+.SS Example
+.PP
+Correct:
+.IP
+.nf
+\f[C]
+    lambda x: x[\[aq]ResultSet\[aq]][\[aq]Result\[aq]][0][\[aq]VideoUrlSet\[aq]][\[aq]VideoUrl\[aq]],
+    list)
+\f[R]
+.fi
+.PP
+Incorrect:
+.IP
+.nf
+\f[C]
+    lambda x: x[\[aq]ResultSet\[aq]][\[aq]Result\[aq]][0][\[aq]VideoUrlSet\[aq]][\[aq]VideoUrl\[aq]],
+    list,
+)
+\f[R]
+.fi
+.SS Use convenience conversion and parsing functions
+.PP
+Wrap all extracted numeric data into safe functions from
+\f[V]youtube_dl/utils.py\f[R] (https://github.com/ytdl-org/youtube-dl/blob/master/youtube_dl/utils.py):
+\f[V]int_or_none\f[R], \f[V]float_or_none\f[R].
+Use them for string to number conversions as well.
+.PP
+Use \f[V]url_or_none\f[R] for safe URL processing.
+.PP
+Use \f[V]try_get\f[R] for safe metadata extraction from parsed JSON.
+.PP
+Use \f[V]unified_strdate\f[R] for uniform \f[V]upload_date\f[R] or any
+\f[V]YYYYMMDD\f[R] meta field extraction, \f[V]unified_timestamp\f[R]
+for uniform \f[V]timestamp\f[R] extraction, \f[V]parse_filesize\f[R] for
+\f[V]filesize\f[R] extraction, \f[V]parse_count\f[R] for count meta
+fields extraction, \f[V]parse_resolution\f[R], \f[V]parse_duration\f[R]
+for \f[V]duration\f[R] extraction, \f[V]parse_age_limit\f[R] for
+\f[V]age_limit\f[R] extraction.
+.PP
+Explore
+\f[V]youtube_dl/utils.py\f[R] (https://github.com/ytdl-org/youtube-dl/blob/master/youtube_dl/utils.py)
+for more useful convenience functions.
+.SS More examples
+.SS Safely extract optional description from parsed JSON
+.IP
+.nf
+\f[C]
+description = try_get(response, lambda x: x[\[aq]result\[aq]][\[aq]video\[aq]][0][\[aq]summary\[aq]], compat_str)
+\f[R]
+.fi
+.SS Safely extract more optional metadata
+.IP
+.nf
+\f[C]
+video = try_get(response, lambda x: x[\[aq]result\[aq]][\[aq]video\[aq]][0], dict) or {}
+description = video.get(\[aq]summary\[aq])
+duration = float_or_none(video.get(\[aq]durationMs\[aq]), scale=1000)
+view_count = int_or_none(video.get(\[aq]views\[aq]))
+\f[R]
+.fi
+.SH EMBEDDING YOUTUBE-DL
+.PP
+youtube-dl makes the best effort to be a good command-line program, and
+thus should be callable from any programming language.
+If you encounter any problems parsing its output, feel free to create a
+report (https://github.com/ytdl-org/youtube-dl/issues/new).
+.PP
+From a Python program, you can embed youtube-dl in a more powerful
+fashion, like this:
+.IP
+.nf
+\f[C]
+from __future__ import unicode_literals
+import youtube_dl
+
+ydl_opts = {}
+with youtube_dl.YoutubeDL(ydl_opts) as ydl:
+    ydl.download([\[aq]https://www.youtube.com/watch?v=BaW_jenozKc\[aq]])
+\f[R]
+.fi
+.PP
+Most likely, you\[cq]ll want to use various options.
+For a list of options available, have a look at
+\f[V]youtube_dl/YoutubeDL.py\f[R] (https://github.com/ytdl-org/youtube-dl/blob/3e4cedf9e8cd3157df2457df7274d0c842421945/youtube_dl/YoutubeDL.py#L137-L312).
+For a start, if you want to intercept youtube-dl\[cq]s output, set a
+\f[V]logger\f[R] object.
+.PP
+Here\[cq]s a more complete example of a program that outputs only errors
+(and a short message after the download is finished), and
+downloads/converts the video to an mp3 file:
+.IP
+.nf
+\f[C]
+from __future__ import unicode_literals
+import youtube_dl
+
+
+class MyLogger(object):
+    def debug(self, msg):
+        pass
+
+    def warning(self, msg):
+        pass
+
+    def error(self, msg):
+        print(msg)
+
+
+def my_hook(d):
+    if d[\[aq]status\[aq]] == \[aq]finished\[aq]:
+        print(\[aq]Done downloading, now converting ...\[aq])
+
+
+ydl_opts = {
+    \[aq]format\[aq]: \[aq]bestaudio/best\[aq],
+    \[aq]postprocessors\[aq]: [{
+        \[aq]key\[aq]: \[aq]FFmpegExtractAudio\[aq],
+        \[aq]preferredcodec\[aq]: \[aq]mp3\[aq],
+        \[aq]preferredquality\[aq]: \[aq]192\[aq],
+    }],
+    \[aq]logger\[aq]: MyLogger(),
+    \[aq]progress_hooks\[aq]: [my_hook],
+}
+with youtube_dl.YoutubeDL(ydl_opts) as ydl:
+    ydl.download([\[aq]https://www.youtube.com/watch?v=BaW_jenozKc\[aq]])
+\f[R]
+.fi
+.SH BUGS
+.PP
+Bugs and suggestions should be reported in the issue tracker:
+<https://github.com/ytdl-org/youtube-dl/issues> (<https://yt-dl.org/bug>
+is an alias for this).
+Unless you were prompted to or there is another pertinent reason
+(e.g.\ GitHub fails to accept the bug report), please do not send bug
+reports via personal email.
+For discussions, join us in the IRC channel
+#youtube-dl (irc://chat.freenode.net/#youtube-dl) on freenode
+(webchat (https://webchat.freenode.net/?randomnick=1&channels=youtube-dl)).
+.SS Opening a bug report or suggestion
+.PP
+Be sure to follow instructions provided \f[B]below\f[R] and \f[B]in the
+issue tracker\f[R].
+Complete the appropriate issue template fully.
+Consider whether your problem is covered by an existing issue: if so,
+follow the discussion there.
+Avoid commenting on existing duplicate issues as such comments do not
+add to the discussion of the issue and are liable to be treated as spam.
+.PP
+\f[B]Please include the full output of youtube-dl when run with
+\f[VB]-v\f[B]\f[R], i.e.\ \f[B]add\f[R] \f[V]-v\f[R] flag to \f[B]your
+command line\f[R], copy the \f[B]whole\f[R] output and post it in the
+issue body wrapped in \[ga]\[ga]\[ga] for better formatting.
+It should look similar to this:
+.IP
+.nf
+\f[C]
+$ youtube-dl -v <your command line>
+[debug] System config: []
+[debug] User config: []
+[debug] Command-line args: [u\[aq]-v\[aq], u\[aq]https://www.youtube.com/watch?v=BaW_jenozKcj\[aq]]
+[debug] Encodings: locale cp1251, fs mbcs, out cp866, pref cp1251
+[debug] youtube-dl version 2015.12.06
+[debug] Git HEAD: 135392e
+[debug] Python version 2.6.6 - Windows-2003Server-5.2.3790-SP2
+[debug] exe versions: ffmpeg N-75573-g1d0487f, ffprobe N-75573-g1d0487f, rtmpdump 2.4
+[debug] Proxy map: {}
+\&...
+\f[R]
+.fi
+.PP
+\f[B]Do not post screenshots of verbose logs; only plain text is
+acceptable.\f[R]
+.PP
+The output (including the first lines) contains important debugging
+information.
+Issues without the full output are often not reproducible and therefore
+do not get solved in short order, if ever.
+.PP
+Finally please review your issue to avoid various common mistakes (you
+can and should use this as a checklist) listed below.
+.SS Is the description of the issue itself sufficient?
+.PP
+We often get issue reports that are hard to understand.
+To avoid subsequent clarifications, and to assist participants who are
+not native English speakers, please elaborate on what feature you are
+requesting, or what bug you want to be fixed.
+.PP
+Make sure that it\[cq]s obvious
+.IP \[bu] 2
+What the problem is
+.IP \[bu] 2
+How it could be fixed
+.IP \[bu] 2
+How your proposed solution would look
+.PP
+If your report is shorter than two lines, it is almost certainly missing
+some of these, which makes it hard for us to respond to it.
+We\[cq]re often too polite to close the issue outright, but the missing
+info makes misinterpretation likely.
+As a committer myself, I often get frustrated by these issues, since the
+only possible way for me to move forward on them is to ask for
+clarification over and over.
+.PP
+For bug reports, this means that your report should contain the
+\f[I]complete\f[R] output of youtube-dl when called with the
+\f[V]-v\f[R] flag.
+The error message you get for (most) bugs even says so, but you would
+not believe how many of our bug reports do not contain this information.
+.PP
+If your server has multiple IPs or you suspect censorship, adding
+\f[V]--call-home\f[R] may be a good idea to get more diagnostics.
+If the error is \f[V]ERROR: Unable to extract ...\f[R] and you cannot
+reproduce it from multiple countries, add \f[V]--dump-pages\f[R]
+(warning: this will yield a rather large output, redirect it to the file
+\f[V]log.txt\f[R] by adding \f[V]>log.txt 2>&1\f[R] to your
+command-line) or upload the \f[V].dump\f[R] files you get when you add
+\f[V]--write-pages\f[R] somewhere (https://gist.github.com/).
+.PP
+\f[B]Site support requests must contain an example URL\f[R].
+An example URL is a URL you might want to download, like
+\f[V]https://www.youtube.com/watch?v=BaW_jenozKc\f[R].
+There should be an obvious video present.
+Except under very special circumstances, the main page of a video
+service (e.g.\ \f[V]https://www.youtube.com/\f[R]) is \f[I]not\f[R] an
+example URL.
+.SS Is the issue already documented?
+.PP
+Make sure that someone has not already opened the issue you\[cq]re
+trying to open.
+Search at the top of the window or browse the GitHub
+Issues (https://github.com/ytdl-org/youtube-dl/search?type=Issues) of
+this repository.
+Initially, at least, use the search term \f[V]-label:duplicate\f[R] to
+focus on active issues.
+If there is an issue, feel free to write something along the lines of
+\[lq]This affects me as well, with version 2015.01.01.
+Here is some more information on the issue: \&...\[rq].
+While some issues may be old, a new post into them often spurs rapid
+activity.
+.SS Are you using the latest version?
+.PP
+Before reporting any issue, type \f[V]youtube-dl -U\f[R].
+This should report that you\[cq]re up-to-date.
+About 20% of the reports we receive are already fixed, but people are
+using outdated versions.
+This goes for feature requests as well.
+.SS Why are existing options not enough?
+.PP
+Before requesting a new feature, please have a quick peek at the list of
+supported
+options (https://github.com/ytdl-org/youtube-dl/blob/master/README.md#options).
+Many feature requests are for features that actually exist already!
+Please, absolutely do show off your work in the issue report and detail
+how the existing similar options do \f[I]not\f[R] solve your problem.
+.SS Is there enough context in your bug report?
+.PP
+People want to solve problems, and often think they do us a favor by
+breaking down their larger problems (e.g.\ wanting to skip already
+downloaded files) to a specific request (e.g.\ requesting us to look
+whether the file exists before downloading the info page).
+However, what often happens is that they break down the problem into two
+steps: One simple, and one impossible (or extremely complicated one).
+.PP
+We are then presented with a very complicated request when the original
+problem could be solved far easier, e.g.\ by recording the downloaded
+video IDs in a separate file.
+To avoid this, you must include the greater context where it is
+non-obvious.
+In particular, every feature request that does not consist of adding
+support for a new site should contain a use case scenario that explains
+in what situation the missing feature would be useful.
+.SS Does the issue involve one problem, and one problem only?
+.PP
+Some of our users seem to think there is a limit of issues they can or
+should open.
+There is no limit of issues they can or should open.
+While it may seem appealing to be able to dump all your issues into one
+ticket, that means that someone who solves one of your issues cannot
+mark the issue as closed.
+Typically, reporting a bunch of issues leads to the ticket lingering
+since nobody wants to attack that behemoth, until someone mercifully
+splits the issue into multiple ones.
+.PP
+In particular, every site support request issue should only pertain to
+services at one site (generally under a common domain, but always using
+the same backend technology).
+Do not request support for vimeo user videos, White house podcasts, and
+Google Plus pages in the same issue.
+Also, make sure that you don\[cq]t post bug reports alongside feature
+requests.
+As a rule of thumb, a feature request does not include outputs of
+youtube-dl that are not immediately related to the feature at hand.
+Do not post reports of a network error alongside the request for a new
+video service.
+.SS Is anyone going to need the feature?
+.PP
+Only post features that you (or an incapacitated friend you can
+personally talk to) require.
+Do not post features because they seem like a good idea.
+If they are really useful, they will be requested by someone who
+requires them.
+.SS Is your question about youtube-dl?
+.PP
+It may sound strange, but some bug reports we receive are completely
+unrelated to youtube-dl and relate to a different, or even the
+reporter\[cq]s own, application.
+Please make sure that you are actually using youtube-dl.
+If you are using a UI for youtube-dl, report the bug to the maintainer
+of the actual application providing the UI.
+On the other hand, if your UI for youtube-dl fails in some way you
+believe is related to youtube-dl, by all means, go ahead and report the
+bug.
+.SH COPYRIGHT
+.PP
+youtube-dl is released into the public domain by the copyright holders.
+.PP
+This README file was originally written by Daniel
+Bolton (https://github.com/dbbolton) and is likewise released into the
+public domain.
diff --git a/network/youtube-dl/youtube-dl.SlackBuild b/network/youtube-dl/youtube-dl.SlackBuild
index c238782976..6cd1b232de 100644
--- a/network/youtube-dl/youtube-dl.SlackBuild
+++ b/network/youtube-dl/youtube-dl.SlackBuild
@@ -1,9 +1,9 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for youtube-dl
 # Copyright 2010 GPLeo <gpleomail@gmail.com>
 # Copyright 2010-2012 byteframe <byteframe@gmail.com>
-# Copyright 2015-2019  Dimitris Zlatanidis  Orestiada, Greece
+# Copyright 2015-2024 Dimitris Zlatanidis Orestiada, Greece
 # 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=youtube-dl
-VERSION=${VERSION:-2019.08.13}
+VERSION=${VERSION:-2021.12.17+20240122_dc512e3a8}
 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}
@@ -62,27 +69,34 @@ mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
 mkdir $PRGNAM-$VERSION 
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz -C $PRGNAM-$VERSION --strip-components 1
+tar xvf $CWD/$PRGNAM-$VERSION.tar.xz -C $PRGNAM-$VERSION --strip-components 1
 cd $PRGNAM-$VERSION
 chown -R root: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 {} +
 
 # setup.py patch
 patch -p1 < $CWD/setup.patch
 
-python setup.py install --root=$PKG
+# 20230627 bkw: building the man page would require pandoc or pandoc-bin.
+# Easier to just include the prebuilt manpage in the SBo repo.
+cat $CWD/$PRGNAM.1 > $PRGNAM.1
 
-# Python 3 support.
-if $(python3 -c 'import sys' 2>/dev/null); then
-    python3 setup.py install --root=$PKG
-fi
+# 20230627 bkw: Unusual for a python build, we need this for the man page
+# and shell completions. It also installs the all-in-one youtube-dl
+# 'frozen' binary, which we don't want, but setup.py will overwrite that.
+make install DESTDIR=$PKG PREFIX=/usr MANDIR=/usr/man
+
+python2 setup.py install --root=$PKG
+python3 setup.py install --root=$PKG
+
+gzip $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
+# 20230627 bkw: this empty dir gets created, but we don't need it.
+rmdir $PKG/usr/doc/youtube_dl
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a README.md LICENSE AUTHORS ChangeLog $PKG/usr/doc/$PRGNAM-$VERSION
@@ -90,7 +104,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/network/youtube-dl/youtube-dl.info b/network/youtube-dl/youtube-dl.info
index 56014d69ee..31283cb3ac 100644
--- a/network/youtube-dl/youtube-dl.info
+++ b/network/youtube-dl/youtube-dl.info
@@ -1,10 +1,10 @@
 PRGNAM="youtube-dl"
-VERSION="2019.08.13"
-HOMEPAGE="http://www.yt-dl.org/"
-DOWNLOAD="https://yt-dl.org/downloads/2019.08.13/youtube-dl-2019.08.13.tar.gz"
-MD5SUM="169c37560b20821a4b20a2d1013a191a"
+VERSION="2021.12.17+20240122_dc512e3a8"
+HOMEPAGE="https://github.com/ytdl-org/youtube-dl"
+DOWNLOAD="https://downloads.sourceforge.net/project/dslackw/src/youtube-dl/youtube-dl-2021.12.17%2B20240122_dc512e3a8.tar.xz"
+MD5SUM="2d69b297389b1a890811d01fb772b49f"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
 MAINTAINER="Dimitris Zlatanidis"
-EMAIL="d.zlatanidis@gmail.com"
+EMAIL="dslackw@gmail.com"
diff --git a/network/youtube-upload/README b/network/youtube-upload/README
index fae729bbbe..30973b3c00 100644
--- a/network/youtube-upload/README
+++ b/network/youtube-upload/README
@@ -1,2 +1,2 @@
 Youtube-upload is a command line Python script that uploads videos
-to Youtube using the YouTube APIv3.
\ No newline at end of file
+to Youtube using the YouTube APIv3.
diff --git a/network/youtube-upload/youtube-upload.SlackBuild b/network/youtube-upload/youtube-upload.SlackBuild
index 261103bfa8..5ee1fcd93f 100644
--- a/network/youtube-upload/youtube-upload.SlackBuild
+++ b/network/youtube-upload/youtube-upload.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for "youtube-upload".
 
@@ -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=youtube-upload
 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=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/network/youtube-upload/youtube-upload.info b/network/youtube-upload/youtube-upload.info
index 7706a92636..e71d44f433 100644
--- a/network/youtube-upload/youtube-upload.info
+++ b/network/youtube-upload/youtube-upload.info
@@ -1,10 +1,10 @@
 PRGNAM="youtube-upload"
 VERSION="0.8.0"
 HOMEPAGE="https://github.com/tokland/youtube-upload/"
-DOWNLOAD="https://github.com/tokland/youtube-upload/archive/0.8.0.tar.gz"
+DOWNLOAD="https://github.com/tokland/youtube-upload/archive/0.8.0/youtube-upload-0.8.0.tar.gz"
 MD5SUM="71c7c31f340b3b3ae30ffbe8dd23b0c1"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="progressbar google-api-python-client six"
+REQUIRES="progressbar google-api-python-client"
 MAINTAINER="Marcel Saegebarth"
 EMAIL="marc@mos6581.de"
diff --git a/network/yt-dlp/README b/network/yt-dlp/README
new file mode 100644
index 0000000000..d734d0d4a5
--- /dev/null
+++ b/network/yt-dlp/README
@@ -0,0 +1,34 @@
+yt-dlp (download videos from youtube)
+
+yt-dlp is a youtube-dl fork based on the now inactive youtube-dlc. The
+main focus of this project is adding new features and patches while
+also keeping up to date with the original project.
+
+yt-dlp has several optional runtime dependencies, which aren't
+required for most common use cases. They don't have to be installed
+before yt-dlp is built, and can be installed after yt-dlp (which won't
+need a rebuild).
+
+mutagen: Required for embedding thumbnails in mp4 files (the
+--embed-thumbnail option).
+
+phantomjs: Used in extractors where JavaScript needs to be run. It's
+not clear to the SlackBuild author which content providers need this;
+YouTube does not.
+
+python3-websockets: Required for downloading over WebSocket ("ws://"
+and "wss://" URLs). If you've never heard of the WebSocket protocol,
+you probably don't need this.
+
+pycryptodomex: For decrypting AES-128 HLS streams and various other
+data. It's not clear to the SlackBuild author what content providers
+use AES-128. YouTube does not, that I've ever seen.
+
+secretstorage: For --cookies-from-browser to access the Gnome keyring
+while decrypting cookies of Chromium-based browsers on Linux.
+
+xattr: For the --xattrs and --xattr-set-filesize option.
+
+If you do not have the necessary dependencies for a task you are
+attempting, yt-dlp will warn you. All the currently available
+dependencies are visible at the top of the --verbose output.
diff --git a/network/yt-dlp/slack-desc b/network/yt-dlp/slack-desc
new file mode 100644
index 0000000000..a57ef03f5b
--- /dev/null
+++ b/network/yt-dlp/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+      |-----handy-ruler------------------------------------------------------|
+yt-dlp: yt-dlp (download videos from youtube)
+yt-dlp:
+yt-dlp: yt-dlp is a youtube-dl fork based on the now inactive youtube-dlc. The
+yt-dlp: main focus of this project is adding new features and patches while
+yt-dlp: also keeping up to date with the original project.
+yt-dlp:
+yt-dlp:
+yt-dlp:
+yt-dlp:
+yt-dlp:
+yt-dlp:
diff --git a/network/yt-dlp/yt-dlp.1 b/network/yt-dlp/yt-dlp.1
new file mode 100644
index 0000000000..93f52b4056
--- /dev/null
+++ b/network/yt-dlp/yt-dlp.1
@@ -0,0 +1,3324 @@
+.\"t
+.\" Automatically generated by Pandoc 2.9.2.1
+.\"
+.TH "yt-dlp" "1" "" "" ""
+.hy
+.SH NAME
+.PP
+yt-dlp - A youtube-dl fork with additional features and patches
+.SH SYNOPSIS
+.PP
+\f[B]yt-dlp\f[R] [OPTIONS] URL [URL...]
+.SH DESCRIPTION
+.PP
+yt-dlp is a youtube-dl (https://github.com/ytdl-org/youtube-dl) fork
+based on the now inactive
+youtube-dlc (https://github.com/blackjack4494/yt-dlc).
+The main focus of this project is adding new features and patches while
+also keeping up to date with the original project
+.SH OPTIONS
+.SS General Options:
+.TP
+-h, --help
+Print this help text and exit
+.TP
+--version
+Print program version and exit
+.TP
+-U, --update
+Update this program to the latest version
+.TP
+--no-update
+Do not check for updates (default)
+.TP
+--update-to \f[I][CHANNEL]\[at][TAG]\f[R]
+Upgrade/downgrade to a specific version.
+CHANNEL can be a repository as well.
+CHANNEL and TAG default to \[dq]stable\[dq] and \[dq]latest\[dq]
+respectively if omitted; See \[dq]UPDATE\[dq] for details.
+Supported channels: stable, nightly, master
+.TP
+-i, --ignore-errors
+Ignore download and postprocessing errors.
+The download will be considered successful even if the postprocessing
+fails
+.TP
+--no-abort-on-error
+Continue with next video on download errors; e.g.
+to skip unavailable videos in a playlist (default)
+.TP
+--abort-on-error
+Abort downloading of further videos if an error occurs (Alias:
+--no-ignore-errors)
+.TP
+--dump-user-agent
+Display the current user-agent and exit
+.TP
+--list-extractors
+List all supported extractors and exit
+.TP
+--extractor-descriptions
+Output descriptions of all supported extractors and exit
+.TP
+--use-extractors \f[I]NAMES\f[R]
+Extractor names to use separated by commas.
+You can also use regexes, \[dq]all\[dq], \[dq]default\[dq] and
+\[dq]end\[dq] (end URL matching); e.g.
+--ies \[dq]holodex.*,end,youtube\[dq].
+Prefix the name with a \[dq]-\[dq] to exclude it, e.g.
+--ies default,-generic.
+Use --list-extractors for a list of extractor names.
+(Alias: --ies)
+.TP
+--default-search \f[I]PREFIX\f[R]
+Use this prefix for unqualified URLs.
+E.g.
+\[dq]gvsearch2:python\[dq] downloads two videos from google videos for
+the search term \[dq]python\[dq].
+Use the value \[dq]auto\[dq] to let yt-dlp guess (\[dq]auto_warning\[dq]
+to emit a warning when guessing).
+\[dq]error\[dq] just throws an error.
+The default value \[dq]fixup_error\[dq] repairs broken URLs, but emits
+an error if this is not possible instead of searching
+.TP
+--ignore-config
+Don\[aq]t load any more configuration files except those given by
+--config-locations.
+For backward compatibility, if this option is found inside the system
+configuration file, the user configuration is not loaded.
+(Alias: --no-config)
+.TP
+--no-config-locations
+Do not load any custom configuration files (default).
+When given inside a configuration file, ignore all previous
+--config-locations defined in the current file
+.TP
+--config-locations \f[I]PATH\f[R]
+Location of the main configuration file; either the path to the config
+or its containing directory (\[dq]-\[dq] for stdin).
+Can be used multiple times and inside other configuration files
+.TP
+--flat-playlist
+Do not extract the videos of a playlist, only list them
+.TP
+--no-flat-playlist
+Fully extract the videos of a playlist (default)
+.TP
+--live-from-start
+Download livestreams from the start.
+Currently only supported for YouTube (Experimental)
+.TP
+--no-live-from-start
+Download livestreams from the current time (default)
+.TP
+--wait-for-video \f[I]MIN[-MAX]\f[R]
+Wait for scheduled streams to become available.
+Pass the minimum number of seconds (or range) to wait between retries
+.TP
+--no-wait-for-video
+Do not wait for scheduled streams (default)
+.TP
+--mark-watched
+Mark videos watched (even with --simulate)
+.TP
+--no-mark-watched
+Do not mark videos watched (default)
+.TP
+--color \f[I][STREAM:]POLICY\f[R]
+Whether to emit color codes in output, optionally prefixed by the STREAM
+(stdout or stderr) to apply the setting to.
+Can be one of \[dq]always\[dq], \[dq]auto\[dq] (default),
+\[dq]never\[dq], or \[dq]no_color\[dq] (use non color terminal
+sequences).
+Can be used multiple times
+.TP
+--compat-options \f[I]OPTS\f[R]
+Options that can help keep compatibility with youtube-dl or youtube-dlc
+configurations by reverting some of the changes made in yt-dlp.
+See \[dq]Differences in default behavior\[dq] for details
+.TP
+--alias \f[I]ALIASES OPTIONS\f[R]
+Create aliases for an option string.
+Unless an alias starts with a dash \[dq]-\[dq], it is prefixed with
+\[dq]--\[dq].
+Arguments are parsed according to the Python string formatting
+mini-language.
+E.g.
+--alias get-audio,-X \[dq]-S=aext:{0},abr -x --audio-format {0}\[dq]
+creates options \[dq]--get-audio\[dq] and \[dq]-X\[dq] that takes an
+argument (ARG0) and expands to \[dq]-S=aext:ARG0,abr -x --audio-format
+ARG0\[dq].
+All defined aliases are listed in the --help output.
+Alias options can trigger more aliases; so be careful to avoid defining
+recursive options.
+As a safety measure, each alias may be triggered a maximum of 100 times.
+This option can be used multiple times
+.SS Network Options:
+.TP
+--proxy \f[I]URL\f[R]
+Use the specified HTTP/HTTPS/SOCKS proxy.
+To enable SOCKS proxy, specify a proper scheme, e.g.
+socks5://user:pass\[at]127.0.0.1:1080/.
+Pass in an empty string (--proxy \[dq]\[dq]) for direct connection
+.TP
+--socket-timeout \f[I]SECONDS\f[R]
+Time to wait before giving up, in seconds
+.TP
+--source-address \f[I]IP\f[R]
+Client-side IP address to bind to
+.TP
+-4, --force-ipv4
+Make all connections via IPv4
+.TP
+-6, --force-ipv6
+Make all connections via IPv6
+.TP
+--enable-file-urls
+Enable file:// URLs.
+This is disabled by default for security reasons.
+.SS Geo-restriction:
+.TP
+--geo-verification-proxy \f[I]URL\f[R]
+Use this proxy to verify the IP address for some geo-restricted sites.
+The default proxy specified by --proxy (or none, if the option is not
+present) is used for the actual downloading
+.TP
+--xff \f[I]VALUE\f[R]
+How to fake X-Forwarded-For HTTP header to try bypassing geographic
+restriction.
+One of \[dq]default\[dq] (only when known to be useful),
+\[dq]never\[dq], an IP block in CIDR notation, or a two-letter ISO
+3166-2 country code
+.SS Video Selection:
+.TP
+-I, --playlist-items \f[I]ITEM_SPEC\f[R]
+Comma separated playlist_index of the items to download.
+You can specify a range using \[dq][START]:[STOP][:STEP]\[dq].
+For backward compatibility, START-STOP is also supported.
+Use negative indices to count from the right and negative STEP to
+download in reverse order.
+E.g.
+\[dq]-I 1:3,7,-5::2\[dq] used on a playlist of size 15 will download the
+items at index 1,2,3,7,11,13,15
+.TP
+--min-filesize \f[I]SIZE\f[R]
+Abort download if filesize is smaller than SIZE, e.g.
+50k or 44.6M
+.TP
+--max-filesize \f[I]SIZE\f[R]
+Abort download if filesize is larger than SIZE, e.g.
+50k or 44.6M
+.TP
+--date \f[I]DATE\f[R]
+Download only videos uploaded on this date.
+The date can be \[dq]YYYYMMDD\[dq] or in the format
+[now|today|yesterday][-N[day|week|month|year]].
+E.g.
+\[dq]--date today-2weeks\[dq] downloads only videos uploaded on the same
+day two weeks ago
+.TP
+--datebefore \f[I]DATE\f[R]
+Download only videos uploaded on or before this date.
+The date formats accepted is the same as --date
+.TP
+--dateafter \f[I]DATE\f[R]
+Download only videos uploaded on or after this date.
+The date formats accepted is the same as --date
+.TP
+--match-filters \f[I]FILTER\f[R]
+Generic video filter.
+Any \[dq]OUTPUT TEMPLATE\[dq] field can be compared with a number or a
+string using the operators defined in \[dq]Filtering Formats\[dq].
+You can also simply specify a field to match if the field is present,
+use \[dq]!field\[dq] to check if the field is not present, and
+\[dq]&\[dq] to check multiple conditions.
+Use a \[dq]\[dq] to escape \[dq]&\[dq] or quotes if needed.
+If used multiple times, the filter matches if atleast one of the
+conditions are met.
+E.g.
+--match-filter !is_live --match-filter \[dq]like_count>?100 &
+description\[ti]=\[aq](?i)& dogs\[dq] matches only videos that are not
+live OR those that have a like count more than 100 (or the like field is
+not available) and also has a description that contains the phrase
+\[dq]cats & dogs\[dq] (caseless).
+Use \[dq]--match-filter -\[dq] to interactively ask whether to download
+each video
+.TP
+--no-match-filters
+Do not use any --match-filter (default)
+.TP
+--break-match-filters \f[I]FILTER\f[R]
+Same as \[dq]--match-filters\[dq] but stops the download process when a
+video is rejected
+.TP
+--no-break-match-filters
+Do not use any --break-match-filters (default)
+.TP
+--no-playlist
+Download only the video, if the URL refers to a video and a playlist
+.TP
+--yes-playlist
+Download the playlist, if the URL refers to a video and a playlist
+.TP
+--age-limit \f[I]YEARS\f[R]
+Download only videos suitable for the given age
+.TP
+--download-archive \f[I]FILE\f[R]
+Download only videos not listed in the archive file.
+Record the IDs of all downloaded videos in it
+.TP
+--no-download-archive
+Do not use archive file (default)
+.TP
+--max-downloads \f[I]NUMBER\f[R]
+Abort after downloading NUMBER files
+.TP
+--break-on-existing
+Stop the download process when encountering a file that is in the
+archive
+.TP
+--break-per-input
+Alters --max-downloads, --break-on-existing, --break-match-filter, and
+autonumber to reset per input URL
+.TP
+--no-break-per-input
+--break-on-existing and similar options terminates the entire download
+queue
+.TP
+--skip-playlist-after-errors \f[I]N\f[R]
+Number of allowed failures until the rest of the playlist is skipped
+.SS Download Options:
+.TP
+-N, --concurrent-fragments \f[I]N\f[R]
+Number of fragments of a dash/hlsnative video that should be downloaded
+concurrently (default is 1)
+.TP
+-r, --limit-rate \f[I]RATE\f[R]
+Maximum download rate in bytes per second, e.g.
+50K or 4.2M
+.TP
+--throttled-rate \f[I]RATE\f[R]
+Minimum download rate in bytes per second below which throttling is
+assumed and the video data is re-extracted, e.g.
+100K
+.TP
+-R, --retries \f[I]RETRIES\f[R]
+Number of retries (default is 10), or \[dq]infinite\[dq]
+.TP
+--file-access-retries \f[I]RETRIES\f[R]
+Number of times to retry on file access error (default is 3), or
+\[dq]infinite\[dq]
+.TP
+--fragment-retries \f[I]RETRIES\f[R]
+Number of retries for a fragment (default is 10), or \[dq]infinite\[dq]
+(DASH, hlsnative and ISM)
+.TP
+--retry-sleep \f[I][TYPE:]EXPR\f[R]
+Time to sleep between retries in seconds (optionally) prefixed by the
+type of retry (http (default), fragment, file_access, extractor) to
+apply the sleep to.
+EXPR can be a number, linear=START[:END[:STEP=1]] or
+exp=START[:END[:BASE=2]].
+This option can be used multiple times to set the sleep for the
+different retry types, e.g.
+--retry-sleep linear=1::2 --retry-sleep fragment:exp=1:20
+.TP
+--skip-unavailable-fragments
+Skip unavailable fragments for DASH, hlsnative and ISM downloads
+(default) (Alias: --no-abort-on-unavailable-fragments)
+.TP
+--abort-on-unavailable-fragments
+Abort download if a fragment is unavailable (Alias:
+--no-skip-unavailable-fragments)
+.TP
+--keep-fragments
+Keep downloaded fragments on disk after downloading is finished
+.TP
+--no-keep-fragments
+Delete downloaded fragments after downloading is finished (default)
+.TP
+--buffer-size \f[I]SIZE\f[R]
+Size of download buffer, e.g.
+1024 or 16K (default is 1024)
+.TP
+--resize-buffer
+The buffer size is automatically resized from an initial value of
+--buffer-size (default)
+.TP
+--no-resize-buffer
+Do not automatically adjust the buffer size
+.TP
+--http-chunk-size \f[I]SIZE\f[R]
+Size of a chunk for chunk-based HTTP downloading, e.g.
+10485760 or 10M (default is disabled).
+May be useful for bypassing bandwidth throttling imposed by a webserver
+(experimental)
+.TP
+--playlist-random
+Download playlist videos in random order
+.TP
+--lazy-playlist
+Process entries in the playlist as they are received.
+This disables n_entries, --playlist-random and --playlist-reverse
+.TP
+--no-lazy-playlist
+Process videos in the playlist only after the entire playlist is parsed
+(default)
+.TP
+--xattr-set-filesize
+Set file xattribute ytdl.filesize with expected file size
+.TP
+--hls-use-mpegts
+Use the mpegts container for HLS videos; allowing some players to play
+the video while downloading, and reducing the chance of file corruption
+if download is interrupted.
+This is enabled by default for live streams
+.TP
+--no-hls-use-mpegts
+Do not use the mpegts container for HLS videos.
+This is default when not downloading live streams
+.TP
+--download-sections \f[I]REGEX\f[R]
+Download only chapters that match the regular expression.
+A \[dq]\f[I]\[dq] prefix denotes time-range instead of chapter. Negative
+timestamps are calculated from the end. \[dq]\f[R]from-url\[dq] can be
+used to download between the \[dq]start_time\[dq] and \[dq]end_time\[dq]
+extracted from the URL.
+Needs ffmpeg.
+This option can be used multiple times to download multiple sections,
+e.g.
+--download-sections \[dq]*10:15-inf\[dq] --download-sections
+\[dq]intro\[dq]
+.TP
+--downloader \f[I][PROTO:]NAME\f[R]
+Name or path of the external downloader to use (optionally) prefixed by
+the protocols (http, ftp, m3u8, dash, rstp, rtmp, mms) to use it for.
+Currently supports native, aria2c, avconv, axel, curl, ffmpeg, httpie,
+wget.
+You can use this option multiple times to set different downloaders for
+different protocols.
+E.g.
+--downloader aria2c --downloader \[dq]dash,m3u8:native\[dq] will use
+aria2c for http/ftp downloads, and the native downloader for dash/m3u8
+downloads (Alias: --external-downloader)
+.TP
+--downloader-args \f[I]NAME:ARGS\f[R]
+Give these arguments to the external downloader.
+Specify the downloader name and the arguments separated by a colon
+\[dq]:\[dq].
+For ffmpeg, arguments can be passed to different positions using the
+same syntax as --postprocessor-args.
+You can use this option multiple times to give different arguments to
+different downloaders (Alias: --external-downloader-args)
+.SS Filesystem Options:
+.TP
+-a, --batch-file \f[I]FILE\f[R]
+File containing URLs to download (\[dq]-\[dq] for stdin), one URL per
+line.
+Lines starting with \[dq]#\[dq], \[dq];\[dq] or \[dq]]\[dq] are
+considered as comments and ignored
+.TP
+--no-batch-file
+Do not read URLs from batch file (default)
+.TP
+-P, --paths \f[I][TYPES:]PATH\f[R]
+The paths where the files should be downloaded.
+Specify the type of file and the path separated by a colon \[dq]:\[dq].
+All the same TYPES as --output are supported.
+Additionally, you can also provide \[dq]home\[dq] (default) and
+\[dq]temp\[dq] paths.
+All intermediary files are first downloaded to the temp path and then
+the final files are moved over to the home path after download is
+finished.
+This option is ignored if --output is an absolute path
+.TP
+-o, --output \f[I][TYPES:]TEMPLATE\f[R]
+Output filename template; see \[dq]OUTPUT TEMPLATE\[dq] for details
+.TP
+--output-na-placeholder \f[I]TEXT\f[R]
+Placeholder for unavailable fields in \[dq]OUTPUT TEMPLATE\[dq]
+(default: \[dq]NA\[dq])
+.TP
+--restrict-filenames
+Restrict filenames to only ASCII characters, and avoid \[dq]&\[dq] and
+spaces in filenames
+.TP
+--no-restrict-filenames
+Allow Unicode characters, \[dq]&\[dq] and spaces in filenames (default)
+.TP
+--windows-filenames
+Force filenames to be Windows-compatible
+.TP
+--no-windows-filenames
+Make filenames Windows-compatible only if using Windows (default)
+.TP
+--trim-filenames \f[I]LENGTH\f[R]
+Limit the filename length (excluding extension) to the specified number
+of characters
+.TP
+-w, --no-overwrites
+Do not overwrite any files
+.TP
+--force-overwrites
+Overwrite all video and metadata files.
+This option includes --no-continue
+.TP
+--no-force-overwrites
+Do not overwrite the video, but overwrite related files (default)
+.TP
+-c, --continue
+Resume partially downloaded files/fragments (default)
+.TP
+--no-continue
+Do not resume partially downloaded fragments.
+If the file is not fragmented, restart download of the entire file
+.TP
+--part
+Use .part files instead of writing directly into output file (default)
+.TP
+--no-part
+Do not use .part files - write directly into output file
+.TP
+--mtime
+Use the Last-modified header to set the file modification time (default)
+.TP
+--no-mtime
+Do not use the Last-modified header to set the file modification time
+.TP
+--write-description
+Write video description to a .description file
+.TP
+--no-write-description
+Do not write video description (default)
+.TP
+--write-info-json
+Write video metadata to a .info.json file (this may contain personal
+information)
+.TP
+--no-write-info-json
+Do not write video metadata (default)
+.TP
+--write-playlist-metafiles
+Write playlist metadata in addition to the video metadata when using
+--write-info-json, --write-description etc.
+(default)
+.TP
+--no-write-playlist-metafiles
+Do not write playlist metadata when using --write-info-json,
+--write-description etc.
+.TP
+--clean-info-json
+Remove some internal metadata such as filenames from the infojson
+(default)
+.TP
+--no-clean-info-json
+Write all fields to the infojson
+.TP
+--write-comments
+Retrieve video comments to be placed in the infojson.
+The comments are fetched even without this option if the extraction is
+known to be quick (Alias: --get-comments)
+.TP
+--no-write-comments
+Do not retrieve video comments unless the extraction is known to be
+quick (Alias: --no-get-comments)
+.TP
+--load-info-json \f[I]FILE\f[R]
+JSON file containing the video information (created with the
+\[dq]--write-info-json\[dq] option)
+.TP
+--cookies \f[I]FILE\f[R]
+Netscape formatted file to read cookies from and dump cookie jar in
+.TP
+--no-cookies
+Do not read/dump cookies from/to file (default)
+.TP
+--cookies-from-browser \f[I]BROWSER[+KEYRING][:PROFILE][::CONTAINER]\f[R]
+The name of the browser to load cookies from.
+Currently supported browsers are: brave, chrome, chromium, edge,
+firefox, opera, safari, vivaldi.
+Optionally, the KEYRING used for decrypting Chromium cookies on Linux,
+the name/path of the PROFILE to load cookies from, and the CONTAINER
+name (if Firefox) (\[dq]none\[dq] for no container) can be given with
+their respective seperators.
+By default, all containers of the most recently accessed profile are
+used.
+Currently supported keyrings are: basictext, gnomekeyring, kwallet,
+kwallet5, kwallet6
+.TP
+--no-cookies-from-browser
+Do not load cookies from browser (default)
+.TP
+--cache-dir \f[I]DIR\f[R]
+Location in the filesystem where yt-dlp can store some downloaded
+information (such as client ids and signatures) permanently.
+By default ${XDG_CACHE_HOME}/yt-dlp
+.TP
+--no-cache-dir
+Disable filesystem caching
+.TP
+--rm-cache-dir
+Delete all filesystem cache files
+.SS Thumbnail Options:
+.TP
+--write-thumbnail
+Write thumbnail image to disk
+.TP
+--no-write-thumbnail
+Do not write thumbnail image to disk (default)
+.TP
+--write-all-thumbnails
+Write all thumbnail image formats to disk
+.TP
+--list-thumbnails
+List available thumbnails of each video.
+Simulate unless --no-simulate is used
+.SS Internet Shortcut Options:
+.TP
+--write-link
+Write an internet shortcut file, depending on the current platform
+(.url, .webloc or .desktop).
+The URL may be cached by the OS
+.TP
+--write-url-link
+Write a .url Windows internet shortcut.
+The OS caches the URL based on the file path
+.TP
+--write-webloc-link
+Write a .webloc macOS internet shortcut
+.TP
+--write-desktop-link
+Write a .desktop Linux internet shortcut
+.SS Verbosity and Simulation Options:
+.TP
+-q, --quiet
+Activate quiet mode.
+If used with --verbose, print the log to stderr
+.TP
+--no-quiet
+Deactivate quiet mode.
+(Default)
+.TP
+--no-warnings
+Ignore warnings
+.TP
+-s, --simulate
+Do not download the video and do not write anything to disk
+.TP
+--no-simulate
+Download the video even if printing/listing options are used
+.TP
+--ignore-no-formats-error
+Ignore \[dq]No video formats\[dq] error.
+Useful for extracting metadata even if the videos are not actually
+available for download (experimental)
+.TP
+--no-ignore-no-formats-error
+Throw error when no downloadable video formats are found (default)
+.TP
+--skip-download
+Do not download the video but write all related files (Alias:
+--no-download)
+.TP
+-O, --print \f[I][WHEN:]TEMPLATE\f[R]
+Field name or output template to print to screen, optionally prefixed
+with when to print it, separated by a \[dq]:\[dq].
+Supported values of \[dq]WHEN\[dq] are the same as that of
+--use-postprocessor (default: video).
+Implies --quiet.
+Implies --simulate unless --no-simulate or later stages of WHEN are
+used.
+This option can be used multiple times
+.TP
+--print-to-file \f[I][WHEN:]TEMPLATE FILE\f[R]
+Append given template to the file.
+The values of WHEN and TEMPLATE are same as that of --print.
+FILE uses the same syntax as the output template.
+This option can be used multiple times
+.TP
+-j, --dump-json
+Quiet, but print JSON information for each video.
+Simulate unless --no-simulate is used.
+See \[dq]OUTPUT TEMPLATE\[dq] for a description of available keys
+.TP
+-J, --dump-single-json
+Quiet, but print JSON information for each url or infojson passed.
+Simulate unless --no-simulate is used.
+If the URL refers to a playlist, the whole playlist information is
+dumped in a single line
+.TP
+--force-write-archive
+Force download archive entries to be written as far as no errors occur,
+even if -s or another simulation option is used (Alias:
+--force-download-archive)
+.TP
+--newline
+Output progress bar as new lines
+.TP
+--no-progress
+Do not print progress bar
+.TP
+--progress
+Show progress bar, even if in quiet mode
+.TP
+--console-title
+Display progress in console titlebar
+.TP
+--progress-template \f[I][TYPES:]TEMPLATE\f[R]
+Template for progress outputs, optionally prefixed with one of
+\[dq]download:\[dq] (default), \[dq]download-title:\[dq] (the console
+title), \[dq]postprocess:\[dq], or \[dq]postprocess-title:\[dq].
+The video\[aq]s fields are accessible under the \[dq]info\[dq] key and
+the progress attributes are accessible under \[dq]progress\[dq] key.
+E.g.
+--console-title --progress-template
+\[dq]download-title:%(info.id)s-%(progress.eta)s\[dq]
+.TP
+-v, --verbose
+Print various debugging information
+.TP
+--dump-pages
+Print downloaded pages encoded using base64 to debug problems (very
+verbose)
+.TP
+--write-pages
+Write downloaded intermediary pages to files in the current directory to
+debug problems
+.TP
+--print-traffic
+Display sent and read HTTP traffic
+.SS Workarounds:
+.TP
+--encoding \f[I]ENCODING\f[R]
+Force the specified encoding (experimental)
+.TP
+--legacy-server-connect
+Explicitly allow HTTPS connection to servers that do not support RFC
+5746 secure renegotiation
+.TP
+--no-check-certificates
+Suppress HTTPS certificate validation
+.TP
+--prefer-insecure
+Use an unencrypted connection to retrieve information about the video
+(Currently supported only for YouTube)
+.TP
+--add-headers \f[I]FIELD:VALUE\f[R]
+Specify a custom HTTP header and its value, separated by a colon
+\[dq]:\[dq].
+You can use this option multiple times
+.TP
+--bidi-workaround
+Work around terminals that lack bidirectional text support.
+Requires bidiv or fribidi executable in PATH
+.TP
+--sleep-requests \f[I]SECONDS\f[R]
+Number of seconds to sleep between requests during data extraction
+.TP
+--sleep-interval \f[I]SECONDS\f[R]
+Number of seconds to sleep before each download.
+This is the minimum time to sleep when used along with
+--max-sleep-interval (Alias: --min-sleep-interval)
+.TP
+--max-sleep-interval \f[I]SECONDS\f[R]
+Maximum number of seconds to sleep.
+Can only be used along with --min-sleep-interval
+.TP
+--sleep-subtitles \f[I]SECONDS\f[R]
+Number of seconds to sleep before each subtitle download
+.SS Video Format Options:
+.TP
+-f, --format \f[I]FORMAT\f[R]
+Video format code, see \[dq]FORMAT SELECTION\[dq] for more details
+.TP
+-S, --format-sort \f[I]SORTORDER\f[R]
+Sort the formats by the fields given, see \[dq]Sorting Formats\[dq] for
+more details
+.TP
+--format-sort-force
+Force user specified sort order to have precedence over all fields, see
+\[dq]Sorting Formats\[dq] for more details (Alias: --S-force)
+.TP
+--no-format-sort-force
+Some fields have precedence over the user specified sort order (default)
+.TP
+--video-multistreams
+Allow multiple video streams to be merged into a single file
+.TP
+--no-video-multistreams
+Only one video stream is downloaded for each output file (default)
+.TP
+--audio-multistreams
+Allow multiple audio streams to be merged into a single file
+.TP
+--no-audio-multistreams
+Only one audio stream is downloaded for each output file (default)
+.TP
+--prefer-free-formats
+Prefer video formats with free containers over non-free ones of same
+quality.
+Use with \[dq]-S ext\[dq] to strictly prefer free containers
+irrespective of quality
+.TP
+--no-prefer-free-formats
+Don\[aq]t give any special preference to free containers (default)
+.TP
+--check-formats
+Make sure formats are selected only from those that are actually
+downloadable
+.TP
+--check-all-formats
+Check all formats for whether they are actually downloadable
+.TP
+--no-check-formats
+Do not check that the formats are actually downloadable
+.TP
+-F, --list-formats
+List available formats of each video.
+Simulate unless --no-simulate is used
+.TP
+--merge-output-format \f[I]FORMAT\f[R]
+Containers that may be used when merging formats, separated by
+\[dq]/\[dq], e.g.
+\[dq]mp4/mkv\[dq].
+Ignored if no merge is required.
+(currently supported: avi, flv, mkv, mov, mp4, webm)
+.SS Subtitle Options:
+.TP
+--write-subs
+Write subtitle file
+.TP
+--no-write-subs
+Do not write subtitle file (default)
+.TP
+--write-auto-subs
+Write automatically generated subtitle file (Alias:
+--write-automatic-subs)
+.TP
+--no-write-auto-subs
+Do not write auto-generated subtitles (default) (Alias:
+--no-write-automatic-subs)
+.TP
+--list-subs
+List available subtitles of each video.
+Simulate unless --no-simulate is used
+.TP
+--sub-format \f[I]FORMAT\f[R]
+Subtitle format; accepts formats preference, e.g.
+\[dq]srt\[dq] or \[dq]ass/srt/best\[dq]
+.TP
+--sub-langs \f[I]LANGS\f[R]
+Languages of the subtitles to download (can be regex) or \[dq]all\[dq]
+separated by commas, e.g.
+--sub-langs \[dq]en.*,ja\[dq].
+You can prefix the language code with a \[dq]-\[dq] to exclude it from
+the requested languages, e.g.
+--sub-langs all,-live_chat.
+Use --list-subs for a list of available language tags
+.SS Authentication Options:
+.TP
+-u, --username \f[I]USERNAME\f[R]
+Login with this account ID
+.TP
+-p, --password \f[I]PASSWORD\f[R]
+Account password.
+If this option is left out, yt-dlp will ask interactively
+.TP
+-2, --twofactor \f[I]TWOFACTOR\f[R]
+Two-factor authentication code
+.TP
+-n, --netrc
+Use .netrc authentication data
+.TP
+--netrc-location \f[I]PATH\f[R]
+Location of .netrc authentication data; either the path or its
+containing directory.
+Defaults to \[ti]/.netrc
+.TP
+--netrc-cmd \f[I]NETRC_CMD\f[R]
+Command to execute to get the credentials for an extractor.
+.TP
+--video-password \f[I]PASSWORD\f[R]
+Video-specific password
+.TP
+--ap-mso \f[I]MSO\f[R]
+Adobe Pass multiple-system operator (TV provider) identifier, use
+--ap-list-mso for a list of available MSOs
+.TP
+--ap-username \f[I]USERNAME\f[R]
+Multiple-system operator account login
+.TP
+--ap-password \f[I]PASSWORD\f[R]
+Multiple-system operator account password.
+If this option is left out, yt-dlp will ask interactively
+.TP
+--ap-list-mso
+List all supported multiple-system operators
+.TP
+--client-certificate \f[I]CERTFILE\f[R]
+Path to client certificate file in PEM format.
+May include the private key
+.TP
+--client-certificate-key \f[I]KEYFILE\f[R]
+Path to private key file for client certificate
+.TP
+--client-certificate-password \f[I]PASSWORD\f[R]
+Password for client certificate private key, if encrypted.
+If not provided, and the key is encrypted, yt-dlp will ask interactively
+.SS Post-Processing Options:
+.TP
+-x, --extract-audio
+Convert video files to audio-only files (requires ffmpeg and ffprobe)
+.TP
+--audio-format \f[I]FORMAT\f[R]
+Format to convert the audio to when -x is used.
+(currently supported: best (default), aac, alac, flac, m4a, mp3, opus,
+vorbis, wav).
+You can specify multiple rules using similar syntax as --remux-video
+.TP
+--audio-quality \f[I]QUALITY\f[R]
+Specify ffmpeg audio quality to use when converting the audio with -x.
+Insert a value between 0 (best) and 10 (worst) for VBR or a specific
+bitrate like 128K (default 5)
+.TP
+--remux-video \f[I]FORMAT\f[R]
+Remux the video into another container if necessary (currently
+supported: avi, flv, gif, mkv, mov, mp4, webm, aac, aiff, alac, flac,
+m4a, mka, mp3, ogg, opus, vorbis, wav).
+If target container does not support the video/audio codec, remuxing
+will fail.
+You can specify multiple rules; e.g.
+\[dq]aac>m4a/mov>mp4/mkv\[dq] will remux aac to m4a, mov to mp4 and
+anything else to mkv
+.TP
+--recode-video \f[I]FORMAT\f[R]
+Re-encode the video into another format if necessary.
+The syntax and supported formats are the same as --remux-video
+.TP
+--postprocessor-args \f[I]NAME:ARGS\f[R]
+Give these arguments to the postprocessors.
+Specify the postprocessor/executable name and the arguments separated by
+a colon \[dq]:\[dq] to give the argument to the specified
+postprocessor/executable.
+Supported PP are: Merger, ModifyChapters, SplitChapters, ExtractAudio,
+VideoRemuxer, VideoConvertor, Metadata, EmbedSubtitle, EmbedThumbnail,
+SubtitlesConvertor, ThumbnailsConvertor, FixupStretched, FixupM4a,
+FixupM3u8, FixupTimestamp and FixupDuration.
+The supported executables are: AtomicParsley, FFmpeg and FFprobe.
+You can also specify \[dq]PP+EXE:ARGS\[dq] to give the arguments to the
+specified executable only when being used by the specified
+postprocessor.
+Additionally, for ffmpeg/ffprobe, \[dq]_i\[dq]/\[dq]_o\[dq] can be
+appended to the prefix optionally followed by a number to pass the
+argument before the specified input/output file, e.g.
+--ppa \[dq]Merger+ffmpeg_i1:-v quiet\[dq].
+You can use this option multiple times to give different arguments to
+different postprocessors.
+(Alias: --ppa)
+.TP
+-k, --keep-video
+Keep the intermediate video file on disk after post-processing
+.TP
+--no-keep-video
+Delete the intermediate video file after post-processing (default)
+.TP
+--post-overwrites
+Overwrite post-processed files (default)
+.TP
+--no-post-overwrites
+Do not overwrite post-processed files
+.TP
+--embed-subs
+Embed subtitles in the video (only for mp4, webm and mkv videos)
+.TP
+--no-embed-subs
+Do not embed subtitles (default)
+.TP
+--embed-thumbnail
+Embed thumbnail in the video as cover art
+.TP
+--no-embed-thumbnail
+Do not embed thumbnail (default)
+.TP
+--embed-metadata
+Embed metadata to the video file.
+Also embeds chapters/infojson if present unless
+--no-embed-chapters/--no-embed-info-json are used (Alias:
+--add-metadata)
+.TP
+--no-embed-metadata
+Do not add metadata to file (default) (Alias: --no-add-metadata)
+.TP
+--embed-chapters
+Add chapter markers to the video file (Alias: --add-chapters)
+.TP
+--no-embed-chapters
+Do not add chapter markers (default) (Alias: --no-add-chapters)
+.TP
+--embed-info-json
+Embed the infojson as an attachment to mkv/mka video files
+.TP
+--no-embed-info-json
+Do not embed the infojson as an attachment to the video file
+.TP
+--parse-metadata \f[I][WHEN:]FROM:TO\f[R]
+Parse additional metadata like title/artist from other fields; see
+\[dq]MODIFYING METADATA\[dq] for details.
+Supported values of \[dq]WHEN\[dq] are the same as that of
+--use-postprocessor (default: pre_process)
+.TP
+--replace-in-metadata \f[I][WHEN:]FIELDS REGEX REPLACE\f[R]
+Replace text in a metadata field using the given regex.
+This option can be used multiple times.
+Supported values of \[dq]WHEN\[dq] are the same as that of
+--use-postprocessor (default: pre_process)
+.TP
+--xattrs
+Write metadata to the video file\[aq]s xattrs (using dublin core and xdg
+standards)
+.TP
+--concat-playlist \f[I]POLICY\f[R]
+Concatenate videos in a playlist.
+One of \[dq]never\[dq], \[dq]always\[dq], or \[dq]multi_video\[dq]
+(default; only when the videos form a single show).
+All the video files must have same codecs and number of streams to be
+concatable.
+The \[dq]pl_video:\[dq] prefix can be used with \[dq]--paths\[dq] and
+\[dq]--output\[dq] to set the output filename for the concatenated
+files.
+See \[dq]OUTPUT TEMPLATE\[dq] for details
+.TP
+--fixup \f[I]POLICY\f[R]
+Automatically correct known faults of the file.
+One of never (do nothing), warn (only emit a warning), detect_or_warn
+(the default; fix file if we can, warn otherwise), force (try fixing
+even if file already exists)
+.TP
+--ffmpeg-location \f[I]PATH\f[R]
+Location of the ffmpeg binary; either the path to the binary or its
+containing directory
+.TP
+--exec \f[I][WHEN:]CMD\f[R]
+Execute a command, optionally prefixed with when to execute it,
+separated by a \[dq]:\[dq].
+Supported values of \[dq]WHEN\[dq] are the same as that of
+--use-postprocessor (default: after_move).
+Same syntax as the output template can be used to pass any field as
+arguments to the command.
+If no fields are passed, %(filepath,_filename|)q is appended to the end
+of the command.
+This option can be used multiple times
+.TP
+--no-exec
+Remove any previously defined --exec
+.TP
+--convert-subs \f[I]FORMAT\f[R]
+Convert the subtitles to another format (currently supported: ass, lrc,
+srt, vtt) (Alias: --convert-subtitles)
+.TP
+--convert-thumbnails \f[I]FORMAT\f[R]
+Convert the thumbnails to another format (currently supported: jpg, png,
+webp).
+You can specify multiple rules using similar syntax as --remux-video
+.TP
+--split-chapters
+Split video into multiple files based on internal chapters.
+The \[dq]chapter:\[dq] prefix can be used with \[dq]--paths\[dq] and
+\[dq]--output\[dq] to set the output filename for the split files.
+See \[dq]OUTPUT TEMPLATE\[dq] for details
+.TP
+--no-split-chapters
+Do not split video based on chapters (default)
+.TP
+--remove-chapters \f[I]REGEX\f[R]
+Remove chapters whose title matches the given regular expression.
+The syntax is the same as --download-sections.
+This option can be used multiple times
+.TP
+--no-remove-chapters
+Do not remove any chapters from the file (default)
+.TP
+--force-keyframes-at-cuts
+Force keyframes at cuts when downloading/splitting/removing sections.
+This is slow due to needing a re-encode, but the resulting video may
+have fewer artifacts around the cuts
+.TP
+--no-force-keyframes-at-cuts
+Do not force keyframes around the chapters when cutting/splitting
+(default)
+.TP
+--use-postprocessor \f[I]NAME[:ARGS]\f[R]
+The (case sensitive) name of plugin postprocessors to be enabled, and
+(optionally) arguments to be passed to it, separated by a colon
+\[dq]:\[dq].
+ARGS are a semicolon \[dq];\[dq] delimited list of NAME=VALUE.
+The \[dq]when\[dq] argument determines when the postprocessor is
+invoked.
+It can be one of \[dq]pre_process\[dq] (after video extraction),
+\[dq]after_filter\[dq] (after video passes filter), \[dq]video\[dq]
+(after --format; before --print/--output), \[dq]before_dl\[dq] (before
+each video download), \[dq]post_process\[dq] (after each video download;
+default), \[dq]after_move\[dq] (after moving video file to it\[aq]s
+final locations), \[dq]after_video\[dq] (after downloading and
+processing all formats of a video), or \[dq]playlist\[dq] (at end of
+playlist).
+This option can be used multiple times to add different postprocessors
+.SS SponsorBlock Options:
+.PP
+Make chapter entries for, or remove various segments (sponsor,
+introductions, etc.) from downloaded YouTube videos using the
+SponsorBlock API (https://sponsor.ajay.app)
+.TP
+--sponsorblock-mark \f[I]CATS\f[R]
+SponsorBlock categories to create chapters for, separated by commas.
+Available categories are sponsor, intro, outro, selfpromo, preview,
+filler, interaction, music_offtopic, poi_highlight, chapter, all and
+default (=all).
+You can prefix the category with a \[dq]-\[dq] to exclude it.
+See [1] for description of the categories.
+E.g.
+--sponsorblock-mark all,-preview [1]
+https://wiki.sponsor.ajay.app/w/Segment_Categories
+.TP
+--sponsorblock-remove \f[I]CATS\f[R]
+SponsorBlock categories to be removed from the video file, separated by
+commas.
+If a category is present in both mark and remove, remove takes
+precedence.
+The syntax and available categories are the same as for
+--sponsorblock-mark except that \[dq]default\[dq] refers to
+\[dq]all,-filler\[dq] and poi_highlight, chapter are not available
+.TP
+--sponsorblock-chapter-title \f[I]TEMPLATE\f[R]
+An output template for the title of the SponsorBlock chapters created by
+--sponsorblock-mark.
+The only available fields are start_time, end_time, category,
+categories, name, category_names.
+Defaults to \[dq][SponsorBlock]: %(category_names)l\[dq]
+.TP
+--no-sponsorblock
+Disable both --sponsorblock-mark and --sponsorblock-remove
+.TP
+--sponsorblock-api \f[I]URL\f[R]
+SponsorBlock API location, defaults to https://sponsor.ajay.app
+.SS Extractor Options:
+.TP
+--extractor-retries \f[I]RETRIES\f[R]
+Number of retries for known extractor errors (default is 3), or
+\[dq]infinite\[dq]
+.TP
+--allow-dynamic-mpd
+Process dynamic DASH manifests (default) (Alias:
+--no-ignore-dynamic-mpd)
+.TP
+--ignore-dynamic-mpd
+Do not process dynamic DASH manifests (Alias: --no-allow-dynamic-mpd)
+.TP
+--hls-split-discontinuity
+Split HLS playlists to different formats at discontinuities such as ad
+breaks
+.TP
+--no-hls-split-discontinuity
+Do not split HLS playlists to different formats at discontinuities such
+as ad breaks (default)
+.TP
+--extractor-args \f[I]IE_KEY:ARGS\f[R]
+Pass ARGS arguments to the IE_KEY extractor.
+See \[dq]EXTRACTOR ARGUMENTS\[dq] for details.
+You can use this option multiple times to give arguments for different
+extractors
+.SH To update to nightly from stable executable/binary:
+.PP
+yt-dlp --update-to nightly
+.SH To install nightly with pip:
+.PP
+python -m pip install -U --pre yt-dlp
+.IP
+.nf
+\f[C]
+
+**Note**: The manpages, shell completion (autocomplete) files etc. are available inside the [source tarball](https://github.com/yt-dlp/yt-dlp/releases/latest/download/yt-dlp.tar.gz)
+
+## DEPENDENCIES
+Python versions 3.8+ (CPython and PyPy) are supported. Other versions and implementations may or may not work correctly.
+
+<!-- Python 3.5+ uses VC++14 and it is already embedded in the binary created
+<!x-- https://www.microsoft.com/en-us/download/details.aspx?id=26999 --x>
+On windows, [Microsoft Visual C++ 2010 SP1 Redistributable Package (x86)](https://download.microsoft.com/download/1/6/5/165255E7-1014-4D0A-B094-B6A430A6BFFC/vcredist_x86.exe) is also necessary to run yt-dlp. You probably already have this, but if the executable throws an error due to missing \[ga]MSVCR100.dll\[ga] you need to install it manually.
+-->
+
+While all the other dependencies are optional, \[ga]ffmpeg\[ga] and \[ga]ffprobe\[ga] are highly recommended
+
+### Strongly recommended
+
+* [**ffmpeg** and **ffprobe**](https://www.ffmpeg.org) - Required for [merging separate video and audio files](#format-selection) as well as for various [post-processing](#post-processing-options) tasks. License [depends on the build](https://www.ffmpeg.org/legal.html)
+
+    There are bugs in ffmpeg that causes various issues when used alongside yt-dlp. Since ffmpeg is such an important dependency, we provide [custom builds](https://github.com/yt-dlp/FFmpeg-Builds#ffmpeg-static-auto-builds) with patches for some of these issues at [yt-dlp/FFmpeg-Builds](https://github.com/yt-dlp/FFmpeg-Builds). See [the readme](https://github.com/yt-dlp/FFmpeg-Builds#patches-applied) for details on the specific issues solved by these builds
+    
+    **Important**: What you need is ffmpeg *binary*, **NOT** [the python package of the same name](https://pypi.org/project/ffmpeg)
+
+### Networking
+* [**certifi**](https://github.com/certifi/python-certifi)\[rs]* - Provides Mozilla\[aq]s root certificate bundle. Licensed under [MPLv2](https://github.com/certifi/python-certifi/blob/master/LICENSE)
+* [**brotli**](https://github.com/google/brotli)\[rs]* or [**brotlicffi**](https://github.com/python-hyper/brotlicffi) - [Brotli](https://en.wikipedia.org/wiki/Brotli) content encoding support. Both licensed under MIT <sup>[1](https://github.com/google/brotli/blob/master/LICENSE) [2](https://github.com/python-hyper/brotlicffi/blob/master/LICENSE) </sup>
+* [**websockets**](https://github.com/aaugustin/websockets)\[rs]* - For downloading over websocket. Licensed under [BSD-3-Clause](https://github.com/aaugustin/websockets/blob/main/LICENSE)
+* [**requests**](https://github.com/psf/requests)\[rs]* - HTTP library. For HTTPS proxy and persistent connections support. Licensed under [Apache-2.0](https://github.com/psf/requests/blob/main/LICENSE)
+
+### Metadata
+
+* [**mutagen**](https://github.com/quodlibet/mutagen)\[rs]* - For \[ga]--embed-thumbnail\[ga] in certain formats. Licensed under [GPLv2+](https://github.com/quodlibet/mutagen/blob/master/COPYING)
+* [**AtomicParsley**](https://github.com/wez/atomicparsley) - For \[ga]--embed-thumbnail\[ga] in \[ga]mp4\[ga]/\[ga]m4a\[ga] files when \[ga]mutagen\[ga]/\[ga]ffmpeg\[ga] cannot. Licensed under [GPLv2+](https://github.com/wez/atomicparsley/blob/master/COPYING)
+* [**xattr**](https://github.com/xattr/xattr), [**pyxattr**](https://github.com/iustin/pyxattr) or [**setfattr**](http://savannah.nongnu.org/projects/attr) - For writing xattr metadata (\[ga]--xattr\[ga]) on **Mac** and **BSD**. Licensed under [MIT](https://github.com/xattr/xattr/blob/master/LICENSE.txt), [LGPL2.1](https://github.com/iustin/pyxattr/blob/master/COPYING) and [GPLv2+](http://git.savannah.nongnu.org/cgit/attr.git/tree/doc/COPYING) respectively
+
+### Misc
+
+* [**pycryptodomex**](https://github.com/Legrandin/pycryptodome)\[rs]* - For decrypting AES-128 HLS streams and various other data. Licensed under [BSD-2-Clause](https://github.com/Legrandin/pycryptodome/blob/master/LICENSE.rst)
+* [**phantomjs**](https://github.com/ariya/phantomjs) - Used in extractors where javascript needs to be run. Licensed under [BSD-3-Clause](https://github.com/ariya/phantomjs/blob/master/LICENSE.BSD)
+* [**secretstorage**](https://github.com/mitya57/secretstorage)\[rs]* - For \[ga]--cookies-from-browser\[ga] to access the **Gnome** keyring while decrypting cookies of **Chromium**-based browsers on **Linux**. Licensed under [BSD-3-Clause](https://github.com/mitya57/secretstorage/blob/master/LICENSE)
+* Any external downloader that you want to use with \[ga]--downloader\[ga]
+
+### Deprecated
+
+* [**avconv** and **avprobe**](https://www.libav.org) - Now **deprecated** alternative to ffmpeg. License [depends on the build](https://libav.org/legal)
+* [**sponskrub**](https://github.com/faissaloo/SponSkrub) - For using the now **deprecated** [sponskrub options](#sponskrub-options). Licensed under [GPLv3+](https://github.com/faissaloo/SponSkrub/blob/master/LICENCE.md)
+* [**rtmpdump**](http://rtmpdump.mplayerhq.hu) - For downloading \[ga]rtmp\[ga] streams. ffmpeg can be used instead with \[ga]--downloader ffmpeg\[ga]. Licensed under [GPLv2+](http://rtmpdump.mplayerhq.hu)
+* [**mplayer**](http://mplayerhq.hu/design7/info.html) or [**mpv**](https://mpv.io) - For downloading \[ga]rstp\[ga]/\[ga]mms\[ga] streams. ffmpeg can be used instead with \[ga]--downloader ffmpeg\[ga]. Licensed under [GPLv2+](https://github.com/mpv-player/mpv/blob/master/Copyright)
+
+To use or redistribute the dependencies, you must agree to their respective licensing terms.
+
+The standalone release binaries are built with the Python interpreter and the packages marked with **\[rs]*** included.
+
+If you do not have the necessary dependencies for a task you are attempting, yt-dlp will warn you. All the currently available dependencies are visible at the top of the \[ga]--verbose\[ga] output
+
+
+## COMPILE
+
+### Standalone PyInstaller Builds
+To build the standalone executable, you must have Python and \[ga]pyinstaller\[ga] (plus any of yt-dlp\[aq]s [optional dependencies](#dependencies) if needed). Once you have all the necessary dependencies installed, simply run \[ga]pyinst.py\[ga]. The executable will be built for the same architecture (x86/ARM, 32/64 bit) as the Python used.
+
+    python3 -m pip install -U pyinstaller -r requirements.txt
+    python3 devscripts/make_lazy_extractors.py
+    python3 pyinst.py
+
+On some systems, you may need to use \[ga]py\[ga] or \[ga]python\[ga] instead of \[ga]python3\[ga].
+
+\[ga]pyinst.py\[ga] accepts any arguments that can be passed to \[ga]pyinstaller\[ga], such as \[ga]--onefile/-F\[ga] or \[ga]--onedir/-D\[ga], which is further [documented here](https://pyinstaller.org/en/stable/usage.html#what-to-generate).
+
+**Note**: Pyinstaller versions below 4.4 [do not support](https://github.com/pyinstaller/pyinstaller#requirements-and-tested-platforms) Python installed from the Windows store without using a virtual environment.
+
+**Important**: Running \[ga]pyinstaller\[ga] directly **without** using \[ga]pyinst.py\[ga] is **not** officially supported. This may or may not work correctly.
+
+### Platform-independent Binary (UNIX)
+You will need the build tools \[ga]python\[ga] (3.8+), \[ga]zip\[ga], \[ga]make\[ga] (GNU), \[ga]pandoc\[ga]\[rs]* and \[ga]pytest\[ga]\[rs]*.
+
+After installing these, simply run \[ga]make\[ga].
+
+You can also run \[ga]make yt-dlp\[ga] instead to compile only the binary without updating any of the additional files. (The build tools marked with **\[rs]*** are not needed for this)
+
+### Standalone Py2Exe Builds (Windows)
+
+While we provide the option to build with [py2exe](https://www.py2exe.org), it is recommended to build [using PyInstaller](#standalone-pyinstaller-builds) instead since the py2exe builds **cannot contain \[ga]pycryptodomex\[ga]/\[ga]certifi\[ga] and needs VC++14** on the target computer to run.
+
+If you wish to build it anyway, install Python and py2exe, and then simply run \[ga]setup.py py2exe\[ga]
+
+    py -m pip install -U py2exe -r requirements.txt
+    py devscripts/make_lazy_extractors.py
+    py setup.py py2exe
+
+### Related scripts
+
+* **\[ga]devscripts/update-version.py\[ga]** - Update the version number based on current date.
+* **\[ga]devscripts/set-variant.py\[ga]** - Set the build variant of the executable.
+* **\[ga]devscripts/make_changelog.py\[ga]** - Create a markdown changelog using short commit messages and update \[ga]CONTRIBUTORS\[ga] file.
+* **\[ga]devscripts/make_lazy_extractors.py\[ga]** - Create lazy extractors. Running this before building the binaries (any variant) will improve their startup performance. Set the environment variable \[ga]YTDLP_NO_LAZY_EXTRACTORS=1\[ga] if you wish to forcefully disable lazy extractor loading.
+
+Note: See their \[ga]--help\[ga] for more info.
+
+### Forking the project
+If you fork the project on GitHub, you can run your fork\[aq]s [build workflow](.github/workflows/build.yml) to automatically build the selected version(s) as artifacts. Alternatively, you can run the [release workflow](.github/workflows/release.yml) or enable the [nightly workflow](.github/workflows/release-nightly.yml) to create full (pre-)releases.
+
+# CONFIGURATION
+
+You can configure yt-dlp by placing any supported command line option to a configuration file. The configuration is loaded from the following locations:
+
+1. **Main Configuration**:
+    * The file given by \[ga]--config-location\[ga]
+1. **Portable Configuration**: (Recommended for portable installations)
+    * If using a binary, \[ga]yt-dlp.conf\[ga] in the same directory as the binary
+    * If running from source-code, \[ga]yt-dlp.conf\[ga] in the parent directory of \[ga]yt_dlp\[ga]
+1. **Home Configuration**:
+    * \[ga]yt-dlp.conf\[ga] in the home path given by \[ga]-P\[ga]
+    * If \[ga]-P\[ga] is not given, the current directory is searched
+1. **User Configuration**:
+    * \[ga]${XDG_CONFIG_HOME}/yt-dlp.conf\[ga]
+    * \[ga]${XDG_CONFIG_HOME}/yt-dlp/config\[ga] (recommended on Linux/macOS)
+    * \[ga]${XDG_CONFIG_HOME}/yt-dlp/config.txt\[ga]
+    * \[ga]${APPDATA}/yt-dlp.conf\[ga]
+    * \[ga]${APPDATA}/yt-dlp/config\[ga] (recommended on Windows)
+    * \[ga]${APPDATA}/yt-dlp/config.txt\[ga]
+    * \[ga]\[ti]/yt-dlp.conf\[ga]
+    * \[ga]\[ti]/yt-dlp.conf.txt\[ga]
+    * \[ga]\[ti]/.yt-dlp/config\[ga]
+    * \[ga]\[ti]/.yt-dlp/config.txt\[ga]
+
+    See also: [Notes about environment variables](#notes-about-environment-variables)
+1. **System Configuration**:
+    * \[ga]/etc/yt-dlp.conf\[ga]
+    * \[ga]/etc/yt-dlp/config\[ga]
+    * \[ga]/etc/yt-dlp/config.txt\[ga]
+
+E.g. with the following configuration file yt-dlp will always extract the audio, not copy the mtime, use a proxy and save all videos under \[ga]YouTube\[ga] directory in your home directory:
+\f[R]
+.fi
+.SH Lines starting with # are comments
+.SH Always extract audio
+.PP
+-x
+.SH Do not copy the mtime
+.PP
+--no-mtime
+.SH Use this proxy
+.PP
+--proxy 127.0.0.1:3128
+.SH Save all videos under YouTube directory in your home directory
+.PP
+-o \[ti]/YouTube/%(title)s.%(ext)s
+.IP
+.nf
+\f[C]
+**Note**: Options in configuration file are just the same options aka switches used in regular command line calls; thus there **must be no whitespace** after \[ga]-\[ga] or \[ga]--\[ga], e.g. \[ga]-o\[ga] or \[ga]--proxy\[ga] but not \[ga]- o\[ga] or \[ga]-- proxy\[ga]. They must also be quoted when necessary as-if it were a UNIX shell.
+
+You can use \[ga]--ignore-config\[ga] if you want to disable all configuration files for a particular yt-dlp run. If \[ga]--ignore-config\[ga] is found inside any configuration file, no further configuration will be loaded. For example, having the option in the portable configuration file prevents loading of home, user, and system configurations. Additionally, (for backward compatibility) if \[ga]--ignore-config\[ga] is found inside the system configuration file, the user configuration is not loaded.
+
+### Configuration file encoding
+
+The configuration files are decoded according to the UTF BOM if present, and in the encoding from system locale otherwise.
+
+If you want your file to be decoded differently, add \[ga]# coding: ENCODING\[ga] to the beginning of the file (e.g. \[ga]# coding: shift-jis\[ga]). There must be no characters before that, even spaces or BOM.
+
+### Authentication with netrc
+
+You may also want to configure automatic credentials storage for extractors that support authentication (by providing login and password with \[ga]--username\[ga] and \[ga]--password\[ga]) in order not to pass credentials as command line arguments on every yt-dlp execution and prevent tracking plain text passwords in the shell command history. You can achieve this using a [\[ga].netrc\[ga] file](https://stackoverflow.com/tags/.netrc/info) on a per-extractor basis. For that you will need to create a \[ga].netrc\[ga] file in \[ga]--netrc-location\[ga] and restrict permissions to read/write by only you:
+\f[R]
+.fi
+.PP
+touch ${HOME}/.netrc chmod a-rwx,u+rw ${HOME}/.netrc
+.IP
+.nf
+\f[C]
+After that you can add credentials for an extractor in the following format, where *extractor* is the name of the extractor in lowercase:
+\f[R]
+.fi
+.PP
+machine login password
+.IP
+.nf
+\f[C]
+E.g.
+\f[R]
+.fi
+.PP
+machine youtube login myaccount\[at]gmail.com password
+my_youtube_password machine twitch login my_twitch_account_name password
+my_twitch_password
+.IP
+.nf
+\f[C]
+To activate authentication with the \[ga].netrc\[ga] file you should pass \[ga]--netrc\[ga] to yt-dlp or place it in the [configuration file](#configuration).
+
+The default location of the .netrc file is \[ga]\[ti]\[ga] (see below).
+
+As an alternative to using the \[ga].netrc\[ga] file, which has the disadvantage of keeping your passwords in a plain text file, you can configure a custom shell command to provide the credentials for an extractor. This is done by providing the \[ga]--netrc-cmd\[ga] parameter, it shall output the credentials in the netrc format and return \[ga]0\[ga] on success, other values will be treated as an error. \[ga]{}\[ga] in the command will be replaced by the name of the extractor to make it possible to select the credentials for the right extractor.
+
+E.g. To use an encrypted \[ga].netrc\[ga] file stored as \[ga].authinfo.gpg\[ga]
+\f[R]
+.fi
+.PP
+yt-dlp --netrc-cmd \[aq]gpg --decrypt \[ti]/.authinfo.gpg\[aq]
+https://www.youtube.com/watch?v=BaW_jenozKc
+.IP
+.nf
+\f[C]
+
+### Notes about environment variables
+* Environment variables are normally specified as \[ga]${VARIABLE}\[ga]/\[ga]$VARIABLE\[ga] on UNIX and \[ga]%VARIABLE%\[ga] on Windows; but is always shown as \[ga]${VARIABLE}\[ga] in this documentation
+* yt-dlp also allow using UNIX-style variables on Windows for path-like options; e.g. \[ga]--output\[ga], \[ga]--config-location\[ga]
+* If unset, \[ga]${XDG_CONFIG_HOME}\[ga] defaults to \[ga]\[ti]/.config\[ga] and \[ga]${XDG_CACHE_HOME}\[ga] to \[ga]\[ti]/.cache\[ga]
+* On Windows, \[ga]\[ti]\[ga] points to \[ga]${HOME}\[ga] if present; or, \[ga]${USERPROFILE}\[ga] or \[ga]${HOMEDRIVE}${HOMEPATH}\[ga] otherwise
+* On Windows, \[ga]${USERPROFILE}\[ga] generally points to \[ga]C:\[rs]Users\[rs]<user name>\[ga] and \[ga]${APPDATA}\[ga] to \[ga]${USERPROFILE}\[rs]AppData\[rs]Roaming\[ga]
+
+# OUTPUT TEMPLATE
+
+The \[ga]-o\[ga] option is used to indicate a template for the output file names while \[ga]-P\[ga] option is used to specify the path each type of file should be saved to.
+
+
+The simplest usage of \[ga]-o\[ga] is not to set any template arguments when downloading a single file, like in \[ga]yt-dlp -o funny_video.flv \[dq]https://some/video\[dq]\[ga] (hard-coding file extension like this is _not_ recommended and could break some post-processing).
+
+It may however also contain special sequences that will be replaced when downloading each video. The special sequences may be formatted according to [Python string formatting operations](https://docs.python.org/3/library/stdtypes.html#printf-style-string-formatting), e.g. \[ga]%(NAME)s\[ga] or \[ga]%(NAME)05d\[ga]. To clarify, that is a percent symbol followed by a name in parentheses, followed by formatting operations.
+
+The field names themselves (the part inside the parenthesis) can also have some special formatting:
+
+1. **Object traversal**: The dictionaries and lists available in metadata can be traversed by using a dot \[ga].\[ga] separator; e.g. \[ga]%(tags.0)s\[ga], \[ga]%(subtitles.en.-1.ext)s\[ga]. You can do Python slicing with colon \[ga]:\[ga]; E.g. \[ga]%(id.3:7:-1)s\[ga], \[ga]%(formats.:.format_id)s\[ga]. Curly braces \[ga]{}\[ga] can be used to build dictionaries with only specific keys; e.g. \[ga]%(formats.:.{format_id,height})#j\[ga]. An empty field name \[ga]%()s\[ga] refers to the entire infodict; e.g. \[ga]%(.{id,title})s\[ga]. Note that all the fields that become available using this method are not listed below. Use \[ga]-j\[ga] to see such fields
+
+1. **Arithmetic**: Simple arithmetic can be done on numeric fields using \[ga]+\[ga], \[ga]-\[ga] and \[ga]*\[ga]. E.g. \[ga]%(playlist_index+10)03d\[ga], \[ga]%(n_entries+1-playlist_index)d\[ga]
+
+1. **Date/time Formatting**: Date/time fields can be formatted according to [strftime formatting](https://docs.python.org/3/library/datetime.html#strftime-and-strptime-format-codes) by specifying it separated from the field name using a \[ga]>\[ga]. E.g. \[ga]%(duration>%H-%M-%S)s\[ga], \[ga]%(upload_date>%Y-%m-%d)s\[ga], \[ga]%(epoch-3600>%H-%M-%S)s\[ga]
+
+1. **Alternatives**: Alternate fields can be specified separated with a \[ga],\[ga]. E.g. \[ga]%(release_date>%Y,upload_date>%Y|Unknown)s\[ga]
+
+1. **Replacement**: A replacement value can be specified using a \[ga]&\[ga] separator according to the [\[ga]str.format\[ga] mini-language](https://docs.python.org/3/library/string.html#format-specification-mini-language). If the field is *not* empty, this replacement value will be used instead of the actual field content. This is done after alternate fields are considered; thus the replacement is used if *any* of the alternative fields is *not* empty. E.g. \[ga]%(chapters&has chapters|no chapters)s\[ga], \[ga]%(title&TITLE={:>20}|NO TITLE)s\[ga]
+
+1. **Default**: A literal default value can be specified for when the field is empty using a \[ga]|\[ga] separator. This overrides \[ga]--output-na-placeholder\[ga]. E.g. \[ga]%(uploader|Unknown)s\[ga]
+
+1. **More Conversions**: In addition to the normal format types \[ga]diouxXeEfFgGcrs\[ga], yt-dlp additionally supports converting to \[ga]B\[ga] = **B**ytes, \[ga]j\[ga] = **j**son (flag \[ga]#\[ga] for pretty-printing, \[ga]+\[ga] for Unicode), \[ga]h\[ga] = HTML escaping, \[ga]l\[ga] = a comma separated **l**ist (flag \[ga]#\[ga] for \[ga]\[rs]n\[ga] newline-separated), \[ga]q\[ga] = a string **q**uoted for the terminal (flag \[ga]#\[ga] to split a list into different arguments), \[ga]D\[ga] = add **D**ecimal suffixes (e.g. 10M) (flag \[ga]#\[ga] to use 1024 as factor), and \[ga]S\[ga] = **S**anitize as filename (flag \[ga]#\[ga] for restricted)
+
+1. **Unicode normalization**: The format type \[ga]U\[ga] can be used for NFC [Unicode normalization](https://docs.python.org/3/library/unicodedata.html#unicodedata.normalize). The alternate form flag (\[ga]#\[ga]) changes the normalization to NFD and the conversion flag \[ga]+\[ga] can be used for NFKC/NFKD compatibility equivalence normalization. E.g. \[ga]%(title)+.100U\[ga] is NFKC
+
+To summarize, the general syntax for a field is:
+\f[R]
+.fi
+.PP
+%(name[.keys][addition][>strf][,alternate][&replacement][|default])[flags][width][.precision][length]type
+.IP
+.nf
+\f[C]
+Additionally, you can set different output templates for the various metadata files separately from the general output template by specifying the type of file followed by the template separated by a colon \[ga]:\[ga]. The different file types supported are \[ga]subtitle\[ga], \[ga]thumbnail\[ga], \[ga]description\[ga], \[ga]annotation\[ga] (deprecated), \[ga]infojson\[ga], \[ga]link\[ga], \[ga]pl_thumbnail\[ga], \[ga]pl_description\[ga], \[ga]pl_infojson\[ga], \[ga]chapter\[ga], \[ga]pl_video\[ga]. E.g. \[ga]-o \[dq]%(title)s.%(ext)s\[dq] -o \[dq]thumbnail:%(title)s\[rs]%(title)s.%(ext)s\[dq]\[ga]  will put the thumbnails in a folder with the same name as the video. If any of the templates is empty, that type of file will not be written. E.g. \[ga]--write-thumbnail -o \[dq]thumbnail:\[dq]\[ga] will write thumbnails only for playlists and not for video.
+
+<a id=\[dq]outtmpl-postprocess-note\[dq]/>
+
+**Note**: Due to post-processing (i.e. merging etc.), the actual output filename might differ. Use \[ga]--print after_move:filepath\[ga] to get the name after all post-processing is complete.
+
+The available fields are:
+
+ - \[ga]id\[ga] (string): Video identifier
+ - \[ga]title\[ga] (string): Video title
+ - \[ga]fulltitle\[ga] (string): Video title ignoring live timestamp and generic title
+ - \[ga]ext\[ga] (string): Video filename extension
+ - \[ga]alt_title\[ga] (string): A secondary title of the video
+ - \[ga]description\[ga] (string): The description of the video
+ - \[ga]display_id\[ga] (string): An alternative identifier for the video
+ - \[ga]uploader\[ga] (string): Full name of the video uploader
+ - \[ga]license\[ga] (string): License name the video is licensed under
+ - \[ga]creator\[ga] (string): The creator of the video
+ - \[ga]timestamp\[ga] (numeric): UNIX timestamp of the moment the video became available
+ - \[ga]upload_date\[ga] (string): Video upload date in UTC (YYYYMMDD)
+ - \[ga]release_timestamp\[ga] (numeric): UNIX timestamp of the moment the video was released
+ - \[ga]release_date\[ga] (string): The date (YYYYMMDD) when the video was released in UTC
+ - \[ga]release_year\[ga] (numeric): Year (YYYY) when the video or album was released
+ - \[ga]modified_timestamp\[ga] (numeric): UNIX timestamp of the moment the video was last modified
+ - \[ga]modified_date\[ga] (string): The date (YYYYMMDD) when the video was last modified in UTC
+ - \[ga]uploader_id\[ga] (string): Nickname or id of the video uploader
+ - \[ga]channel\[ga] (string): Full name of the channel the video is uploaded on
+ - \[ga]channel_id\[ga] (string): Id of the channel
+ - \[ga]channel_follower_count\[ga] (numeric): Number of followers of the channel
+ - \[ga]channel_is_verified\[ga] (boolean): Whether the channel is verified on the platform
+ - \[ga]location\[ga] (string): Physical location where the video was filmed
+ - \[ga]duration\[ga] (numeric): Length of the video in seconds
+ - \[ga]duration_string\[ga] (string): Length of the video (HH:mm:ss)
+ - \[ga]view_count\[ga] (numeric): How many users have watched the video on the platform
+ - \[ga]concurrent_view_count\[ga] (numeric): How many users are currently watching the video on the platform.
+ - \[ga]like_count\[ga] (numeric): Number of positive ratings of the video
+ - \[ga]dislike_count\[ga] (numeric): Number of negative ratings of the video
+ - \[ga]repost_count\[ga] (numeric): Number of reposts of the video
+ - \[ga]average_rating\[ga] (numeric): Average rating give by users, the scale used depends on the webpage
+ - \[ga]comment_count\[ga] (numeric): Number of comments on the video (For some extractors, comments are only downloaded at the end, and so this field cannot be used)
+ - \[ga]age_limit\[ga] (numeric): Age restriction for the video (years)
+ - \[ga]live_status\[ga] (string): One of \[dq]not_live\[dq], \[dq]is_live\[dq], \[dq]is_upcoming\[dq], \[dq]was_live\[dq], \[dq]post_live\[dq] (was live, but VOD is not yet processed)
+ - \[ga]is_live\[ga] (boolean): Whether this video is a live stream or a fixed-length video
+ - \[ga]was_live\[ga] (boolean): Whether this video was originally a live stream
+ - \[ga]playable_in_embed\[ga] (string): Whether this video is allowed to play in embedded players on other sites
+ - \[ga]availability\[ga] (string): Whether the video is \[dq]private\[dq], \[dq]premium_only\[dq], \[dq]subscriber_only\[dq], \[dq]needs_auth\[dq], \[dq]unlisted\[dq] or \[dq]public\[dq]
+ - \[ga]media_type\[ga] (string): The type of media as classified by the site, e.g. \[dq]episode\[dq], \[dq]clip\[dq], \[dq]trailer\[dq]
+ - \[ga]start_time\[ga] (numeric): Time in seconds where the reproduction should start, as specified in the URL
+ - \[ga]end_time\[ga] (numeric): Time in seconds where the reproduction should end, as specified in the URL
+ - \[ga]extractor\[ga] (string): Name of the extractor
+ - \[ga]extractor_key\[ga] (string): Key name of the extractor
+ - \[ga]epoch\[ga] (numeric): Unix epoch of when the information extraction was completed
+ - \[ga]autonumber\[ga] (numeric): Number that will be increased with each download, starting at \[ga]--autonumber-start\[ga], padded with leading zeros to 5 digits
+ - \[ga]video_autonumber\[ga] (numeric): Number that will be increased with each video
+ - \[ga]n_entries\[ga] (numeric): Total number of extracted items in the playlist
+ - \[ga]playlist_id\[ga] (string): Identifier of the playlist that contains the video
+ - \[ga]playlist_title\[ga] (string): Name of the playlist that contains the video
+ - \[ga]playlist\[ga] (string): \[ga]playlist_id\[ga] or \[ga]playlist_title\[ga]
+ - \[ga]playlist_count\[ga] (numeric): Total number of items in the playlist. May not be known if entire playlist is not extracted
+ - \[ga]playlist_index\[ga] (numeric): Index of the video in the playlist padded with leading zeros according the final index
+ - \[ga]playlist_autonumber\[ga] (numeric): Position of the video in the playlist download queue padded with leading zeros according to the total length of the playlist
+ - \[ga]playlist_uploader\[ga] (string): Full name of the playlist uploader
+ - \[ga]playlist_uploader_id\[ga] (string): Nickname or id of the playlist uploader
+ - \[ga]webpage_url\[ga] (string): A URL to the video webpage which if given to yt-dlp should allow to get the same result again
+ - \[ga]webpage_url_basename\[ga] (string): The basename of the webpage URL
+ - \[ga]webpage_url_domain\[ga] (string): The domain of the webpage URL
+ - \[ga]original_url\[ga] (string): The URL given by the user (or same as \[ga]webpage_url\[ga] for playlist entries)
+ 
+All the fields in [Filtering Formats](#filtering-formats) can also be used
+
+Available for the video that belongs to some logical chapter or section:
+
+ - \[ga]chapter\[ga] (string): Name or title of the chapter the video belongs to
+ - \[ga]chapter_number\[ga] (numeric): Number of the chapter the video belongs to
+ - \[ga]chapter_id\[ga] (string): Id of the chapter the video belongs to
+
+Available for the video that is an episode of some series or programme:
+
+ - \[ga]series\[ga] (string): Title of the series or programme the video episode belongs to
+ - \[ga]season\[ga] (string): Title of the season the video episode belongs to
+ - \[ga]season_number\[ga] (numeric): Number of the season the video episode belongs to
+ - \[ga]season_id\[ga] (string): Id of the season the video episode belongs to
+ - \[ga]episode\[ga] (string): Title of the video episode
+ - \[ga]episode_number\[ga] (numeric): Number of the video episode within a season
+ - \[ga]episode_id\[ga] (string): Id of the video episode
+
+Available for the media that is a track or a part of a music album:
+
+ - \[ga]track\[ga] (string): Title of the track
+ - \[ga]track_number\[ga] (numeric): Number of the track within an album or a disc
+ - \[ga]track_id\[ga] (string): Id of the track
+ - \[ga]artist\[ga] (string): Artist(s) of the track
+ - \[ga]genre\[ga] (string): Genre(s) of the track
+ - \[ga]album\[ga] (string): Title of the album the track belongs to
+ - \[ga]album_type\[ga] (string): Type of the album
+ - \[ga]album_artist\[ga] (string): List of all artists appeared on the album
+ - \[ga]disc_number\[ga] (numeric): Number of the disc or other physical medium the track belongs to
+
+Available only when using \[ga]--download-sections\[ga] and for \[ga]chapter:\[ga] prefix when using \[ga]--split-chapters\[ga] for videos with internal chapters:
+
+ - \[ga]section_title\[ga] (string): Title of the chapter
+ - \[ga]section_number\[ga] (numeric): Number of the chapter within the file
+ - \[ga]section_start\[ga] (numeric): Start time of the chapter in seconds
+ - \[ga]section_end\[ga] (numeric): End time of the chapter in seconds
+
+Available only when used in \[ga]--print\[ga]:
+
+ - \[ga]urls\[ga] (string): The URLs of all requested formats, one in each line
+ - \[ga]filename\[ga] (string): Name of the video file. Note that the [actual filename may differ](#outtmpl-postprocess-note)
+ - \[ga]formats_table\[ga] (table): The video format table as printed by \[ga]--list-formats\[ga]
+ - \[ga]thumbnails_table\[ga] (table): The thumbnail format table as printed by \[ga]--list-thumbnails\[ga]
+ - \[ga]subtitles_table\[ga] (table): The subtitle format table as printed by \[ga]--list-subs\[ga]
+ - \[ga]automatic_captions_table\[ga] (table): The automatic subtitle format table as printed by \[ga]--list-subs\[ga]
+ 
+ Available only after the video is downloaded (\[ga]post_process\[ga]/\[ga]after_move\[ga]):
+ 
+ - \[ga]filepath\[ga]: Actual path of downloaded video file
+
+Available only in \[ga]--sponsorblock-chapter-title\[ga]:
+
+ - \[ga]start_time\[ga] (numeric): Start time of the chapter in seconds
+ - \[ga]end_time\[ga] (numeric): End time of the chapter in seconds
+ - \[ga]categories\[ga] (list): The [SponsorBlock categories](https://wiki.sponsor.ajay.app/w/Types#Category) the chapter belongs to
+ - \[ga]category\[ga] (string): The smallest SponsorBlock category the chapter belongs to
+ - \[ga]category_names\[ga] (list): Friendly names of the categories
+ - \[ga]name\[ga] (string): Friendly name of the smallest category
+ - \[ga]type\[ga] (string): The [SponsorBlock action type](https://wiki.sponsor.ajay.app/w/Types#Action_Type) of the chapter
+
+Each aforementioned sequence when referenced in an output template will be replaced by the actual value corresponding to the sequence name. E.g. for \[ga]-o %(title)s-%(id)s.%(ext)s\[ga] and an mp4 video with title \[ga]yt-dlp test video\[ga] and id \[ga]BaW_jenozKc\[ga], this will result in a \[ga]yt-dlp test video-BaW_jenozKc.mp4\[ga] file created in the current directory.
+
+**Note**: Some of the sequences are not guaranteed to be present since they depend on the metadata obtained by a particular extractor. Such sequences will be replaced with placeholder value provided with \[ga]--output-na-placeholder\[ga] (\[ga]NA\[ga] by default).
+
+**Tip**: Look at the \[ga]-j\[ga] output to identify which fields are available for the particular URL
+
+For numeric sequences you can use [numeric related formatting](https://docs.python.org/3/library/stdtypes.html#printf-style-string-formatting); e.g. \[ga]%(view_count)05d\[ga] will result in a string with view count padded with zeros up to 5 characters, like in \[ga]00042\[ga].
+
+Output templates can also contain arbitrary hierarchical path, e.g. \[ga]-o \[dq]%(playlist)s/%(playlist_index)s - %(title)s.%(ext)s\[dq]\[ga] which will result in downloading each video in a directory corresponding to this path template. Any missing directory will be automatically created for you.
+
+To use percent literals in an output template use \[ga]%%\[ga]. To output to stdout use \[ga]-o -\[ga].
+
+The current default template is \[ga]%(title)s [%(id)s].%(ext)s\[ga].
+
+In some cases, you don\[aq]t want special characters such as \[u4E2D], spaces, or &, such as when transferring the downloaded filename to a Windows system or the filename through an 8bit-unsafe channel. In these cases, add the \[ga]--restrict-filenames\[ga] flag to get a shorter title.
+
+#### Output template examples
+
+\[ga]\[ga]\[ga]bash
+$ yt-dlp --print filename -o \[dq]test video.%(ext)s\[dq] BaW_jenozKc
+test video.webm    # Literal name with correct extension
+
+$ yt-dlp --print filename -o \[dq]%(title)s.%(ext)s\[dq] BaW_jenozKc
+youtube-dl test video \[aq]\[aq]_\[:a]\[u21AD]\[u1D550].webm    # All kinds of weird characters
+
+$ yt-dlp --print filename -o \[dq]%(title)s.%(ext)s\[dq] BaW_jenozKc --restrict-filenames
+youtube-dl_test_video_.webm    # Restricted file name
+
+# Download YouTube playlist videos in separate directory indexed by video order in a playlist
+$ yt-dlp -o \[dq]%(playlist)s/%(playlist_index)s - %(title)s.%(ext)s\[dq] \[dq]https://www.youtube.com/playlist?list=PLwiyx1dc3P2JR9N8gQaQN_BCvlSlap7re\[dq]
+
+# Download YouTube playlist videos in separate directories according to their uploaded year
+$ yt-dlp -o \[dq]%(upload_date>%Y)s/%(title)s.%(ext)s\[dq] \[dq]https://www.youtube.com/playlist?list=PLwiyx1dc3P2JR9N8gQaQN_BCvlSlap7re\[dq]
+
+# Prefix playlist index with \[dq] - \[dq] separator, but only if it is available
+$ yt-dlp -o \[dq]%(playlist_index&{} - |)s%(title)s.%(ext)s\[dq] BaW_jenozKc \[dq]https://www.youtube.com/user/TheLinuxFoundation/playlists\[dq]
+
+# Download all playlists of YouTube channel/user keeping each playlist in separate directory:
+$ yt-dlp -o \[dq]%(uploader)s/%(playlist)s/%(playlist_index)s - %(title)s.%(ext)s\[dq] \[dq]https://www.youtube.com/user/TheLinuxFoundation/playlists\[dq]
+
+# Download Udemy course keeping each chapter in separate directory under MyVideos directory in your home
+$ yt-dlp -u user -p password -P \[dq]\[ti]/MyVideos\[dq] -o \[dq]%(playlist)s/%(chapter_number)s - %(chapter)s/%(title)s.%(ext)s\[dq] \[dq]https://www.udemy.com/java-tutorial\[dq]
+
+# Download entire series season keeping each series and each season in separate directory under C:/MyVideos
+$ yt-dlp -P \[dq]C:/MyVideos\[dq] -o \[dq]%(series)s/%(season_number)s - %(season)s/%(episode_number)s - %(episode)s.%(ext)s\[dq] \[dq]https://videomore.ru/kino_v_detalayah/5_sezon/367617\[dq]
+
+# Download video as \[dq]C:\[rs]MyVideos\[rs]uploader\[rs]title.ext\[dq], subtitles as \[dq]C:\[rs]MyVideos\[rs]subs\[rs]uploader\[rs]title.ext\[dq]
+# and put all temporary files in \[dq]C:\[rs]MyVideos\[rs]tmp\[dq]
+$ yt-dlp -P \[dq]C:/MyVideos\[dq] -P \[dq]temp:tmp\[dq] -P \[dq]subtitle:subs\[dq] -o \[dq]%(uploader)s/%(title)s.%(ext)s\[dq] BaW_jenoz --write-subs
+
+# Download video as \[dq]C:\[rs]MyVideos\[rs]uploader\[rs]title.ext\[dq] and subtitles as \[dq]C:\[rs]MyVideos\[rs]uploader\[rs]subs\[rs]title.ext\[dq]
+$ yt-dlp -P \[dq]C:/MyVideos\[dq] -o \[dq]%(uploader)s/%(title)s.%(ext)s\[dq] -o \[dq]subtitle:%(uploader)s/subs/%(title)s.%(ext)s\[dq] BaW_jenozKc --write-subs
+
+# Stream the video being downloaded to stdout
+$ yt-dlp -o - BaW_jenozKc
+\f[R]
+.fi
+.SH FORMAT SELECTION
+.PP
+By default, yt-dlp tries to download the best available quality if you
+\f[B]don\[aq]t\f[R] pass any options.
+This is generally equivalent to using
+\f[C]-f bestvideo*+bestaudio/best\f[R].
+However, if multiple audiostreams is enabled
+(\f[C]--audio-multistreams\f[R]), the default format changes to
+\f[C]-f bestvideo+bestaudio/best\f[R].
+Similarly, if ffmpeg is unavailable, or if you use yt-dlp to stream to
+\f[C]stdout\f[R] (\f[C]-o -\f[R]), the default becomes
+\f[C]-f best/bestvideo+bestaudio\f[R].
+.PP
+\f[B]Deprecation warning\f[R]: Latest versions of yt-dlp can stream
+multiple formats to the stdout simultaneously using ffmpeg.
+So, in future versions, the default for this will be set to
+\f[C]-f bv*+ba/b\f[R] similar to normal downloads.
+If you want to preserve the \f[C]-f b/bv+ba\f[R] setting, it is
+recommended to explicitly specify it in the configuration options.
+.PP
+The general syntax for format selection is \f[C]-f FORMAT\f[R] (or
+\f[C]--format FORMAT\f[R]) where \f[C]FORMAT\f[R] is a \f[I]selector
+expression\f[R], i.e.
+an expression that describes format or formats you would like to
+download.
+.PP
+The simplest case is requesting a specific format; e.g.
+with \f[C]-f 22\f[R] you can download the format with format code equal
+to 22.
+You can get the list of available format codes for particular video
+using \f[C]--list-formats\f[R] or \f[C]-F\f[R].
+Note that these format codes are extractor specific.
+.PP
+You can also use a file extension (currently \f[C]3gp\f[R],
+\f[C]aac\f[R], \f[C]flv\f[R], \f[C]m4a\f[R], \f[C]mp3\f[R],
+\f[C]mp4\f[R], \f[C]ogg\f[R], \f[C]wav\f[R], \f[C]webm\f[R] are
+supported) to download the best quality format of a particular file
+extension served as a single file, e.g.
+\f[C]-f webm\f[R] will download the best quality format with the
+\f[C]webm\f[R] extension served as a single file.
+.PP
+You can use \f[C]-f -\f[R] to interactively provide the format selector
+\f[I]for each video\f[R]
+.PP
+You can also use special names to select particular edge case formats:
+.IP \[bu] 2
+\f[C]all\f[R]: Select \f[B]all formats\f[R] separately
+.IP \[bu] 2
+\f[C]mergeall\f[R]: Select and \f[B]merge all formats\f[R] (Must be used
+with \f[C]--audio-multistreams\f[R], \f[C]--video-multistreams\f[R] or
+both)
+.IP \[bu] 2
+\f[C]b*\f[R], \f[C]best*\f[R]: Select the best quality format that
+\f[B]contains either\f[R] a video or an audio or both (ie;
+\f[C]vcodec!=none or acodec!=none\f[R])
+.IP \[bu] 2
+\f[C]b\f[R], \f[C]best\f[R]: Select the best quality format that
+\f[B]contains both\f[R] video and audio.
+Equivalent to \f[C]best*[vcodec!=none][acodec!=none]\f[R]
+.IP \[bu] 2
+\f[C]bv\f[R], \f[C]bestvideo\f[R]: Select the best quality
+\f[B]video-only\f[R] format.
+Equivalent to \f[C]best*[acodec=none]\f[R]
+.IP \[bu] 2
+\f[C]bv*\f[R], \f[C]bestvideo*\f[R]: Select the best quality format that
+\f[B]contains video\f[R].
+It may also contain audio.
+Equivalent to \f[C]best*[vcodec!=none]\f[R]
+.IP \[bu] 2
+\f[C]ba\f[R], \f[C]bestaudio\f[R]: Select the best quality
+\f[B]audio-only\f[R] format.
+Equivalent to \f[C]best*[vcodec=none]\f[R]
+.IP \[bu] 2
+\f[C]ba*\f[R], \f[C]bestaudio*\f[R]: Select the best quality format that
+\f[B]contains audio\f[R].
+It may also contain video.
+Equivalent to \f[C]best*[acodec!=none]\f[R] (Do not
+use! (https://github.com/yt-dlp/yt-dlp/issues/979#issuecomment-919629354))
+.IP \[bu] 2
+\f[C]w*\f[R], \f[C]worst*\f[R]: Select the worst quality format that
+contains either a video or an audio
+.IP \[bu] 2
+\f[C]w\f[R], \f[C]worst\f[R]: Select the worst quality format that
+contains both video and audio.
+Equivalent to \f[C]worst*[vcodec!=none][acodec!=none]\f[R]
+.IP \[bu] 2
+\f[C]wv\f[R], \f[C]worstvideo\f[R]: Select the worst quality video-only
+format.
+Equivalent to \f[C]worst*[acodec=none]\f[R]
+.IP \[bu] 2
+\f[C]wv*\f[R], \f[C]worstvideo*\f[R]: Select the worst quality format
+that contains video.
+It may also contain audio.
+Equivalent to \f[C]worst*[vcodec!=none]\f[R]
+.IP \[bu] 2
+\f[C]wa\f[R], \f[C]worstaudio\f[R]: Select the worst quality audio-only
+format.
+Equivalent to \f[C]worst*[vcodec=none]\f[R]
+.IP \[bu] 2
+\f[C]wa*\f[R], \f[C]worstaudio*\f[R]: Select the worst quality format
+that contains audio.
+It may also contain video.
+Equivalent to \f[C]worst*[acodec!=none]\f[R]
+.PP
+For example, to download the worst quality video-only format you can use
+\f[C]-f worstvideo\f[R].
+It is however recommended not to use \f[C]worst\f[R] and related
+options.
+When your format selector is \f[C]worst\f[R], the format which is worst
+in all respects is selected.
+Most of the time, what you actually want is the video with the smallest
+filesize instead.
+So it is generally better to use \f[C]-S +size\f[R] or more rigorously,
+\f[C]-S +size,+br,+res,+fps\f[R] instead of \f[C]-f worst\f[R].
+See Sorting Formats for more details.
+.PP
+You can select the n\[aq]th best format of a type by using
+\f[C]best<type>.<n>\f[R].
+For example, \f[C]best.2\f[R] will select the 2nd best combined format.
+Similarly, \f[C]bv*.3\f[R] will select the 3rd best format that contains
+a video stream.
+.PP
+If you want to download multiple videos, and they don\[aq]t have the
+same formats available, you can specify the order of preference using
+slashes.
+Note that formats on the left hand side are preferred; e.g.
+\f[C]-f 22/17/18\f[R] will download format 22 if it\[aq]s available,
+otherwise it will download format 17 if it\[aq]s available, otherwise it
+will download format 18 if it\[aq]s available, otherwise it will
+complain that no suitable formats are available for download.
+.PP
+If you want to download several formats of the same video use a comma as
+a separator, e.g.
+\f[C]-f 22,17,18\f[R] will download all these three formats, of course
+if they are available.
+Or a more sophisticated example combined with the precedence feature:
+\f[C]-f 136/137/mp4/bestvideo,140/m4a/bestaudio\f[R].
+.PP
+You can merge the video and audio of multiple formats into a single file
+using \f[C]-f <format1>+<format2>+...\f[R] (requires ffmpeg installed);
+e.g.
+\f[C]-f bestvideo+bestaudio\f[R] will download the best video-only
+format, the best audio-only format and mux them together with ffmpeg.
+.PP
+\f[B]Deprecation warning\f[R]: Since the \f[I]below\f[R] described
+behavior is complex and counter-intuitive, this will be removed and
+multistreams will be enabled by default in the future.
+A new operator will be instead added to limit formats to single
+audio/video
+.PP
+Unless \f[C]--video-multistreams\f[R] is used, all formats with a video
+stream except the first one are ignored.
+Similarly, unless \f[C]--audio-multistreams\f[R] is used, all formats
+with an audio stream except the first one are ignored.
+E.g.
+\f[C]-f bestvideo+best+bestaudio --video-multistreams --audio-multistreams\f[R]
+will download and merge all 3 given formats.
+The resulting file will have 2 video streams and 2 audio streams.
+But \f[C]-f bestvideo+best+bestaudio --no-video-multistreams\f[R] will
+download and merge only \f[C]bestvideo\f[R] and \f[C]bestaudio\f[R].
+\f[C]best\f[R] is ignored since another format containing a video stream
+(\f[C]bestvideo\f[R]) has already been selected.
+The order of the formats is therefore important.
+\f[C]-f best+bestaudio --no-audio-multistreams\f[R] will download only
+\f[C]best\f[R] while \f[C]-f bestaudio+best --no-audio-multistreams\f[R]
+will ignore \f[C]best\f[R] and download only \f[C]bestaudio\f[R].
+.SS Filtering Formats
+.PP
+You can also filter the video formats by putting a condition in
+brackets, as in \f[C]-f \[dq]best[height=720]\[dq]\f[R] (or
+\f[C]-f \[dq][filesize>10M]\[dq]\f[R] since filters without a selector
+are interpreted as \f[C]best\f[R]).
+.PP
+The following numeric meta fields can be used with comparisons
+\f[C]<\f[R], \f[C]<=\f[R], \f[C]>\f[R], \f[C]>=\f[R], \f[C]=\f[R]
+(equals), \f[C]!=\f[R] (not equals):
+.IP \[bu] 2
+\f[C]filesize\f[R]: The number of bytes, if known in advance
+.IP \[bu] 2
+\f[C]filesize_approx\f[R]: An estimate for the number of bytes
+.IP \[bu] 2
+\f[C]width\f[R]: Width of the video, if known
+.IP \[bu] 2
+\f[C]height\f[R]: Height of the video, if known
+.IP \[bu] 2
+\f[C]aspect_ratio\f[R]: Aspect ratio of the video, if known
+.IP \[bu] 2
+\f[C]tbr\f[R]: Average bitrate of audio and video in KBit/s
+.IP \[bu] 2
+\f[C]abr\f[R]: Average audio bitrate in KBit/s
+.IP \[bu] 2
+\f[C]vbr\f[R]: Average video bitrate in KBit/s
+.IP \[bu] 2
+\f[C]asr\f[R]: Audio sampling rate in Hertz
+.IP \[bu] 2
+\f[C]fps\f[R]: Frame rate
+.IP \[bu] 2
+\f[C]audio_channels\f[R]: The number of audio channels
+.IP \[bu] 2
+\f[C]stretched_ratio\f[R]: \f[C]width:height\f[R] of the video\[aq]s
+pixels, if not square
+.PP
+Also filtering work for comparisons \f[C]=\f[R] (equals),
+\f[C]\[ha]=\f[R] (starts with), \f[C]$=\f[R] (ends with), \f[C]*=\f[R]
+(contains), \f[C]\[ti]=\f[R] (matches regex) and following string meta
+fields:
+.IP \[bu] 2
+\f[C]url\f[R]: Video URL
+.IP \[bu] 2
+\f[C]ext\f[R]: File extension
+.IP \[bu] 2
+\f[C]acodec\f[R]: Name of the audio codec in use
+.IP \[bu] 2
+\f[C]vcodec\f[R]: Name of the video codec in use
+.IP \[bu] 2
+\f[C]container\f[R]: Name of the container format
+.IP \[bu] 2
+\f[C]protocol\f[R]: The protocol that will be used for the actual
+download, lower-case (\f[C]http\f[R], \f[C]https\f[R], \f[C]rtsp\f[R],
+\f[C]rtmp\f[R], \f[C]rtmpe\f[R], \f[C]mms\f[R], \f[C]f4m\f[R],
+\f[C]ism\f[R], \f[C]http_dash_segments\f[R], \f[C]m3u8\f[R], or
+\f[C]m3u8_native\f[R])
+.IP \[bu] 2
+\f[C]language\f[R]: Language code
+.IP \[bu] 2
+\f[C]dynamic_range\f[R]: The dynamic range of the video
+.IP \[bu] 2
+\f[C]format_id\f[R]: A short description of the format
+.IP \[bu] 2
+\f[C]format\f[R]: A human-readable description of the format
+.IP \[bu] 2
+\f[C]format_note\f[R]: Additional info about the format
+.IP \[bu] 2
+\f[C]resolution\f[R]: Textual description of width and height
+.PP
+Any string comparison may be prefixed with negation \f[C]!\f[R] in order
+to produce an opposite comparison, e.g.
+\f[C]!*=\f[R] (does not contain).
+The comparand of a string comparison needs to be quoted with either
+double or single quotes if it contains spaces or special characters
+other than \f[C]._-\f[R].
+.PP
+\f[B]Note\f[R]: None of the aforementioned meta fields are guaranteed to
+be present since this solely depends on the metadata obtained by
+particular extractor, i.e.
+the metadata offered by the website.
+Any other field made available by the extractor can also be used for
+filtering.
+.PP
+Formats for which the value is not known are excluded unless you put a
+question mark (\f[C]?\f[R]) after the operator.
+You can combine format filters, so
+\f[C]-f \[dq]bv[height<=?720][tbr>500]\[dq]\f[R] selects up to 720p
+videos (or videos where the height is not known) with a bitrate of at
+least 500 KBit/s.
+You can also use the filters with \f[C]all\f[R] to download all formats
+that satisfy the filter, e.g.
+\f[C]-f \[dq]all[vcodec=none]\[dq]\f[R] selects all audio-only formats.
+.PP
+Format selectors can also be grouped using parentheses; e.g.
+\f[C]-f \[dq](mp4,webm)[height<480]\[dq]\f[R] will download the best
+pre-merged mp4 and webm formats with a height lower than 480.
+.SS Sorting Formats
+.PP
+You can change the criteria for being considered the \f[C]best\f[R] by
+using \f[C]-S\f[R] (\f[C]--format-sort\f[R]).
+The general format for this is \f[C]--format-sort field1,field2...\f[R].
+.PP
+The available fields are:
+.IP \[bu] 2
+\f[C]hasvid\f[R]: Gives priority to formats that have a video stream
+.IP \[bu] 2
+\f[C]hasaud\f[R]: Gives priority to formats that have an audio stream
+.IP \[bu] 2
+\f[C]ie_pref\f[R]: The format preference
+.IP \[bu] 2
+\f[C]lang\f[R]: The language preference
+.IP \[bu] 2
+\f[C]quality\f[R]: The quality of the format
+.IP \[bu] 2
+\f[C]source\f[R]: The preference of the source
+.IP \[bu] 2
+\f[C]proto\f[R]: Protocol used for download
+(\f[C]https\f[R]/\f[C]ftps\f[R] > \f[C]http\f[R]/\f[C]ftp\f[R] >
+\f[C]m3u8_native\f[R]/\f[C]m3u8\f[R] > \f[C]http_dash_segments\f[R]>
+\f[C]websocket_frag\f[R] > \f[C]mms\f[R]/\f[C]rtsp\f[R] >
+\f[C]f4f\f[R]/\f[C]f4m\f[R])
+.IP \[bu] 2
+\f[C]vcodec\f[R]: Video Codec (\f[C]av01\f[R] > \f[C]vp9.2\f[R] >
+\f[C]vp9\f[R] > \f[C]h265\f[R] > \f[C]h264\f[R] > \f[C]vp8\f[R] >
+\f[C]h263\f[R] > \f[C]theora\f[R] > other)
+.IP \[bu] 2
+\f[C]acodec\f[R]: Audio Codec (\f[C]flac\f[R]/\f[C]alac\f[R] >
+\f[C]wav\f[R]/\f[C]aiff\f[R] > \f[C]opus\f[R] > \f[C]vorbis\f[R] >
+\f[C]aac\f[R] > \f[C]mp4a\f[R] > \f[C]mp3\f[R] > \f[C]ac4\f[R] >
+\f[C]eac3\f[R] > \f[C]ac3\f[R] > \f[C]dts\f[R] > other)
+.IP \[bu] 2
+\f[C]codec\f[R]: Equivalent to \f[C]vcodec,acodec\f[R]
+.IP \[bu] 2
+\f[C]vext\f[R]: Video Extension (\f[C]mp4\f[R] > \f[C]mov\f[R] >
+\f[C]webm\f[R] > \f[C]flv\f[R] > other).
+If \f[C]--prefer-free-formats\f[R] is used, \f[C]webm\f[R] is preferred.
+.IP \[bu] 2
+\f[C]aext\f[R]: Audio Extension (\f[C]m4a\f[R] > \f[C]aac\f[R] >
+\f[C]mp3\f[R] > \f[C]ogg\f[R] > \f[C]opus\f[R] > \f[C]webm\f[R] >
+other).
+If \f[C]--prefer-free-formats\f[R] is used, the order changes to
+\f[C]ogg\f[R] > \f[C]opus\f[R] > \f[C]webm\f[R] > \f[C]mp3\f[R] >
+\f[C]m4a\f[R] > \f[C]aac\f[R]
+.IP \[bu] 2
+\f[C]ext\f[R]: Equivalent to \f[C]vext,aext\f[R]
+.IP \[bu] 2
+\f[C]filesize\f[R]: Exact filesize, if known in advance
+.IP \[bu] 2
+\f[C]fs_approx\f[R]: Approximate filesize
+.IP \[bu] 2
+\f[C]size\f[R]: Exact filesize if available, otherwise approximate
+filesize
+.IP \[bu] 2
+\f[C]height\f[R]: Height of video
+.IP \[bu] 2
+\f[C]width\f[R]: Width of video
+.IP \[bu] 2
+\f[C]res\f[R]: Video resolution, calculated as the smallest dimension.
+.IP \[bu] 2
+\f[C]fps\f[R]: Framerate of video
+.IP \[bu] 2
+\f[C]hdr\f[R]: The dynamic range of the video (\f[C]DV\f[R] >
+\f[C]HDR12\f[R] > \f[C]HDR10+\f[R] > \f[C]HDR10\f[R] > \f[C]HLG\f[R] >
+\f[C]SDR\f[R])
+.IP \[bu] 2
+\f[C]channels\f[R]: The number of audio channels
+.IP \[bu] 2
+\f[C]tbr\f[R]: Total average bitrate in KBit/s
+.IP \[bu] 2
+\f[C]vbr\f[R]: Average video bitrate in KBit/s
+.IP \[bu] 2
+\f[C]abr\f[R]: Average audio bitrate in KBit/s
+.IP \[bu] 2
+\f[C]br\f[R]: Average bitrate in KBit/s,
+\f[C]tbr\f[R]/\f[C]vbr\f[R]/\f[C]abr\f[R]
+.IP \[bu] 2
+\f[C]asr\f[R]: Audio sample rate in Hz
+.PP
+\f[B]Deprecation warning\f[R]: Many of these fields have (currently
+undocumented) aliases, that may be removed in a future version.
+It is recommended to use only the documented field names.
+.PP
+All fields, unless specified otherwise, are sorted in descending order.
+To reverse this, prefix the field with a \f[C]+\f[R].
+E.g.
+\f[C]+res\f[R] prefers format with the smallest resolution.
+Additionally, you can suffix a preferred value for the fields, separated
+by a \f[C]:\f[R].
+E.g.
+\f[C]res:720\f[R] prefers larger videos, but no larger than 720p and the
+smallest video if there are no videos less than 720p.
+For \f[C]codec\f[R] and \f[C]ext\f[R], you can provide two preferred
+values, the first for video and the second for audio.
+E.g.
+\f[C]+codec:avc:m4a\f[R] (equivalent to
+\f[C]+vcodec:avc,+acodec:m4a\f[R]) sets the video codec preference to
+\f[C]h264\f[R] > \f[C]h265\f[R] > \f[C]vp9\f[R] > \f[C]vp9.2\f[R] >
+\f[C]av01\f[R] > \f[C]vp8\f[R] > \f[C]h263\f[R] > \f[C]theora\f[R] and
+audio codec preference to \f[C]mp4a\f[R] > \f[C]aac\f[R] >
+\f[C]vorbis\f[R] > \f[C]opus\f[R] > \f[C]mp3\f[R] > \f[C]ac3\f[R] >
+\f[C]dts\f[R].
+You can also make the sorting prefer the nearest values to the provided
+by using \f[C]\[ti]\f[R] as the delimiter.
+E.g.
+\f[C]filesize\[ti]1G\f[R] prefers the format with filesize closest to 1
+GiB.
+.PP
+The fields \f[C]hasvid\f[R] and \f[C]ie_pref\f[R] are always given
+highest priority in sorting, irrespective of the user-defined order.
+This behaviour can be changed by using \f[C]--format-sort-force\f[R].
+Apart from these, the default order used is:
+\f[C]lang,quality,res,fps,hdr:12,vcodec:vp9.2,channels,acodec,size,br,asr,proto,ext,hasaud,source,id\f[R].
+The extractors may override this default order, but they cannot override
+the user-provided order.
+.PP
+Note that the default has \f[C]vcodec:vp9.2\f[R]; i.e.
+\f[C]av1\f[R] is not preferred.
+Similarly, the default for hdr is \f[C]hdr:12\f[R]; i.e.
+dolby vision is not preferred.
+These choices are made since DV and AV1 formats are not yet fully
+compatible with most devices.
+This may be changed in the future as more devices become capable of
+smoothly playing back these formats.
+.PP
+If your format selector is \f[C]worst\f[R], the last item is selected
+after sorting.
+This means it will select the format that is worst in all respects.
+Most of the time, what you actually want is the video with the smallest
+filesize instead.
+So it is generally better to use
+\f[C]-f best -S +size,+br,+res,+fps\f[R].
+.PP
+\f[B]Tip\f[R]: You can use the \f[C]-v -F\f[R] to see how the formats
+have been sorted (worst to best).
+.SS Format Selection examples
+.IP
+.nf
+\f[C]
+# Download and merge the best video-only format and the best audio-only format,
+# or download the best combined format if video-only format is not available
+$ yt-dlp -f \[dq]bv+ba/b\[dq]
+
+# Download best format that contains video,
+# and if it doesn\[aq]t already have an audio stream, merge it with best audio-only format
+$ yt-dlp -f \[dq]bv*+ba/b\[dq]
+
+# Same as above
+$ yt-dlp
+
+# Download the best video-only format and the best audio-only format without merging them
+# For this case, an output template should be used since
+# by default, bestvideo and bestaudio will have the same file name.
+$ yt-dlp -f \[dq]bv,ba\[dq] -o \[dq]%(title)s.f%(format_id)s.%(ext)s\[dq]
+
+# Download and merge the best format that has a video stream,
+# and all audio-only formats into one file
+$ yt-dlp -f \[dq]bv*+mergeall[vcodec=none]\[dq] --audio-multistreams
+
+# Download and merge the best format that has a video stream,
+# and the best 2 audio-only formats into one file
+$ yt-dlp -f \[dq]bv*+ba+ba.2\[dq] --audio-multistreams
+
+
+# The following examples show the old method (without -S) of format selection
+# and how to use -S to achieve a similar but (generally) better result
+
+# Download the worst video available (old method)
+$ yt-dlp -f \[dq]wv*+wa/w\[dq]
+
+# Download the best video available but with the smallest resolution
+$ yt-dlp -S \[dq]+res\[dq]
+
+# Download the smallest video available
+$ yt-dlp -S \[dq]+size,+br\[dq]
+
+
+
+# Download the best mp4 video available, or the best video if no mp4 available
+$ yt-dlp -f \[dq]bv*[ext=mp4]+ba[ext=m4a]/b[ext=mp4] / bv*+ba/b\[dq]
+
+# Download the best video with the best extension
+# (For video, mp4 > mov > webm > flv. For audio, m4a > aac > mp3 ...)
+$ yt-dlp -S \[dq]ext\[dq]
+
+
+
+# Download the best video available but no better than 480p,
+# or the worst video if there is no video under 480p
+$ yt-dlp -f \[dq]bv*[height<=480]+ba/b[height<=480] / wv*+ba/w\[dq]
+
+# Download the best video available with the largest height but no better than 480p,
+# or the best video with the smallest resolution if there is no video under 480p
+$ yt-dlp -S \[dq]height:480\[dq]
+
+# Download the best video available with the largest resolution but no better than 480p,
+# or the best video with the smallest resolution if there is no video under 480p
+# Resolution is determined by using the smallest dimension.
+# So this works correctly for vertical videos as well
+$ yt-dlp -S \[dq]res:480\[dq]
+
+
+
+# Download the best video (that also has audio) but no bigger than 50 MB,
+# or the worst video (that also has audio) if there is no video under 50 MB
+$ yt-dlp -f \[dq]b[filesize<50M] / w\[dq]
+
+# Download largest video (that also has audio) but no bigger than 50 MB,
+# or the smallest video (that also has audio) if there is no video under 50 MB
+$ yt-dlp -f \[dq]b\[dq] -S \[dq]filesize:50M\[dq]
+
+# Download best video (that also has audio) that is closest in size to 50 MB
+$ yt-dlp -f \[dq]b\[dq] -S \[dq]filesize\[ti]50M\[dq]
+
+
+
+# Download best video available via direct link over HTTP/HTTPS protocol,
+# or the best video available via any protocol if there is no such video
+$ yt-dlp -f \[dq](bv*+ba/b)[protocol\[ha]=http][protocol!*=dash] / (bv*+ba/b)\[dq]
+
+# Download best video available via the best protocol
+# (https/ftps > http/ftp > m3u8_native > m3u8 > http_dash_segments ...)
+$ yt-dlp -S \[dq]proto\[dq]
+
+
+
+# Download the best video with either h264 or h265 codec,
+# or the best video if there is no such video
+$ yt-dlp -f \[dq](bv*[vcodec\[ti]=\[aq]\[ha]((he|a)vc|h26[45])\[aq]]+ba) / (bv*+ba/b)\[dq]
+
+# Download the best video with best codec no better than h264,
+# or the best video with worst codec if there is no such video
+$ yt-dlp -S \[dq]codec:h264\[dq]
+
+# Download the best video with worst codec no worse than h264,
+# or the best video with best codec if there is no such video
+$ yt-dlp -S \[dq]+codec:h264\[dq]
+
+
+
+# More complex examples
+
+# Download the best video no better than 720p preferring framerate greater than 30,
+# or the worst video (still preferring framerate greater than 30) if there is no such video
+$ yt-dlp -f \[dq]((bv*[fps>30]/bv*)[height<=720]/(wv*[fps>30]/wv*)) + ba / (b[fps>30]/b)[height<=720]/(w[fps>30]/w)\[dq]
+
+# Download the video with the largest resolution no better than 720p,
+# or the video with the smallest resolution available if there is no such video,
+# preferring larger framerate for formats with the same resolution
+$ yt-dlp -S \[dq]res:720,fps\[dq]
+
+
+
+# Download the video with smallest resolution no worse than 480p,
+# or the video with the largest resolution available if there is no such video,
+# preferring better codec and then larger total bitrate for the same resolution
+$ yt-dlp -S \[dq]+res:480,codec,br\[dq]
+\f[R]
+.fi
+.SH MODIFYING METADATA
+.PP
+The metadata obtained by the extractors can be modified by using
+\f[C]--parse-metadata\f[R] and \f[C]--replace-in-metadata\f[R]
+.PP
+\f[C]--replace-in-metadata FIELDS REGEX REPLACE\f[R] is used to replace
+text in any metadata field using python regular
+expression (https://docs.python.org/3/library/re.html#regular-expression-syntax).
+Backreferences (https://docs.python.org/3/library/re.html?highlight=backreferences#re.sub)
+can be used in the replace string for advanced use.
+.PP
+The general syntax of \f[C]--parse-metadata FROM:TO\f[R] is to give the
+name of a field or an output template to extract data from, and the
+format to interpret it as, separated by a colon \f[C]:\f[R].
+Either a python regular
+expression (https://docs.python.org/3/library/re.html#regular-expression-syntax)
+with named capture groups, a single field name, or a similar syntax to
+the output template (only \f[C]%(field)s\f[R] formatting is supported)
+can be used for \f[C]TO\f[R].
+The option can be used multiple times to parse and modify various
+fields.
+.PP
+Note that these options preserve their relative order, allowing
+replacements to be made in parsed fields and viceversa.
+Also, any field thus created can be used in the output template and will
+also affect the media file\[aq]s metadata added when using
+\f[C]--embed-metadata\f[R].
+.PP
+This option also has a few special uses:
+.IP \[bu] 2
+You can download an additional URL based on the metadata of the
+currently downloaded video.
+To do this, set the field \f[C]additional_urls\f[R] to the URL that you
+want to download.
+E.g.
+\f[C]--parse-metadata \[dq]description:(?P<additional_urls>https?://www\[rs].vimeo\[rs].com/\[rs]d+)\[dq]\f[R]
+will download the first vimeo video found in the description
+.IP \[bu] 2
+You can use this to change the metadata that is embedded in the media
+file.
+To do this, set the value of the corresponding field with a
+\f[C]meta_\f[R] prefix.
+For example, any value you set to \f[C]meta_description\f[R] field will
+be added to the \f[C]description\f[R] field in the file - you can use
+this to set a different \[dq]description\[dq] and \[dq]synopsis\[dq].
+To modify the metadata of individual streams, use the \f[C]meta<n>_\f[R]
+prefix (e.g.
+\f[C]meta1_language\f[R]).
+Any value set to the \f[C]meta_\f[R] field will overwrite all default
+values.
+.PP
+\f[B]Note\f[R]: Metadata modification happens before format selection,
+post-extraction and other post-processing operations.
+Some fields may be added or changed during these steps, overriding your
+changes.
+.PP
+For reference, these are the fields yt-dlp adds by default to the file
+metadata:
+.PP
+.TS
+tab(@);
+l l.
+T{
+Metadata fields
+T}@T{
+From
+T}
+_
+T{
+\f[C]title\f[R]
+T}@T{
+\f[C]track\f[R] or \f[C]title\f[R]
+T}
+T{
+\f[C]date\f[R]
+T}@T{
+\f[C]upload_date\f[R]
+T}
+T{
+\f[C]description\f[R], \f[C]synopsis\f[R]
+T}@T{
+\f[C]description\f[R]
+T}
+T{
+\f[C]purl\f[R], \f[C]comment\f[R]
+T}@T{
+\f[C]webpage_url\f[R]
+T}
+T{
+\f[C]track\f[R]
+T}@T{
+\f[C]track_number\f[R]
+T}
+T{
+\f[C]artist\f[R]
+T}@T{
+\f[C]artist\f[R], \f[C]creator\f[R], \f[C]uploader\f[R] or
+\f[C]uploader_id\f[R]
+T}
+T{
+\f[C]genre\f[R]
+T}@T{
+\f[C]genre\f[R]
+T}
+T{
+\f[C]album\f[R]
+T}@T{
+\f[C]album\f[R]
+T}
+T{
+\f[C]album_artist\f[R]
+T}@T{
+\f[C]album_artist\f[R]
+T}
+T{
+\f[C]disc\f[R]
+T}@T{
+\f[C]disc_number\f[R]
+T}
+T{
+\f[C]show\f[R]
+T}@T{
+\f[C]series\f[R]
+T}
+T{
+\f[C]season_number\f[R]
+T}@T{
+\f[C]season_number\f[R]
+T}
+T{
+\f[C]episode_id\f[R]
+T}@T{
+\f[C]episode\f[R] or \f[C]episode_id\f[R]
+T}
+T{
+\f[C]episode_sort\f[R]
+T}@T{
+\f[C]episode_number\f[R]
+T}
+T{
+\f[C]language\f[R] of each stream
+T}@T{
+the format\[aq]s \f[C]language\f[R]
+T}
+.TE
+.PP
+\f[B]Note\f[R]: The file format may not support some of these fields
+.SS Modifying metadata examples
+.IP
+.nf
+\f[C]
+# Interpret the title as \[dq]Artist - Title\[dq]
+$ yt-dlp --parse-metadata \[dq]title:%(artist)s - %(title)s\[dq]
+
+# Regex example
+$ yt-dlp --parse-metadata \[dq]description:Artist - (?P<artist>.+)\[dq]
+
+# Set title as \[dq]Series name S01E05\[dq]
+$ yt-dlp --parse-metadata \[dq]%(series)s S%(season_number)02dE%(episode_number)02d:%(title)s\[dq]
+
+# Prioritize uploader as the \[dq]artist\[dq] field in video metadata
+$ yt-dlp --parse-metadata \[dq]%(uploader|)s:%(meta_artist)s\[dq] --embed-metadata
+
+# Set \[dq]comment\[dq] field in video metadata using description instead of webpage_url,
+# handling multiple lines correctly
+$ yt-dlp --parse-metadata \[dq]description:(?s)(?P<meta_comment>.+)\[dq] --embed-metadata
+
+# Do not set any \[dq]synopsis\[dq] in the video metadata
+$ yt-dlp --parse-metadata \[dq]:(?P<meta_synopsis>)\[dq]
+
+# Remove \[dq]formats\[dq] field from the infojson by setting it to an empty string
+$ yt-dlp --parse-metadata \[dq]video::(?P<formats>)\[dq] --write-info-json
+
+# Replace all spaces and \[dq]_\[dq] in title and uploader with a \[ga]-\[ga]
+$ yt-dlp --replace-in-metadata \[dq]title,uploader\[dq] \[dq][ _]\[dq] \[dq]-\[dq]
+\f[R]
+.fi
+.SH EXTRACTOR ARGUMENTS
+.PP
+Some extractors accept additional arguments which can be passed using
+\f[C]--extractor-args KEY:ARGS\f[R].
+\f[C]ARGS\f[R] is a \f[C];\f[R] (semicolon) separated string of
+\f[C]ARG=VAL1,VAL2\f[R].
+E.g.
+\f[C]--extractor-args \[dq]youtube:player-client=android_embedded,web;include_live_dash\[dq] --extractor-args \[dq]funimation:version=uncut\[dq]\f[R]
+.PP
+Note: In CLI, \f[C]ARG\f[R] can use \f[C]-\f[R] instead of \f[C]_\f[R];
+e.g.
+\f[C]youtube:player-client\[dq]\f[R] becomes
+\f[C]youtube:player_client\[dq]\f[R]
+.PP
+The following extractors use this feature:
+.SS youtube
+.IP \[bu] 2
+\f[C]lang\f[R]: Prefer translated metadata (\f[C]title\f[R],
+\f[C]description\f[R] etc) of this language code (case-sensitive).
+By default, the video primary language metadata is preferred, with a
+fallback to \f[C]en\f[R] translated.
+See
+youtube.py (https://github.com/yt-dlp/yt-dlp/blob/c26f9b991a0681fd3ea548d535919cec1fbbd430/yt_dlp/extractor/youtube.py#L381-L390)
+for list of supported content language codes
+.IP \[bu] 2
+\f[C]skip\f[R]: One or more of \f[C]hls\f[R], \f[C]dash\f[R] or
+\f[C]translated_subs\f[R] to skip extraction of the m3u8 manifests, dash
+manifests and auto-translated
+subtitles (https://github.com/yt-dlp/yt-dlp/issues/4090#issuecomment-1158102032)
+respectively
+.IP \[bu] 2
+\f[C]player_client\f[R]: Clients to extract video data from.
+The main clients are \f[C]web\f[R], \f[C]android\f[R] and \f[C]ios\f[R]
+with variants \f[C]_music\f[R], \f[C]_embedded\f[R],
+\f[C]_embedscreen\f[R], \f[C]_creator\f[R] (e.g.
+\f[C]web_embedded\f[R]); and \f[C]mweb\f[R], \f[C]mweb_embedscreen\f[R]
+and \f[C]tv_embedded\f[R] (agegate bypass) with no variants.
+By default, \f[C]ios,android,web\f[R] is used, but \f[C]tv_embedded\f[R]
+and \f[C]creator\f[R] variants are added as required for age-gated
+videos.
+Similarly, the music variants are added for \f[C]music.youtube.com\f[R]
+urls.
+You can use \f[C]all\f[R] to use all the clients, and \f[C]default\f[R]
+for the default clients.
+.IP \[bu] 2
+\f[C]player_skip\f[R]: Skip some network requests that are generally
+needed for robust extraction.
+One or more of \f[C]configs\f[R] (skip client configs),
+\f[C]webpage\f[R] (skip initial webpage), \f[C]js\f[R] (skip js player).
+While these options can help reduce the number of requests needed or
+avoid some rate-limiting, they could cause some issues.
+See #860 (https://github.com/yt-dlp/yt-dlp/pull/860) for more details
+.IP \[bu] 2
+\f[C]player_params\f[R]: YouTube player parameters to use for player
+requests.
+Will overwrite any default ones set by yt-dlp.
+.IP \[bu] 2
+\f[C]comment_sort\f[R]: \f[C]top\f[R] or \f[C]new\f[R] (default) -
+choose comment sorting mode (on YouTube\[aq]s side)
+.IP \[bu] 2
+\f[C]max_comments\f[R]: Limit the amount of comments to gather.
+Comma-separated list of integers representing
+\f[C]max-comments,max-parents,max-replies,max-replies-per-thread\f[R].
+Default is \f[C]all,all,all,all\f[R]
+.RS 2
+.IP \[bu] 2
+E.g.
+\f[C]all,all,1000,10\f[R] will get a maximum of 1000 replies total, with
+up to 10 replies per thread.
+\f[C]1000,all,100\f[R] will get a maximum of 1000 comments, with a
+maximum of 100 replies total
+.RE
+.IP \[bu] 2
+\f[C]formats\f[R]: Change the types of formats to return.
+\f[C]dashy\f[R] (convert HTTP to DASH), \f[C]duplicate\f[R] (identical
+content but different URLs or protocol; includes \f[C]dashy\f[R]),
+\f[C]incomplete\f[R] (cannot be downloaded completely - live dash and
+post-live m3u8)
+.IP \[bu] 2
+\f[C]innertube_host\f[R]: Innertube API host to use for all API
+requests; e.g.
+\f[C]studio.youtube.com\f[R], \f[C]youtubei.googleapis.com\f[R].
+Note that cookies exported from one subdomain will not work on others
+.IP \[bu] 2
+\f[C]innertube_key\f[R]: Innertube API key to use for all API requests
+.IP \[bu] 2
+\f[C]raise_incomplete_data\f[R]: \f[C]Incomplete Data Received\f[R]
+raises an error instead of reporting a warning
+.SS youtubetab (YouTube playlists, channels, feeds, etc.)
+.IP \[bu] 2
+\f[C]skip\f[R]: One or more of \f[C]webpage\f[R] (skip initial webpage
+download), \f[C]authcheck\f[R] (allow the download of playlists
+requiring authentication when no initial webpage is downloaded.
+This may cause unwanted behavior, see
+#1122 (https://github.com/yt-dlp/yt-dlp/pull/1122) for more details)
+.IP \[bu] 2
+\f[C]approximate_date\f[R]: Extract approximate \f[C]upload_date\f[R]
+and \f[C]timestamp\f[R] in flat-playlist.
+This may cause date-based filters to be slightly off
+.SS generic
+.IP \[bu] 2
+\f[C]fragment_query\f[R]: Passthrough any query in mpd/m3u8 manifest
+URLs to their fragments if no value is provided, or else apply the query
+string given as \f[C]fragment_query=VALUE\f[R].
+Does not apply to ffmpeg
+.IP \[bu] 2
+\f[C]variant_query\f[R]: Passthrough the master m3u8 URL query to its
+variant playlist URLs if no value is provided, or else apply the query
+string given as \f[C]variant_query=VALUE\f[R]
+.IP \[bu] 2
+\f[C]hls_key\f[R]: An HLS AES-128 key URI \f[I]or\f[R] key (as hex), and
+optionally the IV (as hex), in the form of \f[C](URI|KEY)[,IV]\f[R];
+e.g.
+\f[C]generic:hls_key=ABCDEF1234567980,0xFEDCBA0987654321\f[R].
+Passing any of these values will force usage of the native HLS
+downloader and override the corresponding values found in the m3u8
+playlist
+.IP \[bu] 2
+\f[C]is_live\f[R]: Bypass live HLS detection and manually set
+\f[C]live_status\f[R] - a value of \f[C]false\f[R] will set
+\f[C]not_live\f[R], any other value (or no value) will set
+\f[C]is_live\f[R]
+.SS funimation
+.IP \[bu] 2
+\f[C]language\f[R]: Audio languages to extract, e.g.
+\f[C]funimation:language=english,japanese\f[R]
+.IP \[bu] 2
+\f[C]version\f[R]: The video version to extract - \f[C]uncut\f[R] or
+\f[C]simulcast\f[R]
+.SS crunchyrollbeta (Crunchyroll)
+.IP \[bu] 2
+\f[C]format\f[R]: Which stream type(s) to extract (default:
+\f[C]adaptive_hls\f[R]).
+Potentially useful values include \f[C]adaptive_hls\f[R],
+\f[C]adaptive_dash\f[R], \f[C]vo_adaptive_hls\f[R],
+\f[C]vo_adaptive_dash\f[R], \f[C]download_hls\f[R],
+\f[C]download_dash\f[R], \f[C]multitrack_adaptive_hls_v2\f[R]
+.IP \[bu] 2
+\f[C]hardsub\f[R]: Preference order for which hardsub versions to
+extract, or \f[C]all\f[R] (default: \f[C]None\f[R] = no hardsubs), e.g.
+\f[C]crunchyrollbeta:hardsub=en-US,None\f[R]
+.SS vikichannel
+.IP \[bu] 2
+\f[C]video_types\f[R]: Types of videos to download - one or more of
+\f[C]episodes\f[R], \f[C]movies\f[R], \f[C]clips\f[R],
+\f[C]trailers\f[R]
+.SS niconico
+.IP \[bu] 2
+\f[C]segment_duration\f[R]: Segment duration in milliseconds for HLS-DMC
+formats.
+Use it at your own risk since this feature \f[B]may result in your
+account termination.\f[R]
+.SS youtubewebarchive
+.IP \[bu] 2
+\f[C]check_all\f[R]: Try to check more at the cost of more requests.
+One or more of \f[C]thumbnails\f[R], \f[C]captures\f[R]
+.SS gamejolt
+.IP \[bu] 2
+\f[C]comment_sort\f[R]: \f[C]hot\f[R] (default), \f[C]you\f[R] (cookies
+needed), \f[C]top\f[R], \f[C]new\f[R] - choose comment sorting mode (on
+GameJolt\[aq]s side)
+.SS hotstar
+.IP \[bu] 2
+\f[C]res\f[R]: resolution to ignore - one or more of \f[C]sd\f[R],
+\f[C]hd\f[R], \f[C]fhd\f[R]
+.IP \[bu] 2
+\f[C]vcodec\f[R]: vcodec to ignore - one or more of \f[C]h264\f[R],
+\f[C]h265\f[R], \f[C]dvh265\f[R]
+.IP \[bu] 2
+\f[C]dr\f[R]: dynamic range to ignore - one or more of \f[C]sdr\f[R],
+\f[C]hdr10\f[R], \f[C]dv\f[R]
+.SS niconicochannelplus
+.IP \[bu] 2
+\f[C]max_comments\f[R]: Maximum number of comments to extract - default
+is \f[C]120\f[R]
+.SS tiktok
+.IP \[bu] 2
+\f[C]api_hostname\f[R]: Hostname to use for mobile API requests, e.g.
+\f[C]api-h2.tiktokv.com\f[R]
+.IP \[bu] 2
+\f[C]app_version\f[R]: App version to call mobile APIs with - should be
+set along with \f[C]manifest_app_version\f[R], e.g.
+\f[C]20.2.1\f[R]
+.IP \[bu] 2
+\f[C]manifest_app_version\f[R]: Numeric app version to call mobile APIs
+with, e.g.
+\f[C]221\f[R]
+.SS rokfinchannel
+.IP \[bu] 2
+\f[C]tab\f[R]: Which tab to download - one of \f[C]new\f[R],
+\f[C]top\f[R], \f[C]videos\f[R], \f[C]podcasts\f[R], \f[C]streams\f[R],
+\f[C]stacks\f[R]
+.SS twitter
+.IP \[bu] 2
+\f[C]api\f[R]: Select one of \f[C]graphql\f[R] (default),
+\f[C]legacy\f[R] or \f[C]syndication\f[R] as the API for tweet
+extraction.
+Has no effect if logged in
+.SS stacommu, wrestleuniverse
+.IP \[bu] 2
+\f[C]device_id\f[R]: UUID value assigned by the website and used to
+enforce device limits for paid livestream content.
+Can be found in browser local storage
+.SS twitch
+.IP \[bu] 2
+\f[C]client_id\f[R]: Client ID value to be sent with GraphQL requests,
+e.g.
+\f[C]twitch:client_id=kimne78kx3ncx6brgo4mv6wki5h1ko\f[R]
+.SS nhkradirulive (NHK \[u3089]\[u3058]\[u308B]\[u2605]\[u3089]\[u3058]\[u308B] LIVE)
+.IP \[bu] 2
+\f[C]area\f[R]: Which regional variation to extract.
+Valid areas are: \f[C]sapporo\f[R], \f[C]sendai\f[R], \f[C]tokyo\f[R],
+\f[C]nagoya\f[R], \f[C]osaka\f[R], \f[C]hiroshima\f[R],
+\f[C]matsuyama\f[R], \f[C]fukuoka\f[R].
+Defaults to \f[C]tokyo\f[R]
+.SS nflplusreplay
+.IP \[bu] 2
+\f[C]type\f[R]: Type(s) of game replays to extract.
+Valid types are: \f[C]full_game\f[R], \f[C]full_game_spanish\f[R],
+\f[C]condensed_game\f[R] and \f[C]all_22\f[R].
+You can use \f[C]all\f[R] to extract all available replay types, which
+is the default
+.PP
+\f[B]Note\f[R]: These options may be changed/removed in the future
+without concern for backward compatibility
+.SH INSTALLATION
+.PP
+You can install yt-dlp using the binaries,
+pip (https://pypi.org/project/yt-dlp) or one using a third-party package
+manager.
+See the wiki (https://github.com/yt-dlp/yt-dlp/wiki/Installation) for
+detailed instructions
+.SS UPDATE
+.PP
+You can use \f[C]yt-dlp -U\f[R] to update if you are using the release
+binaries
+.PP
+If you installed with
+pip (https://github.com/yt-dlp/yt-dlp/wiki/Installation#with-pip),
+simply re-run the same command that was used to install the program
+.PP
+For other third-party package managers, see the
+wiki (https://github.com/yt-dlp/yt-dlp/wiki/Installation#third-party-package-managers)
+or refer their documentation
+.PP
+.PP
+There are currently three release channels for binaries:
+\f[C]stable\f[R], \f[C]nightly\f[R] and \f[C]master\f[R].
+.IP \[bu] 2
+\f[C]stable\f[R] is the default channel, and many of its changes have
+been tested by users of the \f[C]nightly\f[R] and \f[C]master\f[R]
+channels.
+.IP \[bu] 2
+The \f[C]nightly\f[R] channel has releases scheduled to build every day
+around midnight UTC, for a snapshot of the project\[aq]s new patches and
+changes.
+This is the \f[B]recommended channel for regular users\f[R] of yt-dlp.
+The \f[C]nightly\f[R] releases are available from
+yt-dlp/yt-dlp-nightly-builds (https://github.com/yt-dlp/yt-dlp-nightly-builds/releases)
+or as development releases of the \f[C]yt-dlp\f[R] PyPI package (which
+can be installed with pip\[aq]s \f[C]--pre\f[R] flag).
+.IP \[bu] 2
+The \f[C]master\f[R] channel features releases that are built after each
+push to the master branch, and these will have the very latest fixes and
+additions, but may also be more prone to regressions.
+They are available from
+yt-dlp/yt-dlp-master-builds (https://github.com/yt-dlp/yt-dlp-master-builds/releases).
+.PP
+When using \f[C]--update\f[R]/\f[C]-U\f[R], a release binary will only
+update to its current channel.
+\f[C]--update-to CHANNEL\f[R] can be used to switch to a different
+channel when a newer version is available.
+\f[C]--update-to [CHANNEL\[at]]TAG\f[R] can also be used to upgrade or
+downgrade to specific tags from a channel.
+.PP
+You may also use \f[C]--update-to <repository>\f[R]
+(\f[C]<owner>/<repository>\f[R]) to update to a channel on a completely
+different repository.
+Be careful with what repository you are updating to though, there is no
+verification done for binaries from different repositories.
+.PP
+Example usage: * \f[C]yt-dlp --update-to master\f[R] switch to the
+\f[C]master\f[R] channel and update to its latest release *
+\f[C]yt-dlp --update-to stable\[at]2023.07.06\f[R] upgrade/downgrade to
+release to \f[C]stable\f[R] channel tag \f[C]2023.07.06\f[R] *
+\f[C]yt-dlp --update-to 2023.10.07\f[R] upgrade/downgrade to tag
+\f[C]2023.10.07\f[R] if it exists on the current channel *
+\f[C]yt-dlp --update-to example/yt-dlp\[at]2023.09.24\f[R]
+upgrade/downgrade to the release from the \f[C]example/yt-dlp\f[R]
+repository, tag \f[C]2023.09.24\f[R]
+.PP
+\f[B]Important\f[R]: Any user experiencing an issue with the
+\f[C]stable\f[R] release should install or update to the
+\f[C]nightly\f[R] release before submitting a bug report:
+.IP
+.nf
+\f[C]
+
+
+# PLUGINS
+
+Note that **all** plugins are imported even if not invoked, and that **there are no checks** performed on plugin code. **Use plugins at your own risk and only if you trust the code!**
+
+Plugins can be of \[ga]<type>\[ga]s \[ga]extractor\[ga] or \[ga]postprocessor\[ga]. 
+- Extractor plugins do not need to be enabled from the CLI and are automatically invoked when the input URL is suitable for it. 
+- Extractor plugins take priority over builtin extractors.
+- Postprocessor plugins can be invoked using \[ga]--use-postprocessor NAME\[ga].
+
+
+Plugins are loaded from the namespace packages \[ga]yt_dlp_plugins.extractor\[ga] and \[ga]yt_dlp_plugins.postprocessor\[ga].
+
+In other words, the file structure on the disk looks something like:
+    
+        yt_dlp_plugins/
+            extractor/
+                myplugin.py
+            postprocessor/
+                myplugin.py
+
+yt-dlp looks for these \[ga]yt_dlp_plugins\[ga] namespace folders in many locations (see below) and loads in plugins from **all** of them.
+
+See the [wiki for some known plugins](https://github.com/yt-dlp/yt-dlp/wiki/Plugins)
+
+## Installing Plugins
+
+Plugins can be installed using various methods and locations.
+
+1. **Configuration directories**:
+   Plugin packages (containing a \[ga]yt_dlp_plugins\[ga] namespace folder) can be dropped into the following standard [configuration locations](#configuration):
+    * **User Plugins**
+      * \[ga]${XDG_CONFIG_HOME}/yt-dlp/plugins/<package name>/yt_dlp_plugins/\[ga] (recommended on Linux/macOS)
+      * \[ga]${XDG_CONFIG_HOME}/yt-dlp-plugins/<package name>/yt_dlp_plugins/\[ga]
+      * \[ga]${APPDATA}/yt-dlp/plugins/<package name>/yt_dlp_plugins/\[ga] (recommended on Windows)
+      * \[ga]${APPDATA}/yt-dlp-plugins/<package name>/yt_dlp_plugins/\[ga]
+      * \[ga]\[ti]/.yt-dlp/plugins/<package name>/yt_dlp_plugins/\[ga]
+      * \[ga]\[ti]/yt-dlp-plugins/<package name>/yt_dlp_plugins/\[ga]
+    * **System Plugins**
+      * \[ga]/etc/yt-dlp/plugins/<package name>/yt_dlp_plugins/\[ga]
+      * \[ga]/etc/yt-dlp-plugins/<package name>/yt_dlp_plugins/\[ga]
+2. **Executable location**: Plugin packages can similarly be installed in a \[ga]yt-dlp-plugins\[ga] directory under the executable location (recommended for portable installations):
+    * Binary: where \[ga]<root-dir>/yt-dlp.exe\[ga], \[ga]<root-dir>/yt-dlp-plugins/<package name>/yt_dlp_plugins/\[ga]
+    * Source: where \[ga]<root-dir>/yt_dlp/__main__.py\[ga], \[ga]<root-dir>/yt-dlp-plugins/<package name>/yt_dlp_plugins/\[ga]
+
+3. **pip and other locations in \[ga]PYTHONPATH\[ga]**
+    * Plugin packages can be installed and managed using \[ga]pip\[ga]. See [yt-dlp-sample-plugins](https://github.com/yt-dlp/yt-dlp-sample-plugins) for an example.
+      * Note: plugin files between plugin packages installed with pip must have unique filenames.
+    * Any path in \[ga]PYTHONPATH\[ga] is searched in for the \[ga]yt_dlp_plugins\[ga] namespace folder.
+      * Note: This does not apply for Pyinstaller/py2exe builds.
+
+
+\[ga].zip\[ga], \[ga].egg\[ga] and \[ga].whl\[ga] archives containing a \[ga]yt_dlp_plugins\[ga] namespace folder in their root are also supported as plugin packages.
+* e.g. \[ga]${XDG_CONFIG_HOME}/yt-dlp/plugins/mypluginpkg.zip\[ga] where \[ga]mypluginpkg.zip\[ga] contains \[ga]yt_dlp_plugins/<type>/myplugin.py\[ga]
+
+Run yt-dlp with \[ga]--verbose\[ga] to check if the plugin has been loaded.
+
+## Developing Plugins
+
+See the [yt-dlp-sample-plugins](https://github.com/yt-dlp/yt-dlp-sample-plugins) repo for a template plugin package and the [Plugin Development](https://github.com/yt-dlp/yt-dlp/wiki/Plugin-Development) section of the wiki for a plugin development guide.
+
+All public classes with a name ending in \[ga]IE\[ga]/\[ga]PP\[ga] are imported from each file for extractors and postprocessors repectively. This respects underscore prefix (e.g. \[ga]_MyBasePluginIE\[ga] is private) and \[ga]__all__\[ga]. Modules can similarly be excluded by prefixing the module name with an underscore (e.g. \[ga]_myplugin.py\[ga]).
+
+To replace an existing extractor with a subclass of one, set the \[ga]plugin_name\[ga] class keyword argument (e.g. \[ga]class MyPluginIE(ABuiltInIE, plugin_name=\[aq]myplugin\[aq])\[ga] will replace \[ga]ABuiltInIE\[ga] with \[ga]MyPluginIE\[ga]). Since the extractor replaces the parent, you should exclude the subclass extractor from being imported separately by making it private using one of the methods described above.
+
+If you are a plugin author, add [yt-dlp-plugins](https://github.com/topics/yt-dlp-plugins) as a topic to your repository for discoverability.
+
+See the [Developer Instructions](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#developer-instructions) on how to write and test an extractor.
+
+# EMBEDDING YT-DLP
+
+yt-dlp makes the best effort to be a good command-line program, and thus should be callable from any programming language.
+
+Your program should avoid parsing the normal stdout since they may change in future versions. Instead they should use options such as \[ga]-J\[ga], \[ga]--print\[ga], \[ga]--progress-template\[ga], \[ga]--exec\[ga] etc to create console output that you can reliably reproduce and parse.
+
+From a Python program, you can embed yt-dlp in a more powerful fashion, like this:
+
+\[ga]\[ga]\[ga]python
+from yt_dlp import YoutubeDL
+
+URLS = [\[aq]https://www.youtube.com/watch?v=BaW_jenozKc\[aq]]
+with YoutubeDL() as ydl:
+    ydl.download(URLS)
+\f[R]
+.fi
+.PP
+Most likely, you\[aq]ll want to use various options.
+For a list of options available, have a look at
+\f[C]yt_dlp/YoutubeDL.py\f[R] or \f[C]help(yt_dlp.YoutubeDL)\f[R] in a
+Python shell.
+If you are already familiar with the CLI, you can use
+\f[C]devscripts/cli_to_api.py\f[R] (https://github.com/yt-dlp/yt-dlp/blob/master/devscripts/cli_to_api.py)
+to translate any CLI switches to \f[C]YoutubeDL\f[R] params.
+.PP
+\f[B]Tip\f[R]: If you are porting your code from youtube-dl to yt-dlp,
+one important point to look out for is that we do not guarantee the
+return value of \f[C]YoutubeDL.extract_info\f[R] to be json
+serializable, or even be a dictionary.
+It will be dictionary-like, but if you want to ensure it is a
+serializable dictionary, pass it through
+\f[C]YoutubeDL.sanitize_info\f[R] as shown in the example below
+.SS Embedding examples
+.SS Extracting information
+.IP
+.nf
+\f[C]
+import json
+import yt_dlp
+
+URL = \[aq]https://www.youtube.com/watch?v=BaW_jenozKc\[aq]
+
+# \[u2139]\[uFE0F] See help(yt_dlp.YoutubeDL) for a list of available options and public functions
+ydl_opts = {}
+with yt_dlp.YoutubeDL(ydl_opts) as ydl:
+    info = ydl.extract_info(URL, download=False)
+
+    # \[u2139]\[uFE0F] ydl.sanitize_info makes the info json-serializable
+    print(json.dumps(ydl.sanitize_info(info)))
+\f[R]
+.fi
+.SS Download using an info-json
+.IP
+.nf
+\f[C]
+import yt_dlp
+
+INFO_FILE = \[aq]path/to/video.info.json\[aq]
+
+with yt_dlp.YoutubeDL() as ydl:
+    error_code = ydl.download_with_info_file(INFO_FILE)
+
+print(\[aq]Some videos failed to download\[aq] if error_code
+      else \[aq]All videos successfully downloaded\[aq])
+\f[R]
+.fi
+.SS Extract audio
+.IP
+.nf
+\f[C]
+import yt_dlp
+
+URLS = [\[aq]https://www.youtube.com/watch?v=BaW_jenozKc\[aq]]
+
+ydl_opts = {
+    \[aq]format\[aq]: \[aq]m4a/bestaudio/best\[aq],
+    # \[u2139]\[uFE0F] See help(yt_dlp.postprocessor) for a list of available Postprocessors and their arguments
+    \[aq]postprocessors\[aq]: [{  # Extract audio using ffmpeg
+        \[aq]key\[aq]: \[aq]FFmpegExtractAudio\[aq],
+        \[aq]preferredcodec\[aq]: \[aq]m4a\[aq],
+    }]
+}
+
+with yt_dlp.YoutubeDL(ydl_opts) as ydl:
+    error_code = ydl.download(URLS)
+\f[R]
+.fi
+.SS Filter videos
+.IP
+.nf
+\f[C]
+import yt_dlp
+
+URLS = [\[aq]https://www.youtube.com/watch?v=BaW_jenozKc\[aq]]
+
+def longer_than_a_minute(info, *, incomplete):
+    \[dq]\[dq]\[dq]Download only videos longer than a minute (or with unknown duration)\[dq]\[dq]\[dq]
+    duration = info.get(\[aq]duration\[aq])
+    if duration and duration < 60:
+        return \[aq]The video is too short\[aq]
+
+ydl_opts = {
+    \[aq]match_filter\[aq]: longer_than_a_minute,
+}
+
+with yt_dlp.YoutubeDL(ydl_opts) as ydl:
+    error_code = ydl.download(URLS)
+\f[R]
+.fi
+.SS Adding logger and progress hook
+.IP
+.nf
+\f[C]
+import yt_dlp
+
+URLS = [\[aq]https://www.youtube.com/watch?v=BaW_jenozKc\[aq]]
+
+class MyLogger:
+    def debug(self, msg):
+        # For compatibility with youtube-dl, both debug and info are passed into debug
+        # You can distinguish them by the prefix \[aq][debug] \[aq]
+        if msg.startswith(\[aq][debug] \[aq]):
+            pass
+        else:
+            self.info(msg)
+
+    def info(self, msg):
+        pass
+
+    def warning(self, msg):
+        pass
+
+    def error(self, msg):
+        print(msg)
+
+
+# \[u2139]\[uFE0F] See \[dq]progress_hooks\[dq] in help(yt_dlp.YoutubeDL)
+def my_hook(d):
+    if d[\[aq]status\[aq]] == \[aq]finished\[aq]:
+        print(\[aq]Done downloading, now post-processing ...\[aq])
+
+
+ydl_opts = {
+    \[aq]logger\[aq]: MyLogger(),
+    \[aq]progress_hooks\[aq]: [my_hook],
+}
+
+with yt_dlp.YoutubeDL(ydl_opts) as ydl:
+    ydl.download(URLS)
+\f[R]
+.fi
+.SS Add a custom PostProcessor
+.IP
+.nf
+\f[C]
+import yt_dlp
+
+URLS = [\[aq]https://www.youtube.com/watch?v=BaW_jenozKc\[aq]]
+
+# \[u2139]\[uFE0F] See help(yt_dlp.postprocessor.PostProcessor)
+class MyCustomPP(yt_dlp.postprocessor.PostProcessor):
+    def run(self, info):
+        self.to_screen(\[aq]Doing stuff\[aq])
+        return [], info
+
+
+with yt_dlp.YoutubeDL() as ydl:
+    # \[u2139]\[uFE0F] \[dq]when\[dq] can take any value in yt_dlp.utils.POSTPROCESS_WHEN
+    ydl.add_post_processor(MyCustomPP(), when=\[aq]pre_process\[aq])
+    ydl.download(URLS)
+\f[R]
+.fi
+.SS Use a custom format selector
+.IP
+.nf
+\f[C]
+import yt_dlp
+
+URLS = [\[aq]https://www.youtube.com/watch?v=BaW_jenozKc\[aq]]
+
+def format_selector(ctx):
+    \[dq]\[dq]\[dq] Select the best video and the best audio that won\[aq]t result in an mkv.
+    NOTE: This is just an example and does not handle all cases \[dq]\[dq]\[dq]
+
+    # formats are already sorted worst to best
+    formats = ctx.get(\[aq]formats\[aq])[::-1]
+
+    # acodec=\[aq]none\[aq] means there is no audio
+    best_video = next(f for f in formats
+                      if f[\[aq]vcodec\[aq]] != \[aq]none\[aq] and f[\[aq]acodec\[aq]] == \[aq]none\[aq])
+
+    # find compatible audio extension
+    audio_ext = {\[aq]mp4\[aq]: \[aq]m4a\[aq], \[aq]webm\[aq]: \[aq]webm\[aq]}[best_video[\[aq]ext\[aq]]]
+    # vcodec=\[aq]none\[aq] means there is no video
+    best_audio = next(f for f in formats if (
+        f[\[aq]acodec\[aq]] != \[aq]none\[aq] and f[\[aq]vcodec\[aq]] == \[aq]none\[aq] and f[\[aq]ext\[aq]] == audio_ext))
+
+    # These are the minimum required fields for a merged format
+    yield {
+        \[aq]format_id\[aq]: f\[aq]{best_video[\[dq]format_id\[dq]]}+{best_audio[\[dq]format_id\[dq]]}\[aq],
+        \[aq]ext\[aq]: best_video[\[aq]ext\[aq]],
+        \[aq]requested_formats\[aq]: [best_video, best_audio],
+        # Must be + separated list of protocols
+        \[aq]protocol\[aq]: f\[aq]{best_video[\[dq]protocol\[dq]]}+{best_audio[\[dq]protocol\[dq]]}\[aq]
+    }
+
+
+ydl_opts = {
+    \[aq]format\[aq]: format_selector,
+}
+
+with yt_dlp.YoutubeDL(ydl_opts) as ydl:
+    ydl.download(URLS)
+\f[R]
+.fi
+.SH NEW FEATURES
+.IP \[bu] 2
+Forked from
+\f[B]yt-dlc\[at]f9401f2\f[R] (https://github.com/blackjack4494/yt-dlc/commit/f9401f2a91987068139c5f757b12fc711d4c0cee)
+and merged with
+\f[B]youtube-dl\[at]be008e6\f[R] (https://github.com/ytdl-org/youtube-dl/commit/be008e657d79832642e2158557c899249c9e31cd)
+(exceptions (https://github.com/yt-dlp/yt-dlp/issues/21))
+.IP \[bu] 2
+\f[B]SponsorBlock Integration\f[R]: You can mark/remove sponsor sections
+in YouTube videos by utilizing the
+SponsorBlock (https://sponsor.ajay.app) API
+.IP \[bu] 2
+\f[B]Format Sorting\f[R]: The default format sorting options have been
+changed so that higher resolution and better codecs will be now
+preferred instead of simply using larger bitrate.
+Furthermore, you can now specify the sort order using \f[C]-S\f[R].
+This allows for much easier format selection than what is possible by
+simply using \f[C]--format\f[R] (examples)
+.IP \[bu] 2
+\f[B]Merged with animelover1984/youtube-dl\f[R]: You get most of the
+features and improvements from
+animelover1984/youtube-dl (https://github.com/animelover1984/youtube-dl)
+including \f[C]--write-comments\f[R], \f[C]BiliBiliSearch\f[R],
+\f[C]BilibiliChannel\f[R], Embedding thumbnail in mp4/ogg/opus, playlist
+infojson etc.
+Note that NicoNico livestreams are not available.
+See #31 (https://github.com/yt-dlp/yt-dlp/pull/31) for details.
+.IP \[bu] 2
+\f[B]YouTube improvements\f[R]:
+.RS 2
+.IP \[bu] 2
+Supports Clips, Stories (\f[C]ytstories:<channel UCID>\f[R]), Search
+(including filters)\f[B]*\f[R], YouTube Music Search, Channel-specific
+search, Search prefixes (\f[C]ytsearch:\f[R],
+\f[C]ytsearchdate:\f[R])\f[B]*\f[R], Mixes, and Feeds (\f[C]:ytfav\f[R],
+\f[C]:ytwatchlater\f[R], \f[C]:ytsubs\f[R], \f[C]:ythistory\f[R],
+\f[C]:ytrec\f[R], \f[C]:ytnotif\f[R])
+.IP \[bu] 2
+Fix for n-sig based
+throttling (https://github.com/ytdl-org/youtube-dl/issues/29326)
+\f[B]*\f[R]
+.IP \[bu] 2
+Supports some (but not all) age-gated content without cookies
+.IP \[bu] 2
+Download livestreams from the start using \f[C]--live-from-start\f[R]
+(\f[I]experimental\f[R])
+.IP \[bu] 2
+Channel URLs download all uploads of the channel, including shorts and
+live
+.RE
+.IP \[bu] 2
+\f[B]Cookies from browser\f[R]: Cookies can be automatically extracted
+from all major web browsers using
+\f[C]--cookies-from-browser BROWSER[+KEYRING][:PROFILE][::CONTAINER]\f[R]
+.IP \[bu] 2
+\f[B]Download time range\f[R]: Videos can be downloaded partially based
+on either timestamps or chapters using \f[C]--download-sections\f[R]
+.IP \[bu] 2
+\f[B]Split video by chapters\f[R]: Videos can be split into multiple
+files based on chapters using \f[C]--split-chapters\f[R]
+.IP \[bu] 2
+\f[B]Multi-threaded fragment downloads\f[R]: Download multiple fragments
+of m3u8/mpd videos in parallel.
+Use \f[C]--concurrent-fragments\f[R] (\f[C]-N\f[R]) option to set the
+number of threads used
+.IP \[bu] 2
+\f[B]Aria2c with HLS/DASH\f[R]: You can use \f[C]aria2c\f[R] as the
+external downloader for DASH(mpd) and HLS(m3u8) formats
+.IP \[bu] 2
+\f[B]New and fixed extractors\f[R]: Many new extractors have been added
+and a lot of existing ones have been fixed.
+See the changelog or the list of supported sites
+.IP \[bu] 2
+\f[B]New MSOs\f[R]: Philo, Spectrum, SlingTV, Cablevision, RCN etc.
+.IP \[bu] 2
+\f[B]Subtitle extraction from manifests\f[R]: Subtitles can be extracted
+from streaming media manifests.
+See
+commit/be6202f (https://github.com/yt-dlp/yt-dlp/commit/be6202f12b97858b9d716e608394b51065d0419f)
+for details
+.IP \[bu] 2
+\f[B]Multiple paths and output templates\f[R]: You can give different
+output templates and download paths for different types of files.
+You can also set a temporary path where intermediary files are
+downloaded to using \f[C]--paths\f[R] (\f[C]-P\f[R])
+.IP \[bu] 2
+\f[B]Portable Configuration\f[R]: Configuration files are automatically
+loaded from the home and root directories.
+See CONFIGURATION for details
+.IP \[bu] 2
+\f[B]Output template improvements\f[R]: Output templates can now have
+date-time formatting, numeric offsets, object traversal etc.
+See output template for details.
+Even more advanced operations can also be done with the help of
+\f[C]--parse-metadata\f[R] and \f[C]--replace-in-metadata\f[R]
+.IP \[bu] 2
+\f[B]Other new options\f[R]: Many new options have been added such as
+\f[C]--alias\f[R], \f[C]--print\f[R], \f[C]--concat-playlist\f[R],
+\f[C]--wait-for-video\f[R], \f[C]--retry-sleep\f[R],
+\f[C]--sleep-requests\f[R], \f[C]--convert-thumbnails\f[R],
+\f[C]--force-download-archive\f[R], \f[C]--force-overwrites\f[R],
+\f[C]--break-match-filter\f[R] etc
+.IP \[bu] 2
+\f[B]Improvements\f[R]: Regex and other operators in
+\f[C]--format\f[R]/\f[C]--match-filter\f[R], multiple
+\f[C]--postprocessor-args\f[R] and \f[C]--downloader-args\f[R], faster
+archive checking, more format selection options, merge
+multi-video/audio, multiple \f[C]--config-locations\f[R],
+\f[C]--exec\f[R] at different stages, etc
+.IP \[bu] 2
+\f[B]Plugins\f[R]: Extractors and PostProcessors can be loaded from an
+external file.
+See plugins for details
+.IP \[bu] 2
+\f[B]Self updater\f[R]: The releases can be updated using
+\f[C]yt-dlp -U\f[R], and downgraded using \f[C]--update-to\f[R] if
+required
+.IP \[bu] 2
+\f[B]Automated builds\f[R]: Nightly/master builds can be used with
+\f[C]--update-to nightly\f[R] and \f[C]--update-to master\f[R]
+.PP
+See changelog or commits (https://github.com/yt-dlp/yt-dlp/commits) for
+the full list of changes
+.PP
+Features marked with a \f[B]*\f[R] have been back-ported to youtube-dl
+.SS Differences in default behavior
+.PP
+Some of yt-dlp\[aq]s default options are different from that of
+youtube-dl and youtube-dlc:
+.IP \[bu] 2
+yt-dlp supports only Python 3.8+, and \f[I]may\f[R] remove support for
+more versions as they become
+EOL (https://devguide.python.org/versions/#python-release-cycle); while
+youtube-dl still supports Python 2.6+ and
+3.2+ (https://github.com/ytdl-org/youtube-dl/issues/30568#issue-1118238743)
+.IP \[bu] 2
+The options \f[C]--auto-number\f[R] (\f[C]-A\f[R]), \f[C]--title\f[R]
+(\f[C]-t\f[R]) and \f[C]--literal\f[R] (\f[C]-l\f[R]), no longer work.
+See removed options for details
+.IP \[bu] 2
+\f[C]avconv\f[R] is not supported as an alternative to \f[C]ffmpeg\f[R]
+.IP \[bu] 2
+yt-dlp stores config files in slightly different locations to
+youtube-dl.
+See CONFIGURATION for a list of correct locations
+.IP \[bu] 2
+The default output template is \f[C]%(title)s [%(id)s].%(ext)s\f[R].
+There is no real reason for this change.
+This was changed before yt-dlp was ever made public and now there are no
+plans to change it back to \f[C]%(title)s-%(id)s.%(ext)s\f[R].
+Instead, you may use \f[C]--compat-options filename\f[R]
+.IP \[bu] 2
+The default format sorting is different from youtube-dl and prefers
+higher resolution and better codecs rather than higher bitrates.
+You can use the \f[C]--format-sort\f[R] option to change this to any
+order you prefer, or use \f[C]--compat-options format-sort\f[R] to use
+youtube-dl\[aq]s sorting order
+.IP \[bu] 2
+The default format selector is \f[C]bv*+ba/b\f[R].
+This means that if a combined video + audio format that is better than
+the best video-only format is found, the former will be preferred.
+Use \f[C]-f bv+ba/b\f[R] or \f[C]--compat-options format-spec\f[R] to
+revert this
+.IP \[bu] 2
+Unlike youtube-dlc, yt-dlp does not allow merging multiple audio/video
+streams into one file by default (since this conflicts with the use of
+\f[C]-f bv*+ba\f[R]).
+If needed, this feature must be enabled using
+\f[C]--audio-multistreams\f[R] and \f[C]--video-multistreams\f[R].
+You can also use \f[C]--compat-options multistreams\f[R] to enable both
+.IP \[bu] 2
+\f[C]--no-abort-on-error\f[R] is enabled by default.
+Use \f[C]--abort-on-error\f[R] or
+\f[C]--compat-options abort-on-error\f[R] to abort on errors instead
+.IP \[bu] 2
+When writing metadata files such as thumbnails, description or infojson,
+the same information (if available) is also written for playlists.
+Use \f[C]--no-write-playlist-metafiles\f[R] or
+\f[C]--compat-options no-playlist-metafiles\f[R] to not write these
+files
+.IP \[bu] 2
+\f[C]--add-metadata\f[R] attaches the \f[C]infojson\f[R] to
+\f[C]mkv\f[R] files in addition to writing the metadata when used with
+\f[C]--write-info-json\f[R].
+Use \f[C]--no-embed-info-json\f[R] or
+\f[C]--compat-options no-attach-info-json\f[R] to revert this
+.IP \[bu] 2
+Some metadata are embedded into different fields when using
+\f[C]--add-metadata\f[R] as compared to youtube-dl.
+Most notably, \f[C]comment\f[R] field contains the \f[C]webpage_url\f[R]
+and \f[C]synopsis\f[R] contains the \f[C]description\f[R].
+You can use \f[C]--parse-metadata\f[R] to modify this to your liking or
+use \f[C]--compat-options embed-metadata\f[R] to revert this
+.IP \[bu] 2
+\f[C]playlist_index\f[R] behaves differently when used with options like
+\f[C]--playlist-reverse\f[R] and \f[C]--playlist-items\f[R].
+See #302 (https://github.com/yt-dlp/yt-dlp/issues/302) for details.
+You can use \f[C]--compat-options playlist-index\f[R] if you want to
+keep the earlier behavior
+.IP \[bu] 2
+The output of \f[C]-F\f[R] is listed in a new format.
+Use \f[C]--compat-options list-formats\f[R] to revert this
+.IP \[bu] 2
+Live chats (if available) are considered as subtitles.
+Use \f[C]--sub-langs all,-live_chat\f[R] to download all subtitles
+except live chat.
+You can also use \f[C]--compat-options no-live-chat\f[R] to prevent any
+live chat/danmaku from downloading
+.IP \[bu] 2
+YouTube channel URLs download all uploads of the channel.
+To download only the videos in a specific tab, pass the tab\[aq]s URL.
+If the channel does not show the requested tab, an error will be raised.
+Also, \f[C]/live\f[R] URLs raise an error if there are no live videos
+instead of silently downloading the entire channel.
+You may use \f[C]--compat-options no-youtube-channel-redirect\f[R] to
+revert all these redirections
+.IP \[bu] 2
+Unavailable videos are also listed for YouTube playlists.
+Use \f[C]--compat-options no-youtube-unavailable-videos\f[R] to remove
+this
+.IP \[bu] 2
+The upload dates extracted from YouTube are in UTC when
+available (https://github.com/yt-dlp/yt-dlp/blob/89e4d86171c7b7c997c77d4714542e0383bf0db0/yt_dlp/extractor/youtube.py#L3898-L3900).
+Use \f[C]--compat-options no-youtube-prefer-utc-upload-date\f[R] to
+prefer the non-UTC upload date.
+.IP \[bu] 2
+If \f[C]ffmpeg\f[R] is used as the downloader, the downloading and
+merging of formats happen in a single step when possible.
+Use \f[C]--compat-options no-direct-merge\f[R] to revert this
+.IP \[bu] 2
+Thumbnail embedding in \f[C]mp4\f[R] is done with mutagen if possible.
+Use \f[C]--compat-options embed-thumbnail-atomicparsley\f[R] to force
+the use of AtomicParsley instead
+.IP \[bu] 2
+Some internal metadata such as filenames are removed by default from the
+infojson.
+Use \f[C]--no-clean-infojson\f[R] or
+\f[C]--compat-options no-clean-infojson\f[R] to revert this
+.IP \[bu] 2
+When \f[C]--embed-subs\f[R] and \f[C]--write-subs\f[R] are used
+together, the subtitles are written to disk and also embedded in the
+media file.
+You can use just \f[C]--embed-subs\f[R] to embed the subs and
+automatically delete the separate file.
+See #630
+(comment) (https://github.com/yt-dlp/yt-dlp/issues/630#issuecomment-893659460)
+for more info.
+\f[C]--compat-options no-keep-subs\f[R] can be used to revert this
+.IP \[bu] 2
+\f[C]certifi\f[R] will be used for SSL root certificates, if installed.
+If you want to use system certificates (e.g.
+self-signed), use \f[C]--compat-options no-certifi\f[R]
+.IP \[bu] 2
+yt-dlp\[aq]s sanitization of invalid characters in filenames is
+different/smarter than in youtube-dl.
+You can use \f[C]--compat-options filename-sanitization\f[R] to revert
+to youtube-dl\[aq]s behavior
+.IP \[bu] 2
+yt-dlp tries to parse the external downloader outputs into the standard
+progress output if possible (Currently implemented:
+[STRIKEOUT:aria2c] (https://github.com/yt-dlp/yt-dlp/issues/5931)).
+You can use \f[C]--compat-options no-external-downloader-progress\f[R]
+to get the downloader output as-is
+.IP \[bu] 2
+yt-dlp versions between 2021.09.01 and 2023.01.02 applies
+\f[C]--match-filter\f[R] to nested playlists.
+This was an unintentional side-effect of
+8f18ac (https://github.com/yt-dlp/yt-dlp/commit/8f18aca8717bb0dd49054555af8d386e5eda3a88)
+and is fixed in
+d7b460 (https://github.com/yt-dlp/yt-dlp/commit/d7b460d0e5fc710950582baed2e3fc616ed98a80).
+Use \f[C]--compat-options playlist-match-filter\f[R] to revert this
+.IP \[bu] 2
+yt-dlp versions between 2021.11.10 and 2023.06.21 estimated
+\f[C]filesize_approx\f[R] values for fragmented/manifest formats.
+This was added for convenience in
+f2fe69 (https://github.com/yt-dlp/yt-dlp/commit/f2fe69c7b0d208bdb1f6292b4ae92bc1e1a7444a),
+but was reverted in
+0dff8e (https://github.com/yt-dlp/yt-dlp/commit/0dff8e4d1e6e9fb938f4256ea9af7d81f42fd54f)
+due to the potentially extreme inaccuracy of the estimated values.
+Use \f[C]--compat-options manifest-filesize-approx\f[R] to keep
+extracting the estimated values
+.IP \[bu] 2
+yt-dlp uses modern http client backends such as \f[C]requests\f[R].
+Use \f[C]--compat-options prefer-legacy-http-handler\f[R] to prefer the
+legacy http handler (\f[C]urllib\f[R]) to be used for standard http
+requests.
+.IP \[bu] 2
+The sub-module \f[C]swfinterp\f[R] is removed.
+.PP
+For ease of use, a few more compat options are available:
+.IP \[bu] 2
+\f[C]--compat-options all\f[R]: Use all compat options (Do NOT use)
+.IP \[bu] 2
+\f[C]--compat-options youtube-dl\f[R]: Same as
+\f[C]--compat-options all,-multistreams,-playlist-match-filter,-manifest-filesize-approx\f[R]
+.IP \[bu] 2
+\f[C]--compat-options youtube-dlc\f[R]: Same as
+\f[C]--compat-options all,-no-live-chat,-no-youtube-channel-redirect,-playlist-match-filter,-manifest-filesize-approx\f[R]
+.IP \[bu] 2
+\f[C]--compat-options 2021\f[R]: Same as
+\f[C]--compat-options 2022,no-certifi,filename-sanitization,no-youtube-prefer-utc-upload-date\f[R]
+.IP \[bu] 2
+\f[C]--compat-options 2022\f[R]: Same as
+\f[C]--compat-options playlist-match-filter,no-external-downloader-progress,prefer-legacy-http-handler,manifest-filesize-approx\f[R].
+Use this to enable all future compat options
+.SH DEPRECATED OPTIONS
+.PP
+These are all the deprecated options and the current alternative to
+achieve the same effect
+.SS Almost redundant options
+.PP
+While these options are almost the same as their new counterparts, there
+are some differences that prevents them being redundant
+.IP
+.nf
+\f[C]
+-j, --dump-json                  --print \[dq]%()j\[dq]
+-F, --list-formats               --print formats_table
+--list-thumbnails                --print thumbnails_table --print playlist:thumbnails_table
+--list-subs                      --print automatic_captions_table --print subtitles_table
+\f[R]
+.fi
+.SS Redundant options
+.PP
+While these options are redundant, they are still expected to be used
+due to their ease of use
+.IP
+.nf
+\f[C]
+--get-description                --print description
+--get-duration                   --print duration_string
+--get-filename                   --print filename
+--get-format                     --print format
+--get-id                         --print id
+--get-thumbnail                  --print thumbnail
+-e, --get-title                  --print title
+-g, --get-url                    --print urls
+--match-title REGEX              --match-filter \[dq]title \[ti]= (?i)REGEX\[dq]
+--reject-title REGEX             --match-filter \[dq]title !\[ti]= (?i)REGEX\[dq]
+--min-views COUNT                --match-filter \[dq]view_count >=? COUNT\[dq]
+--max-views COUNT                --match-filter \[dq]view_count <=? COUNT\[dq]
+--break-on-reject                Use --break-match-filter
+--user-agent UA                  --add-header \[dq]User-Agent:UA\[dq]
+--referer URL                    --add-header \[dq]Referer:URL\[dq]
+--playlist-start NUMBER          -I NUMBER:
+--playlist-end NUMBER            -I :NUMBER
+--playlist-reverse               -I ::-1
+--no-playlist-reverse            Default
+--no-colors                      --color no_color
+\f[R]
+.fi
+.SS Not recommended
+.PP
+While these options still work, their use is not recommended since there
+are other alternatives to achieve the same
+.IP
+.nf
+\f[C]
+--force-generic-extractor        --ies generic,default
+--exec-before-download CMD       --exec \[dq]before_dl:CMD\[dq]
+--no-exec-before-download        --no-exec
+--all-formats                    -f all
+--all-subs                       --sub-langs all --write-subs
+--print-json                     -j --no-simulate
+--autonumber-size NUMBER         Use string formatting, e.g. %(autonumber)03d
+--autonumber-start NUMBER        Use internal field formatting like %(autonumber+NUMBER)s
+--id                             -o \[dq]%(id)s.%(ext)s\[dq]
+--metadata-from-title FORMAT     --parse-metadata \[dq]%(title)s:FORMAT\[dq]
+--hls-prefer-native              --downloader \[dq]m3u8:native\[dq]
+--hls-prefer-ffmpeg              --downloader \[dq]m3u8:ffmpeg\[dq]
+--list-formats-old               --compat-options list-formats (Alias: --no-list-formats-as-table)
+--list-formats-as-table          --compat-options -list-formats [Default] (Alias: --no-list-formats-old)
+--youtube-skip-dash-manifest     --extractor-args \[dq]youtube:skip=dash\[dq] (Alias: --no-youtube-include-dash-manifest)
+--youtube-skip-hls-manifest      --extractor-args \[dq]youtube:skip=hls\[dq] (Alias: --no-youtube-include-hls-manifest)
+--youtube-include-dash-manifest  Default (Alias: --no-youtube-skip-dash-manifest)
+--youtube-include-hls-manifest   Default (Alias: --no-youtube-skip-hls-manifest)
+--geo-bypass                     --xff \[dq]default\[dq]
+--no-geo-bypass                  --xff \[dq]never\[dq]
+--geo-bypass-country CODE        --xff CODE
+--geo-bypass-ip-block IP_BLOCK   --xff IP_BLOCK
+\f[R]
+.fi
+.SS Developer options
+.PP
+These options are not intended to be used by the end-user
+.IP
+.nf
+\f[C]
+--test                           Download only part of video for testing extractors
+--load-pages                     Load pages dumped by --write-pages
+--youtube-print-sig-code         For testing youtube signatures
+--allow-unplayable-formats       List unplayable formats also
+--no-allow-unplayable-formats    Default
+\f[R]
+.fi
+.SS Old aliases
+.PP
+These are aliases that are no longer documented for various reasons
+.IP
+.nf
+\f[C]
+--avconv-location                --ffmpeg-location
+--clean-infojson                 --clean-info-json
+--cn-verification-proxy URL      --geo-verification-proxy URL
+--dump-headers                   --print-traffic
+--dump-intermediate-pages        --dump-pages
+--force-write-download-archive   --force-write-archive
+--load-info                      --load-info-json
+--no-clean-infojson              --no-clean-info-json
+--no-split-tracks                --no-split-chapters
+--no-write-srt                   --no-write-subs
+--prefer-unsecure                --prefer-insecure
+--rate-limit RATE                --limit-rate RATE
+--split-tracks                   --split-chapters
+--srt-lang LANGS                 --sub-langs LANGS
+--trim-file-names LENGTH         --trim-filenames LENGTH
+--write-srt                      --write-subs
+--yes-overwrites                 --force-overwrites
+\f[R]
+.fi
+.SS Sponskrub Options
+.PP
+Support for SponSkrub (https://github.com/faissaloo/SponSkrub) has been
+deprecated in favor of the \f[C]--sponsorblock\f[R] options
+.IP
+.nf
+\f[C]
+--sponskrub                      --sponsorblock-mark all
+--no-sponskrub                   --no-sponsorblock
+--sponskrub-cut                  --sponsorblock-remove all
+--no-sponskrub-cut               --sponsorblock-remove -all
+--sponskrub-force                Not applicable
+--no-sponskrub-force             Not applicable
+--sponskrub-location             Not applicable
+--sponskrub-args                 Not applicable
+\f[R]
+.fi
+.SS No longer supported
+.PP
+These options may no longer work as intended
+.IP
+.nf
+\f[C]
+--prefer-avconv                  avconv is not officially supported by yt-dlp (Alias: --no-prefer-ffmpeg)
+--prefer-ffmpeg                  Default (Alias: --no-prefer-avconv)
+-C, --call-home                  Not implemented
+--no-call-home                   Default
+--include-ads                    No longer supported
+--no-include-ads                 Default
+--write-annotations              No supported site has annotations now
+--no-write-annotations           Default
+--compat-options seperate-video-versions  No longer needed
+\f[R]
+.fi
+.SS Removed
+.PP
+These options were deprecated since 2014 and have now been entirely
+removed
+.IP
+.nf
+\f[C]
+-A, --auto-number                -o \[dq]%(autonumber)s-%(id)s.%(ext)s\[dq]
+-t, -l, --title, --literal       -o \[dq]%(title)s-%(id)s.%(ext)s\[dq]
+\f[R]
+.fi
+.SH CONTRIBUTING
+.PP
+See CONTRIBUTING.md for instructions on Opening an Issue and
+Contributing code to the project
+.SH WIKI
+.PP
+See the Wiki (https://github.com/yt-dlp/yt-dlp/wiki) for more
+information
diff --git a/network/yt-dlp/yt-dlp.SlackBuild b/network/yt-dlp/yt-dlp.SlackBuild
new file mode 100644
index 0000000000..856b1eb1d0
--- /dev/null
+++ b/network/yt-dlp/yt-dlp.SlackBuild
@@ -0,0 +1,93 @@
+#!/bin/bash
+
+# Slackware build script for yt-dlp
+
+# Written by B. Watson (urchlay@slackware.uk)
+
+# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
+
+# Note: I honestly prefer the standalone executable version of this,
+# which I keep in ~/bin. It allows me to run "yt-dlp -U" as my user to
+# get the latest version. However, since it's listed as a dependency
+# for clipgrab, haruna, xdman, ytfzf, and an optional dependency for
+# pipe-viewer, it has to exist on SBo.
+
+# 20240313 bkw:
+# - updated for v2024.03.10
+# - build method changed (python3 -m build, rather than setup.py)
+# - upstream managed to lose the man page, so include the man page
+#   from the previous version (should be OK for now at least).
+# - switch to github archive/ URL, since pythonhosted.org doesn't have
+#   this version (yet?). filename still has the version number in it.
+
+# 20240217 bkw: switched to pythonhosted.org source tarball, thanks
+# to Jeremy Hansen for finding this. Filename now has the version
+# number in it, so no more caching problems for the download. Build
+# had to change slightly as there's no more CONTRIBUTING file.
+# 20240216 bkw: updated for v2023.12.30
+# 20231219 bkw: updated for v2023.11.16
+# 20231031 bkw: updated for v2023.10.13
+# 20230904 bkw: BUILD=2, silence complaints from 'pip3 check'
+# 20230711 bkw: updated for v2023.07.06
+# 20230623 bkw: updated for v2023.06.22, added version check
+# 20230402 bkw: updated for v2023.03.04
+# 20230222 bkw: updated for v2023.02.17
+# 20230104 bkw: updated for v2023.01.02
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=yt-dlp
+VERSION=${VERSION:-2024.03.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}
+
+# no need for CFLAGS or LIBDIRSUFFIX. actually this would be noarch,
+# except for the lib vs. lib64 python problem.
+
+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 -m build --wheel --no-isolation
+python3 -m installer --destdir "$PKG" dist/*.whl
+
+mkdir -p $PKG/usr/man/man1
+gzip -9c < $CWD/$PRGNAM.1 > $PKG/usr/man/man1/$PRGNAM.1.gz
+
+# AUTHORS is 0 bytes in 2022.01.21 (still is, in 2023.03.04).
+PKGDOC=$PKG/usr/doc/$PRGNAM-$VERSION
+mkdir -p $PKGDOC
+cp -a LICENSE *.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/network/yt-dlp/yt-dlp.info b/network/yt-dlp/yt-dlp.info
new file mode 100644
index 0000000000..ce2ce121a3
--- /dev/null
+++ b/network/yt-dlp/yt-dlp.info
@@ -0,0 +1,10 @@
+PRGNAM="yt-dlp"
+VERSION="2024.03.10"
+HOMEPAGE="https://github.com/yt-dlp/yt-dlp"
+DOWNLOAD="https://github.com/yt-dlp/yt-dlp/archive/2024.03.10/yt-dlp-2024.03.10.tar.gz"
+MD5SUM="1a7525eabc062011fea20ce97a93f0ac"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="python3-build python3-hatchling"
+MAINTAINER="B. Watson"
+EMAIL="urchlay@slackware.uk"
diff --git a/network/ytfzf/README b/network/ytfzf/README
new file mode 100644
index 0000000000..d6706d1dc9
--- /dev/null
+++ b/network/ytfzf/README
@@ -0,0 +1,10 @@
+ytfzf (Script to watch youtube videos from the terminal)
+
+ytfzf is a script to search, download and play YouTube videos by 
+making use of mpv and youtube-dl under the hood. ytfzf also features 
+support for video history, allows choosing the media format and can 
+queue multiple tracks. 
+
+Optional dependencies include dmenu for the -D option and ueberzugpp 
+for thumbnails. Alternative thumbnail viewers include chafa, imv, 
+mpv, and kitty, though they require special configuration to use.
diff --git a/network/ytfzf/slack-desc b/network/ytfzf/slack-desc
new file mode 100644
index 0000000000..85adc7c510
--- /dev/null
+++ b/network/ytfzf/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+     |-----handy-ruler------------------------------------------------------|
+ytfzf: ytfzf (Script to watch youtube videos from the terminal)
+ytfzf:
+ytfzf: ytfzf is a script to search, download and play YouTube videos by 
+ytfzf: making use of mpv and youtube-dl under the hood. ytfzf also features 
+ytfzf: support for video history, allows choosing the media format and can 
+ytfzf: queue multiple tracks. 
+ytfzf:
+ytfzf:
+ytfzf:
+ytfzf: Homepage: https://github.com/pystardust/ytfzf
+ytfzf:
diff --git a/network/ytfzf/ytfzf.SlackBuild b/network/ytfzf/ytfzf.SlackBuild
new file mode 100644
index 0000000000..d4e13627e2
--- /dev/null
+++ b/network/ytfzf/ytfzf.SlackBuild
@@ -0,0 +1,77 @@
+#!/bin/bash
+
+# Slackware build script for ytfzf
+
+# 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=ytfzf
+VERSION=${VERSION:-2.6.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 install doc addons \
+  DESTDIR=$PKG \
+  PREFIX=/usr \
+  DOCDIR=/usr/doc/$PRGNAM-$VERSION \
+  MANDIR=/usr/man \
+  LICENSEDIR=/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
+
+cp -a \
+  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
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/network/ytfzf/ytfzf.info b/network/ytfzf/ytfzf.info
new file mode 100644
index 0000000000..c3eec16ca9
--- /dev/null
+++ b/network/ytfzf/ytfzf.info
@@ -0,0 +1,10 @@
+PRGNAM="ytfzf"
+VERSION="2.6.2"
+HOMEPAGE="https://github.com/pystardust/ytfzf"
+DOWNLOAD="https://github.com/pystardust/ytfzf/archive/v2.6.2/ytfzf-2.6.2.tar.gz"
+MD5SUM="b52c07da4c6b6609cdc315f2e1e5f137"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="fzf jq mpv yt-dlp"
+MAINTAINER="Samuel Young"
+EMAIL="samyoung12788@gmail.com"
diff --git a/network/yturl/README b/network/yturl/README
deleted file mode 100644
index cbf181691a..0000000000
--- a/network/yturl/README
+++ /dev/null
@@ -1,6 +0,0 @@
-yturl (get direct URLs to YouTube videos)
-
-yturl is a simple command-line utility written in Python. It converts
-youtube URLs or video IDs into directly-watchable URLs. Example use:
-
-mpv "$(yturl 'http://www.youtube.com/watch?v=KxaCOHT0pmI')"
diff --git a/network/yturl/slack-desc b/network/yturl/slack-desc
deleted file mode 100644
index e02591739e..0000000000
--- a/network/yturl/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------------------------------------------------------|
-yturl: yturl (get direct URLs to YouTube videos)
-yturl:
-yturl: yturl is a simple command-line utility written in Python. It converts
-yturl: youtube URLs or video IDs into directly-watchable URLs. Example use:
-yturl:
-yturl: mpv "$(yturl 'http://www.youtube.com/watch?v=KxaCOHT0pmI')"
-yturl:
-yturl:
-yturl:
-yturl:
-yturl:
diff --git a/network/yturl/yturl.1 b/network/yturl/yturl.1
deleted file mode 100644
index fe3c5eb244..0000000000
--- a/network/yturl/yturl.1
+++ /dev/null
@@ -1,180 +0,0 @@
-.\" Automatically generated by Pod::Man 2.27 (Pod::Simple 3.28)
-.\"
-.\" Standard preamble:
-.\" ========================================================================
-.de Sp \" Vertical space (when we can't use .PP)
-.if t .sp .5v
-.if n .sp
-..
-.de Vb \" Begin verbatim text
-.ft CW
-.nf
-.ne \\$1
-..
-.de Ve \" End verbatim text
-.ft R
-.fi
-..
-.\" Set up some character translations and predefined strings.  \*(-- will
-.\" give an unbreakable dash, \*(PI will give pi, \*(L" will give a left
-.\" double quote, and \*(R" will give a right double quote.  \*(C+ will
-.\" give a nicer C++.  Capital omega is used to do unbreakable dashes and
-.\" therefore won't be available.  \*(C` and \*(C' expand to `' in nroff,
-.\" nothing in troff, for use with C<>.
-.tr \(*W-
-.ds C+ C\v'-.1v'\h'-1p'\s-2+\h'-1p'+\s0\v'.1v'\h'-1p'
-.ie n \{\
-.    ds -- \(*W-
-.    ds PI pi
-.    if (\n(.H=4u)&(1m=24u) .ds -- \(*W\h'-12u'\(*W\h'-12u'-\" diablo 10 pitch
-.    if (\n(.H=4u)&(1m=20u) .ds -- \(*W\h'-12u'\(*W\h'-8u'-\"  diablo 12 pitch
-.    ds L" ""
-.    ds R" ""
-.    ds C` ""
-.    ds C' ""
-'br\}
-.el\{\
-.    ds -- \|\(em\|
-.    ds PI \(*p
-.    ds L" ``
-.    ds R" ''
-.    ds C`
-.    ds C'
-'br\}
-.\"
-.\" Escape single quotes in literal strings from groff's Unicode transform.
-.ie \n(.g .ds Aq \(aq
-.el       .ds Aq '
-.\"
-.\" If the F register is turned on, we'll generate index entries on stderr for
-.\" titles (.TH), headers (.SH), subsections (.SS), items (.Ip), and index
-.\" entries marked with X<> in POD.  Of course, you'll have to process the
-.\" output yourself in some meaningful fashion.
-.\"
-.\" Avoid warning from groff about undefined register 'F'.
-.de IX
-..
-.nr rF 0
-.if \n(.g .if rF .nr rF 1
-.if (\n(rF:(\n(.g==0)) \{
-.    if \nF \{
-.        de IX
-.        tm Index:\\$1\t\\n%\t"\\$2"
-..
-.        if !\nF==2 \{
-.            nr % 0
-.            nr F 2
-.        \}
-.    \}
-.\}
-.rr rF
-.\"
-.\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2).
-.\" Fear.  Run.  Save yourself.  No user-serviceable parts.
-.    \" fudge factors for nroff and troff
-.if n \{\
-.    ds #H 0
-.    ds #V .8m
-.    ds #F .3m
-.    ds #[ \f1
-.    ds #] \fP
-.\}
-.if t \{\
-.    ds #H ((1u-(\\\\n(.fu%2u))*.13m)
-.    ds #V .6m
-.    ds #F 0
-.    ds #[ \&
-.    ds #] \&
-.\}
-.    \" simple accents for nroff and troff
-.if n \{\
-.    ds ' \&
-.    ds ` \&
-.    ds ^ \&
-.    ds , \&
-.    ds ~ ~
-.    ds /
-.\}
-.if t \{\
-.    ds ' \\k:\h'-(\\n(.wu*8/10-\*(#H)'\'\h"|\\n:u"
-.    ds ` \\k:\h'-(\\n(.wu*8/10-\*(#H)'\`\h'|\\n:u'
-.    ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'^\h'|\\n:u'
-.    ds , \\k:\h'-(\\n(.wu*8/10)',\h'|\\n:u'
-.    ds ~ \\k:\h'-(\\n(.wu-\*(#H-.1m)'~\h'|\\n:u'
-.    ds / \\k:\h'-(\\n(.wu*8/10-\*(#H)'\z\(sl\h'|\\n:u'
-.\}
-.    \" troff and (daisy-wheel) nroff accents
-.ds : \\k:\h'-(\\n(.wu*8/10-\*(#H+.1m+\*(#F)'\v'-\*(#V'\z.\h'.2m+\*(#F'.\h'|\\n:u'\v'\*(#V'
-.ds 8 \h'\*(#H'\(*b\h'-\*(#H'
-.ds o \\k:\h'-(\\n(.wu+\w'\(de'u-\*(#H)/2u'\v'-.3n'\*(#[\z\(de\v'.3n'\h'|\\n:u'\*(#]
-.ds d- \h'\*(#H'\(pd\h'-\w'~'u'\v'-.25m'\f2\(hy\fP\v'.25m'\h'-\*(#H'
-.ds D- D\\k:\h'-\w'D'u'\v'-.11m'\z\(hy\v'.11m'\h'|\\n:u'
-.ds th \*(#[\v'.3m'\s+1I\s-1\v'-.3m'\h'-(\w'I'u*2/3)'\s-1o\s+1\*(#]
-.ds Th \*(#[\s+2I\s-2\h'-\w'I'u*3/5'\v'-.3m'o\v'.3m'\*(#]
-.ds ae a\h'-(\w'a'u*4/10)'e
-.ds Ae A\h'-(\w'A'u*4/10)'E
-.    \" corrections for vroff
-.if v .ds ~ \\k:\h'-(\\n(.wu*9/10-\*(#H)'\s-2\u~\d\s+2\h'|\\n:u'
-.if v .ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'\v'-.4m'^\v'.4m'\h'|\\n:u'
-.    \" for low resolution devices (crt and lpr)
-.if \n(.H>23 .if \n(.V>19 \
-\{\
-.    ds : e
-.    ds 8 ss
-.    ds o a
-.    ds d- d\h'-1'\(ga
-.    ds D- D\h'-1'\(hy
-.    ds th \o'bp'
-.    ds Th \o'LP'
-.    ds ae ae
-.    ds Ae AE
-.\}
-.rm #[ #] #H #V #F C
-.\" ========================================================================
-.\"
-.IX Title "YTURL 1"
-.TH YTURL 1 "2015-09-10" "1.20.0" "SlackBuilds.org"
-.\" For nroff, turn off justification.  Always turn off hyphenation; it makes
-.\" way too many mistakes in technical documents.
-.if n .ad l
-.nh
-.SH "NAME"
-yturl \- Get direct URLs to YouTube videos.
-.SH "SYNOPSIS"
-.IX Header "SYNOPSIS"
-yturl [\-h] [\-q \s-1QUALITY\s0] videoID/url
-.PP
-videoID/url is a YouTube url or bare video \s-1ID.\s0
-.SH "DESCRIPTION"
-.IX Header "DESCRIPTION"
-By default, yturl prints the media \s-1URL\s0 to standard output.
-.PP
-.Vb 3
-\&    $ yturl \*(Aqhttp://www.youtube.com/watch?v=8TCxE0bWQeQ\*(Aq
-\&    Using itag 43.
-\&    http://r2\-\-\-sn\-uphxqvujvh\-30al.googlevideo.com/videoplayback?source=[...]
-.Ve
-.PP
-This means that you can do something like the following to watch it in
-mpv:
-.PP
-.Vb 1
-\&    $ mpv "$(yturl \*(Aqhttp://www.youtube.com/watch?v=8TCxE0bWQeQ\*(Aq)"
-.Ve
-.PP
-(also works with vlc, but for some reason not with mplayer)
-.PP
-Or something like the following to download it (using curl):
-.PP
-.Vb 1
-\&    $ curl \-Lo bill "$(yturl \*(Aqhttp://www.youtube.com/watch?v=8TCxE0bWQeQ\*(Aq)"
-.Ve
-.SH "OPTIONS"
-.IX Header "OPTIONS"
-.IP "\-h, \-\-help" 4
-.IX Item "-h, --help"
-show help message and exit
-.IP "\-q \s-1QUALITY,\s0 \-\-quality \s-1QUALITY\s0" 4
-.IX Item "-q QUALITY, --quality QUALITY"
-specify quality, can be \*(L"low\*(R", \*(L"medium\*(R", \*(L"high\*(R", or an itag (see
-http://en.wikipedia.org/wiki/YouTube#Quality_and_formats)
diff --git a/network/yturl/yturl.SlackBuild b/network/yturl/yturl.SlackBuild
deleted file mode 100644
index 5755385294..0000000000
--- a/network/yturl/yturl.SlackBuild
+++ /dev/null
@@ -1,70 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for yturl
-
-# Written by B. Watson (yalhcru@gmail.com)
-
-# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
-
-# 20180215 bkw: upgrade to 2.0.2.
-
-# 20170302 bkw: use long-format github URL
-
-# 20160727 bkw: upgrade to 2.0.1.
-
-# 20150910 bkw: upgrade to 1.20.0.
-# ARCH=noarch, there's no object code in the package.
-# Add DESCRIPTION section to man page.
-
-# 20150120 bkw: upgrade to 1.17.0. The old download URL was broken,
-# wonder how long for?
-# Use "python setup.py" since upstream has started requiring it.
-# Get rid of unused SLKCFLAGS and LIBDIRSUFFIX variables.
-
-# 20140316 bkw:
-# Updated to 1.16 release, use tar.gz instead of zip file. From now on
-# I'll track the releases instead of just grabbing current git... unless
-# youtube API changes break the release and upstream takes a long time to
-# make a new release.
-
-PRGNAM=yturl
-VERSION=${VERSION:-2.0.2}
-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 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
-
-python setup.py install --root=$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 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}
diff --git a/network/yturl/yturl.info b/network/yturl/yturl.info
deleted file mode 100644
index 7a1b97baeb..0000000000
--- a/network/yturl/yturl.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="yturl"
-VERSION="2.0.2"
-HOMEPAGE="https://github.com/cdown/yturl"
-DOWNLOAD="https://github.com/cdown/yturl/archive/2.0.2/yturl-2.0.2.tar.gz"
-MD5SUM="022a18a8c0bb2882829d53f3a1533b5d"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="six"
-MAINTAINER="B. Watson"
-EMAIL="yalhcru@gmail.com"
diff --git a/network/yturl/yturl.pod b/network/yturl/yturl.pod
deleted file mode 100644
index 51a47b4a19..0000000000
--- a/network/yturl/yturl.pod
+++ /dev/null
@@ -1,50 +0,0 @@
-# POD source for yturl man page. Convert with:
-# pod2man --stderr -s1 -cSlackBuilds.org -r1.20.0 yturl.pod > yturl.1
-
-=pod
-
-=head1 NAME
-
-yturl - Get direct URLs to YouTube videos.
-
-=head1 SYNOPSIS
-
-yturl [-h] [-q QUALITY] videoID/url
-
-videoID/url is a YouTube url or bare video ID.
-
-=head1 DESCRIPTION
-
-By default, yturl prints the media URL to standard output.
-
-    $ yturl 'http://www.youtube.com/watch?v=8TCxE0bWQeQ'
-    Using itag 43.
-    http://r2---sn-uphxqvujvh-30al.googlevideo.com/videoplayback?source=[...]
-
-This means that you can do something like the following to watch it in
-mpv:
-
-    $ mpv "$(yturl 'http://www.youtube.com/watch?v=8TCxE0bWQeQ')"
-
-(also works with vlc, but for some reason not with mplayer)
-
-Or something like the following to download it (using curl):
-
-    $ curl -Lo bill "$(yturl 'http://www.youtube.com/watch?v=8TCxE0bWQeQ')"
-
-=head1 OPTIONS
-
-=over 4
-
-=item -h, --help
-
-show help message and exit
-
-=item -q QUALITY, --quality QUALITY
-
-specify quality, can be "low", "medium", "high", or an itag (see
-http://en.wikipedia.org/wiki/YouTube#Quality_and_formats)
-
-=back
-
-=cut
diff --git a/network/zabbix_agent2/README b/network/zabbix_agent2/README
new file mode 100644
index 0000000000..e5f26a7986
--- /dev/null
+++ b/network/zabbix_agent2/README
@@ -0,0 +1,19 @@
+zabbix_agent2 is the new generation Linux agent written on golang.
+Used to monitor Linux boxes and send the data to the zabbix server.
+
+Zabbix offers advanced monitoring, alerting and visualization
+features, including distributed monitoring, auto-discovery,
+notifications, etcetera.
+
+zabbix_agent2 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:   zabbixagent       UID: 266        GID: 266
+  group:  zabbixagent                       GID: 266
+
+You can pass alternate values for the user and group using
+ZABBIXAGENTUSER and ZABBIXAGENTGROUP variables when running the build
+script.
+
+For some important post-build and basic configuration instructions,
+see the included README.SLACKWARE file.
diff --git a/network/zabbix_agent2/README.SLACKWARE b/network/zabbix_agent2/README.SLACKWARE
new file mode 100644
index 0000000000..13fd88d3e8
--- /dev/null
+++ b/network/zabbix_agent2/README.SLACKWARE
@@ -0,0 +1,75 @@
+README.Slackware
+================
+
+This file contains some specific instructions to complete the
+installation of zabbix_agent2 on Slackware.
+
+0) Before running the SlackBuild script
+---------------------------------------
+
+0.1) zabbix group & user
+
+Before running the zabbix_agent2.SlackBuild script, you will need to create
+the 'zabbix' user and group as well as 'zabbixagent' user. The script won't
+run if these do not exist.
+
+The suggested UID and GID is 228 for 'zabbix' and 266 for 'zabbixagent',
+but you can change this as needed:
+
+  # groupadd -g 228 zabbix
+  # useradd -u 266 -g zabbix -d /dev/null -s /bin/false zabbixagent
+
+1) Configuring zabbix_agent2
+----------------------------
+
+A standard configuration file is installed as /etc/zabbix/zabbix_agent2.conf
+
+At least the following lines need to be configured:
+ For passive checks:
+  Server=<ip_of_your_zabbix_server>
+ For active checks
+  Hostname=<hostname_of_your_zabbix_agent>
+  ServerActive=<ip_of_your_zabbix_server>
+
+2) Start & Stop scripts for zabbix agent daemon
+-----------------------------------------------
+
+2.1) Automatic startup and shutdown
+
+If you want to start zabbix_agent2 on system bootup, include these lines in
+your /etc/rc.d/rc.local:
+
+  # Start zabbix_agent2
+  if [ -x /etc/rc.d/rc.zabbix_agent2]; then
+    echo "Starting zabbix agent daemon..."
+    /etc/rc.d/rc.zabbix_agent2 start
+  fi
+
+To guarantee a clean shutdown of zabbix_agent2, include this in
+/etc/rc.d/rc.local_shutdown:
+
+  # Stop zabbix_agent2
+  if [ -x /etc/rc.d/rc.zabbix_agent2 ]; then
+    echo "Stopping zabbix agent daemon..."
+    /etc/rc.d/rc.zabbix_agent2 stop
+  fi
+
+2.2) Make /etc/rc.d/rc.zabbix_agent2 executable
+
+Additionally, you'll have to set the rc script to be executable just like
+any other Slackware rc script:
+
+  # chmod +x /etc/rc.d/rc.zabbix_agent2
+
+3) Starting zabbix agent daemon
+-------------------------------
+
+Now you are ready to start zabbix_agent2 by calling the startup script:
+
+  # /etc/rc.d/rc.zabbix_agent2 start
+
+You can check the log file (/var/log/zabbix/zabbig_agent2.log) in case of
+problems.
+
+Zabbix uses ports 10050 & 10051 to communicate, so make sure these aren't
+blocked on your network.
diff --git a/network/zabbix_agent2/doinst.sh b/network/zabbix_agent2/doinst.sh
new file mode 100644
index 0000000000..21efb95b2d
--- /dev/null
+++ b/network/zabbix_agent2/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
+}
+
+preserve_perms etc/rc.d/rc.zabbix_agent2.new
+config etc/zabbix/zabbix_agent2.conf.new
+config var/log/zabbix/zabbix_agent2.log.new
+rm -f var/log/zabbix/zabbix_agent2.log.new
diff --git a/network/zabbix_agent2/rc.zabbix_agent2 b/network/zabbix_agent2/rc.zabbix_agent2
new file mode 100644
index 0000000000..842014dfe8
--- /dev/null
+++ b/network/zabbix_agent2/rc.zabbix_agent2
@@ -0,0 +1,78 @@
+#!/bin/sh
+
+# Usage: ./rc.zabbix_agent2 {start|stop|restart}
+
+PRGNAM=zabbix_agent2
+PRGDIR=/usr/sbin/
+PIDDIR=/var/run/zabbixagent/
+LOGDIR=/var/log/zabbix/
+DATE=$(date +%a\ %b\ %d\ %T\ %Y)
+RETVAL=0
+
+prg_start() {
+    echo -n "Starting $PRGNAM ... "
+    if [ -r ${PIDDIR}${PRGNAM}.pid ]; then
+        if $(! /sbin/pidof $PRGNAM > /dev/null 2>&1 ) ; then
+            echo "Removing an old ${PIDDIR}${PRGNAM}.pid"
+            rm -f ${PIDDIR}${PRGNAM}.pid
+        fi
+    fi
+    mkdir -p ${PIDDIR}
+    su -s /bin/sh -c "${PRGDIR}${PRGNAM} >> ${LOGDIR}${PRGNAM}.log 2>&1 &" @ZABBIXAGENTUSER@
+    RETVAL=$?
+
+    if [ $RETVAL -eq 0 ]; then
+        touch /var/lock/$PRGNAM
+        sleep 2
+        echo "done"
+    else
+        echo "failed"
+    fi
+    return $RETVAL
+}
+
+prg_stop() {
+    echo -n "Stopping $PRGNAM ... "
+    if [ -r ${PIDDIR}${PRGNAM}.pid ]; then
+        killall $PRGNAM
+        # 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 $PRGNAM > /dev/null 2>&1 ) ; then
+                rm -f ${PIDDIR}${PRGNAM}.pid
+                break;
+            fi
+            sleep 1
+        done
+
+        if [ "$second" = "10" ]; then
+            echo "\nWARNING: $PRGNAM did not exit!"
+            sleep 10
+        else
+            echo "$DATE EXIT: $PRGNAM stopped by user: $USER (UID: $EUID)" >> ${LOGDIR}${PRGNAM}.log
+            echo "done"
+        fi
+    fi
+    rm -f /var/lock/$PRGNAM
+    return $RETVAL
+}
+
+# How were we called:
+case "$1" in
+    start)
+        prg_start
+        ;;
+    stop)
+        prg_stop
+        ;;
+    restart|reload)
+        prg_stop
+        # Wait a few seconds before restarting
+        sleep 10
+        prg_start
+        ;;
+    *)
+        echo "Usage: $(basename $0) {start|stop|restart}"
+        RETVAL=1
+esac
+
+#EOF
diff --git a/network/zabbix_agent2/slack-desc b/network/zabbix_agent2/slack-desc
new file mode 100644
index 0000000000..459d342ebf
--- /dev/null
+++ b/network/zabbix_agent2/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+             |-----handy-ruler------------------------------------------------------|
+zabbix_agent2: zabbix_agent2 (Linux GO agent for zabbix_server)
+zabbix_agent2:
+zabbix_agent2: Zabbix offers advanced monitoring, alerting and visualization
+zabbix_agent2: features, including distributed monitoring, auto-discovery,
+zabbix_agent2: notifications etc.
+zabbix_agent2:
+zabbix_agent2: This is the new agent2 daemon that communicates with the 
+zabbix_agent2: zabbix_server for local resource monitoring.
+zabbix_agent2:
+zabbix_agent2: https://www.zabbix.com/
+zabbix_agent2:
diff --git a/network/zabbix_agent2/zabbix_agent2.SlackBuild b/network/zabbix_agent2/zabbix_agent2.SlackBuild
new file mode 100644
index 0000000000..60f61016f1
--- /dev/null
+++ b/network/zabbix_agent2/zabbix_agent2.SlackBuild
@@ -0,0 +1,168 @@
+#!/bin/bash
+
+# Slackware build script for zabbix_agent2
+
+# Copyright 2013-2014 Michal Bialozor, Gdansk, Pomorskie, POLAND
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
+# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=zabbix_agent2
+VERSION=${VERSION:-6.4.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
+
+PRGSHORT=zabbix
+
+# ZABBIXUSER is owner of log directory, this is required for running the agent on the same host as server
+ZABBIXUSER=${ZABBIXUSER:-zabbix}
+ZABBIXGROUP=${ZABBIXGROUP:-zabbix}
+ZABBIXUID=${ZABBIXUID:-228}
+ZABBIXGID=${ZABBIXGID:-228}
+
+ZABBIXAGENTUSER=${ZABBIXAGENTUSER:-zabbixagent}
+ZABBIXAGENTGROUP=${ZABBIXAGENTGROUP:-zabbixagent}
+ZABBIXAGENTUID=${ZABBIXAGENTUID:-266}
+ZABBIXAGENTGID=${ZABBIXAGENTGID:-266}
+
+# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
+# the name of the created package would be, and then exit. This information
+# could be useful to other scripts.
+if [ ! -z "${PRINT_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
+
+# Bail out if user or group isn't valid on your system
+# For slackbuilds.org, assigned zabbixagent uid/gid are 266/266 and assigned zabbix uid/gid are 228/228
+# See http://slackbuilds.org/uid_gid.txt
+if [ "$(grep ^$ZABBIXAGENTUSER: /etc/passwd)" = "" -o "$(grep ^$ZABBIXAGENTUSER: /etc/passwd)" = "" -o \
+     "$(grep ^$ZABBIXGROUP: /etc/group)" = "" ] ; then
+    echo "  You must have a \"$ZABBIXGROUP\" group as well as \"$ZABBIXUSER\" and \"$ZABBIXAGENTUSER\" users to run this script."
+    echo "    # groupadd -g $ZABBIXGID $ZABBIXGROUP"
+    echo "    # useradd -u $ZABBIXUID -g $ZABBIXGROUP -d /dev/null -s /bin/false $ZABBIXUSER"
+    echo "    # useradd -u $ZABBIXAGENTUID -g $ZABBIXGROUP -d /dev/null -s /bin/false $ZABBIXAGENTUSER"
+    exit 1
+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
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGSHORT-$VERSION
+tar xvf $CWD/$PRGSHORT-$VERSION.tar.gz
+cd $PRGSHORT-$VERSION
+chown -R root:root .
+
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -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/zabbix \
+  --localstatedir=/var/lib \
+  --mandir=/usr/man \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --with-libpcre2 \
+  --enable-agent2 \
+  --with-openssl \
+  --enable-ipv6 \
+  --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
+
+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
+
+# Initial log file
+mkdir -p $PKG/var/log/$PRGSHORT
+chown $ZABBIXUSER:$ZABBIXGROUP $PKG/var/log/$PRGSHORT
+chmod g+w $PKG/var/log/$PRGSHORT
+#touch $PKG/var/log/$PRGSHORT/$PRGNAM.log.new
+#chown $ZABBIXAGENTUSER:$ZABBIXUSER $PKG/var/log/$PRGSHORT/$PRGNAM.log.new
+
+# Dir for pid-file
+mkdir -p $PKG/var/run/$PRGNAM
+chown -R $ZABBIXAGENTUSER:$ZABBIXGROUP $PKG/var/run/$PRGNAM
+chmod g+w $PKG/var/run/$PRGNAM
+
+# Configuration file
+sed -e "s,# PidFile=/tmp/zabbix_agent2.pid,PidFile=/var/run/$PRGNAM/zabbix_agent2.pid," \
+    -e "s,# LogFile=/tmp/zabbix_agent2.log,LogFile=/var/log/$PRGSHORT/$PRGNAM.log," \
+    -e "s,Include=./zabbix_agent2.d/plugins.d/\*.conf,Include=/etc/$PRGSHORT/zabbix_agent2.d/plugins.d/*.conf," \
+    $PKG/etc/$PRGSHORT/$PRGNAM.conf > $PKG/etc/$PRGSHORT/$PRGNAM.conf.new
+# remove uneeded old agent conf
+rm -rf $PKG/etc/$PRGSHORT/zabbix_agentd.* $PKG/etc/$PRGSHORT/$PRGNAM.d/ $PKG/etc/$PRGSHORT/$PRGNAM.conf
+
+# Init script
+mkdir -p $PKG/etc/rc.d
+sed "s|@ZABBIXAGENTUSER@|$ZABBIXAGENTUSER|" $CWD/rc.$PRGNAM > $PKG/etc/rc.d/rc.$PRGNAM.new
+
+# Documentation
+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
+cat $CWD/README.SLACKWARE > $PKG/usr/doc/$PRGNAM-$VERSION/README.SLACKWARE
+
+# Installation scripts
+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/network/zabbix_agent2/zabbix_agent2.info b/network/zabbix_agent2/zabbix_agent2.info
new file mode 100644
index 0000000000..051d035e6d
--- /dev/null
+++ b/network/zabbix_agent2/zabbix_agent2.info
@@ -0,0 +1,10 @@
+PRGNAM="zabbix_agent2"
+VERSION="6.4.11"
+HOMEPAGE="https://www.zabbix.com"
+DOWNLOAD="https://cdn.zabbix.com/zabbix/sources/stable/6.4/zabbix-6.4.11.tar.gz"
+MD5SUM="c1bac67a0d6b9d0d4376ca8176f327a9"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="google-go-lang"
+MAINTAINER="zux"
+EMAIL="zux@pie-dabas.net"
diff --git a/network/zabbix_agentd/README b/network/zabbix_agentd/README
index 6f30449868..cc7fdd2f1c 100644
--- a/network/zabbix_agentd/README
+++ b/network/zabbix_agentd/README
@@ -1,27 +1,25 @@
 zabbix_agentd is the Linux agent daemon used to monitor Linux boxes
 and send the data to the zabbix server.
 
-Zabbix offers advanced monitoring, alerting and visualization features,
-including distributed monitoring, auto-discovery, notifications, etcetera.
+Zabbix offers advanced monitoring, alerting and visualization
+features, including distributed monitoring, auto-discovery,
+notifications, etcetera.
 
-zabbix_agentd 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.
+zabbix_agentd 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:   zabbixagent       UID: 266        GID: 266
   group:  zabbixagent                       GID: 266
 
 You can pass alternate values for the user and group using
-ZABBIXAGENTUSER and ZABBIXAGENTGROUP variables when running the build script.
+ZABBIXAGENTUSER and ZABBIXAGENTGROUP variables when running the build
+script.
 
-zabbix_agentd needs another user/group to cooperate with other Zabbix deamons,
-like zabbix_server or zabbix_proxy. 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:   zabbix            UID: 228        GID: 228
+zabbix_agentd uses group zabbix to write log file
+  (if you also have zabbix_server installed, it uses the same directory
+  for log file)
   group:  zabbix                            GID: 228
 
-You can pass alternate values for the user and group using
-ZABBIXUSER and ZABBIXGROUP variables when running the build script.
 
 For some important post-build and basic configuration instructions,
 see the included README.SLACKWARE file.
diff --git a/network/zabbix_agentd/README.SLACKWARE b/network/zabbix_agentd/README.SLACKWARE
index a41c2ef1e2..1016693f9e 100644
--- a/network/zabbix_agentd/README.SLACKWARE
+++ b/network/zabbix_agentd/README.SLACKWARE
@@ -26,9 +26,11 @@ but you can change this as needed:
 A standard configuration file is installed as /etc/zabbix/zabbix_agentd.conf
 
 At least the following lines need to be configured:
-
+ For passive items:
   Server=<ip_of_your_zabbix_server>
+ For active items:
   Hostname=<hostname_of_your_zabbix_agent>
+  ServerActive=<ip_of_your_zabbix_server>
 
 2) Start & Stop scripts for zabbix agent daemon
 -----------------------------------------------
diff --git a/network/zabbix_agentd/rc.zabbix_agentd b/network/zabbix_agentd/rc.zabbix_agentd
index bd300d999d..13876fc4df 100644
--- a/network/zabbix_agentd/rc.zabbix_agentd
+++ b/network/zabbix_agentd/rc.zabbix_agentd
@@ -4,7 +4,7 @@
 
 PRGNAM=zabbix_agentd
 PRGDIR=/usr/sbin/
-PIDDIR=/var/run/zabbix/
+PIDDIR=/var/run/zabbix_agentd/
 LOGDIR=/var/log/zabbix/
 DATE=$(date +%a\ %b\ %d\ %T\ %Y)
 RETVAL=0
diff --git a/network/zabbix_agentd/zabbix_agentd.SlackBuild b/network/zabbix_agentd/zabbix_agentd.SlackBuild
index 2a68604788..c3597c05c7 100644
--- a/network/zabbix_agentd/zabbix_agentd.SlackBuild
+++ b/network/zabbix_agentd/zabbix_agentd.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for zabbix_agentd
 
@@ -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=zabbix_agentd
-VERSION=${VERSION:-4.0.4}
+VERSION=${VERSION:-6.4.11}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -47,7 +50,14 @@ ZABBIXAGENTGROUP=${ZABBIXAGENTGROUP:-zabbixagent}
 ZABBIXAGENTUID=${ZABBIXAGENTUID:-266}
 ZABBIXAGENTGID=${ZABBIXAGENTGID:-266}
 
-CWD=$(pwd)
+# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
+# the name of the created package would be, and then exit. This information
+# could be useful to other scripts.
+if [ ! -z "${PRINT_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,6 +113,9 @@ CXXFLAGS="$SLKCFLAGS" \
   --mandir=/usr/man \
   --docdir=/usr/doc/$PRGNAM-$VERSION \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --with-libpcre2 \
+  --with-openssl \
+  --enable-ipv6 \
   --enable-agent \
   --build=$ARCH-slackware-linux
 
@@ -123,16 +136,16 @@ touch $PKG/var/log/$PRGSHORT/$PRGNAM.log.new
 chown $ZABBIXAGENTUSER:$ZABBIXUSER $PKG/var/log/$PRGSHORT/$PRGNAM.log.new
 
 # Dir for pid-file
-mkdir -p $PKG/var/run/$PRGSHORT
-chown -R $ZABBIXUSER:$ZABBIXGROUP $PKG/var/run/$PRGSHORT
-chmod g+w $PKG/var/run/$PRGSHORT
+mkdir -p $PKG/var/run/$PRGNAM
+chown -R $ZABBIXAGENTUSER:$ZABBIXGROUP $PKG/var/run/$PRGNAM
+chmod g+w $PKG/var/run/$PRGNAM
 
 # Configuration file
-sed -e "s,# PidFile=/tmp/,PidFile=/var/run/$PRGSHORT/," \
-    -e "s,LogFile=/tmp/,LogFile=/var/log/$PRGSHORT/," \
+sed -e "s,# PidFile=/tmp/zabbix_agentd.pid,PidFile=/var/run/$PRGNAM/$PRGNAM.pid," \
+    -e "s,LogFile=/tmp/zabbix_agentd.log,LogFile=/var/log/$PRGSHORT/$PRGNAM.log," \
     $PKG/etc/$PRGSHORT/$PRGNAM.conf > $PKG/etc/$PRGSHORT/$PRGNAM.conf.new
 rm -rf $PKG/etc/$PRGSHORT/zabbix_agent.conf.d $PKG/etc/$PRGSHORT/zabbix_agent.conf \
-  $PKG/etc/$PRGSHORT/$PRGNAM.conf
+  $PKG/etc/$PRGSHORT/$PRGNAM.conf $PKG/etc/$PRGSHORT/$PRGNAM.conf.d/
 
 # Init script
 mkdir -p $PKG/etc/rc.d
@@ -140,7 +153,7 @@ sed "s|@ZABBIXAGENTUSER@|$ZABBIXAGENTUSER|" $CWD/rc.$PRGNAM > $PKG/etc/rc.d/rc.$
 
 # Documentation
 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
 cat $CWD/README.SLACKWARE > $PKG/usr/doc/$PRGNAM-$VERSION/README.SLACKWARE
 
@@ -150,4 +163,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/network/zabbix_agentd/zabbix_agentd.info b/network/zabbix_agentd/zabbix_agentd.info
index 3aba67d4d9..5e88ead7f2 100644
--- a/network/zabbix_agentd/zabbix_agentd.info
+++ b/network/zabbix_agentd/zabbix_agentd.info
@@ -1,8 +1,8 @@
 PRGNAM="zabbix_agentd"
-VERSION="4.0.4"
-HOMEPAGE="https://www.zabbix.com/"
-DOWNLOAD="https://downloads.sourceforge.net/zabbix/zabbix-4.0.4.tar.gz"
-MD5SUM="46fdb83d4b24e13127a20a3e874b1d8f"
+VERSION="6.4.11"
+HOMEPAGE="https://www.zabbix.com"
+DOWNLOAD="https://cdn.zabbix.com/zabbix/sources/stable/6.4/zabbix-6.4.11.tar.gz"
+MD5SUM="c1bac67a0d6b9d0d4376ca8176f327a9"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/network/zabbix_frontend/README b/network/zabbix_frontend/README
new file mode 100644
index 0000000000..ee888a2951
--- /dev/null
+++ b/network/zabbix_frontend/README
@@ -0,0 +1,10 @@
+Zabbix offers advanced monitoring, alerting and visualization
+features, including distributed monitoring, auto-discovery,
+notifications, etcetera.
+
+Frontend component is now provided as an individual package
+as it can be installed on a seperate host.
+
+For some important post-build and basic configuration instructions,
+see the included README.SLACKWARE file.
+
diff --git a/network/zabbix_frontend/README.SLACKWARE b/network/zabbix_frontend/README.SLACKWARE
new file mode 100644
index 0000000000..1f09f0fea6
--- /dev/null
+++ b/network/zabbix_frontend/README.SLACKWARE
@@ -0,0 +1,41 @@
+README.Slackware
+================
+
+This file contains some specific instructions to complete the
+installation of zabbix_frontend on Slackware.
+
+
+You will need to have a working installation of httpd for zabbix_frontend 
+to run. Frontend does not have to be on the same box as
+zabbix_server, but they need to be able to communicate.
+
+
+Very complete documentation is available online at:
+  https://www.zabbix.com/documentation/
+
+
+1) Configuring apache
+----------------------------
+
+Edit /etc/httpd/httpd.conf and enable mod_php by uncommenting this line:
+
+	Include /etc/httpd/mod_php.conf
+
+And bellow it add this line: 
+
+	Include /etc/httpd/extra/zabbix.conf
+
+And also replace this line:
+	<IfModule dir_module>
+	    DirectoryIndex index.html 
+	</IfModule>
+
+with this:
+
+	<IfModule dir_module>
+	    DirectoryIndex index.html index.php
+	</IfModule>
+
+
+Now your Zabbix frontend should be available at address http://<YOUR IP>/zabbix
+There you can finish the setup wizard
diff --git a/network/zabbix_frontend/apache.conf b/network/zabbix_frontend/apache.conf
new file mode 100644
index 0000000000..e3dda4608c
--- /dev/null
+++ b/network/zabbix_frontend/apache.conf
@@ -0,0 +1,58 @@
+# Define /zabbix alias, this is the default
+<IfModule mod_alias.c>
+    Alias /zabbix /usr/share/zabbix
+</IfModule>
+
+
+<Directory "/usr/share/zabbix">
+    Options FollowSymLinks
+    AllowOverride None
+    Require all granted
+
+    <IfModule mod_php7.c>
+        php_value max_execution_time 300
+        php_value memory_limit 128M
+        php_value post_max_size 16M
+        php_value upload_max_filesize 2M
+        php_value max_input_time 300
+        php_value max_input_vars 10000
+        php_value always_populate_raw_post_data -1
+        # php_value date.timezone Europe/Riga
+    </IfModule>
+</Directory>
+
+<Directory "/usr/share/zabbix/conf">
+    Require all denied
+    <files *.php>
+    	Require all denied
+    </files>
+</Directory>
+
+<Directory "/usr/share/zabbix/app">
+    Require all denied
+    <files *.php>
+        Require all denied
+    </files>
+</Directory>
+
+<Directory "/usr/share/zabbix/include">
+    Require all denied
+    <files *.php>
+    	Require all denied
+    </files>
+</Directory>
+
+<Directory "/usr/share/zabbix/local">
+    Require all denied
+    <files *.php>
+    	Require all denied
+    </files>
+</Directory>
+
+<Directory "/usr/share/zabbix/vendor">
+    Require all denied
+    <files *.php>
+    	Require all denied
+    </files>
+</Directory>
+
diff --git a/network/zabbix_frontend/doinst.sh b/network/zabbix_frontend/doinst.sh
new file mode 100644
index 0000000000..95cf3f096e
--- /dev/null
+++ b/network/zabbix_frontend/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
+}
+
+config etc/httpd/extra/zabbix.conf.new
diff --git a/network/zabbix_frontend/slack-desc b/network/zabbix_frontend/slack-desc
new file mode 100644
index 0000000000..a86c0f5b7a
--- /dev/null
+++ b/network/zabbix_frontend/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+               |-----handy-ruler------------------------------------------------------|
+zabbix_frontend: zabbix_frontend (enterprise-class distributed monitoring solution)
+zabbix_frontend:
+zabbix_frontend: Zabbix offers advanced monitoring, alerting and visualization
+zabbix_frontend: features, including distributed monitoring, auto-discovery,
+zabbix_frontend: notifications etc.
+zabbix_frontend:
+zabbix_frontend: This package contains the frontend component of Zabbix
+zabbix_frontend:
+zabbix_frontend:
+zabbix_frontend: https://www.zabbix.com/
+zabbix_frontend:
diff --git a/network/zabbix_frontend/zabbix_frontend.SlackBuild b/network/zabbix_frontend/zabbix_frontend.SlackBuild
new file mode 100644
index 0000000000..09be652e40
--- /dev/null
+++ b/network/zabbix_frontend/zabbix_frontend.SlackBuild
@@ -0,0 +1,101 @@
+#!/bin/bash
+
+# Slackware build script for zabbix_server
+
+# Copyright 2013-2014 Michal Bialozor, Gdansk, Pomorskie, POLAND
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
+# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=zabbix_frontend
+VERSION=${VERSION:-6.4.11}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+
+ARCH="noarch" 
+
+PRGSHORT=zabbix
+
+DOCROOT=${DOCROOT:-/usr/share/zabbix/}
+PHPUSER=${PHPUSER:-root}
+PHPGROUP=${PHPGROUP:-apache}
+
+ZABBIXUSER=${ZABBIXUSER:-zabbix}
+ZABBIXGROUP=${ZABBIXGROUP:-zabbix}
+ZABBIXUID=${ZABBIXUID:-228}
+ZABBIXGID=${ZABBIXGID:-228}
+
+# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
+# the name of the created package would be, and then exit. This information
+# could be useful to other scripts.
+if [ ! -z "${PRINT_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 $PRGSHORT-$VERSION
+tar xvf $CWD/$PRGSHORT-$VERSION.tar.gz
+cd $PRGSHORT-$VERSION
+chown -R root:root .
+
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -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 "frontend" to $DOCROOT/
+mkdir -p $PKG/$DOCROOT/
+cp -a ui/* $PKG/$DOCROOT/
+chown -R $PHPUSER:$PHPGROUP $PKG/$DOCROOT
+
+
+
+#install apache conf
+echo $CWD
+mkdir -p $PKG/etc/httpd/extra/
+cp $CWD/apache.conf $PKG/etc/httpd/extra/zabbix.conf.new
+
+# Documentation
+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
+cat $CWD/README.SLACKWARE > $PKG/usr/doc/$PRGNAM-$VERSION/README.SLACKWARE
+
+# Installation scripts
+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/network/zabbix_frontend/zabbix_frontend.info b/network/zabbix_frontend/zabbix_frontend.info
new file mode 100644
index 0000000000..0096647da4
--- /dev/null
+++ b/network/zabbix_frontend/zabbix_frontend.info
@@ -0,0 +1,10 @@
+PRGNAM="zabbix_frontend"
+VERSION="6.4.11"
+HOMEPAGE="https://www.zabbix.com"
+DOWNLOAD="https://cdn.zabbix.com/zabbix/sources/stable/6.4/zabbix-6.4.11.tar.gz"
+MD5SUM="c1bac67a0d6b9d0d4376ca8176f327a9"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="zux"
+EMAIL="zux@pie-dabas.net"
diff --git a/network/zabbix_java_gateway/README b/network/zabbix_java_gateway/README
index b4a92e1ad9..763f40b3be 100644
--- a/network/zabbix_java_gateway/README
+++ b/network/zabbix_java_gateway/README
@@ -1,5 +1,6 @@
-Zabbix offers advanced monitoring, alerting and visualization features,
-including distributed monitoring, auto-discovery, notifications, etcetera.
+Zabbix offers advanced monitoring, alerting and visualization
+features, including distributed monitoring, auto-discovery,
+notifications, etcetera.
 
 zabbix_java_gateway needs to run under its own user/group. This has been
 assigned to the following by SlackBuilds.org, but feel free to change it
diff --git a/network/zabbix_java_gateway/README.SLACKWARE b/network/zabbix_java_gateway/README.SLACKWARE
index 335e9a1ccd..19af301efe 100644
--- a/network/zabbix_java_gateway/README.SLACKWARE
+++ b/network/zabbix_java_gateway/README.SLACKWARE
@@ -32,7 +32,7 @@ running:
 
 A standard configuration file is installed as /etc/zabbix/zabbix_java_gateway.conf
 
-You will need to change at least the following lines:
+If installed on the same host as the server/proxy, configuration should work out of the box
 
 2) Start & Stop scripts for zabbix java gateway
 -----------------------------------------------
@@ -67,6 +67,9 @@ any other Slackware rc script:
 3) Starting zabbix server
 -------------------------
 
-Now you are ready to start zabbix_server by calling the startup script:
+Now you are ready to start zabbix_java_gateway by calling the startup script:
 
   # /etc/rc.d/rc.zabbix_java_gateway start
+
+
+Don't forget to configure Zabbix server/proxy yo use this java gateway (StartJavaPollers= and JavaGateway=)
diff --git a/network/zabbix_java_gateway/java-gateway.patch b/network/zabbix_java_gateway/java-gateway.patch
new file mode 100644
index 0000000000..5ee278e272
--- /dev/null
+++ b/network/zabbix_java_gateway/java-gateway.patch
@@ -0,0 +1,79 @@
+diff -urN 5.4.orig/src/zabbix_java/lib/logback.xml 5.4/src/zabbix_java/lib/logback.xml
+--- 5.4.orig/src/zabbix_java/lib/logback.xml	2021-02-03 14:46:36.510530149 +0200
++++ 5.4/src/zabbix_java/lib/logback.xml	2021-02-03 16:08:48.139648517 +0200
+@@ -2,10 +2,10 @@
+ 
+ 	<appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+ 
+-		<file>/tmp/zabbix_java.log</file>
++		<file>/var/log/zabbix/zabbix_java_gateway.log</file>
+ 
+ 		<rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
+-			<fileNamePattern>/tmp/zabbix_java.log.%i</fileNamePattern>
++			<fileNamePattern>/var/log/zabbix/zabbix_java_gateway.log.%i</fileNamePattern>
+ 			<minIndex>1</minIndex>
+ 			<maxIndex>3</maxIndex>
+ 		</rollingPolicy>
+diff -urN 5.4.orig/src/zabbix_java/settings.sh 5.4/src/zabbix_java/settings.sh
+--- 5.4.orig/src/zabbix_java/settings.sh	2021-02-03 14:46:36.510530149 +0200
++++ 5.4/src/zabbix_java/settings.sh	2021-02-03 17:30:37.637881653 +0200
+@@ -24,7 +24,7 @@
+ # Default:
+ # PID_FILE=
+ 
+-PID_FILE="/tmp/zabbix_java.pid"
++PID_FILE="/var/run/zabbix/zabbix_java_gateway.pid"
+ 
+ ### Option: zabbix.startPollers
+ #	Number of worker threads to start.
+diff -urN 5.4.orig/src/zabbix_java/shutdown.sh 5.4/src/zabbix_java/shutdown.sh
+--- 5.4.orig/src/zabbix_java/shutdown.sh	2021-02-03 14:46:36.510530149 +0200
++++ 5.4/src/zabbix_java/shutdown.sh	2021-02-03 14:54:19.090352858 +0200
+@@ -1,7 +1,14 @@
+ #!/bin/sh
+ 
+-cd `dirname $0`
+-. ./settings.sh
++if [ -r /etc/zabbix/zabbix_java_gateway.conf ]; then
++	. /etc/zabbix/zabbix_java_gateway.conf
++fi
++
++if [ -z $GATEWAY_HOME ]; then
++	GATEWAY_HOME="/usr/share/zabbix_java_gateway"
++fi
++
++cd $GATEWAY_HOME
+ 
+ if [ -n "$PID_FILE" ]; then
+ 	if [ -f "$PID_FILE" ]; then
+diff -urN 5.4.orig/src/zabbix_java/startup.sh 5.4/src/zabbix_java/startup.sh
+--- 5.4.orig/src/zabbix_java/startup.sh	2021-02-03 14:46:36.510530149 +0200
++++ 5.4/src/zabbix_java/startup.sh	2021-02-03 15:51:17.466224873 +0200
+@@ -1,7 +1,12 @@
+ #!/bin/sh
+ 
+-cd `dirname $0`
+-. ./settings.sh
++if [ -r /etc/zabbix/zabbix_java_gateway.conf ]; then
++	. /etc/zabbix/zabbix_java_gateway.conf
++fi
++
++if [ -z $GATEWAY_HOME ]; then
++	GATEWAY_HOME="/usr/share/zabbix_java_gateway"
++fi
+ 
+ if [ -n "$PID_FILE" -a -f "$PID_FILE" ]; then
+ 	PID=`cat "$PID_FILE"`
+@@ -15,9 +20,9 @@
+ JAVA=${JAVA:-java}
+ 
+ JAVA_OPTIONS="$JAVA_OPTIONS -server"
+-if [ -z "$PID_FILE" ]; then
+-	JAVA_OPTIONS="$JAVA_OPTIONS -Dlogback.configurationFile=logback-console.xml"
+-fi
++JAVA_OPTIONS="$JAVA_OPTIONS -Dlogback.configurationFile=/etc/zabbix/zabbix_java_gateway_logback.xml"
++
++cd $GATEWAY_HOME
+ 
+ CLASSPATH="lib"
+ for jar in lib/*.jar bin/*.jar; do
diff --git a/network/zabbix_java_gateway/rc.zabbix_java_gateway b/network/zabbix_java_gateway/rc.zabbix_java_gateway
index ac65aad421..8ccb974cc3 100644
--- a/network/zabbix_java_gateway/rc.zabbix_java_gateway
+++ b/network/zabbix_java_gateway/rc.zabbix_java_gateway
@@ -17,8 +17,7 @@ prg_start() {
             rm -f ${PIDDIR}${PRGNAM}.pid
         fi
     fi
-    mkdir -p ${PIDDIR}
-    ${PRGDIR}${PRGNAM} >> ${LOGDIR}${PRGNAM}.log 2>&1
+    ${PRGDIR}${PRGNAM}_startup >> ${LOGDIR}${PRGNAM}.log 2>&1
     RETVAL=$?
 
     if [ $RETVAL -eq 0 ]; then
@@ -67,7 +66,7 @@ case "$1" in
     restart|reload)
         prg_stop
         # Wait a few seconds before restarting
-        sleep 10
+        sleep 2
         prg_start
         ;;
     *)
diff --git a/network/zabbix_java_gateway/slack-desc b/network/zabbix_java_gateway/slack-desc
index 822bf8dd9c..116c9c02af 100644
--- a/network/zabbix_java_gateway/slack-desc
+++ b/network/zabbix_java_gateway/slack-desc
@@ -12,8 +12,8 @@ zabbix_java_gateway: Zabbix offers advanced monitoring, alerting and visualizati
 zabbix_java_gateway: features, including distributed monitoring, auto-discovery,
 zabbix_java_gateway: notifications etc.
 zabbix_java_gateway:
-zabbix_java_gateway: https://www.zabbix.com/
-zabbix_java_gateway:
-zabbix_java_gateway:
+zabbix_java_gateway: Java gateway adds functionality to monitor JAVA applications by
+zabbix_java_gateway: communicating with JMX
 zabbix_java_gateway:
+zabbix_java_gateway: https://www.zabbix.com/
 zabbix_java_gateway:
diff --git a/network/zabbix_java_gateway/zabbix_java_gateway.SlackBuild b/network/zabbix_java_gateway/zabbix_java_gateway.SlackBuild
index 32e9dd2d89..538f59357d 100644
--- a/network/zabbix_java_gateway/zabbix_java_gateway.SlackBuild
+++ b/network/zabbix_java_gateway/zabbix_java_gateway.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for zabbix_server
 
@@ -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=zabbix_java_gateway
-VERSION=${VERSION:-4.0.4}
+VERSION=${VERSION:-6.4.11}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -46,7 +49,14 @@ ZABBIXGROUP=${ZABBIXGROUP:-zabbix}
 ZABBIXUID=${ZABBIXUID:-228}
 ZABBIXGID=${ZABBIXGID:-228}
 
-CWD=$(pwd)
+# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
+# the name of the created package would be, and then exit. This information
+# could be useful to other scripts.
+if [ ! -z "${PRINT_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,6 +113,10 @@ CXXFLAGS="$SLKCFLAGS" \
   --enable-java \
   --build=$ARCH-slackware-linux
 
+patch -p1 < $CWD/java-gateway.patch
+
+
+
 make
 make install DESTDIR=$PKG
 
@@ -127,14 +141,32 @@ sed -e "s,PID_FILE=\"/tmp/zabbix_java.pid\",PID_FILE=/var/run/$PRGSHORT/$PRGNAM.
 cp $CWD/zabbix_java_gateway_logback.xml $PKG/etc/$PRGSHORT/
 rm -f $PKG/usr/sbin/zabbix_java/settings.sh
 
+# Binaries
+mkdir -p $PKG/usr/sbin
+sed -e "s,GATEWAY_HOME=\"/usr/sbin/zabbix_java\",GATEWAY_HOME=\"/usr/share/zabbix_java_gateway\"," \
+	$PKG/usr/sbin/zabbix_java/startup.sh > $PKG/usr/sbin/$PRGNAM\_startup
+chmod 755 $PKG/usr/sbin/$PRGNAM\_startup
+rm $PKG/usr/sbin/zabbix_java/startup.sh
+
+sed -e "s,GATEWAY_HOME=\"/usr/sbin/zabbix_java\",GATEWAY_HOME=\"/usr/share/zabbix_java_gateway\"," \
+	$PKG/usr/sbin/zabbix_java/shutdown.sh > $PKG/usr/sbin/$PRGNAM\_shutdown
+chmod 755 $PKG/usr/sbin/$PRGNAM\_shutdown
+rm $PKG/usr/sbin/zabbix_java/shutdown.sh
+
+#mkdir -p $PKG/usr/share/zabbix_java_gateway
+mkdir -p $PKG/usr/share/
+mv $PKG/usr/sbin/zabbix_java $PKG/usr/share/zabbix_java_gateway
+#rm $PKG/usr/sbin/zabbix_java/
+
 # Init script
 mkdir -p $PKG/etc/rc.d
 cat $CWD/rc.$PRGNAM > $PKG/etc/rc.d/rc.$PRGNAM.new
 cp $CWD/$PRGNAM $PKG/usr/sbin/$PRGNAM
+chmod 755  $PKG/usr/sbin/$PRGNAM
 
 # Documentation
 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
 cat $CWD/README.SLACKWARE > $PKG/usr/doc/$PRGNAM-$VERSION/README.SLACKWARE
 
@@ -144,4 +176,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/network/zabbix_java_gateway/zabbix_java_gateway.info b/network/zabbix_java_gateway/zabbix_java_gateway.info
index 70410d7d77..716a63ac39 100644
--- a/network/zabbix_java_gateway/zabbix_java_gateway.info
+++ b/network/zabbix_java_gateway/zabbix_java_gateway.info
@@ -1,10 +1,10 @@
 PRGNAM="zabbix_java_gateway"
-VERSION="4.0.4"
-HOMEPAGE="https://www.zabbix.com/"
-DOWNLOAD="https://downloads.sourceforge.net/zabbix/zabbix-4.0.4.tar.gz"
-MD5SUM="46fdb83d4b24e13127a20a3e874b1d8f"
+VERSION="6.4.11"
+HOMEPAGE="https://www.zabbix.com"
+DOWNLOAD="https://cdn.zabbix.com/zabbix/sources/stable/6.4/zabbix-6.4.11.tar.gz"
+MD5SUM="c1bac67a0d6b9d0d4376ca8176f327a9"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="iksemel jdk"
+REQUIRES="zulu-openjdk8"
 MAINTAINER="zux"
 EMAIL="zux@pie-dabas.net"
diff --git a/network/zabbix_proxy/README b/network/zabbix_proxy/README
index b5eb9aa9dd..d040bc15bc 100644
--- a/network/zabbix_proxy/README
+++ b/network/zabbix_proxy/README
@@ -1,16 +1,17 @@
 Zabbix Proxies may greatly simplify maintenance of Zabbix environment
 and increase performance of the central Zabbix server.
 
-Also, use of Zabbix Proxies is the easiest way of implementing centralized
-and distributed monitoring, when all Agents and Proxies report to one
-Zabbix server and all data is collected centrally.
+Also, use of Zabbix Proxies is the easiest way of implementing
+centralized and distributed monitoring, when all Agents and Proxies
+report to one Zabbix server and all data is collected centrally.
 
-Zabbix offers advanced monitoring, alerting and visualization features,
-including distributed monitoring, auto-discovery, notifications, etcetera.
+Zabbix offers advanced monitoring, alerting and visualization
+features, including distributed monitoring, auto-discovery,
+notifications, etcetera.
 
-zabbix_proxy 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.
+zabbix_proxy 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:   zabbix            UID: 228        GID: 228
   group:  zabbix                            GID: 228
 
diff --git a/network/zabbix_proxy/README.SLACKWARE b/network/zabbix_proxy/README.SLACKWARE
index d9ccd5e4ad..8294fd8ad0 100644
--- a/network/zabbix_proxy/README.SLACKWARE
+++ b/network/zabbix_proxy/README.SLACKWARE
@@ -42,7 +42,7 @@ On your MariaDB server, connect with full privileges:
 
 Create the zabbix database & user:
 
-  mysql> create database zabbix_proxy character set utf8;
+  mysql> create database zabbix_proxy character set utf8mb4 collate utf8mb4_bin;
   mysql> use mysql;
   mysql> grant all on zabbix_proxy.* to zabbix_proxy@<your_zabbix_proxy> identified by '<your_password>';
   mysql> flush privileges;
@@ -67,7 +67,7 @@ A standard configuration file is installed as /etc/zabbix/zabbix_proxy.conf
 
 You will need to change at least the following lines:
 
-  Server=<ip_of_your_zabbix_proxy>
+  Server=<ip_of_your_zabbix_server>
   Hostname=<hostname_of_your_zabbix_proxy>
 
   DBHost=<your_mysql_server>            (Change if MariaDB is not on localhost)
diff --git a/network/zabbix_proxy/rc.zabbix_proxy b/network/zabbix_proxy/rc.zabbix_proxy
index ff169bc023..ed118f9d35 100644
--- a/network/zabbix_proxy/rc.zabbix_proxy
+++ b/network/zabbix_proxy/rc.zabbix_proxy
@@ -75,5 +75,5 @@ case "$1" in
         RETVAL=1
 esac
 
-exit $RETVAL
+#exit $RETVAL
 #EOF
diff --git a/network/zabbix_proxy/zabbix_proxy.SlackBuild b/network/zabbix_proxy/zabbix_proxy.SlackBuild
index 4393bb7bc4..c8842f45ca 100644
--- a/network/zabbix_proxy/zabbix_proxy.SlackBuild
+++ b/network/zabbix_proxy/zabbix_proxy.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for zabbix_proxy
 
@@ -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=zabbix_proxy
-VERSION=${VERSION:-4.0.4}
+VERSION=${VERSION:-6.4.11}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -42,7 +45,14 @@ ZABBIXGROUP=${ZABBIXGROUP:-zabbix}
 ZABBIXUID=${ZABBIXUID:-228}
 ZABBIXGID=${ZABBIXGID:-228}
 
-CWD=$(pwd)
+# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
+# the name of the created package would be, and then exit. This information
+# could be useful to other scripts.
+if [ ! -z "${PRINT_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,11 +109,19 @@ CXXFLAGS="$SLKCFLAGS" \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
   --enable-proxy \
   --with-mysql \
-  --with-jabber \
   --with-libcurl \
   --with-net-snmp \
-  --with-ssh2 \
+  --with-libxml2 \
+  --with-ssh \
   --with-ldap \
+  --with-libpcre2 \
+  --with-openssl \
+  --enable-ipv6 \
+  --with-unixodbc \
+  --with-zlib \
+  --with-libpthread \
+  --with-libevent \
+  --with-iconv \
   --build=$ARCH-slackware-linux
 
 make
@@ -136,7 +154,7 @@ sed -e "s,# PidFile=/tmp/,PidFile=/var/run/$PRGSHORT/," \
     -e "s,# DBSocket=/tmp/,DBSocket=/var/run/mysql/," \
     -e "s,LogFile=/tmp/,LogFile=/var/log/$PRGSHORT/," \
     $PKG/etc/$PRGSHORT/$PRGNAM.conf > $PKG/etc/$PRGSHORT/$PRGNAM.conf.new
-rm -f $PKG/etc/$PRGSHORT/$PRGNAM.conf
+rm -rf $PKG/etc/$PRGSHORT/$PRGNAM.conf $PKG/etc/$PRGSHORT/$PRGNAM.conf.d
 
 # Init script
 mkdir -p $PKG/etc/rc.d
@@ -144,7 +162,7 @@ cat $CWD/rc.$PRGNAM > $PKG/etc/rc.d/rc.$PRGNAM.new
 
 # Documentation
 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
 cat $CWD/README.SLACKWARE > $PKG/usr/doc/$PRGNAM-$VERSION/README.SLACKWARE
 
@@ -154,4 +172,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/network/zabbix_proxy/zabbix_proxy.info b/network/zabbix_proxy/zabbix_proxy.info
index 4704e28f2e..b56fd5d9a7 100644
--- a/network/zabbix_proxy/zabbix_proxy.info
+++ b/network/zabbix_proxy/zabbix_proxy.info
@@ -1,10 +1,10 @@
 PRGNAM="zabbix_proxy"
-VERSION="4.0.4"
+VERSION="6.4.11"
 HOMEPAGE="https://www.zabbix.com"
-DOWNLOAD="https://downloads.sourceforge.net/zabbix/zabbix-4.0.4.tar.gz"
-MD5SUM="46fdb83d4b24e13127a20a3e874b1d8f"
+DOWNLOAD="https://cdn.zabbix.com/zabbix/sources/stable/6.4/zabbix-6.4.11.tar.gz"
+MD5SUM="c1bac67a0d6b9d0d4376ca8176f327a9"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="iksemel jdk"
+REQUIRES="unixODBC"
 MAINTAINER="zux"
 EMAIL="zux@pie-dabas.net"
diff --git a/network/zabbix_server/README b/network/zabbix_server/README
index e5c11daa57..9c343bb231 100644
--- a/network/zabbix_server/README
+++ b/network/zabbix_server/README
@@ -1,9 +1,10 @@
-Zabbix offers advanced monitoring, alerting and visualization features,
-including distributed monitoring, auto-discovery, notifications, etcetera.
+Zabbix offers advanced monitoring, alerting and visualization
+features, including distributed monitoring, auto-discovery,
+notifications, etcetera.
 
-zabbix_server 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.
+zabbix_server 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:   zabbix            UID: 228        GID: 228
   group:  zabbix                            GID: 228
 
diff --git a/network/zabbix_server/README.SLACKWARE b/network/zabbix_server/README.SLACKWARE
index 71d5cee738..240f9b4269 100644
--- a/network/zabbix_server/README.SLACKWARE
+++ b/network/zabbix_server/README.SLACKWARE
@@ -4,14 +4,17 @@ README.Slackware
 This file contains some specific instructions to complete the
 installation of zabbix_server on Slackware.
 
-zabbix-java has been moved to a separate package - zabbix-java-gateway
+zabbix-java has been moved to a separate package - zabbix_java_gateway
+
+Frontend is now also in a seperate package - zabbix_frontend as it might be installed on a seperate machine
+
 
 You will need to have a working installation of httpd and MariaDB (*) for
 zabbix_server to run. MariaDB server does not have to be on the same box as
 zabbix_server, but they need to be able to communicate and you will need at
 least the MariaDB client on the box that will run zabbix_server.
 
-(*) zabbix can work with MySQL and its forks, Oracle, PostgreSQL and IBM DB2
+(*) zabbix can work with MySQL and its forks and PostgreSQL
 databases, but these instructions are for MariaDB, as it is included with
 Slackware.
 
@@ -45,7 +48,7 @@ On your MariaDB server, connect with full privileges:
 
 Create the zabbix database & user:
 
-  mysql> create database zabbix character set utf8 collate utf8_bin;
+  mysql> create database zabbix character set utf8mb4 collate utf8mb4_bin;
   mysql> use mysql;
   mysql> grant all privileges on zabbix.* to zabbix@<your_zabbix_server> identified by '<your_password>';
   mysql> flush privileges;
@@ -62,37 +65,12 @@ On your zabbix server, connect to the new database:
 In MariaDB, create the schema & add initial data:
 
   mysql> source schema.sql;
-  mysql> source data.sql;
   mysql> source images.sql;
+  mysql> source data.sql;
   mysql> quit
 
-1.2) Configure PHP
-
-zabbix requires some parameters in /etc/php.ini to be altered:
-
-  - post_max_size = 16M         Default = 8M
-  - max_execution_time = 300    Default = 30
-  - max_input_time = 300        Default = 60
-  - date.timezone               Needs to be set (default = blank)
-  - always_populate_raw_post_data = -1
-
-After changing the php.ini file, you'll need to restart httpd for the
-changes to have effect:
-
-  # /etc/rc.d/rc.httpd restart
 
-1.3) Configure httpd
-
-zabbix requires php enabled in /etc/httpd/httpd.conf
-
-uncomment the line:
-        Include /etc/httpd/mod_php.conf
-
-add index.php to the DirectoryIndex parameter
-        Directory index.html index.php
-
-
-1.4) zabbix_server configuration file
+1.2) zabbix_server configuration file
 
 A standard configuration file is installed as /etc/zabbix/zabbix_server.conf
 
@@ -139,10 +117,3 @@ Now you are ready to start zabbix_server by calling the startup script:
 
   # /etc/rc.d/rc.zabbix_server start
 
-Once zabbix_server has started and configured correctly, you should be able
-to access it by pointing your browser at:
-
-  http://(ip-of-your-zabbix-server)/zabbix/
-
-From here on, you can follow the manual to start the initial configuration
-and set up all the items to monitor.
diff --git a/network/zabbix_server/rc.zabbix_server b/network/zabbix_server/rc.zabbix_server
index 04011cca4f..01d0975ba5 100644
--- a/network/zabbix_server/rc.zabbix_server
+++ b/network/zabbix_server/rc.zabbix_server
@@ -74,6 +74,3 @@ case "$1" in
         echo "Usage: $(basename $0) {start|stop|restart }"
         RETVAL=1
 esac
-
-exit $RETVAL
-#EOF
diff --git a/network/zabbix_server/zabbix_server.SlackBuild b/network/zabbix_server/zabbix_server.SlackBuild
index ae8e62db4d..1f573dab73 100644
--- a/network/zabbix_server/zabbix_server.SlackBuild
+++ b/network/zabbix_server/zabbix_server.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for zabbix_server
 
@@ -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=zabbix_server
-VERSION=${VERSION:-4.0.4}
+VERSION=${VERSION:-6.4.11}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -37,16 +40,23 @@ fi
 
 PRGSHORT=zabbix
 
-DOCROOT=${DOCROOT:-/var/www/htdocs}
-PHPUSER=${PHPUSER:-root}
-PHPGROUP=${PHPGROUP:-apache}
+#DOCROOT=${DOCROOT:-/var/www/htdocs}
+#PHPUSER=${PHPUSER:-root}
+#PHPGROUP=${PHPGROUP:-apache}
 
 ZABBIXUSER=${ZABBIXUSER:-zabbix}
 ZABBIXGROUP=${ZABBIXGROUP:-zabbix}
 ZABBIXUID=${ZABBIXUID:-228}
 ZABBIXGID=${ZABBIXGID:-228}
 
-CWD=$(pwd)
+# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
+# the name of the created package would be, and then exit. This information
+# could be useful to other scripts.
+if [ ! -z "${PRINT_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,6 +103,7 @@ find -L . \
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
+PKG_CONFIG_PATH=/usr/local/lib64/pkgconfig:/usr/local/share/pkgconfig:/usr/lib64/pkgconfig:/usr/share/pkgconfig:/usr/local/lib64/pkgconfig:/usr/local/share/pkgconfig \
 ./configure \
   --prefix=/usr \
   --sysconfdir=/etc/zabbix \
@@ -103,13 +114,20 @@ CXXFLAGS="$SLKCFLAGS" \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
   --enable-server \
   --with-mysql \
-  --with-jabber \
   --with-libcurl \
   --with-net-snmp \
-  --with-ssh2 \
+  --with-ssh \
   --with-ldap \
-  --with-ipv6 \
+  --enable-ipv6 \
   --with-libxml2 \
+  --with-openssl \
+  --enable-ipv6 \
+  --with-unixodbc \
+  --with-libpcre2 \
+  --with-zlib \
+  --with-libpthread \
+  --with-libevent \
+  --with-iconv \
   --build=$ARCH-slackware-linux
 
 make
@@ -121,11 +139,6 @@ find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
 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 "frontend" to $DOCROOT/zabbix
-mkdir -p $PKG/$DOCROOT/$PRGSHORT
-cp -a frontends/php/* $PKG/$DOCROOT/$PRGSHORT/
-chown -R $PHPUSER:$PHPGROUP $PKG/$DOCROOT/$PRGSHORT
-
 # Database scripts
 mkdir -p $PKG/usr/share/$PRGNAM/database/mysql
 cp -a database/mysql $PKG/usr/share/$PRGNAM/database/
@@ -146,7 +159,11 @@ sed -e "s,# PidFile=/tmp/,PidFile=/var/run/$PRGSHORT/," \
     -e "s,# DBSocket=/tmp/,DBSocket=/var/run/mysql/," \
     -e "s,LogFile=/tmp/,LogFile=/var/log/$PRGSHORT/," \
     $PKG/etc/$PRGSHORT/$PRGNAM.conf > $PKG/etc/$PRGSHORT/$PRGNAM.conf.new
-rm -f $PKG/etc/$PRGSHORT/$PRGNAM.conf
+rm -f $PKG/etc/$PRGSHORT/$PRGNAM.conf 
+rm -rf $PKG/etc/$PRGSHORT/$PRGNAM.conf.d
+rm -rf $PKG/etc/$PRGSHORT/alertscripts/
+rm -rf $PKG/etc/$PRGSHORT/externalscripts/
+
 
 # Init script
 mkdir -p $PKG/etc/rc.d
@@ -154,7 +171,7 @@ cat $CWD/rc.$PRGNAM > $PKG/etc/rc.d/rc.$PRGNAM.new
 
 # Documentation
 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
 cat $CWD/README.SLACKWARE > $PKG/usr/doc/$PRGNAM-$VERSION/README.SLACKWARE
 
@@ -164,4 +181,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/network/zabbix_server/zabbix_server.info b/network/zabbix_server/zabbix_server.info
index 4d46eafd4f..c686cad35a 100644
--- a/network/zabbix_server/zabbix_server.info
+++ b/network/zabbix_server/zabbix_server.info
@@ -1,10 +1,10 @@
 PRGNAM="zabbix_server"
-VERSION="4.0.4"
+VERSION="6.4.11"
 HOMEPAGE="https://www.zabbix.com"
-DOWNLOAD="https://downloads.sourceforge.net/zabbix/zabbix-4.0.4.tar.gz"
-MD5SUM="46fdb83d4b24e13127a20a3e874b1d8f"
+DOWNLOAD="https://cdn.zabbix.com/zabbix/sources/stable/6.4/zabbix-6.4.11.tar.gz"
+MD5SUM="c1bac67a0d6b9d0d4376ca8176f327a9"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="iksemel"
+REQUIRES="unixODBC"
 MAINTAINER="zux"
 EMAIL="zux@pie-dabas.net"
diff --git a/network/bro/README b/network/zeek/README
index 02323c5758..02323c5758 100644
--- a/network/bro/README
+++ b/network/zeek/README
diff --git a/network/zeek/slack-desc b/network/zeek/slack-desc
new file mode 100644
index 0000000000..2b0f45921b
--- /dev/null
+++ b/network/zeek/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+    |-----handy-ruler------------------------------------------------------|
+zeek: zeek (The Zeek Network Security Monitor)
+zeek:
+zeek: Zeek (Bro) is an open source intrusion detection system (IDS).
+zeek: It is different from traditional IDS tools in that it is
+zeek: focused on network analysis. In other words, it is used
+zeek: to monitor traffic traversing a network to identify anomalies.
+zeek:
+zeek:
+zeek: https://www.zeek.org
+zeek:
+zeek:
diff --git a/network/zeek/zeek.SlackBuild b/network/zeek/zeek.SlackBuild
new file mode 100644
index 0000000000..ea2b1cdfaa
--- /dev/null
+++ b/network/zeek/zeek.SlackBuild
@@ -0,0 +1,125 @@
+#!/bin/bash
+
+# Slackware build script for Zeek
+
+# Copyright 2018-2024 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=zeek
+VERSION=${VERSION:-6.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 the variable PRINT_PACKAGE_NAME is set, then this script will report what
+# the name of the created package would be, and then exit. This information
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; 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 .
+# -L bails out because of a loop
+find . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -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 distclean
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/opt/$PRGNAM \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --localstatedir=/var \
+  --mandir=/usr/man
+
+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
+
+BIN="zeek zeek-config zeekctl zeek-cut capstats trace-summary"
+mkdir -p $PKG/usr/bin
+(
+  cd $PKG/usr/bin
+  for i in $BIN
+    do ln -sf ../../opt/$PRGNAM/bin/$i $i
+  done
+)
+
+find -L $PKG -type l 2>&1 | grep loop | iconv -t 8859_1//TRANSLIT |
+  cut -d"'" -f2 | xargs rm -v || 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 README COPYING NEWS 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
+rm -f opt/zeek/include/zeek/builtin-plugins/spicy-plugin/usr/lib$LIBDIRSUFFIX/zeek-spicy
+
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/network/zeek/zeek.info b/network/zeek/zeek.info
new file mode 100644
index 0000000000..e3f6119155
--- /dev/null
+++ b/network/zeek/zeek.info
@@ -0,0 +1,10 @@
+PRGNAM="zeek"
+VERSION="6.0.3"
+HOMEPAGE="https://www.zeek.org"
+DOWNLOAD="https://download.zeek.org/zeek-6.0.3.tar.gz"
+MD5SUM="8cf75e403e8072b25140c2d56a294c4f"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Michael Edie"
+EMAIL="michael@sawbox.net"
diff --git a/network/zmap/README b/network/zmap/README
index 982c0520c5..43877cd48c 100644
--- a/network/zmap/README
+++ b/network/zmap/README
@@ -1,9 +1,9 @@
 zmap (network scanner)
 
 ZMap is a fast network scanner designed for Internet-wide network
-surveys. On a typical desktop computer with a gigabit Ethernet connection,
-ZMap is capable scanning the entire public IPv4 address space in under
-five minutes.
+surveys. On a typical desktop computer with a gigabit Ethernet
+connection, ZMap is capable scanning the entire public IPv4 address
+space in under five minutes.
 
 ZMap can be used to study protocol adoption over time, monitor service
 availability and help us better understand large systems distributed
diff --git a/network/zmap/zmap.SlackBuild b/network/zmap/zmap.SlackBuild
index dfb4dd75c1..f0ac1914d5 100644
--- a/network/zmap/zmap.SlackBuild
+++ b/network/zmap/zmap.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for zmap
 
-# 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,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=zmap
-VERSION=${VERSION:-2.1.1}
+VERSION=${VERSION:-3.0.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}
@@ -91,7 +98,7 @@ rm -rf $PKG/usr/share
 
 mkdir -p $PKG/etc/zmap/
 cp conf/zmap.conf $PKG/etc/zmap/zmap.conf.new
-cp conf/blacklist.conf $PKG/etc/zmap/blacklist.conf.new
+cp conf/blocklist.conf $PKG/etc/zmap/blocklist.conf.new
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a AUTHORS LICENSE *.md $PKG/usr/doc/$PRGNAM-$VERSION
@@ -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/network/zmap/zmap.info b/network/zmap/zmap.info
index f0e1a5bfe1..16608501b4 100644
--- a/network/zmap/zmap.info
+++ b/network/zmap/zmap.info
@@ -1,8 +1,8 @@
 PRGNAM="zmap"
-VERSION="2.1.1"
+VERSION="3.0.0"
 HOMEPAGE="https://zmap.io"
-DOWNLOAD="https://github.com/zmap/zmap/archive/v2.1.1/zmap-2.1.1.tar.gz"
-MD5SUM="a37555ac2beda1dc6f3754b411be545e"
+DOWNLOAD="https://github.com/zmap/zmap/archive/v3.0.0/zmap-3.0.0.tar.gz"
+MD5SUM="e1fca7020b86e05959a2b68ff87afd45"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="byacc gengetopt"
diff --git a/network/znc/README b/network/znc/README
index b292fde987..07c8719581 100644
--- a/network/znc/README
+++ b/network/znc/README
@@ -12,7 +12,8 @@ to IRC servers.  If you do not wish to include OpenSSL support in ZNC,
 simply run the build script like this:
   WITH_SSL=no ./znc.SlackBuild
 
-IPv6 support is also enabled by default; to disable it, run the script as:
+IPv6 support is also enabled by default; to disable it, run the script
+like this:
   WITH_IPV6=no ./znc.SlackBuild
 
 This is intended to be run as a nonprivileged user - by default, the
diff --git a/network/znc/znc.SlackBuild b/network/znc/znc.SlackBuild
index 0294cafe18..4ed3b47eed 100644
--- a/network/znc/znc.SlackBuild
+++ b/network/znc/znc.SlackBuild
@@ -1,9 +1,9 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for ZNC
 
 # Copyright 2007-2013  Sean Donner (sean.donner@gmail.com)
-# Copyright 2017, 2018  Mario Preksavec, Zagreb, Croatia
+# Copyright 2017, 2024  Mario Preksavec, Zagreb, Croatia
 # 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=znc
-VERSION=${VERSION:-1.6.6}
+VERSION=${VERSION:-1.9.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 ZNC_USER=${ZNC_USER:-znc}
 WITH_SSL=${WITH_SSL:-yes}
@@ -39,19 +42,26 @@ WITH_TCL=${WITH_TCL:-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}
 
-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"
@@ -136,7 +146,6 @@ CXXFLAGS="$SLKCFLAGS" \
   --sysconfdir=/etc \
   --localstatedir=/var \
   --mandir=/usr/man \
-  --build=$ARCH-slackware-linux \
   $do_openssl \
   $do_ipv6 \
   $do_perl \
@@ -162,7 +171,7 @@ sed -e "s/@ZNC_USER@/$ZNC_USER/g" -e "s/@VERSION@/$VERSION/g" $CWD/rc.znc \
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
-  AUTHORS LICENSE* README* \
+  CONTRIBUTING* ChangeLog* LICENSE* NOTICE README* \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 sed "s/@ZNC_USER@/$ZNC_USER/g" $CWD/README.SLACKWARE > \
@@ -173,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/network/znc/znc.info b/network/znc/znc.info
index cd98172a3f..5d089154e8 100644
--- a/network/znc/znc.info
+++ b/network/znc/znc.info
@@ -1,8 +1,8 @@
 PRGNAM="znc"
-VERSION="1.6.6"
+VERSION="1.9.0"
 HOMEPAGE="https://wiki.znc.in/ZNC"
-DOWNLOAD="https://znc.in/releases/archive/znc-1.6.6.tar.gz"
-MD5SUM="50f60f473df3b11f26b38bad21728879"
+DOWNLOAD="https://znc.in/releases/archive/znc-1.9.0.tar.gz"
+MD5SUM="28c948af16e4b9307760d9fa951abf74"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/network/zoom-linux/doinst.sh b/network/zoom-linux/doinst.sh
index 408a29c514..9a8ded3c60 100644
--- a/network/zoom-linux/doinst.sh
+++ b/network/zoom-linux/doinst.sh
@@ -1,10 +1,3 @@
-( cd usr/bin ; rm -rf zoom-linux )
-( cd usr/bin ; ln -sf /opt/zoom-linux/ZoomLauncher zoom-linux )
-
-if [ -x /usr/bin/xdg-mime ]; then
-    /usr/bin/xdg-mime install /usr/share/mime/packages/zoom-linux.xml
-fi
-
 if [ -x /usr/bin/update-desktop-database ]; then
   /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
 fi
@@ -12,9 +5,3 @@ 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/network/zoom-linux/slack-desc b/network/zoom-linux/slack-desc
index 3b2bfaadeb..99a5379e41 100644
--- a/network/zoom-linux/slack-desc
+++ b/network/zoom-linux/slack-desc
@@ -8,9 +8,9 @@
           |-----handy-ruler------------------------------------------------------|
 zoom-linux: zoom-linux (Video conferencing client)
 zoom-linux:
-zoom-linux: Stay connected wherever you go – start or join a 100-person
+zoom-linux: Stay connected wherever you go - start or join a 100-person
 zoom-linux: meeting with crystal-clear, face-to-face video, high quality
-zoom-linux: screen sharing, and instant messaging – for free!
+zoom-linux: screen sharing, and instant messaging - for free!
 zoom-linux:
 zoom-linux: Join any meeting and host unlimited 1:1 meetings for free.
 zoom-linux: Free group meetings are limited to 40 minutes.
diff --git a/network/zoom-linux/zoom-linux.SlackBuild b/network/zoom-linux/zoom-linux.SlackBuild
index 6ab3302aa1..c0ea126161 100644
--- a/network/zoom-linux/zoom-linux.SlackBuild
+++ b/network/zoom-linux/zoom-linux.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 #
 # Slackware build script for zoom-linux
 #
-# Copyright 2018, 2019 Ebben Aries <e@dscp.org>
+# Copyright 2018-2023 Ebben Aries <slackbuilds@dscp.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=zoom-linux
+VERSION=${VERSION:-5.17.11.3835} # may be overridden by source!
 SRCNAM=zoom
-VERSION=${VERSION:-2.9.265650.0716}
 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}
@@ -61,10 +71,12 @@ set -e
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$SRC.tar.xz
-cd $SRCNAM
+cd $PKG
+tar xvf $CWD/$SRC.pkg.tar.xz
+# don't want these
+rm -vrf .INSTALL .MTREE .PKGINFO
+rm -rf usr/bin/zoom usr/share/doc
+
 chown -R root:root .
 find -L . \
 \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -72,25 +84,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 {} \;
 
-mkdir -p $PKG/opt/$PRGNAM
-cp -a * $PKG/opt/$PRGNAM
+cd $PKG/usr/bin
+ln -sf ../../opt/zoom/ZoomLauncher zoom-linux
 
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+# remove old stuff that might be confused with games/zoom
+rm -fv $PKG/usr/share/applications/Zoom.desktop
+rm -fv $PKG/usr/share/mime/packages/zoom.xml
+rm -fv $PKG/usr/share/pixmaps/Zoom.png
 
-mkdir -p $PKG/usr/share/applications/
-install -D -m644 $CWD/zoom-linux.desktop $PKG/usr/share/applications/
+# add our own files
+install -m 0644 $CWD/zoom-linux.desktop -t $PKG/usr/share/applications/
+install -m 0644 $CWD/zoom-linux.png -t $PKG/usr/share/pixmaps/
+install -m 0644 $CWD/zoom-linux.xml -t $PKG/usr/share/mime/packages/
 
-mkdir -p $PKG/usr/share/pixmaps/
-cp $CWD/zoom-linux.png $PKG/usr/share/pixmaps/
-cp $CWD/application-x-zoom.png $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/share/mime/packages/
-cp $CWD/zoom-linux.xml $PKG/usr/share/mime/packages/
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a $CWD/README $PKG/usr/doc/$PRGNAM-$VERSION
+chown root:root $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
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/network/zoom-linux/zoom-linux.desktop b/network/zoom-linux/zoom-linux.desktop
index c67baa031b..84dc0a257a 100644
--- a/network/zoom-linux/zoom-linux.desktop
+++ b/network/zoom-linux/zoom-linux.desktop
@@ -2,11 +2,10 @@
 Name=Zoom
 Comment=Zoom Video Conference
 Exec=/usr/bin/zoom-linux %U
-Icon=Zoom.png
+Icon=zoom-linux
 Terminal=false
 Type=Application
-Encoding=UTF-8
-Categories=Network;Application;
+Categories=Network;
 StartupWMClass=zoom
 MimeType=x-scheme-handler/zoommtg;application/x-zoom;
 X-KDE-Protocols=zoommtg
diff --git a/network/zoom-linux/zoom-linux.info b/network/zoom-linux/zoom-linux.info
index 042cf48c1c..cd1935075c 100644
--- a/network/zoom-linux/zoom-linux.info
+++ b/network/zoom-linux/zoom-linux.info
@@ -1,10 +1,10 @@
 PRGNAM="zoom-linux"
-VERSION="2.9.265650.0716"
+VERSION="5.17.11.3835"
 HOMEPAGE="https://www.zoom.us/"
-DOWNLOAD="https://www.zoom.us/client/2.9.265650.0716/zoom_i686.tar.xz"
-MD5SUM="615699524fd138cf760d27d05dc02b12"
-DOWNLOAD_x86_64="https://www.zoom.us/client/2.9.265650.0716/zoom_x86_64.tar.xz"
-MD5SUM_x86_64="a2dd4c69e640d221b915eec87c6978ae"
+DOWNLOAD="UNSUPPORTED"
+MD5SUM=""
+DOWNLOAD_x86_64="https://cdn.zoom.us/prod/5.17.11.3835/zoom_x86_64.pkg.tar.xz"
+MD5SUM_x86_64="acb26a735574863f7e2b1bc31f3b8b35"
 REQUIRES=""
 MAINTAINER="Ebben Aries"
-EMAIL="e@dscp.org"
+EMAIL="slackbuilds@dscp.org"
diff --git a/network/zsync/slack-desc b/network/zsync/slack-desc
index 13705bc452..ee8c8ed579 100644
--- a/network/zsync/slack-desc
+++ b/network/zsync/slack-desc
@@ -8,10 +8,10 @@
      |-----handy-ruler------------------------------------------------------|
 zsync: zsync (client-side implementation of the rsync algorithm)
 zsync:
-zsync: zsync is a file transfer program. It allows you to download a file from
-zsync: a remote web server, where you have a copy of an older version of the
-zsync: file on your computer already. zsync downloads only the new parts of
-zsync: the file. It uses the same algorithm as rsync.
+zsync: zsync is a file transfer program. It allows you to download a file
+zsync: from a remote web server, where you have a copy of an older version of
+zsync: the file on your computer already. zsync downloads only the new parts
+zsync: of the file. It uses the same algorithm as rsync.
 zsync:
 zsync: The zsync web site is at http://zsync.moria.org.uk/
 zsync:
diff --git a/network/zsync/zsync.SlackBuild b/network/zsync/zsync.SlackBuild
index ad5b7ecdaf..8a7f33bbbe 100644
--- a/network/zsync/zsync.SlackBuild
+++ b/network/zsync/zsync.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for zsync
 
@@ -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=zsync		
 VERSION=${VERSION:-0.6.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}
@@ -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