From: Juergen Perlinger <perlinger@ntp.org>
Date: Tue, 13 Aug 2019 19:00:16 +0000 (+0200)
Subject: [bug 3576+3577] manual merge with staging area
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=068156bb57c461b45eb440663eee8345152d417e;p=thirdparty%2Fntp.git

[bug 3576+3577] manual merge with staging area

bk: 5d5308c0gtPvqGZF3M4QmmxnanOuww
---

068156bb57c461b45eb440663eee8345152d417e
diff --cc ChangeLog
index 1d659141c,fe0899336..a4858549a
--- a/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 libntp/Makefile.am
index 37bb66200,7b30afae8..ddd1e01dd
--- a/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					\