- updated to 4.2.6p5

Changed files:
    ntp-4.2.6p1-droproot.patch -> 1.2
    ntp-4.2.6p1-rtnetlink.patch -> 1.3
    ntp-4.2.6p3-delaycalib.patch -> 1.2
    ntp.spec -> 1.153

diff --git a/ntp-4.2.6p1-droproot.patch b/ntp-4.2.6p1-droproot.patch
index 4d946b2a303e8a0b70206150b0fd7f4d57987536..12de7acc0c1e3195ac067f8e5c5b37822966bacd 100644 (file)
--- a/ntp-4.2.6p1-droproot.patch
+++ b/ntp-4.2.6p1-droproot.patch
@@ -5,10 +5,10 @@ diff -up ntp-4.2.6p1/html/ntpdate.html.droproot ntp-4.2.6p1/html/ntpdate.html
                <hr>
                <p>Disclaimer: The functionality of this program is now available in the <tt>ntpd</tt> program. See the <tt>-q</tt> command line option in the <a href="ntpd.html"><tt>ntpd</tt> - Network Time Protocol (NTP) daemon</a> page. After a suitable period of mourning, the <tt>ntpdate</tt> program is to be retired from this distribution</p>
                <h4>Synopsis</h4>
--              <tt>ntpdate [ -bBdoqsuv ] [ -a <i>key</i> ] [ -e <i>authdelay</i> ] [ -k <i>keyfile</i> ] [ -o <i>version</i> ] [ -p <i>samples</i> ] [ -t <i>timeout</i> ] <i>server</i> [ ... ]</tt>
-+              <tt>ntpdate [ -bBdoqsuv ] [ -a <i>key</i> ] [ -e <i>authdelay</i> ] [ -k <i>keyfile</i> ] [ -o <i>version</i> ] [ -p <i>samples</i> ] [ -t <i>timeout</i> ] [ -U <i>user_name</i> ] <i>server</i> [ ... ]</tt>
+-              <tt>ntpdate [ -46bBdqsuv ] [ -a <i>key</i> ] [ -e <i>authdelay</i> ] [ -k <i>keyfile</i> ] [ -o <i>version</i> ] [ -p <i>samples</i> ] [ -t <i>timeout</i> ] <i>server</i> [ ... ]</tt>
++              <tt>ntpdate [ -46bBdqsuv ] [ -a <i>key</i> ] [ -e <i>authdelay</i> ] [ -k <i>keyfile</i> ] [ -o <i>version</i> ] [ -p <i>samples</i> ] [ -t <i>timeout</i> ] [ -U <i>user_name</i> ] <i>server</i> [ ... ]</tt>
                <h4>Description</h4>
-               <tt>ntpdate</tt> sets the local date and time by polling the Network Time Protocol (NTP) server(s) given as the <i>server</i> arguments to determine the correct time. It must be run as root on the local host. A number of samples are obtained from each of the servers specified and a subset of the NTP clock filter and selection algorithms are applied to select the best of these. Note that the accuracy and reliability of <tt>ntpdate</tt> depends on the number of servers, the number of polls each time it is run and the interval between runs.
+               <p><tt>ntpdate</tt> sets the local date and time by polling the Network Time Protocol (NTP) server(s) given as the <i>server</i> arguments to determine the correct time. It must be run as root on the local host. A number of samples are obtained from each of the servers specified and a subset of the NTP clock filter and selection algorithms are applied to select the best of these. Note that the accuracy and reliability of <tt>ntpdate</tt> depends on the number of servers, the number of polls each time it is run and the interval between runs.</p>
                <p><tt>ntpdate</tt> can be run manually as necessary to set the host clock, or it can be run from the host startup script to set the clock at boot time. This is useful in some cases to set the clock initially before starting the NTP daemon <tt>ntpd</tt>. It is also possible to run <tt>ntpdate</tt> from a <tt>cron</tt> script. However, it is important to note that <tt>ntpdate</tt> with contrived <tt>cron</tt> scripts is no substitute for the NTP daemon, which uses sophisticated algorithms to maximize accuracy and reliability while minimizing resource use. Finally, since <tt>ntpdate</tt> does not discipline the host clock frequency as does <tt>ntpd</tt>, the accuracy using <tt>ntpdate</tt> is limited.</p>
 @@ -58,6 +58,11 @@
                        <dd>Direct <tt>ntpdate</tt> to use an unprivileged port or outgoing packets. This is most useful when behind a firewall that blocks incoming traffic to privileged ports, and you want to synchronise with hosts beyond the firewall. Note that the <tt>-d</tt> option always uses unprivileged ports.

diff --git a/ntp-4.2.6p1-rtnetlink.patch b/ntp-4.2.6p1-rtnetlink.patch
index f3674ee8b775508039825a8502d514554f0fb170..8d34c2393893986326bd892c0106c0e9d411aac7 100644 (file)
--- a/ntp-4.2.6p1-rtnetlink.patch
+++ b/ntp-4.2.6p1-rtnetlink.patch
@@ -1,14 +1,3 @@
-diff -up ntp-4.2.6p3/configure.rtnetlink ntp-4.2.6p3/configure
---- ntp-4.2.6p3/configure.rtnetlink    2011-01-04 03:03:47.000000000 +0100
-+++ ntp-4.2.6p3/configure      2011-01-05 17:39:29.342985208 +0100
-@@ -25858,6 +25858,7 @@ else
- /* end confdefs.h.  */
- 
-               #include <stddef.h>
-+              #include <sys/socket.h>
-               #include <linux/rtnetlink.h>
- 
- int
 diff -up ntp-4.2.6p3/ntpd/ntp_io.c.rtnetlink ntp-4.2.6p3/ntpd/ntp_io.c
 --- ntp-4.2.6p3/ntpd/ntp_io.c.rtnetlink        2011-01-05 16:03:19.328001089 +0100
 +++ ntp-4.2.6p3/ntpd/ntp_io.c  2011-01-05 16:03:19.349001911 +0100

diff --git a/ntp-4.2.6p3-delaycalib.patch b/ntp-4.2.6p3-delaycalib.patch
index 4380a096ab2c88e8262b659fb61158f9014a6f18..778497a08f86cb70303445efc2faeb5987d554d5 100644 (file)
--- a/ntp-4.2.6p3-delaycalib.patch
+++ b/ntp-4.2.6p3-delaycalib.patch
@@ -3,8 +3,8 @@ diff -up ntp-4.2.6p3/ntpd/ntp_proto.c.delaycalib ntp-4.2.6p3/ntpd/ntp_proto.c
 +++ ntp-4.2.6p3/ntpd/ntp_proto.c       2010-11-25 15:21:55.987625500 +0100
 @@ -1498,7 +1498,7 @@ process_packet(
                 */
-               if (peer->cast_flags & MDF_BCLNT) {
-                       peer->cast_flags &= ~MDF_BCLNT;
+               if (FLAG_BC_VOL & peer->flags) {
+                       peer->flags &= ~FLAG_BC_VOL;
 -                      peer->delay = (peer->offset - p_offset) * 2;
 +                      peer->delay = fabs(peer->offset - p_offset) * 2;
                }

diff --git a/ntp.spec b/ntp.spec
index bf6ec25bae4f4e6b1abf2d888fff6775b619d71e..eac780c098c84a0f173f4a11b30908a5a62e4bbb 100644 (file)
--- a/ntp.spec
+++ b/ntp.spec
@@ -10,12 +10,12 @@ Summary:    Network Time Protocol utilities
 Summary(pl.UTF-8):     Narzędzia do synchronizacji czasu (Network Time Protocol)
 Summary(pt_BR.UTF-8):  Network Time Protocol versão 4
 Name:          ntp
-Version:       4.2.6p3
-Release:       4
+Version:       4.2.6p5
+Release:       1
 License:       distributable
 Group:         Networking/Daemons
 Source0:       http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/%{name}-%{version}.tar.gz
-# Source0-md5: 59876a9009b098ff59767ee45a88ebd2
+# Source0-md5: 00df80a84ec9528fcfb09498075525bc
 Source1:       %{name}.conf
 Source2:       %{name}.keys
 Source3:       %{name}.init
@@ -228,15 +228,19 @@ Este pacote contém documentação adicional sobre o NTP versão 4.
 %patch106 -p1
 %patch107 -p1
 %patch108 -p1
-%patch109 -p1
-%patch110 -p1
+# already applied
+#%patch109 -p1
+# already applied
+#%patch110 -p1
 %patch112 -p1
 %patch113 -p1
 %patch114 -p1
-%patch116 -p1
+# already applied
+#%patch116 -p1
 %patch117 -p1
 %patch118 -p1
-%patch119 -p1
+# already applied
+#%patch119 -p1
 
 echo 'AM_CONDITIONAL([NEED_LIBOPTS], false)' >> configure.ac
 echo 'AM_CONDITIONAL([NEED_LIBOPTS], false)' >> sntp/configure.ac