Version bump. Add header files - bug #173103. Add abort flush commands to init script thanks to Steve Dibb - bug #369915

Package-Manager: portage-2.1.10.4/cvs/Linux x86_64

4 files changed, 52 insertions, 21 deletions

diff --git a/mail-mta/postfix/ChangeLog b/mail-mta/postfix/ChangeLog
index f56d87471ec9..198a090d14c2 100644
--- a/mail-mta/postfix/ChangeLog
+++ b/mail-mta/postfix/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for mail-mta/postfix
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/ChangeLog,v 1.270 2011/07/07 12:46:09 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/ChangeLog,v 1.271 2011/07/07 14:11:36 eras Exp $
+
+*postfix-2.9_pre20110706 (07 Jul 2011)
+
+  07 Jul 2011; Eray Aslan <eras@gentoo.org> -postfix-2.9_pre20110615.ebuild,
+  +postfix-2.9_pre20110706.ebuild, files/postfix.rc6.2.6:
+  Version bump. Add header files - bug #173103. Add abort flush commands to
+  init script thanks to Steve Dibb - bug #369915
 
 *postfix-2.8.4 (07 Jul 2011)
 
diff --git a/mail-mta/postfix/Manifest b/mail-mta/postfix/Manifest
index 3efaa7787fe6..01b3ff79bcc5 100644
--- a/mail-mta/postfix/Manifest
+++ b/mail-mta/postfix/Manifest
@@ -2,13 +2,13 @@
 Hash: SHA256
 
 AUX postfix.rc6.2.5 1415 RMD160 9d9b7240b1bfb7bcf53d6914dfc5aea2b150572e SHA1 ba08faaa70311605d2b869519ce876c71ce47a5d SHA256 11f79d4a84acfe0c34ebba11b6d1afde9c6dffcf44e8aba8dc895d4fcd0adcac
-AUX postfix.rc6.2.6 1336 RMD160 188b402a1d025a95e13ac2dfbf446dcb49d286ff SHA1 03dde5808a99b11b06eb5f0bdec3e804e9afbcb5 SHA256 b04c4cfd34faddae3ce354000f59b29b7629c290076c5762c560830d079d7495
+AUX postfix.rc6.2.6 1986 RMD160 ee719591ed30692c6180947be104573dfad3f2b6 SHA1 2c3d88de3a34b35ad02b436d1b29fe18472e2ab9 SHA256 8230343cfa156603a7f4360238c80f29dec800bbaf693e4beba4ca441e96f35d
 AUX smtp.pass 141 RMD160 799433a4ee9e9e32f20aa2d31f85f33faa2bc7e6 SHA1 e1d75aa259fa07b257a617e056662aecfd19957f SHA256 c9b3b56a8df2367cc15bc43a70304fac7ebdd7697e1d450d1bcb4bfdd3e078e9
 AUX smtp.sasl 147 RMD160 8565ca413ec1a9e369be227643d3610124b34566 SHA1 565035b230d4997a207d146609336dfe643c6ed3 SHA256 0ef6a2a7846498f56b9a8879f561a51c1e3a203ba90b2991d499afa69fd85629
 DIST postfix-2.7.4.tar.gz 3423968 RMD160 4f3e0db43c55cd50b3fb4493dbc698ff3f343294 SHA1 c755ceb3a5ee983f3b72f08e1fffb6384b1f1865 SHA256 9bad5851e8a7c97890ee9465e7f675f7826d56361369d3e792a79eaf98ed2b11
 DIST postfix-2.8.3.tar.gz 3645105 RMD160 9312cb25c352cc3613efed48e0a3b83f7f5fcba5 SHA1 2604066f158f5327449960afd6334b996dc01799 SHA256 288267caede6ea1c4f155855395aa957998909a4968af431b8057062f7d60b49
 DIST postfix-2.8.4.tar.gz 3646391 RMD160 fbeb785c5ed08febf5cf71ea375b10120c1f62b6 SHA1 48d077ad2614098f39411cb965a74d8ce2f3e5be SHA256 979a85b06de1a85be121bfb685e590da9a1441b08b16a89a5e4abc7f1de29df5
-DIST postfix-2.9-20110615.tar.gz 3672939 RMD160 9fecedf7d0d8b463f947fd410a81e619d2903340 SHA1 0fbad72ddb14b78f0b8966cf9b68196bde7a7aea SHA256 004adf5de5835990471bbe865a1a0818d2f319cc8c1c69817bd6e6eb52a1bc59
+DIST postfix-2.9-20110706.tar.gz 3674088 RMD160 8274dc83820bff75b119a6b8e718a34f14c67805 SHA1 78d7e545baa6df3768b563f7e524b97c5f9f2e04 SHA256 5ccd159418ddd84f71f53713af77e08b8d85051603c0824f6474450525b6a66a
 DIST postfix-vda-2.7.2.patch 59667 RMD160 ebec1fa4a4c6b3c0160407b09aacf8357c936148 SHA1 ac712922f45856965118fa7b8551ece1ccb524db SHA256 f9b12376983833ef9305f7696e9792b62058f242ff2630aeb0866cf686f0a14b
 DIST postfix-vda-v10-2.8.1.patch 56777 RMD160 42f6351d645cc7a211aea86cc35e1f3b10b50da1 SHA1 6b36480be036e7b7aa834fd904a2aa57c537cd40 SHA256 13ca7430b68dc19e21ee26c1c1109e1527a656777fa2f224cd3ce2d594435f12
 DIST postfix-vda-v10-2.8.3.patch 56777 RMD160 ce30005d590d884c589612e65dbd34cbdbf84a31 SHA1 c27217b9af33c86a44bbb4469b7ebd4203210f7a SHA256 02599bdf16e7d77fe6043d1dac972daecdd40c4b2758579200d6ccb11e83acaa
@@ -17,23 +17,23 @@ EBUILD postfix-2.8.3-r1.ebuild 8229 RMD160 182de16ddfcc2f8308f849cdba1a64f9c7c0d
 EBUILD postfix-2.8.3-r2.ebuild 8445 RMD160 a0fd6a75eaa571d162662b641a86261b3de9a34f SHA1 53fef3095f829120a136a5a44d05f20046c6fbd8 SHA256 86f91c5cc536934e719ccf761968fd5e932cb3fa6ccc1df1efd2fbd9b5a7a217
 EBUILD postfix-2.8.3.ebuild 7681 RMD160 f5fa99dfa15825b35c200135ee2cb9a2456d0f7a SHA1 8f40aa5b50310f23f6eaa061e189fd1c8ac9540e SHA256 b118a70662931db7ead44b663cdba2750520e6c37552ab4c3dc126df392e1cd4
 EBUILD postfix-2.8.4.ebuild 8397 RMD160 562419f63388401030a67115e50e9c4747674090 SHA1 217bde0cdf4148a2c84af6349138dbcf57a3585b SHA256 1b3d541839f4fa727ae69e320ef785c103f2f3e1fb40b840a641343e2bece415
-EBUILD postfix-2.9_pre20110615.ebuild 8725 RMD160 1c88c0ae1d3077df21bb9468e6012dd368058956 SHA1 f867fb6047c7ad9bd335c42501baf50fc44cbe3d SHA256 04615a4e8a9d82d40b5f7690fcf0cafe4045a50fb22244144f149bf71f009a65
-MISC ChangeLog 66824 RMD160 c2d03ae2fd77d3ae5ceed734bbf877f0cf914f7b SHA1 ec6a60e2e7e5bba79ead4ed116930a67602d996c SHA256 878191eadef411bd46ee3c363b6623f362835fd78d9d067fd2d96e403b1ab391
+EBUILD postfix-2.9_pre20110706.ebuild 8791 RMD160 a8a2903b965637cb3e7c0c4cf4069fcbb477198b SHA1 2fd033b81b04a06c05ec1e4cfa48f3fd2d1fdb99 SHA256 c7f779ce81ed535a2f106c17eeb5a91d83533d39c210907080959e4efc918868
+MISC ChangeLog 67125 RMD160 c770e4e65fc6d862d7724aa6010d9f21847cb436 SHA1 25f243af94995d2d75b7444590938c87ebbe1fd4 SHA256 d836bbb39fee041fe5ab7a445aa8844da2389faa014a614e8799711bddb61872
 MISC metadata.xml 501 RMD160 faf5708865464f36ec686bb58b2474e2a5a1fb53 SHA1 f5d83c47e3edc4a6c337d4bb905eb4917dc0d417 SHA256 7a46203782ad8363c75a53faa35a434e20f879a7f23f624388ce248ea8bb55a0
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCAAGBQJOFaqeAAoJEHfx8XVYajsfrxMP/iLU96WD7w642mvVi7w2cJvH
-ND5FRs+Bl/5xi54iBEzv4xslLBwkzJlZQwWtxRid4UlYLgTxKANQbnn8RbviSIlh
-RNvJ/5I0BNpHuRHmM+wlUwOMhNWmLsDBptxrssh2GHVoV9/xOQosVgna/kqwSozC
-6EXh1k67doezJ+nFMCEoEnbmB+o+Skz3leyAJqgjOku9KyDFZfJiDe1oP0jHw4+Z
-+s7HUFKukyXB6QWdJoGZXSl9ZMRWWBq1xcU12zkOYBsBFxws+JoyNjkY30SuuUzM
-aAJg/0XUwXyCawkOhjkzL6K7MIIK2Irhd253slMmzXXnRwYbIl0y0F7iIFeOLXvI
-gTvLmF7lNSpUroVycqcv3j2gKiOiGxxfi61zVRoEQ0iMiHz1Z1pxZEYeriKqYbn3
-BDCUxXARTZSh1I/Aer61yChod+c99NN8lNTUHI6dzyYYWcZ7ZvIF9cyPP8FrQA9M
-+2gZTjDe+IcNc8reeXo69EWEu1i4+8gClirW8hz3zGFOkRC9b4CORR4f1b2QyziN
-Jh2MtvZXMM3YoAowt13hQXNhoSYICg6AtqPojO55vDrsgh0DOYo1zpGLPFVZr97l
-E4H6lOZkKGVREbQfTJxzrhDuRCzZbD/lLeQk5gimGA2EMhJOvixc0iSkkoWTfuqp
-QiqkoNA5HRkXEL7Elaqh
-=Umqk
+iQIcBAEBCAAGBQJOFb6lAAoJEHfx8XVYajsf1H0P/iXdjYJf+g3UaSN6vrfxYtXL
+3+o3UWeE+/1iEk5dUpopd2faSABWNoaJDgezhPnR83Qbm5HEoaNNhS0l0QvLJDgq
+2dipKZ1OrTFVDJfWbnl9pL65puSIRXGFG7o5ICPXwQoT9LztgGCZEqfcAcBlmzXN
+jEVHSmLFzP6aO7bIrlvyNMdirKQe0GQpNGv88jr56AbGBlosC9t9hW5Muc0fUtIn
+qvYCXHPKIen1LnvooO/gYsCPZZ+e76KjlYyv6TXP7GtpTU6TquRvq+ZYQAadnOAd
+s4JbLaFBHXte5uT0Zv6fhs2lCXEKOuM9Re9+7ftN67g88FziFkSm56ZkNCrZCX5N
+Q5egYKpgd6cxVrYOqiTSF7thv8atlgCc6XFv/k1sM4EuZrJRZb8ZoXpAQ5zhA9I5
+DcInrgyHlDdzBdiBu+DfPlRnp88Jcr2+Qrrcs/8lPW4wcaCBTME1WG4RYOAS3QBR
+tb1clIOaTXHaE4IDvJAkQQky4VtkkUeEwH+YxvnyFM1UbjKllGv2hbftBbkEdADe
+V2ZLi4tqFewiszW/Ukau73oIZb+uenwtivQ2foSAAz25sTbmO4dMUi+tvGa2eLaO
+eL0b/RIcFlOCNGQWI86uPk8ey5CbuMKQmeUjISBCr/M/ZO39pbdq3qyPOwGYwG3Y
++wAapYC1QHXFpDwbQEPm
+=dQ+j
 -----END PGP SIGNATURE-----
diff --git a/mail-mta/postfix/files/postfix.rc6.2.6 b/mail-mta/postfix/files/postfix.rc6.2.6
index 9e7fbc56d1cd..b500f0c86dca 100644
--- a/mail-mta/postfix/files/postfix.rc6.2.6
+++ b/mail-mta/postfix/files/postfix.rc6.2.6
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/files/postfix.rc6.2.6,v 1.1 2011/06/15 10:24:58 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/files/postfix.rc6.2.6,v 1.2 2011/07/07 14:11:36 eras Exp $
 
 # Please read http://www.postfix.org/MULTI_INSTANCE_README.html for multi instance support
 
@@ -18,7 +18,11 @@ else
 	CONF_MESSAGE="(${CONF_DIR})"
 fi
 
-opts="${opts} reload"
+opts="${opts} reload abort flush"
+
+description_reload="Re-read configuration files. Running processes terminate at their earliest convenience."
+description_abort="Stop the Postfix mail system abruptly. Running processes are signaled to stop immediately."
+description_flush="Force delivery: attempt to deliver every message in the deferred mail queue."
 
 depend() {
 	use logger dns ypbind amavisd antivirus postfix_greylist net saslauthd
@@ -51,3 +55,19 @@ reload() {
 	/usr/sbin/postfix ${CONF_PARAM} reload >/dev/null 2>&1
 	eend $?
 }
+
+abort() {
+	ebegin "Aborting postfix ${CONF_MESSAGE}"
+
+	if service_started "${SVCNAME}"; then
+		mark_service_stopped "${SVCNAME}"
+	fi
+	/usr/sbin/postfix ${CONF_PARAM} abort >/dev/null 2>&1
+	eend $?
+}
+
+flush() {
+	ebegin "Flushing postfix ${CONF_MESSAGE}"
+	/usr/sbin/postfix ${CONF_PARAM} flush >/dev/null 2>&1
+	eend $?
+}
diff --git a/mail-mta/postfix/postfix-2.9_pre20110615.ebuild b/mail-mta/postfix/postfix-2.9_pre20110706.ebuild
index 81e7e2e7098a..5e4a57f70d93 100644
--- a/mail-mta/postfix/postfix-2.9_pre20110615.ebuild
+++ b/mail-mta/postfix/postfix-2.9_pre20110706.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/postfix-2.9_pre20110615.ebuild,v 1.1 2011/06/16 06:12:53 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/postfix-2.9_pre20110706.ebuild,v 1.1 2011/07/07 14:11:36 eras Exp $
 
 EAPI=4
 
@@ -250,6 +250,10 @@ src_install () {
 		newins "${FILESDIR}"/smtp.sasl smtpd.conf
 	fi
 
+	# header files
+	insinto /usr/include/postfix
+	doins include/*.h
+
 	# Remove unnecessary files
 	rm -f "${D}"/etc/postfix/{*LICENSE,access,aliases,canonical,generic}
 	rm -f "${D}"/etc/postfix/{header_checks,relocated,transport,virtual}