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

into  psp-deb1.ntp.org:/home/stenn/ntp-stable-2779-2781

bk: 550e7a0c50wtlEMCZaA6eFuia4EMLg

diff --cc ChangeLog
index ca71c988af668cb6be1464908cd5eebeaf5badd7,07872b1dc7ed11a1aa9459b8a50691943c3540b6..67740413282a7a0b6fd56e5e30a3ee749452149b
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -14,10 -15,32 +15,35 @@@
  * [Bug 2773] Early leap announcement from Palisade/Thunderbolt
  * [Bug 2774] Unreasonably verbose printout - leap pending/warning
  * [Bug 2775] ntp-keygen.c fails to compile under Windows.
+ * [Bug 2777] Fixed loops and decoding of Meinberg GPS satellite info.
+   Removed non-ASCII characters from some copyright comments.
+   Removed trailing whitespace.
+   Updated definitions for Meinberg clocks from current Meinberg header files.
+   Now use C99 fixed-width types and avoid non-ASCII characters in comments.
+   Account for updated definitions pulled from Meinberg header files.
+   Updated comments on Meinberg GPS receivers which are not only called GPS16x.
+   Replaced some constant numbers by defines from ntp_calendar.h
+   Modified creation of parse-specific variables for Meinberg devices
+   in gps16x_message().
+   Reworked mk_utcinfo() to avoid printing of ambiguous leap second dates.
+   Modified mbg_tm_str() which now expexts an additional parameter controlling
+   if the time status shall be printed.
 +* [Sec 2779] ntpd accepts unauthenticated packets with symmetric key crypto.
 +* [Sec 2781] Authentication doesn't protect symmetric associations against
 +  DoS attacks.
  * [Bug 2783] Quiet autoconf warnings about missing AC_LANG_SOURCE.
+ * [Bug 2789] Quiet compiler warnings from libevent.
+ * [Bug 2790] If ntpd sets the Windows MM timer highest resolution
+   pause briefly before measuring system clock precision to yield
+   correct results.
+ * Comment from Juergen Perlinger in ntp_calendar.c to make the code clearer.
+ * Use predefined function types for parse driver functions
+   used to set up function pointers.
+   Account for changed prototype of parse_inp_fnc_t functions.
+   Cast parse conversion results to appropriate types to avoid
+   compiler warnings.
+   Let ioctl() for Windows accept a (void *) to avoid compiler warnings
+   when called with pointers to different types.
  ---
  (4.2.8p1) 2015/02/04 Released by Harlan Stenn <stenn@ntp.org>