system/posh: New maintainer.

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

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

5 files changed, 33 insertions, 48 deletions

diff --git a/system/posh/README b/system/posh/README
index c18c26fb85..d99bde3ae2 100644
--- a/system/posh/README
+++ b/system/posh/README
@@ -1,2 +1,5 @@
+posh (Policy-compliant Ordinary SHell)
+
 posh is a stripped-down version of pdksh that aims for compliance with
-Debian's policy, and few extra features.
+Debian's policy, and few extra features. It's a reimplementation of
+the Bourne shell for both interactive and script use.
diff --git a/system/posh/doinst.sh b/system/posh/doinst.sh
index 6910686719..bd3ef40836 100644
--- a/system/posh/doinst.sh
+++ b/system/posh/doinst.sh
@@ -4,5 +4,5 @@ if [ ! -r etc/shells ]; then
 fi
 
 if ! grep -q /bin/posh etc/shells ; then
-  printf %s\\n /bin/posh >> etc/shells
+  echo /bin/posh >> etc/shells
 fi
diff --git a/system/posh/posh.SlackBuild b/system/posh/posh.SlackBuild
index 207b632368..acf9264006 100644
--- a/system/posh/posh.SlackBuild
+++ b/system/posh/posh.SlackBuild
@@ -2,31 +2,21 @@
 
 # Slackware build script for posh
 
-# Copyright 2017-2020 Hunter Sezen California, 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.
+# Original author: Hunter Sezen.
+# Modified and now maintained by B. Watson <urchlay@slackware.uk>.
+
+# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
+
+# 20240830 bkw: BUILD=2
+# - new maintainer.
+# - relicense as WTFPL.
+# - expand README and slack-desc with description from man page.
 
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=posh
 VERSION=${VERSION:-0.14.1}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
 
@@ -38,9 +28,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
@@ -52,16 +39,12 @@ 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 -eu
@@ -73,12 +56,10 @@ 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 {} +
 
+# 20240830 bkw: yes, this is really needed.
 autoreconf -fi
 
 CFLAGS="$SLKCFLAGS" \
@@ -90,20 +71,21 @@ CXXFLAGS="$SLKCFLAGS" \
   --build=$ARCH-slackware-linux
 
 make
-make install DESTDIR=$PKG
+make install-strip DESTDIR=$PKG
+gzip -9 $PKG/usr/man/man*/*
 
 mkdir -p $PKG/usr/bin
 ln -s /bin/$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
+PKGDOC=$PKG/usr/doc/$PRGNAM-$VERSION
+mkdir -p $PKGDOC
+cp -a COPYING debian/changelog $PKGDOC
+cat $CWD/$PRGNAM.SlackBuild > $PKGDOC/$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/usr/doc/$PRGNAM-$VERSION
-cp -a COPYING debian/changelog $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+# 20240830 bkw: not going to 'make test' by default.
+if [ "${MAKETEST:-no}" = "yes" ]; then
+  make -C tests test &> $PKGDOC/maketest.txt
+fi
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
diff --git a/system/posh/posh.info b/system/posh/posh.info
index 5867da639a..7f1f4f5b7e 100644
--- a/system/posh/posh.info
+++ b/system/posh/posh.info
@@ -6,5 +6,5 @@ MD5SUM="71f482c9a8815f209abf6ac134543bc9"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Hunter Sezen"
-EMAIL="orbea@riseup.net"
+MAINTAINER="B. Watson"
+EMAIL="urchlay@slackware.uk"
diff --git a/system/posh/slack-desc b/system/posh/slack-desc
index 9828ff72fc..0d42a8f06e 100644
--- a/system/posh/slack-desc
+++ b/system/posh/slack-desc
@@ -8,12 +8,12 @@
     |-----handy-ruler------------------------------------------------------|
 posh: posh (Policy-compliant Ordinary SHell)
 posh:
-posh: posh is a stripped-down version of pdksh that aims for compliance
-posh: with Debian's policy, and few extra features.
+posh: posh is a stripped-down version of pdksh that aims for compliance with
+posh: Debian's policy, and few extra features. It's a reimplementation of
+posh: the Bourne shell for both interactive and script use.
 posh:
 posh: Homepage: https://packages.qa.debian.org/p/posh.html
 posh:
 posh:
 posh:
 posh:
-posh: