Force pidfile usage (#291651).

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

3 files changed, 24 insertions, 25 deletions

diff --git a/mail-filter/sid-milter/ChangeLog b/mail-filter/sid-milter/ChangeLog
index 491d98204ce7..facfdfc783cf 100644
--- a/mail-filter/sid-milter/ChangeLog
+++ b/mail-filter/sid-milter/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for mail-filter/sid-milter
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/sid-milter/ChangeLog,v 1.15 2009/12/05 06:49:37 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/sid-milter/ChangeLog,v 1.16 2009/12/12 10:53:15 mrness Exp $
+
+  12 Dec 2009; Alin Năstac <mrness@gentoo.org> files/sid-filter.init:
+  Force pidfile usage (#291651).
 
 *sid-milter-1.0.0-r4 (05 Dec 2009)
 
diff --git a/mail-filter/sid-milter/Manifest b/mail-filter/sid-milter/Manifest
index 504e50aaa101..c228d03e1380 100644
--- a/mail-filter/sid-milter/Manifest
+++ b/mail-filter/sid-milter/Manifest
@@ -3,17 +3,17 @@ Hash: SHA1
 
 AUX gentoo-config.m4 197 RMD160 f8ea32f01eefd71de2a6fe36fc6bd084735ac8eb SHA1 c26236132574f782a3c2df187c52372ec854927c SHA256 e704faeab661553c2bb886f9486693681f07d3581d8d8b8eb287faf621c23738
 AUX sid-filter.conf 226 RMD160 c2743152e4dc29f4d3df046e122acfe9e89fb99a SHA1 fc251d7534dabaf3923e11ad1710718c23730efa SHA256 9c887c16afecfce014ab64a4747fd6c643f7b570f5d506740401d61872ae5249
-AUX sid-filter.init 1474 RMD160 e20f796d3419e1e5048d8889b010bfee1270de2b SHA1 76ef173535641bc461acff38933a1941a96f3556 SHA256 53c692f6c15cd934829f58d53382cf1eecacd441d597a3dfc03c4f68ab3654d0
+AUX sid-filter.init 1386 RMD160 570de2aebb54444abea1e5b58bd074719e733b38 SHA1 0c5e74f2bc068151c60f9a5a7e28b950fb64eca8 SHA256 a96e39cd0d931af6694dc1e5074db94e6d791f602062f38a2052a3a94c537409
 AUX sid-milter-1.0.0-as-needed.patch 1213 RMD160 d846aaa04a390d5b7ee6e7a342f7b94d365679b0 SHA1 f864e9135880dd4c675d2ff35e99c6825b91dff6 SHA256 8c77f7be8f99d69e75eced9aa8880acb0ada60aec7186bc2d48b823855b902a0
 AUX sid-milter-1.0.0-nopra_on_spf1.patch 1777 RMD160 2b87e1759a806ef6f8b09dbbc99d51dc663a80be SHA1 b54ed8bc77cbbeb83af13d7e322c011dfe66fc17 SHA256 2a01bb115496583682e1e6f78370acc267c7e45067bb4dd91daa90dbf7107942
 DIST sid-milter-1.0.0.tar.gz 351161 RMD160 7aca88c5d1c18581a17a779c87e7dda3d0091e0e SHA1 dd6517b36933083923c3094cf7f09e74825e7dcb SHA256 b303bf0c43afd0cb0c814b8c862b8d22563d1203339ac130036873e79f696376
 EBUILD sid-milter-1.0.0-r4.ebuild 2021 RMD160 14e7c0afd526921e9ace9d492c91be283366baee SHA1 f243a587465f4ea950447e695b81f0de132c08c9 SHA256 516afd773970fd5eac2c791c99683bc84287106b3acde92735cb4ec18517ffed
-MISC ChangeLog 2947 RMD160 08e914dcffbfa8ebc1e9ada546c2679512058ebf SHA1 1c500caf50f6ea8b950682c62bf9c4cef611ef21 SHA256 5ecb6e54b263c40379184fb70b2e287677f8335d2d09bd942ca053923b34f938
+MISC ChangeLog 3052 RMD160 a328805b9aba2939404f8dfda5d952813c79e9d3 SHA1 c5096741043056fec5d2c9c38b7dbb9ca3cac66e SHA256 c6740ef5d9264adea3a3ce7593506eb6b8fef4e882d4e4bab963bf8170448297
 MISC metadata.xml 447 RMD160 d12715bcb22b684ecc8d69400ea109bb1898b068 SHA1 4967c8a01ec72918142454d4795637048283ef63 SHA256 c014f1e81516b87fd0b79be261b843a3ed2d8f981baf0177c3805ef8e51bac17
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAksaAooACgkQ9A5kJBGSrsth2gCfdyoQrFSqIcgWMYDHsX3fkktv
-mBgAoJrZYKzIk9xptXL5XlfxVE4JIP2O
-=8Lrx
+iEYEARECAAYFAksjdikACgkQ9A5kJBGSrsuZ3gCdEwb5fHnpc8f5rlPfK9aLX+Jt
+hoMAn2AoTS7zbvotqBFxFd55/JYeDbbc
+=aQWb
 -----END PGP SIGNATURE-----
diff --git a/mail-filter/sid-milter/files/sid-filter.init b/mail-filter/sid-milter/files/sid-filter.init
index 1fdc734fda73..d2f735bbcbfe 100755
--- a/mail-filter/sid-milter/files/sid-filter.init
+++ b/mail-filter/sid-milter/files/sid-filter.init
@@ -1,7 +1,7 @@
 #!/sbin/runscript
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/sid-milter/files/sid-filter.init,v 1.2 2009/12/05 06:49:37 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/sid-milter/files/sid-filter.init,v 1.3 2009/12/12 10:53:15 mrness Exp $
 
 depend() {
 	# need net
@@ -25,40 +25,36 @@ parse_opts() {
 		filter_user=milter
 		SID_FILTER_OPTS="${SID_FILTER_OPTS} -u ${filter_user}"
 	fi
+	if [ -z "${filter_pid}" ]; then 
+		filter_pid="/var/run/sid-filter.pid"
+		SID_FILTER_OPTS="${SID_FILTER_OPTS} -P ${filter_pid}"
+	fi
 }
 
 start() {
-	local filter_user= filter_pid= SSD_OPTS=
+	local filter_user= filter_pid=
 
 	parse_opts
-	if [ -n "${filter_pid}" ]; then
-		if ! (touch ${filter_pid} && chown ${filter_user} ${filter_pid}) ; then
-			eerror "Failed to create pidfile"
-			return 1
-		fi
-		SSD_OPTS="--pidfile ${filter_pid}"
+	if ! (touch ${filter_pid} && chown ${filter_user} ${filter_pid}) ; then
+		eerror "Failed to create pidfile"
+		return 1
 	fi
 
 	ebegin "Starting Sender-ID Filter"
-	start-stop-daemon --start --quiet --background ${SSD_OPTS} \
-		--exec /usr/bin/sid-filter -- ${SID_FILTER_OPTS}
+	start-stop-daemon --start --exec /usr/bin/sid-filter -- ${SID_FILTER_OPTS}
 	eend $?
 }
 
 stop() {
-	local filter_user= filter_pid= SSD_OPTS=
+	local filter_user= filter_pid=
 
 	parse_opts
-	if [ -n "${filter_pid}" ]; then
-		SSD_OPTS="--pidfile ${filter_pid}"
-	fi
-	
+
 	ebegin "Stopping Sender-ID Filter"
-	start-stop-daemon --stop --quiet --name sid-filter ${SSD_OPTS}
+	start-stop-daemon --stop --quiet --name sid-filter --pidfile ${filter_pid}
 	eend $?
 
-	if [ $? = 0 -a -n "${filter_pid}" -a -f "${filter_pid}" ]; then
+	if [ $? = 0 -a -f "${filter_pid}" ]; then
 		rm ${filter_pid}
 	fi
 }
-