Version 4.89

------------

 1. Allow relative config file names for ".include"

 2. A main-section config option "debug_store" to control the checks on
    variable locations during store-reset.  Normally false but can be enabled
    when a memory corrution issue is suspected on a production system.

8 files changed, 33 insertions, 32 deletions

diff --git a/mail/exim-html/Makefile b/mail/exim-html/Makefile
index 4d62a6e45e6..5c56ca99e51 100644
--- a/mail/exim-html/Makefile
+++ b/mail/exim-html/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.34 2017/01/19 18:52:15 agc Exp $
+# $NetBSD: Makefile,v 1.35 2017/03/18 07:08:23 adam Exp $
 
-DISTNAME=	exim-html-4.87
+DISTNAME=	exim-html-4.89
 CATEGORIES=	mail net
 MASTER_SITES=	ftp://ftp.exim.org/pub/exim/exim4/
 MASTER_SITES+=	ftp://ftp.csx.cam.ac.uk/pub/software/email/exim/exim4/
diff --git a/mail/exim-html/PLIST b/mail/exim-html/PLIST
index b6f389e2ea3..0770e98417f 100644
--- a/mail/exim-html/PLIST
+++ b/mail/exim-html/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.15 2016/04/09 10:49:39 adam Exp $
+@comment $NetBSD: PLIST,v 1.16 2017/03/18 07:08:23 adam Exp $
 share/doc/exim/html/spec_html/ch-access_control_lists.html
 share/doc/exim/html/spec_html/ch-adding_a_local_scan_function_to_exim.html
 share/doc/exim/html/spec_html/ch-adding_new_drivers_or_lookup_types.html
@@ -140,6 +140,7 @@ share/doc/exim/html/spec_html/index_toc.xml
 share/doc/exim/html/static/css/common.css
 share/doc/exim/html/static/css/index.css
 share/doc/exim/html/static/doc/CVE-2016-1531.txt
+share/doc/exim/html/static/doc/CVE-2016-9963.txt
 share/doc/exim/html/static/doc/chapter.css
 share/doc/exim/html/static/doc/chapter.js
 share/doc/exim/html/static/doc/contents.png
diff --git a/mail/exim-html/distinfo b/mail/exim-html/distinfo
index be54d8f5dae..7e9fcbcde3b 100644
--- a/mail/exim-html/distinfo
+++ b/mail/exim-html/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.27 2016/04/09 10:49:39 adam Exp $
+$NetBSD: distinfo,v 1.28 2017/03/18 07:08:23 adam Exp $
 
-SHA1 (exim-html-4.87.tar.bz2) = 30ef36561866be1f9a1edd193739585cf4deea1b
-RMD160 (exim-html-4.87.tar.bz2) = 1015c6a19a72eeae724efb5490698ad0e7dc3fe4
-SHA512 (exim-html-4.87.tar.bz2) = 224884abfd7ab9a2410dbdd24bb65545faf427f1b83a942c6c72309e7d85771f78bf7dc5ec1439de95e1038959cdfc4ab549abb98852c8b17c8310b51ad0385c
-Size (exim-html-4.87.tar.bz2) = 478953 bytes
+SHA1 (exim-html-4.89.tar.bz2) = 3a3979fba7df3697cec10d3dee846b18384e5de7
+RMD160 (exim-html-4.89.tar.bz2) = de3d3b70f4a653880e8b2d6fe4c407cf37a7eb14
+SHA512 (exim-html-4.89.tar.bz2) = 083678e5dc5acc23cd7f72b6b3e2e6d4e60bab8af25b21e2e6c8f4c1f07e070f9fabc9c8a337784e6d7436cc4aa8d7674700c61030b0c23e4b9c7d3c909e5db0
+Size (exim-html-4.89.tar.bz2) = 480222 bytes
diff --git a/mail/exim/Makefile b/mail/exim/Makefile
index 54645c2ae1b..5ccbbc13ff1 100644
--- a/mail/exim/Makefile
+++ b/mail/exim/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.152 2017/01/19 18:52:15 agc Exp $
+# $NetBSD: Makefile,v 1.153 2017/03/18 07:08:23 adam Exp $
 
-DISTNAME=	exim-4.88
+DISTNAME=	exim-4.89
 CATEGORIES=	mail net
 MASTER_SITES=	ftp://ftp.exim.org/pub/exim/exim4/
 MASTER_SITES+=	http://dl.ambiweb.de/mirrors/ftp.exim.org/exim/exim4/
@@ -114,7 +114,7 @@ post-build:
 	    ${FILESDIR}/mailer.conf.exim \
 	    > ${WRKDIR}/mailer.conf
 
-INSTALLATION_DIRS+= ${PKGMANDIR}/man8 sbin share/examples/exim share/doc/exim
+INSTALLATION_DIRS+=	${PKGMANDIR}/man8 sbin share/examples/exim share/doc/exim
 
 post-install:
 	${INSTALL_DATA} ${WRKDIR}/mailer.conf ${DESTDIR}${EXAMPLESDIR}
diff --git a/mail/exim/distinfo b/mail/exim/distinfo
index e3c6d5fcbda..8f5e07d7da1 100644
--- a/mail/exim/distinfo
+++ b/mail/exim/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.66 2016/12/25 11:29:54 wiedi Exp $
+$NetBSD: distinfo,v 1.67 2017/03/18 07:08:23 adam Exp $
 
-SHA1 (exim-4.88.tar.bz2) = f77cd027284ebf5bdf5fb7a7bd2755238722bfde
-RMD160 (exim-4.88.tar.bz2) = cbcacf3f8f45975c68a450f2fa595b802c76b345
-SHA512 (exim-4.88.tar.bz2) = ea094bf703628c201de119fc5f09539475e52158e935f8f2a9e4138c4a1bfe885017145c3cc5e22aa9087b195091955c69385ebf1ea0baec64ed5c1b8e3b1caf
-Size (exim-4.88.tar.bz2) = 1824610 bytes
-SHA1 (patch-aa) = 4df21c2497e9fee8dfbcd4386bb1b70d69ca2932
-SHA1 (patch-ab) = 6af17f036ed02a3bc37c1f303269eea447fcb691
-SHA1 (patch-ae) = aa0a31e77d5f76e33bc92140c14d39c79f710b95
+SHA1 (exim-4.89.tar.bz2) = 6e4c042d55c57152d56dfa9745abd9e9665a85f5
+RMD160 (exim-4.89.tar.bz2) = db87de7a5bef115efe062153a8a14e10b4ee884b
+SHA512 (exim-4.89.tar.bz2) = 1e059966a93b47f055ab4ec2a4556f2c918aff56ea0367585f3a853f00411e9c275e13be4f9ae615a468fa06263135cd6a138fa1753f1b7fb3259a3321fcca65
+Size (exim-4.89.tar.bz2) = 1844430 bytes
+SHA1 (patch-Local_Makefile.pkgsrc) = de19076443c4d89a7ead97a0cabdec9bb784dd9f
+SHA1 (patch-OS_Makefile-Default) = 6af17f036ed02a3bc37c1f303269eea447fcb691
 SHA1 (patch-lookups_Makefile) = cfc40dba3f75ef37b9887f7767139ad50cf9d4e5
+SHA1 (patch-scripts_exim__install) = aa0a31e77d5f76e33bc92140c14d39c79f710b95
diff --git a/mail/exim/patches/patch-aa b/mail/exim/patches/patch-Local_Makefile.pkgsrc
index a939519b739..62341c84ca7 100644
--- a/mail/exim/patches/patch-aa
+++ b/mail/exim/patches/patch-Local_Makefile.pkgsrc
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.24 2016/01/10 20:55:56 bsiegert Exp $
+$NetBSD: patch-Local_Makefile.pkgsrc,v 1.1 2017/03/18 07:08:23 adam Exp $
 
---- Local/Makefile.pkgsrc.orig	2016-01-10 20:50:29.000000000 +0000
+--- Local/Makefile.pkgsrc.orig	2017-03-18 06:47:43.000000000 +0000
 +++ Local/Makefile.pkgsrc
 @@ -98,7 +98,7 @@
  # /usr/local/sbin. The installation script will try to create this directory,
@@ -47,7 +47,7 @@ $NetBSD: patch-aa,v 1.24 2016/01/10 20:55:56 bsiegert Exp $
  
  
  
-@@ -373,7 +373,7 @@ PCRE_CONFIG=yes
+@@ -380,7 +380,7 @@ PCRE_CONFIG=yes
  # files are defaulted in the OS/Makefile-Default file, but can be overridden in
  # local OS-specific make files.
  
@@ -56,7 +56,7 @@ $NetBSD: patch-aa,v 1.24 2016/01/10 20:55:56 bsiegert Exp $
  
  
  #------------------------------------------------------------------------------
-@@ -628,16 +628,16 @@ FIXED_NEVER_USERS=root
+@@ -622,7 +622,7 @@ FIXED_NEVER_USERS=root
  # included in the Exim binary. You will then need to set up the run time
  # configuration to make use of the mechanism(s) selected.
  
@@ -65,18 +65,18 @@ $NetBSD: patch-aa,v 1.24 2016/01/10 20:55:56 bsiegert Exp $
  # AUTH_CYRUS_SASL=yes
  # AUTH_DOVECOT=yes
  # AUTH_GSASL=yes
- # AUTH_GSASL_PC=libgsasl
+@@ -630,8 +630,8 @@ FIXED_NEVER_USERS=root
  # 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_PLAINTEXT=yes
 +AUTH_SPA=yes
  # AUTH_TLS=yes
  
- 
- #------------------------------------------------------------------------------
-@@ -822,7 +822,7 @@ HEADERS_CHARSET="ISO-8859-1"
+ # Heimdal through 1.5 required pkg-config 'heimdal-gssapi'; Heimdal 7.1
+@@ -831,7 +831,7 @@ HEADERS_CHARSET="ISO-8859-1"
  # %s. This will be replaced by one of the strings "main", "panic", or "reject"
  # to form the final file names. Some installations may want something like this:
  
@@ -85,7 +85,7 @@ $NetBSD: patch-aa,v 1.24 2016/01/10 20:55:56 bsiegert Exp $
  
  # which results in files with names /var/log/exim_mainlog, etc. The directory
  # in which the log files are placed must exist; Exim does not try to create
-@@ -1080,13 +1080,13 @@ SYSTEM_ALIASES_FILE=/etc/aliases
+@@ -1119,13 +1119,13 @@ SYSTEM_ALIASES_FILE=/etc/aliases
  # haven't got Perl, Exim will still build and run; you just won't be able to
  # use those utilities.
  
@@ -106,7 +106,7 @@ $NetBSD: patch-aa,v 1.24 2016/01/10 20:55:56 bsiegert Exp $
  
  
  #------------------------------------------------------------------------------
-@@ -1286,7 +1286,7 @@ TMPDIR="/tmp"
+@@ -1327,7 +1327,7 @@ EXIM_TMPDIR="/tmp"
  # (process id) to a file so that it can easily be identified. The path of the
  # file can be specified here. Some installations may want something like this:
  
@@ -115,7 +115,7 @@ $NetBSD: patch-aa,v 1.24 2016/01/10 20:55:56 bsiegert Exp $
  
  # If PID_FILE_PATH is not defined, Exim writes a file in its spool directory
  # using the name "exim-daemon.pid".
-@@ -1358,3 +1358,10 @@ TMPDIR="/tmp"
+@@ -1399,3 +1399,10 @@ EXIM_TMPDIR="/tmp"
  # ENABLE_DISABLE_FSYNC=yes
  
  # End of EDITME for Exim 4.
diff --git a/mail/exim/patches/patch-ab b/mail/exim/patches/patch-OS_Makefile-Default
index e35047d778b..ddf09fb252d 100644
--- a/mail/exim/patches/patch-ab
+++ b/mail/exim/patches/patch-OS_Makefile-Default
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.16 2012/06/11 11:41:25 adam Exp $
+$NetBSD: patch-OS_Makefile-Default,v 1.1 2017/03/18 07:08:23 adam Exp $
 
 --- OS/Makefile-Default.orig	2012-05-31 00:40:15.000000000 +0000
 +++ OS/Makefile-Default
diff --git a/mail/exim/patches/patch-ae b/mail/exim/patches/patch-scripts_exim__install
index f909da33e39..d21fa909e07 100644
--- a/mail/exim/patches/patch-ae
+++ b/mail/exim/patches/patch-scripts_exim__install
@@ -1,4 +1,4 @@
-$NetBSD: patch-ae,v 1.13 2016/12/25 11:29:55 wiedi Exp $
+$NetBSD: patch-scripts_exim__install,v 1.1 2017/03/18 07:08:23 adam Exp $
 
 --- scripts/exim_install.orig	2016-12-18 14:02:28.000000000 +0000
 +++ scripts/exim_install