Merge ntpd & friends 4.2.4p5 from vendor/ntp/dist into head. Next commit

will update usr.sbin/ntp to match this.

MFC after:	2 weeks

1 files changed, 12 insertions, 9 deletions

diff --git a/contrib/ntp/libntp/Makefile.am b/contrib/ntp/libntp/Makefile.am
index 75b5505..932f87b 100644
--- a/contrib/ntp/libntp/Makefile.am
+++ b/contrib/ntp/libntp/Makefile.am
@@ -3,15 +3,15 @@ AUTOMAKE_OPTIONS = ../util/ansi2knr
 noinst_LIBRARIES = libntp.a @MAKE_LIBNTPSIM@
 EXTRA_LIBRARIES = libntpsim.a
 libntp_a_SRCS = a_md5encrypt.c adjtime.c atoint.c atolfp.c atouint.c \
-	audio.c authkeys.c authreadkeys.c authusekey.c binio.c buftvtots.c \
-	caljulian.c calleapwhen.c caltontp.c calyearstart.c clocktime.c \
+	audio.c authkeys.c authreadkeys.c authusekey.c buftvtots.c \
+	caljulian.c caltontp.c calyearstart.c clocktime.c \
 	clocktypes.c decodenetnum.c dofptoa.c dolfptoa.c emalloc.c \
-	findconfig.c fptoa.c fptoms.c getopt.c gpstolfp.c hextoint.c \
-	hextolfp.c humandate.c icom.c ieee754io.c inttoa.c iosignal.c \
-	lib_strbuf.c machines.c md5c.c memmove.c mfp_mul.c mfptoa.c \
+	findconfig.c fptoa.c fptoms.c getopt.c hextoint.c \
+	hextolfp.c humandate.c icom.c inttoa.c iosignal.c \
+	lib_strbuf.c machines.c md5c.c memmove.c mfptoa.c \
 	mfptoms.c mktime.c modetoa.c mstolfp.c msutotsf.c msyslog.c netof.c \
 	ntp_rfc2553.c numtoa.c numtohost.c octtoint.c prettydate.c \
-	ranny.c recvbuff.c refnumtoa.c snprintf.c socktoa.c socktohost.c \
+	ntp_random.c recvbuff.c refnumtoa.c snprintf.c socktoa.c socktohost.c \
 	statestr.c strdup.c strerror.c strstr.c \
 	syssignal.c tsftomsu.c tstotv.c tvtoa.c tvtots.c \
 	uglydate.c uinttoa.c utvtoa.c ymd2yd.c \
@@ -19,14 +19,17 @@ libntp_a_SRCS = a_md5encrypt.c adjtime.c atoint.c atolfp.c atouint.c \
 	$(srcdir)/../libisc/interfaceiter.c $(srcdir)/../libisc/lib.c \
 	$(srcdir)/../libisc/mem.c $(srcdir)/../libisc/msgcat.c \
 	$(srcdir)/../libisc/net.c $(srcdir)/../libisc/isc_strerror.c \
-	$(srcdir)/../libisc/inet_ntop.c
+	$(srcdir)/../libisc/inet_ntop.c \
+	$(srcdir)/../libisc/inet_pton.c \
+	$(srcdir)/../libisc/netaddr.c $(srcdir)/../libisc/sockaddr.c \
+	$(srcdir)/../libisc/netscope.c
 libntp_a_SOURCES = systime.c $(libntp_a_SRCS)
 libntpsim_a_SOURCES = systime_s.c $(libntp_a_SRCS)
-EXTRA_libntp_a_SOURCES = adjtimex.c log.c random.c
+EXTRA_libntp_a_SOURCES = adjtimex.c
 INCLUDES = -I$(top_srcdir)/include -I../include
 ETAGS_ARGS = Makefile.am
 
-noinst_HEADERS = lib_strbuf.h log.h
+noinst_HEADERS = lib_strbuf.h 
 
 ../include/des.h:
 	touch ../include/des.h