Upgrade NTP to 4.2.8p4.

Security:	FreeBSD-SA-15:25.ntp
Security:	CVE-2015-7871
Security:	CVE-2015-7855
Security:	CVE-2015-7854
Security:	CVE-2015-7853
Security:	CVE-2015-7852
Security:	CVE-2015-7851
Security:	CVE-2015-7850
Security:	CVE-2015-7849
Security:	CVE-2015-7848
Security:	CVE-2015-7701
Security:	CVE-2015-7703
Security:	CVE-2015-7704, CVE-2015-7705
Security:	CVE-2015-7691, CVE-2015-7692, CVE-2015-7702
Approved by:	so

1 files changed, 72 insertions, 56 deletions

diff --git a/contrib/ntp/include/Makefile.am b/contrib/ntp/include/Makefile.am
index 1fbe6fcfe35f..f032c97e792d 100644
--- a/contrib/ntp/include/Makefile.am
+++ b/contrib/ntp/include/Makefile.am
@@ -1,63 +1,79 @@
-#AUTOMAKE_OPTIONS = ../util/ansi2knr no-dependencies
-AUTOMAKE_OPTIONS = ../util/ansi2knr
-ETAGS_ARGS = $(srcdir)/Makefile.am
-EXTRA_DIST = autogen-version.def copyright.def debug-opt.def homerc.def version.def
+NULL =
 
 SUBDIRS = isc
 
-noinst_HEADERS = \
-	adjtime.h \
-	audio.h \
-	ascii.h \
-	audio.h \
-	binio.h \
-	global.h \
-	gps.h \
-	hopf6039.h \
-	icom.h \
-	ieee754io.h \
-	iosignal.h \
-	l_stdlib.h \
-	mbg_gps166.h \
-	mx4200.h \
-	ntif.h \
-	ntp.h \
-	ntp_calendar.h \
-	ntp_cmdargs.h \
-	ntp_config.h \
-	ntp_control.h \
-	ntp_crypto.h \
-	ntp_datum.h \
-	ntp_debug.h \
-	ntp_filegen.h \
-	ntp_fp.h \
-	ntp_if.h \
-	ntp_io.h \
-	ntp_machine.h \
-	ntp_malloc.h \
-	ntp_md5.h \
-	ntp_proto.h \
-	ntp_random.h \
-	ntp_refclock.h \
-	ntp_request.h \
-	ntp_rfc2553.h \
-	ntp_select.h \
-	ntp_sprintf.h \
-	ntp_stdlib.h \
-	ntp_string.h \
-	ntp_syscall.h \
-	ntp_syslog.h \
-	ntp_tty.h \
-	ntp_types.h \
-	ntp_unixtime.h \
-	ntpd.h \
-	ntpsim.h \
-	parse.h \
-	parse_conf.h \
-	recvbuff.h \
-	rsa_md5.h \
+noinst_HEADERS =	\
+	adjtime.h	\
+	audio.h		\
+	ascii.h		\
+	audio.h		\
+	binio.h		\
+	declcond.h	\
+	gps.h		\
+	hopf6039.h	\
+	icom.h		\
+	ieee754io.h	\
+	intreswork.h	\
+	iosignal.h	\
+	l_stdlib.h	\
+	lib_strbuf.h	\
+	libntp.h	\
+	mbg_gps166.h	\
+	mx4200.h	\
+	ntif.h		\
+	ntp.h		\
+	ntp_assert.h	\
+	ntp_calendar.h	\
+	ntp_cmdargs.h	\
+	ntp_config.h	\
+	ntp_control.h	\
+	ntp_crypto.h	\
+	ntp_prio_q.h	\
+	ntp_datum.h	\
+	ntp_debug.h	\
+	ntp_filegen.h	\
+	ntp_fp.h	\
+	ntp_if.h	\
+	ntp_intres.h	\
+	ntp_io.h	\
+	ntp_libopts.h	\
+	ntp_lineedit.h	\
+	ntp_lists.h	\
+	ntp_machine.h	\
+	ntp_malloc.h	\
+	ntp_md5.h	\
+	ntp_net.h	\
+	ntp_proto.h	\
+	ntp_random.h	\
+	ntp_refclock.h	\
+	ntp_request.h	\
+	ntp_rfc2553.h	\
+	ntp_select.h	\
+	ntp_stdlib.h	\
+	ntp_string.h	\
+	ntp_syscall.h	\
+	ntp_syslog.h	\
+	ntp_tty.h	\
+	ntp_types.h	\
+	ntp_unixtime.h	\
+	ntp_worker.h	\
+	ntp_workimpl.h	\
+	ntpd.h		\
+	ntpsim.h	\
+	parse.h		\
+	parse_conf.h	\
+	rc_cmdlength.h	\
+	recvbuff.h	\
+	refclock_atom.h	\
+	refidsmear.h	\
+	ssl_applink.c	\
 	timepps-SCO.h	\
 	timepps-Solaris.h	\
 	timepps-SunOS.h	\
-	trimble.h
+	timespecops.h	\
+	timetoa.h	\
+	timevalops.h	\
+	trimble.h	\
+	vint64ops.h	\
+	$(NULL)