gentoo resync : 11.02.2018

5 files changed, 37 insertions, 36 deletions

diff --git a/mail-mta/exim/Manifest b/mail-mta/exim/Manifest
index 7bd3dfaacc1a..f053f423c7a8 100644
--- a/mail-mta/exim/Manifest
+++ b/mail-mta/exim/Manifest
@@ -23,13 +23,15 @@ AUX exim.socket 139 BLAKE2B bb8281a98fdac1b52031d5250fd1e658bf5a2c32e24b49ed0daa
 AUX exim_at.service 140 BLAKE2B 8624f4a555e2acdc7aaf917952c4152ad00dc063a51076aefa1d023d47d5f7fe8b268f3308734f363ed9628cd8551ccac7fc369657e0fdf65507d2e6419f704c SHA512 11c8133ee15b3e5193c9b1c59aed66c81b6e045dd23310bede9fcde6c88905db5ef08afdb798b53b75a7465915ea1247e980edf95db07a7f9b7bb58ce95fbb5a
 DIST exim-4.89.1.tar.bz2 1828699 BLAKE2B 21b3acc73717319c58341f28463d0fd576c725291ae348015f6696f079fc6c3c08c86f9a2c19f81e0019c50b6cb8670466f4b449bf09a454e6b6e02feee60bfc SHA512 391102c5af991c3f9035aefadd031a9ab2505c682a5cd9c2268f82edb01dc5edec94d86e298d2be3c0437c261b63fb2662cc37f4de67106b0325f2c3bf7e0b9e
 DIST exim-4.89.tar.bz2 1844430 BLAKE2B 255bb3f27a264d92bf4664cf1278beabffa888006dfc0b31cde8a04d62501b0fe282db5b959bd303e2a818322716548c97264842130b8d5c3b9075615f668ca7 SHA512 1e059966a93b47f055ab4ec2a4556f2c918aff56ea0367585f3a853f00411e9c275e13be4f9ae615a468fa06263135cd6a138fa1753f1b7fb3259a3321fcca65
+DIST exim-4.90.1.tar.bz2 1854894 BLAKE2B d7fd8963fb8e98e562a87d248b4e0a54c382d922ea9ea0df10d06fd0992dc19b53e85b73e16dc4b8ae294268fa4f66fe1ae98c7bd3a1d62798425fc2a8a4aa01 SHA512 ba612cf056d97dfaac2b49255ad1e952c5f6b2623118a65f4ddae35ceb51a45f63e77956373f5550121bc1d7eb0c2ebeece1144cf1b15d57332a4782e3fb6db1
 DIST exim-4.90.tar.bz2 1873037 BLAKE2B 5498886560f85fba94a5055d9e72eece959cde6db20a589e6567e89b9c7669c4bb421d6a48f3c5d676381aa008088f391007be5de30e033f64e8e6a128059e62 SHA512 0424d5d4eff28d94ade786402cfece3e2760ff0e44da3be5327b8695e4c3c483ec925ab24e13b1ebe145e204ad02b67ae99ff0992705bd1a3c312ede0464c74b
 DIST exim-pdf-4.89.1.tar.bz2 1942785 BLAKE2B 588298b2c3007a94d40370463dec52d9b5c44b72e8c93e9b749e0ed513f1da045b58140f8802edfd9a5e9dd2d9911f70b4d4cdde3b3952c794c6abd9744ed3d9 SHA512 0b7944237fcadf708570c39a7963246fc70579fecafc746ed8e210c3319eed64a4678162c8c4243e84f48396b3b8bcbc3626523984a716b85564ee50c5712333
 DIST exim-pdf-4.89.tar.bz2 1924606 BLAKE2B f03182d51f4cc5b71cb65c2e0bcf74142f8110b6bfbd5b0fc05e321b692ebde5dbc84c4562a39ee85065f4d2db0654e6a189c826bfdea19051f56969d4ca74e2 SHA512 b04ea2e4dcdb1aaf52ef77ccd76e6599c68c4c6e5a98090720dbd3c50f7191bf3f6cd7dc2089a765c47576311780809cff547f85f004caec411d0f1ac9985299
+DIST exim-pdf-4.90.1.tar.bz2 1958791 BLAKE2B 2dcb523dbdaa989ca0a228db31967230b1bbb68cb998c90231108a822ca4dcc7db9e4c4a91034129ba7d9f08bb632379f021c65ea43159e21f9c6bae9060f146 SHA512 9529b9b459cc766a7171cbd37c2fab710acf130131326b8eb50d9c65714297b0139364fe6129e80d2f29ccee88e35497604a80d6d92207e16518c1d96c267127
 DIST exim-pdf-4.90.tar.bz2 2025099 BLAKE2B 9b82d0a0dcace893ab6fd6b2273ed6961aa4b0091909eea49f72cace3ac25d9a861f9883373a4a41753ba2fb0eda118e9df2e779f29e6b988865ba4630e2898b SHA512 4baeabeee5554d9e80edc21b12622bf9d4b84461307f2eacaff0ad583818f7f38306ae1029de1066019327e490a3bd046c175c735fe3c6724c31b34d6171bf45
 DIST system_filter.exim.gz 3075 BLAKE2B d05e872b5cef377d29126cda03fc0a74c8777b2119b76ff43da6e8de808035eb9bfcb034a85d81824f135d484e864bfc0629fc1af2c228a7277d5ee7cf9cde79 SHA512 cb358d3ce2499a0bb5920d962a06f2af8486e55ec90c8c928bd8e3aefb279aa57f5f960d5adfcef68bd94110b405eaa144e9629cfe6014a529c79c544600bbf3
-EBUILD exim-4.89-r1.ebuild 12211 BLAKE2B 2f4f19e73a4794d6f4af8a7cd70ba1725ed4095cc208a599beb3e374368ca9c5bf65f641b57632ee4480f4a01364dc54279236adb525c883e629dcfa5930c997 SHA512 d6f08d234c7776539a81ffed1e3afc1d835f3a7336e48ddc736e87d1c91a7e17dd5d40b6600f3062970472398e5b9edb446015f27fbc499927fabb450e7fdedd
-EBUILD exim-4.89-r5.ebuild 12578 BLAKE2B 771ba0b738fa44cd62611ddb8e7c402100b30af0255053dd463ab35debeac1ca6faf70b4c9bace4b128e9bf341995c0c3dd192c0d41ca6114eeab0377fe71e41 SHA512 4c417876d681f11d8f5a0b6a97825621cbc137e19ff48f9f8d9d38f5c6ce6d1277c9de80d1ec4c5cc388fa3b4e83cdd8e1280c4b0c9bda5886434455707a6eb0
-EBUILD exim-4.89.1.ebuild 12301 BLAKE2B 7ecad73cd39ee34c1bfb6a52f0fa93151e308f0a80b799a78ab1284e4a9798344a60ba89c223239085fb0dd9c1ed75cef1e780771e22f0e9df36850b9f4fbdf7 SHA512 f3bb3a44600d182aa03c7fe813afe7801e72e852da03777d9cc2572b1928856cdca5622b44634732ae98d5b4eac480b90464064aefcaf4906f9a266ea00c6e63
-EBUILD exim-4.90.ebuild 12233 BLAKE2B f13122c9432d567ce68d934f5871378fcdd3351bbce76a0631e08abc744a68dda22f02a829d1cc92ad43acc8e05b1198850ae9d5db12f0bacacfc650e49d14b4 SHA512 beb800d1fd149d424dad19556b6dff7cf60948490103b1005d0bf97f67f2a6cc48940c3fc66c2aac71dfc38c2b8bd49bc60ffb0f3674a522d7832613a0f2877c
+EBUILD exim-4.89-r5.ebuild 12585 BLAKE2B 4ab8179cf41e847edcc23214e149e5af9270ebd9367cccf233c17ed3406299f810a195ccbb75368f8a2921a717814e2d4e33dcbe4525cba2d7ff76384138eda3 SHA512 fdd78249ade5e6d1d11a47a71283d47940709d8292b6129722d63f91d422067f4850c350edf28dfce88b7513785f0f0f764bf98a9155be62af404343153c144b
+EBUILD exim-4.89.1.ebuild 12309 BLAKE2B 03cb1d877ccc0057c3242efe64979621c6455aac6371f2ea5cb7eff13b71bc9858cd427d3335269543e03591b2d8b9cb128ede714ef58611b60cdb98e5036adb SHA512 03c237f71fd4d5ede14c02314f2ffce98ccc04337b49ea089d7abf1bceb457eef2baede38d047a75d43d76ec367c0e0f21adb524db0dd8429c6d23dc4f9dbe5e
+EBUILD exim-4.90.1.ebuild 12241 BLAKE2B 62d34f83130e91e4feee5468b1088ef78d23f7fed201b652c13b3c9d22330200cf8b01e745dec0fd4ebc80c4f44614cad744e9944d2c4376f719bf1d20c0a720 SHA512 f3f6ebe42fa81f5527ffdd786a6ab76704bd2bb2caa7263d3931dc1a234fdb27bf2c4c5459d1c2339ad0904906aa2463368135b61b8194c19d3cdda1ac260540
+EBUILD exim-4.90.ebuild 12241 BLAKE2B 62d34f83130e91e4feee5468b1088ef78d23f7fed201b652c13b3c9d22330200cf8b01e745dec0fd4ebc80c4f44614cad744e9944d2c4376f719bf1d20c0a720 SHA512 f3f6ebe42fa81f5527ffdd786a6ab76704bd2bb2caa7263d3931dc1a234fdb27bf2c4c5459d1c2339ad0904906aa2463368135b61b8194c19d3cdda1ac260540
 MISC metadata.xml 2482 BLAKE2B 8cc92e47224d8afbc72bd61d6651887f5211c4ebe36ae1d38e55ed395dee9574307b075bcf36fcd0761be0358c2bc27cfc0e60294a48483b444d4534f5c0b9da SHA512 dcda0d8164098a41d7defa30b84b36bfdc6fc1fecce2dc680aa22341f67be9dad281bdee0b6f9028459b4a62d4f3a83a16bd1cdca99238b114532c7b06f5c25f
diff --git a/mail-mta/exim/exim-4.89-r5.ebuild b/mail-mta/exim/exim-4.89-r5.ebuild
index 226c7601533a..5201343c00fd 100644
--- a/mail-mta/exim/exim-4.89-r5.ebuild
+++ b/mail-mta/exim/exim-4.89-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -7,9 +7,9 @@ inherit eutils toolchain-funcs multilib pam systemd
 
 IUSE="dane 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 elibc_glibc"
 REQUIRED_USE="
-	dane? ( !gnutls )
+	dane? ( ssl !gnutls )
 	dmarc? ( spf dkim )
-	pkcs11? ( gnutls )
+	pkcs11? ( ssl gnutls )
 	spf? ( exiscan-acl )
 	srs? ( exiscan-acl )
 "
@@ -24,7 +24,7 @@ HOMEPAGE="http://www.exim.org/"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x86-solaris"
 
 COMMON_DEPEND=">=sys-apps/sed-4.0.5
 	>=sys-libs/db-3.2:=
diff --git a/mail-mta/exim/exim-4.89.1.ebuild b/mail-mta/exim/exim-4.89.1.ebuild
index 55536b6c0d35..6ccacc0529b1 100644
--- a/mail-mta/exim/exim-4.89.1.ebuild
+++ b/mail-mta/exim/exim-4.89.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -7,9 +7,9 @@ inherit eutils toolchain-funcs multilib pam systemd
 
 IUSE="dane 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 elibc_glibc"
 REQUIRED_USE="
-	dane? ( !gnutls )
+	dane? ( ssl !gnutls )
 	dmarc? ( spf dkim )
-	pkcs11? ( gnutls )
+	pkcs11? ( ssl gnutls )
 	spf? ( exiscan-acl )
 	srs? ( exiscan-acl )
 "
diff --git a/mail-mta/exim/exim-4.89-r1.ebuild b/mail-mta/exim/exim-4.90.1.ebuild
index aab4f2e3242b..e4f0e7b5fa0a 100644
--- a/mail-mta/exim/exim-4.89-r1.ebuild
+++ b/mail-mta/exim/exim-4.90.1.ebuild
@@ -1,15 +1,15 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 
 inherit eutils toolchain-funcs multilib pam systemd
 
-IUSE="dane 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 elibc_glibc"
+IUSE="dane 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 elibc_glibc"
 REQUIRED_USE="
-	dane? ( !gnutls )
+	dane? ( ssl !gnutls )
 	dmarc? ( spf dkim )
-	pkcs11? ( gnutls )
+	pkcs11? ( ssl gnutls )
 	spf? ( exiscan-acl )
 	srs? ( exiscan-acl )
 "
@@ -24,7 +24,7 @@ HOMEPAGE="http://www.exim.org/"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="sparc"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-solaris"
 
 COMMON_DEPEND=">=sys-apps/sed-4.0.5
 	>=sys-libs/db-3.2:=
@@ -95,7 +95,6 @@ src_prepare() {
 	epatch "${FILESDIR}"/exim-4.82-makefile-freebsd.patch # 235785
 	epatch "${FILESDIR}"/exim-4.89-as-needed-ldflags.patch # 352265, 391279
 	epatch "${FILESDIR}"/exim-4.76-crosscompile.patch # 266591
-	epatch "${FILESDIR}"/exim-4.89-CVE-2017-1000369.patch # 622212
 
 	if use maildir ; then
 		epatch "${FILESDIR}"/exim-4.20-maildir.patch
@@ -146,7 +145,8 @@ src_configure() {
 	EOC
 
 	# if we use libiconv, now is the time to tell so
-	use !elibc_glibc && use !elibc_musl && echo "EXTRALIBS_EXIM=-liconv" >> Makefile
+	use !elibc_glibc && use !elibc_musl && \
+		echo "EXTRALIBS_EXIM=-liconv" >> Makefile
 
 	# support for IPv6
 	if use ipv6; then
@@ -257,7 +257,6 @@ src_configure() {
 	if use exiscan-acl; then
 		cat >> Makefile <<- EOC
 			WITH_CONTENT_SCAN=yes
-			WITH_OLD_DEMIME=yes
 		EOC
 	fi
 
@@ -277,6 +276,14 @@ src_configure() {
 		EOC
 	fi
 
+	# Transport post-delivery actions
+	if ! use tpda; then
+		# EVENT is enabled by default
+		cat >> Makefile <<- EOC
+			DISABLE_EVENT=yes
+		EOC
+	fi
+
 	# log to syslog
 	if use syslog; then
 		sed -i "s:LOG_FILE_PATH=/var/log/exim/exim_%s.log:LOG_FILE_PATH=syslog:" Makefile
@@ -376,17 +383,10 @@ src_configure() {
 		EOC
 	fi
 
-	# Transport post-delivery actions
-	if use tpda; then
-		cat >> Makefile <<- EOC
-			EXPERIMENTAL_EVENT=yes
-		EOC
-	fi
-
-	# Delivery Sender Notifications
+	# Delivery Sender Notifications extra information in fail message
 	if use dsn; then
 		cat >> Makefile <<- EOC
-			EXPERIMENTAL_DSN=yes
+			EXPERIMENTAL_DSN_INFO=yes
 		EOC
 	fi
 
@@ -452,9 +452,9 @@ src_install () {
 	dosym exim /usr/sbin/sendmail
 	dosym exim /usr/sbin/rsmtp
 	dosym exim /usr/sbin/rmail
-	dosym /usr/sbin/exim /usr/bin/mailq
-	dosym /usr/sbin/exim /usr/bin/newaliases
-	dosym /usr/sbin/sendmail /usr/lib/sendmail
+	dosym ../sbin/exim /usr/bin/mailq
+	dosym ../sbin/exim /usr/bin/newaliases
+	dosym ../sbin/sendmail /usr/lib/sendmail
 
 	for i in exicyclog exim_dbmbuild exim_dumpdb exim_fixdb exim_lock \
 		exim_tidydb exinext exiwhat exigrep eximstats exiqsumm exiqgrep \
@@ -522,8 +522,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 dsn && einfo "DSN support is experimental"
+	use dsn && einfo "extra information in fail DSN message is experimental"
 	elog "The obsolete acl condition 'demime' is removed, the replacements"
 	elog "are the ACLs acl_smtp_mime and acl_not_smtp_mime"
 }
diff --git a/mail-mta/exim/exim-4.90.ebuild b/mail-mta/exim/exim-4.90.ebuild
index c6f82d8187f9..e4f0e7b5fa0a 100644
--- a/mail-mta/exim/exim-4.90.ebuild
+++ b/mail-mta/exim/exim-4.90.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -7,9 +7,9 @@ inherit eutils toolchain-funcs multilib pam systemd
 
 IUSE="dane 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 elibc_glibc"
 REQUIRED_USE="
-	dane? ( !gnutls )
+	dane? ( ssl !gnutls )
 	dmarc? ( spf dkim )
-	pkcs11? ( gnutls )
+	pkcs11? ( ssl gnutls )
 	spf? ( exiscan-acl )
 	srs? ( exiscan-acl )
 "