25129643 Upgrade NTP to version 4.2.8p9
24340375 When routers are stuck in a loop, NTP eats up resources and causes DoS
25129656 problem in SERVICE/NTP
--- a/components/ntp/Makefile Wed Nov 30 16:55:23 2016 -0800
+++ b/components/ntp/Makefile Mon Nov 28 18:54:29 2016 -0800
@@ -27,7 +27,7 @@
COMPONENT_NAME= ntp
COMPONENT_VERSION= 4.2.8
-COMPONENT_PATCH_VERSION= 8
+COMPONENT_PATCH_VERSION= 9
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:2ab3d0b5f0456e6311dda1cc27ab75da108762773a19e46abd938bd9407b97ee
+ sha256:b724287778e1bac625b447327c9851eedef020517a3545625e9f652a90f30b72
COMPONENT_ARCHIVE_URL= http://archive.ntp.org/ntp4/ntp-4.2/$(COMPONENT_ARCHIVE)
COMPONENT_BUGDB= service/ntp
--- a/components/ntp/patches/80-rootdist.patch Wed Nov 30 16:55:23 2016 -0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
-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
-@@ -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/patches/80-weak.patch Wed Nov 30 16:55:23 2016 -0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
-This has been submitted as NTP community bug 3021
-http://bugzilla.ntp.org/show_bug.cgi?id=3021
-This patch may be removed when NTP is upgraded to a version that has bug
-3021 fixed in it.
-
---- sntp/unity/unity_fixture.c
-+++ sntp/unity/unity_fixture.c
-@@ -16,7 +16,8 @@ UNITY_FIXTURE_T UnityFixture;
- int (*outputChar)(int) = putchar;
-
- int verbose = 0;
--
-+#pragma weak setUp
-+#pragma weak tearDown
- void setUp(void);
- void tearDown(void);
- void setUp(void) { /*does nothing*/ }
--- a/components/ntp/test/results-64.master Wed Nov 30 16:55:23 2016 -0800
+++ b/components/ntp/test/results-64.master Mon Nov 28 18:54:29 2016 -0800
@@ -113,26 +113,26 @@
OK
PASS test-packetHandling (exit status: 0)
-packetProcessing.c:25:test_TooShortLength:PASS
-packetProcessing.c:26:test_LengthNotMultipleOfFour:PASS
-packetProcessing.c:27:test_TooShortExtensionFieldLength:PASS
-packetProcessing.c:28:test_UnauthenticatedPacketReject:PASS
+packetProcessing.c:20:test_TooShortLength:PASS
+packetProcessing.c:21:test_LengthNotMultipleOfFour:PASS
+packetProcessing.c:22:test_TooShortExtensionFieldLength:PASS
+packetProcessing.c:23:test_UnauthenticatedPacketReject:PASS
Crypto NAK = 0x00000000
-packetProcessing.c:29:test_CryptoNAKPacketReject:PASS
-packetProcessing.c:30:test_AuthenticatedPacketInvalid:PASS
+packetProcessing.c:24:test_CryptoNAKPacketReject:PASS
+packetProcessing.c:25:test_AuthenticatedPacketInvalid:PASS
unrecognized key ID = 0x00000032
-packetProcessing.c:31:test_AuthenticatedPacketUnknownKey:PASS
-packetProcessing.c:32:test_ServerVersionTooOld:PASS
-packetProcessing.c:33:test_ServerVersionTooNew:PASS
-packetProcessing.c:34:test_NonWantedMode:PASS
-packetProcessing.c:35:test_KoDRate:PASS
-packetProcessing.c:36:test_KoDDeny:PASS
-packetProcessing.c:37:test_RejectUnsyncedServer:PASS
-packetProcessing.c:38:test_RejectWrongResponseServerMode:PASS
-packetProcessing.c:39:test_AcceptNoSentPacketBroadcastMode:PASS
-packetProcessing.c:40:test_CorrectUnauthenticatedPacket:PASS
-packetProcessing.c:41:test_CorrectAuthenticatedPacketMD5:PASS
-packetProcessing.c:42:test_CorrectAuthenticatedPacketSHA1:PASS
+packetProcessing.c:26:test_AuthenticatedPacketUnknownKey:PASS
+packetProcessing.c:27:test_ServerVersionTooOld:PASS
+packetProcessing.c:28:test_ServerVersionTooNew:PASS
+packetProcessing.c:29:test_NonWantedMode:PASS
+packetProcessing.c:30:test_KoDRate:PASS
+packetProcessing.c:31:test_KoDDeny:PASS
+packetProcessing.c:32:test_RejectUnsyncedServer:PASS
+packetProcessing.c:33:test_RejectWrongResponseServerMode:PASS
+packetProcessing.c:34:test_AcceptNoSentPacketBroadcastMode:PASS
+packetProcessing.c:35:test_CorrectUnauthenticatedPacket:PASS
+packetProcessing.c:36:test_CorrectAuthenticatedPacketMD5:PASS
+packetProcessing.c:37:test_CorrectAuthenticatedPacketSHA1:PASS
-----------------------
18 Tests:
@@ -194,7 +194,7 @@
a_md5encrypt.c:41:test_DecryptValid:PASS
a_md5encrypt.c:42:test_DecryptInvalid:PASS
a_md5encrypt.c:43:test_IPv4AddressToRefId:PASS
-a_md5encrypt.c:115:test_IPv6AddressToRefId:IGNORE: Skipping because of big endian problem?
+a_md5encrypt.c:113:test_IPv6AddressToRefId:IGNORE: Skipping because of big endian problem?
-----------------------
5 Tests:
@@ -272,25 +272,27 @@
OK
PASS test-buftvtots (exit status: 0)
-calendar.c:22:test_DaySplitMerge:PASS
-calendar.c:23:test_SplitYearDays1:PASS
-calendar.c:24:test_SplitYearDays2:PASS
-calendar.c:25:test_RataDie1:PASS
-calendar.c:26:test_LeapYears1:PASS
-calendar.c:27:test_LeapYears2:PASS
-calendar.c:28:test_RoundTripDate:PASS
-calendar.c:29:test_RoundTripYearStart:PASS
-calendar.c:30:test_RoundTripMonthStart:PASS
-calendar.c:31:test_RoundTripWeekStart:PASS
-calendar.c:32:test_RoundTripDayStart:PASS
-calendar.c:33:test_IsoCalYearsToWeeks:PASS
-calendar.c:34:test_IsoCalWeeksToYearStart:PASS
-calendar.c:35:test_IsoCalWeeksToYearEnd:PASS
-calendar.c:36:test_DaySecToDate:PASS
+calendar.c:24:test_DaySplitMerge:PASS
+calendar.c:25:test_SplitYearDays1:PASS
+calendar.c:26:test_SplitYearDays2:PASS
+calendar.c:27:test_RataDie1:PASS
+calendar.c:28:test_LeapYears1:PASS
+calendar.c:29:test_LeapYears2:PASS
+calendar.c:30:test_RoundTripDate:PASS
+calendar.c:31:test_RoundTripYearStart:PASS
+calendar.c:32:test_RoundTripMonthStart:PASS
+calendar.c:33:test_RoundTripWeekStart:PASS
+calendar.c:34:test_RoundTripDayStart:PASS
+calendar.c:35:test_IsoCalYearsToWeeks:PASS
+calendar.c:36:test_IsoCalWeeksToYearStart:PASS
+calendar.c:37:test_IsoCalWeeksToYearEnd:PASS
+calendar.c:38:test_DaySecToDate:PASS
+calendar.c:40:test_NtpToNtp:PASS
+calendar.c:41:test_NtpToTime:PASS
-----------------------
-15 Tests:
-15 PASS
+17 Tests:
+17 PASS
0 XFAIL
0 Failures
0 XPASS