From: Harlan Stenn <stenn@ntp.org>
Date: Sat, 9 May 2015 04:27:15 +0000 (+0000)
Subject: Merge bk://bk.ntp.org/ntp-stable
X-Git-Tag: NTP_4_3_41~2^2~2^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4c6bcd2d6af20cf0bdd77dbd6d6d5b0f45345a46;p=thirdparty%2Fntp.git

Merge bk://bk.ntp.org/ntp-stable
into  psp-at1.ntp.org:/a/etc/amd.stage/thump2-g3/export/ntp/home/stenn/ntp-stable-2805

bk: 554d8ca31YSDJHhQlnfOB9vbbH61xw
---

4c6bcd2d6af20cf0bdd77dbd6d6d5b0f45345a46
diff --cc ChangeLog
index 99aa5bd17,21a86196d..ac1082d57
--- a/ChangeLog
+++ b/ChangeLog
@@@ -19,12 -13,9 +19,13 @@@
  * [Bug 2800] refclock_true.c true_debug() can't open debug log because
    of incompatible open/fdopen parameters.
  * [Bug 2804] install-local-data assumes GNU 'find' semantics.
+ * [Bug 2805] ntpd fails to join multicast group.
  * [Bug 2806] refclock_jjy.c supports the Telephone JJY.
  * [Bug 2808] GPSD_JSON driver enhancements, step 1.
 +  Fix crash during cleanup if GPS device not present and char device.
 +  Increase internal token buffer to parse all JSON data, even SKY.
 +  Defer logging of errors during driver init until the first unit is
 +  started, so the syslog is not cluttered when the driver is not used.
    Various improvements, see http://bugs.ntp.org/2808 for details.
    Changed libjsmn to a more recent version.
  * [Bug 2810] refclock_shm.c memory barrier code needs tweaks for QNX.