Merge bk://bk.ntp.org./ntp-dev

into  shiny.ad.hartbrothers.com:C:/ntp/ntp-dev-libevent-sntp

bk: 4d617f07_jbFDuLMBspfYH_UG9-dag

diff --cc ChangeLog
index 7a14fa48e58beb0100723212a96312ddc4adacc1,ac7d831aee712a784a0b66939f1f22929a292a68..dd00cc66f5bd8cd10dcb1a1752d015ac057a9659
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,22 -1,28 +1,47 @@@
 +* Convert sntp to libevent event-driven socket programming.  Instead of
 +  blocking name resolution and querying one NTP server at a time,
 +  resolve server names and send NTP queries without blocking.  Add
 +  sntp command-line options to adjust timing and optionally wait for all
 +  servers to respond instead of exiting after the first.
 +* Move "can't write KoD file" warning from sntp shutdown to startup.
 +* Import libevent 2.0.10-stable plus local patches as a tearoff, used
 +  only if the target system lacks an installed libevent 2.0.9 or later.
 +* Move blocking worker and resolver to libntp from ntpd.
 +* Use threads rather than forked child processes for blocking worker
 +  when possible.  Override with configure --disable-thread-support.
 +* Move init_logging(), change_logfile(), and setup_logfile() from ntpd
 +  to libntp, use them in sntp.
 +* Test --without-sntp in flock-build script's -no-refclocks variety.
 +* Avoid invoking config.status twice in a row in build script.
 +* Move more m4sh tests needed by libntp to shared .m4 files.
 +* Split up ntp_libntp.m4 into smaller, more specific subsets.
 +* Enable gcc -Wcast-align, fix many instances of warnings when casting
 +  a pointer to a more-strictly-aligned underlying type.
+ (4.2.7p130) 2011/02/12 Released by Harlan Stenn <stenn@ntp.org>
+ * [Bug 1811] Update the download location in WHERE-TO-START.
+ (4.2.7p129) 2011/02/09 Released by Harlan Stenn <stenn@ntp.org>
+ * Add missing "break;" to ntp_control.c ctl_putsys() for caliberrs, used
+   by ntpq -c kerninfo introduced in 4.2.7p104.
+ * Fix leak in ntp_control.c read_mru_list().
+ (4.2.7p128) 2011/01/30 Released by Harlan Stenn <stenn@ntp.org>
+ * [Bug 1799] ntpq mrv crash.
+ * [Bug 1801] ntpq mreadvar requires prior association caching.
+ (4.2.7p127) 2011/01/28 Released by Harlan Stenn <stenn@ntp.org>
+ * [Bug 1797] Restore stale timestamp check from the RANGEGATE cleanup.
+ (4.2.7p126) 2011/01/27 Released by Harlan Stenn <stenn@ntp.org>
+ * Fix unexposed fencepost error in format_time_fraction().
+ * Add more unit tests for timeval_tostr() and timespec_tostr().
+ (4.2.7p125) 2011/01/26 Released by Harlan Stenn <stenn@ntp.org>
+ * [Bug 1794] ntpq -c rv missing clk_wander information.
+ * [Bug 1795] ntpq readvar does not display last variable.
+ (4.2.7p124) 2011/01/25 Released by Harlan Stenn <stenn@ntp.org>
+ * sntp/Makefile.am needs any passed-in CFLAGS.
+ (4.2.7p123) 2011/01/24 Released by Harlan Stenn <stenn@ntp.org>
+ * [Bug 1788] tvtots.c tables inaccurate
+ (4.2.7p122) 2011/01/22 Released by Harlan Stenn <stenn@ntp.org>
+ * ACTS refclock cleanup from Dave Mills.
+ * Avoid shadowing the "group" global variable.
+ (4.2.7p121) 2011/01/21 Released by Harlan Stenn <stenn@ntp.org>
  * [Bug 1786] Remove extra semicolon from ntp_proto.c .
  (4.2.7p120) 2011/01/20 Released by Harlan Stenn <stenn@ntp.org>
  * Change new timeval and timespec to string routines to use snprintf()

diff --cc include/Makefile.am
Simple merge

diff --cc include/ntp_stdlib.h
Simple merge

diff --cc include/ntp_unixtime.h
Simple merge

diff --cc libntp/Makefile.am
Simple merge

diff --cc ntpd/ntp_control.c
Simple merge

diff --cc ntpd/ntp_io.c
Simple merge

diff --cc ntpd/ntpd.c
Simple merge

diff --cc ntpd/refclock_acts.c
Simple merge

diff --cc ntpq/ntpq.c
Simple merge

diff --cc ports/winnt/vc6/libntp.dsp
Simple merge

diff --cc ports/winnt/vs2003/libntp.vcproj
Simple merge

diff --cc ports/winnt/vs2005/libntp.vcproj
Simple merge

diff --cc ports/winnt/vs2008/libntp/libntp.vcproj
Simple merge

diff --cc tests/libntp/Makefile.am
index 8e92a630ea8fab83c6088ca085acdbed1edc5df3,c1e93ae7322bb7f8fbb5050392c792df0ef7fd78..0a415ff123e9c21c7a62b7119951db57824d7efb
--- 1/tests/libntp/Makefile.am
--- 2/tests/libntp/Makefile.am
+++ b/tests/libntp/Makefile.am
@@@ -64,8 -58,16 +66,10 @@@ tests_SOURCES = $(top_srcdir)/sntp/test
  
  noinst_HEADERS =      lfptest.h       \
                        libntptest.h    \
-                       sockaddrtest.h
+                       sockaddrtest.h  \
+                       timestructs.h   \
+                       $(NULL)
  
 -INCLUDES  = -I$(top_srcdir)/include
 -INCLUDES += -I$(top_srcdir)/lib/isc/include
 -INCLUDES += -I$(top_srcdir)/lib/isc/nothreads/include
 -INCLUDES += -I$(top_srcdir)/lib/isc/unix/include
 -INCLUDES += -I$(top_srcdir)/sntp
 -
  TESTS =
  
  if !NTP_CROSSCOMPILE