- Update to 4.86.2

MFH:		2016Q1
Security:	7d09b9ee-e0ba-11e5-abc4-6fb07af136d2

3 files changed, 27 insertions, 16 deletions

diff --git a/mail/exim/Makefile b/mail/exim/Makefile
index 557c9904c6b7..1be667cae8e7 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
+EXIM_VERSION=	4.86.2
 SA_EXIM_VERSION=4.2
 EXIM_INSTALL_ARG+=	"-no_chown" "-no_symlink"
 
diff --git a/mail/exim/distinfo b/mail/exim/distinfo
index 65381a0fec4b..4e4dec506906 100644
--- a/mail/exim/distinfo
+++ b/mail/exim/distinfo
@@ -1,4 +1,4 @@
-SHA256 (exim/exim-4.86.tar.bz2) = f1ccf2ce2ea51b7fbbf160e7e0e41d24ca401cf44a185128ad99ea04635fc456
-SIZE (exim/exim-4.86.tar.bz2) = 1804807
+SHA256 (exim/exim-4.86.2.tar.bz2) = 7756deafd0583776e091f2efcba9b36203e668cf420d8876f314980803636eb3
+SIZE (exim/exim-4.86.2.tar.bz2) = 1799316
 SHA256 (exim/sa-exim-4.2.tar.gz) = 72e0a735547f18b05785e6c58a71d24623858f0f5234a5dc0e24cb453999e99a
 SIZE (exim/sa-exim-4.2.tar.gz) = 66575
diff --git a/mail/exim/pkg-message b/mail/exim/pkg-message
index 032d56d302a1..963ce9f44e55 100644
--- a/mail/exim/pkg-message
+++ b/mail/exim/pkg-message
@@ -1,23 +1,36 @@
-
 IMPORTANT NOTE:
 ===============
 
-Please read %%DOCSDIR%%/POST-INSTALL-NOTES for important
-information regarding your Exim installation.
+All installations having Exim set-uid root and using 'perl_startup' are
+vulnerable to a local privilege escalation. Any user who can start an
+instance of Exim (and this is normally *any* user) can gain root
+privileges. If you do not use 'perl_startup' you *should* be safe.
+
+New options
+-----------
 
+We had to introduce two new configuration options:
 
-How to restore pre-4.77 behaviour of match_* expansions
-=======================================================
+    keep_environment =
+    add_environment =
 
-Just two steps to do it:
+Both options are empty per default. That is, Exim cleans the complete
+environment on startup. This affects Exim itself and any subprocesses,
+as transports, that may call other programs via some alias mechanisms,
+as routers (queryprogram), lookups, and so on. This may affect used
+libraries (e.g. LDAP).
 
- 1. first, read README.UPDATING and in most cases you will
-    realize that pre-4.77 behaviour is not what you want;
+** THIS MAY BREAK your existing installation **
 
- 2. if you're still here, turn on port's knob LISTMATCH_RHS
-    and carefully review your configuration for untrusted
-    right-hand sides in match_* operations.
+New behaviour
+-------------
 
+Now Exim changes it's working directory to / right after startup,
+even before reading it's configuration. (Later Exim changes it's working
+directory to $spool_directory, as usual.)
+
+Exim only accepts an absolute configuration file path now, when using
+the -C option.
 
 Upgrades to Exim 4.80
 =====================
@@ -34,4 +47,3 @@ There are more details, covering more changes, in README.UPDATING.
 We now enable accept_8bitmime by default, as the Exim maintainers agree
 with Dan Bernstein about the best way to deal with the 8BITMIME
 extension.
-