Merge psp-deb1.ntp.org:/home/stenn/ntp-stable-sec

into  psp-deb1.ntp.org:/home/perlinger/ntp-stable-cve2014-9297

bk: 5612549eNAy88abr_79QR4vwMZ8GLQ

diff --cc ChangeLog
index ae4fca08b91f2b5e791b792229ff49de51548d33,c6d3609919ce33bd13d05307240cc9d3466c227e..17a6b1f07bfd8f45e16feba49dee317ff51ddba0
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,7 -1,5 +1,8 @@@
  ---
+ * CVE-2014-9297  perlinger@ntp.org
 +* [Bug 2332] (reopened) Exercise thread cancellation once before dropping
 +  privileges and limiting resources in NTPD removes the need to link
 +  forcefully against 'libgcc_s' which does not always work. J.Perlinger
  * [Bug 2595] ntpdate man page quirks.  Hal Murray, Harlan Stenn.
  * [Bug 2625] Deprecate flag1 in local refclock.  Hal Murray, Harlan Stenn.
  * [Bug 2817] Stop locking ntpd into memory by default under Linux.  H.Stenn.