[bug 3576+3577] manual merge with staging area

bk: 5d5308c0gtPvqGZF3M4QmmxnanOuww

diff --cc ChangeLog
index 1d659141c079991b1528a68d424068ec82c24ae1,fe0899336caf0647b0930f7994a874b184c2f916..a4858549adff6d5631c2bd0226e1c9d1a64e7ca0
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,46 -1,8 +1,49 @@@
  ---
- 
+ * [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>
 +  - 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 3577] Update refclock_zyfer.c to the new GPS date API <perlinger@ntp.org>
+   - also updates for refclock_nmea.c and refclock_jupiter.c
+ * [Bug 3576] New GPS date function API <perlinger@ntp.org>
 +* [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 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 html/drivers/driver20.html
Simple merge

diff --cc libntp/Makefile.am
index 37bb662002dd63b6d59e01bb792f8847cdee1883,7b30afae84d83d9a1a454e8737569e9bd01879c0..ddd1e01dd7efcda69d0d8da4abcaf3001b9c6c5d
--- 1/libntp/Makefile.am
--- 2/libntp/Makefile.am
+++ b/libntp/Makefile.am
@@@ -104,9 -105,9 +105,10 @@@ libntp_a_SRCS =                                           
        strdup.c                                        \
        strl_obsd.c                                     \
        syssignal.c                                     \
+       timespecops.c                                   \
        timetoa.c                                       \
        timevalops.c                                    \
 +      timexsup.c                                      \
        uglydate.c                                      \
        vint64ops.c                                     \
        work_fork.c                                     \

diff --cc tests/libntp/run-calendar.c
Simple merge