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

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

bk: 5f969fe9h0p6yMymnSGgW2JVPaXvDw

diff --cc ChangeLog
index 9a9874004c7caf86089b7c8debd3d761c5646205,ec773cf39c37b8fe8263c4b13ee5ec098598ef95..0217bb1290f96972b649fd15334969c1c5225b35
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,35 -1,6 +1,38 @@@
  ---
 +
 +* [Bug 3694] NMEA refclock seems to unnecessarily require location in messages
 +  - misleading title; essentially a request to ignore the receiver status.
 +    Added a mode bit for this. <perlinger@ntp.org>
 +* [Bug 3693] Improvement of error handling key lengths <perlinger@ntp.org>
 +  - original patch by Richard Schmidt, with mods & unit test fixes
 +* [Bug 3692] /dev/gpsN requirement prevents KPPS <perlinger@ntp.org>
 +  - implement/wrap 'realpath()' to resolve symlinks in device names
 +* [Bug 3691] Buffer Overflow reading GPSD output
 +  - original patch by matt<ntpbr@mattcorallo.com>
 +  - increased max PDU size to 4k to avoid truncation
 +* [Bug 3690] newline in ntp clock variable (parse) <perlinger@ntp.org>
 +  - patch by Frank Kardel
 +* [Bug 3689] Extension for MD5, SHA-1 and other keys <perlinger@ntp.org>
 +  - ntp{q,dc} now use the same password processing as ntpd does in the key
 +    file, so havin a binary secret >= 11 bytes is possible for all keys.
 +    (This is a different approach to the roblem than suggested)
 +* [Bug 3688] GCC 10 build errors in testsuite <perlinger@ntp.org>
+ * [Bug 3677] additional peer events not decoded in associations listing <perlinger@ntp.org>
+   - original patch by Gerry Garvey
 +* [Bug 3676] compiler warnings (CMAC, interrupt_buf, typo, fallthrough)
 +  - applied patches by Gerry Garvey
 +* [Bug 3675] ntpq ccmds[] stores pointer to non-persistent storage
 +* [Bug 3674] ntpq command 'execute only' using '~' prefix <perlinger@ntp.org>
 +  - idea+patch by Gerry Garvey
 +* [Bug 3672] fix biased selection in median cut <perlinger@ntp.org>
 +* [Bug 3666] avoid unlimited receive buffer allocation <perlinger@ntp.org>
 +  - follow-up: fix inverted sense in check, reset shortfall counter
 +* [Bug 3626] (SNTP) UTC offset calculation needs dst flag <perlinger@ntp.org>
 +  - applied patch by Gerry Garvey
 +* [Bug 3432] refclocks that 'write()' should check the result <perlinger@ntp.org>
 +  - backport from -dev, plus some more work on warnings for unchecked results
 +* Implement NTP_FUNC_REALPATH.  <stenn@ntp.org>
++>>>>>>>
  
  ---
  (4.2.8p15) 2020/06/23 Released by Harlan Stenn <stenn@ntp.org>