From: Harlan Stenn Date: Tue, 12 Jan 2010 10:55:24 +0000 (-0500) Subject: Merge cleanup X-Git-Tag: NTP_4_2_7P9~1 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c22edb44c384964d4e2272b54bf81aedcfa94f9d;p=thirdparty%2Fntp.git Merge cleanup bk: 4b4c551cer1GLt-MormsYtd5L4jQcQ --- c22edb44c384964d4e2272b54bf81aedcfa94f9d diff --cc ChangeLog index 5ff9b862e,69bf8f9c6..e71799a7b --- a/ChangeLog +++ b/ChangeLog @@@ -1,4 -1,29 +1,31 @@@ - * [Bug 1421] add util/tg2, a clone of tg that works on Linux, NetBSD, and FreeBSD + (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. diff --cc util/Makefile.am index fd1320533,3be9cd4ec..144a0a69e --- a/util/Makefile.am +++ b/util/Makefile.am @@@ -2,10 -2,16 +2,16 @@@ NULL #AUTOMAKE_OPTIONS = ../ansi2knr no-dependencies AUTOMAKE_OPTIONS= + if NTP_BINSUBDIR_IS_BIN bin_PROGRAMS= @MAKE_NTPTIME@ @MAKE_TICKADJ@ @MAKE_TIMETRIM@ \ ntp-keygen + else + sbin_PROGRAMS= @MAKE_NTPTIME@ @MAKE_TICKADJ@ @MAKE_TIMETRIM@ \ + ntp-keygen + endif + EXTRA_PROGRAMS= audio-pcm byteorder hist jitter kern longsize \ - ntptime pps-api precision sht testrs6000 tg tickadj timetrim + ntptime pps-api precision sht testrs6000 tg tg2 tickadj timetrim AM_CPPFLAGS= -I$(top_srcdir)/include -I$(top_srcdir)/lib/isc/include \ -I$(top_srcdir)/lib/isc/nothreads/include \