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

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

bk: 5871e31fXIeAl7wsF0dhXdsLCT3Bog
---

075e17a89046269a0fec7ae07cb60e5307ef8f21
diff --cc ChangeLog
index e748ec746,cc2b5848b..a7bd12cd0
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,7 -1,12 +1,14 @@@
  ---
- * [Bug 3144] NTP does not build without openSSL <perlinger@ntp.org>
+ 
 -* [Bug 3144] NTP does not build without openSSL <perlinger@ntp.org>
 +* [Bug 3363] Support for openssl-1.1.0 without compatibility modes
-   - rework of patch set from <ntp.org@eroen.eu> <perlinger@ntp.org>
++  - rework of patch set from <ntp.org@eroen.eu>. <perlinger@ntp.org>
++* [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>