From df220b32afc915dda4ecc037a7887367f6ef3ce4 Mon Sep 17 00:00:00 2001
From: Thomas Morper <thomas@beingboiled.info>
Date: Sat, 31 Dec 2016 00:01:00 +0000
Subject: network/exim: Updated for version 4.88.

Signed-off-by: David Spencer <idlemoor@slackbuilds.org>
---
 network/exim/exim.SlackBuild | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'network/exim/exim.SlackBuild')

diff --git a/network/exim/exim.SlackBuild b/network/exim/exim.SlackBuild
index 0cf535ca63..e3163e555b 100644
--- a/network/exim/exim.SlackBuild
+++ b/network/exim/exim.SlackBuild
@@ -23,13 +23,13 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=exim
-VERSION=${VERSION:-4.87}
+VERSION=${VERSION:-4.88}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
@@ -40,8 +40,8 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -99,10 +99,10 @@ FULLECHO="" LIBDIRSUFFIX=$LIBDIRSUFFIX DESTDIR=$PKG make -e 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
 
-# Rename the version specific suid binary to simply 'exim'.
-find $PKG/usr/sbin -perm /4000 -exec mv {} $PKG/usr/sbin/exim \;
+# Replace the 'exim' symlink with the 'exim' binary.
+mv $(readlink -f $PKG/usr/sbin/exim) $PKG/usr/sbin/exim
 
-# Additional symlinks provide compatibility with sendmail
+# Additional symlinks provide compatibility with sendmail.
 mkdir -p $PKG/usr/lib     # no LIBDIRSUFFIX here!
 ( cd $PKG/usr/lib;  ln -s /usr/sbin/exim sendmail )
 ( cd $PKG/usr/sbin; ln -s /usr/sbin/exim sendmail )
@@ -125,7 +125,7 @@ cp -a \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
-# Don't use the default config - make it part of the documentation
+# Don't use the default config - make it part of the documentation.
 mv $PKG/etc/exim/exim.conf $PKG/usr/doc/$PRGNAM-$VERSION/example-exim.conf
 mv $PKG/etc/exim/aliases $PKG/usr/doc/$PRGNAM-$VERSION/example-aliases
 
-- 
cgit v1.2.3-80-g2a13