network/xinetd: New maintainer.

Signed-off-by: B. Watson <urchlay@slackware.uk>

4 files changed, 31 insertions, 36 deletions

diff --git a/network/xinetd/README b/network/xinetd/README
index bf77dbabe0..84a8eae259 100644
--- a/network/xinetd/README
+++ b/network/xinetd/README
@@ -1,14 +1,13 @@
-Xinetd is a powerful inetd replacement.  Xinetd has access control
+xinetd (a better inetd)
+
+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
+servers that can be started, and has configurable defence mechanisms
 to protect against port scanners, among other things.
 
 Before starting xinetd, you may wish to switch inetd off if it is
-running. To do this:
-
-Do a "ps x" as root and look up the pid of inetd. Then do "kill <pid
-of inetd>"
+running. To do this: killall inetd
 
 Stop inetd from starting at boot: chmod 0644 /etc/rc.d/rc.inetd
 
@@ -18,6 +17,7 @@ Start xinetd on boot by adding the following lines to
   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:
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 7707e974aa..4da22df787 100644
--- a/network/xinetd/xinetd.SlackBuild
+++ b/network/xinetd/xinetd.SlackBuild
@@ -3,8 +3,9 @@
 # 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 <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,6 +25,15 @@
 # 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
@@ -40,9 +50,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
@@ -72,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
 
@@ -97,30 +100,22 @@ 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
diff --git a/network/xinetd/xinetd.info b/network/xinetd/xinetd.info
index ec6322ac56..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"
-EMAIL="aaditya_gnulinux@zoho.com"
+MAINTAINER="B. Watson"
+EMAIL="urchlay@slackware.uk"