- Update to 4.87

- Enable recommended default options
- Rename no longer experimental options
- Add rspamd shutdown patch

Exim 4.87 announce link:
https://lists.exim.org/lurker/message/20160406.181048.292a54e9.en.html

8 files changed, 38 insertions, 116 deletions

diff --git a/mail/exim-doc-html/Makefile b/mail/exim-doc-html/Makefile
index 796ba4d4ceaa..19db06f9e784 100644
--- a/mail/exim-doc-html/Makefile
+++ b/mail/exim-doc-html/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	exim
-PORTVERSION=	4.86.2
+PORTVERSION=	4.87
 CATEGORIES=	mail
 MASTER_SITES=	EXIM/exim4/:exim
 PKGNAMESUFFIX=	-doc-${DOCFORMAT}
diff --git a/mail/exim-doc-html/distinfo b/mail/exim-doc-html/distinfo
index 86a913837f84..cf0296d60de7 100644
--- a/mail/exim-doc-html/distinfo
+++ b/mail/exim-doc-html/distinfo
@@ -1,6 +1,6 @@
-SHA256 (exim/exim-html-4.86.2.tar.bz2) = 1c97a6efd0a7aaf4b9960ce70fed4df37725f676397ce744efea1503ec1f5914
-SIZE (exim/exim-html-4.86.2.tar.bz2) = 466139
-SHA256 (exim/exim-pdf-4.86.2.tar.bz2) = 4e0f960d94f10d52d6f72d55bb28f7abbf7643ce6287ee66356dd3c1ec5d9491
-SIZE (exim/exim-pdf-4.86.2.tar.bz2) = 1886776
-SHA256 (exim/exim-postscript-4.86.2.tar.bz2) = 34ae3882d4b1126e6c3034c217212e18f02c16c17a6a9452404c749a8788ce98
-SIZE (exim/exim-postscript-4.86.2.tar.bz2) = 1037469
+SHA256 (exim/exim-html-4.87.tar.bz2) = 8f87876d4a392f59d1009ba64ac461862951a3f4eed9c0b14a49be7bcbdc1f12
+SIZE (exim/exim-html-4.87.tar.bz2) = 478953
+SHA256 (exim/exim-pdf-4.87.tar.bz2) = 52c6205ec31fe8162a7068ba86dfd1ac6e370c76a5377bdc7bd29555f8d6ca0c
+SIZE (exim/exim-pdf-4.87.tar.bz2) = 1917123
+SHA256 (exim/exim-postscript-4.87.tar.bz2) = 7241b80d724d473cb9e47823eaa219d89bf2a56d6e80e710b850bbd90f271b49
+SIZE (exim/exim-postscript-4.87.tar.bz2) = 1052132
diff --git a/mail/exim/Makefile b/mail/exim/Makefile
index 7f2e3378b45e..eae67e3a7d76 100644
--- a/mail/exim/Makefile
+++ b/mail/exim/Makefile
@@ -3,7 +3,6 @@
 
 PORTNAME=	exim
 PORTVERSION?=	${EXIM_VERSION}
-PORTREVISION=	1
 CATEGORIES=	mail ipv6
 MASTER_SITES=	EXIM/exim4/:exim
 DISTNAME=	${PORTNAME}-${EXIM_VERSION}
@@ -96,7 +95,7 @@ MASTER_SITES+=	http://marc.merlins.org/linux/exim/files/:sa_exim \
 DISTFILES+=	sa-exim-${SA_EXIM_VERSION}.tar.gz:sa_exim
 .endif
 
-EXIM_VERSION=	4.86.2
+EXIM_VERSION=	4.87
 SA_EXIM_VERSION=4.2
 EXIM_INSTALL_ARG+=	"-no_chown" "-no_symlink"
 
@@ -200,7 +199,7 @@ SEDLIST+=	-e 's,^\# (EXPERIMENTAL_DCC=),\1,'
 .endif
 
 .if ${PORT_OPTIONS:MPROXY}
-SEDLIST+=	-e 's,^\# (EXPERIMENTAL_PROXY=),\1,'
+SEDLIST+=	-e 's,^\# (SUPPORT_PROXY=),\1,'
 .endif
 
 .if ${PORT_OPTIONS:MCERTNAMES}
@@ -215,19 +214,19 @@ SEDLIST+=	-e 's,^\# (EXPERIMENTAL_DSN=),\1,'
 SEDLIST+=	-e 's,^\# (EXPERIMENTAL_DANE=),\1,'
 .endif
 
-.if ${PORT_OPTIONS:MEVENT}
-SEDLIST+=	-e 's,^\# (EXPERIMENTAL_EVENT=),\1,'
+.if !${PORT_OPTIONS:MEVENT}
+SEDLIST+=	-e 's,^\# (DISABLE_EVENT=),\1,'
 .endif
 
 .if ${PORT_OPTIONS:MINTERNATIONAL}
-SEDLIST+=	-e 's,^\# (EXPERIMENTAL_INTERNATIONAL=),\1,' \
+SEDLIST+=	-e 's,^\# (SUPPORT_I18N=),\1,' \
 		-e 's,XX_IDN_LIBS_XX,-L${LOCALBASE}/lib -lidn,'
 .else
 SEDLIST+=	-e 's,XX_IDN_LIBS_XX,,'
 .endif
 
 .if ${PORT_OPTIONS:MSOCKS}
-SEDLIST+=	-e 's,^\# (EXPERIMENTAL_SOCKS=),\1,'
+SEDLIST+=	-e 's,^\# (SUPPORT_SOCKS=),\1,'
 .endif
 
 .if !${PORT_OPTIONS:MPRDR}
@@ -438,7 +437,7 @@ SEDLIST+=	-e 's,XX_SQLITE_LIBS_XX,,' \
 .if ${PORT_OPTIONS:MREDIS}
 SEDLIST+=	-e 's,XX_REDIS_LIBS_XX,-L${LOCALBASE}/lib -lhiredis,' \
 		-e 's,^\# (LOOKUP_REDIS=),\1,' \
-		-e 's,^\# (EXPERIMENTAL_REDIS=),\1,'
+		-e 's,^\# (REDIS=),\1,'
 .else
 SEDLIST+=	-e 's,XX_REDIS_LIBS_XX,,'
 .endif
diff --git a/mail/exim/distinfo b/mail/exim/distinfo
index 4e4dec506906..5561dc8d7d88 100644
--- a/mail/exim/distinfo
+++ b/mail/exim/distinfo
@@ -1,4 +1,4 @@
-SHA256 (exim/exim-4.86.2.tar.bz2) = 7756deafd0583776e091f2efcba9b36203e668cf420d8876f314980803636eb3
-SIZE (exim/exim-4.86.2.tar.bz2) = 1799316
+SHA256 (exim/exim-4.87.tar.bz2) = 74691e0dff4d1b5d387e9c33c86f96a8f6d2adbc781c0dec9d2061a847b07dc9
+SIZE (exim/exim-4.87.tar.bz2) = 1801422
 SHA256 (exim/sa-exim-4.2.tar.gz) = 72e0a735547f18b05785e6c58a71d24623858f0f5234a5dc0e24cb453999e99a
 SIZE (exim/sa-exim-4.2.tar.gz) = 66575
diff --git a/mail/exim/files/patch-post-transport-crash b/mail/exim/files/patch-post-transport-crash
deleted file mode 100644
index 6bb69b11925c..000000000000
--- a/mail/exim/files/patch-post-transport-crash
+++ /dev/null
@@ -1,82 +0,0 @@
-diff --git src/deliver.c.orig src/src/deliver.c
-index 0e7cea3..b5aa9b9 100644
---- src/deliver.c.orig
-+++ src/deliver.c
-@@ -9,6 +9,7 @@
- 
- 
- #include "exim.h"
-+#include <assert.h>
- 
- 
- /* Data block for keeping track of subprocesses for parallel remote
-@@ -7914,17 +7915,36 @@ if (!regex_IGNOREQUOTA) regex_IGNOREQUOTA =
- uschar *
- deliver_get_sender_address (uschar * id)
- {
-+int rc;
-+uschar * new_sender_address,
-+       * save_sender_address;
-+
- if (!spool_open_datafile(id))
-   return NULL;
- 
-+/* Save and restore the global sender_address.  I'm not sure if we should
-+not save/restore all the other global variables too, because
-+spool_read_header() may change all of them. But OTOH, when this
-+deliver_get_sender_address() gets called, the current message is done
-+already and nobody needs the globals anymore. (HS12, 2015-08-21) */
-+
- sprintf(CS spoolname, "%s-H", id);
--if (spool_read_header(spoolname, TRUE, TRUE) != spool_read_OK)
-+save_sender_address = sender_address;
-+
-+rc = spool_read_header(spoolname, TRUE, TRUE);
-+
-+new_sender_address = sender_address;
-+sender_address = save_sender_address;
-+
-+if (rc != spool_read_OK)
-   return NULL;
- 
-+assert(new_sender_address);
-+
- (void)close(deliver_datafile);
- deliver_datafile = -1;
- 
--return sender_address;
-+return new_sender_address;
- }
- 
- /* vi: aw ai sw=2
-diff --git src/transports/smtp.c.orig src/transports/smtp.c
-index 609dba3..c93f2ef 100644
---- src/transports/smtp.c.orig
-+++ src/transports/smtp.c
-@@ -1274,14 +1274,19 @@ we will veto this new message.  */
- static BOOL
- smtp_are_same_identities(uschar * message_id, smtp_compare_t * s_compare)
- {
--uschar * save_sender_address = sender_address;
--uschar * current_local_identity =
-+
-+uschar * message_local_identity,
-+       * current_local_identity,
-+       * new_sender_address;
-+
-+current_local_identity =
-   smtp_local_identity(s_compare->current_sender_address, s_compare->tblock);
--uschar * new_sender_address = deliver_get_sender_address(message_id);
--uschar * message_local_identity =
--  smtp_local_identity(new_sender_address, s_compare->tblock);
- 
--sender_address = save_sender_address;
-+if (!(new_sender_address = deliver_get_sender_address(message_id)))
-+    return 0;
-+
-+message_local_identity =
-+  smtp_local_identity(new_sender_address, s_compare->tblock);
- 
- return Ustrcmp(current_local_identity, message_local_identity) == 0;
- }
-
diff --git a/mail/exim/files/patch-rspamd-shutdown b/mail/exim/files/patch-rspamd-shutdown
new file mode 100644
index 000000000000..51a0d5827e1f
--- /dev/null
+++ b/mail/exim/files/patch-rspamd-shutdown
@@ -0,0 +1,13 @@
+--- src/spam.c.orig	2016-04-02 20:24:15.000000000 +0100
++++ src/spam.c	2016-04-21 16:42:49.297221000 +0100
+@@ -494,7 +494,9 @@
+ (void)fclose(mbox_file);
+ 
+ /* we're done sending, close socket for writing */
+-shutdown(spamd_sock,SHUT_WR);
++if (!sd->is_rspamd) {
++  shutdown(spamd_sock,SHUT_WR);
++}
+ 
+ /* read spamd response using what's left of the timeout.  */
+ memset(spamd_buffer, 0, sizeof(spamd_buffer));
diff --git a/mail/exim/files/patch-src__auths__call_radius.c b/mail/exim/files/patch-src__auths__call_radius.c
deleted file mode 100644
index 4a863efb0bd8..000000000000
--- a/mail/exim/files/patch-src__auths__call_radius.c
+++ /dev/null
@@ -1,14 +0,0 @@
---- src/auths/call_radius.c
-+++ src/auths/call_radius.c
-@@ -38,7 +38,11 @@
-   #if !defined(RADIUS_LIB_RADIUSCLIENT) && !defined(RADIUS_LIB_RADIUSCLIENTNEW)
-   #define RADIUS_LIB_RADIUSCLIENT
-   #endif
-+  #if !defined(RADIUS_LIB_RADIUSCLIENTNEW)
-   #include <radiusclient.h>
-+  #else
-+  #include <radiusclient-ng.h>
-+  #endif
- #endif
- 
- 
diff --git a/mail/exim/options b/mail/exim/options
index c45ac125ff49..9456705ea5a6 100644
--- a/mail/exim/options
+++ b/mail/exim/options
@@ -18,7 +18,11 @@ OPTIONS_DEFINE+=	ALT_CONFIG_PREFIX \
 			READLINE \
 			SUID \
 			TCP_WRAPPERS \
-			WISHLIST
+			WISHLIST \
+			EVENT \
+			PROXY \
+			SOCKS \
+			INTERNATIONAL
 
 OPTIONS_DEFAULT+=	AUTH_CRAM_MD5 \
 			AUTH_DOVECOT \
@@ -32,7 +36,9 @@ OPTIONS_DEFAULT+=	AUTH_CRAM_MD5 \
 			DNSSEC \
 			DSEARCH \
 			EMBEDDED_PERL \
+			EVENT \
 			ICONV \
+			INTERNATIONAL \
 			LMTP \
 			LSEARCH \
 			MAILDIR \
@@ -60,7 +66,7 @@ OPTIONS_GROUP_LOOKUP=	CDB BDB DNSDB DSEARCH LSEARCH MYSQL NIS OPENLDAP PGSQL RED
 LOOKUP_DESC=	Lookup support
 OPTIONS_GROUP_STORAGE=	MAILDIR MAILSTORE MBX
 STORAGE_DESC=	Supported storage formats
-OPTIONS_GROUP_EXPERIMENTAL= CERTNAMES DANE DCC DMARC DSN EVENT INTERNATIONAL PROXY SOCKS SPF
+OPTIONS_GROUP_EXPERIMENTAL= CERTNAMES DANE DCC DMARC DSN SPF
 EXPERIMENTAL_DESC=	Experimental options
 OPTIONS_GROUP=	AUTH LOOKUP STORAGE EXPERIMENTAL
 
@@ -107,7 +113,7 @@ PGSQL_DESC=		Enable postgresql lookups
 PRDR_DESC=		Enable Per-Recipient-Data-Response support
 PROXY_DESC=		Enable Experimental Proxy Protocol
 READLINE_DESC=		Enable readline(3) library
-REDIS_DESC=		Enable redis lookups (experimental)
+REDIS_DESC=		Enable redis lookups
 SASLAUTHD_DESC=		Enable use of Cyrus SASL auth daemon
 SA_EXIM_DESC=		Build with Spamassassin local scan
 SOCKS_DESC=		Enable smtp transport via socks5 proxies