Fix init script, bug #353620, by Alan Swanson <swanson at ukfsn dot org> and bug...

Package-Manager: portage-2.1.10.7/cvs/Linux ia64

diff --git a/net-p2p/deluge/ChangeLog b/net-p2p/deluge/ChangeLog
index fa86d622df2603a05ef9689c43360fa066f5343f..44ba4396e2bd0d8b1765c2d500215721af6961d8 100644 (file)
--- a/net-p2p/deluge/ChangeLog
+++ b/net-p2p/deluge/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-p2p/deluge
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/deluge/ChangeLog,v 1.162 2011/08/07 11:54:44 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/deluge/ChangeLog,v 1.163 2011/08/07 13:16:39 armin76 Exp $
+
+  07 Aug 2011; Raúl Porcel <armin76@gentoo.org> files/deluged.init:
+  Fix init script, bug #353620, by Alan Swanson <swanson at ukfsn dot org> and
+  bug #374755
 
 *deluge-1.3.3 (07 Aug 2011)
 

diff --git a/net-p2p/deluge/Manifest b/net-p2p/deluge/Manifest
index 7e787a3729598aff364efcb72cc13b2818b8b393..24fc10e491d16facd4553170f2f0ed78d621b60e 100644 (file)
--- a/net-p2p/deluge/Manifest
+++ b/net-p2p/deluge/Manifest
@@ -2,7 +2,7 @@
 Hash: SHA1
 
 AUX deluged.conf 184 RMD160 f1721fcc20b77836c783cbe4e7492748902f0428 SHA1 e330df742ae8f21e7dfbbaa31f181279ef96e3b8 SHA256 9f686931e7f5c337d4866d91ae725b0a983ee2a409eee69a197e7db8e4bc2b3d
-AUX deluged.init 2057 RMD160 1be6d3459ea5dfd912363755aebd5cbca90a6c85 SHA1 2260e7b5f48c255c8f8b59ad4e44c0eb8c76ac1f SHA256 c3c87e243d462fdc81329e22527ae2bd55f4d99bb1ca7d527aba343eec39516a
+AUX deluged.init 2060 RMD160 08be3fb63993e4f9dd5d8c5e31dad6308b2b3a01 SHA1 50db77a0f4338c9c6c0b5e14bc56ede399443c24 SHA256 0059349d1676b57ca0ac6d34e6b4ab7da6e882772a8251fe35c15e8eda787c8c
 DIST deluge-1.3.1.tar.lzma 1869318 RMD160 8500d7bc8d03bedee66d4bb349c2db6e2eae41af SHA1 94813e975b2d9a6cd31e17b112808a148302a438 SHA256 651b42e7ceb5f00e6a280f954ecff1da3a8ae0efc9a1f5e43eda317f499ec95f
 DIST deluge-1.3.2.tar.lzma 2088854 RMD160 0df4184a06e1973158dcc1aad32bf4fdc1a99ca7 SHA1 5ee582db96308333ec8bb60e962636a5d0faea5f SHA256 7420221d861d05357edc338868294b6f600b4ac9783c568e65da389aeea4bf21
 DIST deluge-1.3.3.tar.lzma 2094978 RMD160 d6044714dd242d9758436f5d0194a37f298f5dc0 SHA1 5bf22824cc5181c789429575d5d4a40f2e7d3cc6 SHA256 c40e0f5757bc3912e9628e1a68dfa41cd487beca370c315f5d31261b931cea05
@@ -10,12 +10,12 @@ EBUILD deluge-1.3.1.ebuild 1785 RMD160 e7cd07893524860f83c52ef4613b410befe403a7
 EBUILD deluge-1.3.2.ebuild 1786 RMD160 06803542ff9301a3dde9c478ef5d8c4a9be717b1 SHA1 7282ba9c699421f7154a9adee2f93f319c66d8da SHA256 890f5f8a2e23f25bcafeb50389841b193d2a8bc8e82d8ff8adb034aab39e0f1c
 EBUILD deluge-1.3.3.ebuild 1786 RMD160 19e7058c9a54440ba0067e30c5d15b01ded26e2e SHA1 197173842693971efe76deb11a1e3370a30587ed SHA256 607c6a4eb28b4aee828091f447f26d72926c9d4f0951f98bdaa7f13c4fa02211
 EBUILD deluge-9999.ebuild 1761 RMD160 cc18f58680581e7ff612894c5de3750bac752043 SHA1 735973ee83f642ea55adb0ca9cbc6a303fddd5d6 SHA256 b07fa554ec922d42e190fc80f7daefaa83816cdccbcdc079479a75f032444c83
-MISC ChangeLog 22771 RMD160 43639a559760db6043e1382c541a516bdce979d1 SHA1 3ef10ed2a9c274c5352f896fe73dd08a4b9eec1f SHA256 d25f127651088d56d945789d3241a450f1e6097abc46923a4c4f778ee525c586
+MISC ChangeLog 22934 RMD160 9e633c83ea6c66d1da7bb2ecc122ad3a6daa9ad3 SHA1 d00e9aa553de486e8fa4ba692eeb643ab52e2aed SHA256 384828749cd4deb53205119931277f443ec64b3f8c1d69850e8a4cef36b279c0
 MISC metadata.xml 322 RMD160 ba506cbedd76759bd1b14d569d0d121a1644fa75 SHA1 811976e88cb463281a74ac671ca920b9a15f15c3 SHA256 e88e99b119abf92a69e2115263e6992e6b2a6f711d810e6234c0cfaa21bc1d1f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk4+fQ4ACgkQuQc30/atMkAXkQCfYwRMT/YUxTgPOBAx/1JORDWW
-wjgAnRqmAawT0VIF0fm3jZC0gjktpmKd
-=u6hI
+iEYEARECAAYFAk4+kEMACgkQuQc30/atMkB/KACfaURB++rIV2P7QlavIp6n0TPD
+xYMAn1lzaEIG1g94TZYfr6El5MOx61If
+=NwX0
 -----END PGP SIGNATURE-----

diff --git a/net-p2p/deluge/files/deluged.init b/net-p2p/deluge/files/deluged.init
index b409a8901f55a90fda38430ee60599d53370a6be..269ec4c7aa94ca61950c11ff0fc7515cc4d97c85 100644 (file)
--- a/net-p2p/deluge/files/deluged.init
+++ b/net-p2p/deluge/files/deluged.init
@@ -1,7 +1,7 @@
 #!/sbin/runscript
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/deluge/files/deluged.init,v 1.6 2010/10/02 15:36:03 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/deluge/files/deluged.init,v 1.7 2011/08/07 13:16:39 armin76 Exp $
 
 depend() {
        need net
@@ -39,9 +39,9 @@ start() {
                DELUGED_USER_HOME=${DELUGED_HOME}
        fi
        ebegin "Starting Deluged"
-       start-stop-daemon --start --user "${DELUGED_USER}" \
+       start-stop-daemon --start --user "${DELUGED_USER%:*}" \
        --name deluged --pidfile /var/run/deluged.pid --background --make-pidfile \
-       --exec /usr/bin/deluged -c "${DELUGED_USER}" -e HOME=${DELUGED_USER_HOME} -- --do-not-daemonize "${DELUGED_OPTS}"
+       --exec /usr/bin/deluged -u "${DELUGED_USER}" -e HOME=${DELUGED_USER_HOME} -- --do-not-daemonize "${DELUGED_OPTS}"
        eend $?
 
        
@@ -49,7 +49,7 @@ start() {
                ebegin "Starting Deluge"
                start-stop-daemon --start --background --pidfile \
                /var/run/deluge.pid  --make-pidfile \
-               --exec /usr/bin/deluge -c "${DELUGED_USER}" \
+               --exec /usr/bin/deluge -u "${DELUGED_USER}" \
                -e HOME="${DELUGED_USER_HOME}" -- ${DELUGEUI_OPTS}
                eend $?
        fi