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

(Portage version: 2.1.10.4/cvs/Linux x86_64)

3 files changed, 35 insertions, 4 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/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}