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

into  psp-fb1.ntp.org:/a/etc/amd.net/nfs-stor0.ntfo.org/root/nfs/home/stenn/ntp-stable-3529

bk: 5c04f464vwQW9_k0tZ9-FfW9BcMbWw

diff --cc ChangeLog
index 0f8346ff6a9eac03e41d4f74c9abfc1c568556b4,246c7c7d8bb79952f555ff395b586056e667b950..e4659279d914b9a3ce7c5de7e6516d0cb46dd4bf
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,10 -1,7 +1,13 @@@
  ---
 +(4.2.8p13)
 +
+ * [Bug 3529] Build failures on Mac OS X 10.13 (High Sierra) <perlinger@ntp.org>
+   - patch by Daniel J. Luke; this does not fix a potential linker
+     regression issue on MacOS.
 +* [Bug 3526] Incorrect poll interval in packet <perlinger@ntp.org>
 +  - applied patch by Gerry Garvey
 +* [Bug 3471] Check for openssl/[ch]mac.h.  <perlinger@ntp.org>
 +  - added missing check, reported by Reinhard Max <perlinger@ntp.org>
  
  ---
  (4.2.8p12) 2018/08/14 Released by Harlan Stenn <stenn@ntp.org>