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

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

bk: 5e2549cbW7XZcl6uHiIh5lE063Wm8g

diff --cc ChangeLog
index 2b2731409ecd2d47197e1260de9370be5cff2090,00ee95a9479245d19d8435e19461eff6b6cb87e9..2956096e91791674917c9a9125066e77e8ea12de
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,9 -1,42 +1,46 @@@
 +* [Bug 3432] refclocks that 'write()' should check the result <perlinger@ntp.org>
 +  - plus some more work on warnings for unchecked results
 +
 +From ntp-4.2.8p14:
  ---
  
+ * [Sec 3610] process_control() should bail earlier on short packets. stenn@
+   - Reported by Philippe Antoine
+ * [Bug 3637] Emit the version of ntpd in saveconfig.  stenn@
+ * [Bug 3636] NMEA: combine time/date from multiple sentences <perlinger@ntp.org>
+ * [Bug 3635] Make leapsecond file hash check optional <perlinger@ntp.org>
+ * [Bug 3634] Typo in discipline.html, reported by Jason Harrison.  stenn@
+ * [Bug 3628] raw DCF decoding - improve robustness with Zeller's congruence
+   - implement Zeller's congruence in libparse and libntp <perlinger@ntp.org>
+ * [Bug 3627] SIGSEGV on FreeBSD-12 with stack limit and stack gap <perlinger@ntp.org>
+   - integrated patch by Cy Schubert
+ * [Bug 3620] memory leak in ntpq sysinfo <perlinger@ntp.org>
+   - applied patch by Gerry Garvey
+ * [Bug 3619] Honour drefid setting in cooked mode and sysinfo <perlinger@ntp.org>
+   - applied patch by Gerry Garvey
+ * [Bug 3617] Add support for ACE III and Copernicus II receivers <perlinger@ntp.org>
+   - integrated patch by Richard Steedman
+ * [Bug 3615] accelerate refclock startup <perlinger@ntp.org>
+ * [Bug 3613] Propagate noselect to mobilized pool servers <stenn@ntp.org>
+   - Reported by Martin Burnicki
+ * [Bug 3612] Use-of-uninitialized-value in receive function <perlinger@ntp.org>
+   - Reported by Philippe Antoine
+ * [Bug 3611] NMEA time interpreted incorrectly <perlinger@ntp.org>
+   - officially document new "trust date" mode bit for NMEA driver
+   - restore the (previously undocumented) "trust date" feature lost with [bug 3577] 
+ * [Bug 3609] Fixing wrong falseticker in case of non-statistic jitter <perlinger@ntp.org>
+   - mostly based on a patch by Michael Haardt, implementing 'fudge minjitter'
+ * [Bug 3608] libparse fails to compile on S11.4SRU13 and later <perlinger@ntp.org>
+   - removed ffs() and fls() prototypes as per Brian Utterback
+ * [Bug 3604] Wrong param byte order passing into record_raw_stats() in
+       ntp_io.c <perlinger@ntp.org>
+   - fixed byte and paramter order as suggested by wei6410@sina.com 
+ * [Bug 3601] Tests fail to link on platforms with ntp_cv_gc_sections_runs=no <perlinger@ntp.org>
+ * [Bug 3599] Build fails on linux-m68k due to alignment issues <perlinger@ntp.org>
+   - added padding as suggested by John Paul Adrian Glaubitz 
+ * [Bug 3594] ntpd discards messages coming through nmead <perlinger@ntp.org>
+ * [Bug 3593] ntpd discards silently nmea messages after the 5th string <perlinger@ntp.org>
+ * [Bug 3590] Update refclock_oncore.c to the new GPS date API <perlinger@ntp.org>
  * [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>
@@@ -45,9 -83,8 +87,10 @@@
    - 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>
+ * Clean up sntp/networking.c:sendpkt() error message.  <stenn@ntp.org>
  
 +(4.3.99) 2019/06/07 Released by Harlan Stenn <stenn@ntp.org>
 +From ntp-4.2.8p13:
  ---
  (4.2.8p13) 2019/03/07 Released by Harlan Stenn <stenn@ntp.org>
  

diff --cc include/ntp_refclock.h
Simple merge

diff --cc ntpd/ntp_refclock.c
Simple merge

diff --cc ntpd/refclock_nmea.c
index c07966e3de4378263ded38b5f093cb3f3f3ac829,4fdadea61dffa425187feb12e6537278f8024f93..48f39de35ffbeb7d1cbd88bb70c08e5d14974f7f
--- 1/ntpd/refclock_nmea.c
--- 2/ntpd/refclock_nmea.c
+++ b/ntpd/refclock_nmea.c
@@@ -325,12 -320,16 +320,9 @@@ static int       nmead_open      (const char * dev
   * support functions by defining NMEA_WRITE_SUPPORT to non-zero...
   */
  #if NMEA_WRITE_SUPPORT
 -
  static        void gps_send(int, const char *, struct peer *);
 -# ifdef SYS_WINNT
 -#  undef write        /* ports/winnt/include/config.h: #define write _write */
 -extern int async_write(int, const void *, unsigned int);
 -#  define write(fd, data, octets)     async_write(fd, data, octets)
 -# endif /* SYS_WINNT */
 -
  #endif /* NMEA_WRITE_SUPPORT */
  
- static int32_t g_gpsMinBase;
- static int32_t g_gpsMinYear;
- 
  /*
   * -------------------------------------------------------------------
   * Transfer vector

diff --cc ntpd/refclock_oncore.c
Simple merge

diff --cc ntpd/refclock_palisade.c
Simple merge

diff --cc parseutil/dcfd.c
Simple merge