From: Harlan Stenn <stenn@ntp.org>
Date: Sun, 8 Apr 2018 07:30:00 +0000 (+0000)
Subject: Merge psp-deb1.ntp.org:/home/stenn/ntp-stable
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5ee6156113df2eb687a95cb4f9375df84f8a6d48;p=thirdparty%2Fntp.git

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

bk: 5ac9c4f8nbXyOoOoG2HBm95hC7eljw
---

5ee6156113df2eb687a95cb4f9375df84f8a6d48
diff --cc ChangeLog
index 60d0d05a2,02ecbc4ad..df8ee65fe
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,10 -1,5 +1,11 @@@
  ---
 +
+ * [Bug 3470] ntpd4.2.8p11 fails to compile without OpenSSL <perlinger@ntp.org>
 +* [Bug 3465] Default TTL values cannot be used <perlinger@ntp.org>
 +* [Bug 3456] Use uintptr_t rather than size_t to store an integer in a pointer
 + - According to Brooks Davis, there was only one location <perlinger@ntp.org>
 +* [Bug 2821] minor build issues <perlinger@ntp.org>
 + - applied patches by Christos Zoulas, including real bug fixes
  
  ---
  (4.2.8p11) 2018/02/27 Released by Harlan Stenn <stenn@ntp.org>