gentoo resync : 08.01.2018

2 files changed, 6 insertions, 15 deletions

diff --git a/mail-mta/postfix/Manifest b/mail-mta/postfix/Manifest
index 8bc63839a5af..fa31009f1589 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-20171223.tar.gz 4401235 BLAKE2B c4f5459935758b3d9847d4b20054cf2021520377f917e0ab78fecdd8abe11b432464105c50eff3acb7908c94d5c69f7e636fc8d69411e64d51906d01d8d4f40d SHA512 c0120d5042ae3a5eaf8ece2ea504ad9975cef9cb31ca91376a88cd6b4a43569108edcb77f5e7f896b2da00364d43afa59f6520bf1e0276c0875e7b2c1f8026aa
+DIST postfix-3.3-20180107.tar.gz 4427783 BLAKE2B ea036647edb3ddd3bd48675a94c9ae2759db82b21736309fca1e9dd491c6243a11b0de39b412994c5d1a162d3fdf5da9173221bd93f5393cac8295b66f65e546 SHA512 0fdf7a152b4efc0583bdff78cf8ba198bb28344374387510f370beae6f207af3ff42d4a94c2e0d1aea9d5f5ad819840289e2bd4ce073b5234d834cf53f1bde31
 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_pre20171223.ebuild 8764 BLAKE2B 43fbf460d572143e5612de76044f24722140a21779dc3f35f4b6ad28831384e8dbf0a18d497ff405d3fc5096c51a9cd8411c444f6a02f48e28a5631e1a621f3f SHA512 7dc624549c5bec88a509372e63256604ce3e899a093508fff914afe7d4a698a0e9c941f9b8fe97fa162eec197d9b3488c4a665822689cc5cfa1686b20ba918f7
+EBUILD postfix-3.3_pre20180107.ebuild 8418 BLAKE2B 2f9b2058e43510577a7dbf131288bcc25d426efe55f2c864acde609a6d4f4de2dfdf412c60b2fa2a5e162d782d88a57bf3e91c8ff6dbf3a61a6b067249e9700b SHA512 78875d12be46e34f345da7144346b0c03d620b55e1ae2249b8bd0109c2413d1b9797a03ecd2f91abaab80699a8652aff8839d7595c692693047f3b04aef0950e
 MISC metadata.xml 903 BLAKE2B ad36e98f33e0538aa2cec74a6c7342e42a0e65fea2898b93a9a2e7cb81bddad130fd0eec89e554a3e8ca5d9399ef21ea47d9e16d39f070d8e9d325c45ca95356 SHA512 3159041e80f1b045d9beda6f517be0acd5a5eaca4b979e7ae2d27f6d7cc07ad83ba55a9e78b718689c9d6fff780e77d9b0c8275a1dec96bd84d2cd184d86662d
diff --git a/mail-mta/postfix/postfix-3.3_pre20171223.ebuild b/mail-mta/postfix/postfix-3.3_pre20180107.ebuild
index a6ac5530fbf4..a778e668f172 100644
--- a/mail-mta/postfix/postfix-3.3_pre20171223.ebuild
+++ b/mail-mta/postfix/postfix-3.3_pre20180107.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
@@ -234,14 +234,6 @@ src_install () {
 	dosbin bin/smtp-{source,sink} bin/qmqp-{source,sink}
 	doman man/man1/smtp-{source,sink}.1 man/man1/qmqp-{source,sink}.1
 
-	# Set proper permissions on required files/directories
-	dodir /var/lib/postfix
-	keepdir /var/lib/postfix
-	fowners -R postfix:postfix /var/lib/postfix
-	fperms 0750 /var/lib/postfix
-	fowners root:postdrop /usr/sbin/post{drop,queue}
-	fperms 02711 /usr/sbin/post{drop,queue}
-
 	keepdir /etc/postfix
 	if use mbox; then
 		mypostconf="mail_spool_directory=/var/spool/mail"
@@ -275,10 +267,6 @@ src_install () {
 	insinto /usr/include/postfix
 	doins include/*.h
 
-	# Keep config_dir clean
-	rm -f "${D}"/etc/postfix/{*LICENSE,access,aliases,canonical,generic}
-	rm -f "${D}"/etc/postfix/{header_checks,relocated,transport,virtual}
-
 	if has_version mail-mta/postfix; then
 		# let the sysadmin decide when to change the compatibility_level
 		sed -i -e /^compatibility_level/"s/^/#/" "${D}"/etc/postfix/main.cf || die
@@ -296,6 +284,9 @@ pkg_postinst() {
 		ewarn
 	fi
 
+	# check and fix file permissions 
+	"${EROOT}"/usr/sbin/postfix set-permissions 2>/dev/null
+
 	# configure tls
 	if use ssl ; then
 		if "${EROOT}"/usr/sbin/postfix tls all-default-client; then