Fix init script to start gift completely before checking if gift is running. #116082

(Portage version: 2.1_pre7-r5)

4 files changed, 46 insertions, 11 deletions

diff --git a/net-p2p/gift/ChangeLog b/net-p2p/gift/ChangeLog
index 44cc18830249..027939a86bb3 100644
--- a/net-p2p/gift/ChangeLog
+++ b/net-p2p/gift/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-p2p/gift
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/gift/ChangeLog,v 1.58 2005/09/16 23:37:45 mkay Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/gift/ChangeLog,v 1.59 2006/04/19 02:10:47 squinky86 Exp $
+
+  19 Apr 2006; Jon Hood <squinky86@gentoo.org> files/gift.initd:
+  Wait for process to start completely before checking it, #116082. Thanks
+  Philip Canavan <pcanavan@deloitte.co.uk>.
 
   16 Sep 2005; <mkay@gentoo.org> gift-0.11.6.ebuild:
   just change date in header to make repoman happy;>
diff --git a/net-p2p/gift/Manifest b/net-p2p/gift/Manifest
index ed3bdb6eb1bf..80f6f5fe1cca 100644
--- a/net-p2p/gift/Manifest
+++ b/net-p2p/gift/Manifest
@@ -1,14 +1,42 @@
-MD5 f1c6ed33832f34000b11dc0e774aeeb0 ChangeLog 4087
+MD5 1e60703562a1707bbf1c7a0506ed1771 ChangeLog 4272
+RMD160 bf7b42663fc28d5bc1f8e9e3992ca6a04704a8ce ChangeLog 4272
+SHA256 9d100cee4c0cb5773e6d4306d2666a8379de4aca3bd9d28698309a58fc0b4a6d ChangeLog 4272
+MD5 64b21cffd79f35db281d077303eb810b files/digest-gift-0.11.6 64
+RMD160 dcd4de988ba804e556958ebe26b69f0aa62e257c files/digest-gift-0.11.6 64
+SHA256 714d1044e0283f5f58fb31b50affe79fcd9e928fe5db15f4bc36d079e95b33b3 files/digest-gift-0.11.6 64
+MD5 64b21cffd79f35db281d077303eb810b files/digest-gift-0.11.6-r1 64
+RMD160 dcd4de988ba804e556958ebe26b69f0aa62e257c files/digest-gift-0.11.6-r1 64
+SHA256 714d1044e0283f5f58fb31b50affe79fcd9e928fe5db15f4bc36d079e95b33b3 files/digest-gift-0.11.6-r1 64
+MD5 8f91b068201aa85015f5d55ca35867d8 files/digest-gift-0.11.7-r1 64
+RMD160 99752a1fcb85607242b0327f06c3c997fd53d643 files/digest-gift-0.11.7-r1 64
+SHA256 f3b6b7d36f18f004782fe842105aadedf969fb1639e79fe677befc7872962527 files/digest-gift-0.11.7-r1 64
+MD5 e53b1d5024a6b4a9c59097929889cd0e files/digest-gift-0.11.7_pre20040627 76
+RMD160 9712a7979ff71282541279dcae5415c5e50e0ac3 files/digest-gift-0.11.7_pre20040627 76
+SHA256 417768de1588a93bb9cf127c76158a8b00028f5b271febcd6eb9505e082e7d38 files/digest-gift-0.11.7_pre20040627 76
+MD5 acb65dbaa164d74932e2d89b80877214 files/digest-gift-0.11.8.1 244
+RMD160 27af749b660dbd4b91b30c83097ce7a2a58ed360 files/digest-gift-0.11.8.1 244
+SHA256 e6c922fd31c0efe609e2360e0e373124d19e096674c5aaac3fc275c6b0a06e0a files/digest-gift-0.11.8.1 244
+MD5 d5055758521dad61c69c27ecd493d426 files/gift.confd 637
+RMD160 23251f99424964430cceeaa7e2f3636ca69b2149 files/gift.confd 637
+SHA256 a35d8ab4b3b1e63dd7fc40d21bd77eada4da0fc03fb7e84c0fa378787a9dc218 files/gift.confd 637
+MD5 7e769d8268dc97125f40a1197014db74 files/gift.initd 823
+RMD160 352b854926548b6449720f642306944bb54070bd files/gift.initd 823
+SHA256 aa3d9c455fd95d9d71d392936296a772da4f191cdd463c85403fc33f1184308e files/gift.initd 823
 MD5 fa7abf5b122646184f15da253331f226 gift-0.11.6-r1.ebuild 1920
+RMD160 53cfb8edd94933ae4e1a17fc4eef6c1ace194a06 gift-0.11.6-r1.ebuild 1920
+SHA256 0437e5b494c42fae62dde582435115e5f739ce0eafc5351cba1d64d7faf15784 gift-0.11.6-r1.ebuild 1920
 MD5 f17d16de3b2f54f9a7ac014b13d55fbc gift-0.11.6.ebuild 1327
+RMD160 848934973c7a6ec7664092fd4a5a6e0463a35f95 gift-0.11.6.ebuild 1327
+SHA256 ca41e7f6659db00f5b944498702d6dd9a73339fc64dd1a11dd1eb9b2d8e52c1d gift-0.11.6.ebuild 1327
 MD5 3e67a63f5a45f17503f7fd44d03612b1 gift-0.11.7-r1.ebuild 1850
+RMD160 23cdf64cfee7b1265b0fa4a8651ad44579a09d39 gift-0.11.7-r1.ebuild 1850
+SHA256 0f3e9900b262a3e906e1c80e9dda730740b7979132843b5b246cf6c2169df2ec gift-0.11.7-r1.ebuild 1850
 MD5 20f38ffd20cb25188a17e8fe4a985f60 gift-0.11.7_pre20040627.ebuild 2139
+RMD160 95884c832ce459dd323169c13f877c8f8ba375e6 gift-0.11.7_pre20040627.ebuild 2139
+SHA256 8d49ad7467e533c8b1b40442776c30c70fe8fbe77320377a3f7934c8afc4ece4 gift-0.11.7_pre20040627.ebuild 2139
 MD5 2ea8ab0472deb641dc55ec8b6c146a86 gift-0.11.8.1.ebuild 1963
+RMD160 7b8deeaa726f3454283e36ba3765c1b7feee18cf gift-0.11.8.1.ebuild 1963
+SHA256 4d645c610c228a1f0808b9beee952c0fba5133c758604fce525958c1c8be420a gift-0.11.8.1.ebuild 1963
 MD5 875f23093b78af2d864a7a7ba464f126 metadata.xml 223
-MD5 64b21cffd79f35db281d077303eb810b files/digest-gift-0.11.6 64
-MD5 64b21cffd79f35db281d077303eb810b files/digest-gift-0.11.6-r1 64
-MD5 8f91b068201aa85015f5d55ca35867d8 files/digest-gift-0.11.7-r1 64
-MD5 e53b1d5024a6b4a9c59097929889cd0e files/digest-gift-0.11.7_pre20040627 76
-MD5 783b88fc3b1999d8274180380c02a82c files/digest-gift-0.11.8.1 66
-MD5 d5055758521dad61c69c27ecd493d426 files/gift.confd 637
-MD5 de822b4ec211175e809c7c93c0651cc4 files/gift.initd 814
+RMD160 04492d6d9ec5940eb67563e2498d6a5a79028978 metadata.xml 223
+SHA256 fea830dcdf6851fe6a940828046810f5f6eb8a8472c06b7529d81142185df0e6 metadata.xml 223
diff --git a/net-p2p/gift/files/digest-gift-0.11.8.1 b/net-p2p/gift/files/digest-gift-0.11.8.1
index 97af10a36a4d..c2bab6747504 100644
--- a/net-p2p/gift/files/digest-gift-0.11.8.1
+++ b/net-p2p/gift/files/digest-gift-0.11.8.1
@@ -1 +1,3 @@
 MD5 1c70477af403af142359d07ee4a03348 gift-0.11.8.1.tar.bz2 541446
+RMD160 cef5fe571eff21a61219ce40501652c7b1997a02 gift-0.11.8.1.tar.bz2 541446
+SHA256 7b22e6d36482119a0d2dfd3e911a208439be32f554919536629b4c7c22ea5882 gift-0.11.8.1.tar.bz2 541446
diff --git a/net-p2p/gift/files/gift.initd b/net-p2p/gift/files/gift.initd
index 4e624bc21035..a03a7686ef0a 100644
--- a/net-p2p/gift/files/gift.initd
+++ b/net-p2p/gift/files/gift.initd
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/gift/files/gift.initd,v 1.6 2005/09/16 23:32:20 mkay Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/gift/files/gift.initd,v 1.7 2006/04/19 02:10:48 squinky86 Exp $
 
 depend() {
 	need net
@@ -14,6 +14,7 @@ start() {
 		--nicelevel ${NICE} -- \
 		--local-dir=${LOCAL_DIR} &>${LOG} &
 		result=$?
+	sleep 1
 	[ -z "`pgrep -u ${USER} giftd`" ] && result=1
 	if [ $result -eq 1 ]; then
 		eerror "Failed to start gift. Check ${LOG} for more information"