23522230 Upgrade NTP to version 4.2.8p8
23522230 Upgrade NTP to version 4.2.8p8
23522196 problem in SERVICE/NTP
23522211 problem in SERVICE/NTP
23522226 problem in SERVICE/NTP
23522221 problem in SERVICE/NTP
23522207 problem in SERVICE/NTP
23750290 NTP make test needs more work
23536107 NTP root distance calculation is broken
--- a/components/ntp/Makefile Tue Jul 26 15:27:27 2016 -0700
+++ b/components/ntp/Makefile Tue Jul 26 18:00:02 2016 -0700
@@ -27,7 +27,7 @@
COMPONENT_NAME= ntp
COMPONENT_VERSION= 4.2.8
-COMPONENT_PATCH_VERSION= 7
+COMPONENT_PATCH_VERSION= 8
COMPONENT_RC_VERSION= 1
HUMAN_VERSION= $(COMPONENT_VERSION)p$(COMPONENT_PATCH_VERSION)
IPS_COMPONENT_VERSION= $(COMPONENT_VERSION).$(COMPONENT_PATCH_VERSION)
@@ -35,7 +35,7 @@
COMPONENT_SRC_NAME= ntp
COMPONENT_SRC= $(COMPONENT_SRC_NAME)-$(HUMAN_VERSION)
COMPONENT_ARCHIVE_HASH= \
- sha256:81d20c06a0b01abe3b84fac092185bf014252d38fe5e7b2758f604680a0220dc
+ sha256:2ab3d0b5f0456e6311dda1cc27ab75da108762773a19e46abd938bd9407b97ee
COMPONENT_ARCHIVE_URL= http://archive.ntp.org/ntp4/ntp-4.2/$(COMPONENT_ARCHIVE)
COMPONENT_BUGDB= service/ntp
@@ -56,13 +56,17 @@
print "\#!/bin/sh" > $(COMPONENT_TEST_TRANSFORM_CMD); \
print '$(FIND) $(BUILD_DIR_64) -name test-\*.log | sort |\\' \
>> $(COMPONENT_TEST_TRANSFORM_CMD); \
- print ' xargs cat | grep -v TEST_PROGNAME3 \\' \
+ print ' xargs cat | grep -v TEST_PROGNAME3 | \\' \
+ >> $(COMPONENT_TEST_TRANSFORM_CMD); \
+ print 'sed -e "s/4.2..p[0-9]*//" \\' \
>> $(COMPONENT_TEST_TRANSFORM_CMD); \
print '> $(COMPONENT_TEST_SNAPSHOT)' \
>> $(COMPONENT_TEST_TRANSFORM_CMD); \
print 'cat $(BUILD_DIR_64)/config.h | \\' \
>> $(COMPONENT_TEST_TRANSFORM_CMD); \
- print 'grep -v VERSION | grep -v STR_SYSTEM | grep -v ENDIAN \\' \
+ print 'grep -v ENDIAN | grep -v STR_SYSTEM | \\' \
+ >> $(COMPONENT_TEST_TRANSFORM_CMD); \
+ print 'grep -v VERSION | grep -v PACKAGE_STRING \\' \
>> $(COMPONENT_TEST_TRANSFORM_CMD); \
print '>> $(COMPONENT_TEST_SNAPSHOT)' \
>> $(COMPONENT_TEST_TRANSFORM_CMD); \
--- a/components/ntp/patches/45-alignts.patch Tue Jul 26 15:27:27 2016 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,28 +0,0 @@
-This problem has been reported to the NTP community as NTP bug 3058 -
-http://bugzilla.ntp.org/show_bug.cgi?id=3058
-"fetch_timestamp fails to account for alignment."
-
-This patch may be removed when upgrading to a version of NTP with bug 3058
-fixed.
-
---- ntpd/ntp_io.c
-+++ ntpd/ntp_io.c
[email protected]@ -3289,7 +3289,8 @@ fetch_timestamp(
- struct timespec * tsp;
- #endif
- #ifdef HAVE_TIMESTAMP
-- struct timeval * tvp;
-+ struct timeval tvhold;
-+ struct timeval * tvp = &tvhold;
- #endif
- unsigned long ticks;
- double fuzz;
[email protected]@ -3349,7 +3350,7 @@ fetch_timestamp(
- #endif /* HAVE_TIMESTAMPNS */
- #ifdef HAVE_TIMESTAMP
- case SCM_TIMESTAMP:
-- tvp = (struct timeval *)CMSG_DATA(cmsghdr);
-+ memcpy(&tvhold, CMSG_DATA(cmsghdr), sizeof(tvhold));
- if (sys_tick > measured_tick &&
- sys_tick > 1e-6) {
- ticks = (unsigned long)((tvp->tv_usec * 1e-6) /--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/ntp/patches/80-rootdist.patch Tue Jul 26 18:00:02 2016 -0700
@@ -0,0 +1,19 @@
+The root dispersion calculation incorrectly stopped using the peer dispersion
+term when testing the acceptability of a NTP sever.
+
+This has been reported as NTP community bug 3093
+http://bugs.ntp.org/show_bug.cgi?id=3093
+This patch may be removed when upgrading to a version of NTP with that bug
+fixed.
+
+--- ntpd/ntp_proto.c
++++ ntpd/ntp_proto.c
[email protected]@ -4338,7 +4338,7 @@ peer_unfit(
+ * plus the increment due to one host poll interval.
+ */
+ if ( !(peer->flags & FLAG_REFCLOCK)
+- && root_distance(peer) >= sys_maxdist
++ && (root_distance(peer) + peer->disp) >= sys_maxdist
+ + clock_phi * ULOGTOD(peer->hpoll))
+ rval |= TEST11; /* distance exceeded */
+
--- a/components/ntp/test/results-64.master Tue Jul 26 15:27:27 2016 -0700
+++ b/components/ntp/test/results-64.master Tue Jul 26 18:00:02 2016 -0700
@@ -1,39 +1,3 @@
-===========================================
- libevent 2.1.5-beta: ./test-suite.log
-===========================================
-
-# TOTAL: 1
-# PASS: 1
-# SKIP: 0
-# XFAIL: 0
-# FAIL: 0
-# XPASS: 0
-# ERROR: 0
-
-.. contents:: :depth: 2
-
-Running tests:
-EPOLL (timerfd)
-Skipping test
-EPOLL (changelist)
-Skipping test
-EPOLL (timerfd+changelist)
-Skipping test
-EVPORT
-Skipping test
-KQUEUE
-Skipping test
-EPOLL
-Skipping test
-DEVPOLL
-Skipping test
-POLL
-Skipping test
-SELECT
-Skipping test
-WIN32
-Skipping test
-PASS test/test-script.sh (exit status: 0)
crypto.c:12:test_MakeMd5Mac:PASS
crypto.c:13:test_MakeSHA1Mac:PASS
crypto.c:14:test_VerifyCorrectMD5:PASS
@@ -181,7 +145,7 @@
OK
PASS test-packetProcessing (exit status: 0)
========================================
- sntp 4.2.8p7: tests/test-suite.log
+ sntp : tests/test-suite.log
========================================
# TOTAL: 9
@@ -213,7 +177,7 @@
OK
PASS test-utilities (exit status: 0)
================================================
- ntp 4.2.8p7: tests/bug-2803/test-suite.log
+ ntp : tests/bug-2803/test-suite.log
================================================
# TOTAL: 1
@@ -729,7 +693,7 @@
OK
PASS test-strtolfp (exit status: 0)
==============================================
- ntp 4.2.8p7: tests/libntp/test-suite.log
+ ntp : tests/libntp/test-suite.log
==============================================
# TOTAL: 39
@@ -1483,7 +1447,7 @@
OK
PASS test-rc_cmdlength (exit status: 0)
============================================
- ntp 4.2.8p7: tests/ntpd/test-suite.log
+ ntp : tests/ntpd/test-suite.log
============================================
# TOTAL: 4
@@ -1509,7 +1473,7 @@
OK
PASS test-ntpq (exit status: 0)
============================================
- ntp 4.2.8p7: tests/ntpq/test-suite.log
+ ntp : tests/ntpq/test-suite.log
============================================
# TOTAL: 1
@@ -1523,7 +1487,7 @@
.. contents:: :depth: 2
===============================================
- ntp 4.2.8p7: tests/sandbox/test-suite.log
+ ntp : tests/sandbox/test-suite.log
===============================================
# TOTAL: 2
@@ -1537,7 +1501,7 @@
.. contents:: :depth: 2
================================================
- ntp 4.2.8p7: tests/sec-2853/test-suite.log
+ ntp : tests/sec-2853/test-suite.log
================================================
# TOTAL: 1
@@ -3000,7 +2964,6 @@
#define PACKAGE_NAME "ntp"
/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "ntp 4.2.8p7"
/* Define to the one symbol short name of this package. */
#define PACKAGE_TARNAME "ntp"