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

into  psp-at1.ntp.org:/a/etc/amd.stage/thump2-g3/export/ntp/home/viperus/ntp-stable-unity

bk: 55740583LD8rZ5MFdIEnloDl_gqpwQ

diff --cc ChangeLog
index 1fc33182713b421a0bb71396f9e88838338601aa,6845d2e218519afe2a217afe73695a10249cce08..2f9611434015c75d309921a7f31129e17cdd8180
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,8 -1,20 +1,24 @@@
  ---
  
+ * [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>
  
  * CID 739725: Fix a rare resource leak in libevent/listener.c.

diff --cc configure.ac
index 0cd0e482223f43eaf059971551a7867b543cfc96,37f492afe4ab075740c821d6399484794400c8cd..b647090f5fd6213f021efe79faa61d3048aa278d
--- 1/configure.ac
--- 2/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"