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-3538

bk: 5c050351OQ1rTtaiMQeA7WOYT1yHbA

diff --cc ChangeLog
index 25a6d0352a1a26f5bd4f0eb240282f19b874b9f1,132a5a32804d6eec11391f67f151abb3e11e4e47..12a264ce054d3013f71b6c9af1cf739034d77566
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,16 -1,6 +1,18 @@@
  ---
 +(4.2.8p13)
 +
+ * [Bug 3538] Build fails for no-MMU targets <perlinger@ntp.org>
+   - applied patch by Baruch Siach
 +* [Bug 3535] libparse won't handle GPS week rollover <perlinger@ntp.org>
 +  - refactored handling of GPS era based on 'tos basedate' for
 +    parse (TSIP) and JUPITER clocks
 +* [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>

diff --cc ntpd/ntpd.c
Simple merge