diff --git a/chrony-124-tai.patch b/chrony-124-tai.patch new file mode 100644 index 0000000..5198fe4 --- /dev/null +++ b/chrony-124-tai.patch @@ -0,0 +1,30 @@ +From 8f5b3084144967b313cfb51285bf6517e06e1b9e Mon Sep 17 00:00:00 2001 +From: Miroslav Lichvar +Date: Tue, 4 Jun 2024 16:23:41 +0200 +Subject: [PATCH] test: make 124-tai more reliable + +Reported-by: Reinhard Max +--- + test/simulation/124-tai | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +--- test/simulation/124-tai.orig ++++ test/simulation/124-tai +@@ -20,7 +20,7 @@ client_conf=" + refclock SHM 0 dpoll 0 poll 0 tai + leapsectz right/UTC + leapsecmode ignore +-maxchange 1e-3 1 0" ++maxchange 1e-3 10 0" + + run_test || test_fail + check_chronyd_exit || test_fail +@@ -35,7 +35,7 @@ client_conf=" + refclock SHM 0 dpoll 0 poll 0 tai + leapsectz right/UTC + makestep 1 1 +-maxchange 1e-3 1 0" ++maxchange 1e-3 10 0" + + run_test || test_fail + check_chronyd_exit || test_fail diff --git a/chrony.changes b/chrony.changes index b015acc..bdcb1b8 100644 --- a/chrony.changes +++ b/chrony.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Tue Jun 4 14:57:09 UTC 2024 - Reinhard Max + +- bsc#1225362, chrony-124-tai.patch: make 124-tai more reliable + +------------------------------------------------------------------- +Mon May 27 15:34:40 UTC 2024 - Reinhard Max + +- Update clknetsim to snapshot 0a11a35. + ------------------------------------------------------------------- Mon Feb 26 10:33:53 UTC 2024 - Dominique Leuenberger diff --git a/chrony.spec b/chrony.spec index f2275e5..b0ee217 100644 --- a/chrony.spec +++ b/chrony.spec @@ -33,7 +33,7 @@ %bcond_without testsuite %define _systemdutildir %(pkg-config --variable systemdutildir systemd) -%global clknetsim_ver 5d1dc05 +%global clknetsim_ver 0a11a35 #Compat macro for new _fillupdir macro introduced in Nov 2017 %if ! %{defined _fillupdir} %define _fillupdir %{_localstatedir}/adm/fillup-templates @@ -70,6 +70,7 @@ Patch2: chrony-logrotate.patch Patch3: chrony-service-ordering.patch Patch7: chrony-htonl.patch Patch8: chrony.nm-dispatcher.dhcp.patch +Patch9: chrony-124-tai.patch BuildRequires: NetworkManager-devel BuildRequires: bison BuildRequires: findutils @@ -181,6 +182,7 @@ e.g. because the servers will be set via DHCP. %patch -P 3 %patch -P 7 %patch -P 8 +%patch -P 9 # Remove pool statements from the default /etc/chrony.conf. They will # be provided by branding packages in /etc/chrony.d/pool.conf . diff --git a/clknetsim-0a11a35.tar.gz b/clknetsim-0a11a35.tar.gz new file mode 100644 index 0000000..848705a --- /dev/null +++ b/clknetsim-0a11a35.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5ef3d546932c7b848109474f782bd0c0a54b6dff9c199c7d524d535972b112b2 +size 51432 diff --git a/clknetsim-5d1dc05.tar.gz b/clknetsim-5d1dc05.tar.gz deleted file mode 100644 index 6abbd73..0000000 --- a/clknetsim-5d1dc05.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:26ffb69047e1839ec7bdd92bc55140a31edb2d8b6d97fbb6f19e1c9ccf601d99 -size 51356