Update init script to use dropbox itselfs pid file. #503300

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0xF8551514

3 files changed, 23 insertions, 20 deletions

diff --git a/net-misc/dropbox/ChangeLog b/net-misc/dropbox/ChangeLog
index dd4e36edf667..a5d2990ab254 100644
--- a/net-misc/dropbox/ChangeLog
+++ b/net-misc/dropbox/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-misc/dropbox
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dropbox/ChangeLog,v 1.48 2014/03/04 20:13:04 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dropbox/ChangeLog,v 1.49 2014/03/04 20:42:02 naota Exp $
+
+  04 Mar 2014; Naohiro Aota <naota@gentoo.org> files/dropbox.initd:
+  Update init script to use dropbox itselfs pid file. #503300
 
   04 Mar 2014; Agostino Sarubbo <ago@gentoo.org> dropbox-2.4.10.ebuild:
   Stable for x86, wrt bug #500080
diff --git a/net-misc/dropbox/Manifest b/net-misc/dropbox/Manifest
index 66253e1bb726..4864a8a37952 100644
--- a/net-misc/dropbox/Manifest
+++ b/net-misc/dropbox/Manifest
@@ -2,7 +2,7 @@
 Hash: SHA256
 
 AUX dropbox.conf 322 SHA256 b45db3c9676cfd8bf568ca5ce86a4e1a6b95cd604edeba2b3e2b3fb604e19ab4 SHA512 100a9480dc086e18972c25bbf554e47737dae43989fc7fe1d01173c2570e64792e64fa7d52a93ca53f3e1248b3b335fd838b5c7713dae937e919f0e6a99bb132 WHIRLPOOL 2093d21df44308b478654457bf753913b56cc64ff76dd037720dcf15ba061307fc65175cf32c3ae54a16dba32614b1f123aff3c69bad599651ed67be0685f791
-AUX dropbox.initd 1599 SHA256 c3d4a32aedd5391e40057a1cfa9a9dbc654c20894df7fa3462c28579ec4ae5e5 SHA512 1712c5c2429ec3aa355be7f14032f5da0651104b46d18e4c5e8c2a0085d96d89fea1833dccae6ad6a18f38bb96d326ba5077893f967cf41e472d40e8b27c5ada WHIRLPOOL 8bea0b5b7943f3c9514e7a66baf4874db23f8ad8565df8d0f36ba47dfa6462c414a9eb7d99b597570bbe1bdb424a9109c5fe51d44dc73c84f4fec1009e98c367
+AUX dropbox.initd 1602 SHA256 8ef786d0493f118a018d5dc04f0ba4a06c18f1fb9a31eec18ae807084ae0c03d SHA512 20e3595916ab6a932fa55cf839836b5e5ffe6ac05d9ed63b8ec51155093f7a751ede74c4beb85e7eee90469bad32374b323f6174825bc27409fe9f2b6f7fc71c WHIRLPOOL ac2d29edef7b7bd46729e249d091e5cf1f97d00662274fd198c8516aebc45be43e652dd2af78a1d96a990a14a62a55afccdf39a2aeb84b9be92a4f473938dec4
 AUX dropbox_at.service 220 SHA256 8a02c67f98781a781741ab54d5c22ff904871db84e5549bc2e4864b8d5b9cee8 SHA512 cb33bf6aa290be0ba1afce2f5e525489f8bf4144daf09619b15292968657c74ee17678ed1aba6aa9d2dbd068dc394a10896e7dbd0eaf74d74a928368394bc933 WHIRLPOOL eb318ca1804cd023ca3a78eb923ce5be4dce1166187956fc190af23ae9676bcad61e6180869778e2bea53c572d7e53c0e3f9402874d57791b9e728ad9dd3cc4d
 DIST dropbox-lnx.x86-1.6.16.tar.gz 18849327 SHA256 dbef9f13410a454fb181793c7ff52be2ea9d17246ff6b3bce31bc2bd5c889f9d SHA512 a19d8d4e9ee9bae18690530585876c46f385dab44267bdf513cfd1e30f2ea8ced8cb520aef3c4097b5807c2974ce2243b5d78228d50cc2b7314ef77856109377 WHIRLPOOL 916bdd72d96546b958c082fb5587b13c6fa4eee0655a8ff341a9b019a7a1731b871639188d08e0f0b3856acb5a94f26871f9b3332e2766e6fad2e98f003b9f01
 DIST dropbox-lnx.x86-2.0.8.tar.gz 19989050 SHA256 d93b662869876b8bc1b9f7cfae11b487d63f4f677774dd1375750ac38e24455c SHA512 f18a61c1a3dd8b69a1b094d675128086e338f1635f8cc4604ab95f72dcfb2d47180145f99720bc59b76f032525811289b75a1d102817cd0cb30b06a4ba1c203e WHIRLPOOL 5721aa9c559f87f6ddf492a0f8d3acad4b156b3d7da4a6948d3824e9f962de18485deeca9f7a9714d9af3ea540e0fa208743eb7ccba2b3da8f529c32567e818c
@@ -29,22 +29,22 @@ EBUILD dropbox-2.4.10.ebuild 2473 SHA256 d641446d592d82af2f79454a1e2df1027aa1524
 EBUILD dropbox-2.4.7.ebuild 2397 SHA256 31a320c12f09dc6539450d964a6b875089315dd64a43faae893ec89c6574767a SHA512 5be229fe5310704bf662fe236a1b34bc07e0dcce5d3f55263c550292ee1a068765734151cc33a4f3399905f8d19395b4a8eadddcb78a9a895f9637d80017305d WHIRLPOOL b84094eb2051a2c4d9ac7ef5ffda6d4747f1204191b1284ba813e79c1b945175ef39d636ff1ffc29e2a213d5ba9798930d959b111ac942b6b2c6c0ef666139f3
 EBUILD dropbox-2.4.8-r1.ebuild 2479 SHA256 c2ec2d488fc3e368ebf0a93a56ddd0ebe72b49b0681ae8051b85a73110d81975 SHA512 ed61e8e8f61a649e2715a2433f56288626c045f441c1bd7c4bdb89ba7733c8a0724f2c75035393f7018c4d0b601e1eafb75dee046c35e41212bf89cff95272e7 WHIRLPOOL d95f2688f44d8a83b87cc90d79c3b9baa9aa6342c2564d6af1cb58741c97334e73984619bbf62c1c0d935bb5465a7f2eb85d98e86432448462a120246e3139cd
 EBUILD dropbox-2.4.8.ebuild 2399 SHA256 c9e318b74e680bcc2fb613129fa23c0a30d91538214382884e1a9565b450d59e SHA512 b3bd920680bc20e635bd8d5f68da0a6ab4dbeeaa8bdb65d9877a53ab1ca85322d5b6833c2cc4d6a79497e6d4f92cbb65f7159518edb8fb69af39b0df2b5751c3 WHIRLPOOL b19ed2331f9449b3e1571e6e76c8594d9b05b8d43e46745557382653af5adae40de1efc18707180663db88a3e16d7540072f8236cfa0879bffa0eb1d5dd632e1
-MISC ChangeLog 7707 SHA256 b43817f11a165e2e286ab2c8decb3a4d2597e0a1c95161a54b6446c0b2e773c8 SHA512 35faabc1d5ebff883f408c9bfbb30bea4fe8e7e59626deffb373854b7558bf4e75d15fd2a480d18f93426ac67a45c519703c6faaddaeba5347e88f1a16463308 WHIRLPOOL 46a8438bfb3c20df399eee3367c24c930f8c025f553c4d96289d96b2e3c88fba0b10244bf88953590246f5d122569d8f195c30b35cadfce3d1e87e3233fdcf0b
+MISC ChangeLog 7840 SHA256 b2cef2771638c7b6dc8aa37b9b6afc8f009b1417f573a07e3eef39597e497962 SHA512 c73616295a364afb301f048d3bf8bbda39ad1653d1971b9e3bff855677deca6842d74c66f46df52713b5bb22dcddaaab8204544759f7e5294bccf44e20447cc7 WHIRLPOOL d288bfc0e87fe246559967f0a4cd9609a0d5a73d67f5d2ad9034f3446ca383eccc224729a6519de3f62cf0a6a3168fcd6c47c8d7eb8902eba2c1893b10a74fef
 MISC metadata.xml 293 SHA256 8080bd70880d4e0c836cd4c517e65cdf6216c286317ed50a8eeab4162e34ff5c SHA512 393fa16e2d4b86b96b941f64cd143b23bbcd25708df7105a4cbb8d3b88599119e7403ea7acc9a21af3d6e9df36ffbac7921ac8bac2aff240361a7c885382f180 WHIRLPOOL 7f472367e05683054f2219c10a552b3ee6dd583206253cb3ca96b12f3c9ab5fdb944500d8dbe939123c365355e4aa1e2175f4a4b31071b9d7d624de36ce70ce3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTFjPRAAoJELp701BxlEWfFygQAIpxASQ7EMYBS0AN7ZhkAy+J
-Et/bOnKFyd3IQMSCYLl+U+Ve2tRGBSG4RGoOpUieZYd5Ol9Gl9c8ayc4xwTInI8k
-DMur//raCrpc332TLZEgPQm7+0LqazufZhcDbvJldExv+2TY5ciYjfnAh26ygSRZ
-p6uUlQD7N02ugkPB89tMFP7Ipb1T1CV2xDi4taFFuhGxIBWcCXdumKnDRpjC351T
-coBIHBppHxkcmqQqwwANnNaZaZlfkuoGOwW1QHrTaArQikn3QpsmHwfRUSWsnXLU
-f4MfOno5gNJ1Fa231W4Ey6buPglHUKW1vv+TKHhVtu8Dpxn3iRIczccE4BEXgH5L
-5R7m+eBiEpu2XhEPNPpNdCKsq/Z7Eb78U5d0ilzsIuVqula4+J+nq3tQreqQDPkd
-ZhSffYFhh71PmS+zLJ3cB+hragDSty6HTgY4COQ+1I+gHjUPRAC3JS9NeQfUcxF3
-LiJO1YmtqL1x/xZbLPcCZNsAkSlq3uC4+ba9C4fwAR+LWrutwGVk/X+h5dLvi6As
-Gp3BnOQ1Jl2POg9T+0CmtMyNTrcqT1TEhCrPImcTMu59s/MJ3fJPE+tAApS0fxuJ
-3OrULrbiRpLWjbTNQj3ZaL4g8fTuIyMUgjqJdfRHxmJSTuHlT+7R8srjgQeAYLTL
-bqUJQWO/oyeqa8IpZgXo
-=fq6G
+iQIcBAEBCAAGBQJTFjqbAAoJEDYO1FT4VRUUeuIQAI19q1widfT2VszdKH4H5jui
+5f/+zEqL41UA9VK7D7H226uhjpLhqEXseHeaZQvPeX41wOtfPHTrKPkjy83qpAsY
+IS1HhkhBCsxIEvWqT3Da8SuuRPj3vKyyaNhKhu15REXKsWPBbEnFlLm86mtMfIDL
+fX1uNlG0o7P7dlc3H3iJyQ4ZW/Dbfgz+z8jRtJmAnZe5emVAndws3Wp6y77C3RT0
+5DsJ4JFMndCyTPHnYxWAflM32MehgejVlVhapyVlnUxPUz7gmtIOHvwmxuEJsawN
+iddHnmMuX9dEm2o4aROW5swPIEqTVkkEhIqNgYTrhmy1BgOFJxnx/BKRUrqXvpkB
+G6i87CO3nII6RexSoJ+iPRYdMPbQpnGeBvaljnjnTx5T5WVVF6onwmin2OcD5V6U
+4MG+TK5VSFjOHYm3kBbTUV1HjNI6/pa37cIS9XA6Iu6mWFoB4P3vdENIwdRcACPF
+cIURuJCK/N2pLRHKKIbVozh7x1OtX/O4cjEIg7RYHHRfrfVBW5V12SlFkEiwSPVe
+WEJ5am42zD+73zdzMF705rwnSirFakakykrCxtTpmuBD7l/PaPb42kAX0chrhlUj
+P6NkG8T+XX6G3znoqMRBqjvhMxiWDo6oqnS8MNNX+/79u1M1OfeaIDJx9+PEnRsz
+UoU0F+Fn5Mu+CiaJ2Xwl
+=4gaL
 -----END PGP SIGNATURE-----
diff --git a/net-misc/dropbox/files/dropbox.initd b/net-misc/dropbox/files/dropbox.initd
index 9bdbb839677b..7bba8943e6ed 100644
--- a/net-misc/dropbox/files/dropbox.initd
+++ b/net-misc/dropbox/files/dropbox.initd
@@ -1,7 +1,7 @@
 #!/sbin/runscript
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dropbox/files/dropbox.initd,v 1.2 2012/07/25 02:39:58 naota Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dropbox/files/dropbox.initd,v 1.3 2014/03/04 20:42:02 naota Exp $
 
 PID_DIR=/var/run/dropbox
 
@@ -22,7 +22,6 @@ start() {
 	local homedir=$(eval echo ~${dbuser})
 	if test -d "${homedir}" && \
 	    start-stop-daemon -S -b \
-	    -m --pidfile ${PID_DIR}/$dbuser.pid \
 	    ${tmpnice} ${tmpionice} \
 	    -u ${dbuser} -v \
 	    -e HOME=${homedir} \
@@ -50,8 +49,9 @@ stop() {
     local retval=0
     ebegin "Stopping dropbox"
     for dbuser in ${DROPBOX_USERS}; do
+	local homedir=$(eval echo ~${dbuser})
 	start-stop-daemon --stop \
-	    --pidfile ${PID_DIR}/${dbuser}.pid || retval=$?
+	    --pidfile ${homedir}/.dropbox/dropbox.pid || retval=$?
     done
     eend ${retval}
 }