Sync from SUSE:SLFO:Main chrony revision 8306baa327e4c2548c7dc7522196d9a5
This commit is contained in:
parent
55059d9e43
commit
ce71d27a59
30
chrony-124-tai.patch
Normal file
30
chrony-124-tai.patch
Normal file
@ -0,0 +1,30 @@
|
||||
From 8f5b3084144967b313cfb51285bf6517e06e1b9e Mon Sep 17 00:00:00 2001
|
||||
From: Miroslav Lichvar <mlichvar@redhat.com>
|
||||
Date: Tue, 4 Jun 2024 16:23:41 +0200
|
||||
Subject: [PATCH] test: make 124-tai more reliable
|
||||
|
||||
Reported-by: Reinhard Max <max@suse.de>
|
||||
---
|
||||
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
|
BIN
chrony-4.4.tar.gz
(Stored with Git LFS)
BIN
chrony-4.4.tar.gz
(Stored with Git LFS)
Binary file not shown.
@ -1,16 +0,0 @@
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
|
||||
iQIzBAABCAAdFiEEjzdcfo0O4SWj071RU34rdvdoDawFAmTTlb0ACgkQU34rdvdo
|
||||
DaxNlhAAhqmQKW5LEQmJjld2bor7nJHjuJ9/Xs4YVvUM3+U1R+BxRZiyX3aNAABz
|
||||
J/iDGbQc1Bbd7cfGPSLrInSRJL0j1r2CQi76gxjcjyJOFU+QiZxZYIM5BN2QouI9
|
||||
taNi5cyRQSNgu+JO7Xzq3dZ7q0UFp2/5/OcryZU2RMcy9mg8zsYBvaoxs+vE098O
|
||||
kGHR3fLlK/Dvbyv+8uWejmC3pDqzTdbIJDziH9Q1h1SyjFb4x7ISbVrsnuYKTZfl
|
||||
oSKEucEHmlAXgCvLU2abWSL6M8vQeOpuwtJnWswzTxKyon0sM28pzyJ2D49MfkNT
|
||||
MSJV/NsD3Htu/XrUBfX4FXwsCkfV1AVUZIbgira7eVE/sY2Hjz3RJzZf4Kfpy+1d
|
||||
uY/Ch+AHxJpO4OiwmWBEz04MSJYqmwMILi5ey3NSopT/b8Xm1iAu29AYHsHYshrj
|
||||
kn8vbgqfZihP7ainGw8Y4ljCGfdMNXOyPcmoDR8BGSks7nRls9siO6fUQxuNF1Uy
|
||||
YV4mvvt+mQck+ympbSSRboz+dvnT8No6L17RPsP5va4ro2C5kqlPB45VfxCRauqe
|
||||
/lW/TxksyBo2cE0cL5V4ZKg0TXVSrsx15bY5rWRaozbj3EYCZfoQ1jOmQ1rP+ysh
|
||||
EcKbs/RsR+6O7viKvybb1pYrsgaeyrPYfIVbWCcDqUGKgzo2XUY=
|
||||
=Zu1L
|
||||
-----END PGP SIGNATURE-----
|
BIN
chrony-4.5.tar.gz
(Stored with Git LFS)
Normal file
BIN
chrony-4.5.tar.gz
(Stored with Git LFS)
Normal file
Binary file not shown.
16
chrony-4.5.tar.gz.sig
Normal file
16
chrony-4.5.tar.gz.sig
Normal file
@ -0,0 +1,16 @@
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
|
||||
iQIzBAABCAAdFiEEjzdcfo0O4SWj071RU34rdvdoDawFAmVvJPkACgkQU34rdvdo
|
||||
DawQjw//Zkq4UTPZDpU/gifjUtE/jpIa6+tyhSFpRI5abNScOPaEa8nZz6Q33/s4
|
||||
qiS9RJh1AA13xnal7bIHsixadON01x91ysW1sbNhFx942SwTpk00wDdLmySqW+u5
|
||||
klrTfGlGRejp7ahasbXx/dXqk3Sz+J19YIvdz2X1o2HaUZwp1SIwq5Y8BYS8iE0a
|
||||
G5ov/ail2965hwSoYWNbR7/UuOTEO3YgRk2YSpKKKGJgL27pAzwGlOVwgP9JLAD0
|
||||
WsGDEpn+EY+4BOkwMyFeACOHyJ+QCcpKXF9B6CGJELyPqTp2uQy+OkaF4VtkGvpp
|
||||
wRs6IhMoHFt5NjvCiBhOMvocKd6JrxDxN84gGhSG6OtSFp8GZoFhTxIp//mnZDoz
|
||||
WPl/Z+n3yABdaG7IWavl6tn2wvipMsgcTJHxRYg6A4d2+mKKy0pRyfLUtGTM9EA/
|
||||
NEhTIHVZZLORNK7zPaB8CkFmmsmDQVhowBjXjFcq2HDNzQawbU5gjWUBEH+4R4bq
|
||||
rb4P9Eg3Kus0fvBxj4z72XkzYGNn951YFhwW26x4w09+J35/1eoshNkBaPfOdsRf
|
||||
Xgb37MmEe5yfU32k27aYtERnH9w/+rOk1RISrVcK0c87uz0RnzPN5HBzc4PnEpx6
|
||||
KQFkFxVaaMeJNc0Ca5/u9aE9nli1DIS8Afo/Z4zQtjVMqLsvecQ=
|
||||
=4/yB
|
||||
-----END PGP SIGNATURE-----
|
@ -1,14 +1,12 @@
|
||||
Index: chrony-4.0/examples/chrony.conf.example3
|
||||
===================================================================
|
||||
--- chrony-4.0.orig/examples/chrony.conf.example3
|
||||
+++ chrony-4.0/examples/chrony.conf.example3
|
||||
--- examples/chrony.conf.example3.orig
|
||||
+++ examples/chrony.conf.example3
|
||||
@@ -27,12 +27,38 @@
|
||||
# you can access at http://support.ntp.org/bin/view/Servers/WebHome or
|
||||
# you can use servers from the pool.ntp.org project.
|
||||
|
||||
-! server foo.example.net iburst
|
||||
-! server bar.example.net iburst
|
||||
-! server baz.example.net iburst
|
||||
-! server ntp1.example.net iburst
|
||||
-! server ntp2.example.net iburst
|
||||
-! server ntp3.example.net iburst
|
||||
-
|
||||
! pool pool.ntp.org iburst
|
||||
|
||||
|
@ -1,6 +1,6 @@
|
||||
--- test/unit/util.c.orig
|
||||
+++ test/unit/util.c
|
||||
@@ -561,7 +561,7 @@ test_unit(void)
|
||||
@@ -602,7 +602,7 @@ test_unit(void)
|
||||
#else
|
||||
TEST_CHECK(tspec.tv_sec_high == htonl(TV_NOHIGHSEC));
|
||||
#endif
|
||||
|
@ -1,3 +1,28 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue Jun 4 14:57:09 UTC 2024 - Reinhard Max <max@suse.com>
|
||||
|
||||
- bsc#1225362, chrony-124-tai.patch: make 124-tai more reliable
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon May 27 15:34:40 UTC 2024 - Reinhard Max <max@suse.com>
|
||||
|
||||
- Update clknetsim to snapshot 0a11a35.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Feb 26 10:33:53 UTC 2024 - Dominique Leuenberger <dimstar@opensuse.org>
|
||||
|
||||
- Use %patch -P N instead of deprecated %patchN.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Jan 15 14:12:31 UTC 2024 - Reinhard Max <max@suse.com>
|
||||
|
||||
- Update to version 4.5:
|
||||
* Add support for AES-GCM-SIV in GnuTLS
|
||||
* Add support for corrections from PTP transparent clocks
|
||||
* Add support for systemd socket activation
|
||||
* Fix presend in interleaved mode
|
||||
* Fix reloading of modified sources from sourcedir
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Sep 1 14:05:34 UTC 2023 - Fabian Vogt <fvogt@suse.com>
|
||||
|
||||
|
26
chrony.spec
26
chrony.spec
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package chrony
|
||||
#
|
||||
# Copyright (c) 2023 SUSE LLC
|
||||
# Copyright (c) 2024 SUSE LLC
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
@ -33,7 +33,7 @@
|
||||
%bcond_without testsuite
|
||||
|
||||
%define _systemdutildir %(pkg-config --variable systemdutildir systemd)
|
||||
%global clknetsim_ver ef2a7a9
|
||||
%global clknetsim_ver 0a11a35
|
||||
#Compat macro for new _fillupdir macro introduced in Nov 2017
|
||||
%if ! %{defined _fillupdir}
|
||||
%define _fillupdir %{_localstatedir}/adm/fillup-templates
|
||||
@ -41,7 +41,7 @@
|
||||
%define chrony_helper %{_libexecdir}/chrony/helper
|
||||
%define chrony_rundir %{_rundir}/%{name}
|
||||
Name: chrony
|
||||
Version: 4.4
|
||||
Version: 4.5
|
||||
Release: 0
|
||||
Summary: System Clock Synchronization Client and Server
|
||||
License: GPL-2.0-only
|
||||
@ -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
|
||||
@ -136,7 +137,7 @@ Conflicts: %name-pool
|
||||
Requires: %name = %version
|
||||
BuildArch: noarch
|
||||
Supplements: (chrony and branding-SLE)
|
||||
Removepathpostfixes:.suse
|
||||
Removepathpostfixes: .suse
|
||||
|
||||
%description pool-suse
|
||||
This package configures chrony to use the SUSE NTP server pool by
|
||||
@ -151,7 +152,7 @@ Conflicts: %name-pool
|
||||
Requires: %name = %version
|
||||
BuildArch: noarch
|
||||
Supplements: (chrony and branding-openSUSE)
|
||||
Removepathpostfixes:.opensuse
|
||||
Removepathpostfixes: .opensuse
|
||||
|
||||
%description pool-openSUSE
|
||||
This package configures chrony to use the openSUSE NTP server pool by
|
||||
@ -164,7 +165,7 @@ Provides: %name-pool = %version
|
||||
Conflicts: %name-pool
|
||||
Requires: %name = %version
|
||||
BuildArch: noarch
|
||||
Removepathpostfixes:.empty
|
||||
Removepathpostfixes: .empty
|
||||
|
||||
%description pool-empty
|
||||
This package provides an empty /etc/chrony.d/pool.conf file for
|
||||
@ -175,12 +176,13 @@ e.g. because the servers will be set via DHCP.
|
||||
|
||||
%prep
|
||||
%setup -q -a 10
|
||||
%patch0 -p1
|
||||
%patch1
|
||||
%patch2 -p1
|
||||
%patch3
|
||||
%patch7
|
||||
%patch8
|
||||
%patch -P 0
|
||||
%patch -P 1
|
||||
%patch -P 2 -p1
|
||||
%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 .
|
||||
|
BIN
clknetsim-0a11a35.tar.gz
(Stored with Git LFS)
Normal file
BIN
clknetsim-0a11a35.tar.gz
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
clknetsim-ef2a7a9.tar.gz
(Stored with Git LFS)
BIN
clknetsim-ef2a7a9.tar.gz
(Stored with Git LFS)
Binary file not shown.
Loading…
Reference in New Issue
Block a user