summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Wendler <polynomial-c@gentoo.org>2011-03-28 14:00:21 +0000
committerLars Wendler <polynomial-c@gentoo.org>2011-03-28 14:00:21 +0000
commit58aff38ed0f03d60b2357f751cc065afd086dc6c (patch)
tree1b68349b3f850b5e4887e00e7855caf5e554ecae /net-dns
parentDrop 2.7 versions (diff)
downloadgentoo-2-58aff38ed0f03d60b2357f751cc065afd086dc6c.tar.gz
gentoo-2-58aff38ed0f03d60b2357f751cc065afd086dc6c.tar.bz2
gentoo-2-58aff38ed0f03d60b2357f751cc065afd086dc6c.zip
Fixed broken pdnsd-online init script (result of bug #349335)
(Portage version: 2.2.0_alpha29/cvs/Linux x86_64)
Diffstat (limited to 'net-dns')
-rw-r--r--net-dns/pdnsd/ChangeLog9
-rw-r--r--net-dns/pdnsd/files/pdnsd.online.114
-rw-r--r--net-dns/pdnsd/pdnsd-1.2.8-r2.ebuild (renamed from net-dns/pdnsd/pdnsd-1.2.8-r1.ebuild)2
3 files changed, 14 insertions, 11 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/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"