4 files changed, 33 insertions, 17 deletions
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=""