From: Dave Hart Date: Mon, 1 Feb 2010 04:57:23 +0000 (+0000) Subject: Merge shiny.ad.hartbrothers.com:C:/ntp/ntp-stable-1470 X-Git-Tag: NTP_4_2_7P14~1^2~1^2~3 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0b136b91fb3da04342a9d69260166ac896559278;p=thirdparty%2Fntp.git Merge shiny.ad.hartbrothers.com:C:/ntp/ntp-stable-1470 into shiny.ad.hartbrothers.com:C:/ntp/ntp-dev-1470-71-72 bk: 4b665f33Hl1tFkVAS8G3svrkQbXaGQ --- 0b136b91fb3da04342a9d69260166ac896559278 diff --cc ChangeLog index 25e2c0fd0,fed2d1b4b..38d2d9122 --- a/ChangeLog +++ b/ChangeLog @@@ -1,65 -1,11 +1,72 @@@ ++* Include (4.2.6p1) - [Bug 1470] "make distdir" compiles keyword-gen. +* [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 +* Include (4.2.6p1) - [Bug 1467] Fix bogus rebuild of sntp/sntp.html. +(4.2.7p12) 2010/01/30 Released by Harlan Stenn +* [Bug 1468] 'make install' broken for root on default NFS mount. +(4.2.7p11) 2010/01/28 Released by Harlan Stenn +* [Bug 47] Debugging and logging do not work after a fork. +* [Bug 1010] getaddrinfo() could block and thus should not be called by + the main thread/process. +* New async DNS resolver in ntpd allows nonblocking queries anytime, + instead of only once at startup. +(4.2.7p10) 2010/01/24 Released by Harlan Stenn +* [Bug 1140] Clean up debug.html, decode.html, and ntpq.html. +* Include (4.2.6p1-RC3) - Use TZ=UTC instead of TZ= when calling date in + scripts/mkver.in . +* Include (4.2.6p1-RC3) - [Bug 1448] Some macros not correctly conditionally + or absolutely defined on Windows. +* Include (4.2.6p1-RC3) - [Bug 1449] ntpsim.h in ntp_config.c should be used + conditionally. +* Include (4.2.6p1-RC3) - [Bug 1450] Option to exclude warnings not + unconditionally defined on Windows. +(4.2.7p9) 2010/01/13 Released by Harlan Stenn +(4.2.7p8) 2010/01/12 Released by Harlan Stenn +* [Bug 702] ntpd service logic should use libopts to examine cmdline. +* Include (4.2.6p1-RC3) - [Bug 1451] sntp leaks KoD entry updating. +* Include (4.2.6p1-RC3) - [Bug 1453] Use $CC in config.cache filename. +(4.2.7p7) 2009/12/30 Released by Harlan Stenn +* [Bug 620] ntpdc getresponse() esize != *rsize s/b size != *rsize. +* [Bug 1446] 4.2.7p6 requires autogen, missing ntpd.1, *.texi, *.menu. +(4.2.7p6) 2009/12/28 Released by Harlan Stenn +* [Bug 1443] Remove unnecessary dependencies on ntp_io.h +* [Bug 1442] Move Windows functions into libntp files +* Include (4.2.6p1-RC3) - [Bug 1127] Check the return of X590_verify(). +* Include (4.2.6p1-RC3) - [Bug 1439] .texi gen after binary is linked. +* Include (4.2.6p1-RC3) - [Bug 1440] Update configure.ac to support kfreebsd. +* Include (4.2.6p1-RC3) - [Bug 1445] IRIX does not have -lcap or support + linux capabilities. +(4.2.7p5) 2009/12/25 Released by Harlan Stenn +* Include (4.2.6p1-RC2) +(4.2.7p4) 2009/12/24 Released by Harlan Stenn +* [Bug 1429] ntpd -4 option does not reliably force IPv4 resolution. +* [Bug 1431] System headers must come before ntp headers in ntp_intres.c . +(4.2.7p3) 2009/12/22 Released by Harlan Stenn +* [Bug 1426] scripts/VersionName needs . on the search path. +* [Bug 1427] quote missing in ./build - shows up on NetBSD. +* [Bug 1428] Use AC_HEADER_RESOLV to fix breaks from resolv.h +(4.2.7p2) 2009/12/20 Released by Harlan Stenn +* [Bug 1419] ntpdate, ntpdc, sntp, ntpd ignore configure --bindir. +* [Bug 1421] add util/tg2, a clone of tg that works on Linux, NetBSD, and + FreeBSD +(4.2.7p1) 2009/12/15 Released by Harlan Stenn +* [Bug 1348] ntpd Windows port should wait for sendto() completion. +* [Bug 1413] test OpenSSL headers regarding -Wno-strict-prototypes. +* [Bug 1418] building ntpd/ntpdc/ntpq statically with ssl fails. +(4.2.7p0) 2009/12/13 Released by Harlan Stenn +* [Bug 1412] m4/os_cflags.m4 caches results that depend on $CC. +* [Bug 1414] Enable "make distcheck" success with BSD make. +(4.2.7) 2009/12/09 Released by Harlan Stenn +* [Bug 1407] configure.ac: recent GNU Make -v does not include "version". --- + * [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 + * Use TZ=UTC instead of TZ= when calling date in scripts/mkver.in . * [Bug 1448] Some macros not correctly conditionally or absolutely defined on Windows. diff --cc ntpd/Makefile.am index 479ce526a,2eb716092..d59d75d23 --- a/ntpd/Makefile.am +++ b/ntpd/Makefile.am @@@ -207,23 -211,28 +212,30 @@@ libntpd_a_SOURCES = refclock_wwv.c \ refclock_wwvb.c \ refclock_zyfer.c \ + work_fork.c \ + work_thread.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