25129643 Upgrade NTP to version 4.2.8p9 s11u3-sru
authorBrian Utterback <brian.utterback@oracle.com>
Mon, 28 Nov 2016 18:54:29 -0800
branchs11u3-sru
changeset 7533 d7ad80926fea
parent 7532 7c3747a0f6b1
child 7534 2aa7c5a61a30
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
components/ntp/Makefile
components/ntp/patches/80-rootdist.patch
--- a/components/ntp/Makefile	Mon Dec 19 21:16:50 2016 -0800
+++ b/components/ntp/Makefile	Mon Nov 28 18:54:29 2016 -0800
@@ -20,14 +20,14 @@
 #
 
 #
-# Copyright (c) 2010, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2017, Oracle and/or its affiliates. All rights reserved.
 #
 
 include ../../make-rules/shared-macros.mk
 
 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)
@@ -36,7 +36,7 @@
 COMPONENT_SRC=		$(COMPONENT_SRC_NAME)-$(HUMAN_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
 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	Mon Dec 19 21:16:50 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
[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 */
-