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

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

bk: 5d561ff2f8lGfqD7ZXZKc2pYbhc3CA

diff --cc ChangeLog
index 1d659141c079991b1528a68d424068ec82c24ae1,a62501ffb2a740c2cc43cfac0658014b45694b0d..175ac834cf732e5ee6103c2faaaa7d3e249c271b
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,46 -1,6 +1,48 @@@
  ---
 +
 +* [Bug 3585] Unity tests mix buffered and unbuffered output <perlinger@ntp.org>
 +  - stdout+stderr are set to line buffered during test setup now
 +* [Bug 3583] synchronization error <perlinger@ntp.org>
 +  - set clock to base date if system time is before that limit
 +* [Bug 3582] gpsdjson refclock fudgetime1 adjustment is doubled <perlinger@ntp.org>
 +* [Bug 3580] Possible bug ntpq-subs (NULL dereference in dogetassoc) <perlinger@ntp.org>
 +  - Reported by Paulo Neves
 +* [Bug 3573] nptdate: missleading error message <perlinger@ntp.org>
 +* [Bug 3570] NMEA driver docs: talker ID not mentioned, typo <perlinger@ntp.org>
 +* [Bug 3569] cleanup MOD_NANO/STA_NANO handling for 'ntpadjtimex()' <perlinger@ntp.org>
 +  - sidekick: service port resolution in 'ntpdate'
 +* [Bug 3550] Reproducible build: Respect SOURCE_DATE_EPOCH <perlinger@ntp.org>
 +  - applied patch by Douglas Royds
 +* [Bug 3542] ntpdc monlist parameters cannot be set <perlinger@ntp.org>
 +* [Bug 3533] ntpdc peer_info ipv6 issues <perlinger@ntp.org>
 +  - applied patch by Gerry Garvey
 +* [Bug 3531] make check: test-decodenetnum fails <perlinger@ntp.org>
 +  - try to harden 'decodenetnum()' against 'getaddrinfo()' errors
 +  - fix wrong cond-compile tests in unit tests
 +* [Bug 3517] Reducing build noise <perlinger@ntp.org>
 +* [Bug 3516] Require tooling from this decade <perlinger@ntp.org>
 +  - patch by Philipp Prindeville
 +* [Bug 3515] Refactor ntpdmain() dispatcher loop and group common code <perlinger@ntp.org>
 +  - patch by Philipp Prindeville
 +* [Bug 3511] Get rid of AC_LANG_SOURCE() warnings <perlinger@ntp.org>
 +  - patch by Philipp Prindeville
 +* [Bug 3510] Flatten out the #ifdef nesting in ntpdmain() <perlinger@ntp.org>
 +  - partial application of patch by Philipp Prindeville
 +* [Bug 3491] Signed values of LFP datatypes should always display a sign
 +  - applied patch by Gerry Garvey & fixed unit tests <perlinger@ntp.org>
 +* [Bug 3490] Patch to support Trimble Resolution Receivers <perlinger@ntp.org>
 +  - applied (modified) patch by Richard Steedman
+ * [Bug 3473] RefID of refclocks should always be text format <perlinger@ntp.org>
+   - applied patch by Gerry Garvey (with minor formatting changes)
 +* [Bug 3132] Building 4.2.8p8 with disabled local libopts fails <perlinger@ntp.org>
 +  - applied patch by Miroslav Lichvar
 +* [Bug 3094] ntpd trying to listen for broadcasts on a completely ipv6 network
 +  <perlinger@ntp.org>
 +* [Bug 2420] ntpd doesn't run and exits with retval 0 when invalid user
 +             is specified with -u <perlinger@ntp.org>
 +  - monitor daemon child startup & propagate exit codes
 +* [Bug 1433] runtime check whether the kernel really supports capabilities
 +  - (modified) patch by Kurt Roeckx <perlinger@ntp.org>
  
  ---
  (4.2.8p13) 2019/03/07 Released by Harlan Stenn <stenn@ntp.org>

diff --cc ntpd/ntp_control.c
Simple merge

diff --cc ntpdc/ntpdc_ops.c
Simple merge

diff --cc ntpq/ntpq.c
Simple merge