rpms/ntp/devel ntp-4.2.4-html2man.patch, 1.4, 1.5 ntp-4.2.4p5-htmldoc.patch, 1.2, 1.3 ntp.spec, 1.95, 1.96 ntpd.init, 1.28, 1.29 ntpdate.init, 1.2, 1.3

Wed Oct 21 14:12:11 UTC 2009

Author: mlichvar

Update of /cvs/pkgs/rpms/ntp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21054

Modified Files:
	ntp-4.2.4-html2man.patch ntp-4.2.4p5-htmldoc.patch ntp.spec 
	ntpd.init ntpdate.init 
Log Message:
- add ntp-wait man page (#526161)
- fix init scripts (#527987)


ntp-4.2.4-html2man.patch:
 html2man.in |  103 +++++++++++++++++++++++++++++++++++++++---------------------
 1 file changed, 68 insertions(+), 35 deletions(-)

Index: ntp-4.2.4-html2man.patch
===================================================================
RCS file: /cvs/pkgs/rpms/ntp/devel/ntp-4.2.4-html2man.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5

--- ntp-4.2.4-html2man.patch	29 Sep 2009 12:26:31 -0000	1.4
+++ ntp-4.2.4-html2man.patch	21 Oct 2009 14:12:11 -0000	1.5
@@ -1,12 +1,13 @@
 --- ntp-4.2.4/scripts/html2man.in.html2man	2006-06-06 22:17:10.000000000 +0200
 +++ ntp-4.2.4/scripts/html2man.in	2007-01-08 12:47:31.000000000 +0100
-@@ -23,10 +23,11 @@
+@@ -23,10 +23,12 @@ $MANDIR = "./man";
  	     'ntpq' => ['ntpq', 8, 'ntpd(8), ntpdc(8)'],
  	     'ntpdate' => ['ntpdate', 8, 'ntpd(8)'],
  	     'ntpdc' => ['ntpdc', 8, 'ntpd(8)'],
 -	     'ntptime' => ['ntpdtime', 8, 'ntpd(8), ntpdate(8)'],
 +	     'ntptime' => ['ntptime', 8, 'ntpd(8), ntpdate(8)'],
  	     'ntptrace' => ['ntptrace', 8, 'ntpd(8)'],
++	     'ntp-wait' => ['ntp-wait', 8, 'ntpd(8)'],
  	     'keygen' => ['ntp-keygen', 8, 'ntpd(8), ntp_auth(5)'],
 -	     'confopt' => ['ntp.conf', 5, 'ntpd(8)'],
 +	     'tickadj' => ['tickadj', 8, 'ntpd(8)'],

ntp-4.2.4p5-htmldoc.patch:
 ntp-4.2.4p5/html/authopt.html  |    4 ++--
 ntp-4.2.4p5/html/confopt.html  |    4 ++--
 ntp-4.2.4p5/html/keygen.html   |   10 ++++++----
 ntp-4.2.4p5/html/monopt.html   |   16 ++++------------
 ntp-4.2.4p5/html/ntpd.html     |   24 +++++++++++++++++-------
 ntp-4.2.4p5/html/ntpdate.html  |   16 ++++++++--------
 ntp-4.2.4p5/html/ntpdc.html    |   20 +++++++++++---------
 ntp-4.2.4p5/html/ntpq.html     |   12 ++++++------
 ntp-4.2.4p5/html/ntptrace.html |   10 +---------
 ntp-4.2.4p7/html/ntp-wait.html |   32 ++++++++++++++++++++++++++++++++
 ntp-4.2.4p7/html/tickadj.html  |    6 ++++--
 11 files changed, 93 insertions(+), 61 deletions(-)

Index: ntp-4.2.4p5-htmldoc.patch
===================================================================
RCS file: /cvs/pkgs/rpms/ntp/devel/ntp-4.2.4p5-htmldoc.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- ntp-4.2.4p5-htmldoc.patch	29 Sep 2009 12:26:31 -0000	1.2
+++ ntp-4.2.4p5-htmldoc.patch	21 Oct 2009 14:12:11 -0000	1.3
@@ -113,6 +113,42 @@ diff -up ntp-4.2.4p5/html/monopt.html.ht
  							<dd>Enables or disables the recording function.
  						</dl>
  				</dl>
+diff -up ntp-4.2.4p7/html/ntp-wait.html.htmldoc ntp-4.2.4p7/html/ntp-wait.html
+--- ntp-4.2.4p7/html/ntp-wait.html.htmldoc	2009-10-21 15:33:41.000000000 +0200
++++ ntp-4.2.4p7/html/ntp-wait.html	2009-10-21 15:51:18.000000000 +0200
+@@ -0,0 +1,32 @@
++<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
++<html>
++	<head>
++		<meta http-equiv="content-type" content="text/html;charset=iso-8859-1">
++		<meta name="generator" content="HTML Tidy, see www.w3.org">
++		<title>ntp-wait - waits until ntpd is in synchronized state</title>
++		<link href="scripts/style.css" type="text/css" rel="stylesheet">
++	</head>
++	<body>
++		<h3><tt>ntp-wait</tt> - waits until ntpd is in synchronized state</h3>
++		<hr>
++		<h4>Synopsis</h4>
++		<p><tt>ntp-wait [ -fv ] [ -n <i>tries</i> ] [ -s <i>seconds</i> ]</tt></p>
++		<h4>Description</h4>
++		<p>The <tt>ntp-wait</tt> program blocks until ntpd is in synchronized state.
++		This can be useful at boot time, to delay the boot sequence
++		until after "ntpd -g" has set the time.
++		<h4>Command Line Options</h4>
++		<dl>
++			<dt><tt>-f</tt>
++			<dd>Return a non-zero exit code if the state is unknown.
++			<dt><tt>-n <i>tries</i></tt>
++			<dd>Number of tries before giving up. The default is 1000.
++			<dt><tt>-s <i>seconds</i></tt>
++			<dd>Seconds to sleep between tries. The default is 6 seconds.
++			<dt><tt>-v</tt>
++			<dd>Be verbose.
++		</dl>
++		<script type="text/javascript" language="javascript" src="scripts/footer.txt"></script>
++	</body>
++
++</html>
 diff -up ntp-4.2.4p5/html/ntpd.html.htmldoc ntp-4.2.4p5/html/ntpd.html
 --- ntp-4.2.4p5/html/ntpd.html.htmldoc	2006-12-28 13:02:57.000000000 +0100
 +++ ntp-4.2.4p5/html/ntpd.html	2008-08-18 12:31:59.000000000 +0200


Index: ntp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ntp/devel/ntp.spec,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -p -r1.95 -r1.96
--- ntp.spec	29 Sep 2009 12:26:31 -0000	1.95
+++ ntp.spec	21 Oct 2009 14:12:11 -0000	1.96
@@ -1,7 +1,7 @@
 Summary: The NTP daemon and utilities
 Name: ntp
 Version: 4.2.4p7
-Release: 6%{?dist}
+Release: 7%{?dist}
 # primary license (COPYRIGHT) : MIT
 # ElectricFence/ (not used) : GPLv2
 # kernel/sys/ppsclock.h (not used) : BSD with advertising
@@ -352,6 +352,7 @@ fi
 %defattr(-,root,root)
 %{_sbindir}/ntp-wait
 %{_sbindir}/ntptrace
+%{_mandir}/man8/ntp-wait.8*
 %{_mandir}/man8/ntptrace.8*
 
 %files -n ntpdate
@@ -369,6 +370,10 @@ fi
 %{ntpdocdir}/html
 
 %changelog
+* Wed Oct 21 2009 Miroslav Lichvar <mlichvar at redhat.com> 4.2.4p7-7
+- add ntp-wait man page (#526161)
+- fix init scripts (#527987)
+
 * Tue Sep 29 2009 Miroslav Lichvar <mlichvar at redhat.com> 4.2.4p7-6
 - generate tickadj man page (#526161)
 - fix precision calculation on fast CPUs


Index: ntpd.init
===================================================================
RCS file: /cvs/pkgs/rpms/ntp/devel/ntpd.init,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- ntpd.init	20 Apr 2009 11:44:54 -0000	1.28
+++ ntpd.init	21 Oct 2009 14:12:11 -0000	1.29
@@ -32,11 +32,9 @@ prog=ntpd
 lockfile=/var/lock/subsys/$prog
 
 start() {
-	# Check that networking is up.
+	[ "$EUID" != "0" ] && exit 4
 	[ "$NETWORKING" = "no" ] && exit 1
-
 	[ -x /usr/sbin/ntpd ] || exit 5
-
 	[ -f /etc/sysconfig/ntpd ] || exit 6
 	. /etc/sysconfig/ntpd
 
@@ -50,6 +48,7 @@ start() {
 }
 
 stop() {
+	[ "$EUID" != "0" ] && exit 4
         echo -n $"Shutting down $prog: "
 	killproc $prog
 	RETVAL=$?


Index: ntpdate.init
===================================================================
RCS file: /cvs/pkgs/rpms/ntp/devel/ntpdate.init,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- ntpdate.init	7 Apr 2008 17:18:26 -0000	1.2
+++ ntpdate.init	21 Oct 2009 14:12:11 -0000	1.3
@@ -23,10 +23,9 @@ ntpconf=/etc/ntp.conf
 ntpstep=/etc/ntp/step-tickers
 
 start() {
+	[ "$EUID" != "0" ] && exit 4
 	[ "$NETWORKING" = "no" ] && exit 1
-
 	[ -x /usr/sbin/ntpdate ] || exit 5
-
 	[ -f /etc/sysconfig/ntpdate ] || exit 6
 	. /etc/sysconfig/ntpdate
 
@@ -63,6 +62,7 @@ status() {
 }
 
 stop() {
+	[ "$EUID" != "0" ] && exit 4
 	rm -f $lockfile
 }
 


