Virgin import of ntpd 4.2.6p5.vendor/ntp/4.2.6p5

When the series of commits is complete, things like
https://cert.litnet.lt/en/docs/ntp-distributed-reflection-dos-attacks
should be fixed.

PR:		bin/148836 (except that we import a newer version)
Asked by:	Too many
MFC after:	2 weeks

1 files changed, 126 insertions, 74 deletions

diff --git a/Makefile.in b/Makefile.in
index 42b2e2e79db6..0fe79e359aa2 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -33,16 +33,22 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-@NEED_LIBOPTS_TRUE@am__append_1 = libopts
 subdir = .
 DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.in $(srcdir)/config.h.in \
 	$(top_srcdir)/configure ChangeLog INSTALL NEWS TODO compile \
-	config.guess config.sub depcomp install-sh ltmain.sh missing
+	config.guess config.sub depcomp install-sh ltmain.sh missing \
+	ylwrap
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/libopts/m4/libopts.m4 \
-	$(top_srcdir)/m4/define_dir.m4 \
-	$(top_srcdir)/m4/hs_ulong_const.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/sntp/libopts/m4/libopts.m4 \
+	$(top_srcdir)/m4/define_dir.m4 $(top_srcdir)/m4/libtool.m4 \
+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+	$(top_srcdir)/m4/ntp_cacheversion.m4 \
+	$(top_srcdir)/m4/ntp_dir_sep.m4 \
+	$(top_srcdir)/m4/ntp_lineeditlibs.m4 \
+	$(top_srcdir)/m4/ntp_openssl.m4 \
+	$(top_srcdir)/m4/ntp_vpathhack.m4 \
 	$(top_srcdir)/m4/os_cflags.m4 $(top_srcdir)/version.m4 \
 	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -108,7 +114,6 @@ distcleancheck_listfiles = find . -type f -print
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 AR = @AR@
-ARLIB_DIR = @ARLIB_DIR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
@@ -125,14 +130,18 @@ CYGPATH_W = @CYGPATH_W@
 DCFD = @DCFD@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-ECHO = @ECHO@
+DLLTOOL = @DLLTOOL@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
+EDITLINE_LIBS = @EDITLINE_LIBS@
 EF_LIBS = @EF_LIBS@
 EF_PROGS = @EF_PROGS@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
+FGREP = @FGREP@
 GREP = @GREP@
 HAVE_INLINE = @HAVE_INLINE@
 INSTALL = @INSTALL@
@@ -141,6 +150,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 LCRYPTO = @LCRYPTO@
+LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBOPTS_CFLAGS = @LIBOPTS_CFLAGS@
@@ -149,6 +159,7 @@ LIBOPTS_LDADD = @LIBOPTS_LDADD@
 LIBPARSE = @LIBPARSE@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
 LN_S = @LN_S@
 LSCF = @LSCF@
 LTLIBOBJS = @LTLIBOBJS@
@@ -160,15 +171,22 @@ MAKE_LIBNTPSIM = @MAKE_LIBNTPSIM@
 MAKE_LIBPARSE = @MAKE_LIBPARSE@
 MAKE_LIBPARSE_KERNEL = @MAKE_LIBPARSE_KERNEL@
 MAKE_NTPDSIM = @MAKE_NTPDSIM@
+MAKE_NTPSNMPD = @MAKE_NTPSNMPD@
 MAKE_NTPTIME = @MAKE_NTPTIME@
 MAKE_PARSEKMODULE = @MAKE_PARSEKMODULE@
 MAKE_TICKADJ = @MAKE_TICKADJ@
 MAKE_TIMETRIM = @MAKE_TIMETRIM@
+MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
 OPENSSL = @OPENSSL@
 OPENSSL_INC = @OPENSSL_INC@
 OPENSSL_LIB = @OPENSSL_LIB@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
@@ -176,23 +194,32 @@ PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_NET_SNMP_CONFIG = @PATH_NET_SNMP_CONFIG@
 PATH_PERL = @PATH_PERL@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PATH_SH = @PATH_SH@
+PATH_TEST = @PATH_TEST@
+POSIX_SHELL = @POSIX_SHELL@
 PROPDELAY = @PROPDELAY@
 RANLIB = @RANLIB@
-READLINE_LIBS = @READLINE_LIBS@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
+SNMP_CFLAGS = @SNMP_CFLAGS@
+SNMP_CPPFLAGS = @SNMP_CPPFLAGS@
+SNMP_LIBS = @SNMP_LIBS@
 STRIP = @STRIP@
 TESTDCF = @TESTDCF@
-U = @U@
 VERSION = @VERSION@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -239,83 +266,88 @@ target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-
-#AUTOMAKE_OPTIONS = util/ansi2knr foreign dist-tarZ no-dependencies
-AUTOMAKE_OPTIONS = util/ansi2knr foreign 1.8
-ACLOCAL_AMFLAGS = -I m4 -I libopts/m4
+AUTOMAKE_OPTIONS = foreign 1.10
+ACLOCAL_AMFLAGS = -I m4 -I sntp/libopts/m4
 NULL = 
-SUBDIRS = $(am__append_1) scripts include ElectricFence @ARLIB_DIR@ \
-	libntp libparse ntpd ntpdate ntpdc ntpq parseutil adjtimed \
-	clockstuff kernel sntp util $(NULL)
+SUBDIRS = scripts include ElectricFence libntp sntp libparse ntpd \
+	ntpdate ntpdc ntpq ntpsnmpd parseutil adjtimed clockstuff \
+	kernel util $(NULL)
 DIST_SUBDIRS = \
 	scripts		\
 	include		\
 	ElectricFence	\
-	arlib		\
 	libntp		\
-	libopts		\
 	libparse	\
+	sntp		\
 	ntpd		\
 	ntpdate		\
 	ntpdc		\
 	ntpq		\
+	ntpsnmpd	\
 	parseutil	\
 	adjtimed	\
 	clockstuff	\
 	kernel		\
-	sntp		\
 	util		\
 	$(NULL)
 
-DISTCHECK_CONFIGURE_FLAGS = --with-arlib --enable-local-libopts
+DISTCHECK_CONFIGURE_FLAGS = -C
 EXTRA_DIST = \
-	COPYRIGHT	\
-	ChangeLog	\
-	CommitLog	\
-	CommitLog-4.1.0 \
-	NEWS		\
-	NOTES.y2kfixes	\
-	README.bk	\
-	README.hackers	\
-	README.patches	\
-	README.refclocks \
-	README.versions	\
-	TODO		\
-	WHERE-TO-START	\
-	bootstrap	\
-	build		\
-	config.guess	\
-	config.h.in	\
-	config.sub	\
-	dot.emacs	\
-	excludes	\
-	flock-build	\
-	install-sh	\
-	packageinfo.sh	\
-	readme.y2kfixes	\
+	$(srcdir)/COPYRIGHT	\
+	ChangeLog		\
+	CommitLog		\
+	CommitLog-4.1.0		\
+	NEWS			\
+	NOTES.y2kfixes		\
+	README.bk		\
+	README.hackers		\
+	README.patches		\
+	README.refclocks	\
+	README.versions		\
+	TODO			\
+	WHERE-TO-START		\
+	bootstrap		\
+	build			\
+	config.guess		\
+	config.h.in		\
+	config.sub		\
+	dot.emacs		\
+	excludes		\
+	flock-build		\
+	install-sh		\
+	packageinfo.sh		\
+	readme.y2kfixes		\
 	results.y2kfixes	\
 	\
-	conf		\
-	html		\
-	libisc		\
-	ports		\
+	conf			\
+	html			\
+	lib/isc			\
+	ports			\
 	\
-	bincheck.mf	\
-	version		\
-	version.m4	\
+	bincheck.mf		\
+	depsver.mf		\
+	deps-ver		\
+	$(srcdir)/version	\
+	version.m4		\
 	\
 	$(NULL)
 
+CLEANFILES = 
 DISTCLEANFILES = .gcc-warning
-
-#ETAGS_ARGS = $(srcdir)/Makefile.am $(srcdir)/configure.ac
 ETAGS_ARGS = Makefile.am configure.ac
 
-# HMS: make ports be the last directory...
-# DIST_HOOK_DIRS = conf html scripts ports
-
 # HMS: Keep .gcc-warning first, as that way it gets printed first.
-BUILT_SOURCES = .gcc-warning $(srcdir)/COPYRIGHT $(srcdir)/version $(srcdir)/version.m4 $(srcdir)/include/version.def
+BUILT_SOURCES = \
+	.gcc-warning			\
+	libtool				\
+	$(srcdir)/COPYRIGHT		\
+	$(srcdir)/version		\
+	$(srcdir)/version.m4		\
+	$(srcdir)/include/version.def	\
+	$(srcdir)/include/version.texi	\
+	$(srcdir)/.checkChangeLog	\
+	$(NULL)
+
 
 # HMS: The following seems to be a work-in-progress...
 CVO = `$(srcdir)/config.guess`
@@ -392,7 +424,7 @@ distclean-libtool:
 #     (which will cause the Makefiles to be regenerated when you run `make');
 # (2) otherwise, pass the desired values on the `make' command line.
 $(RECURSIVE_TARGETS):
-	@failcom='exit 1'; \
+	@fail= failcom='exit 1'; \
 	for f in x $$MAKEFLAGS; do \
 	  case $$f in \
 	    *=* | --[!k]*);; \
@@ -417,7 +449,7 @@ $(RECURSIVE_TARGETS):
 	fi; test -z "$$fail"
 
 $(RECURSIVE_CLEAN_TARGETS):
-	@failcom='exit 1'; \
+	@fail= failcom='exit 1'; \
 	for f in x $$MAKEFLAGS; do \
 	  case $$f in \
 	    *=* | --[!k]*);; \
@@ -584,7 +616,8 @@ distdir: $(DISTFILES)
 	  top_distdir="$(top_distdir)" distdir="$(distdir)" \
 	  dist-hook
 	-test -n "$(am__skip_mode_fix)" \
-	|| find "$(distdir)" -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
+	|| find "$(distdir)" -type d ! -perm -755 \
+		-exec chmod u+rwx,go+rx {} \; -o \
 	  ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
 	  ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
 	  ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
@@ -628,17 +661,17 @@ dist dist-all: distdir
 distcheck: dist
 	case '$(DIST_ARCHIVES)' in \
 	*.tar.gz*) \
-	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
+	  GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
 	*.tar.bz2*) \
-	  bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
+	  bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
 	*.tar.lzma*) \
-	  unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\
+	  lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\
 	*.tar.xz*) \
 	  xz -dc $(distdir).tar.xz | $(am__untar) ;;\
 	*.tar.Z*) \
 	  uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
 	*.shar.gz*) \
-	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\
+	  GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\
 	*.zip*) \
 	  unzip $(distdir).zip ;;\
 	esac
@@ -721,6 +754,7 @@ install-strip:
 mostlyclean-generic:
 
 clean-generic:
+	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
@@ -823,7 +857,17 @@ uninstall-am:
 
 
 $(srcdir)/COPYRIGHT: $(srcdir)/html/copyright.html
-	( echo "This file is automatically generated from html/copyright.html" ; lynx -dump $(srcdir)/html/copyright.html ) > $(srcdir)/COPYRIGHT.new && mv $(srcdir)/COPYRIGHT.new $(srcdir)/COPYRIGHT
+	{ echo "This file is automatically generated from html/copyright.html" ; \
+	  lynx -dump $(srcdir)/html/copyright.html ;} > COPYRIGHT.new \
+	&& mv -f COPYRIGHT.new $(srcdir)/COPYRIGHT
+
+COPYRIGHT-please: $(srcdir)/COPYRIGHT
+	@: do-nothing action to prevent default \
+	   This target is needed by sntp/Makefile.am on decrepit \
+	   FreeBSD 6.x make which fails with "make COPYRIGHT" \
+	   configured in $(srcdir) but "make ./COPYRIGHT" succeeds. \
+	   Rather than determine our $(srcdir) from sntp/Makefile.am \
+	   COPYRIGHT-please serves as a fixed target.
 
 # HMS: The next bit is still suboptimal.  If bk is present but this NTP
 # repo is not a bk repo, we'll get an error message from the prs command.
@@ -833,24 +877,31 @@ $(srcdir)/COPYRIGHT: $(srcdir)/html/copyright.html
 $(srcdir)/version: FRC.version
 	-(bk version) >/dev/null 2>&1 && \
 	    cd $(srcdir) && \
-            x=`bk -R prs -hr+ -nd:I: ChangeSet` && \
+	    x=`bk -R prs -hr+ -nd:I: ChangeSet` && \
 	    y=`cat version 2>/dev/null` || true && \
 	    case "$$x" in ''|$$y) ;; *) echo $$x > version ;; esac
 
 $(srcdir)/version.m4: $(srcdir)/packageinfo.sh
-	cd $(srcdir) && \
+	TEMPDIR=`pwd` && export TEMPDIR && cd $(srcdir) && \
 	./scripts/genver version.m4
 
 $(srcdir)/include/version.def: $(srcdir)/packageinfo.sh
-	cd $(srcdir) && \
+	TEMPDIR=`pwd` && export TEMPDIR && cd $(srcdir) && \
 	./scripts/genver include/version.def
 
+$(srcdir)/include/version.texi: $(srcdir)/packageinfo.sh
+	TEMPDIR=`pwd` && export TEMPDIR && cd $(srcdir) && \
+	./scripts/genver include/version.texi
+
+$(srcdir)/.checkChangeLog: $(srcdir)/ChangeLog $(srcdir)/scripts/checkChangeLog
+	cd $(srcdir) && \
+	./scripts/checkChangeLog
+
+libtool: $(LIBTOOL_DEPS)
+	./config.status --recheck
+
 dist-hook:
-	@find $(distdir) -type d -name CVS -print | xargs rm -rf
 	@find $(distdir) -type d -name SCCS -print | xargs rm -rf
-	@chmod u+w $(distdir)/ports/winnt
-	@for i in `find $(distdir)/ports/winnt -type f -name '*.ds*' -print`; \
-	   do chmod u+w $$i ; unix2dos $$i $$i; done
 
 .gcc-warning:
 	@echo "Compiling with GCC now generates lots of new warnings."
@@ -866,7 +917,7 @@ dist-hook:
 
 CommitLog: FRC.CommitLog
 	cd $(srcdir)					\
-	&& /bin/test -e CommitLog			\
+	&& $(PATH_TEST) -e CommitLog			\
 		-a SCCS/s.ChangeSet -ot CommitLog	\
 	|| scripts/genCommitLog
 
@@ -890,6 +941,7 @@ CommitLog: FRC.CommitLog
 	fi
 
 FRC.CommitLog FRC.distwarn FRC.checkcvo FRC.checkhost FRC.version:
+	@: do-nothing action prevents any default
 
 # HMS: what was I trying to do with this?
 #dot.emacs: FRC.distwarn