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

into  psp-deb2.ntp.org:/home/stenn/ntp-stable-3691

bk: 5f8fe206HdNsoCBvoXdPT9EdiRBJHg

diff --cc ChangeLog
index 931fedadd66cf98cf7015a9811f6ec1d4386aec5,3e5b3a639dace67966099bc6cf1fcc6b11833fdd..b366507fd2f15f5ef5e4a5d15319396c97548654
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,28 -1,7 +1,32 @@@
  ---
- * [Bug 3694] NMEA refclock appears to unnecessarily require location in messages
 +
++* [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 3676] compiler warnings (CMAC, interrupt_buf, typo, fallthrough)
 +  - applied patches by Gerry Garvey
 +* [Bug 3675] ntpq ccmds[] stores pointer to non-persistent storage
 +* [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
 +* Implement NTP_FUNC_REALPATH.  <stenn@ntp.org>
++>>>>>>>
  
  ---
  (4.2.8p15) 2020/06/23 Released by Harlan Stenn <stenn@ntp.org>

diff --cc ntpd/refclock_gpsdjson.c
Simple merge