1 files changed, 28 insertions, 16 deletions
diff --git a/system/clamsmtp/clamsmtp.SlackBuild b/system/clamsmtp/clamsmtp.SlackBuild
index 2e56d765ce..af0cb6a7bb 100644
--- a/system/clamsmtp/clamsmtp.SlackBuild
+++ b/system/clamsmtp/clamsmtp.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware Package Build Script for clamsmtp
 # Home Page http://memberwebs.com/stef/software/clamsmtp/
@@ -24,10 +24,17 @@
 # NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20220409 bkw: Modified by SlackBuilds.org, BUILD=2:
+# - install SlackBuild in doc dir.
+# 20220211 bkw: Modified by SlackBuilds.org: fix build on 15.0.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=clamsmtp
 VERSION=${VERSION:-1.10}
 BUILD=${BUILD:-4}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -37,7 +44,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}
@@ -66,10 +77,18 @@ cd $TMP/$PRGNAM-$VERSION
 chown -R root.root .
 find -L . \
   \( -perm 664 -o -perm 666 -o -perm 600 -o -perm 440 -o -perm 444 -o -perm 400 \) \
-  -exec chmod 644 {} \;
+  -exec chmod 644 {} \+
 find -L . \
   \( -perm 777 -o -perm 755 -o -perm 711 -o -perm 700 -o -perm 555 -o -perm 511 -o -perm 500 \) \
-  -exec chmod 755 {} \;
+  -exec chmod 755 {} \+
+
+# 20220211 bkw: These patches came from Debian:
+# http://deb.debian.org/debian/pool/main/c/clamsmtp/clamsmtp_1.10-17.diff.gz
+# They fix various issues, including one that kept this from compiling
+# on Slackware 15.0.
+for i in $(cat $CWD/patches/series); do
+  patch -p1 < $CWD/patches/$i
+done
 
 CFLAGS="$SLKCFLAGS" \
 ./configure \
@@ -83,29 +102,22 @@ CFLAGS="$SLKCFLAGS" \
   --build=${ARCH}-slackware-linux
 
 make
-make install DESTDIR=$PKG
+make install-strip DESTDIR=$PKG
+gzip -9 $PKG/usr/man/man*/*
 
 # Install init script and config file
 mkdir -p $PKG/etc/rc.d
 cat $CWD/rc.clamsmtpd > $PKG/etc/rc.d/rc.clamsmtpd.new
 cat doc/clamsmtpd.conf > $PKG/etc/clamsmtpd.conf.new
 
-### strip binaries
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-( cd $PKG/usr/man
-  find . -type f -exec gzip -9 {} \;
-  for i in $(find . -type l) ; do ln -s $(readlink $i).gz $i.gz ; rm $i ; done
-)
-
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS ChangeLog COPYING INSTALL NEWS README \
+cp -a AUTHORS ChangeLog COPYING NEWS README \
   $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install $PKG/etc/rc.d
 cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 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