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

into  psp-deb1.ntp.org:/net/nfs1/nfs/home/stenn/ntp-stable-3062

bk: 587215c1zGwQuB30ztHu_9dhAreClA

diff --cc ChangeLog
index 07cf0a356c2953babd52f99f2844fc69cd91dcd5,d73a9d85fad3593571c140d7a28f9dc39dc3f4c2..36ac50820dc806cade2df9d961613c6647899b61
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,22 -1,6 +1,24 @@@
  ---
 +(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 3065] Quiet warnings on NetBSD <perlinger@ntp.org>
 +  - applied some of the patches provided by Havard. Not all of them
 +    still match the current code base, and I did not touch libopt.
+ * [Bug 3062] Change the process name of forked DNS worker <perlinger@ntp.org>
+   - applied patch by Reinhard Max. See bugzilla for limitations.
 +* [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>

diff --cc include/ntpd.h
Simple merge