[ntp] update to 4.2.6p3
Miroslav Lichvar
mlichvar at fedoraproject.org
Fri Jan 7 14:49:51 UTC 2011
commit 348db8c1612e56dd9bd9898334d80e5d6612c763
Author: Miroslav Lichvar <mlichvar at redhat.com>
Date: Fri Jan 7 15:31:29 2011 +0100
update to 4.2.6p3
.gitignore | 2 +-
ntp-4.2.6p1-rtnetlink.patch | 26 ---------
ntp-4.2.6p1-bcast.patch => ntp-4.2.6p3-bcast.patch | 22 ++++----
ntp-4.2.6p2-mlock.patch => ntp-4.2.6p3-mlock.patch | 56 ++++++++++----------
ntp-4.2.6p3-mvkeygen.patch | 11 ----
ntp-4.2.6p3-rtnetlink.patch | 26 +++++++++
...-tentative.patch => ntp-4.2.6p3-tentative.patch | 10 ++--
ntp.spec | 21 ++++----
sources | 2 +-
9 files changed, 82 insertions(+), 94 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 2d24c96..b71a2cf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,3 @@
ntpstat-0.2.tgz
timepps.h
-ntp-4.2.6p3-RC10.tar.gz
+ntp-4.2.6p3.tar.gz
diff --git a/ntp-4.2.6p1-bcast.patch b/ntp-4.2.6p3-bcast.patch
similarity index 81%
rename from ntp-4.2.6p1-bcast.patch
rename to ntp-4.2.6p3-bcast.patch
index 8c30cf3..57581f3 100644
--- a/ntp-4.2.6p1-bcast.patch
+++ b/ntp-4.2.6p3-bcast.patch
@@ -1,6 +1,6 @@
-diff -up ntp-4.2.6p1/ntpd/ntp_io.c.bcast ntp-4.2.6p1/ntpd/ntp_io.c
---- ntp-4.2.6p1/ntpd/ntp_io.c.bcast 2009-12-09 08:36:37.000000000 +0100
-+++ ntp-4.2.6p1/ntpd/ntp_io.c 2010-03-05 14:49:25.000000000 +0100
+diff -up ntp-4.2.6p3/ntpd/ntp_io.c.bcast ntp-4.2.6p3/ntpd/ntp_io.c
+--- ntp-4.2.6p3/ntpd/ntp_io.c.bcast 2010-12-25 10:40:36.000000000 +0100
++++ ntp-4.2.6p3/ntpd/ntp_io.c 2011-01-05 17:46:13.820049150 +0100
@@ -151,6 +151,8 @@ int ninterfaces; /* Total number of in
int disable_dynamic_updates; /* scan interfaces once only */
@@ -10,7 +10,7 @@ diff -up ntp-4.2.6p1/ntpd/ntp_io.c.bcast ntp-4.2.6p1/ntpd/ntp_io.c
#ifdef REFCLOCK
/*
* Refclock stuff. We keep a chain of structures with data concerning
-@@ -1937,6 +1939,17 @@ set_reuseaddr(
+@@ -2254,6 +2256,17 @@ set_reuseaddr(
#endif /* ! SO_EXCLUSIVEADDRUSE */
}
@@ -28,7 +28,7 @@ diff -up ntp-4.2.6p1/ntpd/ntp_io.c.bcast ntp-4.2.6p1/ntpd/ntp_io.c
/*
* This is just a wrapper around an internal function so we can
* make other changes as necessary later on
-@@ -2374,6 +2387,7 @@ io_setbclient(void)
+@@ -2659,6 +2672,7 @@ io_setbclient(void)
}
}
set_reuseaddr(0);
@@ -36,15 +36,15 @@ diff -up ntp-4.2.6p1/ntpd/ntp_io.c.bcast ntp-4.2.6p1/ntpd/ntp_io.c
if (nif > 0)
DPRINTF(1, ("io_setbclient: Opened broadcast clients\n"));
else if (!nif)
-@@ -2405,6 +2419,7 @@ io_unsetbclient(void)
-
- socket_broadcast_disable(interf, &interf->sin);
+@@ -2685,6 +2699,7 @@ io_unsetbclient(void)
+ continue;
+ socket_broadcast_disable(ep, &ep->sin);
}
+ set_pktinfo(0);
}
/*
-@@ -3130,7 +3145,8 @@ read_network_packet(
+@@ -3392,7 +3407,8 @@ read_network_packet(
#ifdef HAVE_TIMESTAMP
struct msghdr msghdr;
struct iovec iovec;
@@ -54,7 +54,7 @@ diff -up ntp-4.2.6p1/ntpd/ntp_io.c.bcast ntp-4.2.6p1/ntpd/ntp_io.c
#endif
/*
-@@ -3141,7 +3157,7 @@ read_network_packet(
+@@ -3403,7 +3419,7 @@ read_network_packet(
*/
rb = get_free_recv_buffer();
@@ -63,7 +63,7 @@ diff -up ntp-4.2.6p1/ntpd/ntp_io.c.bcast ntp-4.2.6p1/ntpd/ntp_io.c
char buf[RX_BUFF_SIZE];
sockaddr_u from;
-@@ -3201,6 +3217,27 @@ read_network_packet(
+@@ -3463,6 +3479,27 @@ read_network_packet(
return (buflen);
}
diff --git a/ntp-4.2.6p2-mlock.patch b/ntp-4.2.6p3-mlock.patch
similarity index 79%
rename from ntp-4.2.6p2-mlock.patch
rename to ntp-4.2.6p3-mlock.patch
index 03c7268..f977b3d 100644
--- a/ntp-4.2.6p2-mlock.patch
+++ b/ntp-4.2.6p3-mlock.patch
@@ -1,6 +1,6 @@
-diff -up ntp-4.2.6p2/html/ntpd.html.mlock ntp-4.2.6p2/html/ntpd.html
---- ntp-4.2.6p2/html/ntpd.html.mlock 2010-07-12 16:36:09.000000000 +0200
-+++ ntp-4.2.6p2/html/ntpd.html 2010-07-12 16:36:09.000000000 +0200
+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
@@ -32,7 +32,7 @@
</ul>
<hr>
@@ -19,26 +19,26 @@ diff -up ntp-4.2.6p2/html/ntpd.html.mlock ntp-4.2.6p2/html/ntpd.html
<dt><tt>-n</tt></dt>
<dd>Don't fork.</dd>
<dt><tt>-N</tt></dt>
-diff -up ntp-4.2.6p2/ntpd/ntpd-opts.c.mlock ntp-4.2.6p2/ntpd/ntpd-opts.c
---- ntp-4.2.6p2/ntpd/ntpd-opts.c.mlock 2010-07-09 04:23:28.000000000 +0200
-+++ ntp-4.2.6p2/ntpd/ntpd-opts.c 2010-07-12 16:36:09.000000000 +0200
-@@ -284,6 +284,15 @@ tSCC zNice_Name[] = "ni
+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[]
#define NICE_FLAGS (OPTST_DISABLED)
/*
+ * Mlock option description:
+ */
-+tSCC zMlockText[] =
++static char const zMlockText[] =
+ "Lock memory";
-+tSCC zMlock_NAME[] = "MLOCK";
-+tSCC zMlock_Name[] = "mlock";
++static char const zMlock_NAME[] = "MLOCK";
++static char const zMlock_Name[] = "mlock";
+#define MLOCK_FLAGS (OPTST_DISABLED)
+
+/*
* Pidfile option description:
*/
- tSCC zPidfileText[] =
-@@ -911,6 +920,18 @@ static tOptDesc optDesc[ OPTION_CT ] = {
+ static char const zPidfileText[] =
+@@ -909,6 +918,18 @@ static tOptDesc optDesc[ OPTION_CT ] = {
/* desc, NAME, name */ zPccfreqText, zPccfreq_NAME, zPccfreq_Name,
/* disablement strs */ NULL, NULL },
@@ -57,19 +57,19 @@ diff -up ntp-4.2.6p2/ntpd/ntpd-opts.c.mlock ntp-4.2.6p2/ntpd/ntpd-opts.c
{ /* entry idx, value */ INDEX_OPT_VERSION, VALUE_OPT_VERSION,
/* equiv idx value */ NO_EQUIVALENT, 0,
/* equivalenced to */ NO_EQUIVALENT,
-@@ -1005,7 +1026,7 @@ tOptions ntpdOptions = {
+@@ -1008,7 +1029,7 @@ tOptions ntpdOptions = {
NO_EQUIVALENT, /* '-#' option index */
NO_EQUIVALENT /* index of default opt */
},
- 35 /* full option count */, 32 /* user option count */,
+ 36 /* full option count */, 33 /* user option count */,
ntpd_full_usage, ntpd_short_usage,
- NULL, NULL
- };
-diff -up ntp-4.2.6p2/ntpd/ntpd-opts.h.mlock ntp-4.2.6p2/ntpd/ntpd-opts.h
---- ntp-4.2.6p2/ntpd/ntpd-opts.h.mlock 2010-07-09 04:23:28.000000000 +0200
-+++ ntp-4.2.6p2/ntpd/ntpd-opts.h 2010-07-12 16:36:09.000000000 +0200
-@@ -87,6 +87,7 @@ typedef enum {
+ 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 {
- INDEX_OPT_VERSION = 32,
- INDEX_OPT_HELP = 33,
- INDEX_OPT_MORE_HELP = 34
@@ -81,7 +81,7 @@ diff -up ntp-4.2.6p2/ntpd/ntpd-opts.h.mlock ntp-4.2.6p2/ntpd/ntpd-opts.h
-#define OPTION_CT 35
+#define OPTION_CT 36
-@@ -182,6 +183,10 @@ typedef enum {
+@@ -189,6 +190,10 @@ typedef enum {
# warning undefining MODIFYMMTIMER due to option name conflict
# undef MODIFYMMTIMER
# endif
@@ -92,7 +92,7 @@ diff -up ntp-4.2.6p2/ntpd/ntpd-opts.h.mlock ntp-4.2.6p2/ntpd/ntpd-opts.h
# ifdef NOFORK
# warning undefining NOFORK due to option name conflict
# undef NOFORK
-@@ -263,6 +268,7 @@ typedef enum {
+@@ -270,6 +275,7 @@ typedef enum {
# undef LOGFILE
# undef NOVIRTUALIPS
# undef MODIFYMMTIMER
@@ -100,7 +100,7 @@ diff -up ntp-4.2.6p2/ntpd/ntpd-opts.h.mlock ntp-4.2.6p2/ntpd/ntpd-opts.h
# undef NOFORK
# undef NICE
# undef PIDFILE
-@@ -301,6 +307,7 @@ typedef enum {
+@@ -308,6 +314,7 @@ typedef enum {
#define VALUE_OPT_LOGFILE 'l'
#define VALUE_OPT_NOVIRTUALIPS 'L'
#define VALUE_OPT_MODIFYMMTIMER 'M'
@@ -108,10 +108,10 @@ diff -up ntp-4.2.6p2/ntpd/ntpd-opts.h.mlock ntp-4.2.6p2/ntpd/ntpd-opts.h
#define VALUE_OPT_NOFORK 'n'
#define VALUE_OPT_NICE 'N'
#define VALUE_OPT_PIDFILE 'p'
-diff -up ntp-4.2.6p2/ntpd/ntpd.c.mlock ntp-4.2.6p2/ntpd/ntpd.c
---- ntp-4.2.6p2/ntpd/ntpd.c.mlock 2010-07-12 16:36:09.000000000 +0200
-+++ ntp-4.2.6p2/ntpd/ntpd.c 2010-07-12 16:36:09.000000000 +0200
-@@ -722,7 +722,8 @@ ntpdmain(
+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
+@@ -723,7 +723,8 @@ ntpdmain(
}
#endif
@@ -121,7 +121,7 @@ diff -up ntp-4.2.6p2/ntpd/ntpd.c.mlock ntp-4.2.6p2/ntpd/ntpd.c
# ifdef HAVE_SETRLIMIT
/*
* Set the stack limit to something smaller, so that we don't lock a lot
-@@ -748,7 +749,7 @@ ntpdmain(
+@@ -749,7 +750,7 @@ ntpdmain(
* fail if we drop root privlege. To be useful the value
* has to be larger than the largest ntpd resident set size.
*/
@@ -130,7 +130,7 @@ diff -up ntp-4.2.6p2/ntpd/ntpd.c.mlock ntp-4.2.6p2/ntpd/ntpd.c
if (setrlimit(RLIMIT_MEMLOCK, &rl) == -1) {
msyslog(LOG_ERR, "Cannot set RLIMIT_MEMLOCK: %m");
}
-@@ -760,6 +761,7 @@ ntpdmain(
+@@ -761,6 +762,7 @@ ntpdmain(
*/
if (mlockall(MCL_CURRENT|MCL_FUTURE) < 0)
msyslog(LOG_ERR, "mlockall(): %m");
diff --git a/ntp-4.2.6p3-rtnetlink.patch b/ntp-4.2.6p3-rtnetlink.patch
new file mode 100644
index 0000000..f3674ee
--- /dev/null
+++ b/ntp-4.2.6p3-rtnetlink.patch
@@ -0,0 +1,26 @@
+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
+@@ -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-4.2.6p2-tentative.patch b/ntp-4.2.6p3-tentative.patch
similarity index 54%
rename from ntp-4.2.6p2-tentative.patch
rename to ntp-4.2.6p3-tentative.patch
index 8f589a0..b4b7526 100644
--- a/ntp-4.2.6p2-tentative.patch
+++ b/ntp-4.2.6p3-tentative.patch
@@ -1,6 +1,6 @@
-diff -up ntp-4.2.6p2/lib/isc/unix/interfaceiter.c.tentative ntp-4.2.6p2/lib/isc/unix/interfaceiter.c
---- ntp-4.2.6p2/lib/isc/unix/interfaceiter.c.tentative 2010-06-12 08:13:53.000000000 +0200
-+++ ntp-4.2.6p2/lib/isc/unix/interfaceiter.c 2010-07-12 16:25:43.000000000 +0200
+diff -up ntp-4.2.6p3/lib/isc/unix/interfaceiter.c.tentative ntp-4.2.6p3/lib/isc/unix/interfaceiter.c
+--- ntp-4.2.6p3/lib/isc/unix/interfaceiter.c.tentative 2010-12-25 10:40:35.000000000 +0100
++++ ntp-4.2.6p3/lib/isc/unix/interfaceiter.c 2011-01-05 17:49:44.429413622 +0100
@@ -45,6 +45,8 @@
#include <isc/types.h>
#include <isc/util.h>
@@ -10,7 +10,7 @@ diff -up ntp-4.2.6p2/lib/isc/unix/interfaceiter.c.tentative ntp-4.2.6p2/lib/isc/
/* Must follow <isc/net.h>. */
#ifdef HAVE_NET_IF6_H
#include <net/if6.h>
-@@ -252,6 +254,10 @@ linux_if_inet6_current(isc_interfaceiter
+@@ -253,6 +255,10 @@ linux_if_inet6_current(isc_interfaceiter
iter->current.flags |= INTERFACE_F_MULTICAST;
#endif
@@ -19,5 +19,5 @@ diff -up ntp-4.2.6p2/lib/isc/unix/interfaceiter.c.tentative ntp-4.2.6p2/lib/isc/
+ iter->current.flags &= ~INTERFACE_F_UP;
+
isc_netaddr_fromin6(&iter->current.address, &addr6);
+ iter->current.ifindex = ifindex;
if (isc_netaddr_islinklocal(&iter->current.address)) {
- isc_netaddr_setzone(&iter->current.address,
diff --git a/ntp.spec b/ntp.spec
index 30ad351..a2b7f0f 100644
--- a/ntp.spec
+++ b/ntp.spec
@@ -1,7 +1,7 @@
Summary: The NTP daemon and utilities
Name: ntp
Version: 4.2.6p3
-Release: 0.1.rc10%{?dist}
+Release: 1%{?dist}
# primary license (COPYRIGHT) : MIT
# ElectricFence/ (not used) : GPLv2
# kernel/sys/ppsclock.h (not used) : BSD with advertising
@@ -27,8 +27,7 @@ Release: 0.1.rc10%{?dist}
# util/ansi2knr.c (not used) : GPL+
License: (MIT and BSD and BSD with advertising) and GPLv2
Group: System Environment/Daemons
-#Source0: http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/ntp-%{version}.tar.gz
-Source0: http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/ntp-%{version}-RC10.tar.gz
+Source0: http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/ntp-%{version}.tar.gz
Source1: ntp.conf
Source2: ntp.keys
Source3: ntpd.init
@@ -49,17 +48,17 @@ Patch1: ntp-4.2.6p1-sleep.patch
# add support for dropping root to ntpdate
Patch2: ntp-4.2.6p1-droproot.patch
# ntpbz #779
-Patch3: ntp-4.2.6p1-bcast.patch
+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.6p2-tentative.patch
+Patch6: ntp-4.2.6p3-tentative.patch
# ntpbz #759
Patch7: ntp-4.2.6p1-retcode.patch
# ntpbz #992
-Patch8: ntp-4.2.6p1-rtnetlink.patch
+Patch8: ntp-4.2.6p3-rtnetlink.patch
# fix script used to generate man pages
Patch9: ntp-4.2.6p2-html2man.patch
# ntpbz #898
@@ -69,7 +68,7 @@ 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.6p2-mlock.patch
+Patch14: ntp-4.2.6p3-mlock.patch
# allow -u and -p options to be used twice (#639101)
Patch15: ntp-4.2.6p2-multiopts.patch
# ntpbz #1554
@@ -80,8 +79,6 @@ Patch17: ntp-4.2.6p3-broadcastdelay.patch
Patch18: ntp-4.2.6p3-delaycalib.patch
# ntpbz #1695
Patch19: ntp-4.2.6p3-ntpdaterecv.patch
-# ntpbz #1719
-Patch20: ntp-4.2.6p3-mvkeygen.patch
# handle unknown clock types
Patch50: ntpstat-0.2-clksrc.patch
@@ -147,7 +144,7 @@ This package contains NTP documentation in HTML format.
%endif
%prep
-%setup -q -a 5 -n ntp-%{version}-RC10
+%setup -q -a 5
cp %{SOURCE11} include
@@ -171,7 +168,6 @@ cp %{SOURCE11} include
%patch17 -p1 -b .broadcastdelay
%patch18 -p1 -b .delaycalib
%patch19 -p1 -b .ntpdaterecv
-%patch20 -p1 -b .mvkeygen
# set default path to sntp KoD database
sed -i 's|/var/db/ntp-kod|%{_localstatedir}/lib/ntp/sntp-kod|' sntp/{sntp.1,main.c}
@@ -370,6 +366,9 @@ fi
%{ntpdocdir}/html
%changelog
+* Fri Jan 07 2011 Miroslav Lichvar <mlichvar at redhat.com> 4.2.6p3-1
+- update to 4.2.6p3
+
* Thu Nov 25 2010 Miroslav Lichvar <mlichvar at redhat.com> 4.2.6p3-0.1.rc10
- update to 4.2.6p3-RC10
- fix system peer unmarking when unreachable
diff --git a/sources b/sources
index 1e88301..8ef8904 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
6b2bedefe2e7c63ea52609b222022121 ntpstat-0.2.tgz
b494eddf72f3455c333eed80642dc20d timepps.h
-c338e05b4bb6b5c6e20e96c6d7af2321 ntp-4.2.6p3-RC10.tar.gz
+59876a9009b098ff59767ee45a88ebd2 ntp-4.2.6p3.tar.gz
More information about the scm-commits
mailing list