Author: draenog Date: Wed May 25 14:43:34 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- up to 4.2.6p3
- remove openssl_check.patch and ntpdc-link_order.patch; fixed upstream
- update no_libelf.patch
- updated and new fedora patches
---- Files affected:
packages/ntp:
ntp-4.2.6p1-mlock.patch (1.1 -> 1.2) , ntp-4.2.6p1-rtnetlink.patch (1.1 ->
1.2) , ntp-4.2.6p1-tentative.patch (1.1 -> 1.2) , ntp-no_libelf.patch (1.2 ->
1.3) , ntp.spec (1.145 -> 1.146) , ntp-4.2.6p3-broadcastdelay.patch (NONE ->
1.1) (NEW), ntp-4.2.6p3-delaycalib.patch (NONE -> 1.1) (NEW),
ntp-4.2.6p3-nosyspeer.patch (NONE -> 1.1) (NEW), ntp-4.2.6p3-ntpdaterecv.patch
(NONE -> 1.1) (NEW), ntp-ntpdc-link_order.patch (1.1 -> NONE) (REMOVED),
ntp-openssl_check.patch (1.5 -> NONE) (REMOVED)
---- Diffs:
================================================================
Index: packages/ntp/ntp-4.2.6p1-mlock.patch
diff -u packages/ntp/ntp-4.2.6p1-mlock.patch:1.1
packages/ntp/ntp-4.2.6p1-mlock.patch:1.2
--- packages/ntp/ntp-4.2.6p1-mlock.patch:1.1 Mon May 24 21:48:45 2010
+++ packages/ntp/ntp-4.2.6p1-mlock.patch Wed May 25 16:43:29 2011
@@ -1,6 +1,6 @@
-diff -up ntp-4.2.6p1/html/ntpd.html.mlock ntp-4.2.6p1/html/ntpd.html
---- ntp-4.2.6p1/html/ntpd.html.mlock 2010-03-04 16:06:38.000000000 +0100
-+++ ntp-4.2.6p1/html/ntpd.html 2010-03-04 16:07:42.000000000 +0100
+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,35 +19,26 @@
<dt><tt>-n</tt></dt>
<dd>Don't fork.</dd>
<dt><tt>-N</tt></dt>
-diff -up ntp-4.2.6p1/ntpd/ntpd-opts.c.mlock ntp-4.2.6p1/ntpd/ntpd-opts.c
---- ntp-4.2.6p1/ntpd/ntpd-opts.c.mlock 2010-02-09 11:27:18.000000000 +0100
-+++ ntp-4.2.6p1/ntpd/ntpd-opts.c 2010-03-04 16:09:12.000000000 +0100
-@@ -9,7 +9,7 @@
- */
-
- /*
-- * This file was produced by an AutoOpts template. AutoOpts is a
-+ * This file was produced by an AutoOpts template. AutoOpts is
- * copyrighted work. This source file is not encumbered by AutoOpts
- * licensing, but is provided under the licensing terms chosen by the
- * ntpd author or copyright holder. AutoOpts is licensed under
-@@ -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 },
@@ -66,22 +57,19 @@
{ /* 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.6p1/ntpd/ntpd-opts.h.mlock ntp-4.2.6p1/ntpd/ntpd-opts.h
---- ntp-4.2.6p1/ntpd/ntpd-opts.h.mlock 2010-02-09 11:27:18.000000000 +0100
-+++ ntp-4.2.6p1/ntpd/ntpd-opts.h 2010-03-04 16:10:16.000000000 +0100
-@@ -84,12 +84,13 @@ typedef enum {
- INDEX_OPT_SLEW = 29,
- INDEX_OPT_USEPCC = 30,
- INDEX_OPT_PCCFREQ = 31,
+ 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
@@ -93,10 +81,7 @@
-#define OPTION_CT 35
+#define OPTION_CT 36
- #define NTPD_VERSION "4.2.6p1"
- #define NTPD_FULL_VERSION "ntpd - NTP daemon program - Ver. 4.2.6p1"
-
-@@ -182,6 +183,10 @@ typedef enum {
+@@ -189,6 +190,10 @@ typedef enum {
# warning undefining MODIFYMMTIMER due to option name conflict
# undef MODIFYMMTIMER
# endif
@@ -107,7 +92,7 @@
# 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
@@ -115,7 +100,7 @@
# 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'
@@ -123,10 +108,10 @@
#define VALUE_OPT_NOFORK 'n'
#define VALUE_OPT_NICE 'N'
#define VALUE_OPT_PIDFILE 'p'
-diff -up ntp-4.2.6p1/ntpd/ntpd.c.mlock ntp-4.2.6p1/ntpd/ntpd.c
---- ntp-4.2.6p1/ntpd/ntpd.c.mlock 2010-02-09 11:02:27.000000000 +0100
-+++ ntp-4.2.6p1/ntpd/ntpd.c 2010-03-04 16:11:42.000000000 +0100
-@@ -724,7 +724,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
@@ -136,7 +121,7 @@
# ifdef HAVE_SETRLIMIT
/*
* Set the stack limit to something smaller, so that we don't lock a lot
-@@ -750,7 +751,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.
*/
@@ -145,7 +130,7 @@
if (setrlimit(RLIMIT_MEMLOCK, &rl) == -1) {
msyslog(LOG_ERR, "Cannot set RLIMIT_MEMLOCK: %m");
}
-@@ -762,6 +763,7 @@ ntpdmain(
+@@ -761,6 +762,7 @@ ntpdmain(
*/
if (mlockall(MCL_CURRENT|MCL_FUTURE) < 0)
msyslog(LOG_ERR, "mlockall(): %m");
================================================================
Index: packages/ntp/ntp-4.2.6p1-rtnetlink.patch
diff -u packages/ntp/ntp-4.2.6p1-rtnetlink.patch:1.1
packages/ntp/ntp-4.2.6p1-rtnetlink.patch:1.2
--- packages/ntp/ntp-4.2.6p1-rtnetlink.patch:1.1 Mon May 24 21:48:45 2010
+++ packages/ntp/ntp-4.2.6p1-rtnetlink.patch Wed May 25 16:43:29 2011
@@ -1,18 +1,18 @@
-diff -up ntp-4.2.6p1/configure.rtnetlink ntp-4.2.6p1/configure
---- ntp-4.2.6p1/configure.rtnetlink 2010-02-09 11:19:49.000000000 +0100
-+++ ntp-4.2.6p1/configure 2010-03-04 17:11:50.000000000 +0100
-@@ -20579,6 +20579,7 @@ else
+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>
+ #include <stddef.h>
++ #include <sys/socket.h>
+ #include <linux/rtnetlink.h>
+
int
- main ()
-diff -up ntp-4.2.6p1/ntpd/ntp_io.c.rtnetlink ntp-4.2.6p1/ntpd/ntp_io.c
---- ntp-4.2.6p1/ntpd/ntp_io.c.rtnetlink 2009-12-09 08:36:37.000000000
+0100
-+++ ntp-4.2.6p1/ntpd/ntp_io.c 2010-03-04 17:11:32.000000000 +0100
-@@ -4304,10 +4304,7 @@ init_async_notifications()
+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;
================================================================
Index: packages/ntp/ntp-4.2.6p1-tentative.patch
diff -u packages/ntp/ntp-4.2.6p1-tentative.patch:1.1
packages/ntp/ntp-4.2.6p1-tentative.patch:1.2
--- packages/ntp/ntp-4.2.6p1-tentative.patch:1.1 Mon May 24 21:48:45 2010
+++ packages/ntp/ntp-4.2.6p1-tentative.patch Wed May 25 16:43:29 2011
@@ -1,6 +1,6 @@
-diff -up ntp-4.2.6p1/lib/isc/unix/interfaceiter.c.tentative
ntp-4.2.6p1/lib/isc/unix/interfaceiter.c
---- ntp-4.2.6p1/lib/isc/unix/interfaceiter.c.tentative 2009-12-09
08:36:35.000000000 +0100
-+++ ntp-4.2.6p1/lib/isc/unix/interfaceiter.c 2010-03-04 17:50:17.000000000
+0100
+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,15 +10,14 @@
/* Must follow <isc/net.h>. */
#ifdef HAVE_NET_IF6_H
#include <net/if6.h>
-@@ -223,6 +225,11 @@ linux_if_inet6_current(isc_interfaceiter
- }
- iter->current.af = AF_INET6;
- iter->current.flags = INTERFACE_F_UP;
-+
+@@ -253,6 +255,10 @@ linux_if_inet6_current(isc_interfaceiter
+ iter->current.flags |= INTERFACE_F_MULTICAST;
+ #endif
+
+ /* ignore tentative address */
-+ if (flag4 & IFA_F_TENTATIVE)
++ if (flags & IFA_F_TENTATIVE)
+ 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,
================================================================
Index: packages/ntp/ntp-no_libelf.patch
diff -u packages/ntp/ntp-no_libelf.patch:1.2
packages/ntp/ntp-no_libelf.patch:1.3
--- packages/ntp/ntp-no_libelf.patch:1.2 Sun May 20 19:46:42 2007
+++ packages/ntp/ntp-no_libelf.patch Wed May 25 16:43:29 2011
@@ -1,16 +1,15 @@
diff -ur ntp-4.1.1a.orig/configure.ac ntp-4.1.1a/configure.ac
--- ntp-4.1.1a.orig/configure.ac Thu Mar 28 23:42:00 2002
+++ ntp-4.1.1a/configure.ac Thu Nov 21 11:56:41 2002
-@@ -512,9 +512,9 @@
- case "$ac_cv_func___adjtimex" in
- yes) ;;
+@@ -687,9 +687,9 @@
+ yes)
+ ;;
*)
-- AC_CHECK_LIB(elf, nlist) dnl Only needed for tickadj...
-+ #AC_CHECK_LIB(elf, nlist) dnl Only needed for tickadj...
+- AC_CHECK_LIB([elf], [nlist]) dnl Only needed for tickadj...
++ #AC_CHECK_LIB([elf], [nlist]) dnl Only needed for tickadj...
dnl AC_CHECK_LIB(kvm, main, , , -lelf)
-- AC_CHECK_LIB(kvm, main) dnl We already know about -lelf here...
-+ #AC_CHECK_LIB(kvm, main) dnl We already know about -lelf here...
- AC_CHECK_LIB(ld, nlist)
- AC_CHECK_LIB(mld, nlist)
- AC_CHECK_HEADER(nlist.h,
-
+- AC_CHECK_LIB([kvm], [main]) dnl We already know about -lelf
here...
++ #AC_CHECK_LIB([kvm], [main]) dnl We already know about -lelf
here...
+ AC_CHECK_LIB([ld], [nlist])
+ AC_CHECK_LIB([mld], [nlist])
+ AC_CHECK_HEADERS([nlist.h sys/var.h])
================================================================
Index: packages/ntp/ntp.spec
diff -u packages/ntp/ntp.spec:1.145 packages/ntp/ntp.spec:1.146
--- packages/ntp/ntp.spec:1.145 Thu Jan 27 23:44:24 2011
+++ packages/ntp/ntp.spec Wed May 25 16:43:29 2011
@@ -11,12 +11,12 @@
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.6p1
-Release: 4
+Version: 4.2.6p3
+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: 0510396dfbde40678b92f808ec07c0d2
+# Source0-md5: 59876a9009b098ff59767ee45a88ebd2
Source1: %{name}.conf
Source2: %{name}.keys
Source3: %{name}.init
@@ -29,10 +29,8 @@
Patch0: %{name}-time.patch
Patch1: %{name}-no_libelf.patch
Patch2: %{name}-ipv6.patch
-Patch3: %{name}-openssl_check.patch
-Patch4: %{name}-nano.patch
-Patch5: %{name}-ntpdc-link_order.patch
-Patch6: %{name}-no_avahi.patch
+Patch3: %{name}-nano.patch
+Patch4: %{name}-no_avahi.patch
# FC patches + 100
Patch101: %{name}-4.2.6p1-sleep.patch
Patch102: %{name}-4.2.6p1-droproot.patch
@@ -47,6 +45,10 @@
Patch112: %{name}-4.2.4p7-getprecision.patch
Patch113: %{name}-4.2.6p1-logdefault.patch
Patch114: %{name}-4.2.6p1-mlock.patch
+Patch116: %{name}-4.2.6p3-nosyspeer.patch
+Patch117: %{name}-4.2.6p3-broadcastdelay.patch
+Patch118: %{name}-4.2.6p3-delaycalib.patch
+Patch119: %{name}-4.2.6p3-ntpdaterecv.patch
URL: http://www.ntp.org/
BuildRequires: autoconf
BuildRequires: automake
@@ -226,9 +228,7 @@
%patch1 -p1
%patch2 -p1
%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%{!?with_avahi:%patch6 -p1}
+%{!?with_avahi:%patch4 -p1}
## FC patches
%patch101 -p1
@@ -244,13 +244,17 @@
%patch112 -p1
%patch113 -p1
%patch114 -p1
+%patch116 -p1
+%patch117 -p1
+%patch118 -p1
+%patch119 -p1
echo 'AM_CONDITIONAL([NEED_LIBOPTS], false)' >> configure.ac
echo 'AM_CONDITIONAL([NEED_LIBOPTS], false)' >> sntp/configure.ac
%build
%{__libtoolize}
-%{__aclocal} -I m4 -I libopts/m4
+%{__aclocal} -I m4 -I sntp/libopts/m4
%{__autoconf}
%{__automake}
cd sntp
@@ -430,6 +434,12 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.146 2011/05/25 14:43:29 draenog
+- up to 4.2.6p3
+- remove openssl_check.patch and ntpdc-link_order.patch; fixed upstream
+- update no_libelf.patch
+- updated and new fedora patches
+
Revision 1.145 2011/01/27 22:44:24 glen
- upstart hook
================================================================
Index: packages/ntp/ntp-4.2.6p3-broadcastdelay.patch
diff -u /dev/null packages/ntp/ntp-4.2.6p3-broadcastdelay.patch:1.1
--- /dev/null Wed May 25 16:43:34 2011
+++ packages/ntp/ntp-4.2.6p3-broadcastdelay.patch Wed May 25 16:43:29 2011
@@ -0,0 +1,31 @@
+==== ntpd/ntp_proto.c ====
+2010-10-22 01:55:45-04:00, [email protected] +2 -5
+ [Bug 1670] Fix peer->bias and broadcastdelay
+
+--- 1.307/ntpd/ntp_proto.c 2010-10-11 21:06:05 -07:00
++++ 1.308/ntpd/ntp_proto.c 2010-10-21 22:55:45 -07:00
+@@ -929,7 +929,6 @@ receive(
+
+ } else {
+ peer->delay = sys_bdelay;
+- peer->bias = -sys_bdelay / 2.;
+ }
+ break;
+ }
+@@ -1570,7 +1569,6 @@ process_packet(
+ p_del = fabs(t21 - t34);
+ p_offset = (t21 + t34) / 2.;
+ }
+- p_offset += peer->bias;
+ p_disp = LOGTOD(sys_precision) + LOGTOD(peer->precision) +
+ clock_phi * p_del;
+
+@@ -1647,7 +1645,7 @@ process_packet(
+ /*
+ * That was awesome. Now hand off to the clock filter.
+ */
+- clock_filter(peer, p_offset, p_del, p_disp);
++ clock_filter(peer, p_offset + peer->bias, p_del, p_disp);
+
+ /*
+ * If we are in broadcast calibrate mode, return to broadcast
================================================================
Index: packages/ntp/ntp-4.2.6p3-delaycalib.patch
diff -u /dev/null packages/ntp/ntp-4.2.6p3-delaycalib.patch:1.1
--- /dev/null Wed May 25 16:43:34 2011
+++ packages/ntp/ntp-4.2.6p3-delaycalib.patch Wed May 25 16:43:29 2011
@@ -0,0 +1,12 @@
+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.delaycalib 2010-11-25 15:21:52.578492466
+0100
++++ 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;
+- peer->delay = (peer->offset - p_offset) * 2;
++ peer->delay = fabs(peer->offset - p_offset) * 2;
+ }
+ p_del = peer->delay;
+ p_offset += p_del / 2;
================================================================
Index: packages/ntp/ntp-4.2.6p3-nosyspeer.patch
diff -u /dev/null packages/ntp/ntp-4.2.6p3-nosyspeer.patch:1.1
--- /dev/null Wed May 25 16:43:34 2011
+++ packages/ntp/ntp-4.2.6p3-nosyspeer.patch Wed May 25 16:43:29 2011
@@ -0,0 +1,19 @@
+==== ntpd/ntp_proto.c ====
+2010-09-30 00:43:09-04:00, [email protected] +10 -3
+ [Bug 1554]: peer may stay selected as system peer after becoming
+ unreachable.
+
+--- 1.303/ntpd/ntp_proto.c 2010-09-25 10:39:41 -07:00
++++ 1.304/ntpd/ntp_proto.c 2010-09-29 21:43:09 -07:00
+@@ -2187,8 +2187,10 @@ clock_filter(
+ * save the offset, delay and jitter. Note the jitter must not
+ * be less than the precision.
+ */
+- if (m == 0)
++ if (m == 0) {
++ clock_select();
+ return;
++ }
+
+ etemp = fabs(peer->offset - peer->filter_offset[k]);
+ peer->offset = peer->filter_offset[k];
================================================================
Index: packages/ntp/ntp-4.2.6p3-ntpdaterecv.patch
diff -u /dev/null packages/ntp/ntp-4.2.6p3-ntpdaterecv.patch:1.1
--- /dev/null Wed May 25 16:43:34 2011
+++ packages/ntp/ntp-4.2.6p3-ntpdaterecv.patch Wed May 25 16:43:29 2011
@@ -0,0 +1,21 @@
+diff -up ntp-4.2.6p3/ntpdate/ntpdate.c.ntpdaterecv
ntp-4.2.6p3/ntpdate/ntpdate.c
+--- ntp-4.2.6p3/ntpdate/ntpdate.c.ntpdaterecv 2010-11-25 15:18:01.669483673
+0100
++++ ntp-4.2.6p3/ntpdate/ntpdate.c 2010-11-25 15:18:01.720485666 +0100
+@@ -1042,6 +1042,17 @@ receive(
+ * Shift this data in, then schedule another transmit.
+ */
+ server_data(server, (s_fp) di, &ci, 0);
++
++ if ((int)server->filter_nextpt >= sys_samples) {
++ /*
++ * Got all the data we need. Mark this guy
++ * completed and return.
++ */
++ server->event_time = 0;
++ complete_servers++;
++ return;
++ }
++
+ server->event_time = current_time + sys_timeout;
+ }
+
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ntp/ntp-4.2.6p1-mlock.patch?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ntp/ntp-4.2.6p1-rtnetlink.patch?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ntp/ntp-4.2.6p1-tentative.patch?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ntp/ntp-no_libelf.patch?r1=1.2&r2=1.3&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ntp/ntp.spec?r1=1.145&r2=1.146&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
