add checking to start() in init script

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

3 files changed, 100 insertions, 15 deletions

diff --git a/mail-mta/postfix/ChangeLog b/mail-mta/postfix/ChangeLog
index bbea67da3e74..f3e9e5bfe0db 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.341 2012/03/06 13:12:55 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/ChangeLog,v 1.342 2012/03/06 15:03:53 eras Exp $
+
+  06 Mar 2012; Eray Aslan <eras@gentoo.org> +files/postfix.rc6.2.7:
+  add checking to start() in init script
 
 *postfix-2.10_pre20120305 (06 Mar 2012)
 *postfix-2.8.9 (06 Mar 2012)
diff --git a/mail-mta/postfix/Manifest b/mail-mta/postfix/Manifest
index 5c36ab0921db..cf166ed7079d 100644
--- a/mail-mta/postfix/Manifest
+++ b/mail-mta/postfix/Manifest
@@ -3,6 +3,7 @@ Hash: SHA256
 
 AUX postfix.rc6.2.5 1424 RMD160 c0026032a5a807c19431b1381df48dab14469796 SHA1 3aae6fdb80488398442237b2a8a581e4da448e0d SHA256 f5ab48b469db3f62a5e5ccc15e5cfa6e0ace97d2c2bc66af334d105b0dfa7d31
 AUX postfix.rc6.2.6 1996 RMD160 a7936897d1b8249e3fc0da2426afcbbe25bbe0ce SHA1 34e7d5899649b932808551f4d08517b4c1dcceca SHA256 2beed4cf54d6634620bd44ce6337912a7dfaeada1fd03c04f37f777628a5c9bf
+AUX postfix.rc6.2.7 2183 RMD160 3198e8e96ab6492406cb4556c1acd2607ad2786a SHA1 e50836dd19456d2f4a9bd1bc1d571d4696e2dfc9 SHA256 6eabad8e665985a745e651409cb4cb2920e08b9327a8544266646c35f3ec0e90
 AUX postfix_no-berkdb.patch 2729 RMD160 2e80e5c446b58afe8cda35991ac3af5f3db3f7eb SHA1 8c6d8695bf347769f957a79f3320fcff8d844315 SHA256 c21e9582346c913b3033ec6d3567d0b0bd3576ad64052fed48a5cf78d7ad92fc
 AUX smtp.pass 141 RMD160 799433a4ee9e9e32f20aa2d31f85f33faa2bc7e6 SHA1 e1d75aa259fa07b257a617e056662aecfd19957f SHA256 c9b3b56a8df2367cc15bc43a70304fac7ebdd7697e1d450d1bcb4bfdd3e078e9
 AUX smtp.sasl 147 RMD160 8565ca413ec1a9e369be227643d3610124b34566 SHA1 565035b230d4997a207d146609336dfe643c6ed3 SHA256 0ef6a2a7846498f56b9a8879f561a51c1e3a203ba90b2991d499afa69fd85629
@@ -42,22 +43,22 @@ EBUILD postfix-2.8.9.ebuild 8433 RMD160 1c2edff066c7f7004bc49b9ef3e042fc9b422dfa
 EBUILD postfix-2.9.0-r1.ebuild 9557 RMD160 97300e05fc507d1b90146f2c6cb1f45f2c7bc5db SHA1 df1669c2af777951a244dbb7f60f36f529ee169f SHA256 21b0fdad4a7a065e20dd39bd2b75bfc4da2c066bd76558a304fd2114ed4c81a7
 EBUILD postfix-2.9.0.ebuild 9554 RMD160 6077663c5d24ee7b97069befd5e37833e8f10f9a SHA1 41777f9b4f2120c6f99ab0ea26866f65c1321e14 SHA256 a5f517184ac04843bf5c09fc4a76d8b8ecde981b6af463f598a48262bc86bced
 EBUILD postfix-2.9.1.ebuild 9483 RMD160 e7a7abdcd7d31603b1e4d298a10d368cd7b708fb SHA1 ddce969d04456765884478e255d0157e9963046f SHA256 4403a43db499e7dff8c6faf9df62e042a323a7aeaf6ba2c7d3f3f19e99863f84
-MISC ChangeLog 78405 RMD160 61d1cfd85b3ef7ac866e049f47014dfa5b8fc83f SHA1 3ad07292fd258e4ac2e4e59619e776172ce65088 SHA256 47386bfce4ee92caac6aa12ecc048331cd10af72a327914d15d5ee8833477603
+MISC ChangeLog 78515 RMD160 9deed6dc586d5e1ebf2c51e97a9c3cf0c92a16b8 SHA1 aed66f18a70727804576cd3795203fd9b6dc4ba9 SHA256 6feb5d61da015d96d9d11ca824a632349e1958fff8f85e146e98e296837cb64c
 MISC metadata.xml 610 RMD160 095d8cd529350f58c64d6d2eb40e8534d3dddfae SHA1 d53048933e7490f3f342ccf8972c191ee8030ccd SHA256 00b7ef524664b20a9df7642573745b1d17b0b51f005ffd150ac6dccba38dee88
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBCAAGBQJPVg1mAAoJEHfx8XVYajsftIoP/2uU8j45rlsUqhsAAYUu+rRA
-RT3PEQrzK03u5Au76/M2hOv4yMz33X/jahMqqooFkeEXWQT+2eap/H7LMr9Mi5kA
-swStxtMyc+/e8SMEqUzii1sESvotSsMRzweLynM9D6XfjsFT6vqWygNr1I0k5bSx
-5gSoaNTI19RQL1dnzlQb2LfCtHD+Aw8Ntgy0uCM5eGx0f7G/NBPsWt0hnkVLpOEA
-wK3sFSfggtB6OGTdn8yQWu3frY19kOZiRBGgIxG+sEkrPgiMUairmxpxAkEcDk/p
-M8JlBiQou6bEwFPjCa8SKI6hDkrRv/CS/GGU5Zgiit1g1mnH9vEPux3Or1cJku+R
-MvNt3rfQ/k6L2XPcrMctkr3pcUiZSTciEqR55Z5PFIbr0TLEAOlNKQzEq4Rrb6V7
-Hw896IrSixTgUVtdOuYLSvQ22y+ephgPAiVb/dc/CN5parUYXuAcHCPgEURXW7db
-BJw5zvkMeVaj5urzjrN8H8hRFTnfo9F0DtSD6+GTg87WtPDtUd4GFmGsxt8nj7kH
-yo4hVUVISuxvMAqhhSWNJznTdFVr2buQTFfC6KpN0v88dvwWHMTYVFHjDgPYOjYH
-6xyedxjhUcSoQstb7Nd5BLme54uAW7tv51D8/Dgwo9ZyEOKHMeRvvhBHzbhaKyF4
-WTys7r0yOkWyIPGHVJDC
-=eXQ5
+iQIcBAEBCAAGBQJPVideAAoJEHfx8XVYajsfmIcQAKIXzSpecil0tQhqu8R4D3mf
+iMOzD+bMbTxGHIPloA70w7WnrEgjm8WNsiRyCfOe+F9O8LrLOcpc1B1E/fF0OF+l
+5W5MGwF6plO932hmd2fjhfVBTZQN89P4WogEO9XUnbiFDoZvgm2OAk5yoP/6CMYz
+6q06VXRAzlpRRxc0/4TbXkzoxyyJeHKZWb6TH620NNSb0xtkgtJv0wUht52cwCYc
+iAqe0yponSw94v1kowNvGFCL59XAxfwxIhIeOo4dsAHcIOFDUIvj2WPlcujf69o7
+V/XPjMkcRXntH6HoAd1Uq2eE82h/07UvuBJxc0Xn1MrfkV+ZPWxEmV1OoZ4a8nqu
+vhpLdi6BUozPG8gjvK+AkHdmxAqDE8Am88/HhGDUIutzqLUgtZL0TZ5JjM9qI3EJ
+lj7ni5TD6lnF8Ag5R9af1KX1SfVFeW1IMVk2mbBOtIJE4hopxmSxACLLy3B/5kZ/
+zbD62BC6xuPM95D6fFP+8Vxb9vijVukgH1RDoXTPueOvnE84yOtJq04Fcuqa377K
+G2c+/pNDi6lpZEc3wf6DT1Rb0PO77eoSTdLJpDODkWFGgLZz0YPyM6aDkKI3x/tt
+F/0z01XeFpKNea3YWN5ZL0VlfsO8+N08PEQNcyxY0PTroAoE1I8jMdH4pVIngBPO
+reVWpoYv3nK2G7n4K/PP
+=faYl
 -----END PGP SIGNATURE-----
diff --git a/mail-mta/postfix/files/postfix.rc6.2.7 b/mail-mta/postfix/files/postfix.rc6.2.7
new file mode 100644
index 000000000000..151617360e6b
--- /dev/null
+++ b/mail-mta/postfix/files/postfix.rc6.2.7
@@ -0,0 +1,81 @@
+#!/sbin/runscript
+# Copyright 1999-2012 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.7,v 1.1 2012/03/06 15:03:53 eras Exp $
+
+# Please read http://www.postfix.org/MULTI_INSTANCE_README.html for multi instance support
+
+CONF_DIR="/etc/postfix"
+CONF_OPT="${SVCNAME##*.}"
+if [ -n ${CONF_OPT} -a ${SVCNAME} != "postfix" ]; then
+	CONF_DIR="${CONF_DIR}.${CONF_OPT}"
+fi
+if [ "${CONF_DIR}" = "/etc/postfix" ]; then
+	CONF_PARAM=""
+	CONF_MESSAGE=""
+else
+	CONF_PARAM="-c ${CONF_DIR}"
+	CONF_MESSAGE="(${CONF_DIR})"
+fi
+
+extra_started_commands="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
+	if [ "${SVCNAME}" = "postfix" ]; then
+		provide mta
+	fi
+}
+
+start() {
+	local _retval
+	if [ ! -z "${CONF_PARAM}" ]; then
+		einfo "Please consider updating your config for postmulti support."
+	fi
+	ebegin "Starting postfix ${CONF_MESSAGE}"
+	if [ ! -d ${CONF_DIR} ]; then
+		eend 1 "${CONF_DIR} does not exist"
+		return 1
+	fi
+	/usr/sbin/postfix ${CONF_PARAM} start >/dev/null 2>&1
+	_retval=$?
+	# check that master started correctly
+	if [ "${_retval}" ]; then
+		sleep 1
+		/usr/sbin/postfix ${CONF_PARAM} status >/dev/null 2>&1
+		_retval=$?
+	fi
+	eend "${_retval}"
+}
+
+stop() {
+	ebegin "Stopping postfix ${CONF_MESSAGE}"
+	/usr/sbin/postfix ${CONF_PARAM} stop >/dev/null 2>&1
+	eend $?
+}
+
+reload() {
+	ebegin "Reloading postfix ${CONF_MESSAGE}"
+	/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 $?
+}