From: Harlan Stenn <stenn@ntp.org>
Date: Sun, 7 Jun 2015 09:06:25 +0000 (+0000)
Subject: Merge bk://bk.ntp.org/ntp-stable
X-Git-Tag: NTP_4_3_40~6^2~15^2~7
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=10bec45d2be657d77d255ab88cd8d20d1c1c5a3a;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-unity

bk: 55740991cu4ybFZbmfjnJ9UWs3TB9A
---

10bec45d2be657d77d255ab88cd8d20d1c1c5a3a
diff --cc ChangeLog
index 1fc331827,6845d2e21..0a6aa6db5
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,7 -1,19 +1,21 @@@
  ---
  
+ * [Bug 2824] Convert update-leap to perl. (also see 2769)
+ * [Bug 2830] ntpd doesn't always transfer the correct TAI offset via autokey
+    NTPD transfers the current TAI (instead of an announcement) now.
+    This might still needed improvement.
+ * [Bug 2832] refclock_jjy.c supports the TDC-300.
+ * [Bug 2834] Correct a broken html tag in html/refclock.html
+ * [Bug 2836] DFC77 patches from Frank Kardel to make decoding more
+   robust, and require 2 consecutive timestamps to be consistent.
+ * [Bug 2837] Allow a configurable DSCP value.
+ * [Bug 2837] add test for DSCP to ntpd/complete.conf.in
+ * [Bug 2842] Glitch in ntp.conf.def documentation stanza.
+ * [Bug 2842] Bug in mdoc2man.
+ * Report select() debug messages at debug level 3 now.
+ * sntp/scripts/genLocInfo: treat raspbian as debian.
 +* Unity test framework fixes.
 +* Initial support for PACKAGE_VERSION tests.
  ---
  (4.2.8p3-RC1) 2015/05/12 Released by Harlan Stenn <stenn@ntp.org>
  
diff --cc configure.ac
index 0cd0e4822,37f492afe..b647090f5
--- a/configure.ac
+++ b/configure.ac
@@@ -4388,11 -4385,10 +4388,12 @@@ AC_CONFIG_FILES([scripts/ntpver],	[chmo
  AC_CONFIG_FILES([scripts/plot_summary],	[chmod +x scripts/plot_summary])
  AC_CONFIG_FILES([scripts/summary],	[chmod +x scripts/summary])
  AC_CONFIG_FILES([scripts/update-leap/Makefile])
+ AC_CONFIG_FILES([scripts/update-leap/update-leap], [chmod +x scripts/update-leap/update-leap])
  AC_CONFIG_FILES([tests/Makefile])
 +AC_CONFIG_FILES([tests/bug-2803/Makefile])
  AC_CONFIG_FILES([tests/libntp/Makefile])
  AC_CONFIG_FILES([tests/ntpd/Makefile])
 +AC_CONFIG_FILES([tests/sandbox/Makefile])
  AC_CONFIG_FILES([util/Makefile])
  
  perllibdir="${datadir}/ntp/lib"