mail-mta/exim: version bumps for CVE-2016-1531

Package-Manager: portage-2.2.26

5 files changed, 20 insertions, 19 deletions

diff --git a/mail-mta/exim/Manifest b/mail-mta/exim/Manifest
index 20fb3d854d12..09a8db68c5de 100644
--- a/mail-mta/exim/Manifest
+++ b/mail-mta/exim/Manifest
@@ -1,11 +1,15 @@
+DIST exim-4.84.2.tar.bz2 1745970 SHA256 eb082aedf9349a29e25120e53f9e67a7ca6c4a6dad579c1425da1e131599bf52 SHA512 04f0f4631d5eb81d7732f4e210fdda87e34adb497f1af744868fab0fe1dc64845b0d1228b34660e0123436a78d0ecf62a6d18702a0ba4f2c1a1c1398b8ac4aaf WHIRLPOOL 34054528aa0a1724001942474ad23385221a42def71bb7460574052f06fe93bead0af04ba5cbdd463fddcb85d855c5441ed3b72a1a97f862a4bf9534267f4434
 DIST exim-4.84.tar.bz2 1761790 SHA256 78ea22be87fb6df880e7fd482f3bec9ef6ceca0c9dedd50f8a26cae0b38b9e9c SHA512 3cd41af6d57e5f0377fc93367753eae6cb6bf835803e8608c44e1da5acefce1ed8886f4fe7536950de072bfed6e927afe1536c1e6466cf3121dd352b69a68039 WHIRLPOOL 9e840aa6afa0db68455b4ab458706eedd7ea57b084999c9e85eaaec0530ed93958731d934ff1d7830d9b5cd086e36cb56dc8a2f78dad85bdba9ae6573510e840
+DIST exim-4.85.2.tar.bz2 1773050 SHA256 b0dcdb8832e77716396a6ca8a7523263af518d23910d818ba9a492fe93bef618 SHA512 17398ac730cc355ea063d68f9396e1f9238d2c9cc90939dd0ed3a003aa995e79190f6a206f1b338c95f300a43c97481b0b24d34bcded7b281b521f9dbb41fc6d WHIRLPOOL faa21b50b76e7d5ffe94d4bbf3616492108a0ab3702c16d1e0e6fe62d6ecc351d5df62d99f0c97aa32d8e20c1af96a3ed57207a026f8830f0df149edf508a33d
 DIST exim-4.85.tar.bz2 1784150 SHA256 13211f2bbc5400d095a9b4be075eb1347e0d98676fdfe4be8a3b4d56281daaa4 SHA512 2c5846528ee98e4aff5dbabe49dfa5ba6753fa64154b9671a7849db8a17773917fe13bcb9e5f732c43d7479debfadd8012b8650823eb12504a6b1b28be456161 WHIRLPOOL 4057cd745f12ff62e956838406544060d3d2d7383027959f3c1ca12eff43bddb9be63e284767245b271e53bef92596c1241f5e90e9ed611d02e95b7a30adc7c8
+DIST exim-4.86.2.tar.bz2 1799316 SHA256 7756deafd0583776e091f2efcba9b36203e668cf420d8876f314980803636eb3 SHA512 5869a7ae8fd66819f654f6617c7e77075a24b110074317b77135b8cc86f12632e79758d41819c6e91871e0145adaba4b91651f5c6c1d2ebd17927f0198876231 WHIRLPOOL 81e284bf6d1be9597e858468834ce8ff60f2783b75fea85a020df20a15a088339c4b2ccc6199c83672fcb37c05d4ca7957e70a2f2827292454266e7f9bcab87f
 DIST exim-4.86.tar.bz2 1804807 SHA256 f1ccf2ce2ea51b7fbbf160e7e0e41d24ca401cf44a185128ad99ea04635fc456 SHA512 0b90cd1b4d99bbb976336ccf9c2c3375f453a74bb306f1b0215f7ecca80fbda83cf5cc38c502516c2903c5d753f1f559c534fc4f4b1b32ee3300db86de6610ab WHIRLPOOL a7e938cfaeb92af1b81c8a113752914b61e49d7fd71c39460b944716725b1e98b50a7c9ef1699569cd031ee7cac210639d9ef9bd21280e5ce7682eb40db91726
-DIST exim-4.87_RC2.tar.bz2 1819354 SHA256 ac3a09464183ded893b590492eb1ed6d548a20c43f57ddd267ffa2fae9c8f032 SHA512 4cbf01f80f968c4ce2760c96f0e0c94f365f75526311fc68ee97698ce55440df1dc2aa50e670da34f2baa4dba1be0db8726c094a873beb54881252c4d78e1ac7 WHIRLPOOL 927caa9738e69aa4c5b7269a292cfce839189234510ae6208977d58f712e9128a63ba14e5b305d117028f101a7aaa626fa31e045940e951e9c38f7e0a540dc6e
-DIST exim-4.87_RC3.tar.bz2 1795572 SHA256 aa2627518782f9a0c00fc131143430b1ea05cc20a5175c217cdfcc18b09f562c SHA512 03fe161240934c08f95263496478894f83c303069ac9f7df9d2ac105685a59f8217ed11f1100904558a1b2784ea94b69f57ed2d0d9775752c00b3d5b7cbe53f6 WHIRLPOOL 67a87273a37814f83ff650228052ea123b0624675b5c17458118f2150f7f018cb414388bcd08dfa5d2540d8f15dd48de111ae388dd2882f3d03dd56bf426dee2
+DIST exim-4.87_RC5.tar.bz2 1784131 SHA256 94fb3c0619f22e1787ca158e9a5de32556648e3f9cf44611251db38e32616fd2 SHA512 863e2472c650b666b0a75f56044b41af217522cdc5fcab6e4a4e77cb515b683aed939124407367d6dc7e4380f3fd1a8ed72e75b5f5e43b6b78c470f0eada87f2 WHIRLPOOL 3305278e113c7b03d9df912c87a75bd5028017d47e43f93d88bb009fe6feae30bd304e57756659335eb15113656ca40124b2ede571bdc342529d1dba5433679d
+DIST exim-html-4.84.2.tar.bz2 459553 SHA256 407165354936515c28d6f206cf20bb3c3c7f55e70e66c551154e8e9dd554955d SHA512 17b1151f90eec13334ac27f9f8430276bf1a7b4c9c6e41c76afb52e18fe107ab421194881876221acef6386a7bd8c6a5372fec6217f88e3dd4bcaef8809aa178 WHIRLPOOL df3960dfbb631b9b82d60edda27910e58936e17edc6782cd63bf70bf826bce8dbe76d7add6444045334eb6230167f5f76984274d9ba3a6c6b50009412c6e6e8b
 DIST exim-html-4.84.tar.bz2 465281 SHA256 7ee7e9015b853915604b7806be93d56e9ba1fb915b63f0d6828c47f2228fd45b SHA512 7de8513476b6abcdfd36b0121a2a9d6decf1ccf94ef51b8363e544066cc05670e6f2b4d03d5fbc49071b1431183dfd9badde5cbcc65f51d55ec6b25ebcb070b9 WHIRLPOOL 88c376fd399e17b2bc06d2d0fad19f8c6485807118a81e0c200f6c39defe7155fa920489481a8b82e629951766ce0222b85956f387d22d22549303bd3dff7f82
+DIST exim-html-4.85.2.tar.bz2 461392 SHA256 b84e19f53b4077efbb94e232c8ce6557d133e0275a1d0ec32f2677068ad33dfa SHA512 e6f8531cbf0edc50db43d74b1e671ea51a2eaac7c06c8551f0229bc3a7882c725c8025a95d8a728aeb4ab3feddf6d2e1e5b7191869ac02cdfcb428e986a86422 WHIRLPOOL 8fe3a6575300ce660770b1357cef1158ef1171bcd79d7a4d7170a4867a4f7d5fd5e33d3be8a48ddfc875860d209b0771cd1c49173a9b821b3c1d70b48ea1583c
 DIST exim-html-4.85.tar.bz2 467069 SHA256 fd91946369626e74842a0799b93d0d9e4a201fe640af84e1b5349fe6ff204167 SHA512 8214576300827f79c0880e2d2163f71d7f1b3fe2aff714b591a011e48816965de5a773c3509137b085fec3d4d2128931f8398768c24dad6c92b7df27cbcafe74 WHIRLPOOL a7edffd7124c4920708616d3e59c0db5159dee5f7e4fd62ce29fdba769d39781a3826d4e3e39cdc97669941bb9a5c977defe280feb73cbe159b23df4cb6fe95f
+DIST exim-html-4.86.2.tar.bz2 466139 SHA256 1c97a6efd0a7aaf4b9960ce70fed4df37725f676397ce744efea1503ec1f5914 SHA512 593df23914939f8fa76c15a2ab7fc197efa05fcbb984179c9dc2c7d535fe2bef1394c07bc8449f2219f54615ff2f4ee13b76409d89b846dc71e54880681c913e WHIRLPOOL e6bbcf9bc20e2231542d20f40c656b30ce1f2e6fff5005f594191c5e325d0c5fbd45543b680151773fc14cbee253f417e7cea4e514d4e677486a6d334a36a3a7
 DIST exim-html-4.86.tar.bz2 471159 SHA256 02226a9fbb6d5aaa9d35f3e2a3bd9077e2307463de6baf6e3e2e938c1fe39146 SHA512 0c15fbccaf9b744fb8b7990d2b2bd0555a04ef5ed82ffbf2e32372a539bae6d7cebad96960f5570a2f8f27d31ebdf2467c51cb053b059996bb9122bc02fa741b WHIRLPOOL d9fbaa73491ab1657afb6ba59da5adea26144b58b358aeb9829731d3f35d6c1d8c7021c5243cb989e7c704cc346cde2a330f9eedc5b357326c1d56d7caa4a6c5
-DIST exim-html-4.87_RC2.tar.bz2 477015 SHA256 119274228a85de90324a6004efb1049474e7f2ec7f575cb57809735ab1b48a9b SHA512 51966e3b64c41dd95fa19b42484fe2d48b99eb104945de4d18b82d54d5f5791137eb308a7e05f7bdec7663d4f2e73353c7853d27c6496b529671dcaed6faa202 WHIRLPOOL 86af06c293bb920572144b94628dc7bc1626bf6f9bfd5867589bfb16b5171d2bb4ddbd3d07b3164e04b1bfa822cf8e8378b4382abc54d94b9b5646ceeab9d24f
-DIST exim-html-4.87_RC3.tar.bz2 477704 SHA256 95caf31a880043693f40397041949b582ce260a35a152611eafcf42d0bf55b95 SHA512 a5ef50b8494cbaeda107c779c85c5e24483dffbed250838b4552be424f013a8cad1727209905fec30c9adc5a6e5384c9d1cb66fee606d9c615c670d1a7ff4f75 WHIRLPOOL eacdb4d274bab112ed61164a198806c6965b6c363846d20a7fb00087161bc63e2ede6a75dc22d55c8598501eda23d91be44354021834d80ab1f28873dcd8d372
+DIST exim-html-4.87_RC5.tar.bz2 472681 SHA256 8c994de29df34537903240043f373ad1398d683cc23d7e92f3d0efc6e97ea7da SHA512 9d6eccb46dc2151ebfb371354e3024fd7456bf5ed63438b00fe4adcb186a7190f5474faa0bc1ae1101ed2ab67779f12196868f221b302375ed95cf8fe42aaf76 WHIRLPOOL 4a1aa2c4c7c8c00feb903ae6057356163918379897ea2d46d6098818e90f9180904294c6a02abd0333a081c62af49088a3b08cc690997b45989d70504c9d05c8
 DIST system_filter.exim.gz 3075 SHA256 3a3471b486a09e0a0153f7b520e1eaf26d21b97d73ea8348bdc593c00eb1e437 SHA512 cb358d3ce2499a0bb5920d962a06f2af8486e55ec90c8c928bd8e3aefb279aa57f5f960d5adfcef68bd94110b405eaa144e9629cfe6014a529c79c544600bbf3 WHIRLPOOL ce68d9c18b24eca3ef97ea810964cc1ada5f85b795a7c432ad39b5788188a16419101c92fb52b418738d760e1d658f7a41485e5561079a667d84d276c71be5a4
diff --git a/mail-mta/exim/exim-4.87_rc2.ebuild b/mail-mta/exim/exim-4.84.2.ebuild
index 99e8ddea94f5..a295de0ecf1d 100644
--- a/mail-mta/exim/exim-4.87_rc2.ebuild
+++ b/mail-mta/exim/exim-4.84.2.ebuild
@@ -6,10 +6,10 @@ EAPI="5"
 
 inherit eutils toolchain-funcs multilib pam systemd
 
-IUSE="dcc +dkim dlfunc dmarc +dnsdb doc dovecot-sasl dsn exiscan-acl gnutls ipv6 ldap libressl lmtp maildir mbx mysql nis pam perl pkcs11 postgres +prdr proxy radius redis sasl selinux spf sqlite srs ssl syslog tcpd tpda X"
+IUSE="dcc +dkim dlfunc dmarc +dnsdb doc dovecot-sasl dsn exiscan-acl gnutls ipv6 ldap lmtp maildir mbx mysql nis pam perl pkcs11 postgres +prdr proxy radius redis sasl selinux spf sqlite srs ssl syslog tcpd tpda X"
 REQUIRED_USE="spf? ( exiscan-acl ) srs? ( exiscan-acl ) dmarc? ( spf dkim ) pkcs11? ( gnutls )"
 
-COMM_URI="ftp://ftp.exim.org/pub/exim/exim4$([[ ${PV} == *_rc* ]] && echo /test)"
+COMM_URI="ftp://ftp.exim.org/pub/exim/exim4/old"
 
 DESCRIPTION="A highly configurable, drop-in replacement for sendmail"
 SRC_URI="${COMM_URI}/${P//rc/RC}.tar.bz2
@@ -19,7 +19,7 @@ HOMEPAGE="http://www.exim.org/"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~hppa ~ppc64 ~x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-solaris"
 
 COMMON_DEPEND=">=sys-apps/sed-4.0.5
 	>=sys-libs/db-3.2
@@ -27,10 +27,7 @@ COMMON_DEPEND=">=sys-apps/sed-4.0.5
 	perl? ( dev-lang/perl:= )
 	pam? ( virtual/pam )
 	tcpd? ( sys-apps/tcp-wrappers )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:= )
-	)
+	ssl? ( dev-libs/openssl )
 	gnutls? ( net-libs/gnutls[pkcs11?]
 			  dev-libs/libtasn1 )
 	ldap? ( >=net-nds/openldap-2.0.7 )
@@ -48,7 +45,7 @@ COMMON_DEPEND=">=sys-apps/sed-4.0.5
 		x11-libs/libXaw
 	)
 	sqlite? ( dev-db/sqlite )
-	radius? ( net-dialup/freeradius-client )
+	radius? ( net-dialup/radiusclient )
 	virtual/libiconv
 	"
 	# added X check for #57206
@@ -83,7 +80,7 @@ src_prepare() {
 	epatch "${FILESDIR}"/exim-4.69-r1.27021.patch
 	epatch "${FILESDIR}"/exim-4.74-radius-db-ENV-clash.patch # 287426
 	epatch "${FILESDIR}"/exim-4.82-makefile-freebsd.patch # 235785
-	epatch "${FILESDIR}"/exim-4.87-as-needed-ldflags.patch # 352265, 391279
+	epatch "${FILESDIR}"/exim-4.77-as-needed-ldflags.patch # 352265, 391279
 	epatch "${FILESDIR}"/exim-4.76-crosscompile.patch # 266591
 
 	if use maildir ; then
@@ -347,7 +344,7 @@ src_configure() {
 	# Transport post-delivery actions
 	if use tpda; then
 		cat >> Makefile <<- EOC
-			EXPERIMENTAL_EVENT=yes
+			EXPERIMENTAL_TPDA=yes
 		EOC
 	fi
 
@@ -403,8 +400,8 @@ src_configure() {
 	if use radius; then
 		cat >> Makefile <<- EOC
 			RADIUS_CONFIG_FILE=${EPREFIX}/etc/radiusclient/radiusclient.conf
-			RADIUS_LIB_TYPE=RADIUSCLIENTNEW
-			AUTH_LIBS += -lfreeradius-client
+			RADIUS_LIB_TYPE=RADIUSCLIENT
+			AUTH_LIBS += -lradiusclient
 		EOC
 	fi
 }
@@ -467,7 +464,7 @@ src_install () {
 	insinto /etc/logrotate.d
 	newins "${FILESDIR}/exim.logrotate" exim
 
-	newinitd "${FILESDIR}"/exim.rc9 exim
+	newinitd "${FILESDIR}"/exim.rc8 exim
 	newconfd "${FILESDIR}"/exim.confd exim
 
 	systemd_dounit "${FILESDIR}"/{exim.service,exim.socket,exim-submission.socket}
@@ -496,7 +493,7 @@ pkg_postinst() {
 		einfo "configure DMARC, for usage see the documentation at "
 		einfo "experimental-spec.txt."
 	fi
-	use tpda && einfo "TPDA/EVENT support is experimental"
+	use tpda && einfo "TPDA support is experimental"
 	use proxy && einfo "proxy support is experimental"
 	if use dsn ; then
 		einfo "Starting from Exim 4.83, DSN support comes from upstream."
diff --git a/mail-mta/exim/exim-4.86.ebuild b/mail-mta/exim/exim-4.85.2.ebuild
index e3fef8412ad4..704b1ba7ffca 100644
--- a/mail-mta/exim/exim-4.86.ebuild
+++ b/mail-mta/exim/exim-4.85.2.ebuild
@@ -9,7 +9,7 @@ inherit eutils toolchain-funcs multilib pam systemd
 IUSE="dcc +dkim dlfunc dmarc +dnsdb doc dovecot-sasl dsn exiscan-acl gnutls ipv6 ldap lmtp maildir mbx mysql nis pam perl pkcs11 postgres +prdr proxy radius redis sasl selinux spf sqlite srs ssl syslog tcpd tpda X"
 REQUIRED_USE="spf? ( exiscan-acl ) srs? ( exiscan-acl ) dmarc? ( spf dkim ) pkcs11? ( gnutls )"
 
-COMM_URI="ftp://ftp.exim.org/pub/exim/exim4$([[ ${PV} == *_rc* ]] && echo /test)"
+COMM_URI="ftp://ftp.exim.org/pub/exim/exim4/old"
 
 DESCRIPTION="A highly configurable, drop-in replacement for sendmail"
 SRC_URI="${COMM_URI}/${P//rc/RC}.tar.bz2
diff --git a/mail-mta/exim/exim-4.86-r2.ebuild b/mail-mta/exim/exim-4.86.2.ebuild
index afad1483e3e5..afad1483e3e5 100644
--- a/mail-mta/exim/exim-4.86-r2.ebuild
+++ b/mail-mta/exim/exim-4.86.2.ebuild
diff --git a/mail-mta/exim/exim-4.87_rc3.ebuild b/mail-mta/exim/exim-4.87_rc5.ebuild
index 2bcd19282d75..2bcd19282d75 100644
--- a/mail-mta/exim/exim-4.87_rc3.ebuild
+++ b/mail-mta/exim/exim-4.87_rc5.ebuild