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

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

bk: 587202dfldiFddHS6cZnH7qadu0hrA
---

c925797990d72085d9124e565ac28d5224e6e1e6
diff --cc ChangeLog
index 312e267bf,2db3d2c23..970bd1050
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,20 -1,10 +1,22 @@@
  ---
 +(4.2.8p10)
 +
 +* [Bug 3363] Support for openssl-1.1.0 without compatibility modes
 +  - 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 2896] Nothing happens if minsane < maxclock < minclock
+   - produce ERROR log message about dysfunctional daemon. <perlinger@ntp.org>
 - 
 +* [Bug 2851] allow -4/-6 on restrict line with mask <perlinger@ntp.org>
 +  - applied patch by Miroslav Lichvar for ntp4.2.6 compat
 +* [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>
 -(4.2.8p9) 2016/MM/DD Released by Harlan Stenn <stenn@ntp.org>
  
  * [Sec 3119] Trap crash <perlinger@ntp.org>
  * [Sec 3118] Mode 6 information disclosure and DDoS vector <perlinger@ntp.org>