Merge psp-deb1.ntp.org:/home/perlinger/ntp-stable-3490

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

bk: 5d1c7ab5KHFhegKeylIILQo_47KsRA

diff --cc ChangeLog
index 9ce201570f64dc49ee7e008f12c123ecdbdd87f1,ed68059a9fa660b3c3eed7bb091f06b5dae906f7..554e404dda519c2828fa5190ba421ea89d91ab9c
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,14 -1,6 +1,16 @@@
  ---
 +
+ * [Bug 3490] Patch to support Trimble Resolution Receivers <perlinger@ntp.org>
+   - applied (modified) patch by Richard Steedman
 +* [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>