Add smtpd_relay_restrictions compatibility shim

Package-Manager: portage-2.2.0_alpha142/cvs/Linux x86_64
Manifest-Sign-Key: 0x77F1F175586A3B1F

3 files changed, 37 insertions, 17 deletions

diff --git a/mail-mta/postfix/ChangeLog b/mail-mta/postfix/ChangeLog
index da36bc48c6cf..5f6172d3e460 100644
--- a/mail-mta/postfix/ChangeLog
+++ b/mail-mta/postfix/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for mail-mta/postfix
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/ChangeLog,v 1.396 2012/10/30 19:38:28 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/ChangeLog,v 1.397 2012/11/02 15:13:27 eras Exp $
+
+  02 Nov 2012; Eray Aslan <eras@gentoo.org> postfix-2.10_pre20121022.ebuild:
+  Add smtpd_relay_restrictions compatibility shim
 
   30 Oct 2012; Eray Aslan <eras@gentoo.org> -files/postfix-2.9.3-freebsd9.patch,
   -files/postfix.rc6.2.6, -postfix-2.8.10.ebuild, -postfix-2.8.11.ebuild,
diff --git a/mail-mta/postfix/Manifest b/mail-mta/postfix/Manifest
index bc73e550f255..86b5dbda3355 100644
--- a/mail-mta/postfix/Manifest
+++ b/mail-mta/postfix/Manifest
@@ -13,26 +13,26 @@ DIST postfix-2.9.4.tar.gz 3760718 SHA256 58343afcc727594cc1f9a3980562d8199aa55fc
 DIST postfix-vda-v10-2.8.8.patch 56777 SHA256 40e32a1c159fe3d12836f81e4871e4a628a87623b80402e90f7465eb39f89a86
 DIST postfix-vda-v10-2.8.9.patch 56777 SHA256 e671f7349173349d66f1b091359761ed5a5d517f8a58c86a42ff461997d2cd7e
 DIST postfix-vda-v11-2.9.1.patch 55009 SHA256 611283a932577944bcdde36e5fe1a80ca750a0a66eb5f3490666e2adafd2bf84 SHA512 ce34b533c2f50cf714d8bd51791c3e30ba91f49861e3c1dcfb08d21d2d38be970b3e3040c7e224142d085c7b11b6b14bfa230844e21daa2eb0bf59641dcc29b9 WHIRLPOOL 0668cafec5678d09504220e31ce60344fc0cb46cfec449db2aade89ee09c598484012c5ef0536a0dfea24df51c6bc86d1a9e491f136312afdab90725e5efe86e
-EBUILD postfix-2.10_pre20121022.ebuild 9649 SHA256 6ee462e394873ca60301cb0c551251b3acc1bf3e401560e2ee621cfa9d70e754 SHA512 792e53548f43b7b5a3b57ae3218f6ddc048b92890a34f3d9ffe98b2ef4ef20f100b47073d2d47950127c064c483cf31c15c522f63da514edc60fdd1ab2773481 WHIRLPOOL 71d1219a9a925c67839379ca014326eef466ea2725db5f0aab301803a5c4544c1e8e94d74181e8fed2a3ae9aa741ee74f8011c0df4563a4c756662be9b419fa6
+EBUILD postfix-2.10_pre20121022.ebuild 10436 SHA256 ef794cee245074beb9af3967a5e21752c4abfed2e8ac27f66d5268eef9725576 SHA512 d8a48a6b202a2c039481d9b77d68b9a76a3624aa6a340ec014c025348a04ebdef42be8dc7f0264b5ac9ff0220501fd3fbf46c1b500c2b41fd1dd99e72d84d936 WHIRLPOOL 4673d401a4ba910ae4fb8e856664396dfb201e263abf7847da8c22a872239728e14fabf2dd6946f426d146120ea14038693afd0cbda9a5dfc23e9ee1bdf49695
 EBUILD postfix-2.8.12.ebuild 8431 SHA256 c9d9c2b0d69bbb8a6082c4563db5e55da7520dfb377f8b16ce1edd67112dc9e8 SHA512 1a47f9aac55fd913eaf8bd443768b7b5c4bcb30cdee31ce1643a1821c33f700b1fb574e0f4632b6061d7d52099b04ea3b9db4e4262433cde225d06f6e5c5cb4b WHIRLPOOL d1f7ab5837f4d88ea6a3d6db58ae7522f0010059815424216817f425f5d120bf622328d5df157d49b68cdc8f97fbf436ef33cf96792d21905a96908319d20b55
 EBUILD postfix-2.8.9.ebuild 8423 SHA256 f9bf38dbeb5b50c4d19e80bdd4ca10c2e7d1933256dee24e871c1754ec4b56b3 SHA512 0430e97b8bd00aad292f5862de14376ad21c6056a3866c81b33c5d41b59a285b99122f6515f343a0addad83d5c68e72a0626b707acbb885e72d48bec8b804a28 WHIRLPOOL 012caabe54c65cca9d436acfddcf716d49eea2a24435e3a0a6b0d939669e2a994e37ae7ba2fbb7a4a0947348c6b20ab773d3c40ce160d1da5e7de025235f10b8
 EBUILD postfix-2.9.4.ebuild 9624 SHA256 b6fc79a6c61f91125905573759132360dad6758f4b4d10700fd924ef2f43601f SHA512 ab57540f8e8bbccac0fc878a09a1205e451f690426d2901bdf4d7aa88d2f1c4e370842defc6af4fd58f0bb17943e2ceb15c1c4dfa09d1bcd7f4fa8b84db07c23 WHIRLPOOL 6beb5751204ac8810034b901840f4341fa71e11ee4bca846e90cb7a12019c5bc52292f1d642d3c917cc7b253f93fe907f4c8226a9eb6a51a233f5214a20c978c
-MISC ChangeLog 87494 SHA256 7a7bb9d49fbfc81389489de84369c8f3c1bb60034db618babf4196e4a6b8f60e SHA512 51390f6f9d1270517798c062b3fec940676006f17613343e4d768077a19fcb67a56b5b704457147fb356f2a54ec51998ed98813e3e68d709449935f4f1f37f49 WHIRLPOOL 6f4c840b3494facc45f8e7e0f473bd632a5511a64bb681650d65aaf0c123708466b87da7fd6600be91f31953cf6a744cf5c739ef6ac093c7cbd4267244a22bb2
+MISC ChangeLog 87622 SHA256 3ac56caf0dca2c1e3a64d1768aaadd28f6c8f3409a02aa2c095c341929610054 SHA512 a8debf308f1bbd247beb64a576b7b16a311fabf340cc651ef6ba85426cd259271afa2a98de5bbbded10aaed36e1c92d199c8a329c0fc0ab4cd6d6ebcd4939167 WHIRLPOOL 8e50e254f0a254f31427329c7d773f28c20861a2a7f0dd05ba66050242b2dffa6391f8a1d1a301e965a895cf2eae13915230c106138c6c04137237e09d941f2b
 MISC metadata.xml 610 SHA256 00b7ef524664b20a9df7642573745b1d17b0b51f005ffd150ac6dccba38dee88 SHA512 fd446f288b11070e2d6b5dad3ec259a889508c3c7f4755ea2ceda18500844e065ddc2bbce5f4108b30ebacff76443ea8a23805c21d39c2bf72210f801adcfe06 WHIRLPOOL 815ae4ddbaca96871454d44adbe3bec4a081d857c61b07cd0e382ce0d44503421a4ad156da6009cc91f24855b7c1d8adfe3fbd48c82833f9d82c1afaf798072e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQkCzGAAoJEHfx8XVYajsfa/MP/0vgD+k2G6qQ1mZNRfRE25Dk
-zhLK693JLLJ7V+Mk4t0FR1pmSfoaP6Hs3MxJL/4aqBHKWtvxlHqSbyKZVHu1onz4
-GyB72ZFAsQ3TFpr2cR8FE73gdBEBN8NfCOYczXfTS2l13+YWa99xql6GQONGjB3o
-cEHPZdSE/rEsFlG1ZdVryO0EHHOR04+At8AhoxSoguZzWSdaBzMyyzJeJiGYxVdT
-PNDv5HAnoc1+MR25DBsZb6rDooC2EjQHapsP0af9Iebu+OspmSP7wcAVKwegb0Sb
-2UkBvrI10Q6hiVj1mQIJdgjDk9BDwdi0GEGIf+6u6FDY7lHViGeh2g+mykFZUD2S
-Zggxq2qRAkeL6cJaQHt3CSOzbUZgP8OLp/6RPPIpTArdIt7b1Q2hyPUColmcjNyY
-RoT9xEhYUzjaOct8/tBjk832dbdXMTt43zLavD33EVG/II4CBKS/GPKHdl3XUDEI
-SlhvMAoIrFDVm4JiNY3uz5Kxt4NMsvidreVz8zujasFJLkIAjMOQLCl4z0hXyJ5a
-IAuPNum8nQXau5RMT8g/Oy8OtVPPHbkZ+JywYmUS2Q+x2x6JeJ7R6IUtamtapsuN
-kGx9PzoRgwPKOcE2EMoFLJGWS8pHNV9wYB06WXw+rbCPWSLDXTxSJDc8dse/xpIX
-Din3OkdhjO3NGJFFV5oA
-=cfr/
+iQIcBAEBCAAGBQJQk+MiAAoJEHfx8XVYajsfJcQQAIDPYpv7Nd2+KXKMuWEq4jfQ
+olEncrXcRr1ZjuJ5PcEvcQv3KiT/tvG8AFk8U7vxBcLqM4ZnGTGNImyfLOsKg7WY
+lZ0QeXTo3eIBDv3DeFKu/B+QaEkMsRZpgi8gh//iHnTxgQu6l63KI20juW8BfvYZ
+x4oY0+lN0yQcRyv2qaft50XXftG+3MQSHyY2Ts/PyhN+zccGpK3CrZE0aBJHNAvz
+VQOp/ypayTghhFvZbuqk+E44YSlpP+Zfg36zMeWrJLbt+ZLgKHs79aTXIyT9JYyB
+DUre2pgkJdpGh19uRWQyaaSSIbVXEpgxDNepNwqjzOtejtRQGD+NG6rXeHiDBYvs
+KdAthdC+PESfOjFGuBbxpwCWh7t4OEXgPYCIUuTP39Izinf7mNNKtRd27jjbivJu
+04X9gA9j7sGHociyuA8Z4K7kLWQ7ZU3180Kenc16Upz5AUKfLIScGWMcVU3Q5sWI
+XX7BpAHzzQ3aOW5y+ByPZnjldkHYAUQq9mzVyrm3hNG3YSrLoiBxIn0B2GiQzSq8
+YwN15FS32YTQWLPY9n4b9dTengo2bfPiyTD+NOCaz9dQ0Ez2jAknjTNCxc2kC9TQ
+HXOHhZ+lZBdIRbAOurIKj8JBO2QFvpz2SnuZNI3J5b4p3bKkhuJUVkoJIkHAcMr/
+IEG89DRgvQF9rQFp7Xcw
+=9l7g
 -----END PGP SIGNATURE-----
diff --git a/mail-mta/postfix/postfix-2.10_pre20121022.ebuild b/mail-mta/postfix/postfix-2.10_pre20121022.ebuild
index 9922c7d9d7a0..7f6ff72764be 100644
--- a/mail-mta/postfix/postfix-2.10_pre20121022.ebuild
+++ b/mail-mta/postfix/postfix-2.10_pre20121022.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/postfix-2.10_pre20121022.ebuild,v 1.1 2012/10/23 07:44:28 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/postfix-2.10_pre20121022.ebuild,v 1.2 2012/11/02 15:13:27 eras Exp $
 
 EAPI=4
 inherit eutils multilib ssl-cert toolchain-funcs flag-o-matic pam user versionator
@@ -262,6 +262,7 @@ src_install () {
 }
 
 pkg_preinst() {
+	# Postfix 2.9.
 	# default for inet_protocols changed from ipv4 to all in postfix-2.9.
 	# check inet_protocols setting in main.cf and modify if necessary to prevent
 	# performance loss with useless DNS lookups and useless connection attempts.
@@ -278,6 +279,22 @@ pkg_preinst() {
 		fi
 	fi
 	}
+
+	# Postfix 2.10.
+	# Safety net for incompatible changes due to the introduction
+	# of the smtpd_relay_restrictions feature to separate the
+	# mail relay policy from the spam blocking policy.
+	[[ -d ${ROOT}/etc/postfix ]] && {
+	if [[ ! -n "$(${D}/usr/sbin/postconf -c ${ROOT}/etc/postfix -n smtpd_relay_restrictions)" ]];
+	then
+		local myconf="smtpd_relay_restrictions=permit_mynetworks,permit_sasl_authenticated,defer_unauth_destination"
+		ewarn "\nCOMPATIBILITY: adding smtpd_relay_restrictions to main.cf"
+		ewarn "to prevent inbound mail from unexpectedly bouncing."
+		ewarn "Specify an empty smtpd_relay_restrictions value to keep using"
+		ewarn "smtpd_recipient_restrictions as before.\n"
+		"${D}"/usr/sbin/postconf -c "${D}"/etc/postfix -e ${myconf} || die
+	fi
+	}
 }
 
 pkg_postinst() {