[ntp:bk-ntp-dev-send] BitKeeper diffs

Harlan Stenn stenn at whimsy.udel.edu
Tue Feb 2 09:25:34 UTC 2010


#### ChangeSet ####
2010-02-02 04:18:56-05:00, stenn at pogo.udel.edu 
  cleanup

==== configure.ac ====
2010-02-02 04:18:46-05:00, stenn at pogo.udel.edu +0 -1
  cleanup

--- 1.476/configure.ac	2010-02-02 03:28:06 -05:00
+++ 1.477/configure.ac	2010-02-02 04:18:46 -05:00
@@ -1166,7 +1166,6 @@ AC_C_CHAR_UNSIGNED		dnl CROSS_COMPILE?
 AC_CHECK_SIZEOF(signed char)
 AC_CHECK_SIZEOF(int)
 AC_CHECK_SIZEOF(long)
-AC_CHECK_TYPES([int32, u_int32])
 
 AC_CHECK_TYPES([s_char])
 case "$ac_cv_c_char_unsigned$ac_cv_sizeof_signed_char$ac_cv_type_s_char" in

#### ChangeSet ####
2010-02-02 08:09:04+00:00, davehart at shiny.ad.hartbrothers.com 
  [Bug 1473] "make distcheck" before build can't make sntp/version.m4.

==== ChangeLog ====
2010-02-02 08:09:04+00:00, davehart at shiny.ad.hartbrothers.com +1 -0
  [Bug 1473] "make distcheck" before build can't make sntp/version.m4.

--- 1.496.25.32/ChangeLog	2010-01-31 20:56:41 -05:00
+++ 1.496.25.33/ChangeLog	2010-02-02 03:09:04 -05:00
@@ -2,6 +2,7 @@
 
 * [Bug 1467] Fix bogus rebuild of sntp/sntp.html
 * [Bug 1470] "make distdir" in $srcdir builds keyword-gen, libntp.a.
+* [Bug 1473] "make distcheck" before build can't make sntp/version.m4.
 
 ---
 (4.2.6p1-RC3) 2010/01/24 Released by Harlan Stenn <stenn at ntp.org>

==== Makefile.am ====
2010-02-02 08:09:04+00:00, davehart at shiny.ad.hartbrothers.com +12 -1
  add COPYRIGHT-please target for use by sntp/Makefile.am
  minor tweak to COPYRIGHT action to create intermediate file in
    build dir not $(srcdir) to minimize parallel VPATH makes
    interfering with each other.
  add do-nothing action for rule lacking one to avoid any use
    of SCCS get default.

--- 1.89/Makefile.am	2009-11-28 01:27:33 -05:00
+++ 1.90/Makefile.am	2010-02-02 03:09:04 -05:00
@@ -113,7 +113,17 @@ BUILT_SOURCES =				\
 	$(NULL)
 
 $(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.
@@ -190,6 +200,7 @@ BHOST=`(hostname || uname -n)`
 	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

==== sntp/Makefile.am ====
2010-02-02 08:09:04+00:00, davehart at shiny.ad.hartbrothers.com +34 -5
  [Bug 1473] "make distcheck" before build can't make sntp/version.m4.
    add targets for autogen-version.def, version.def, version.m4, and
    version.texi which invoke a submake on the corresponding check-*
    targets, avoiding an explicit dependency which would cause Autogen
    to be invoked to make sntp-opts.h, which would be considered out-
    of-date because version.def is, and version,def because it depends
    on non-existent check-version.def.  The submake ensures the check
    action is taken without introducing the troublesome dependency.
  use "cd .. && $(MAKE) COPYRIGHT-please" to work around quirk with
    FreeBSD 6.x make which fails with "make COPYRIGHT" when 
    "make ./COPYRIGHT" would work.

--- 1.21.1.4/sntp/Makefile.am	2010-01-08 14:11:53 -05:00
+++ 1.21.1.5/sntp/Makefile.am	2010-02-02 03:09:04 -05:00
@@ -21,7 +21,7 @@ else
 sbin_PROGRAMS=	sntp
 endif
 
-CLEANFILES=
+CLEANFILES = check-COPYRIGHT-submake
 
 SUBDIRS=
 if NEED_LIBOPTS
@@ -86,6 +86,12 @@ noinst_DATA=				\
 	$(NULL)
 
 FRC:
+	@: do-nothing action to prevent default SCCS get
+	@: FRC "force" depends on nothing and is not a file, so is
+	@: always out-of-date causing targets which depend on it to
+	@: similarly always be outdated causing their rules to fire
+	@: each time they or a dependent is built.
+
 check-autogen-version.def: FRC
 	@cd $(srcdir)							\
 	&& test -r ../include/autogen-version.def			\
@@ -95,6 +101,9 @@ check-autogen-version.def: FRC
 		echo "Installing new sntp/autogen-version.def file";	\
 	   fi )
 
+$(srcdir)/autogen-version.def:
+	$(MAKE) check-autogen-version.def
+
 check-version.def: FRC
 	@cd $(srcdir)					\
 	&& test -r ../include/version.def		\
@@ -104,6 +113,9 @@ check-version.def: FRC
 		echo "Installing new sntp/version.def file";	\
 	   fi )
 
+$(srcdir)/version.def:
+	$(MAKE) check-version.def
+
 check-version.m4: FRC
 	@cd $(srcdir)					\
 	&& test -r ../version.m4			\
@@ -113,6 +125,9 @@ check-version.m4: FRC
 		echo "Installing new sntp/version.m4 file";	\
 	   fi )
 
+$(srcdir)/version.m4:
+	$(MAKE) check-version.m4
+
 check-version.texi: FRC
 	@cd $(srcdir)					\
 	&& test -r ../include/version.texi			\
@@ -122,11 +137,25 @@ check-version.texi: FRC
 		echo "Installing new sntp/version.texi file";	\
 	   fi )
 
+$(srcdir)/version.texi:
+	$(MAKE) check-version.texi
+
 $(srcdir)/../COPYRIGHT:
-	cd .. && $(MAKE) COPYRIGHT
+	cd .. && $(MAKE) COPYRIGHT-please
+
+check-COPYRIGHT-submake: $(srcdir)/../COPYRIGHT
+	@cmp -s $(srcdir)/../COPYRIGHT $(srcdir)/COPYRIGHT	\
+	 || { cp $(srcdir)/../COPYRIGHT $(srcdir)/COPYRIGHT	\
+	      && echo 'updated sntp/COPYRIGHT installed' ;}
+	@echo 'submake avoided if this file is newer than parent COPYRIGHT' > $@
+
+check-COPYRIGHT: FRC
+	[ ! -r $(srcdir)/../COPYRIGHT ]					\
+	|| [ check-COPYRIGHT-submake -nt $(srcdir)/../COPYRIGHT ]	\
+	|| $(MAKE) check-COPYRIGHT-submake
 
-$(srcdir)/COPYRIGHT: $(srcdir)/../COPYRIGHT
-	cat $(srcdir)/../COPYRIGHT > $@
+$(srcdir)/COPYRIGHT: check-COPYRIGHT
+	@: do-nothing action to prevent any default
 
 $(srcdir)/sntp-opts.h: $(srcdir)/sntp-opts.c
 	@: do-nothing action to avoid default SCCS get, .h built with .c
@@ -147,7 +176,7 @@ $(srcdir)/sntp.html: $(srcdir)/sntp-opts
 	cd $(srcdir) && makeinfo --force --html --no-split -o sntp.html sntp.texi
 
 ../libntp/libntp.a:
-	cd ../libntp && $(MAKE)
+	cd ../libntp && $(MAKE) libntp.a
 
 libtool: $(LIBTOOL_DEPS)
 	./config.status --recheck

#### ChangeSet ####
2010-02-02 01:29:56+00:00, davehart at shiny.ad.hartbrothers.com 
  Makefile.am:
    keyword-gen-utd is intended to have one line of content.

==== ntpd/Makefile.am ====
2010-02-02 01:28:58+00:00, davehart at shiny.ad.hartbrothers.com +1 -1
  keyword-gen-utd is intended to have one line of content.

--- 1.80.1.6/ntpd/Makefile.am	2010-01-31 20:56:41 -05:00
+++ 1.80.1.7/ntpd/Makefile.am	2010-02-01 20:28:58 -05:00
@@ -227,7 +227,7 @@ k-g-u-submake: keyword-gen
 
 $(srcdir)/keyword-gen-utd: $(srcdir)/keyword-gen.c $(srcdir)/ntp_parser.h
 	$(MAKE) k-g-u-submake	# avoid explicit dependency
-	grep -v diff_ignore_line $(srcdir)/ntp_keyword.h > k-g-u
+	grep diff_ignore_line $(srcdir)/ntp_keyword.h > k-g-u
 	mv -f k-g-u $@
 	
 $(srcdir)/ntp_keyword.h: $(srcdir)/keyword-gen-utd

#### ChangeSet ####
2010-02-01 18:15:31+00:00, davehart at shiny.ad.hartbrothers.com 
  ntp_data_structures.h:
    ensure size_t is available by including stddef.h

==== include/ntp_data_structures.h ====
2010-02-01 18:15:17+00:00, davehart at shiny.ad.hartbrothers.com +1 -0
  ensure size_t is available by including stddef.h

--- 1.6/include/ntp_data_structures.h	2010-01-27 13:45:22 -05:00
+++ 1.7/include/ntp_data_structures.h	2010-02-01 13:15:17 -05:00
@@ -13,6 +13,7 @@
 #ifndef NTP_DATA_STRUCTURES_H
 #define NTP_DATA_STRUCTURES_H
 
+#include <stddef.h>		/* size_t */
 
 /* Structures for storing a priority queue 
  * ---------------------------------------

#### ChangeSet ####
2010-02-01 04:40:15+00:00, davehart at shiny.ad.hartbrothers.com 
  [Bug 1471] CID 120 CID 121 CID 122 is_ip_address() uninit family.
  [Bug 1472] CID 116 CID 117 minor warnings in new DNS code.

==== ChangeLog ====
2010-02-01 04:40:06+00:00, davehart at shiny.ad.hartbrothers.com +2 -0
  [Bug 1471] CID 120 CID 121 CID 122 is_ip_address() uninit family.
  [Bug 1472] CID 116 CID 117 minor warnings in new DNS code.

--- 1.513.1.4/ChangeLog	2010-01-31 05:31:53 -05:00
+++ 1.513.1.5/ChangeLog	2010-01-31 23:40:06 -05:00
@@ -1,3 +1,5 @@
+* [Bug 1471] CID 120 CID 121 CID 122 is_ip_address() uninit family.
+* [Bug 1472] CID 116 CID 117 minor warnings in new DNS code.
 (4.2.7p13) 2010/01/31 Released by Harlan Stenn <stenn at ntp.org>
 * Include (4.2.6p1) - [Bug 1467] Fix bogus rebuild of sntp/sntp.html.
 (4.2.7p12) 2010/01/30 Released by Harlan Stenn <stenn at ntp.org>

==== include/ntp_io.h ====
2010-02-01 04:40:06+00:00, davehart at shiny.ad.hartbrothers.com +1 -1
  [Bug 1471] CID 120 CID 121 CID 122 is_ip_address() uninit family.
  [Bug 1472] CID 116 CID 117 minor warnings in new DNS code.

--- 1.14/include/ntp_io.h	2010-01-27 13:45:23 -05:00
+++ 1.15/include/ntp_io.h	2010-01-31 23:40:06 -05:00
@@ -80,7 +80,7 @@ typedef enum {
 
 SOCKET		move_fd(SOCKET fd);
 isc_boolean_t	get_broadcastclient_flag(void);
-isc_boolean_t	is_ip_address(const char *, isc_netaddr_t *);
+isc_boolean_t	is_ip_address(const char *, u_short, isc_netaddr_t *);
 extern void	sau_from_netaddr(sockaddr_u *, const isc_netaddr_t *);
 extern void	add_nic_rule(nic_rule_match match_type,
 			     const char *if_name, int prefixlen,

==== ntpd/ntp_config.c ====
2010-02-01 04:40:06+00:00, davehart at shiny.ad.hartbrothers.com +7 -9
  [Bug 1471] CID 120 CID 121 CID 122 is_ip_address() uninit family.

--- 1.244/ntpd/ntp_config.c	2010-01-27 13:45:25 -05:00
+++ 1.245/ntpd/ntp_config.c	2010-01-31 23:40:06 -05:00
@@ -2387,7 +2387,8 @@ config_nic_rules(
 			pchSlash = strchr(if_name, '/');
 			if (pchSlash != NULL)
 				*pchSlash = '\0';
-			if (is_ip_address(if_name, &netaddr)) {
+			if (is_ip_address(if_name, AF_UNSPEC,
+					  &netaddr)) {
 				match_type = MATCH_IFADDR;
 				if (pchSlash != NULL) {
 					sscanf(pchSlash + 1, "%d",
@@ -3321,11 +3322,9 @@ config_peers(
 		 * getaddrinfo in the mainline with it.  Otherwise
 		 * hand it off to the blocking child.
 		 */
-		memset(&i_netaddr, 0, sizeof(i_netaddr));
-		i_netaddr.family = (u_short)curr_peer->addr->type;
-
 		if (1 == num_needed
 		    && is_ip_address(curr_peer->addr->address,
+				     (u_short)curr_peer->addr->type,
 				     &i_netaddr)) {
 
 			AF(&peeraddr) = (u_short)i_netaddr.family;
@@ -3505,10 +3504,9 @@ config_unpeers(
 		 * getaddrinfo in the mainline with it.  Otherwise
 		 * hand it off to the blocking child.
 		 */
-		memset(&i_netaddr, 0, sizeof(i_netaddr));
-		i_netaddr.family = (u_short)curr_unpeer->addr->type;
-
-		if (is_ip_address(curr_unpeer->addr->address, &i_netaddr)) {
+		if (is_ip_address(curr_unpeer->addr->address,
+				  (u_short)curr_unpeer->addr->type,
+				  &i_netaddr)) {
 
 			AF(&peeraddr) = (u_short)i_netaddr.family;
 			if (AF_INET6 == i_netaddr.family)
@@ -4346,7 +4344,7 @@ get_multiple_netnums(
 	}
 
 	lookup = nameornum;
-	if (is_ip_address(nameornum, &ipaddr)) {
+	if (is_ip_address(nameornum, AF_UNSPEC, &ipaddr)) {
 		hints.ai_flags = AI_NUMERICHOST;
 		hints.ai_family = ipaddr.family;
 		if ('[' == nameornum[0]) {

==== ntpd/ntp_intres.c ====
2010-02-01 04:40:06+00:00, davehart at shiny.ad.hartbrothers.com +4 -1
  [Bug 1472] CID 116 CID 117 minor warnings in new DNS code.

--- 1.80/ntpd/ntp_intres.c	2010-01-27 13:45:25 -05:00
+++ 1.80.1.1/ntpd/ntp_intres.c	2010-01-31 23:40:06 -05:00
@@ -217,7 +217,10 @@ getaddrinfo_sometime(
 	next_dns_timeslot = max(now, next_dns_timeslot);
 	gai_req->scheduled = now;
 	gai_req->earliest = next_dns_timeslot;
-	gai_req->hints = *hints;
+	if (NULL == hints)
+		memset(&gai_req->hints, 0, sizeof(gai_req->hints));
+	else
+		gai_req->hints = *hints;
 	gai_req->retry = INITIAL_DNS_RETRY;
 	gai_req->callback = callback;
 	gai_req->context = context;

==== ntpd/ntp_io.c ====
2010-02-01 04:40:06+00:00, davehart at shiny.ad.hartbrothers.com +5 -3
  [Bug 1471] CID 120 CID 121 CID 122 is_ip_address() uninit family.

--- 1.311/ntpd/ntp_io.c	2010-01-27 13:45:26 -05:00
+++ 1.312/ntpd/ntp_io.c	2010-01-31 23:40:06 -05:00
@@ -761,6 +761,7 @@ remove_asyncio_reader(
 isc_boolean_t
 is_ip_address(
 	const char *	host,
+	u_short		af,
 	isc_netaddr_t *	addr
 	)
 {
@@ -781,13 +782,13 @@ is_ip_address(
 	 * addresses (up to 46 bytes), the delimiter character and the
 	 * terminating NULL character.
 	 */
-	if (AF_UNSPEC == addr->family || AF_INET == addr->family)
+	if (AF_UNSPEC == af || AF_INET == af)
 		if (inet_pton(AF_INET, host, &in4) == 1) {
 			isc_netaddr_fromin(addr, &in4);
 			return (ISC_TRUE);
 		}
 
-	if (AF_UNSPEC == addr->family || AF_INET6 == addr->family)
+	if (AF_UNSPEC == af || AF_INET6 == af)
 		if (sizeof(tmpbuf) > strlen(host)) {
 			if ('[' == host[0]) {
 				strncpy(tmpbuf, &host[1], sizeof(tmpbuf));
@@ -1125,7 +1126,8 @@ add_nic_rule(
 	} else if (MATCH_IFADDR == match_type) {
 		NTP_REQUIRE(NULL != if_name);
 		/* set rule->netaddr */
-		is_ip = is_ip_address(if_name, &rule->netaddr);
+		is_ip = is_ip_address(if_name, AF_UNSPEC,
+				      &rule->netaddr);
 		NTP_REQUIRE(is_ip);
 	} else
 		NTP_REQUIRE(NULL == if_name);

==== ntpd/ntpd.c ====
2010-02-01 04:40:06+00:00, davehart at shiny.ad.hartbrothers.com +7 -4
  [Bug 1471] CID 120 CID 121 CID 122 is_ip_address() uninit family.
  [Bug 1472] CID 116 CID 117 minor warnings in new DNS code.

--- 1.113/ntpd/ntpd.c	2010-01-27 16:16:19 -05:00
+++ 1.114/ntpd/ntpd.c	2010-01-31 23:40:06 -05:00
@@ -367,8 +367,10 @@ change_logfile(
 		new_file = fopen(abs_fname, "a");
 	}
 
-	if (NULL == new_file)
+	if (NULL == new_file) {
+		free(abs_fname);
 		return -1;
+	}
 
 	/* leave a pointer in the old log */
 	if (log_fname != syslog_abs_fname)
@@ -687,9 +689,10 @@ ntpdmain(
 
 		while (ifacect-- > 0) {
 			add_nic_rule(
-				is_ip_address(*ifaces, &netaddr)
-					? MATCH_IFADDR
-					: MATCH_IFNAME,
+				is_ip_address(*ifaces, AF_UNSPEC,
+					      &netaddr)
+				    ? MATCH_IFADDR
+				    : MATCH_IFNAME,
 				*ifaces, -1, ACTION_LISTEN);
 			ifaces++;
 		}

#### ChangeSet ####
2010-02-01 01:56:41+00:00, davehart at shiny.ad.hartbrothers.com 
  [Bug 1470] "make distdir" in $srcdir builds keyword-gen, libntp.a.

==== ChangeLog ====
2010-02-01 01:56:41+00:00, davehart at shiny.ad.hartbrothers.com +1 -0
  [Bug 1470] "make distdir" in $srcdir builds keyword-gen, libntp.a.

--- 1.496.25.31/ChangeLog	2010-01-30 18:06:02 -05:00
+++ 1.496.25.32/ChangeLog	2010-01-31 20:56:41 -05:00
@@ -1,6 +1,7 @@
 ---
 
 * [Bug 1467] Fix bogus rebuild of sntp/sntp.html
+* [Bug 1470] "make distdir" in $srcdir builds keyword-gen, libntp.a.
 
 ---
 (4.2.6p1-RC3) 2010/01/24 Released by Harlan Stenn <stenn at ntp.org>

==== bootstrap ====
2010-02-01 01:56:41+00:00, davehart at shiny.ad.hartbrothers.com +5 -6
  add ntpd/keyword-gen.out to touch targets, at same time as ntp_parser.h.

--- 1.28.1.2/bootstrap	2010-01-30 18:06:03 -05:00
+++ 1.28.1.3/bootstrap	2010-01-31 20:56:41 -05:00
@@ -106,13 +106,12 @@ done
 
 ## EOAutoGen stuff
 
-# Yacc/bison files
+# Yacc/bison files ntp_parser.[ch] so we don't require the tool if
+# ntp_parser.y hasn't been updated.  At the same time, keyword-gen-utd
+# and ntp_keyword.h which are derived from ntp_parser.h and
+# keyword-gen.c.
 
-touch ntpd/ntp_parser.[ch]
-
-# generated by ntpd/keyword-gen.c
-
-touch ntpd/ntp_keyword.h
+touch ntpd/ntp_parser.[ch] ntpd/keyword-gen-utd ntpd/ntp_keyword.h
 
 cp bincheck.mf sntp/
 cp depsver.mf sntp/

==== ntpd/Makefile.am ====
2010-02-01 01:56:41+00:00, davehart at shiny.ad.hartbrothers.com +41 -26
  [Bug 1470] "make distdir" in $srcdir builds keyword-gen, libntp.a.
    Avoid building keyword-gen if its output is up-to-date in general.

--- 1.80.1.5/ntpd/Makefile.am	2009-12-30 00:48:35 -05:00
+++ 1.80.1.6/ntpd/Makefile.am	2010-01-31 20:56:41 -05:00
@@ -27,12 +27,6 @@ else !SAVECONFIG_ENABLED
 CHECK_SAVECONFIG=
 endif
 
-if NTP_CROSSCOMPILE
-NTP_KEYWORD_OUT=ntp_keyword.dummy
-else
-NTP_KEYWORD_OUT=ntp_keyword.out
-endif
-
 #
 # VPHACK and VPHACK_AFTER are enabled on non-GNU makes (such as 
 # BSD make) to work around issues specific to compiling
@@ -71,7 +65,6 @@ vphack_after:
 
 # BUILT_SOURCES which should also be in EXTRA_DIST
 B_S_DIST=		\
-	ntp_keyword.h 	\
 	ntpd-opts.c 	\
 	ntpd-opts.h 	\
 	$(NULL)
@@ -80,7 +73,7 @@ BUILT_SOURCES=		\
 	$(VPHACK) 	\
 	ntp_parser.c 	\
 	ntp_parser.h 	\
-	$(VPHACK_AFTER) \
+	$(VPHACK_AFTER)	\
 	$(B_S_DIST)	\
 	$(NULL)
 
@@ -95,26 +88,37 @@ man_MANS=	$(srcdir)/ntpd.1
 # sqrt                                ntp_control.o
 # floor                               refclock_wwv.o
 # which are (usually) provided by -lm.
-keyword_gen_LDADD = ../libntp/libntp.a
 ntpd_LDADD = $(LDADD) $(LIBOPTS_LDADD) ../libntp/libntp.a -lm @LCRYPTO@ @LSCF@
 ntpdsim_LDADD = $(LDADD) $(LIBOPTS_LDADD) ../libntp/libntpsim.a -lm @LCRYPTO@ @LSCF@
 ntpdsim_CFLAGS = $(CFLAGS) -DSIM
 check_y2k_LDADD = $(LDADD) ../libntp/libntp.a
-DISTCLEANFILES = keyword-gen .version version.c
-CLEANFILES = check-saveconfig compsave.conf ntp_keyword.out \
-	ntp_keyword.dummy
+keyword_gen_LDADD = ../libntp/libntp.a	# we don't want $(LDADD) here
+
+DISTCLEANFILES =		\
+	keyword-gen		\
+	.version		\
+	version.c		\
+	$(NULL)
+
+CLEANFILES =			\
+	check-saveconfig	\
+	compsave.conf		\
+	k-g-u-submake		\
+	$(NULL)
+
 EXTRA_DIST =			\
 	complete.conf		\
+	keyword-gen-utd		\
 	ntpd.1			\
 	ntpd-opts.def		\
 	ntpd-opts.menu		\
 	ntpd-opts.texi		\
 	ntpdbase-opts.def	\
-	ntp_keyword.h		\
 	refclock_msfees.c	\
 	refclock_trak.c		\
 	$(B_S_DIST)		\
 	$(NULL)
+
 ETAGS_ARGS = Makefile.am
 ###							Y2Kfixes
 check_PROGRAMS = @MAKE_CHECK_Y2K@
@@ -133,6 +137,7 @@ ntpd_SOURCES =			\
 	cmd_args.c		\
 	ntp_config.c		\
 	ntp_data_structures.c	\
+	ntp_keyword.h		\
 	ntp_io.c		\
 	ntp_parser.y		\
 	ntp_scanner.c		\
@@ -208,19 +213,26 @@ libntpd_a_SOURCES =		\
 	refclock_zyfer.c	\
 	$(NULL)
 
-ntp_keyword.out: keyword-gen
-	./keyword-gen $(srcdir)/ntp_parser.h > $@
-	grep -v diff_ignore_line < $(srcdir)/ntp_keyword.h > cmp1
-	grep -v diff_ignore_line < $@ > cmp2
-	cmp cmp1 cmp2 > /dev/null || cp $@ $(srcdir)/ntp_keyword.h
-	rm cmp1 cmp2
+k-g-u-submake: keyword-gen
+	./keyword-gen $(srcdir)/ntp_parser.h > k-g.out
+	@grep -v diff_ignore_line < k-g.out > cmp1
+	@grep -v diff_ignore_line < $(srcdir)/ntp_keyword.h > cmp2
+	@cmp cmp1 cmp2 > /dev/null || \
+		{ mv -f k-g.out $(srcdir)/ntp_keyword.h && \
+		  echo 'Generated changed ntp_keyword.h.' ;}
+	@[ ! -f k-g.out ] || \
+		{ rm k-g.out && echo 'ntp_keyword.h is up to date.' ;}
+	@rm cmp1 cmp2
+	@echo 'keyword-gen and ntp_keyword.h are up to date.' > $@
+
+$(srcdir)/keyword-gen-utd: $(srcdir)/keyword-gen.c $(srcdir)/ntp_parser.h
+	$(MAKE) k-g-u-submake	# avoid explicit dependency
+	grep -v diff_ignore_line $(srcdir)/ntp_keyword.h > k-g-u
+	mv -f k-g-u $@
 	
-ntp_keyword.dummy:
-	echo stamp > $@
-
-$(srcdir)/ntp_keyword.h: $(NTP_KEYWORD_OUT)
+$(srcdir)/ntp_keyword.h: $(srcdir)/keyword-gen-utd
 	@: do-nothing action to avoid default SCCS get
-	@: .h updated if needed by ntp_keyword.out rule
+	@: .h updated if needed by k-g-u-submake rule
 
 $(srcdir)/ntpd-opts.h: $(srcdir)/ntpd-opts.c
 	@: do-nothing action to avoid default SCCS get, .h built with .c
@@ -245,13 +257,16 @@ compsave.conf: ntpd $(srcdir)/complete.c
 check-saveconfig: $(srcdir)/complete.conf compsave.conf
 	cmp $(srcdir)/complete.conf compsave.conf && echo stamp > $@
 
+../libopts/libopts.la:
+	cd ../libopts && $(MAKE) libopts.la
+
 ../libntp/libntp.a:
 	cd ../libntp && $(MAKE) libntp.a
 
 ../libparse/libparse.a:
-	cd ../libparse && $(MAKE)
+	cd ../libparse && $(MAKE) libparse.a
 
-$(top_srcdir)/version :
+$(top_srcdir)/version:
 	cd $(top_srcdir) && $(MAKE) version
 
 version.o: $(ntpd_OBJECTS) ../libntp/libntp.a @LIBPARSE@ Makefile $(top_srcdir)/version

==== ntpd/keyword-gen-utd ====
2010-02-01 01:55:44+00:00, davehart at shiny.ad.hartbrothers.com +1 -0
  intermediate Makefile target used in avoiding building keyword-gen
    after bootstrap or from tarball unless sources change, necessary
    to ensure "make distdir" can succeed before compiling without
    compiling.  See [Bug 1470].

--- /dev/null	2010-02-02 04:25:08 -05:00
+++ 1.1/ntpd/keyword-gen-utd	2010-01-31 20:55:44 -05:00
@@ -0,0 +1 @@
+ *	 Generated 2009-11-09 03:14:05 UTC	  diff_ignore_line

==== ntpd/keyword-gen-utd ====
2010-02-01 01:55:44+00:00, davehart at shiny.ad.hartbrothers.com +0 -0

#### ChangeSet ####
2010-01-30 18:06:35-05:00, stenn at whimsy.udel.edu 
  [Bug 1467] Fix bogus rebuild of sntp/sntp.html

==== ChangeLog ====
2010-01-30 18:06:02-05:00, stenn at whimsy.udel.edu +4 -0
  [Bug 1467] Fix bogus rebuild of sntp/sntp.html

--- 1.496.25.30/ChangeLog	2010-01-24 05:31:16 -05:00
+++ 1.496.25.31/ChangeLog	2010-01-30 18:06:02 -05:00
@@ -1,4 +1,8 @@
 ---
+
+* [Bug 1467] Fix bogus rebuild of sntp/sntp.html
+
+---
 (4.2.6p1-RC3) 2010/01/24 Released by Harlan Stenn <stenn at ntp.org>
 
 * Use TZ=UTC instead of TZ= when calling date in scripts/mkver.in .

==== bootstrap ====
2010-01-30 18:06:03-05:00, stenn at whimsy.udel.edu +1 -1
  [Bug 1467] Fix bogus rebuild of sntp/sntp.html

--- 1.28.1.1/bootstrap	2009-12-22 02:29:22 -05:00
+++ 1.28.1.2/bootstrap	2010-01-30 18:06:03 -05:00
@@ -78,7 +78,7 @@ prog_opt_files=`grep -l '^prog.name' $de
 
 ## Non-AutoGen stuff
 
-for i in autogen-version.def version.def
+for i in autogen-version.def version.def version.texi
 do
     cmp -s include/$i sntp/$i || cp -fp include/$i sntp/$i
 done

#### ChangeSet ####
2010-01-24 10:31:32+00:00, stenn at whimsy.udel.edu 
  NTP_4_2_6P1_RC3
  TAG: NTP_4_2_6P1_RC3

==== ChangeLog ====
2010-01-24 10:31:16+00:00, stenn at whimsy.udel.edu +1 -0
  NTP_4_2_6P1_RC3

--- 1.496.25.29/ChangeLog	2010-01-24 03:49:45 -05:00
+++ 1.496.25.30/ChangeLog	2010-01-24 05:31:16 -05:00
@@ -1,4 +1,5 @@
 ---
+(4.2.6p1-RC3) 2010/01/24 Released by Harlan Stenn <stenn at ntp.org>
 
 * Use TZ=UTC instead of TZ= when calling date in scripts/mkver.in .
 * [Bug 1448] Some macros not correctly conditionally or absolutely defined

==== ntpd/ntpd-opts.c ====
2010-01-24 10:31:17+00:00, stenn at whimsy.udel.edu +4 -4
  NTP_4_2_6P1_RC3

--- 1.248.2.1/ntpd/ntpd-opts.c	2009-12-25 04:31:32 -05:00
+++ 1.248.3.1/ntpd/ntpd-opts.c	2010-01-24 05:31:17 -05:00
@@ -1,7 +1,7 @@
 /*  
  *  EDIT THIS FILE WITH CAUTION  (ntpd-opts.c)
  *  
- *  It has been AutoGen-ed  December 25, 2009 at 09:24:30 AM by AutoGen 5.10
+ *  It has been AutoGen-ed  January 24, 2010 at 10:24:00 AM by AutoGen 5.10
  *  From the definitions    ntpd-opts.def
  *  and the template file   options
  *
@@ -19,7 +19,7 @@
  *
  * This source file is copyrighted and licensed under the following terms:
  *
- * ntpd copyright (c) 1970-2009 David L. Mills and/or others - all rights reserved
+ * ntpd copyright (c) 1970-2010 David L. Mills and/or others - all rights reserved
  *
  * see html/copyright.html
  */
@@ -39,7 +39,7 @@ extern "C" {
 /* TRANSLATORS: choose the translation for option names wisely because you
                 cannot ever change your mind. */
 tSCC zCopyright[] =
-       "ntpd copyright (c) 1970-2009 David L. Mills and/or others, all rights reserved"
+       "ntpd copyright (c) 1970-2010 David L. Mills and/or others, all rights reserved"
 /* extracted from ../include/copyright.def near line 8 */
 ;
 tSCC zCopyrightNotice[24] =
@@ -956,7 +956,7 @@ static tOptDesc optDesc[ OPTION_CT ] = {
  */
 tSCC   zPROGNAME[]   = "NTPD";
 tSCC   zUsageTitle[] =
-"ntpd - NTP daemon program - Ver. 4.2.6p1-RC2\n\
+"ntpd - NTP daemon program - Ver. 4.2.6p1-RC3\n\
 USAGE:  %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]...\n";
 #define zRcName     NULL
 #define apzHomeList NULL

==== ntpd/ntpd-opts.h ====
2010-01-24 10:31:17+00:00, stenn at whimsy.udel.edu +4 -4
  NTP_4_2_6P1_RC3

--- 1.248.2.1/ntpd/ntpd-opts.h	2009-12-25 04:31:32 -05:00
+++ 1.248.3.1/ntpd/ntpd-opts.h	2010-01-24 05:31:17 -05:00
@@ -1,7 +1,7 @@
 /*  
  *  EDIT THIS FILE WITH CAUTION  (ntpd-opts.h)
  *  
- *  It has been AutoGen-ed  December 25, 2009 at 09:24:30 AM by AutoGen 5.10
+ *  It has been AutoGen-ed  January 24, 2010 at 10:24:00 AM by AutoGen 5.10
  *  From the definitions    ntpd-opts.def
  *  and the template file   options
  *
@@ -19,7 +19,7 @@
  *
  * This source file is copyrighted and licensed under the following terms:
  *
- * ntpd copyright (c) 1970-2009 David L. Mills and/or others - all rights reserved
+ * ntpd copyright (c) 1970-2010 David L. Mills and/or others - all rights reserved
  *
  * see html/copyright.html
  */
@@ -90,8 +90,8 @@ typedef enum {
 } teOptIndex;
 
 #define OPTION_CT    35
-#define NTPD_VERSION       "4.2.6p1-RC2"
-#define NTPD_FULL_VERSION  "ntpd - NTP daemon program - Ver. 4.2.6p1-RC2"
+#define NTPD_VERSION       "4.2.6p1-RC3"
+#define NTPD_FULL_VERSION  "ntpd - NTP daemon program - Ver. 4.2.6p1-RC3"
 
 /*
  *  Interface defines for all options.  Replace "n" with the UPPER_CASED

==== ntpd/ntpd-opts.texi ====
2010-01-24 10:31:18+00:00, stenn at whimsy.udel.edu +2 -2
  NTP_4_2_6P1_RC3

--- 1.246.2.1/ntpd/ntpd-opts.texi	2009-12-25 04:31:33 -05:00
+++ 1.246.3.1/ntpd/ntpd-opts.texi	2010-01-24 05:31:18 -05:00
@@ -6,7 +6,7 @@
 # 
 # EDIT THIS FILE WITH CAUTION  (ntpd-opts.texi)
 # 
-# It has been AutoGen-ed  December 25, 2009 at 09:25:25 AM by AutoGen 5.10
+# It has been AutoGen-ed  January 24, 2010 at 10:25:12 AM by AutoGen 5.10
 # From the definitions    ntpd-opts.def
 # and the template file   aginfo.tpl
 @end ignore
@@ -63,7 +63,7 @@ This is the automatically generated usag
 
 @exampleindent 0
 @example
-ntpd - NTP daemon program - Ver. 4.2.6p1-RC2
+ntpd - NTP daemon program - Ver. 4.2.6p1-RC3
 USAGE:  ntpd [ -<flag> [<val>] | --<name>[@{=| @}<val>] ]...
   Flg Arg Option-Name    Description
    -4 no  ipv4           Force IPv4 DNS name resolution

==== ntpd/ntpd.1 ====
2010-01-24 10:31:18+00:00, stenn at whimsy.udel.edu +2 -2
  NTP_4_2_6P1_RC3

--- 1.246.2.1/ntpd/ntpd.1	2009-12-25 04:31:33 -05:00
+++ 1.246.3.1/ntpd/ntpd.1	2010-01-24 05:31:18 -05:00
@@ -1,7 +1,7 @@
-.TH NTPD 1 2009-12-25 "( 4.2.6p1-RC2)" "Programmer's Manual"
+.TH NTPD 1 2010-01-24 "( 4.2.6p1-RC3)" "Programmer's Manual"
 .\"  EDIT THIS FILE WITH CAUTION  (ntpd.1)
 .\"  
-.\"  It has been AutoGen-ed  December 25, 2009 at 09:24:32 AM by AutoGen 5.10
+.\"  It has been AutoGen-ed  January 24, 2010 at 10:25:11 AM by AutoGen 5.10
 .\"  From the definitions    ntpd-opts.def
 .\"  and the template file   agman1.tpl
 .\"

==== ntpdc/ntpdc-opts.c ====
2010-01-24 10:31:19+00:00, stenn at whimsy.udel.edu +4 -4
  NTP_4_2_6P1_RC3

--- 1.244.2.1/ntpdc/ntpdc-opts.c	2009-12-25 04:31:33 -05:00
+++ 1.244.3.1/ntpdc/ntpdc-opts.c	2010-01-24 05:31:19 -05:00
@@ -1,7 +1,7 @@
 /*  
  *  EDIT THIS FILE WITH CAUTION  (ntpdc-opts.c)
  *  
- *  It has been AutoGen-ed  December 25, 2009 at 09:26:10 AM by AutoGen 5.10
+ *  It has been AutoGen-ed  January 24, 2010 at 10:25:28 AM by AutoGen 5.10
  *  From the definitions    ntpdc-opts.def
  *  and the template file   options
  *
@@ -19,7 +19,7 @@
  *
  * This source file is copyrighted and licensed under the following terms:
  *
- * ntpdc copyright (c) 1970-2009 David L. Mills and/or others - all rights reserved
+ * ntpdc copyright (c) 1970-2010 David L. Mills and/or others - all rights reserved
  *
  * see html/copyright.html
  */
@@ -39,7 +39,7 @@ extern "C" {
 /* TRANSLATORS: choose the translation for option names wisely because you
                 cannot ever change your mind. */
 tSCC zCopyright[] =
-       "ntpdc copyright (c) 1970-2009 David L. Mills and/or others, all rights reserved"
+       "ntpdc copyright (c) 1970-2010 David L. Mills and/or others, all rights reserved"
 /* extracted from ../include/copyright.def near line 8 */
 ;
 tSCC zCopyrightNotice[24] =
@@ -452,7 +452,7 @@ static tOptDesc optDesc[ OPTION_CT ] = {
  */
 tSCC   zPROGNAME[]   = "NTPDC";
 tSCC   zUsageTitle[] =
-"ntpdc - vendor-specific NTP query program - Ver. 4.2.6p1-RC2\n\
+"ntpdc - vendor-specific NTP query program - Ver. 4.2.6p1-RC3\n\
 USAGE:  %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]... [ host ...]\n";
 tSCC   zRcName[]     = ".ntprc";
 tSCC*  apzHomeList[] = {

==== ntpdc/ntpdc-opts.h ====
2010-01-24 10:31:19+00:00, stenn at whimsy.udel.edu +4 -4
  NTP_4_2_6P1_RC3

--- 1.244.2.1/ntpdc/ntpdc-opts.h	2009-12-25 04:31:33 -05:00
+++ 1.244.3.1/ntpdc/ntpdc-opts.h	2010-01-24 05:31:19 -05:00
@@ -1,7 +1,7 @@
 /*  
  *  EDIT THIS FILE WITH CAUTION  (ntpdc-opts.h)
  *  
- *  It has been AutoGen-ed  December 25, 2009 at 09:26:09 AM by AutoGen 5.10
+ *  It has been AutoGen-ed  January 24, 2010 at 10:25:28 AM by AutoGen 5.10
  *  From the definitions    ntpdc-opts.def
  *  and the template file   options
  *
@@ -19,7 +19,7 @@
  *
  * This source file is copyrighted and licensed under the following terms:
  *
- * ntpdc copyright (c) 1970-2009 David L. Mills and/or others - all rights reserved
+ * ntpdc copyright (c) 1970-2010 David L. Mills and/or others - all rights reserved
  *
  * see html/copyright.html
  */
@@ -70,8 +70,8 @@ typedef enum {
 } teOptIndex;
 
 #define OPTION_CT    15
-#define NTPDC_VERSION       "4.2.6p1-RC2"
-#define NTPDC_FULL_VERSION  "ntpdc - vendor-specific NTP query program - Ver. 4.2.6p1-RC2"
+#define NTPDC_VERSION       "4.2.6p1-RC3"
+#define NTPDC_FULL_VERSION  "ntpdc - vendor-specific NTP query program - Ver. 4.2.6p1-RC3"
 
 /*
  *  Interface defines for all options.  Replace "n" with the UPPER_CASED

==== ntpdc/ntpdc-opts.texi ====
2010-01-24 10:31:19+00:00, stenn at whimsy.udel.edu +3 -3
  NTP_4_2_6P1_RC3

--- 1.243.2.1/ntpdc/ntpdc-opts.texi	2009-12-25 04:31:33 -05:00
+++ 1.243.3.1/ntpdc/ntpdc-opts.texi	2010-01-24 05:31:19 -05:00
@@ -6,7 +6,7 @@
 # 
 # EDIT THIS FILE WITH CAUTION  (ntpdc-opts.texi)
 # 
-# It has been AutoGen-ed  December 25, 2009 at 09:26:36 AM by AutoGen 5.10
+# It has been AutoGen-ed  January 24, 2010 at 10:25:54 AM by AutoGen 5.10
 # From the definitions    ntpdc-opts.def
 # and the template file   aginfo.tpl
 @end ignore
@@ -58,7 +58,7 @@ This is the automatically generated usag
 
 @exampleindent 0
 @example
-ntpdc - vendor-specific NTP query program - Ver. 4.2.6p1-RC2
+ntpdc - vendor-specific NTP query program - Ver. 4.2.6p1-RC3
 USAGE:  ntpdc [ -<flag> [<val>] | --<name>[@{=| @}<val>] ]... [ host ...]
   Flg Arg Option-Name    Description
    -4 no  ipv4           Force IPv4 DNS name resolution
@@ -101,7 +101,7 @@ Options are specified by doubled hyphens
 or by a single hyphen and the flag character.
 
 The following option preset mechanisms are supported:
- - reading file /users/stenn/.ntprc
+ - reading file /deacon/users/stenn/.ntprc
  - reading file /deacon/backroom/snaps/ntp-stable/ntpdc/.ntprc
  - examining environment variables named NTPDC_*
 

==== ntpdc/ntpdc.1 ====
2010-01-24 10:31:20+00:00, stenn at whimsy.udel.edu +2 -2
  NTP_4_2_6P1_RC3

--- 1.243.2.1/ntpdc/ntpdc.1	2009-12-25 04:31:34 -05:00
+++ 1.243.3.1/ntpdc/ntpdc.1	2010-01-24 05:31:20 -05:00
@@ -1,7 +1,7 @@
-.TH NTPDC 1 2009-12-25 "( 4.2.6p1-RC2)" "Programmer's Manual"
+.TH NTPDC 1 2010-01-24 "( 4.2.6p1-RC3)" "Programmer's Manual"
 .\"  EDIT THIS FILE WITH CAUTION  (ntpdc.1)
 .\"  
-.\"  It has been AutoGen-ed  December 25, 2009 at 09:26:11 AM by AutoGen 5.10
+.\"  It has been AutoGen-ed  January 24, 2010 at 10:25:53 AM by AutoGen 5.10
 .\"  From the definitions    ntpdc-opts.def
 .\"  and the template file   agman1.tpl
 .\"

==== ntpq/ntpq-opts.c ====
2010-01-24 10:31:20+00:00, stenn at whimsy.udel.edu +4 -4
  NTP_4_2_6P1_RC3

--- 1.245.2.1/ntpq/ntpq-opts.c	2009-12-25 04:31:34 -05:00
+++ 1.245.3.1/ntpq/ntpq-opts.c	2010-01-24 05:31:20 -05:00
@@ -1,7 +1,7 @@
 /*  
  *  EDIT THIS FILE WITH CAUTION  (ntpq-opts.c)
  *  
- *  It has been AutoGen-ed  December 25, 2009 at 09:26:37 AM by AutoGen 5.10
+ *  It has been AutoGen-ed  January 24, 2010 at 10:25:56 AM by AutoGen 5.10
  *  From the definitions    ntpq-opts.def
  *  and the template file   options
  *
@@ -19,7 +19,7 @@
  *
  * This source file is copyrighted and licensed under the following terms:
  *
- * ntpq copyright (c) 1970-2009 David L. Mills and/or others - all rights reserved
+ * ntpq copyright (c) 1970-2010 David L. Mills and/or others - all rights reserved
  *
  * see html/copyright.html
  */
@@ -39,7 +39,7 @@ extern "C" {
 /* TRANSLATORS: choose the translation for option names wisely because you
                 cannot ever change your mind. */
 tSCC zCopyright[] =
-       "ntpq copyright (c) 1970-2009 David L. Mills and/or others, all rights reserved"
+       "ntpq copyright (c) 1970-2010 David L. Mills and/or others, all rights reserved"
 /* extracted from ../include/copyright.def near line 8 */
 ;
 tSCC zCopyrightNotice[24] =
@@ -427,7 +427,7 @@ static tOptDesc optDesc[ OPTION_CT ] = {
  */
 tSCC   zPROGNAME[]   = "NTPQ";
 tSCC   zUsageTitle[] =
-"ntpq - standard NTP query program - Ver. 4.2.6p1-RC2\n\
+"ntpq - standard NTP query program - Ver. 4.2.6p1-RC3\n\
 USAGE:  %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]... [ host ...]\n";
 tSCC   zRcName[]     = ".ntprc";
 tSCC*  apzHomeList[] = {

==== ntpq/ntpq-opts.h ====
2010-01-24 10:31:21+00:00, stenn at whimsy.udel.edu +4 -4
  NTP_4_2_6P1_RC3

--- 1.245.2.1/ntpq/ntpq-opts.h	2009-12-25 04:31:34 -05:00
+++ 1.245.3.1/ntpq/ntpq-opts.h	2010-01-24 05:31:21 -05:00
@@ -1,7 +1,7 @@
 /*  
  *  EDIT THIS FILE WITH CAUTION  (ntpq-opts.h)
  *  
- *  It has been AutoGen-ed  December 25, 2009 at 09:26:37 AM by AutoGen 5.10
+ *  It has been AutoGen-ed  January 24, 2010 at 10:25:55 AM by AutoGen 5.10
  *  From the definitions    ntpq-opts.def
  *  and the template file   options
  *
@@ -19,7 +19,7 @@
  *
  * This source file is copyrighted and licensed under the following terms:
  *
- * ntpq copyright (c) 1970-2009 David L. Mills and/or others - all rights reserved
+ * ntpq copyright (c) 1970-2010 David L. Mills and/or others - all rights reserved
  *
  * see html/copyright.html
  */
@@ -69,8 +69,8 @@ typedef enum {
 } teOptIndex;
 
 #define OPTION_CT    14
-#define NTPQ_VERSION       "4.2.6p1-RC2"
-#define NTPQ_FULL_VERSION  "ntpq - standard NTP query program - Ver. 4.2.6p1-RC2"
+#define NTPQ_VERSION       "4.2.6p1-RC3"
+#define NTPQ_FULL_VERSION  "ntpq - standard NTP query program - Ver. 4.2.6p1-RC3"
 
 /*
  *  Interface defines for all options.  Replace "n" with the UPPER_CASED

==== ntpq/ntpq-opts.texi ====
2010-01-24 10:31:21+00:00, stenn at whimsy.udel.edu +3 -3
  NTP_4_2_6P1_RC3

--- 1.244.2.1/ntpq/ntpq-opts.texi	2009-12-25 04:31:34 -05:00
+++ 1.244.3.1/ntpq/ntpq-opts.texi	2010-01-24 05:31:21 -05:00
@@ -6,7 +6,7 @@
 # 
 # EDIT THIS FILE WITH CAUTION  (ntpq-opts.texi)
 # 
-# It has been AutoGen-ed  December 25, 2009 at 09:27:01 AM by AutoGen 5.10
+# It has been AutoGen-ed  January 24, 2010 at 10:26:20 AM by AutoGen 5.10
 # From the definitions    ntpq-opts.def
 # and the template file   aginfo.tpl
 @end ignore
@@ -47,7 +47,7 @@ This is the automatically generated usag
 
 @exampleindent 0
 @example
-ntpq - standard NTP query program - Ver. 4.2.6p1-RC2
+ntpq - standard NTP query program - Ver. 4.2.6p1-RC3
 USAGE:  ntpq [ -<flag> [<val>] | --<name>[@{=| @}<val>] ]... [ host ...]
   Flg Arg Option-Name    Description
    -4 no  ipv4           Force IPv4 DNS name resolution
@@ -83,7 +83,7 @@ Options are specified by doubled hyphens
 or by a single hyphen and the flag character.
 
 The following option preset mechanisms are supported:
- - reading file /users/stenn/.ntprc
+ - reading file /deacon/users/stenn/.ntprc
  - reading file /deacon/backroom/snaps/ntp-stable/ntpq/.ntprc
  - examining environment variables named NTPQ_*
 

==== ntpq/ntpq.1 ====
2010-01-24 10:31:21+00:00, stenn at whimsy.udel.edu +2 -2
  NTP_4_2_6P1_RC3

--- 1.244.2.1/ntpq/ntpq.1	2009-12-25 04:31:35 -05:00
+++ 1.244.3.1/ntpq/ntpq.1	2010-01-24 05:31:21 -05:00
@@ -1,7 +1,7 @@
-.TH NTPQ 1 2009-12-25 "( 4.2.6p1-RC2)" "Programmer's Manual"
+.TH NTPQ 1 2010-01-24 "( 4.2.6p1-RC3)" "Programmer's Manual"
 .\"  EDIT THIS FILE WITH CAUTION  (ntpq.1)
 .\"  
-.\"  It has been AutoGen-ed  December 25, 2009 at 09:26:38 AM by AutoGen 5.10
+.\"  It has been AutoGen-ed  January 24, 2010 at 10:26:19 AM by AutoGen 5.10
 .\"  From the definitions    ntpq-opts.def
 .\"  and the template file   agman1.tpl
 .\"

==== ntpsnmpd/ntpsnmpd-opts.c ====
2010-01-24 10:31:22+00:00, stenn at whimsy.udel.edu +4 -4
  NTP_4_2_6P1_RC3

--- 1.123.2.1/ntpsnmpd/ntpsnmpd-opts.c	2009-12-25 04:31:35 -05:00
+++ 1.123.3.1/ntpsnmpd/ntpsnmpd-opts.c	2010-01-24 05:31:22 -05:00
@@ -1,7 +1,7 @@
 /*  
  *  EDIT THIS FILE WITH CAUTION  (ntpsnmpd-opts.c)
  *  
- *  It has been AutoGen-ed  December 25, 2009 at 09:27:02 AM by AutoGen 5.10
+ *  It has been AutoGen-ed  January 24, 2010 at 10:26:21 AM by AutoGen 5.10
  *  From the definitions    ntpsnmpd-opts.def
  *  and the template file   options
  *
@@ -19,7 +19,7 @@
  *
  * This source file is copyrighted and licensed under the following terms:
  *
- * ntpsnmpd copyright (c) 1970-2009 David L. Mills and/or others - all rights reserved
+ * ntpsnmpd copyright (c) 1970-2010 David L. Mills and/or others - all rights reserved
  *
  * see html/copyright.html
  */
@@ -39,7 +39,7 @@ extern "C" {
 /* TRANSLATORS: choose the translation for option names wisely because you
                 cannot ever change your mind. */
 tSCC zCopyright[] =
-       "ntpsnmpd copyright (c) 1970-2009 David L. Mills and/or others, all rights reserved"
+       "ntpsnmpd copyright (c) 1970-2010 David L. Mills and/or others, all rights reserved"
 /* extracted from ../include/copyright.def near line 8 */
 ;
 tSCC zCopyrightNotice[24] =
@@ -233,7 +233,7 @@ static tOptDesc optDesc[ OPTION_CT ] = {
  */
 tSCC   zPROGNAME[]   = "NTPSNMPD";
 tSCC   zUsageTitle[] =
-"ntpsnmpd - NTP SNMP MIB agent - Ver. 4.2.6p1-RC2\n\
+"ntpsnmpd - NTP SNMP MIB agent - Ver. 4.2.6p1-RC3\n\
 USAGE:  %s [ -<flag> | --<name> ]...\n";
 tSCC   zRcName[]     = ".ntprc";
 tSCC*  apzHomeList[] = {

==== ntpsnmpd/ntpsnmpd-opts.h ====
2010-01-24 10:31:22+00:00, stenn at whimsy.udel.edu +4 -4
  NTP_4_2_6P1_RC3

--- 1.123.2.1/ntpsnmpd/ntpsnmpd-opts.h	2009-12-25 04:31:35 -05:00
+++ 1.123.3.1/ntpsnmpd/ntpsnmpd-opts.h	2010-01-24 05:31:22 -05:00
@@ -1,7 +1,7 @@
 /*  
  *  EDIT THIS FILE WITH CAUTION  (ntpsnmpd-opts.h)
  *  
- *  It has been AutoGen-ed  December 25, 2009 at 09:27:01 AM by AutoGen 5.10
+ *  It has been AutoGen-ed  January 24, 2010 at 10:26:21 AM by AutoGen 5.10
  *  From the definitions    ntpsnmpd-opts.def
  *  and the template file   options
  *
@@ -19,7 +19,7 @@
  *
  * This source file is copyrighted and licensed under the following terms:
  *
- * ntpsnmpd copyright (c) 1970-2009 David L. Mills and/or others - all rights reserved
+ * ntpsnmpd copyright (c) 1970-2010 David L. Mills and/or others - all rights reserved
  *
  * see html/copyright.html
  */
@@ -62,8 +62,8 @@ typedef enum {
 } teOptIndex;
 
 #define OPTION_CT    7
-#define NTPSNMPD_VERSION       "4.2.6p1-RC2"
-#define NTPSNMPD_FULL_VERSION  "ntpsnmpd - NTP SNMP MIB agent - Ver. 4.2.6p1-RC2"
+#define NTPSNMPD_VERSION       "4.2.6p1-RC3"
+#define NTPSNMPD_FULL_VERSION  "ntpsnmpd - NTP SNMP MIB agent - Ver. 4.2.6p1-RC3"
 
 /*
  *  Interface defines for all options.  Replace "n" with the UPPER_CASED

==== ntpsnmpd/ntpsnmpd-opts.texi ====
2010-01-24 10:31:23+00:00, stenn at whimsy.udel.edu +3 -3
  NTP_4_2_6P1_RC3

--- 1.123.2.1/ntpsnmpd/ntpsnmpd-opts.texi	2009-12-25 04:31:35 -05:00
+++ 1.123.3.1/ntpsnmpd/ntpsnmpd-opts.texi	2010-01-24 05:31:23 -05:00
@@ -6,7 +6,7 @@
 # 
 # EDIT THIS FILE WITH CAUTION  (ntpsnmpd-opts.texi)
 # 
-# It has been AutoGen-ed  December 25, 2009 at 09:27:16 AM by AutoGen 5.10
+# It has been AutoGen-ed  January 24, 2010 at 10:26:36 AM by AutoGen 5.10
 # From the definitions    ntpsnmpd-opts.def
 # and the template file   aginfo.tpl
 @end ignore
@@ -33,7 +33,7 @@ This is the automatically generated usag
 
 @exampleindent 0
 @example
-ntpsnmpd - NTP SNMP MIB agent - Ver. 4.2.6p1-RC2
+ntpsnmpd - NTP SNMP MIB agent - Ver. 4.2.6p1-RC3
 USAGE:  ntpsnmpd [ -<flag> | --<name> ]...
   Flg Arg Option-Name    Description
    -n no  nofork         Do not fork
@@ -50,7 +50,7 @@ Options are specified by doubled hyphens
 or by a single hyphen and the flag character.
 
 The following option preset mechanisms are supported:
- - reading file /users/stenn/.ntprc
+ - reading file /deacon/users/stenn/.ntprc
  - reading file /deacon/backroom/snaps/ntp-stable/ntpsnmpd/.ntprc
  - examining environment variables named NTPSNMPD_*
 

==== ntpsnmpd/ntpsnmpd.1 ====
2010-01-24 10:31:23+00:00, stenn at whimsy.udel.edu +2 -2
  NTP_4_2_6P1_RC3

--- 1.122.2.1/ntpsnmpd/ntpsnmpd.1	2009-12-25 04:31:36 -05:00
+++ 1.122.3.1/ntpsnmpd/ntpsnmpd.1	2010-01-24 05:31:23 -05:00
@@ -1,7 +1,7 @@
-.TH NTPSNMPD 1 2009-12-25 "( 4.2.6p1-RC2)" "Programmer's Manual"
+.TH NTPSNMPD 1 2010-01-24 "( 4.2.6p1-RC3)" "Programmer's Manual"
 .\"  EDIT THIS FILE WITH CAUTION  (ntpsnmpd.1)
 .\"  
-.\"  It has been AutoGen-ed  December 25, 2009 at 09:27:03 AM by AutoGen 5.10
+.\"  It has been AutoGen-ed  January 24, 2010 at 10:26:35 AM by AutoGen 5.10
 .\"  From the definitions    ntpsnmpd-opts.def
 .\"  and the template file   agman1.tpl
 .\"

==== packageinfo.sh ====
2010-01-24 10:31:23+00:00, stenn at whimsy.udel.edu +1 -1
  NTP_4_2_6P1_RC3

--- 1.255.4.1/packageinfo.sh	2009-12-25 04:31:36 -05:00
+++ 1.255.5.1/packageinfo.sh	2010-01-24 05:31:23 -05:00
@@ -91,4 +91,4 @@ betapoint=0
 # - - prerelease is emptied
 # else (not in RC)
 # - rcpoint is empty and unused (for now).
-rcpoint=2
+rcpoint=3

==== sntp/sntp-opts.c ====
2010-01-24 10:31:24+00:00, stenn at whimsy.udel.edu +4 -4
  NTP_4_2_6P1_RC3

--- 1.117.2.1/sntp/sntp-opts.c	2009-12-25 04:31:36 -05:00
+++ 1.117.3.1/sntp/sntp-opts.c	2010-01-24 05:31:24 -05:00
@@ -1,7 +1,7 @@
 /*  
  *  EDIT THIS FILE WITH CAUTION  (sntp-opts.c)
  *  
- *  It has been AutoGen-ed  December 25, 2009 at 09:30:47 AM by AutoGen 5.10
+ *  It has been AutoGen-ed  January 24, 2010 at 10:30:23 AM by AutoGen 5.10
  *  From the definitions    sntp-opts.def
  *  and the template file   options
  *
@@ -19,7 +19,7 @@
  *
  * This source file is copyrighted and licensed under the following terms:
  *
- * sntp copyright (c) 1970-2009 David L. Mills and/or others - all rights reserved
+ * sntp copyright (c) 1970-2010 David L. Mills and/or others - all rights reserved
  *
  * see html/copyright.html
  */
@@ -39,7 +39,7 @@ extern "C" {
 /* TRANSLATORS: choose the translation for option names wisely because you
                 cannot ever change your mind. */
 tSCC zCopyright[] =
-       "sntp copyright (c) 1970-2009 David L. Mills and/or others, all rights reserved"
+       "sntp copyright (c) 1970-2010 David L. Mills and/or others, all rights reserved"
 /* extracted from ../include/copyright.def near line 8 */
 ;
 tSCC zCopyrightNotice[24] =
@@ -474,7 +474,7 @@ static tOptDesc optDesc[ OPTION_CT ] = {
  */
 tSCC   zPROGNAME[]   = "SNTP";
 tSCC   zUsageTitle[] =
-"sntp - standard SNTP program - Ver. 4.2.6p1-RC2\n\
+"sntp - standard SNTP program - Ver. 4.2.6p1-RC3\n\
 USAGE:  %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]... hostname-or-IP ...\n";
 tSCC   zRcName[]     = ".ntprc";
 tSCC*  apzHomeList[] = {

==== sntp/sntp-opts.h ====
2010-01-24 10:31:24+00:00, stenn at whimsy.udel.edu +4 -4
  NTP_4_2_6P1_RC3

--- 1.117.2.1/sntp/sntp-opts.h	2009-12-25 04:31:36 -05:00
+++ 1.117.3.1/sntp/sntp-opts.h	2010-01-24 05:31:24 -05:00
@@ -1,7 +1,7 @@
 /*  
  *  EDIT THIS FILE WITH CAUTION  (sntp-opts.h)
  *  
- *  It has been AutoGen-ed  December 25, 2009 at 09:30:47 AM by AutoGen 5.10
+ *  It has been AutoGen-ed  January 24, 2010 at 10:30:22 AM by AutoGen 5.10
  *  From the definitions    sntp-opts.def
  *  and the template file   options
  *
@@ -19,7 +19,7 @@
  *
  * This source file is copyrighted and licensed under the following terms:
  *
- * sntp copyright (c) 1970-2009 David L. Mills and/or others - all rights reserved
+ * sntp copyright (c) 1970-2010 David L. Mills and/or others - all rights reserved
  *
  * see html/copyright.html
  */
@@ -72,8 +72,8 @@ typedef enum {
 } teOptIndex;
 
 #define OPTION_CT    17
-#define SNTP_VERSION       "4.2.6p1-RC2"
-#define SNTP_FULL_VERSION  "sntp - standard SNTP program - Ver. 4.2.6p1-RC2"
+#define SNTP_VERSION       "4.2.6p1-RC3"
+#define SNTP_FULL_VERSION  "sntp - standard SNTP program - Ver. 4.2.6p1-RC3"
 
 /*
  *  Interface defines for all options.  Replace "n" with the UPPER_CASED

==== sntp/sntp-opts.texi ====
2010-01-24 10:31:25+00:00, stenn at whimsy.udel.edu +3 -3
  NTP_4_2_6P1_RC3

--- 1.117.2.1/sntp/sntp-opts.texi	2009-12-25 04:31:37 -05:00
+++ 1.117.3.1/sntp/sntp-opts.texi	2010-01-24 05:31:25 -05:00
@@ -6,7 +6,7 @@
 # 
 # EDIT THIS FILE WITH CAUTION  (sntp-opts.texi)
 # 
-# It has been AutoGen-ed  December 25, 2009 at 09:30:56 AM by AutoGen 5.10
+# It has been AutoGen-ed  January 24, 2010 at 10:30:37 AM by AutoGen 5.10
 # From the definitions    sntp-opts.def
 # and the template file   aginfo.tpl
 @end ignore
@@ -56,7 +56,7 @@ This is the automatically generated usag
 
 @exampleindent 0
 @example
-sntp - standard SNTP program - Ver. 4.2.6p1-RC2
+sntp - standard SNTP program - Ver. 4.2.6p1-RC3
 USAGE:  sntp [ -<flag> [<val>] | --<name>[@{=| @}<val>] ]... hostname-or-IP ...
   Flg Arg Option-Name    Description
    -4 no  ipv4           Force IPv4 DNS name resolution
@@ -95,7 +95,7 @@ Options are specified by doubled hyphens
 or by a single hyphen and the flag character.
 
 The following option preset mechanisms are supported:
- - reading file /users/stenn/.ntprc
+ - reading file /deacon/users/stenn/.ntprc
  - reading file /deacon/backroom/snaps/ntp-stable/sntp/.ntprc
  - examining environment variables named SNTP_*
 

==== sntp/sntp.1 ====
2010-01-24 10:31:25+00:00, stenn at whimsy.udel.edu +2 -2
  NTP_4_2_6P1_RC3

--- 1.117.2.1/sntp/sntp.1	2009-12-25 04:31:37 -05:00
+++ 1.117.3.1/sntp/sntp.1	2010-01-24 05:31:25 -05:00
@@ -1,7 +1,7 @@
-.TH SNTP 1 2009-12-25 "( 4.2.6p1-RC2)" "Programmer's Manual"
+.TH SNTP 1 2010-01-24 "( 4.2.6p1-RC3)" "Programmer's Manual"
 .\"  EDIT THIS FILE WITH CAUTION  (sntp.1)
 .\"  
-.\"  It has been AutoGen-ed  December 25, 2009 at 09:30:57 AM by AutoGen 5.10
+.\"  It has been AutoGen-ed  January 24, 2010 at 10:30:36 AM by AutoGen 5.10
 .\"  From the definitions    sntp-opts.def
 .\"  and the template file   agman1.tpl
 .\"

==== sntp/sntp.html ====
2010-01-24 10:31:25+00:00, stenn at whimsy.udel.edu +1 -1
  NTP_4_2_6P1_RC3

--- 1.7.2.1/sntp/sntp.html	2009-12-25 04:31:37 -05:00
+++ 1.7.3.1/sntp/sntp.html	2010-01-24 05:31:25 -05:00
@@ -38,7 +38,7 @@ display the time offset of the system cl
 clock.  Run as root, it can correct the system clock to this offset as
 well.  It can be run as an interactive command or from a cron job.
 
-  <p>This document applies to version 4.2.6p1-RC2 of <code>sntp</code>.
+  <p>This document applies to version 4.2.6p1-RC3 of <code>sntp</code>.
 
   <p>The program implements the SNTP protocol as defined by the draft NTPv4
 IETF specification.

==== util/ntp-keygen-opts.c ====
2010-01-24 10:31:26+00:00, stenn at whimsy.udel.edu +4 -4
  NTP_4_2_6P1_RC3

--- 1.247.2.1/util/ntp-keygen-opts.c	2009-12-25 04:31:37 -05:00
+++ 1.247.3.1/util/ntp-keygen-opts.c	2010-01-24 05:31:26 -05:00
@@ -1,7 +1,7 @@
 /*  
  *  EDIT THIS FILE WITH CAUTION  (ntp-keygen-opts.c)
  *  
- *  It has been AutoGen-ed  December 25, 2009 at 09:31:04 AM by AutoGen 5.10
+ *  It has been AutoGen-ed  January 24, 2010 at 10:30:38 AM by AutoGen 5.10
  *  From the definitions    ntp-keygen-opts.def
  *  and the template file   options
  *
@@ -19,7 +19,7 @@
  *
  * This source file is copyrighted and licensed under the following terms:
  *
- * ntp-keygen copyright (c) 1970-2009 David L. Mills and/or others - all rights reserved
+ * ntp-keygen copyright (c) 1970-2010 David L. Mills and/or others - all rights reserved
  *
  * see html/copyright.html
  */
@@ -40,7 +40,7 @@ extern "C" {
 /* TRANSLATORS: choose the translation for option names wisely because you
                 cannot ever change your mind. */
 tSCC zCopyright[] =
-       "ntp-keygen copyright (c) 1970-2009 David L. Mills and/or others, all rights reserved"
+       "ntp-keygen copyright (c) 1970-2010 David L. Mills and/or others, all rights reserved"
 /* extracted from ../include/copyright.def near line 8 */
 ;
 tSCC zCopyrightNotice[24] =
@@ -738,7 +738,7 @@ static tOptDesc optDesc[ OPTION_CT ] = {
  */
 tSCC   zPROGNAME[]   = "NTP_KEYGEN";
 tSCC   zUsageTitle[] =
-"ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.6p1-RC2\n\
+"ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.6p1-RC3\n\
 USAGE:  %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]...\n";
 tSCC   zRcName[]     = ".ntprc";
 tSCC*  apzHomeList[] = {

==== util/ntp-keygen-opts.h ====
2010-01-24 10:31:26+00:00, stenn at whimsy.udel.edu +4 -4
  NTP_4_2_6P1_RC3

--- 1.247.2.1/util/ntp-keygen-opts.h	2009-12-25 04:31:38 -05:00
+++ 1.247.3.1/util/ntp-keygen-opts.h	2010-01-24 05:31:26 -05:00
@@ -1,7 +1,7 @@
 /*  
  *  EDIT THIS FILE WITH CAUTION  (ntp-keygen-opts.h)
  *  
- *  It has been AutoGen-ed  December 25, 2009 at 09:31:04 AM by AutoGen 5.10
+ *  It has been AutoGen-ed  January 24, 2010 at 10:30:38 AM by AutoGen 5.10
  *  From the definitions    ntp-keygen-opts.def
  *  and the template file   options
  *
@@ -19,7 +19,7 @@
  *
  * This source file is copyrighted and licensed under the following terms:
  *
- * ntp-keygen copyright (c) 1970-2009 David L. Mills and/or others - all rights reserved
+ * ntp-keygen copyright (c) 1970-2010 David L. Mills and/or others - all rights reserved
  *
  * see html/copyright.html
  */
@@ -78,8 +78,8 @@ typedef enum {
 } teOptIndex;
 
 #define OPTION_CT    23
-#define NTP_KEYGEN_VERSION       "4.2.6p1-RC2"
-#define NTP_KEYGEN_FULL_VERSION  "ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.6p1-RC2"
+#define NTP_KEYGEN_VERSION       "4.2.6p1-RC3"
+#define NTP_KEYGEN_FULL_VERSION  "ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.6p1-RC3"
 
 /*
  *  Interface defines for all options.  Replace "n" with the UPPER_CASED

==== util/ntp-keygen-opts.texi ====
2010-01-24 10:31:27+00:00, stenn at whimsy.udel.edu +3 -3
  NTP_4_2_6P1_RC3

--- 1.246.2.1/util/ntp-keygen-opts.texi	2009-12-25 04:31:38 -05:00
+++ 1.246.3.1/util/ntp-keygen-opts.texi	2010-01-24 05:31:27 -05:00
@@ -6,7 +6,7 @@
 # 
 # EDIT THIS FILE WITH CAUTION  (ntp-keygen-opts.texi)
 # 
-# It has been AutoGen-ed  December 25, 2009 at 09:31:20 AM by AutoGen 5.10
+# It has been AutoGen-ed  January 24, 2010 at 10:31:02 AM by AutoGen 5.10
 # From the definitions    ntp-keygen-opts.def
 # and the template file   aginfo.tpl
 @end ignore
@@ -51,7 +51,7 @@ This is the automatically generated usag
 @exampleindent 0
 @example
 Using OpenSSL version 90704f
-ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.6p1-RC2
+ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.6p1-RC3
 USAGE:  ntp-keygen [ -<flag> [<val>] | --<name>[@{=| @}<val>] ]...
   Flg Arg Option-Name    Description
    -c Str certificate    certificate scheme
@@ -87,7 +87,7 @@ Options are specified by doubled hyphens
 or by a single hyphen and the flag character.
 
 The following option preset mechanisms are supported:
- - reading file /users/stenn/.ntprc
+ - reading file /deacon/users/stenn/.ntprc
  - reading file /deacon/backroom/snaps/ntp-stable/util/.ntprc
  - examining environment variables named NTP_KEYGEN_*
 

==== util/ntp-keygen.1 ====
2010-01-24 10:31:27+00:00, stenn at whimsy.udel.edu +2 -2
  NTP_4_2_6P1_RC3

--- 1.246.2.1/util/ntp-keygen.1	2009-12-25 04:31:38 -05:00
+++ 1.246.3.1/util/ntp-keygen.1	2010-01-24 05:31:27 -05:00
@@ -1,7 +1,7 @@
-.TH NTP-KEYGEN 1 2009-12-25 "(ntp 4.2.6p1-RC2)" "Programmer's Manual"
+.TH NTP-KEYGEN 1 2010-01-24 "(ntp 4.2.6p1-RC3)" "Programmer's Manual"
 .\"  EDIT THIS FILE WITH CAUTION  (ntp-keygen.1)
 .\"  
-.\"  It has been AutoGen-ed  December 25, 2009 at 09:31:06 AM by AutoGen 5.10
+.\"  It has been AutoGen-ed  January 24, 2010 at 10:31:01 AM by AutoGen 5.10
 .\"  From the definitions    ntp-keygen-opts.def
 .\"  and the template file   agman1.tpl
 .\"


More information about the bk-ntp-dev-send mailing list