Merge whimsy.udel.edu:/deacon/backroom/ntp-stable

into  whimsy.udel.edu:/deacon/backroom/ntp-dev

bk: 4657d9adoO0-gkaHWQiGn1or_THjcA

diff --cc ChangeLog
index 01dcac2a3d9228e3cad09b2ed7ebe94337e31fee,8d0f7c8a16ed919a54ed8a9a0fceefb989835b86..39e1810b9671c7f18ebe04f5810ce63fe9047f83
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,48 -1,7 +1,50 @@@
- (4.2.4p1) Released by Harlan Stenn <stenn@ntp.org>
 +* [Bug 832] Add libisc/log.c headers to the distribution.
 +* [Bug 808] Only write the drift file if we are in state 4.
 +* Initial import of libisc/log.c and friends.
 +* [Bug 826] Fix redefinition of PI.
 +* [Bug 825] ntp_scanner.c needs to #include <config.h> .
 +* [Bug 824] New parser code has some build problems with the SIM code.
 +* [Bug 817] Use longnames for setting ntp variables on the command-line;
 +          Allowing '-v' with and without an arg to disambiguate usage
 +          is error-prone.
 +* [Bug 822] set progname once, early.
 +* [Bug 819] remove erroneous #if 0 in Windows completion port code.
 +* The new config code missed an #ifdef for building without refclocks.
 +* Distribute some files needed by the new config parsing code.
 +* [Bug 819] Timeout for WaitForMultipleObjects was 500ms instead of INFINITE
 +* Use autogen 5.9.1.
 +* Fix clktest command-line arg processing.'
 +* Audio documentation updates from Dave Mills.
 +* New config file parsing code, from Sachin Kamboj.
 +* fuzz bit cleanup from Dave Mills.
 +* replay cleanup from Dave Mills.
 +* [Bug 542] Tolerate missing directory separator at EO statsdir.
 +* [Bug 812] ntpd should drop supplementary groups.
 +* [Bug 815] Fix warning compiling 4.2.5p22 under Windows with VC6.
 +* [Bug 740] Fix kernel/daemon startup drift anomaly.
 +* refclock_wwv.c fixes from Dave Mills.
 +* [Bug 810] Fix ntp-keygen documentation.
 +* [Bug 789] Fix multicast client crypto authentication and make sure arriving
 +          multicast packets do not disturb the autokey dance.
 +* [Bug 787] Bug fixes for 64-bit time_t on Windows.
 +* [Bug 796] Clean up duplicate #defines in ntp_control.c.
 +* [Bug 569] Use the correct precision for the Leitch CSD-5300.
 +* [Bug 795] Moved declaration of variable to top of function.
 +* [Bug 798] ntpq [p typo crashes ntpq/ntpdc.
 +* [Bug 786] Fix refclock_bancomm.c on Solaris.
 +* [Bug 774] parsesolaris.c does not compile under the new Solaris.
 +* [Bug 782] Remove P() macros from Windows files.
 +* [Bug 778] ntpd fails to lock with drift=+500 when started with drift=-500.
 +* [Bug 592] Trimble Thunderbolt GPS support.
 +* IRIG, CHU, WWV, WWVB refclock improvements from Dave Mills.
 +* [Bug 757] Lose ULONG_CONST().
 +* [Bug 756] Require ANSI C (function prototypes).
 +* codec (audio) and ICOM changes from Dave Mills.
 +\f
+ (4.2.4p2) Released by Harlan Stenn <stenn@ntp.org>
  * [Bug 811] ntpd should not read a .ntprc file.
+ (4.2.4p1) (skipped)
+ (4.2.4p0) Released by Harlan Stenn <stenn@ntp.org>
  * [Bug 793] Update Hans Lambermont's email address in ntpsweep.
  * [Bug 776] Remove unimplemented "rate" flag from ntpdate.
  * [Bug 586] Avoid lookups if AI_NUMERICHOST is set.

diff --cc NEWS
index c9fdc31af0ad797d956ffa308afd91ef9388f483,701a29e1e017556f603a5cfcfc3270e2060b4bea..d33207ada32d8cc1e21f04e37bbafe47e29da6b1
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -1,8 -1,9 +1,14 @@@
 +Backward-Incomatible changes:
 +
 +ntpd no longer accepts '-v name' or '-V name' to define internal variables.
 +Use '--var name' or '--dvar name' instead. (Bug 817)
 +---
+ NTP 4.2.4p2 (Harlan Stenn <stenn@ntp.org>, 2007/05/18)
+ 
+ Focus: bug fix.
+ 
+ [Bug 811] ntpd should not read a .ntprc file.
+ ---
  NTP 4.2.4 (Harlan Stenn <stenn@ntp.org>, 2006/12/31)
  
  Focus: enhancements and bug fixes.