exim: updated to 4.92

4.92:
New features include:
- ${l_header:<name>} expansion
- ${readsocket} now supports TLS
- "utf8_downconvert" option (if built with SUPPORT_I18N)
- "pipelining" log_selector
- JSON variants for ${extract } expansion
- "noutf8" debug option
- TCP Fast Open support on MacOS

5 files changed, 21 insertions, 19 deletions

diff --git a/mail/exim-html/Makefile b/mail/exim-html/Makefile
index cc5f36e58c6..c6c1a8c990e 100644
--- a/mail/exim-html/Makefile
+++ b/mail/exim-html/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.37 2018/04/23 07:28:18 adam Exp $
+# $NetBSD: Makefile,v 1.38 2019/02/24 20:31:00 adam Exp $
 
-DISTNAME=	exim-html-4.91
+DISTNAME=	exim-html-4.92
 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/
@@ -16,6 +16,6 @@ INSTALLATION_DIRS=	share/doc/exim/html
 USE_TOOLS+=	pax
 
 do-install:
-	cd ${WRKSRC}/doc && pax -rw html ${DESTDIR}${PREFIX}/share/doc/exim
+	cd ${WRKSRC}/${DISTNAME}/doc && pax -rw html ${DESTDIR}${PREFIX}/share/doc/exim
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/exim-html/PLIST b/mail/exim-html/PLIST
index d557f72ef1b..08826dd75c4 100644
--- a/mail/exim-html/PLIST
+++ b/mail/exim-html/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.18 2018/04/23 07:28:18 adam Exp $
+@comment $NetBSD: PLIST,v 1.19 2019/02/24 20:31:00 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
@@ -47,7 +47,7 @@ share/doc/exim/html/spec_html/ch-the_dnslookup_router.html
 share/doc/exim/html/spec_html/ch-the_dovecot_authenticator.html
 share/doc/exim/html/spec_html/ch-the_exim_command_line.html
 share/doc/exim/html/spec_html/ch-the_exim_monitor.html
-share/doc/exim/html/spec_html/ch-the_exim_run_time_configuration_file.html
+share/doc/exim/html/spec_html/ch-the_exim_runtime_configuration_file.html
 share/doc/exim/html/spec_html/ch-the_gsasl_authenticator.html
 share/doc/exim/html/spec_html/ch-the_heimdalgssapi_authenticator.html
 share/doc/exim/html/spec_html/ch-the_ipliteral_router.html
@@ -148,4 +148,7 @@ share/doc/exim/html/static/doc/index.css
 share/doc/exim/html/static/doc/index.js
 share/doc/exim/html/static/doc/minus-12x12.png
 share/doc/exim/html/static/doc/plus-12x12.png
+share/doc/exim/html/static/doc/security/CVE-2016-1531.txt
+share/doc/exim/html/static/doc/security/CVE-2016-9963.txt
+share/doc/exim/html/static/doc/security/CVE-2018-6789.txt
 share/doc/exim/html/static/js/common.js
diff --git a/mail/exim-html/distinfo b/mail/exim-html/distinfo
index ebf40ef02c3..03dd274545e 100644
--- a/mail/exim-html/distinfo
+++ b/mail/exim-html/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.30 2018/04/23 07:28:18 adam Exp $
+$NetBSD: distinfo,v 1.31 2019/02/24 20:31:00 adam Exp $
 
-SHA1 (exim-html-4.91.tar.xz) = 26b8fd410ba651f6f7274d08cd7c4122ff539971
-RMD160 (exim-html-4.91.tar.xz) = 7d5831b3b4a6044123ea60bc4dd8de61005428c8
-SHA512 (exim-html-4.91.tar.xz) = c91a7b2194b817d78cd1184b0b2d64015780085d481cf6d0a63785e94ed50c4d0f78d9356772ea2e37ce6728a81b0afcef8c978f7141d7f7dafd13afe89e6f24
-Size (exim-html-4.91.tar.xz) = 487980 bytes
+SHA1 (exim-html-4.92.tar.xz) = 70df838de2f01203b3152ceaf3c9409de99c48bf
+RMD160 (exim-html-4.92.tar.xz) = 9b9d0e8211e267e058870d95e721d948abc01e3e
+SHA512 (exim-html-4.92.tar.xz) = 7a5dbfcf995adbb226d8045a1a805775e2860063cccb464d4bbc7cc9454e12bbc30018ed1127edae46a6a408c2bdd36dddbc7c5fc9aaf3477a459bf6bb2e7bff
+Size (exim-html-4.92.tar.xz) = 492924 bytes
diff --git a/mail/exim/Makefile b/mail/exim/Makefile
index 84e3aa07252..62623a98bc5 100644
--- a/mail/exim/Makefile
+++ b/mail/exim/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.164 2018/12/09 18:52:35 adam Exp $
+# $NetBSD: Makefile,v 1.165 2019/02/24 20:31:00 adam Exp $
 
-DISTNAME=	exim-4.91
-PKGREVISION=	3
+DISTNAME=	exim-4.92
 CATEGORIES=	mail net
 MASTER_SITES=	ftp://ftp.exim.org/pub/exim/exim4/
 MASTER_SITES+=	https://ftp.exim.org/pub/exim/exim4/
@@ -104,7 +103,7 @@ pre-configure:
 .if !empty(EXIM_MAX_INCLUDE_SIZE)
 	${ECHO} MAX_INCLUDE_SIZE=${EXIM_MAX_INCLUDE_SIZE} >> ${WRKSRC}/Local/Makefile
 .endif
-	sed -e 's:@PREFIX@:${PREFIX}:' \
+	sed	-e 's:@PREFIX@:${PREFIX}:' \
 		-e 's:@PKG_SYSCONFDIR@:${PKG_SYSCONFDIR}:' \
 	    < ${WRKSRC}/Local/eximon.conf.pkgsrc \
 	    > ${WRKSRC}/Local/eximon.conf
diff --git a/mail/exim/distinfo b/mail/exim/distinfo
index 7ffdca564f3..0481d102333 100644
--- a/mail/exim/distinfo
+++ b/mail/exim/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.69 2018/04/23 07:28:18 adam Exp $
+$NetBSD: distinfo,v 1.70 2019/02/24 20:31:00 adam Exp $
 
-SHA1 (exim-4.91.tar.xz) = 142f510b24f7ff5516a1a0adb5f4afded29f88c6
-RMD160 (exim-4.91.tar.xz) = a11c0a3db5197e4064c8898b4bd32b218661a635
-SHA512 (exim-4.91.tar.xz) = 35b34dda8dd0f27c0429e6eb8409756ecd3cf9e535bac421d696b1560db0ff3bf4cd0e4a00bc0b7e32137d31bb5de20776c7c1830ec125aa36b5c4376b0c71a2
-Size (exim-4.91.tar.xz) = 1744660 bytes
+SHA1 (exim-4.92.tar.xz) = 22f9138186ea3233c20a7dffaf3d506c4017ce07
+RMD160 (exim-4.92.tar.xz) = 662834adae2764f64b925f7d897c2967c8177202
+SHA512 (exim-4.92.tar.xz) = 62c327e6184a358ba7f0dbc38b44d2537234be91727a5bfac97e74af64a8d77e376b3221dcfdd8f6eca7d812f9233595503dc6e50e2972bed40a1b74eb209c31
+Size (exim-4.92.tar.xz) = 1767136 bytes
 SHA1 (patch-Local_Makefile.pkgsrc) = de19076443c4d89a7ead97a0cabdec9bb784dd9f
 SHA1 (patch-OS_Makefile-Default) = 6af17f036ed02a3bc37c1f303269eea447fcb691
 SHA1 (patch-lookups_Makefile) = cfc40dba3f75ef37b9887f7767139ad50cf9d4e5