Merge pogo:/usa/clemens/ntp-stable-XXX

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

bk: 47e6036eyZ0FKwdi4cLpaJFfzZIsXQ

diff --cc ChangeLog
index 0befd6001a635a8d2ec00fe309a0bdbe24113542,2c230539257cf69b9726dc73b83385c5000525c3..79dde815a82d72fef10d90b8f194d34e03aeaa25
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,7 -1,25 +1,28 @@@
- *          Negative-sawtooth not applied correctly for oncore 12 channel
-            receiver. Fixed.
- *          Startup code for original LinuxPPS removed.  LinuxPPS now
-            conforms to the PPSAPI.
 -* [Bug 1000] allow implicit receive buffer allocation for Windows
 -           fixes startup for windows systems with many interfaces
 -           reduces dropped packets on network bursts
 -           additionally fix timer() starvation during high load
++* Correctly apply negative-sawtooth for oncore 12 channel receiver.
++* Startup code for original LinuxPPS removed.  LinuxPPS now conforms to
++  the PPSAPI.
++* [Bug 1000] allow implicit receive buffer allocation for Windows.
++  fixes startup for windows systems with many interfaces.
++  reduces dropped packets on network bursts.
++  additionally fix timer() starvation during high load.
+ * [Bug 990] drop minimum time restriction for interface update interval.
+ * [Bug 977] Fix mismatching #ifdefs for builds without IPv6.
+ * Update the copyright year.
+ * Build system cleanup (make autogen-generated files writable).
+ * [Bug 957] Windows only: Let command line parameters from the Windows SCM GUI
+   override the standard parameters from the ImagePath registry key.
+ * Fixes for ntpdate:
+ * [Bug 532] nptdate timeout is too long if several servers are supplied.
+ * [Bug 698] timeBeginPeriod is called without timeEndPeriod in some NTP tools.
+ * [Bug 857] ntpdate debug mode adjusts system clock when it shouldn't.
+ * [Bug 908] ntpdate crashes sometimes.
+ * [Bug 982] ntpdate(and ntptimeset) buffer overrun if HAVE_POLL_H isn't set
+   (dup of 908).
+ * [Bug 997] ntpdate buffer too small and unsafe.
+ * ntpdate.c: Under Windows check whether NTP port in use under same conditions
+   as under other OSs.
+ * ntpdate.c: Fixed some typos and indents (tabs/spaces).
+ 
  ---
  (4.2.4p4) Released by Harlan Stenn <stenn@ntp.org>