2 files changed, 40 insertions, 31 deletions
diff --git a/system/aespipe/aespipe.SlackBuild b/system/aespipe/aespipe.SlackBuild
index dd20a66b2b..8cbe4a355f 100644
--- a/system/aespipe/aespipe.SlackBuild
+++ b/system/aespipe/aespipe.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for aespipe
 
@@ -23,12 +23,20 @@
 #   OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 #   SUCH DAMAGE.
 #
-# markus reichelt, slackbuilds@mareichelt.de, 0xCCEEF115
+# markus reichelt, (email removed)
+
+# 20231031 bkw: update for v2.4g.
+# 20230709 bkw: BUILD=2
+# - new maintainer.
+# - include bz2aespipe in package.
+
+cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=aespipe
-VERSION=${VERSION:-2.4f}
+VERSION=${VERSION:-2.4g}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 SRCVER="v${VERSION}"
 
@@ -40,29 +48,34 @@ 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}
 
+OPT="--enable-padlock --enable-intelaes"
+
 if [ "$ARCH" = "i586" ]; then
   SLKCFLAGS="-O2 -march=i586 -mtune=i686"
-  LIBDIRSUFFIX=""
-  OPT="--enable-asm=x86 --enable-padlock --enable-intelaes"
+  OPT+=" --enable-asm=x86"
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-  LIBDIRSUFFIX=""
-  OPT="--enable-asm=x86 --enable-padlock --enable-intelaes"
+  OPT+=" --enable-asm=x86"
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
-  OPT="--enable-asm=amd64 --enable-padlock --enable-intelaes"
+  OPT+=" --enable-asm=amd64"
+elif [ "$ARCH" = "aarch64" ]; then # hope this is correct
+  SLKCFLAGS="-O2 -fPIC"
 else
   SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-  OPT=""
 fi
 
+echo "===> configure options: $OPT"
+
 set -e
 
 rm -rf $PKG
@@ -72,11 +85,8 @@ rm -rf $PRGNAM-$SRCVER
 tar xvf $CWD/$PRGNAM-$SRCVER.tar.bz2
 cd $PRGNAM-$SRCVER
 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 {} +
 
 set -e
 
@@ -91,18 +101,17 @@ fi
 LDFLAGS=$LDFLAGS \
 CFLAGS=$SLKCFLAGS \
 ./configure \
-  --bindir=$PKG/usr/bin \
-  --mandir=$PKG/usr/man \
+  --bindir=/usr/bin \
+  --mandir=/usr/man \
   $OPT
 
 make
 make tests
-make install
-
-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
+make install-strip DESTDIR=$PKG
+gzip -9 $PKG/usr/man/man*/*
 
-find $PKG/usr/man/man1 -type f -exec gzip -9 {} \;
+# 20230709 bkw: this loox useful and the README shows an example for it:
+cp -a bz2aespipe $PKG/usr/bin
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a README* ChangeLog* $PKG/usr/doc/$PRGNAM-$VERSION
@@ -112,4 +121,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 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/system/aespipe/aespipe.info b/system/aespipe/aespipe.info
index a2ae6076d8..5d11b1e5ac 100644
--- a/system/aespipe/aespipe.info
+++ b/system/aespipe/aespipe.info
@@ -1,10 +1,10 @@
 PRGNAM="aespipe"
-VERSION="2.4f"
-HOMEPAGE="http://loop-aes.sourceforge.net/"
-DOWNLOAD="http://loop-aes.sourceforge.net/aespipe/aespipe-v2.4f.tar.bz2"
-MD5SUM="ed05c62c1954110f009bedda4bc1562f"
+VERSION="2.4g"
+HOMEPAGE="https://loop-aes.sourceforge.net/"
+DOWNLOAD="https://loop-aes.sourceforge.net/aespipe/aespipe-v2.4g.tar.bz2"
+MD5SUM="c216c6c9e939fac69f859af0ad2fd8ef"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Markus Reichelt"
-EMAIL="slackbuilds@mareichelt.de"
+MAINTAINER="B. Watson"
+EMAIL="urchlay@slackware.uk"