From 13fed6608a80e13cdaaf768eb61a16f49e90764d Mon Sep 17 00:00:00 2001 From: Miroslav Lichvar Date: Wed, 11 Jun 2025 15:46:31 +0200 Subject: [PATCH 1/5] update to 4.7 --- .gitignore | 6 ++--- chrony-defconfig.patch | 57 ++++++++++++++++++++++++++++++++++++++++++ chrony.spec | 6 +++-- sources | 6 ++--- 4 files changed, 67 insertions(+), 8 deletions(-) create mode 100644 chrony-defconfig.patch diff --git a/.gitignore b/.gitignore index 96c8228..2414820 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,3 @@ -/chrony-4.7-pre1-tar-gz-asc.txt -/chrony-4.7-pre1.tar.gz -/clknetsim-d60afc.tar.gz +/chrony-4.7.tar.gz +/chrony-4.7-tar-gz-asc.txt +/clknetsim-83cf9c.tar.gz diff --git a/chrony-defconfig.patch b/chrony-defconfig.patch new file mode 100644 index 0000000..5145656 --- /dev/null +++ b/chrony-defconfig.patch @@ -0,0 +1,57 @@ +commit 4a8da7e02dc1b882d33cfbb7301d29bdb5ea915f +Author: Miroslav Lichvar +Date: Wed Jun 11 14:53:47 2025 +0200 + + examples: improve chrony.conf examples + + Add a note that three servers is the generally recommended minimum for + an NTP client to be able to detect a falseticker. Mention that the pool + directive uses four servers. Update the links to the pool join page and + list of public servers. + +diff --git a/examples/chrony.conf.example1 b/examples/chrony.conf.example1 +index 5e93ea75..f822813b 100644 +--- a/examples/chrony.conf.example1 ++++ b/examples/chrony.conf.example1 +@@ -1,4 +1,4 @@ +-# Use public NTP servers from the pool.ntp.org project. ++# Use four public NTP servers from the pool.ntp.org project. + pool pool.ntp.org iburst + + # Record the rate at which the system clock gains/losses time. +diff --git a/examples/chrony.conf.example2 b/examples/chrony.conf.example2 +index 03e7d47b..a257f54c 100644 +--- a/examples/chrony.conf.example2 ++++ b/examples/chrony.conf.example2 +@@ -1,5 +1,10 @@ +-# Use public servers from the pool.ntp.org project. +-# Please consider joining the pool (https://www.pool.ntp.org/join.html). ++# Note: The general recommendation for an NTP client is to have at least ++# three NTP servers to be able to detect one server providing incorrect ++# time (falseticker). ++ ++# Use four public NTP servers from the pool.ntp.org project. If this ++# host has a static public IP address, please consider joining the pool: ++# https://www.ntppool.org/join.html + pool pool.ntp.org iburst + + # Record the rate at which the system clock gains/losses time. +diff --git a/examples/chrony.conf.example3 b/examples/chrony.conf.example3 +index 8d895d04..01eaff1c 100644 +--- a/examples/chrony.conf.example3 ++++ b/examples/chrony.conf.example3 +@@ -21,10 +21,12 @@ + ####################################################################### + ### SPECIFY YOUR NTP SERVERS + # Most computers using chrony will send measurement requests to one or +-# more 'NTP servers'. You will probably find that your Internet Service ++# more NTP servers. The general recommendation is to have at least ++# three NTP servers to be able to detect one server providing incorrect ++# time (falseticker). You will probably find that your Internet Service + # Provider or company have one or more NTP servers that you can specify. + # Failing that, there are a lot of public NTP servers. There is a list +-# you can access at http://support.ntp.org/bin/view/Servers/WebHome or ++# you can access at https://support.ntp.org/bin/view/Servers/WebHome or + # you can use servers from the pool.ntp.org project. + + ! server ntp1.example.net iburst diff --git a/chrony.spec b/chrony.spec index 34ffc37..c46edbf 100644 --- a/chrony.spec +++ b/chrony.spec @@ -1,6 +1,5 @@ %global _hardened_build 1 -%global clknetsim_ver d60afc -%global prerelease -pre1 +%global clknetsim_ver 83cf9c %bcond_without debug %bcond_without nts @@ -26,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 default config +Patch2: chrony-defconfig.patch BuildRequires: libcap-devel libedit-devel nettle-devel pps-tools-devel BuildRequires: gcc gcc-c++ make bison systemd gnupg2 @@ -60,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 -R -b .defconfig %{?gitpatch: echo %{version}-%{gitpatch} > version.txt} diff --git a/sources b/sources index 4931309..f03173e 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (chrony-4.7-pre1-tar-gz-asc.txt) = 6180dfede6bc2d11b4b8a9f2708b306faecdf2f6c92552c52c222b8fe09210aa770ec28c9272a1105ea6716e66553e606dbb00077bce061c6faaf65e1ce2bbf9 -SHA512 (chrony-4.7-pre1.tar.gz) = 9f83887d9771a409edd812046a4b1b7e11966d02a99806d48442a52441ee41a7043a75987e29414b04ddb8ff82dedd0b7646135961f6532cc173c52c01c600c1 -SHA512 (clknetsim-d60afc.tar.gz) = 9fff0dc7c089169158926741860c933fa4fc6eda68c100a54ead137b294ec94b0a6fccb0e3f86abfed274b38621e89b49f3e1ad96fd9bed48a79fabcc0d0ba5f +SHA512 (chrony-4.7.tar.gz) = 419594ab8ff0fd42acaf6e4ca1a011d5cf87c8d90ab040e90bb004b43570888329531593f073fb7c5a1093b5754d61c1ae6034d0b86660e4dc37d42ee0f30623 +SHA512 (chrony-4.7-tar-gz-asc.txt) = c2351e6e624f60e82973bddd5cb1d84c90ee5e862d7d24dfc2b7a8f60a6a948f7446c9b7d68c5e72be4afccbd5d8f572141a4e0bde9cfeefc59aebb7e4fc74e1 +SHA512 (clknetsim-83cf9c.tar.gz) = 2ffef556fc1edc3e19d44773ca550e9ac87889951a0162828238eab7dbd0586b46d16708d6a95a56aae8485acade1db5d16f7463362da00cb1d40cff394364e9 From da5c52a83a29b9f7bf313d3c224851f38fa1f234 Mon Sep 17 00:00:00 2001 From: Miroslav Lichvar Date: Wed, 11 Jun 2025 16:03:44 +0200 Subject: [PATCH 2/5] 4.7-1.fc42 --- chrony.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/chrony.spec b/chrony.spec index c46edbf..96c7238 100644 --- a/chrony.spec +++ b/chrony.spec @@ -9,7 +9,7 @@ Name: chrony Version: 4.7 -Release: 0.2.pre1%{?dist} +Release: 1%{?dist} Summary: An NTP client/server License: GPL-2.0-only @@ -212,6 +212,9 @@ fi %dir %attr(750,chrony,chrony) %{_localstatedir}/log/chrony %changelog +* Wed Jun 11 2025 Miroslav Lichvar 4.7-1.fc42 +- update to 4.7 + * Thu May 22 2025 Miroslav Lichvar 4.7-0.2.pre1 - add workaround for broken build on aarch64 From 8861354ad5476917d1ef3af71411f9a24686c604 Mon Sep 17 00:00:00 2001 From: Miroslav Lichvar Date: Wed, 27 Aug 2025 14:47:58 +0200 Subject: [PATCH 3/5] update to 4.8 --- .gitignore | 6 +++--- chrony.spec | 4 ++-- sources | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index 2414820..4d608e1 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,3 @@ -/chrony-4.7.tar.gz -/chrony-4.7-tar-gz-asc.txt -/clknetsim-83cf9c.tar.gz +/chrony-4.8-tar-gz-asc.txt +/chrony-4.8.tar.gz +/clknetsim-6ee99f50dec8.tar.gz diff --git a/chrony.spec b/chrony.spec index 96c7238..0ba94d2 100644 --- a/chrony.spec +++ b/chrony.spec @@ -1,5 +1,5 @@ %global _hardened_build 1 -%global clknetsim_ver 83cf9c +%global clknetsim_ver 6ee99f50dec8 %bcond_without debug %bcond_without nts @@ -8,7 +8,7 @@ %endif Name: chrony -Version: 4.7 +Version: 4.8 Release: 1%{?dist} Summary: An NTP client/server diff --git a/sources b/sources index f03173e..35a8415 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (chrony-4.7.tar.gz) = 419594ab8ff0fd42acaf6e4ca1a011d5cf87c8d90ab040e90bb004b43570888329531593f073fb7c5a1093b5754d61c1ae6034d0b86660e4dc37d42ee0f30623 -SHA512 (chrony-4.7-tar-gz-asc.txt) = c2351e6e624f60e82973bddd5cb1d84c90ee5e862d7d24dfc2b7a8f60a6a948f7446c9b7d68c5e72be4afccbd5d8f572141a4e0bde9cfeefc59aebb7e4fc74e1 -SHA512 (clknetsim-83cf9c.tar.gz) = 2ffef556fc1edc3e19d44773ca550e9ac87889951a0162828238eab7dbd0586b46d16708d6a95a56aae8485acade1db5d16f7463362da00cb1d40cff394364e9 +SHA512 (chrony-4.8-tar-gz-asc.txt) = df7f4e06f74a4b8c9a49e8fe57ea02e0324c5683d036412c32192a09f08e08f33537609cef8df0b4302bfcd63332b3092f33f40c8d02857c93ecea13822b5b47 +SHA512 (chrony-4.8.tar.gz) = 949b796bb34db32a5c1b9e6b53be6a22e51c59f24a316d585b8a52a52ab1f61bdf0378dc58b282bb0ba4fac1f05e1e99fbe37cb4259aa2b359e7bf679c176aab +SHA512 (clknetsim-6ee99f50dec8.tar.gz) = 2621d1c44b84b42fcdf644f236ff90dab9f8a8407a138c8719c53dd9c4f21480db3b4ba598116aa1b9d6bd1fa02fc410d85a43baf55ddf8ad47fc09aba4c4477 From d465978a6460e6f7591a5f0605e4e26b6e535365 Mon Sep 17 00:00:00 2001 From: Miroslav Lichvar Date: Thu, 10 Jul 2025 14:02:11 +0200 Subject: [PATCH 4/5] drop workaround for broken build on aarch64 --- chrony.spec | 4 ---- 1 file changed, 4 deletions(-) diff --git a/chrony.spec b/chrony.spec index 0ba94d2..eb13de0 100644 --- a/chrony.spec +++ b/chrony.spec @@ -100,10 +100,6 @@ rm -f getdate.c mv clknetsim-*-%{clknetsim_ver}* test/simulation/clknetsim %build -%ifarch aarch64 -# workaround for bug #2367978 -CFLAGS="$RPM_OPT_FLAGS -fno-inline" -%endif %configure \ %{?with_debug: --enable-debug} \ --enable-ntp-signd \ From 555cc6f91e686430531f80dc94c5f06e7c724a19 Mon Sep 17 00:00:00 2001 From: Miroslav Lichvar Date: Wed, 27 Aug 2025 14:57:04 +0200 Subject: [PATCH 5/5] 4.8-1 --- chrony.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/chrony.spec b/chrony.spec index eb13de0..357ad8a 100644 --- a/chrony.spec +++ b/chrony.spec @@ -208,6 +208,10 @@ fi %dir %attr(750,chrony,chrony) %{_localstatedir}/log/chrony %changelog +* Wed Aug 27 2025 Miroslav Lichvar 4.8-1 +- update to 4.8 +- drop workaround for broken build on aarch64 + * Wed Jun 11 2025 Miroslav Lichvar 4.7-1.fc42 - update to 4.7