network/mosh: New maintainer, bash completion, ufw support.

Signed-off-by: B. Watson <yalhcru@gmail.com>

3 files changed, 38 insertions, 30 deletions

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 8cb9827d9f..86a192894f 100644
--- a/network/mosh/mosh.SlackBuild
+++ b/network/mosh/mosh.SlackBuild
@@ -3,13 +3,23 @@
 # Slackware build script for mosh
 
 # Written by ruario
-# Maintained by Donald Cooley, South Haven, Indiana, USA
+# 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.
+
+# 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.3.2}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
 
@@ -21,9 +31,6 @@ 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
@@ -58,9 +65,9 @@ cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
+ -exec chmod 755 {} \+ -o \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
+ -exec chmod 644 {} \+
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS -fpermissive" \
@@ -74,19 +81,21 @@ CXXFLAGS="$SLKCFLAGS -fpermissive" \
   --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
diff --git a/network/mosh/mosh.info b/network/mosh/mosh.info
index e4ac67131b..e4d1a34cb1 100644
--- a/network/mosh/mosh.info
+++ b/network/mosh/mosh.info
@@ -6,5 +6,5 @@ MD5SUM="5122f4d2b973ab7c38dcdac8c35cb61e"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="perl-IO-Tty protobuf3"
-MAINTAINER="Donald Cooley"
-EMAIL="chytraeu@sdf.org"
+MAINTAINER="B. Watson"
+EMAIL="urchlay@slackware.uk"