From: Harlan Stenn <stenn@ntp.org>
Date: Sun, 8 Jan 2017 06:51:01 +0000 (+0000)
Subject: Merge psp-deb1.ntp.org:/home/perlinger/ntp-stable-3144
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=510c07b6e68930f1f5a71b5fea892e2967ef7ef3;p=thirdparty%2Fntp.git

Merge psp-deb1.ntp.org:/home/perlinger/ntp-stable-3144
into  psp-deb1.ntp.org:/net/nfs1/nfs/home/stenn/ntp-stable-2645

bk: 5871e155lXpCd3AyznMDFqqIwMh43w
---

510c07b6e68930f1f5a71b5fea892e2967ef7ef3
diff --cc ChangeLog
index 62b527bb6,29e7524b3..cc2b5848b
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,5 -1,11 +1,12 @@@
  ---
+ 
 +* [Bug 3144] NTP does not build without openSSL <perlinger@ntp.org>
+ * [Bug 2923] Trap Configuration Fail <perlinger@ntp.org>
+   - fixed dependency inversion from [Bug 2837]
+ * [Bug 2645] out-of-bound pointers in ctl_putsys and decode_bitflags
+   - Fixed these and some more locations of this pattern.
+     Probably din't get them all, though. <perlinger@ntp.org>
+ * Update copyright year.
  
  ---
  (4.2.8p9) 2016/11/21 Released by Harlan Stenn <stenn@ntp.org>