summaryrefslogtreecommitdiff
path: root/network
diff options
context:
space:
mode:
authorThomas Morper <thomas@beingboiled.info>2016-12-31 00:01:00 +0000
committerDavid Spencer <idlemoor@slackbuilds.org>2016-12-31 00:01:00 +0000
commitdf220b32afc915dda4ecc037a7887367f6ef3ce4 (patch)
tree92582116e4afbd16639dda77ce2c8b09c07c254e /network
parent1e92b7eec08e3604214c64c37c89dc22dc38e3a5 (diff)
downloadslackbuilds-df220b32afc915dda4ecc037a7887367f6ef3ce4.tar.gz
network/exim: Updated for version 4.88.
Signed-off-by: David Spencer <idlemoor@slackbuilds.org>
Diffstat (limited to 'network')
-rw-r--r--network/exim/exim.Makefile24
-rw-r--r--network/exim/exim.SlackBuild16
-rw-r--r--network/exim/exim.info6
3 files changed, 27 insertions, 19 deletions
diff --git a/network/exim/exim.Makefile b/network/exim/exim.Makefile
index 736fa7c9e3..d4e1b7e56f 100644
--- a/network/exim/exim.Makefile
+++ b/network/exim/exim.Makefile
@@ -411,13 +411,6 @@ endif
WITH_CONTENT_SCAN=yes
-# If you want to use the deprecated "demime" condition in the DATA ACL,
-# uncomment the line below. Doing so will also explicitly turn on the
-# WITH_CONTENT_SCAN option. If possible, use the MIME ACL instead of
-# the "demime" condition.
-
-# WITH_OLD_DEMIME=yes
-
#------------------------------------------------------------------------------
# If you're using ClamAV and are backporting fixes to an old version, instead
# of staying current (which is the more usual approach) then you may need to
@@ -508,11 +501,22 @@ WITH_CONTENT_SCAN=yes
# Uncomment the following line to add DANE support
# Note: Enabling this unconditionally overrides DISABLE_DNSSEC
+# Note: DANE is only supported when using OpenSSL
# EXPERIMENTAL_DANE=yes
# Uncomment the following to include extra information in fail DSN message (bounces)
# EXPERIMENTAL_DSN_INFO=yes
+# Uncomment the following to add LMDB lookup support
+# You need to have LMDB installed on your system (https://github.com/LMDB/lmdb)
+# Depending on where it is installed you may have to edit the CFLAGS and LDFLAGS lines.
+# EXPERIMENTAL_LMDB=yes
+# CFLAGS += -I/usr/local/include
+# LDFLAGS += -llmdb
+
+# Uncomment the following line to add queuefile transport support
+# EXPERIMENTAL_QUEUEFILE=yes
+
###############################################################################
# THESE ARE THINGS YOU MIGHT WANT TO SPECIFY #
###############################################################################
@@ -761,6 +765,10 @@ USE_OPENSSL_PC=openssl
# USE_GNUTLS_PC=gnutls
# TLS_LIBS=-lgnutls -ltasn1 -lgcrypt
+# If using GnuTLS older than 2.10 and using pkg-config then note that Exim's
+# build process will require libgcrypt-config to exist in your $PATH. A
+# version that old is likely to become unsupported by Exim in 2017.
+
# The security fix we provide with the gnutls_allow_auto_pkcs11 option
# (4.82 PP/09) introduces a compatibility regression. The symbol is
# not available if GnuTLS is build without p11-kit (--without-p11-kit
@@ -1054,7 +1062,7 @@ CYRUS_SASLAUTHD_SOCKET=/var/state/saslauthd/mux
# (the value doesn't matter), the symbolic link is not created or moved. You
# will then have to "turn Exim on" by setting up the link manually.
-NO_SYMLINK=yes
+# NO_SYMLINK=yes
#------------------------------------------------------------------------------
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
diff --git a/network/exim/exim.info b/network/exim/exim.info
index 78ace947c7..e313d611db 100644
--- a/network/exim/exim.info
+++ b/network/exim/exim.info
@@ -1,8 +1,8 @@
PRGNAM="exim"
-VERSION="4.87"
+VERSION="4.88"
HOMEPAGE="http://www.exim.org/"
-DOWNLOAD="ftp://ftp.exim.org/pub/exim/exim4/exim-4.87.tar.bz2"
-MD5SUM="2effc2bd47ad2dc010f655c11a1b1173"
+DOWNLOAD="ftp://ftp.exim.org/pub/exim/exim4/exim-4.88.tar.bz2"
+MD5SUM="4cc10c910fd18bb9e299e98bc0a32ed2"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="%README%"