6 files changed, 36 insertions, 22 deletions
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/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 755b99c2df..42eb0f7108 100644
--- a/network/ipxnet/ipxnet.info
+++ b/network/ipxnet/ipxnet.info
@@ -7,4 +7,4 @@ DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
 MAINTAINER="B. Watson"
-EMAIL="yalhcru@gmail.com"
+EMAIL="urchlay@slackware.uk"
diff --git a/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