From: Harlan Stenn <stenn@ntp.org>
Date: Thu, 26 Nov 2009 06:36:26 +0000 (-0500)
Subject: Merge bk://ntp2.isc.org/ntp-dev
X-Git-Tag: NTP_4_2_5P248_RC~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8b2a2814711d850103a5619ef29227ae7b21d716;p=thirdparty%2Fntp.git

Merge bk://ntp2.isc.org/ntp-dev
into  psp-deb1.ntp.org:/home/stenn/ntp-dev-sntp

bk: 4b0e21eaZaAuoGNdVsKsVBygtNQIjw
---

8b2a2814711d850103a5619ef29227ae7b21d716
diff --cc ChangeLog
index 48f72d324,60a23adc7..56b866bd8
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,4 -1,9 +1,10 @@@
 +* Prepare for the generation of sntp.html.
+ * Documentation changes from Dave Mills.
+ * [Bug 1387] Storage leak in ntp_intres (minor).
+ * [Bug 1389] buffer overflow in refclock_oncore.c
+ * [Bug 1391] .texi usage text from installed, not built binaries.
+ * [Bug 1392] intres retries duplicate assocations endlessly.
+ * Correct *-opts.h dependency so default 'get' action isn't used.
  (4.2.5p247-RC) 2009/11/20 Released by Harlan Stenn <stenn@ntp.org>
  * [Bug 1142] nodebug builds shed no light on -d, -D option failure.
  * [Bug 1179] point out the problem with -i/--jaildir and -u/--user when
diff --cc sntp/Makefile.am
index d7a64463b,621504090..dbe154ced
--- a/sntp/Makefile.am
+++ b/sntp/Makefile.am
@@@ -125,11 -111,9 +126,12 @@@ $(srcdir)/sntp.1: $(srcdir)/sntp-opts.d
  	$(run_ag) -Tagman1.tpl -bsntp sntp-opts.def
  
  $(srcdir)/sntp-opts.texi $(srcdir)/sntp-opts.menu: $(srcdir)/sntp-opts.def $(srcdir)/../include/version.def
+ 	$(MAKE) sntp	# aginfo.tpl runs the binary to extract --help usage text
  	$(run_ag) -Taginfo.tpl -DLEVEL=section sntp-opts.def
  
 +$(srcdir)/sntp.html: $(srcdir)/sntp-opts.menu $(srcdir)/sntp-opts.texi $(srcdir)/sntp.texi $(srcdir)/version.texi
 +	cd $(srcdir) && makeinfo --force --html --no-split -o sntp.html sntp.texi
 +
  ../libntp/libntp.a:
  	cd ../libntp && $(MAKE)