From bd5c061d02bf3aa00befd119b6873e241b76f9e3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 3 Sep 2024 10:36:31 +0200 Subject: [PATCH 1/4] update to 4.6 --- .gitignore | 6 +++--- chrony-defconfig.patch | 15 +++++++++++++++ chrony.spec | 7 +++++-- sources | 6 +++--- 4 files changed, 26 insertions(+), 8 deletions(-) create mode 100644 chrony-defconfig.patch diff --git a/.gitignore b/.gitignore index ca5815e..c02a352 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,3 @@ -/chrony-4.5.tar.gz -/chrony-4.5-tar-gz-asc.txt -/clknetsim-5d1dc0.tar.gz +/chrony-4.6.tar.gz +/chrony-4.6-tar-gz-asc.txt +/clknetsim-64df92.tar.gz diff --git a/chrony-defconfig.patch b/chrony-defconfig.patch new file mode 100644 index 0000000..92d5669 --- /dev/null +++ b/chrony-defconfig.patch @@ -0,0 +1,15 @@ +diff --git a/examples/chrony.conf.example2 b/examples/chrony.conf.example2 +index 03e7d47b..bf2bbdda 100644 +--- a/examples/chrony.conf.example2 ++++ b/examples/chrony.conf.example2 +@@ -37,8 +37,8 @@ ntsdumpdir /var/lib/chrony + # Insert/delete leap seconds by slewing instead of stepping. + #leapsecmode slew + +-# Set the TAI-UTC offset of the system clock. +-#leapseclist /usr/share/zoneinfo/leap-seconds.list ++# Get TAI-UTC offset and leap seconds from the system tz database. ++#leapsectz right/UTC + + # Specify directory for log files. + logdir /var/log/chrony diff --git a/chrony.spec b/chrony.spec index 51a9c3a..5497f75 100644 --- a/chrony.spec +++ b/chrony.spec @@ -1,5 +1,5 @@ %global _hardened_build 1 -%global clknetsim_ver 5d1dc0 +%global clknetsim_ver 64df92 %bcond_without debug %bcond_without nts @@ -8,7 +8,7 @@ %endif Name: chrony -Version: 4.5 +Version: 4.6 Release: 3%{?dist} Summary: An NTP client/server @@ -25,6 +25,8 @@ Source10: https://gitlab.com/chrony/clknetsim/-/archive/master/clknetsim-% # add distribution-specific bits to DHCP dispatcher Patch1: chrony-nm-dispatcher-dhcp.patch +# revert upstream changes in packaged configuration examples +Patch2: chrony-defconfig.patch BuildRequires: libcap-devel libedit-devel nettle-devel pps-tools-devel BuildRequires: gcc gcc-c++ make bison systemd gnupg2 @@ -59,6 +61,7 @@ service to other computers in the network. %setup -q -n %{name}-%{version}%{?prerelease} -a 10 %{?gitpatch:%patch -P 0 -p1} %patch -P 1 -p1 -b .nm-dispatcher-dhcp +%patch -P 2 -p1 -b .defconfig %{?gitpatch: echo %{version}-%{gitpatch} > version.txt} diff --git a/sources b/sources index 970d87e..d1a6a50 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (chrony-4.5.tar.gz) = 58a449e23186da799064b16ab16f799c1673296984b152b43e87c620d86e272c55365e83439d410fc89e4e0ba0befd7d5c625eac78a6665813b7ea75444f71b5 -SHA512 (chrony-4.5-tar-gz-asc.txt) = 05470e6cc34524fdab494f70cee71d46172b38bdd4acd8173ac79fdec12178239248880db474437690094aae7909002113289ac7f9305130c5e0a1d9364122cb -SHA512 (clknetsim-5d1dc0.tar.gz) = 7d542443d7d9334d900cee821207fab1ee87e57fda6580a9d894f65fb36d265fdc4a72022b4293134d54cdeffba7e84d2f68f732f4b228b84d846d8668b314b2 +SHA512 (chrony-4.6.tar.gz) = 84926b6c9eb90824ab98333412b001b18de9342dacb898d195ee8de52868b1945700a8b161de6b603c231460d290e02df6712c1dcb7f034ba45754b38466c8bd +SHA512 (chrony-4.6-tar-gz-asc.txt) = f735c1d52f1474d2af656e55d3a9abfd33b4ed706b983a393c7e3852b766b5179fe4098425ee7f32bb5db4a2e4170e8c5930cf63d20884be6c0eac338a3d26db +SHA512 (clknetsim-64df92.tar.gz) = 3253e6823b66f23f63203aad0ea22c25cf9d1f5af789722662f4d383111cb2c1816cb23d2fa06171a65b102ae82a5371376becb029d7c9b163b0aee710374c02 From d2eb69700d25cb026e870578bce68b756973d8be Mon Sep 17 00:00:00 2001 From: Miroslav Lichvar Date: Tue, 3 Sep 2024 10:36:45 +0200 Subject: [PATCH 2/4] 4.6-1 --- chrony.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/chrony.spec b/chrony.spec index 5497f75..86f8b04 100644 --- a/chrony.spec +++ b/chrony.spec @@ -9,7 +9,7 @@ Name: chrony Version: 4.6 -Release: 3%{?dist} +Release: 1%{?dist} Summary: An NTP client/server License: GPL-2.0-only @@ -208,6 +208,9 @@ fi %dir %attr(750,chrony,chrony) %{_localstatedir}/log/chrony %changelog +* Tue Sep 03 2024 Miroslav Lichvar 4.6-1 +- update to 4.6 + * Tue Jan 23 2024 Fedora Release Engineering - 4.5-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From ae5528322b4ea8e68b19c33bcce9b6ac2c1fbb4d Mon Sep 17 00:00:00 2001 From: Miroslav Lichvar Date: Tue, 8 Oct 2024 15:39:55 +0200 Subject: [PATCH 3/4] update to 4.6.1 --- .gitignore | 4 ++-- chrony.spec | 2 +- sources | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index c02a352..04fffa0 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,3 @@ -/chrony-4.6.tar.gz -/chrony-4.6-tar-gz-asc.txt +/chrony-4.6.1.tar.gz +/chrony-4.6.1-tar-gz-asc.txt /clknetsim-64df92.tar.gz diff --git a/chrony.spec b/chrony.spec index 86f8b04..a0433f3 100644 --- a/chrony.spec +++ b/chrony.spec @@ -8,7 +8,7 @@ %endif Name: chrony -Version: 4.6 +Version: 4.6.1 Release: 1%{?dist} Summary: An NTP client/server diff --git a/sources b/sources index d1a6a50..a3dab97 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (chrony-4.6.tar.gz) = 84926b6c9eb90824ab98333412b001b18de9342dacb898d195ee8de52868b1945700a8b161de6b603c231460d290e02df6712c1dcb7f034ba45754b38466c8bd -SHA512 (chrony-4.6-tar-gz-asc.txt) = f735c1d52f1474d2af656e55d3a9abfd33b4ed706b983a393c7e3852b766b5179fe4098425ee7f32bb5db4a2e4170e8c5930cf63d20884be6c0eac338a3d26db +SHA512 (chrony-4.6.1.tar.gz) = 646ae08f2587366236796f2399d8ab3eb570979e0d82f5d13f5cec49939054c876cc93dc20c8d38e105fd3500e1720d05a223a15076783cd882d0de43afd9c7e +SHA512 (chrony-4.6.1-tar-gz-asc.txt) = 992b706636bf3a7eb6d502562a4990c9d8e20e5f3011d2cdb2ceb32220e9a1c2bfa6eca767212cee49b811823872602dc33f9e7201a7f9a93cc9c90e81b1db49 SHA512 (clknetsim-64df92.tar.gz) = 3253e6823b66f23f63203aad0ea22c25cf9d1f5af789722662f4d383111cb2c1816cb23d2fa06171a65b102ae82a5371376becb029d7c9b163b0aee710374c02 From 4755f5c7349135a69b2ee22cbce1402034fbb8b3 Mon Sep 17 00:00:00 2001 From: Miroslav Lichvar Date: Tue, 8 Oct 2024 15:48:07 +0200 Subject: [PATCH 4/4] 4.6.1-1 --- chrony.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/chrony.spec b/chrony.spec index a0433f3..69ac7be 100644 --- a/chrony.spec +++ b/chrony.spec @@ -208,6 +208,9 @@ fi %dir %attr(750,chrony,chrony) %{_localstatedir}/log/chrony %changelog +* Tue Oct 08 2024 Miroslav Lichvar 4.6.1-1 +- update to 4.6.1 + * Tue Sep 03 2024 Miroslav Lichvar 4.6-1 - update to 4.6