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

into  shiny.ad.hartbrothers.com:C:/ntp/ntp-dev-orphanwait-local-acts

bk: 4dc87741BrMYnq8x6E6H1vCVlLsSQw

diff --cc ChangeLog
index b170e4ca7d47018e62638da42585f19c7613e6b8,bed2bb53f9e8d92d02a0bcdc80d48cccee95f207..a02c763474505811bec23f8656e31382680aaef2
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,17 -1,22 +1,36 @@@
+ * [Bug 988] Local clock eats up -g option, so ntpd stops with large
+   initial time offset.
+ * [Bug 1921] LOCAL, ACTS drivers with "prefer" excluded from initial
+   candidate list.
+ * [Bug 1922] "tos orphanwait" applied incorrectly at startup.
+ * [Bug 1923] orphan parent favored over LOCAL, ACTS drivers.
+ * [Bug 1924] Billboard tally codes sometimes do not match operation,
+   variables.
+ * Change "pool DNS" messages from msyslog to debug trace output.
+ * Remove unused FLAG_SYSPEER from peer->status.
+ * Respect "tos orphanwait" at startup.  Previously there was an
+   unconditional 300 s. startup orphanwait, though other values were
+   respected for subsequent orphan wait periods after no_sys_peer events.
+ * Apply "tos orphanwait" (def. 300 seconds) to LOCAL and ACTS reference
+   clock drivers, in addition to orphan parent operation.  LOCAL and ACTS
+   are not selectable during the orphanwait delay at startup and after
+   each no_sys_peer event.  This prevents a particular form of clock-
+   hopping, such as using LOCAL briefly at startup before remote peers
+   are selectable.  This fixes the issue reported in [Bug 988].
 +(4.2.7p163) 2011/05/08 Released by Harlan Stenn <stenn@ntp.org>
 +* [Bug 1911] missing curly brace in libntp/ntp_rfc2553.c
 +(4.2.7p162) 2011/05/03 Released by Harlan Stenn <stenn@ntp.org>
 +* [Bug 1910] Support the Tristate Ltd. TS-GPSclock-01.
 +(4.2.7p161) 2011/05/02 Released by Harlan Stenn <stenn@ntp.org>
 +* [Bug 1904] 4.2.7p160 Windows build broken (POSIX_SHELL).
 +* [Bug 1906] 4.2.7p160 - libtool: compile: cannot determine name of
 +  library object in ./libevent
 +* Share a single sntp/libevent/build-aux directory between all three
 +  configure scripts.
 +* Add missing --enable-local-libevent help to top-level configure.
 +(4.2.7p160) 2011/05/01 Released by Harlan Stenn <stenn@ntp.org>
 +* from 4.2.6p4-RC1: Upgrade to libopts 35.0.10 from AutoGen 5.11.9pre8.
 +* [Bug 1901] Simulator does not set progname.
  (4.2.7p159) 2011/04/28 Released by Harlan Stenn <stenn@ntp.org>
  * Fix a couple of unused variable warnings.
  * cleanup in timespecops.c / timevalops.c