Fix jabberd init.d script to start multiple services, see bug #158466.

Package-Manager: portage-2.1.2_rc4-r7

diff --git a/net-im/jabberd/ChangeLog b/net-im/jabberd/ChangeLog
index c993adec48638c5293f0ecfdbe45c6973a4298fd..ba5e681f5ec812f3a05003abdf986f0da5744bda 100644 (file)
--- a/net-im/jabberd/ChangeLog
+++ b/net-im/jabberd/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-im/jabberd
-# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd/ChangeLog,v 1.91 2006/11/23 20:34:02 vivo Exp $
+# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd/ChangeLog,v 1.92 2007/01/09 10:38:59 nelchael Exp $
+
+  09 Jan 2007; Krzysiek Pawlik <nelchael@gentoo.org>
+  files/jabberd-2.0.11.init:
+  Fix jabberd init.d script to start multiple services, see bug #158466.
 
   23 Nov 2006; Francesco Riosa <vivo@gentoo.org> jabberd-1.4.4-r3.ebuild,
   jabberd-2.0.11-r1.ebuild:

diff --git a/net-im/jabberd/Manifest b/net-im/jabberd/Manifest
index d7e48f0d25e485eda970ff9e0d61d18cf3c2687f..c4622ac1959ff2d12d45384a571eba7d6d6fd0af 100644 (file)
--- a/net-im/jabberd/Manifest
+++ b/net-im/jabberd/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX README.Gentoo 984 RMD160 cbaac3ea99a614c2155baad18a0a364a33d01ca1 SHA1 9a8c71a0499ccf46aa80d4b54b3e16066dd74caa SHA256 cb495c86769e5de3d070b98ba379f3a1d83936c3c509263bca34f2fdd78f3726
 MD5 1a325b6068e591bc222376a7d70f6e17 files/README.Gentoo 984
 RMD160 cbaac3ea99a614c2155baad18a0a364a33d01ca1 files/README.Gentoo 984
@@ -66,10 +69,10 @@ AUX jabberd-2.0.11-configure.in.patch 396 RMD160 86c99a761a23e55ebce98bdffba060e
 MD5 0d6acfc3d4a22d09d4d17ffd202d38d8 files/jabberd-2.0.11-configure.in.patch 396
 RMD160 86c99a761a23e55ebce98bdffba060e18073826f files/jabberd-2.0.11-configure.in.patch 396
 SHA256 afa527ce6e4abedf097a92dc73046b8bacd851bf75ea309bd706937c8080aa5f files/jabberd-2.0.11-configure.in.patch 396
-AUX jabberd-2.0.11.init 1545 RMD160 2e80cded1163c762d67e0384a238be98d578d2f0 SHA1 504985e68b195a305353c6d38d8cf08b4ff27f6b SHA256 0dbf1a9a3729f3649d94b74f2a454a7ed85a0d581be1298f66b4eba6b12cb31f
-MD5 b195e0529406d7d2f40643fea20c24f0 files/jabberd-2.0.11.init 1545
-RMD160 2e80cded1163c762d67e0384a238be98d578d2f0 files/jabberd-2.0.11.init 1545
-SHA256 0dbf1a9a3729f3649d94b74f2a454a7ed85a0d581be1298f66b4eba6b12cb31f files/jabberd-2.0.11.init 1545
+AUX jabberd-2.0.11.init 1701 RMD160 0637157c6c84aa9acc5e787ae347980506db3c02 SHA1 95958ed179ec3c8b20dc4a2934c1a8adae08b92b SHA256 21ab8f057412d853318370b567c8f53c4d33dfc6ca2151e205f51c01b7dd5c0a
+MD5 15e304cfa6bdf41c2633da7fe6063ace files/jabberd-2.0.11.init 1701
+RMD160 0637157c6c84aa9acc5e787ae347980506db3c02 files/jabberd-2.0.11.init 1701
+SHA256 21ab8f057412d853318370b567c8f53c4d33dfc6ca2151e205f51c01b7dd5c0a files/jabberd-2.0.11.init 1701
 AUX multiple-xml-patch-00 5934 RMD160 89554e2f3f3354ecc248324bcb2a8b9151ebc67d SHA1 27f0aab6b2ec468dd9a1d3b7633555db83ade23f SHA256 43287b8265631498e0e82dfd0b362ec2513ffc4f3ea4daf112a52f3be49795c7
 MD5 5aeafd17644a405b363de0ea1eb22d8b files/multiple-xml-patch-00 5934
 RMD160 89554e2f3f3354ecc248324bcb2a8b9151ebc67d files/multiple-xml-patch-00 5934
@@ -119,10 +122,10 @@ EBUILD jabberd-2.0.11-r1.ebuild 2292 RMD160 b5ab536343692dbd873ff61c349af2b5d12c
 MD5 eb18455612bf9cb77ddf56c3957c2997 jabberd-2.0.11-r1.ebuild 2292
 RMD160 b5ab536343692dbd873ff61c349af2b5d12ce3f1 jabberd-2.0.11-r1.ebuild 2292
 SHA256 5c172be2b8d01508b7da14bec0b6709a66757d021f19a84779d3ae1c37fa8239 jabberd-2.0.11-r1.ebuild 2292
-MISC ChangeLog 14445 RMD160 81b4177ccbaac7fce6a1aa1ce1975959c36b424d SHA1 c1c13ac4c3c3c072e186fcd963a9b8af530fcada SHA256 de69323436be96abfee0431045c4aaa66aba1213dfe1c6b1a408dca8f6f3ed29
-MD5 23f11cd9a635afdda6d4b63093f8648b ChangeLog 14445
-RMD160 81b4177ccbaac7fce6a1aa1ce1975959c36b424d ChangeLog 14445
-SHA256 de69323436be96abfee0431045c4aaa66aba1213dfe1c6b1a408dca8f6f3ed29 ChangeLog 14445
+MISC ChangeLog 14605 RMD160 1033098f367c7cc9498d428842dc61473e9ae793 SHA1 65b6ef986aa648a97a9eeba920f2bc6910f3520d SHA256 96a117e55c62f2e3bb650ecd551ffa62a25c9804997129f57bb798cee7dcae77
+MD5 bc2d1b738a563727182d601c1068d324 ChangeLog 14605
+RMD160 1033098f367c7cc9498d428842dc61473e9ae793 ChangeLog 14605
+SHA256 96a117e55c62f2e3bb650ecd551ffa62a25c9804997129f57bb798cee7dcae77 ChangeLog 14605
 MISC metadata.xml 399 RMD160 e223c713f74619996bc47a70298aa535f6addf09 SHA1 dc9bc290a5ed00f7101aabd3a40b346112eb40eb SHA256 f68b0864864ad54de5cf072835fc9903e709987261ad1fc102afb0019aa52377
 MD5 be8887bde84aab1d4ff9d5a0f5d50141 metadata.xml 399
 RMD160 e223c713f74619996bc47a70298aa535f6addf09 metadata.xml 399
@@ -136,3 +139,10 @@ SHA256 05c069ff9a60336785d0d1049dc28c727a5b4cc2f9a40c0f5304f98f2343cb9b files/di
 MD5 3cbebd7d43212be46daad3e042dce34f files/digest-jabberd-2.0.11-r1 244
 RMD160 4638cd85561494bb4ec40e8af80cc145f8156b23 files/digest-jabberd-2.0.11-r1 244
 SHA256 8d5a3e81789ef9e85b365e2974311b0f46ffb940a2b0bfdbc80457e40014f05b files/digest-jabberd-2.0.11-r1 244
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.1 (GNU/Linux)
+
+iD8DBQFFo3EEgo/w9rxVVVERAqLZAJ0dZxD8WgCCdfNY9mm2W6J7n0v/ZACcCWrI
+oqbzqI6JzbLe6bqbHM7VBrw=
+=S+u7
+-----END PGP SIGNATURE-----

diff --git a/net-im/jabberd/files/jabberd-2.0.11.init b/net-im/jabberd/files/jabberd-2.0.11.init
index 59fe2ccb8ecb23fc70d0e8f8daf6cbf73eff3abb..fee8d2ea2c20c2e492e8454ec0b3c6794af57aa5 100644 (file)
--- a/net-im/jabberd/files/jabberd-2.0.11.init
+++ b/net-im/jabberd/files/jabberd-2.0.11.init
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd/files/jabberd-2.0.11.init,v 1.2 2006/10/11 14:29:48 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd/files/jabberd-2.0.11.init,v 1.3 2007/01/09 10:38:59 nelchael Exp $
 
 depend() {
        need net
@@ -29,11 +29,13 @@ function stopJabberServices() {
 start() {
 
        einfo "Starting Jabber Server ..."
-       local services=$(grep -v ^# /etc/jabber/jabberd.cfg | grep '..*' | awk '{print $1}')
+       local services=$(grep -v ^# /etc/jabber/jabberd.cfg | grep '..*' | awk '{print $1 ":" $2}')
+       local tempPidHack=/var/run/jabber/start_stop_daemon.pid
        eindent
        for service in ${services}; do
 
-               cfgfile="$(grep "^${service}" /etc/jabber/jabberd.cfg | awk '{print $2}')"
+               cfgfile=${service/*:/}
+               service=${service/:*/}
                if [[ ! -f "${cfgfile}" ]]; then
                        if [[ -f "/etc/jabber/${service}.xml" ]]; then
                                cfgfile="/etc/jabber/${service}.xml"
@@ -52,17 +54,22 @@ start() {
                        return 1
                fi
 
+               rm -f ${tempPidHack} &> /dev/null
                ebegin "Starting ${service} (${cfgfile})"
                start-stop-daemon \
                        --background \
                        --start  \
                        --chuid jabber:jabber \
                        --exec /usr/bin/${service} \
+                       --pid ${tempPidHack} \
+                       --make-pidfile \
                        -- -c ${cfgfile}
                eend $?
+               rm -f ${tempPidHack} &> /dev/null
 
        done
        eoutdent
+
 }
 
 stop() {