[ntp] update to 4.2.6p4
Miroslav Lichvar
mlichvar at fedoraproject.org
Thu Oct 6 15:30:15 UTC 2011
commit 8055a9fe683c1d8fa4f10cb537a7cbd2254eca7f
Author: Miroslav Lichvar <mlichvar at redhat.com>
Date: Thu Oct 6 15:11:02 2011 +0200
update to 4.2.6p4
.gitignore | 4 +-
ntp-4.2.6p2-html2man.patch | 220 -----------
ntp-4.2.6p2-htmldoc.patch | 403 --------------------
ntp-4.2.6p3-nosyspeer.patch | 19 -
ntp-4.2.6p3-ntpdaterecv.patch | 21 -
ntp-4.2.6p3-rtnetlink.patch | 26 --
ntp-4.2.6p3-tentative.patch | 23 --
...p1-droproot.patch => ntp-4.2.6p4-droproot.patch | 33 +-
ntp-4.2.6p4-htmldoc.patch | 76 ++++
ntp-4.2.6p3-mlock.patch => ntp-4.2.6p4-mlock.patch | 40 +-
ntp-4.2.6p4-rtnetlink.patch | 15 +
ntp.spec | 24 +-
sources | 2 +-
13 files changed, 136 insertions(+), 770 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index c899b41..7a8af79 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
-ntpstat-0.2.tgz
-ntp-4.2.6p3.tar.gz
+/ntpstat-0.2.tgz
+/ntp-4.2.6p4.tar.gz
diff --git a/ntp-4.2.6p1-droproot.patch b/ntp-4.2.6p4-droproot.patch
similarity index 74%
rename from ntp-4.2.6p1-droproot.patch
rename to ntp-4.2.6p4-droproot.patch
index 4d946b2..1d953d1 100644
--- a/ntp-4.2.6p1-droproot.patch
+++ b/ntp-4.2.6p4-droproot.patch
@@ -1,20 +1,19 @@
-diff -up ntp-4.2.6p1/html/ntpdate.html.droproot ntp-4.2.6p1/html/ntpdate.html
---- ntp-4.2.6p1/html/ntpdate.html.droproot 2006-12-28 13:02:58.000000000 +0100
-+++ ntp-4.2.6p1/html/ntpdate.html 2010-03-03 15:32:08.000000000 +0100
+diff -up ntp-4.2.6p4/html/ntpdate.html.droproot ntp-4.2.6p4/html/ntpdate.html
+--- ntp-4.2.6p4/html/ntpdate.html.droproot 2011-07-11 04:18:25.000000000 +0200
++++ ntp-4.2.6p4/html/ntpdate.html 2011-10-05 15:47:29.643634928 +0200
@@ -18,7 +18,7 @@
<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.
+@@ -58,6 +58,10 @@
+ <dd>Direct <tt>ntpdate</tt> to use an unprivileged port for outgoing packets. This is most useful when behind a firewall that blocks incoming traffic to privileged ports, and you want to synchronize with hosts beyond the firewall. Note that the <tt>-d</tt> option always uses unprivileged ports.
<dt><tt>-<i>v</i></tt>
<dd>Be verbose. This option will cause <tt>ntpdate</tt>'s version identification string to be logged.
-+
+ <dt><tt>-U <i>user_name</i></tt></dt>
+ <dd>ntpdate process drops root privileges and changes user ID to
+ <i>user_name</i> and group ID to the primary group of
@@ -22,10 +21,10 @@ diff -up ntp-4.2.6p1/html/ntpdate.html.droproot ntp-4.2.6p1/html/ntpdate.html
</dl>
<h4>Diagnostics</h4>
<tt>ntpdate</tt>'s exit status is zero if it finds a server and updates the clock, and nonzero otherwise.
-diff -up ntp-4.2.6p1/ntpdate/ntpdate.c.droproot ntp-4.2.6p1/ntpdate/ntpdate.c
---- ntp-4.2.6p1/ntpdate/ntpdate.c.droproot 2009-12-09 08:36:35.000000000 +0100
-+++ ntp-4.2.6p1/ntpdate/ntpdate.c 2010-03-03 15:33:06.000000000 +0100
-@@ -48,6 +48,12 @@
+diff -up ntp-4.2.6p4/ntpdate/ntpdate.c.droproot ntp-4.2.6p4/ntpdate/ntpdate.c
+--- ntp-4.2.6p4/ntpdate/ntpdate.c.droproot 2011-05-25 07:06:09.000000000 +0200
++++ ntp-4.2.6p4/ntpdate/ntpdate.c 2011-10-05 15:45:39.570555972 +0200
+@@ -49,6 +49,12 @@
#include <arpa/inet.h>
@@ -38,7 +37,7 @@ diff -up ntp-4.2.6p1/ntpdate/ntpdate.c.droproot ntp-4.2.6p1/ntpdate/ntpdate.c
#ifdef SYS_VXWORKS
# include "ioLib.h"
# include "sockLib.h"
-@@ -152,6 +158,11 @@ int simple_query = 0;
+@@ -153,6 +159,11 @@ int simple_query = 0;
int unpriv_port = 0;
/*
@@ -50,7 +49,7 @@ diff -up ntp-4.2.6p1/ntpdate/ntpdate.c.droproot ntp-4.2.6p1/ntpdate/ntpdate.c
* Program name.
*/
char *progname;
-@@ -293,6 +304,88 @@ void clear_globals()
+@@ -294,6 +305,88 @@ void clear_globals()
static ni_namelist *getnetinfoservers (void);
#endif
@@ -139,7 +138,7 @@ diff -up ntp-4.2.6p1/ntpdate/ntpdate.c.droproot ntp-4.2.6p1/ntpdate/ntpdate.c
/*
* Main program. Initialize us and loop waiting for I/O and/or
* timer expiries.
-@@ -340,6 +433,8 @@ ntpdatemain (
+@@ -341,6 +434,8 @@ ntpdatemain (
init_lib(); /* sets up ipv4_works, ipv6_works */
@@ -148,7 +147,7 @@ diff -up ntp-4.2.6p1/ntpdate/ntpdate.c.droproot ntp-4.2.6p1/ntpdate/ntpdate.c
/* Check to see if we have IPv6. Otherwise default to IPv4 */
if (!ipv6_works)
ai_fam_templ = AF_INET;
-@@ -351,7 +446,7 @@ ntpdatemain (
+@@ -352,7 +447,7 @@ ntpdatemain (
/*
* Decode argument list
*/
diff --git a/ntp-4.2.6p4-htmldoc.patch b/ntp-4.2.6p4-htmldoc.patch
new file mode 100644
index 0000000..2b2dab7
--- /dev/null
+++ b/ntp-4.2.6p4-htmldoc.patch
@@ -0,0 +1,76 @@
+diff -up ntp-4.2.6p4/html/authopt.html.htmldoc ntp-4.2.6p4/html/authopt.html
+--- ntp-4.2.6p4/html/authopt.html.htmldoc 2011-07-11 04:18:25.000000000 +0200
++++ ntp-4.2.6p4/html/authopt.html 2011-10-05 17:30:09.463244610 +0200
+@@ -364,7 +364,7 @@ UTC</p>
+ are left unspecified, the default names are used as described below. Unless
+ the complete path and name of the file are specified, the location of a file
+ is relative to the keys directory specified in the <tt>keysdir</tt> configuration
+- command or default <tt>/usr/local/etc</tt>. Following are the options.</dd>
++ command or default <tt>/etc/ntp/crypto</tt>. Following are the options.</dd>
+
+ <dd><dl>
+
+@@ -396,7 +396,7 @@ UTC</p>
+ <dd>Specifies the complete path to the MD5 key file containing the keys and key IDs used by <tt>ntpd</tt>, <tt>ntpq</tt> and <tt>ntpdc</tt> when operating with symmetric key cryptography. This is the same operation as the <tt>-k </tt>command line option. Note that the directory path for Autokey media is specified by the <tt>keysdir</tt> command.</dd>
+
+ <dt id="keysdir"><tt>keysdir <i>path</i></tt>K</dt>
+-<dd>This command specifies the default directory path for Autokey cryptographic keys, parameters and certificates. The default is <tt>/usr/local/etc/</tt>. Note that the path for the symmetric keys file is specified by the <tt>keys</tt> command.</dd>
++<dd>This command specifies the default directory path for Autokey cryptographic keys, parameters and certificates. The default is <tt>/etc/ntp/crypto</tt>. Note that the path for the symmetric keys file is specified by the <tt>keys</tt> command.</dd>
+
+ <dt id="requestkey"><tt>requestkey <i>keyid</i></tt></dt>
+ <dd>Specifies the key ID to use with the
+diff -up ntp-4.2.6p4/html/keygen.html.htmldoc ntp-4.2.6p4/html/keygen.html
+--- ntp-4.2.6p4/html/keygen.html.htmldoc 2011-07-11 04:18:26.000000000 +0200
++++ ntp-4.2.6p4/html/keygen.html 2011-10-05 17:30:09.463244610 +0200
+@@ -206,7 +206,6 @@
+ <p>All cryptographically sound key generation schemes must have means to randomize the entropy seed used to initialize the internal pseudo-random number generator used by the OpenSSL library routines. If a site supports <tt>ssh</tt>, it is very likely that means to do this are already available. The entropy seed used by the OpenSSL library is contained in a file, usually called <tt>.rnd</tt>, which must be available when starting the <tt>ntp-keygen</tt> program or <tt>ntpd</tt> daemon.</p>
+
+ <p>The OpenSSL library looks for the file using the path specified by the <tt>RANDFILE</tt> environment variable in the user home directory, whether root or some other user. If the <tt>RANDFILE</tt> environment variable is not present, the library looks for the <tt>.rnd</tt> file in the user home directory. Since both the <tt>ntp-keygen</tt> program and <tt>ntpd</tt> daemon must run as root, the logical place to put this file is in <tt>/.rnd</tt> or <tt>/root/.rnd</tt>. If the file is not available or cannot be written, the program exits with a message to the system log.</p>
+-<p>On systems that provide /dev/urandom, the randomness device is used instead and the file specified by the <tt>randfile</tt> subcommand or the <tt>RANDFILE</tt> environment variable is ignored.</p>
+
+ <h4 id="priv">Cryptographic Data Files</h4>
+
+diff -up ntp-4.2.6p4/html/ntpd.html.htmldoc ntp-4.2.6p4/html/ntpd.html
+--- ntp-4.2.6p4/html/ntpd.html.htmldoc 2011-07-11 04:18:26.000000000 +0200
++++ ntp-4.2.6p4/html/ntpd.html 2011-10-05 17:34:07.545384008 +0200
+@@ -214,14 +214,14 @@
+ </tr>
+ <tr>
+ <td width="30%">statistics path</td>
+- <td width="30%"><tt>/var/NTP</tt></td>
++ <td width="30%"><tt>/var/log/ntpstats/</tt></td>
+ <td width="20%"><tt>-s</tt></td>
+ <td width="20%"><tt>statsdir</tt></td>
+ </tr>
+ <tr>
+ <td width="30%">keys path</td>
+- <td width="30%"><tt>/usr/local/etc</tt></td>
+- <td width="20%"><tt>-k</tt></td>
++ <td width="30%"><tt>/etc/ntp/crypto</tt></td>
++ <td width="20%"><tt>none</tt></td>
+ <td width="20%"><tt>keysdir</tt></td>
+ </tr>
+ </table>
+diff -up ntp-4.2.6p4/html/ntpdate.html.htmldoc ntp-4.2.6p4/html/ntpdate.html
+--- ntp-4.2.6p4/html/ntpdate.html.htmldoc 2011-10-05 17:30:09.438244595 +0200
++++ ntp-4.2.6p4/html/ntpdate.html 2011-10-05 17:36:24.195463971 +0200
+@@ -43,7 +43,7 @@
+ <dt><tt>-e <i>authdelay</i></tt>
+ <dd>Specify the processing delay to perform an authentication function as the value <i>authdelay</i>, in seconds and fraction (see <tt>ntpd</tt> for details). This number is usually small enough to be negligible for most purposes, though specifying a value may improve timekeeping on very slow CPU's.
+ <dt><tt>-k <i>keyfile</i></tt>
+- <dd>Specify the path for the authentication key file as the string <i>keyfile</i>. The default is <tt>/etc/ntp.keys</tt>. This file should be in the format described in <tt>ntpd</tt>.
++ <dd>Specify the path for the authentication key file as the string <i>keyfile</i>. The default is <tt>/etc/ntp/keys</tt>. This file should be in the format described in <tt>ntpd</tt>.
+ <dt><tt>-o <i>version</i></tt>
+ <dd>Specify the NTP version for outgoing packets as the integer <i>version</i>, which can be 1 or 2. The default is 4. This allows <tt>ntpdate</tt> to be used with older NTP versions.
+ <dt><tt>-p <i>samples</i></tt>
+@@ -66,7 +66,7 @@
+ <h4>Diagnostics</h4>
+ <tt>ntpdate</tt>'s exit status is zero if it finds a server and updates the clock, and nonzero otherwise.
+ <h4>Files</h4>
+- <tt>/etc/ntp.keys</tt> - encryption keys used by <tt>ntpdate</tt>.
++ <tt>/etc/ntp/keys</tt> - encryption keys used by <tt>ntpdate</tt>.
+ <h4>Bugs</h4>
+ The slew adjustment is actually 50% larger than the measured offset, since this (it is argued) will tend to keep a badly drifting clock more accurate. This is probably not a good idea and may cause a troubling hunt for some values of the kernel variables <tt>tick</tt> and <tt>tickadj</tt>.
+ <hr>
+diff -up ntp-4.2.6p4/html/ntpdc.html.htmldoc ntp-4.2.6p4/html/ntpdc.html
+diff -up ntp-4.2.6p4/html/ntpq.html.htmldoc ntp-4.2.6p4/html/ntpq.html
diff --git a/ntp-4.2.6p3-mlock.patch b/ntp-4.2.6p4-mlock.patch
similarity index 83%
rename from ntp-4.2.6p3-mlock.patch
rename to ntp-4.2.6p4-mlock.patch
index f977b3d..354f7d5 100644
--- a/ntp-4.2.6p3-mlock.patch
+++ b/ntp-4.2.6p4-mlock.patch
@@ -1,6 +1,6 @@
-diff -up ntp-4.2.6p3/html/ntpd.html.mlock ntp-4.2.6p3/html/ntpd.html
---- ntp-4.2.6p3/html/ntpd.html.mlock 2011-01-05 17:51:36.242120783 +0100
-+++ ntp-4.2.6p3/html/ntpd.html 2011-01-05 17:51:36.254121258 +0100
+diff -up ntp-4.2.6p4/html/ntpd.html.mlock ntp-4.2.6p4/html/ntpd.html
+--- ntp-4.2.6p4/html/ntpd.html.mlock 2011-10-06 13:08:50.897274352 +0200
++++ ntp-4.2.6p4/html/ntpd.html 2011-10-06 13:08:50.909274362 +0200
@@ -32,7 +32,7 @@
</ul>
<hr>
@@ -19,10 +19,10 @@ diff -up ntp-4.2.6p3/html/ntpd.html.mlock ntp-4.2.6p3/html/ntpd.html
<dt><tt>-n</tt></dt>
<dd>Don't fork.</dd>
<dt><tt>-N</tt></dt>
-diff -up ntp-4.2.6p3/ntpd/ntpd-opts.c.mlock ntp-4.2.6p3/ntpd/ntpd-opts.c
---- ntp-4.2.6p3/ntpd/ntpd-opts.c.mlock 2011-01-04 03:15:35.000000000 +0100
-+++ ntp-4.2.6p3/ntpd/ntpd-opts.c 2011-01-05 17:55:01.609260787 +0100
-@@ -282,6 +282,15 @@ static char const zNice_Name[]
+diff -up ntp-4.2.6p4/ntpd/ntpd-opts.c.mlock ntp-4.2.6p4/ntpd/ntpd-opts.c
+--- ntp-4.2.6p4/ntpd/ntpd-opts.c.mlock 2011-09-23 05:36:04.000000000 +0200
++++ ntp-4.2.6p4/ntpd/ntpd-opts.c 2011-10-06 13:10:54.082360146 +0200
+@@ -276,6 +276,15 @@ static char const zNice_Name[]
#define NICE_FLAGS (OPTST_DISABLED)
/*
@@ -38,7 +38,7 @@ diff -up ntp-4.2.6p3/ntpd/ntpd-opts.c.mlock ntp-4.2.6p3/ntpd/ntpd-opts.c
* Pidfile option description:
*/
static char const zPidfileText[] =
-@@ -909,6 +918,18 @@ static tOptDesc optDesc[ OPTION_CT ] = {
+@@ -903,6 +912,18 @@ static tOptDesc optDesc[OPTION_CT] = {
/* desc, NAME, name */ zPccfreqText, zPccfreq_NAME, zPccfreq_Name,
/* disablement strs */ NULL, NULL },
@@ -57,7 +57,7 @@ diff -up ntp-4.2.6p3/ntpd/ntpd-opts.c.mlock ntp-4.2.6p3/ntpd/ntpd-opts.c
{ /* entry idx, value */ INDEX_OPT_VERSION, VALUE_OPT_VERSION,
/* equiv idx value */ NO_EQUIVALENT, 0,
/* equivalenced to */ NO_EQUIVALENT,
-@@ -1008,7 +1029,7 @@ tOptions ntpdOptions = {
+@@ -1018,7 +1039,7 @@ tOptions ntpdOptions = {
NO_EQUIVALENT, /* '-#' option index */
NO_EQUIVALENT /* index of default opt */
},
@@ -65,11 +65,11 @@ diff -up ntp-4.2.6p3/ntpd/ntpd-opts.c.mlock ntp-4.2.6p3/ntpd/ntpd-opts.c
+ 36 /* full option count */, 33 /* user option count */,
ntpd_full_usage, ntpd_short_usage,
NULL, NULL,
- PKGDATADIR
-diff -up ntp-4.2.6p3/ntpd/ntpd-opts.h.mlock ntp-4.2.6p3/ntpd/ntpd-opts.h
---- ntp-4.2.6p3/ntpd/ntpd-opts.h.mlock 2011-01-04 03:15:35.000000000 +0100
-+++ ntp-4.2.6p3/ntpd/ntpd-opts.h 2011-01-05 17:51:36.256121337 +0100
-@@ -82,6 +82,7 @@ typedef enum {
+ PKGDATADIR, ntpd_packager_info
+diff -up ntp-4.2.6p4/ntpd/ntpd-opts.h.mlock ntp-4.2.6p4/ntpd/ntpd-opts.h
+--- ntp-4.2.6p4/ntpd/ntpd-opts.h.mlock 2011-09-23 05:36:04.000000000 +0200
++++ ntp-4.2.6p4/ntpd/ntpd-opts.h 2011-10-06 13:08:50.910274363 +0200
+@@ -81,6 +81,7 @@ typedef enum {
- INDEX_OPT_VERSION = 32,
- INDEX_OPT_HELP = 33,
- INDEX_OPT_MORE_HELP = 34
@@ -81,7 +81,7 @@ diff -up ntp-4.2.6p3/ntpd/ntpd-opts.h.mlock ntp-4.2.6p3/ntpd/ntpd-opts.h
-#define OPTION_CT 35
+#define OPTION_CT 36
-@@ -189,6 +190,10 @@ typedef enum {
+@@ -187,6 +188,10 @@ typedef enum {
# warning undefining MODIFYMMTIMER due to option name conflict
# undef MODIFYMMTIMER
# endif
@@ -92,7 +92,7 @@ diff -up ntp-4.2.6p3/ntpd/ntpd-opts.h.mlock ntp-4.2.6p3/ntpd/ntpd-opts.h
# ifdef NOFORK
# warning undefining NOFORK due to option name conflict
# undef NOFORK
-@@ -270,6 +275,7 @@ typedef enum {
+@@ -268,6 +273,7 @@ typedef enum {
# undef LOGFILE
# undef NOVIRTUALIPS
# undef MODIFYMMTIMER
@@ -100,7 +100,7 @@ diff -up ntp-4.2.6p3/ntpd/ntpd-opts.h.mlock ntp-4.2.6p3/ntpd/ntpd-opts.h
# undef NOFORK
# undef NICE
# undef PIDFILE
-@@ -308,6 +314,7 @@ typedef enum {
+@@ -306,6 +312,7 @@ typedef enum {
#define VALUE_OPT_LOGFILE 'l'
#define VALUE_OPT_NOVIRTUALIPS 'L'
#define VALUE_OPT_MODIFYMMTIMER 'M'
@@ -108,9 +108,9 @@ diff -up ntp-4.2.6p3/ntpd/ntpd-opts.h.mlock ntp-4.2.6p3/ntpd/ntpd-opts.h
#define VALUE_OPT_NOFORK 'n'
#define VALUE_OPT_NICE 'N'
#define VALUE_OPT_PIDFILE 'p'
-diff -up ntp-4.2.6p3/ntpd/ntpd.c.mlock ntp-4.2.6p3/ntpd/ntpd.c
---- ntp-4.2.6p3/ntpd/ntpd.c.mlock 2011-01-05 17:51:36.191118761 +0100
-+++ ntp-4.2.6p3/ntpd/ntpd.c 2011-01-05 17:51:36.257121377 +0100
+diff -up ntp-4.2.6p4/ntpd/ntpd.c.mlock ntp-4.2.6p4/ntpd/ntpd.c
+--- ntp-4.2.6p4/ntpd/ntpd.c.mlock 2011-10-06 13:08:50.869274334 +0200
++++ ntp-4.2.6p4/ntpd/ntpd.c 2011-10-06 13:08:50.911274363 +0200
@@ -723,7 +723,8 @@ ntpdmain(
}
#endif
diff --git a/ntp-4.2.6p4-rtnetlink.patch b/ntp-4.2.6p4-rtnetlink.patch
new file mode 100644
index 0000000..06d2e87
--- /dev/null
+++ b/ntp-4.2.6p4-rtnetlink.patch
@@ -0,0 +1,15 @@
+diff -up ntp-4.2.6p4/ntpd/ntp_io.c.rtnetlink ntp-4.2.6p4/ntpd/ntp_io.c
+--- ntp-4.2.6p4/ntpd/ntp_io.c.rtnetlink 2011-10-05 15:49:17.061711033 +0200
++++ ntp-4.2.6p4/ntpd/ntp_io.c 2011-10-05 15:49:17.074711042 +0200
+@@ -4549,10 +4549,7 @@ init_async_notifications()
+ #ifdef HAVE_RTNETLINK
+ memset(&sa, 0, sizeof(sa));
+ sa.nl_family = PF_NETLINK;
+- sa.nl_groups = RTMGRP_LINK | RTMGRP_IPV4_IFADDR
+- | RTMGRP_IPV6_IFADDR | RTMGRP_IPV4_ROUTE
+- | RTMGRP_IPV4_MROUTE | RTMGRP_IPV6_ROUTE
+- | RTMGRP_IPV6_MROUTE;
++ sa.nl_groups = RTMGRP_IPV4_IFADDR | RTMGRP_IPV6_IFADDR;
+ if (bind(fd, (struct sockaddr *)&sa, sizeof(sa)) < 0) {
+ msyslog(LOG_ERR,
+ "bind failed on routing socket (%m) - using polled interface update");
diff --git a/ntp.spec b/ntp.spec
index 6eac943..7c3422b 100644
--- a/ntp.spec
+++ b/ntp.spec
@@ -1,7 +1,7 @@
Summary: The NTP daemon and utilities
Name: ntp
-Version: 4.2.6p3
-Release: 5%{?dist}.1
+Version: 4.2.6p4
+Release: 1%{?dist}
# primary license (COPYRIGHT) : MIT
# ElectricFence/ (not used) : GPLv2
# kernel/sys/ppsclock.h (not used) : BSD with advertising
@@ -48,39 +48,31 @@ Source14: ntp-wait.service
# ntpbz #802
Patch1: ntp-4.2.6p1-sleep.patch
# add support for dropping root to ntpdate
-Patch2: ntp-4.2.6p1-droproot.patch
+Patch2: ntp-4.2.6p4-droproot.patch
# ntpbz #779
Patch3: ntp-4.2.6p3-bcast.patch
# align buffer for control messages
Patch4: ntp-4.2.6p1-cmsgalign.patch
# link ntpd with -ffast-math on ia64
Patch5: ntp-4.2.6p1-linkfastmath.patch
-# ntpbz #1134
-Patch6: ntp-4.2.6p3-tentative.patch
# ntpbz #759
Patch7: ntp-4.2.6p1-retcode.patch
# ntpbz #992
-Patch8: ntp-4.2.6p3-rtnetlink.patch
-# fix script used to generate man pages
-Patch9: ntp-4.2.6p2-html2man.patch
+Patch8: ntp-4.2.6p4-rtnetlink.patch
# ntpbz #898
-Patch10: ntp-4.2.6p2-htmldoc.patch
+Patch10: ntp-4.2.6p4-htmldoc.patch
# fix precision calculation on fast CPUs
Patch12: ntp-4.2.4p7-getprecision.patch
# ntpbz #1408
Patch13: ntp-4.2.6p1-logdefault.patch
# add option -m to lock memory
-Patch14: ntp-4.2.6p3-mlock.patch
+Patch14: ntp-4.2.6p4-mlock.patch
# allow -u and -p options to be used twice (#639101)
Patch15: ntp-4.2.6p2-multiopts.patch
-# ntpbz #1554
-Patch16: ntp-4.2.6p3-nosyspeer.patch
# ntpbz #1670
Patch17: ntp-4.2.6p3-broadcastdelay.patch
# ntpbz #1671
Patch18: ntp-4.2.6p3-delaycalib.patch
-# ntpbz #1695
-Patch19: ntp-4.2.6p3-ntpdaterecv.patch
# handle unknown clock types
Patch50: ntpstat-0.2-clksrc.patch
@@ -158,19 +150,15 @@ This package contains NTP documentation in HTML format.
%ifarch ia64
%patch5 -p1 -b .linkfastmath
%endif
-%patch6 -p1 -b .tentative
%patch7 -p1 -b .retcode
%patch8 -p1 -b .rtnetlink
-%patch9 -p1 -b .html2man
%patch10 -p1 -b .htmldoc
%patch12 -p1 -b .getprecision
%patch13 -p1 -b .logdefault
%patch14 -p1 -b .mlock
%patch15 -p1 -b .multiopts
-%patch16 -p1 -b .nosyspeer
%patch17 -p1 -b .broadcastdelay
%patch18 -p1 -b .delaycalib
-%patch19 -p1 -b .ntpdaterecv
# ntpstat patches
%patch50 -p1 -b .clksrc
diff --git a/sources b/sources
index cbff2a2..bd9426a 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
6b2bedefe2e7c63ea52609b222022121 ntpstat-0.2.tgz
-59876a9009b098ff59767ee45a88ebd2 ntp-4.2.6p3.tar.gz
+1447121a07b49361677ffda4f6e29527 ntp-4.2.6p4.tar.gz
More information about the scm-commits
mailing list