gentoo resync : 20.12.2017

6 files changed, 21 insertions, 22 deletions

diff --git a/mail-mta/Manifest.gz b/mail-mta/Manifest.gz
index dce57db820ae..6455c99d0631 100644
--- a/mail-mta/Manifest.gz
+++ b/mail-mta/Manifest.gz
diff --git a/mail-mta/exim/Manifest b/mail-mta/exim/Manifest
index 71f4eef1579d..7bd3dfaacc1a 100644
--- a/mail-mta/exim/Manifest
+++ b/mail-mta/exim/Manifest
@@ -23,11 +23,13 @@ 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.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.tar.bz2 2025099 BLAKE2B 9b82d0a0dcace893ab6fd6b2273ed6961aa4b0091909eea49f72cace3ac25d9a861f9883373a4a41753ba2fb0eda118e9df2e779f29e6b988865ba4630e2898b SHA512 4baeabeee5554d9e80edc21b12622bf9d4b84461307f2eacaff0ad583818f7f38306ae1029de1066019327e490a3bd046c175c735fe3c6724c31b34d6171bf45
 DIST system_filter.exim.gz 3075 BLAKE2B d05e872b5cef377d29126cda03fc0a74c8777b2119b76ff43da6e8de808035eb9bfcb034a85d81824f135d484e864bfc0629fc1af2c228a7277d5ee7cf9cde79 SHA512 cb358d3ce2499a0bb5920d962a06f2af8486e55ec90c8c928bd8e3aefb279aa57f5f960d5adfcef68bd94110b405eaa144e9629cfe6014a529c79c544600bbf3
-EBUILD exim-4.89-r1.ebuild 12275 BLAKE2B ddda4ce9e499eef9243a0239e290b8a4af85cd247cfe1bb2ae0b4a77974a96ffa2559623d5ff8e0034985b8ca25e1fcf11ec1c432d82ed31b0c9d3d801ab00c6 SHA512 954fc08d9d7b319f404e349abbcde6188717cbd6012ed325f673615e79766bbd360993ad7afe6b17976162e965b94b2b5a7eb127ccacf868b8a82048ae0d1f70
-EBUILD exim-4.89-r3.ebuild 12435 BLAKE2B bf255c5a66084c23320f37929de45731364690a23961982ade4a6b44027e01048f66caa9f30f5f42f37345aa99c8c3e9441452a724db69225dae6ffdbd5b755e SHA512 2da4c674e67518521c0e7adbb0be23265e024425625b9d1ac47061233368f7279d4a482e7507b8e245c2113c0fd197ae3d982c4946ecfeefd8f995713726e2b5
+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
 MISC metadata.xml 2482 BLAKE2B 8cc92e47224d8afbc72bd61d6651887f5211c4ebe36ae1d38e55ed395dee9574307b075bcf36fcd0761be0358c2bc27cfc0e60294a48483b444d4534f5c0b9da SHA512 dcda0d8164098a41d7defa30b84b36bfdc6fc1fecce2dc680aa22341f67be9dad281bdee0b6f9028459b4a62d4f3a83a16bd1cdca99238b114532c7b06f5c25f
diff --git a/mail-mta/exim/exim-4.89-r1.ebuild b/mail-mta/exim/exim-4.89-r1.ebuild
index 604e97786eca..aab4f2e3242b 100644
--- a/mail-mta/exim/exim-4.89-r1.ebuild
+++ b/mail-mta/exim/exim-4.89-r1.ebuild
@@ -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="sparc"
 
 COMMON_DEPEND=">=sys-apps/sed-4.0.5
 	>=sys-libs/db-3.2:=
diff --git a/mail-mta/exim/exim-4.89-r3.ebuild b/mail-mta/exim/exim-4.90.ebuild
index da1e74e4eee1..c6f82d8187f9 100644
--- a/mail-mta/exim/exim-4.89-r3.ebuild
+++ b/mail-mta/exim/exim-4.90.ebuild
@@ -5,7 +5,7 @@ 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 )
 	dmarc? ( spf dkim )
@@ -95,9 +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
-	epatch "${FILESDIR}"/${P}-transport-crash.patch # from git/in next release
-	epatch "${FILESDIR}"/${P}-address-expando-crash.patch # from git/in next release
 
 	if use maildir ; then
 		epatch "${FILESDIR}"/exim-4.20-maildir.patch
@@ -148,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
@@ -259,7 +257,6 @@ src_configure() {
 	if use exiscan-acl; then
 		cat >> Makefile <<- EOC
 			WITH_CONTENT_SCAN=yes
-			WITH_OLD_DEMIME=yes
 		EOC
 	fi
 
@@ -279,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
@@ -378,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
 
@@ -524,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/postfix/Manifest b/mail-mta/postfix/Manifest
index 10bd9df05196..954b790fa2f4 100644
--- a/mail-mta/postfix/Manifest
+++ b/mail-mta/postfix/Manifest
@@ -10,12 +10,12 @@ DIST postfix-3.1.6.tar.gz 4341308 BLAKE2B 6a5ec763cf96770240f63b35b4532c555cc6e5
 DIST postfix-3.2.2.tar.gz 4390318 BLAKE2B 4d0648ad89c90b13573bf9a2721919f90fa706a37d745889bc1e3a38e5f5277af848e2ba6eed8f61dec68f53ac65fd67c133bc37ed73ecb350baa76834a5a33c SHA512 9432fa8b181db99b8e2d72b2a0f640d1456b10c42615f0a002638f7f788d748b8bb55cd36409a368ac4f6d22033d1d059728fa33980fb93d465b6dfd5ae26418
 DIST postfix-3.2.3.tar.gz 4390567 BLAKE2B 911b183c318bc60cfd1ba2ae5e9467cfe3cc62f9787c7566f2edea7b867974bc90f0cc4b236f71b50c08a1696e6d60beeccdc634d7bf7f3a600c260b89743a36 SHA512 99ea74a5a0620e739668e55d620a0370b72c4802983a8a4cf4d6c51c6f8f5573128f2d6869386cedadba66b3f741df2f18867a059facd94092ac95f6da3a600c
 DIST postfix-3.2.4.tar.gz 4390376 BLAKE2B 132a6b467f9156d716a92cc7beae0f9a7c47e6a2045e83726a5e7305e6f9bf666ebcfb93a9ab1a96ec988431661059d62e926287bd13089eeb4bab3e8f4b9fc7 SHA512 6dc583d3b1c98f5c8d6486351bee9f92a98b5379cd0d76d26a382379c112317e7a2a58c3a200477a6d0f831c73395257d1a63170df17ea8a65a4048a7df391f8
-DIST postfix-3.3-20171028.tar.gz 4397753 BLAKE2B cc2a44f9e902440ee1b571fbb2d6a489d5535ba5d49a0b2758555a83062f4713e19be2b2b4a488cc735b3009144419f398acafacb5161154f04dd20856f8172e SHA512 3ff967d5102161edf5de9e7cf432fee438fab954e9a260e805372a7d28b9bfdad8d01c6d274429ee99bafc86f12a0292fdff18192c0f3647cf1187ea243a80dd
+DIST postfix-3.3-20171218.tar.gz 4399324 BLAKE2B 8b26c767db328f360ad2c5f705d90c1c315b66e4e4e5debf4a7c8b0ca6c1e2bf7e1260ea78db6137811c52246826891b86a32b980f7dde6840f79b0c740046f6 SHA512 9e72487e247fe30defe98e14c72b3ca632e845a936fcbdd54296139e8328ae5efcf35e254c52143a16e68052dba87b0ef49081f071232ad6109c9f34eed568f9
 DIST postfix-vda-v13-2.10.0.patch 55701 BLAKE2B d8df041bb4ae7457cd066e71b6ae9470840d42edc9990a550ae51356cd62bfb08516250249030da26d1ef475619f0ebd609570d84ce57f8cdc347a2824b29536 SHA512 0b4b53a8cd28abf56eee3b2ed63ca1814251b60816e6ca1143249d25fd6ef7f905bec3134125ac6e851af685db8aae878012113693261529ae2ddbcf1bd93e62
 EBUILD postfix-2.10.9.ebuild 8736 BLAKE2B 2e95575a37c0f4587c9ecde36a9a1d622e2fb5b988f4374c1d1f9951351f138d578ad1540d2ca8e6192baacf868ce3ab8836eca0d4e07d7b11a11b8df57d512a SHA512 09a64554311b5b5c7395770329eb44cf80d3f3e9197adefbb304214feb9ff3d4df9e3d3376b3b4e87f329281e1fb4e03bfb7b3bbfbae463384031b3810e011d0
 EBUILD postfix-3.1.6.ebuild 8661 BLAKE2B 707f1822c7e8359adc8f0884237069cd2092385eb4a55c378d2918ed097b596755a533cdf297895a3651572996b5dce8603e3dce8bea172acee60471cfce32c9 SHA512 6174266e057ca6110d39c76f6bd6d11fa24f40641599a90c143aa9396822d1cc2b3e72b7de94e849c913c5d34bf3dd081f29feedb41b2bfc349a6e567381550d
 EBUILD postfix-3.2.2.ebuild 8669 BLAKE2B bec764e9e0d8a93270bc0b3b2f6bdaedbf5e9be6cbb55b506464eecb7f620317b8d55a577a9b65d19a7ab1c40b83fb059233fb56edc4f9aba01e19b8effae6c1 SHA512 094bd11212903bfcbf678698765da8f72ed3b34562aca398d47e90d3a2ae7ef252bc29eead3bb92eebe46a7dc2aa4e615dc3b85ec192c6d6872c2370fe99a11a
 EBUILD postfix-3.2.3.ebuild 8669 BLAKE2B bec764e9e0d8a93270bc0b3b2f6bdaedbf5e9be6cbb55b506464eecb7f620317b8d55a577a9b65d19a7ab1c40b83fb059233fb56edc4f9aba01e19b8effae6c1 SHA512 094bd11212903bfcbf678698765da8f72ed3b34562aca398d47e90d3a2ae7ef252bc29eead3bb92eebe46a7dc2aa4e615dc3b85ec192c6d6872c2370fe99a11a
 EBUILD postfix-3.2.4.ebuild 8664 BLAKE2B 36a15f5ae6e0c05517b0925b85940668aa47c851729660a331460300b50c0d6114254ecb643fa823f3e186d1c89b1df41e1df6b0f7429cbcb66c6147cf3227a0 SHA512 2d40980192a4e11845723446d849c1f5e555756b69adb8a4ca2339970fdeaabd6a473b2199bb6e8162546c74e3ff369be4bfab25882497fcf594cfd7c7aca921
-EBUILD postfix-3.3_pre20171028.ebuild 8764 BLAKE2B 43fbf460d572143e5612de76044f24722140a21779dc3f35f4b6ad28831384e8dbf0a18d497ff405d3fc5096c51a9cd8411c444f6a02f48e28a5631e1a621f3f SHA512 7dc624549c5bec88a509372e63256604ce3e899a093508fff914afe7d4a698a0e9c941f9b8fe97fa162eec197d9b3488c4a665822689cc5cfa1686b20ba918f7
+EBUILD postfix-3.3_pre20171218.ebuild 8764 BLAKE2B 43fbf460d572143e5612de76044f24722140a21779dc3f35f4b6ad28831384e8dbf0a18d497ff405d3fc5096c51a9cd8411c444f6a02f48e28a5631e1a621f3f SHA512 7dc624549c5bec88a509372e63256604ce3e899a093508fff914afe7d4a698a0e9c941f9b8fe97fa162eec197d9b3488c4a665822689cc5cfa1686b20ba918f7
 MISC metadata.xml 903 BLAKE2B ad36e98f33e0538aa2cec74a6c7342e42a0e65fea2898b93a9a2e7cb81bddad130fd0eec89e554a3e8ca5d9399ef21ea47d9e16d39f070d8e9d325c45ca95356 SHA512 3159041e80f1b045d9beda6f517be0acd5a5eaca4b979e7ae2d27f6d7cc07ad83ba55a9e78b718689c9d6fff780e77d9b0c8275a1dec96bd84d2cd184d86662d
diff --git a/mail-mta/postfix/postfix-3.3_pre20171028.ebuild b/mail-mta/postfix/postfix-3.3_pre20171218.ebuild
index a6ac5530fbf4..a6ac5530fbf4 100644
--- a/mail-mta/postfix/postfix-3.3_pre20171028.ebuild
+++ b/mail-mta/postfix/postfix-3.3_pre20171218.ebuild