From 819870693c3f00590408de2306da2373f9e28209 Mon Sep 17 00:00:00 2001
From: Thomas Morper <thomas@beingboiled.info>
Date: Thu, 9 Mar 2017 08:28:01 +0700
Subject: network/exim: Updated for version 4.89.

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
---
 network/exim/exim.Makefile   | 20 ++++++++++++++++++--
 network/exim/exim.SlackBuild |  6 +++---
 network/exim/exim.info       |  6 +++---
 3 files changed, 24 insertions(+), 8 deletions(-)

(limited to 'network/exim')

diff --git a/network/exim/exim.Makefile b/network/exim/exim.Makefile
index d4e1b7e56f..31a89fa31b 100644
--- a/network/exim/exim.Makefile
+++ b/network/exim/exim.Makefile
@@ -616,7 +616,7 @@ FIXED_NEVER_USERS=root
 # That shim can set macros before .include'ing your main configuration file.
 #
 # As a strictly transient measure to ease migration to 4.73, the
-# WHITELIST_D_MACROS value definies a colon-separated list of macro-names
+# WHITELIST_D_MACROS value defines a colon-separated list of macro-names
 # which are permitted to be overridden from the command-line which will be
 # honoured by the Exim user.  So these are macros that can persist to delivery
 # time.
@@ -648,10 +648,15 @@ AUTH_DOVECOT=yes
 # AUTH_GSASL_PC=libgsasl
 # AUTH_HEIMDAL_GSSAPI=yes
 # AUTH_HEIMDAL_GSSAPI_PC=heimdal-gssapi
+# AUTH_HEIMDAL_GSSAPI_PC=heimdal-gssapi heimdal-krb5
 AUTH_PLAINTEXT=yes
 AUTH_SPA=yes
 AUTH_TLS=yes
 
+# Heimdal through 1.5 required pkg-config 'heimdal-gssapi'; Heimdal 7.1
+# requires multiple pkg-config files to work with Exim, so the second example
+# above is needed.
+
 
 #------------------------------------------------------------------------------
 # If you specified AUTH_CYRUS_SASL above, you should ensure that you have the
@@ -704,6 +709,13 @@ HEADERS_CHARSET="ISO-8859-1"
 #
 # but of course there may need to be other things in CFLAGS and EXTRALIBS_EXIM
 # as well.
+#
+# nb: FreeBSD as of 4.89 defines LIBICONV_PLUG to pick up the system iconv
+# more reliably.  If you explicitly want the libiconv Port then as well
+# as adding -liconv you'll want to unset LIBICONV_PLUG.  If you actually need
+# this, let us know, but for now the Exim Maintainers are assuming that this
+# is uncommon and so you'll need to edit OS/os.h-FreeBSD yourself to remove
+# the define.
 
 
 #------------------------------------------------------------------------------
@@ -957,11 +969,15 @@ EXTRALIBS += -ldl
 #
 # Uncomment the following to include Internationalisation features.  This is the
 # SMTPUTF8 ESMTP extension, and associated facilities for handling UTF8 domain
-# and localparts, per RFCs 5890, 6530 and 6533.
+# and localparts, per RFC 3490 (IDNA2003).
 # You need to have the IDN library installed.
+# If you want IDNA2008 mappings per RFCs 5890, 6530 and 6533, you additionally
+# need libidn2 and SUPPORT_I18N_2008.
 
 SUPPORT_I18N=yes
 LDFLAGS += -lidn
+# SUPPORT_I18N_2008=yes
+# LDFLAGS += -lidn -lidn2
 
 
 #------------------------------------------------------------------------------
diff --git a/network/exim/exim.SlackBuild b/network/exim/exim.SlackBuild
index e3163e555b..18db9f29e1 100644
--- a/network/exim/exim.SlackBuild
+++ b/network/exim/exim.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for Exim
 
-# Copyright 2012-2016 Thomas Morper, Augsburg, Germany
+# Copyright 2012-2017 Thomas Morper, Augsburg, Germany
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=exim
-VERSION=${VERSION:-4.88}
+VERSION=${VERSION:-4.89}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -68,7 +68,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
+tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
diff --git a/network/exim/exim.info b/network/exim/exim.info
index e313d611db..42a84ac164 100644
--- a/network/exim/exim.info
+++ b/network/exim/exim.info
@@ -1,8 +1,8 @@
 PRGNAM="exim"
-VERSION="4.88"
+VERSION="4.89"
 HOMEPAGE="http://www.exim.org/"
-DOWNLOAD="ftp://ftp.exim.org/pub/exim/exim4/exim-4.88.tar.bz2"
-MD5SUM="4cc10c910fd18bb9e299e98bc0a32ed2"
+DOWNLOAD="ftp://ftp.exim.org/pub/exim/exim4/exim-4.89.tar.xz"
+MD5SUM="b569ec80c495dffc54545895e680ed61"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="%README%"
-- 
cgit v1.2.3