Bump for non bash init scripts.

  ntpd now uses start-stop-daemon correctly.

Package-Manager: portage-2.1.2-r10

3 files changed, 15 insertions, 10 deletions

diff --git a/net-misc/ntp/files/digest-ntp-4.2.4-r1 b/net-misc/ntp/files/digest-ntp-4.2.4-r1
new file mode 100644
index 000000000000..35b5c07d3563
--- /dev/null
+++ b/net-misc/ntp/files/digest-ntp-4.2.4-r1
@@ -0,0 +1,6 @@
+MD5 7634518362dff8528c6527646885d96e ntp-4.2.4-manpages.tar.bz2 49084
+RMD160 a0f58094502b309e777b0e227f8e8b0c316f6c26 ntp-4.2.4-manpages.tar.bz2 49084
+SHA256 47daa90cec64bb1796f2194732972ee94947c64e64e571b27d2b77b3741991d6 ntp-4.2.4-manpages.tar.bz2 49084
+MD5 eb9147d26cbe18bd8fbec07f1df55aef ntp-4.2.4.tar.gz 3417698
+RMD160 bd51211582958f7c7d14ecd5ba04f5815bdc7ef8 ntp-4.2.4.tar.gz 3417698
+SHA256 a8adc8134d692273673559da3a4181e12cfb166f2177c726f916d4a9ff18182f ntp-4.2.4.tar.gz 3417698
diff --git a/net-misc/ntp/files/ntp-client.rc b/net-misc/ntp/files/ntp-client.rc
index 704f2daea3ea..05cce75c2bcf 100644
--- a/net-misc/ntp/files/ntp-client.rc
+++ b/net-misc/ntp/files/ntp-client.rc
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/ntp/files/ntp-client.rc,v 1.9 2007/01/09 17:51:14 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ntp/files/ntp-client.rc,v 1.10 2007/02/23 11:26:26 uberlord Exp $
 
 depend() {
 	before cron portmap
@@ -10,12 +10,12 @@ depend() {
 }
 
 checkconfig() {
-	if ! type -p ${NTPCLIENT_CMD} > /dev/null ; then
+	if ! type "${NTPCLIENT_CMD}" >/dev/null 2>/dev/null ; then
 		eerror "Please edit /etc/conf.d/ntp-client"
 		eerror "Unable to locate the client command ${NTPCLIENT_CMD}!"
 		return 1
 	fi
-	if [[ -z ${NTPCLIENT_OPTS} ]] ; then
+	if [ -z "${NTPCLIENT_OPTS}" ] ; then
 		eerror "Please edit /etc/conf.d/ntp-client"
 		eerror "I need to know what server/options to use!"
 		return 1
@@ -27,6 +27,6 @@ start() {
 	checkconfig || return $?
 
 	ebegin "Setting clock via the NTP client '${NTPCLIENT_CMD}'"
-	${NTPCLIENT_CMD} ${NTPCLIENT_OPTS} >/dev/null &
+	"${NTPCLIENT_CMD}" ${NTPCLIENT_OPTS} >/dev/null &
 	eend $? "Failed to set clock"
 }
diff --git a/net-misc/ntp/files/ntpd.rc b/net-misc/ntp/files/ntpd.rc
index 73459474c788..5ce7f5b0b2d8 100644
--- a/net-misc/ntp/files/ntpd.rc
+++ b/net-misc/ntp/files/ntpd.rc
@@ -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-misc/ntp/files/ntpd.rc,v 1.22 2005/08/20 04:10:15 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ntp/files/ntpd.rc,v 1.23 2007/02/23 11:26:26 uberlord Exp $
 
 depend() {
 	need net
@@ -22,7 +22,9 @@ start() {
 	checkconfig || return $?
 
 	ebegin "Starting ntpd"
-	/usr/sbin/ntpd -p /var/run/ntpd.pid ${NTPD_OPTS}
+	start-stop-daemon --start --exec /usr/sbin/ntpd \
+	    --pidfile /var/run/ntpd.pid \
+	    -- -p /var/run/ntpd.pid ${NTPD_OPTS}
 	eend $? "Failed to start ntpd"
 }
 
@@ -31,8 +33,5 @@ stop() {
 	start-stop-daemon --stop \
 		--pidfile /var/run/ntpd.pid \
 		--exec /usr/sbin/ntpd
-	local ret=$?
-	eend ${ret} "Failed to stop ntpd"
-	rm -f /var/run/ntpd.pid
-	return ${ret}
+	eend $? "Failed to stop ntpd"
 }