Merge psp-at1.ntp.org:/home/perlinger/ntp-stable-2980

into  psp-at1.ntp.org:/a/local/amd/amd.stage/thump2-g3/export/ntp/home/stenn/ntp-stable-p6+

bk: 56978b2doqXKlPi00X3BAjkR0ujgrw

diff --cc ChangeLog
index afa932c503014ba0565289aba9707813d1364754,864175543daca024be9620ed4c490e292421c3cb..c0f7bf7a7c01b0511a161b5dd78b26c01633bce3
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,5 -1,32 +1,34 @@@
  ---
  
+ * [Sec 2935] Deja Vu: Replay attack on authenticated broadcast mode. HStenn.
+ * [Sec 2937] ntpq: nextvar() missing length check. perlinger@ntp.org
+ * [Sec 2938] ntpq saveconfig command allows dangerous characters
+   in filenames. perlinger@ntp.org
+ * [Sec 2939] reslist NULL pointer dereference.  perlinger@ntp.org
+ * [Sec 2940] Stack exhaustion in recursive traversal of restriction
+   list. perlinger@ntp.org
+ * [Sec 2945] Zero Origin Timestamp Bypass. perlinger@ntp.org
+ * [Sec 2948] Potential Infinite Loop in ntpq ( and ntpdc) perlinger@ntp.org
+ * [Bug 2772] adj_systime overflows tv_usec. perlinger@ntp.org
+ * [Bug 2814] msyslog deadlock when signaled. perlinger@ntp.org
+   - applied patch by shenpeng11@huawei.com with minor adjustments
+ * [Bug 2882] Look at ntp_request.c:list_peers_sum(). perlinger@ntp.org
+ * [Bug 2891] Deadlock in deferred DNS lookup framework. perlinger@ntp.org
+ * [Bug 2892] Several test cases assume IPv6 capabilities even when
+              IPv6 is disabled in the build. perlinger@ntp.org
+   - Found this already fixed, but validation led to cleanup actions.
+ * [Bug 2905] DNS lookups broken. perlinger@ntp.org
+   - added limits to stack consumption, fixed some return code handling
+ * [Bug 2971] ntpq bails on ^C: select fails: Interrupted system call
+   - changed stacked/nested handling of CTRL-C. perlinger@ntp.org
+   - make CTRL-C work for retrieval and printing od MRU list. perlinger@ntp.org
++* [Bug 2980] reduce number of warnings. perlinger@ntp.org
++  - integrated several patches from Havard Eidnes (he@uninett.no)
+ * Make leapsec_query debug messages less verbose.  Harlan Stenn.
+ 
+ ---
+ (4.2.8p5) 2016/01/07 Released by Harlan Stenn <stenn@ntp.org>
+ 
  * [Sec 2956] small-step/big-step.  Close the panic gate earlier.  HStenn.
  * CID 1339955: Free allocated memory in caljulian test.  HStenn.
  * CID 1339962: Explicitly initialize variable in caljulian test.  HStenn.

diff --cc ntpd/ntp_io.c
Simple merge

diff --cc ntpd/ntp_timer.c
Simple merge

diff --cc ntpq/ntpq-subs.c
Simple merge

diff --cc ntpq/ntpq.c
Simple merge