Hello community, here is the log from the commit of package chrony for openSUSE:Leap:15.2 checked in at 2020-01-23 09:20:44 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Leap:15.2/chrony (Old) and /work/SRC/openSUSE:Leap:15.2/.chrony.new.26092 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "chrony" Thu Jan 23 09:20:44 2020 rev:28 rq:765998 version:3.2 Changes: -------- --- /work/SRC/openSUSE:Leap:15.2/chrony/chrony.changes 2020-01-15 14:50:09.409405647 +0100 +++ /work/SRC/openSUSE:Leap:15.2/.chrony.new.26092/chrony.changes 2020-01-23 09:20:48.598697161 +0100 @@ -1,0 +2,8 @@ +Wed Jan 8 17:31:23 UTC 2020 - Reinhard Max <[email protected]> + +- bsc#1159840: Add chrony-ntp-era-split.patch from upstream to fix + "make check" builds made after 2019-12-20. Existing installations + do not need to be updated as the bug only affects the test, but + not chrony itself. + +------------------------------------------------------------------- New: ---- chrony-ntp-era-split.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ chrony.spec ++++++ --- /var/tmp/diff_new_pack.AG4fH1/_old 2020-01-23 09:20:49.690697709 +0100 +++ /var/tmp/diff_new_pack.AG4fH1/_new 2020-01-23 09:20:49.690697709 +0100 @@ -44,6 +44,7 @@ Patch2: chrony-logrotate.patch Patch5: chrony-fix-open.patch Patch6: chrony-service-ordering.patch +Patch7: chrony-ntp-era-split.patch BuildRequires: NetworkManager-devel BuildRequires: bison BuildRequires: gcc-c++ @@ -96,6 +97,7 @@ %patch2 -p1 %patch5 -p1 %patch6 +%patch7 # If this is an openSUSE build, use our vendor zone # (2.*pool.ntp.org names include IPv6 addresses). If not ++++++ chrony-ntp-era-split.patch ++++++ commit 2d9eb5b6fa5225a7300c8eed95712969249900fb Author: Miroslav Lichvar <[email protected]> Date: Fri Jan 3 11:25:55 2020 +0100 test: fix util unit test for NTP era split The current default NTP era split passed the Unix epoch (~50 years ago), which means the epoch converted to an NTP timestamp and back ends up in the next NTP era (year 2106). Fix the test to take into account the era split. --- test/unit/util.c.orig +++ test/unit/util.c @@ -43,11 +43,19 @@ void test_unit(void) { ntp_ts.hi = htonl(JAN_1970); ntp_ts.lo = 0xffffffff; UTI_Ntp64ToTimespec(&ntp_ts, &ts); +#if defined(HAVE_LONG_TIME_T) && NTP_ERA_SPLIT > 0 + TEST_CHECK(ts.tv_sec == 0x100000000LL * (1 + (NTP_ERA_SPLIT - 1) / 0x100000000LL)); +#else TEST_CHECK(ts.tv_sec == 0); +#endif TEST_CHECK(ts.tv_nsec == 999999999); UTI_AddDoubleToTimespec(&ts, 1e-9, &ts); +#if defined(HAVE_LONG_TIME_T) && NTP_ERA_SPLIT > 0 + TEST_CHECK(ts.tv_sec == 1 + 0x100000000LL * (1 + (NTP_ERA_SPLIT - 1) / 0x100000000LL)); +#else TEST_CHECK(ts.tv_sec == 1); +#endif TEST_CHECK(ts.tv_nsec == 0); ntp_fuzz.hi = 0;
