Version 4.87

 1. The ACL conditions regex and mime_regex now capture substrings
    into numeric variables $regex1 to 9, like the "match" expansion condition.

 2. New $callout_address variable records the address used for a spam=,
    malware= or verify= callout.

 3. Transports now take a "max_parallel" option, to limit concurrency.

 4. Expansion operators ${ipv6norm:<string>} and ${ipv6denorm:<string>}.
    The latter expands to a 8-element colon-sep set of hex digits including
    leading zeroes. A trailing ipv4-style dotted-decimal set is converted
    to hex.  Pure ipv4 addresses are converted to IPv4-mapped IPv6.
    The former operator strips leading zeroes and collapses the longest
    set of 0-groups to a double-colon.

 5. New "-bP config" support, to dump the effective configuration.

 6. New $dkim_key_length variable.

 7. New base64d and base64 expansion items (the existing str2b64 being a
    synonym of the latter).  Add support in base64 for certificates.

 8. New main configuration option "bounce_return_linesize_limit" to
    avoid oversize bodies in bounces. The dafault value matches RFC
    limits.

 9. New $initial_cwd expansion variable.

6 files changed, 22 insertions, 30 deletions

diff --git a/mail/exim-html/Makefile b/mail/exim-html/Makefile
index 21e7c1bb793..4652c17fc11 100644
--- a/mail/exim-html/Makefile
+++ b/mail/exim-html/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.31 2016/03/02 20:13:18 wiedi Exp $
+# $NetBSD: Makefile,v 1.32 2016/04/09 10:49:39 adam Exp $
 
-DISTNAME=	exim-html-4.86.2
+DISTNAME=	exim-html-4.87
 CATEGORIES=	mail net
 MASTER_SITES=	ftp://ftp.exim.org/pub/exim/exim4/ \
 		ftp://ftp.csx.cam.ac.uk/pub/software/email/exim/exim4/ \
diff --git a/mail/exim-html/PLIST b/mail/exim-html/PLIST
index fe01a6ee287..b6f389e2ea3 100644
--- a/mail/exim-html/PLIST
+++ b/mail/exim-html/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.14 2016/01/11 08:35:31 adam Exp $
+@comment $NetBSD: PLIST,v 1.15 2016/04/09 10:49:39 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
@@ -12,6 +12,7 @@ share/doc/exim/html/spec_html/ch-domain_host_address_and_local_part_lists.html
 share/doc/exim/html/spec_html/ch-embedded_perl.html
 share/doc/exim/html/spec_html/ch-encrypted_smtp_connections_using_tlsssl.html
 share/doc/exim/html/spec_html/ch-environment_for_running_local_transports.html
+share/doc/exim/html/spec_html/ch-events.html
 share/doc/exim/html/spec_html/ch-exim_utilities.html
 share/doc/exim/html/spec_html/ch-file_and_database_lookups.html
 share/doc/exim/html/spec_html/ch-format_of_spool_files.html
@@ -19,11 +20,13 @@ share/doc/exim/html/spec_html/ch-generic_options_for_routers.html
 share/doc/exim/html/spec_html/ch-generic_options_for_transports.html
 share/doc/exim/html/spec_html/ch-how_exim_receives_and_delivers_mail.html
 share/doc/exim/html/spec_html/ch-incorporated_code.html
+share/doc/exim/html/spec_html/ch-internationalisation.html
 share/doc/exim/html/spec_html/ch-introduction.html
 share/doc/exim/html/spec_html/ch-log_files.html
 share/doc/exim/html/spec_html/ch-main_configuration.html
 share/doc/exim/html/spec_html/ch-message_processing.html
 share/doc/exim/html/spec_html/ch-option_index.html
+share/doc/exim/html/spec_html/ch-proxies.html
 share/doc/exim/html/spec_html/ch-regular_expressions.html
 share/doc/exim/html/spec_html/ch-retry_configuration.html
 share/doc/exim/html/spec_html/ch-security_considerations.html
@@ -121,6 +124,9 @@ share/doc/exim/html/spec_html/ch58.html
 share/doc/exim/html/spec_html/ch59.html
 share/doc/exim/html/spec_html/ch60.html
 share/doc/exim/html/spec_html/ch61.html
+share/doc/exim/html/spec_html/ch62.html
+share/doc/exim/html/spec_html/ch63.html
+share/doc/exim/html/spec_html/ch64.html
 share/doc/exim/html/spec_html/filter.html
 share/doc/exim/html/spec_html/filter_ch-exim_filter_files.html
 share/doc/exim/html/spec_html/filter_ch-forwarding_and_filtering_in_exim.html
@@ -133,6 +139,7 @@ share/doc/exim/html/spec_html/index.html
 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/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 005a8904a3d..be54d8f5dae 100644
--- a/mail/exim-html/distinfo
+++ b/mail/exim-html/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.26 2016/03/02 20:13:18 wiedi Exp $
+$NetBSD: distinfo,v 1.27 2016/04/09 10:49:39 adam Exp $
 
-SHA1 (exim-html-4.86.2.tar.bz2) = 9b55e69787cf1f9ef233fd762736bb4541773bb4
-RMD160 (exim-html-4.86.2.tar.bz2) = bf077ceaed3c0763d0ef93e2a7ee455a714db195
-SHA512 (exim-html-4.86.2.tar.bz2) = 593df23914939f8fa76c15a2ab7fc197efa05fcbb984179c9dc2c7d535fe2bef1394c07bc8449f2219f54615ff2f4ee13b76409d89b846dc71e54880681c913e
-Size (exim-html-4.86.2.tar.bz2) = 466139 bytes
+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
diff --git a/mail/exim/Makefile b/mail/exim/Makefile
index c8a7ea86bd7..db46c6b3132 100644
--- a/mail/exim/Makefile
+++ b/mail/exim/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.144 2016/03/05 11:28:48 jperkin Exp $
+# $NetBSD: Makefile,v 1.145 2016/04/09 10:49:39 adam Exp $
 
-DISTNAME=	exim-4.86.2
-PKGREVISION=	1
+DISTNAME=	exim-4.87
 CATEGORIES=	mail net
 MASTER_SITES=	ftp://ftp.exim.org/pub/exim/exim4/ \
 		http://dl.ambiweb.de/mirrors/ftp.exim.org/exim/exim4/
diff --git a/mail/exim/distinfo b/mail/exim/distinfo
index aaf281b2d9c..ddd177880da 100644
--- a/mail/exim/distinfo
+++ b/mail/exim/distinfo
@@ -1,11 +1,10 @@
-$NetBSD: distinfo,v 1.64 2016/03/02 20:13:18 wiedi Exp $
+$NetBSD: distinfo,v 1.65 2016/04/09 10:49:39 adam Exp $
 
-SHA1 (exim-4.86.2.tar.bz2) = 539cb2edc784d439cae8f95940e9eff847e2695d
-RMD160 (exim-4.86.2.tar.bz2) = 06790977ad50fb19548826631df904d6bda62a83
-SHA512 (exim-4.86.2.tar.bz2) = 5869a7ae8fd66819f654f6617c7e77075a24b110074317b77135b8cc86f12632e79758d41819c6e91871e0145adaba4b91651f5c6c1d2ebd17927f0198876231
-Size (exim-4.86.2.tar.bz2) = 1799316 bytes
+SHA1 (exim-4.87.tar.bz2) = ca1c1aba63be80ca70ccfdc704ba9b899b77ec22
+RMD160 (exim-4.87.tar.bz2) = 4a2cc7c35d02bff5cdd175d8dd0538f1fef5af43
+SHA512 (exim-4.87.tar.bz2) = 2b0d5c82133315c444e29abd182e0866482c904db1abe5ffe9a3008c2174f52eca850a433c069b4102874dc32bbe4af112beac94ffa154f1c06615c24deb47a4
+Size (exim-4.87.tar.bz2) = 1801422 bytes
 SHA1 (patch-aa) = 4df21c2497e9fee8dfbcd4386bb1b70d69ca2932
 SHA1 (patch-ab) = 6af17f036ed02a3bc37c1f303269eea447fcb691
 SHA1 (patch-ae) = 7daf63727e222bbaa7e5b8289c4fcb6a8c0272cf
-SHA1 (patch-ag) = dd93bb718c996f18b4e985806eb6d4ff5f25a67f
 SHA1 (patch-lookups_Makefile) = cfc40dba3f75ef37b9887f7767139ad50cf9d4e5
diff --git a/mail/exim/patches/patch-ag b/mail/exim/patches/patch-ag
deleted file mode 100644
index d1bbc6f0201..00000000000
--- a/mail/exim/patches/patch-ag
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ag,v 1.7 2012/06/11 11:41:25 adam Exp $
-
---- src/spam.h.orig	2006-04-28 11:32:23.000000000 +0100
-+++ src/spam.h
-@@ -10,7 +10,7 @@
- #ifdef WITH_CONTENT_SCAN
- 
- /* timeout for reading and writing spamd */
--#define SPAMD_TIMEOUT 120
-+#define SPAMD_TIMEOUT 240
- 
- /* maximum length of the spam bar */
- #define MAX_SPAM_BAR_CHARS 50