Fixed broken pdnsd-online init script (result of bug #349335)

Package-Manager: portage-2.2.0_alpha29/cvs/Linux x86_64

4 files changed, 17 insertions, 24 deletions

diff --git a/net-dns/pdnsd/ChangeLog b/net-dns/pdnsd/ChangeLog
index 395b5fbc35e7..0dd34c017cd9 100644
--- a/net-dns/pdnsd/ChangeLog
+++ b/net-dns/pdnsd/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-dns/pdnsd
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/pdnsd/ChangeLog,v 1.100 2011/03/27 17:31:42 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/pdnsd/ChangeLog,v 1.101 2011/03/28 14:00:21 polynomial-c Exp $
+
+*pdnsd-1.2.8-r2 (28 Mar 2011)
+
+  28 Mar 2011; Lars Wendler <polynomial-c@gentoo.org> -pdnsd-1.2.8-r1.ebuild,
+  +pdnsd-1.2.8-r2.ebuild, files/pdnsd.online.1:
+  non-maintainer commit: Fixed broken pdnsd-online init script (result of bug
+  #349335). Committed with kind permission from flameeyes.
 
 *pdnsd-1.2.8-r1 (27 Mar 2011)
 
diff --git a/net-dns/pdnsd/Manifest b/net-dns/pdnsd/Manifest
index 326a83ff3f4e..c70c884cb374 100644
--- a/net-dns/pdnsd/Manifest
+++ b/net-dns/pdnsd/Manifest
@@ -1,20 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX pdnsd.conf.test 377 RMD160 fbf25b78728754fa1f9cf5259c43cce9cb22a995 SHA1 bd7fdc0d89873921d5284e8d6713e62a424de704 SHA256 8ef1e68c43cefde86598158d2b624cbdd66d2436d681cabbc6327d34d5886058
 AUX pdnsd.online 733 RMD160 22a0107d1521c4f0934c14f9c617a7e0878da5a3 SHA1 94398b67952142548557394fe64d82dc85fafaff SHA256 48479251841f348848c497cdf7e61134da69001d7c611756368746122fc95b7d
-AUX pdnsd.online.1 751 RMD160 b38e1e6d50744dd9bc73fe534a8e16696d0698fc SHA1 8719c93a0ed4e786538a3f77ea9a90c80717d20e SHA256 275402040f80f8044d59d50fcc8db8edcd12597243878d3f126ffc24b028f138
+AUX pdnsd.online.1 669 RMD160 9567c8eadc9916956a130dc601394fd7a1fdbb53 SHA1 830bed0a1a513094d50714ad2ec7075dd8be7ab5 SHA256 b4bc97c47bcda1713c98d4cf8de583d4dbb26ec7b9c064252d15e493977af09b
 AUX pdnsd.rc6.1 942 RMD160 eaf58c47f1b6183dea8466ef1a05f9afbefd4404 SHA1 fcc8392195e0ee20a6f180ca4e6c5fbc413580b8 SHA256 9508b0dd6adbbe1bf5afc5af037d5fa9bd2ee0ab9748892fdf4ed6f12739d2fa
 AUX pdnsd.resolvconf-r1 17538 RMD160 a79ab764cd96a7203165771d50b14f4bf3907141 SHA1 3afbba4b8eb5fad1e1268dab85cc1fc04b1258b2 SHA256 40bdcc876ba8bb86069d52f8023fed468974004f47c235c202ca7eac88aa0fe3
 DIST pdnsd-1.2.8-par.tar.gz 471303 RMD160 227a550ba210c2454b3cc39e8d8d056960d49b9f SHA1 538849975f29c59b1e7f0dd0756435cc6f0f2b30 SHA256 5f3cade09e445f034430863ba65047a4ab2f581b86f3eab0d0981646e7ec244e
-EBUILD pdnsd-1.2.8-r1.ebuild 3784 RMD160 612fa8f6242da8f7f24fd434d2c5c2043f4c7fa1 SHA1 3ad87db44c07e18521d44f0046586cfd82c94e9c SHA256 1b5342e13027083f9ff5073b3c8108c3e35e85af418eafc4a40b36b6b0e847ed
+EBUILD pdnsd-1.2.8-r2.ebuild 3787 RMD160 efacb893ba435c59feae94a9cfcc5d0047a1fd63 SHA1 a07b54eb69d41b4bc3b8961fa11680ff2eea3b42 SHA256 447fe077f8d333432badea6e4f2e25ca9379b849dea0fe17d077edc9bed3c67f
 EBUILD pdnsd-1.2.8.ebuild 3729 RMD160 afdb5d582c44f73d1cec4d5224ba66230b249ea8 SHA1 2c90593c445a17e3183709d59418a9a051fdd543 SHA256 e151c197e484decd0eec85b005d78d08def4070d08b441cfb684bd9471941461
-MISC ChangeLog 15480 RMD160 b62382cce95e10603b290e9ceccc7a382c0ae697 SHA1 4035c512c246d0bc1cd42d61841849155eb67888 SHA256 5ccc288b78ed4bbb53b541c4c723294ff74e8ea4869c444f3946e13ba1107ab3
+MISC ChangeLog 15778 RMD160 a59aeef343d694e83aa3347e59079987d7ddd9b6 SHA1 4d1996f402d67e833e6b2a7ee705566452653c09 SHA256 cffbee5fe7a51f8824fb15e3dc34c5954729a86b953503ca2019f62b98620ee4
 MISC metadata.xml 791 RMD160 b3836aa6dcb1a6a902d6778827a54ae6a6d2d2e2 SHA1 7cfc112ccb691fe60b0f9fd8c4cebcc36bf3539a SHA256 8b45a03b5123fe08058fd1657b80fe479b1025ee0e1663fca7e077363f6be6f1
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iEYEARECAAYFAk2PdIIACgkQAiZjviIA2XgwAgCg8558r918sAE/OY9v0u9br02C
-/T4An3uC/zte/4GOb37dQB6s5QhirMp+
-=Wmr3
------END PGP SIGNATURE-----
diff --git a/net-dns/pdnsd/files/pdnsd.online.1 b/net-dns/pdnsd/files/pdnsd.online.1
index 79e7a41e96fb..393ebf589ebd 100644
--- a/net-dns/pdnsd/files/pdnsd.online.1
+++ b/net-dns/pdnsd/files/pdnsd.online.1
@@ -1,25 +1,21 @@
 #!/sbin/runscript
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/pdnsd/files/pdnsd.online.1,v 1.1 2011/03/27 17:31:44 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/pdnsd/files/pdnsd.online.1,v 1.2 2011/03/28 14:00:21 polynomial-c Exp $
 
 depend() {
 	need pdnsd
 }
 
 wait_for_socket() {
-	local i pdnsd_socket="/var/cache/pdnsd/pdnsd.status"
-	while [ ! -S "${pdnsd_socket}" -a $i -lt 10 ]; do
+	local i=0 pdnsd_socket="/var/cache/pdnsd/pdnsd.status"
+	while [ $i -lt 10 ]; do
+		[ -S "${pdnsd_socket}" ] && return 0
+		i=$(($i+1))
 		sleep 1s
-		: $((i++))
 	done
 
-	if [ ! -S "${pdnsd_socket}" ]; then
-    	eerror "${pdnsd_socket} socket is missing."
     	return 1
-	fi
-
-	return 0
 }
 
 start() {
diff --git a/net-dns/pdnsd/pdnsd-1.2.8-r1.ebuild b/net-dns/pdnsd/pdnsd-1.2.8-r2.ebuild
index e7204784cc45..be40729f4b72 100644
--- a/net-dns/pdnsd/pdnsd-1.2.8-r1.ebuild
+++ b/net-dns/pdnsd/pdnsd-1.2.8-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/pdnsd/pdnsd-1.2.8-r1.ebuild,v 1.1 2011/03/27 17:31:42 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/pdnsd/pdnsd-1.2.8-r2.ebuild,v 1.1 2011/03/28 14:00:21 polynomial-c Exp $
 
 EAPI="2"