rpms/ntp/F-12 ntp-4.2.4p7-getprecision.patch, NONE, 1.1 ntp-4.2.4-html2man.patch, 1.3, 1.4 ntp-4.2.4p5-htmldoc.patch, 1.1, 1.2 ntp.spec, 1.94, 1.95 ntpd.init, 1.28, 1.29 ntpdate.init, 1.2, 1.3

Miroslav Lichvar mlichvar at fedoraproject.org
Wed Oct 21 14:24:55 UTC 2009 

Author: mlichvar

Update of /cvs/pkgs/rpms/ntp/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24769

Modified Files:
	ntp-4.2.4-html2man.patch ntp-4.2.4p5-htmldoc.patch ntp.spec 
	ntpd.init ntpdate.init 
Added Files:
	ntp-4.2.4p7-getprecision.patch 
Log Message:
- add ntp-wait man page (#526161)
- fix init scripts (#527987)
- generate tickadj man page (#526161)
- fix precision calculation on fast CPUs


ntp-4.2.4p7-getprecision.patch:
 ntp_proto.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE ntp-4.2.4p7-getprecision.patch ---
diff -up ntp-4.2.4p7/ntpd/ntp_proto.c.getprecision ntp-4.2.4p7/ntpd/ntp_proto.c
--- ntp-4.2.4p7/ntpd/ntp_proto.c.getprecision	2009-09-29 14:16:22.000000000 +0200
+++ ntp-4.2.4p7/ntpd/ntp_proto.c	2009-09-29 14:18:13.000000000 +0200
@@ -3099,7 +3099,7 @@ peer_unfit(
 /*
  * Find the precision of this particular machine
  */
-#define MINSTEP 100e-9		/* minimum clock increment (s) */
+#define MINSTEP 10e-9		/* minimum clock increment (s) */
 #define MAXSTEP 20e-3		/* maximum clock increment (s) */
 #define MINLOOPS 5		/* minimum number of step samples */
 

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/F-12/ntp-4.2.4-html2man.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- ntp-4.2.4-html2man.patch	29 Jan 2007 13:33:45 -0000	1.3
+++ ntp-4.2.4-html2man.patch	21 Oct 2009 14:24:55 -0000	1.4
@@ -1,14 +1,16 @@
 --- 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,10 @@
+@@ -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)'],
 +	     'confopt' => ['ntp.conf', 5, 'ntpd(8), ntp_auth(5), ntp_mon(5), ntp_acc(5), ntp_clock(5), ntp_misc(5)'],
  	     'authopt' => ['ntp_auth', 5, 'ntp.conf(5), ntpd(8)'],
  	     'monopt' => ['ntp_mon', 5, 'ntp.conf(5)'],

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/F-12/ntp-4.2.4p5-htmldoc.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- ntp-4.2.4p5-htmldoc.patch	29 Aug 2008 08:26:04 -0000	1.1
+++ ntp-4.2.4p5-htmldoc.patch	21 Oct 2009 14:24:55 -0000	1.2
@@ -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
@@ -397,3 +433,26 @@ diff -up ntp-4.2.4p5/html/ntptrace.html.
  		</dl>
  		<h4>Bugs</h4>
  		<p>This program makes no attempt to improve accuracy by doing multiple samples.</p>
+diff -up ntp-4.2.4p7/html/tickadj.html.htmldoc ntp-4.2.4p7/html/tickadj.html
+--- ntp-4.2.4p7/html/tickadj.html.htmldoc	2006-06-06 22:16:08.000000000 +0200
++++ ntp-4.2.4p7/html/tickadj.html	2009-09-29 14:01:40.000000000 +0200
+@@ -14,9 +14,11 @@
+ 		<p>Last update: <csobj format="ShortTime" h="25" locale="00000409" region="0" t="DateTime" w="61">18:50</csobj> UTC <csobj format="LongDate" h="25" locale="00000409" region="0" t="DateTime" w="246">Thursday, July 28, 2005</csobj></p>
+ 		<hr>
+ 		<h4>Synopsis</h4>
+-		<tt>tickadj [ -Aqs ] [ -a <i>tickadj</i> ] [ -t <i>tick</i> ]</tt>
++		<p><tt>tickadj [ <i>tick</i> ]</tt></p>
++		<p><tt>tickadj [ -Aqs ] [ -a <i>tickadj</i> ] [ -t <i>tick</i> ]</tt></p>
+ 		<h4>Description</h4>
+ 		<p>The <tt>tickadj</tt> program reads, and optionally modifies, several timekeeping-related variables in older kernels that do not have support for precision ttimekeeping, including HP-UX, SunOS, Ultrix, SGI and probably others. Those machines provide means to patch the kernel <tt>/dev/kmem</tt>. Newer machines with precision time support, including Solaris, Tru64, FreeBSD and Linux (with PPSkit patch) should NOT use the program. The particular variables that can be changed with <tt>tickadj</tt> include <tt>tick</tt>, which is the number of microseconds added to the system time for a clock interrupt, <tt>tickadj</tt>, which sets the slew rate and resolution used by the <tt>adjtime</tt> system call, and <tt>dosynctodr</tt>, which indicates to the kernels on some machines whether they should internally adjust the system clock to keep it in line with time-of-day clock or not.</p>
++		<p>On Linux, only the <tt>tick</tt> variable is supported and the only allowed argument is the tick value.</p>
+ 		<p>By default, with no arguments, <tt>tickadj</tt> reads the variables of interest in the kernel and displays them. At the same time, it determines an "optimal" value for the value of the <tt>tickadj</tt> variable if the intent is to run the <tt>ntpd</tt> Network Time Protocol (NTP) daemon, and prints this as well. Since the operation of <tt>tickadj</tt> when reading the kernel mimics the operation of similar parts of the <tt>ntpd</tt> program fairly closely, this can be useful when debugging problems with <tt>ntpd</tt>.</p>
+ 		<p>Note that <tt>tickadj</tt> should be run with some caution when being used for the first time on different types of machines. The operations which <tt>tickadj</tt> tries to perform are not guaranteed to work on all Unix machines and may in rare cases cause the kernel to crash.</p>
+ 		<h4>Command Line Options</h4>
+@@ -46,4 +48,4 @@
+ 		<script type="text/javascript" language="javascript" src="scripts/footer.txt"></script>
+ 	</body>
+ 
+-</html>
+\ No newline at end of file
++</html>


Index: ntp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ntp/F-12/ntp.spec,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -p -r1.94 -r1.95
--- ntp.spec	21 Aug 2009 14:45:39 -0000	1.94
+++ ntp.spec	21 Oct 2009 14:24:55 -0000	1.95
@@ -1,7 +1,7 @@
 Summary: The NTP daemon and utilities
 Name: ntp
 Version: 4.2.4p7
-Release: 5%{?dist}
+Release: 7%{?dist}
 # primary license (COPYRIGHT) : MIT
 # ElectricFence/ (not used) : GPLv2
 # kernel/sys/ppsclock.h (not used) : BSD with advertising
@@ -104,6 +104,8 @@ Patch30: ntp-4.2.4p7-freqmode.patch
 Patch31: ntpstat-0.2-clksrc.patch
 # process first packet in multipacket response
 Patch32: ntpstat-0.2-multipacket.patch
+# fix precision calculation on fast CPUs
+Patch33: ntp-4.2.4p7-getprecision.patch
 
 URL: http://www.ntp.org
 Requires(post): /sbin/chkconfig
@@ -192,6 +194,7 @@ This package contains NTP documentation 
 %patch30 -p1 -b .freqmode
 %patch31 -p1 -b .clksrc
 %patch32 -p1 -b .multipacket
+%patch33 -p1 -b .getprecision
 
 # clock_gettime needs -lrt
 sed -i.gettime 's|^LIBS = @LIBS@|& -lrt|' ntp{d,q,dc,date}/Makefile.in
@@ -343,11 +346,13 @@ fi
 %{_mandir}/man8/ntpq.8*
 %{_mandir}/man8/ntpstat.8*
 %{_mandir}/man8/ntptime.8*
+%{_mandir}/man8/tickadj.8*
 
 %files perl
 %defattr(-,root,root)
 %{_sbindir}/ntp-wait
 %{_sbindir}/ntptrace
+%{_mandir}/man8/ntp-wait.8*
 %{_mandir}/man8/ntptrace.8*
 
 %files -n ntpdate
@@ -365,6 +370,14 @@ 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
+
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 4.2.4p7-5
 - rebuilt with new openssl
 


Index: ntpd.init
===================================================================
RCS file: /cvs/pkgs/rpms/ntp/F-12/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:24:55 -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/F-12/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:24:55 -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
 }

More information about the fedora-extras-commits mailing list