File ntp-4.2.6p5-xleap.patch of Package ntp.500

Index: ntp-4.2.6p5/html/miscopt.html
===================================================================
--- ntp-4.2.6p5.orig/html/miscopt.html	2009-12-09 08:36:36.000000000 +0100
+++ ntp-4.2.6p5/html/miscopt.html	2015-03-13 14:59:55.454596520 +0100
@@ -88,7 +88,7 @@
 						is 0.128 s. If set to zero, step adjustments will never
 						occur. Note: The kernel time discipline is disabled if
 						the step threshold is set to zero or greater than 0.5
-						s.</dd>
+						s and the threshold is applied also to leap second corrections.</dd>
 					<dt><tt>stepout <i>stepout</i></tt></dt>
 					<dd>Specifies the stepout threshold in seconds. The default without this
 						command is 900 s.  If set to zero, popcorn spikes will
Index: ntp-4.2.6p5/html/ntpd.html
===================================================================
--- ntp-4.2.6p5.orig/html/ntpd.html	2011-07-11 04:18:26.000000000 +0200
+++ ntp-4.2.6p5/html/ntpd.html	2015-03-13 14:59:55.455596532 +0100
@@ -147,7 +147,7 @@
 			<dt><tt>-V <i>variable</i></tt></dt>
 			<dd>Add a system variable listed by default.</dd>
 			<dt><tt>-x</tt></dt>
-			<dd>Normally, the time is slewed if the offset is less than the step threshold, which is 128 ms by default, and stepped if above the threshold. This option sets the threshold to 600 s, which is well within the accuracy window to set the clock manually. Note: Since the slew rate of typical Unix kernels is limited to 0.5 ms/s, each second of adjustment requires an amortization interval of 2000 s. Thus, an adjustment as much as 600 s will take almost 14 days to complete. This option can be used with the <tt>-g</tt> and <tt>-q</tt> options. See the <tt>tinker</tt> command for other options. Note: The kernel time discipline is disabled with this option.</dd>
+			<dd>Normally, the time is slewed if the offset is less than the step threshold, which is 128 ms by default, and stepped if above the threshold. This option sets the threshold to 600 s, which is well within the accuracy window to set the clock manually. Note: Since the slew rate of typical Unix kernels is limited to 0.5 ms/s, each second of adjustment requires an amortization interval of 2000 s. Thus, an adjustment as much as 600 s will take almost 14 days to complete. This option can be used with the <tt>-g</tt> and <tt>-q</tt> options. See the <tt>tinker</tt> command for other options. Note: The kernel time discipline is disabled with this option and the step threshold is applied also to leap second corrections.</dd>
 			<dt><tt>--pccfreq <i>frequency</i></tt></dt>
 			<dd>Substitute processor cycle counter for QueryPerformanceCounter unconditionally
 				using the given frequency (in Hz). <tt>--pccfreq</tt> can be used on systems
Index: ntp-4.2.6p5/ntpd/ntp_timer.c
===================================================================
--- ntp-4.2.6p5.orig/ntpd/ntp_timer.c	2011-12-01 03:55:17.000000000 +0100
+++ ntp-4.2.6p5/ntpd/ntp_timer.c	2015-03-13 14:59:55.455596532 +0100
@@ -338,7 +338,8 @@
 			sys_leap = LEAP_NOWARNING;
 			sys_tai = leap_tai;
 #ifdef KERNEL_PLL
-			if (!(pll_control && kern_enable))
+			if (clock_max < 1.0 && clock_max > 0.0 &&
+					!(pll_control && kern_enable))
 				step_systime(-1.0);
 #else /* KERNEL_PLL */
 #ifndef SYS_WINNT /* WinNT port has its own leap second handling */
openSUSE Build Service is sponsored by