init script improvements by Vladimir Brik <no.hope@gmail.com>, bug #293222

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

diff --git a/net-nntp/hellanzb/ChangeLog b/net-nntp/hellanzb/ChangeLog
index 243eb0cc684df58cb3b1d966703d039a3c69fab7..b3b295965182ce10b28642eea6eeeb74a8daf636 100644 (file)
--- a/net-nntp/hellanzb/ChangeLog
+++ b/net-nntp/hellanzb/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-nntp/hellanzb
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-nntp/hellanzb/ChangeLog,v 1.15 2010/04/23 13:36:52 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nntp/hellanzb/ChangeLog,v 1.16 2010/04/23 13:46:56 aballier Exp $
+
+  23 Apr 2010; Alexis Ballier <aballier@gentoo.org> files/hellanzb.init:
+  init script improvements by Vladimir Brik <no.hope@gmail.com>, bug #293222
 
   23 Apr 2010; Alexis Ballier <aballier@gentoo.org> hellanzb-0.13-r7.ebuild,
   +files/hellanzb-0.13-python_26_fixes.patch,

diff --git a/net-nntp/hellanzb/Manifest b/net-nntp/hellanzb/Manifest
index feb7a13dd433fb1685812cb34c39f48e5a0bbdf0..4d64edc5b0c28fb10aa0dc6f967415e38bed2020 100644 (file)
--- a/net-nntp/hellanzb/Manifest
+++ b/net-nntp/hellanzb/Manifest
@@ -9,15 +9,15 @@ AUX hellanzb-0.13-gettinggroup.patch 481 RMD160 715ba7a1bf445611c2ebf92b16076a79
 AUX hellanzb-0.13-python_26_fixes.patch 2686 RMD160 1b5ac34248ec0e56458fd535609a4c1e604dfd7b SHA1 1d4f82d26133188f4cfeed03d06979bc92ebb1e9 SHA256 0c7c7121e938cf5e71f331634d7f99d3ae71c05b92dc041dff2d7f244d064dd1
 AUX hellanzb-0.13-twisted-10.0.0.patch 1506 RMD160 43ebca1cb4aaf3483c16097ce776c9ae644f87a5 SHA1 d2c5f398efce0629dc4367f7bee89a5a583045da SHA256 4a0636a23067a230f29be946bfe5a6a461f2216c132b185bce8b8c8cc1f6a458
 AUX hellanzb.conf 700 RMD160 b1a897c502b143a58713d171d98642dab911c91b SHA1 f1de67993fcca92245e04e6892e4bfbed990e9fd SHA256 6bbed7f6aa0bfd42d75b47518569617db27ccc0baacecb17fa9cd6b5f28f8901
-AUX hellanzb.init 790 RMD160 487b3499f3ee9692492550596323cfbef0670a0d SHA1 861068599b7f440e03847f484e2a00499b993574 SHA256 23f4fb0d9c93047aa0e6bcb67e70041f1aa443f51fc4e9291c9dc7b518bca305
+AUX hellanzb.init 823 RMD160 6092682d6144fe3a1bdc23c685ee7eb8c1be4e72 SHA1 00f53796dc54353d802881d5d58acf28a45fe386 SHA256 840734cb4e499dfd5972c65ae31568b6bb743d6d640dba4b66a0d0761e673fe4
 DIST hellanzb-0.13.tar.gz 163698 RMD160 2ec3069cd0c9cb6c9fdaa4a4edc4f311a86d944c SHA1 4ada7268ccb9c8f85d8de8d34fda92c3e2d84b5f SHA256 565b08725eb92ac1e278fa7df2c7b27b21588c4e24c140fddbec4a5625159127
 EBUILD hellanzb-0.13-r7.ebuild 1866 RMD160 d8ca948585c8ddbebf14a5f1f4130a6490c9a077 SHA1 ec4994b22cadf87b735ad2b2b0bcb34d5d9b1416 SHA256 e9afba440db35139c87df06cf2d8760f73cf9d87d61b4e9d85f37f21129d4df7
-MISC ChangeLog 3613 RMD160 3288db71363e8f39fa84089f92a929b8b25b6507 SHA1 da69648138cbba9bdf256e32420320546ae0f21e SHA256 62563d0fc2aec5fd24288e91f9a2d6083e2e1e274d23d993fff46a2b8469425e
+MISC ChangeLog 3764 RMD160 9f376a0fd2c6aa212842f2ff981aacf1779fca07 SHA1 09986ec909cde64026e56f7dbfdd9e17a0e50dff SHA256 77fc79f1269fc9202bf8fb34bbdb868309e05ca1fa61446219dd0ab094855656
 MISC metadata.xml 706 RMD160 7f3ebb6d6e55352055197e008a86428ac1a3d1f7 SHA1 48a67cea318c18afa7fd6b802834719843feceef SHA256 1cec98091461e56458cfafa8a79f05d8bf18da85e6f4355263b25c19f500257b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.15 (GNU/Linux)
 
-iEYEARECAAYFAkvRonoACgkQvFcC4BYPU0rE/QCcChw5wzzNi44Oho0NP4WAsPRq
-zCMAoMQHjCJ1lSJ2PnEVXDtiSszsvIY7
-=Fxw0
+iEYEARECAAYFAkvRpNUACgkQvFcC4BYPU0r8jgCfWs+aXJ+e9PKm4jPegOFOc80v
+vzQAnjraul5Jt1fZnl9NQoPpiZF14k28
+=3fjr
 -----END PGP SIGNATURE-----

diff --git a/net-nntp/hellanzb/files/hellanzb.init b/net-nntp/hellanzb/files/hellanzb.init
index 2c397a5e413f9df17feb214159d72288440ab942..be318d56c49dfde7422225a6f1b2d074ac9c6db6 100644 (file)
--- a/net-nntp/hellanzb/files/hellanzb.init
+++ b/net-nntp/hellanzb/files/hellanzb.init
@@ -14,9 +14,11 @@ start() {
                eend 1
                return 1
        fi
+       if [ "${RC_CMD}" = "restart" ] ; then
+               sleep 1 # wait for socket to be released
+       fi
 
-       export PATH="${PATH}:/opt/bin"
-        start-stop-daemon --quiet --start -c ${HELLA_USER} \
+        start-stop-daemon --start -c ${HELLA_USER} \
                -g ${HELLA_GROUP} --name hellanzb.py \
                 --exec /usr/bin/hellanzb.py -- \
                 -D -c ${HELLA_CONFIGFILE} ${HELLA_OPTS} &> /dev/null
@@ -25,8 +27,7 @@ start() {
 
 stop() {
        ebegin "Stopping hellanzb"
-       start-stop-daemon --quiet --stop \
-               --name hellanzb.py
+       /usr/bin/hellanzb.py shutdown &> /dev/null
        eend $?
 }