1 files changed, 60 insertions, 72 deletions
diff --git a/source/n/mailx/mailx.SlackBuild b/source/n/s-nail/s-nail.SlackBuild
index 9a2b28795..2795c9117 100755
--- a/source/n/mailx/mailx.SlackBuild
+++ b/source/n/s-nail/s-nail.SlackBuild
@@ -1,6 +1,9 @@
-#!/bin/bash
+#!/bin/sh
+
+# Slackware build script for S-nail
 
 # Copyright 2008, 2009, 2010, 2016, 2018  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2018 Johannes Schoepfer, Germany
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,17 +25,15 @@
 
 cd $(dirname $0) ; CWD=$(pwd)
 
-PKGNAM=mailx
-VERSION=12.5
-BUILD=${BUILD:-4}
+PKGNAM=s-nail
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+BUILD=${BUILD:-1}
 
-# Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) export ARCH=i586 ;;
-    arm*) export ARCH=arm ;;
-    # Unless $ARCH is already set, use uname -m for all other archs:
-       *) export ARCH=$( uname -m ) ;;
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
   esac
 fi
 
@@ -48,49 +49,57 @@ NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
 
 if [ "$ARCH" = "i586" ]; then
   SLKCFLAGS="-O2 -march=i586 -mtune=i686"
-elif [ "$ARCH" = "s390" ]; then
-  SLKCFLAGS="-O2"
+  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
 
 TMP=${TMP:-/tmp}
-PKG=$TMP/package-mailx
+PKG=$TMP/package-$PKGNAM
+
 rm -rf $PKG
 mkdir -p $TMP $PKG
-
 cd $TMP
-rm -rf mailx-$VERSION
-tar xvf $CWD/mailx-$VERSION.tar.?z* || exit 1
-cd mailx-$VERSION || exit 1
-
-zcat $CWD/mailx-12.5-openssl.patch.gz | patch -p1 --verbose || exit 1
-zcat $CWD/mailx-12.5-globname-Invoke-wordexp-with-WRDE_NOCMD-CVE-2004-277.patch.gz | patch -p1 --verbose || exit 1
-zcat $CWD/mailx-12.5-outof-Introduce-expandaddr-flag.patch.gz | patch -p1 --verbose || exit 1
-
+rm -rf $PKGNAM-$VERSION
+tar xvf $CWD/$PKGNAM-$VERSION.tar.?z || exit 1
+cd $PKGNAM-$VERSION || exit 1
 chown -R root:root .
-find . \
-  \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
-  -exec chmod 755 {} \; -o \
-  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-  -exec chmod 644 {} \;
-
-make CFLAGS="$SLKCFLAGS" \
-     PREFIX=/usr \
-     MANDIR=/usr/man \
-     MAILSPOOL=/var/spool/mail \
-     UCBINSTALL=/usr/bin/install \
-     SENDMAIL=/usr/sbin/sendmail || exit 1
-
-make install DESTDIR=$PKG \
-             CFLAGS="$SLKCFLAGS" \
-             PREFIX=/usr \
-             MANDIR=/usr/man \
-             MAILSPOOL=/var/spool/mail \
-             UCBINSTALL=/usr/bin/install \
-             SENDMAIL=/usr/sbin/sendmail || exit 1
+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 {} \;
+
+CFLAGS="$SLKCFLAGS" \
+make $NUMJOBS \
+  VAL_PREFIX=/usr \
+  VAL_SYSCONFDIR=/etc \
+  VAL_MANDIR=/usr/man \
+  VAL_MAIL=/var/spool/mail \
+  VAL_MTA=/usr/sbin/sendmail \
+  OPT_AUTOCC=0 \
+  VAL_SID= \
+  VAL_MAILX=mailx \
+  VAL_SYSCONFRC=nail.rc \
+  VAL_RANDOM="libgetrandom,sysgetrandom,urandom" \
+  config || exit 1
+
+make $NUMJOBS build || exit 1
+make $NUMJOBS test || exit 1
+make install DESTDIR=$PKG || exit 1
+
+# Tighten up the perms a bit:
+chmod 4711 $PKG//usr/libexec/mailx-privsep
+
+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
 
 # We put symlinks in /bin since some things still expect '/bin/mail' or '/bin/Mail':
 mkdir -p $PKG/bin
@@ -99,29 +108,18 @@ mkdir -p $PKG/bin
   ln -sf /usr/bin/mailx mail
   ln -sf /usr/bin/mailx nail
 )
+
 # Likewise, we make some compat symlinks in /usr/bin:
 ( cd $PKG/usr/bin
   ln -sf mailx Mail
   ln -sf mailx mail
   ln -sf mailx nail
 )
+
 mv $PKG/etc/nail.rc $PKG/etc/nail.rc.new
-strip $PKG/usr/bin/mailx
-
-# Compress and link manpages, if any:
-if [ -d $PKG/usr/man ]; then
-  ( cd $PKG/usr/man
-    for manpagedir in $(find . -type d -name "man*") ; do
-      ( cd $manpagedir
-        for eachpage in $( find . -type l -maxdepth 1) ; do
-          ln -s $( readlink $eachpage ).gz $eachpage.gz
-          rm $eachpage
-        done
-        gzip -9 *.?
-      )
-    done
-  )
-fi
+
+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
 
 # Manpage links:
 ( cd $PKG/usr/man/man1
@@ -130,24 +128,14 @@ fi
   ln -sf mailx.1.gz Mail.1.gz
 )
 
-mkdir -p $PKG/usr/doc/mailx-$VERSION
+mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
 cp -a \
-  AUTHORS COPYING* INSTALL README TODO \
-  $PKG/usr/doc/mailx-$VERSION
-
-# If there's a ChangeLog, installing at least part of the recent history
-# is useful, but don't let it get totally out of control:
-if [ -r ChangeLog ]; then
-  DOCSDIR=$(echo $PKG/usr/doc/*-$VERSION)
-  cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog
-  touch -r ChangeLog $DOCSDIR/ChangeLog
-fi
+  COPYING* INSTALL* NEWS* README* THANKS* \
+  $PKG/usr/doc/$PKGNAM-$VERSION
 
 mkdir -p $PKG/install
-zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh
 cat $CWD/slack-desc > $PKG/install/slack-desc
+zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh
 
-# Build the package:
 cd $PKG
-/sbin/makepkg -l y -c n $TMP/mailx-$VERSION-$ARCH-$BUILD.txz
-
+/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz