--- a/components/ntp/Makefile	Thu Jan 28 10:36:09 2016 -0800
+++ b/components/ntp/Makefile	Thu Jan 07 18:40:27 2016 -0800
@@ -20,14 +20,14 @@
 #
 
 #
-# Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2016, 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=	2
+COMPONENT_PATCH_VERSION=	6
 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:0d69bc0e95caad43ea04fdad410e756bae1a71e67b1c2bd799b76b55e04c9b31
+    sha256:583d0e1c573ace30a9c6afbea0fc52cae9c8c916dbc15c026e485a0dda4ba048
 COMPONENT_ARCHIVE_URL=	http://archive.ntp.org/ntp4/ntp-4.2/$(COMPONENT_ARCHIVE)
 COMPONENT_BUGDB= service/ntp
 

--- a/components/ntp/patches/40-norefresh.patch	Thu Jan 28 10:36:09 2016 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
-Don't change interfaces unless there is something wrong with the old one.
-This is NTP bug [2043] and this patch should be removed after upgrading to
-a version of NTP with a fix for that bug.
-
---- ntpd/ntp_peer.c
-+++ ntpd/ntp_peer.c
-@@ -718,9 +718,13 @@
- 	/*
- 	 * this is called when the interface list has changed
- 	 * give all peers a chance to find a better interface
-+	 * but only if either they don't have an address already
-+	 * or if the one they have hasn't worked for a while.
- 	 */
--	for (p = peer_list; p != NULL; p = p->p_link)
--		peer_refresh_interface(p);
-+	for (p = peer_list; p != NULL; p = p->p_link) {
-+		if (!(p->dstadr && (p->reach & 0x3)))
-+			peer_refresh_interface(p);
-+	}
- }
- 
- 

--- a/components/ntp/patches/70-leapslew.patch	Thu Jan 28 10:36:09 2016 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,42 +0,0 @@
-This patch can be removed when upgrading to community version that has
-NTP bug 2745 fixed. See http://bugzilla.ntp.org/show_bug.cgi?id=2745
-
---- ntpd/ntp_timer.c
-+++ ntpd/ntp_timer.c
-@@ -472,7 +472,7 @@ alarming(
- # endif
- # ifdef DEBUG
- 	if (debug >= 4)
--		write(1, msg, strlen(msg));
-+		(void)(0 != write(1, msg, strlen(msg)));
- # endif
- }
- #endif /* SYS_WINNT */
-@@ -521,11 +521,23 @@ check_leapsec(
- 		 * announce the leap event has happened.
- 		 */
- 		if (lsdata.warped < 0) {
--			step_systime(lsdata.warped);
--			msyslog(LOG_NOTICE, "Inserting positive leap second.");
-+			if (clock_max_back > 0.0 &&
-+			    clock_max_back < fabs(lsdata.warped)) {
-+				step_systime(lsdata.warped);
-+				msyslog(LOG_NOTICE, "Positive leap second, stepped backward.");
-+			} else {
-+				msyslog(LOG_NOTICE, "Positive leap second, expect slowdown slew soon."
-+				    " System clock will be inaccurate until it finishes.");
-+			}
- 		} else 	if (lsdata.warped > 0) {
--			step_systime(lsdata.warped);
--			msyslog(LOG_NOTICE, "Inserting negative leap second.");
-+			if (clock_max_fwd > 0.0 &&
-+			    clock_max_fwd < fabs(lsdata.warped)) {
-+				step_systime(lsdata.warped);
-+				msyslog(LOG_NOTICE, "Negative leap second, stepped forward.");
-+			} else {
-+				msyslog(LOG_NOTICE, "Negative leap second, expect speedup slew soon."
-+				    " System clock will be inaccurate until it finishes.");
-+			}
- 		}
- 		report_event(EVNT_LEAP, NULL, NULL);
- 		lsprox  = LSPROX_NOWARN;

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/ntp/patches/70-no-timing.patch	Thu Jan 07 18:40:27 2016 -0800
@@ -0,0 +1,18 @@
+This patch is used to get around a compiling problem with ntp-4.2.8p6. It is
+not needed on versions prior to that. The problem has been reported as NTP
+community bug 2994, http://bugs.ntp.org/show_bug.cgi?id=2994 and may be removed
+for versions of NTP with this bug fixed.
+
+--- ntpd/ntpd.c
++++ ntpd/ntpd.c
+@@ -159,6 +159,10 @@ int priority_done = 2;		/* 0 - Set prior
+ 
+ int listen_to_virtual_ips = TRUE;
+ 
++#if defined(HAVE_SIGNALED_IO) && defined(DEBUG_TIMING)
++# undef DEBUG_TIMING
++#endif
++
+ /*
+  * No-fork flag.  If set, we do not become a background daemon.
+  */