The package rpms/chrony.git has added or updated architecture specific content in its spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s): https://src.fedoraproject.org/cgit/rpms/chrony.git/commit/?id=5d99ee337f23f4....
Change: +%ifarch aarch64
Thanks.
Full change: ============
commit 8fc47d4a3dc41723aa2d56cf38d3176f62775a47 Author: Miroslav Lichvar mlichvar@redhat.com Date: Wed Jun 11 16:03:44 2025 +0200
4.7-1.fc41
diff --git a/chrony.spec b/chrony.spec index c46edbf..af7a45b 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 mlichvar@redhat.com 4.7-1.fc41 +- update to 4.7 + * Thu May 22 2025 Miroslav Lichvar mlichvar@redhat.com 4.7-0.2.pre1 - add workaround for broken build on aarch64
commit 13fed6608a80e13cdaaf768eb61a16f49e90764d Author: Miroslav Lichvar mlichvar@redhat.com Date: Wed Jun 11 15:46:31 2025 +0200
update to 4.7
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 mlichvar@redhat.com +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
commit 969143e1d65cdfd02a88360aed91f0f6adc6c324 Author: Miroslav Lichvar mlichvar@redhat.com Date: Thu May 22 14:40:43 2025 +0200
4.7-0.2.pre1
diff --git a/chrony.spec b/chrony.spec index 1f023cb..34ffc37 100644 --- a/chrony.spec +++ b/chrony.spec @@ -10,7 +10,7 @@
Name: chrony Version: 4.7 -Release: 0.1.pre1%{?dist} +Release: 0.2.pre1%{?dist} Summary: An NTP client/server
License: GPL-2.0-only @@ -210,6 +210,9 @@ fi %dir %attr(750,chrony,chrony) %{_localstatedir}/log/chrony
%changelog +* Thu May 22 2025 Miroslav Lichvar mlichvar@redhat.com 4.7-0.2.pre1 +- add workaround for broken build on aarch64 + * Wed May 21 2025 Miroslav Lichvar mlichvar@redhat.com 4.7-0.1.pre1 - update to 4.7-pre1
commit 5d99ee337f23f4e09fa4f7f669fa007629176ad9 Author: Miroslav Lichvar mlichvar@redhat.com Date: Thu May 22 14:40:19 2025 +0200
add workaround for broken build on aarch64
diff --git a/chrony.spec b/chrony.spec index 144ff7c..1f023cb 100644 --- a/chrony.spec +++ b/chrony.spec @@ -98,6 +98,10 @@ 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 \
commit 3b9d8b1213423834a2e59e5831b2ee429216961a Author: Miroslav Lichvar mlichvar@redhat.com Date: Wed May 21 14:47:16 2025 +0200
4.7-0.1.pre1
diff --git a/chrony.spec b/chrony.spec index 063693c..144ff7c 100644 --- a/chrony.spec +++ b/chrony.spec @@ -10,7 +10,7 @@
Name: chrony Version: 4.7 -Release: 2%{?dist} +Release: 0.1.pre1%{?dist} Summary: An NTP client/server
License: GPL-2.0-only @@ -206,6 +206,9 @@ fi %dir %attr(750,chrony,chrony) %{_localstatedir}/log/chrony
%changelog +* Wed May 21 2025 Miroslav Lichvar mlichvar@redhat.com 4.7-0.1.pre1 +- update to 4.7-pre1 + * Thu Jan 16 2025 Fedora Release Engineering releng@fedoraproject.org - 4.6.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
commit 8f77afe47e9dd596174ba2ed6a4914efea889189 Author: Miroslav Lichvar mlichvar@redhat.com Date: Wed May 21 14:45:46 2025 +0200
update to 4.7-pre1
diff --git a/.gitignore b/.gitignore index 04fffa0..96c8228 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,3 @@ -/chrony-4.6.1.tar.gz -/chrony-4.6.1-tar-gz-asc.txt -/clknetsim-64df92.tar.gz +/chrony-4.7-pre1-tar-gz-asc.txt +/chrony-4.7-pre1.tar.gz +/clknetsim-d60afc.tar.gz diff --git a/chrony.spec b/chrony.spec index 3a4449a..063693c 100644 --- a/chrony.spec +++ b/chrony.spec @@ -1,5 +1,6 @@ %global _hardened_build 1 -%global clknetsim_ver 64df92 +%global clknetsim_ver d60afc +%global prerelease -pre1 %bcond_without debug %bcond_without nts
@@ -8,7 +9,7 @@ %endif
Name: chrony -Version: 4.6.1 +Version: 4.7 Release: 2%{?dist} Summary: An NTP client/server
@@ -69,8 +70,8 @@ md5sum -c <<-EOF | (! grep -v 'OK$') 6a3178c4670de7de393d9365e2793740 examples/chrony.logrotate c3992e2f985550739cd1cd95f98c9548 examples/chrony.nm-dispatcher.dhcp 4e85d36595727318535af3387411070c examples/chrony.nm-dispatcher.onoffline - c11159b78b89684eca773db6236a9855 examples/chronyd.service - 46fa3e2d42c8eb9c42e71095686c90ed examples/chronyd-restricted.service + 274a44cd51981d6d4d3a44dfc92c94ab examples/chronyd.service + 5ddbb8a8055f587cb6b0b462ca73ea46 examples/chronyd-restricted.service EOF
# don't allow packaging without vendor zone diff --git a/sources b/sources index a3dab97..4931309 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (chrony-4.6.1.tar.gz) = 646ae08f2587366236796f2399d8ab3eb570979e0d82f5d13f5cec49939054c876cc93dc20c8d38e105fd3500e1720d05a223a15076783cd882d0de43afd9c7e -SHA512 (chrony-4.6.1-tar-gz-asc.txt) = 992b706636bf3a7eb6d502562a4990c9d8e20e5f3011d2cdb2ceb32220e9a1c2bfa6eca767212cee49b811823872602dc33f9e7201a7f9a93cc9c90e81b1db49 -SHA512 (clknetsim-64df92.tar.gz) = 3253e6823b66f23f63203aad0ea22c25cf9d1f5af789722662f4d383111cb2c1816cb23d2fa06171a65b102ae82a5371376becb029d7c9b163b0aee710374c02 +SHA512 (chrony-4.7-pre1-tar-gz-asc.txt) = 6180dfede6bc2d11b4b8a9f2708b306faecdf2f6c92552c52c222b8fe09210aa770ec28c9272a1105ea6716e66553e606dbb00077bce061c6faaf65e1ce2bbf9 +SHA512 (chrony-4.7-pre1.tar.gz) = 9f83887d9771a409edd812046a4b1b7e11966d02a99806d48442a52441ee41a7043a75987e29414b04ddb8ff82dedd0b7646135961f6532cc173c52c01c600c1 +SHA512 (clknetsim-d60afc.tar.gz) = 9fff0dc7c089169158926741860c933fa4fc6eda68c100a54ead137b294ec94b0a6fccb0e3f86abfed274b38621e89b49f3e1ad96fd9bed48a79fabcc0d0ba5f
commit 18b59b582787633bac1fe86ec032536c38485d0c Author: Ondrej Mejzlik omejzlik@redhat.com Date: Tue Oct 1 12:13:30 2024 +0200
Update plans and gating
diff --git a/gating.yaml b/gating.yaml index de5c323..1b16508 100644 --- a/gating.yaml +++ b/gating.yaml @@ -4,8 +4,8 @@ product_versions: decision_context: bodhi_update_push_testing subject_type: koji_build rules: - - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/public.functional} - + - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/tier1-public.functional} + #Rawhide --- !Policy product_versions: @@ -13,15 +13,13 @@ product_versions: decision_context: bodhi_update_push_stable subject_type: koji_build rules: - - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/public.functional} - + - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/tier1-public.functional} + #gating rhel --- !Policy product_versions: - rhel-* decision_context: osci_compose_gate rules: - - !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.tier1.functional} - - !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.tedude.validation} - - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/tier1-internal.functional} - - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/public.functional} + - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/tier1-public.functional} + - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/tier1-internal.functional} \ No newline at end of file diff --git a/plans.fmf b/plans.fmf new file mode 100644 index 0000000..661c046 --- /dev/null +++ b/plans.fmf @@ -0,0 +1,47 @@ +/tier1-internal: + plan: + import: + url: https://src.fedoraproject.org/tests/chrony.git + name: /plans/tier1/internal + adjust: + enabled: false + when: distro == centos-stream, fedora + because: They don't have access to internal repos. + +/tier1-public: + plan: + import: + url: https://src.fedoraproject.org/tests/chrony.git + name: /plans/tier1/public + +/tier2-tier3-internal: + plan: + import: + url: https://src.fedoraproject.org/tests/chrony.git + name: /plans/tier2-tier3/internal + adjust: + enabled: false + when: distro == centos-stream, fedora + because: They don't have access to internal repos. + +/tier2-tier3-public: + plan: + import: + url: https://src.fedoraproject.org/tests/chrony.git + name: /plans/tier2-tier3/public + +/others-internal: + plan: + import: + url: https://src.fedoraproject.org/tests/chrony.git + name: /plans/others/internal + adjust: + enabled: false + when: distro == centos-stream, fedora + because: They don't have access to internal repos. + +/others-public: + plan: + import: + url: https://src.fedoraproject.org/tests/chrony.git + name: /plans/others/public diff --git a/plans/public.fmf b/plans/public.fmf deleted file mode 100644 index cff1391..0000000 --- a/plans/public.fmf +++ /dev/null @@ -1,6 +0,0 @@ -summary: Test plan with all Fedora tests -discover: - how: fmf - url: https://src.fedoraproject.org/tests/chrony.git -execute: - how: tmt diff --git a/plans/tier1-internal.fmf b/plans/tier1-internal.fmf deleted file mode 100644 index 9714336..0000000 --- a/plans/tier1-internal.fmf +++ /dev/null @@ -1,12 +0,0 @@ -summary: CI plan, picks internal Tier1 tests, runs in beakerlib. -discover: - - name: rhel - how: fmf - filter: 'tier: 1' - url: git://pkgs.devel.redhat.com/tests/chrony -execute: - how: tmt -adjust: - enabled: false - when: distro == centos-stream, fedora - because: They don't have access to internal repos.
commit 0aae5f7bf1ce7d871adec9ab714299a69b03ad57 Author: Fedora Release Engineering releng@fedoraproject.org Date: Thu Jan 16 13:43:18 2025 +0000
Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
diff --git a/chrony.spec b/chrony.spec index 391bff2..3a4449a 100644 --- a/chrony.spec +++ b/chrony.spec @@ -9,7 +9,7 @@
Name: chrony Version: 4.6.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: An NTP client/server
License: GPL-2.0-only @@ -205,6 +205,9 @@ fi %dir %attr(750,chrony,chrony) %{_localstatedir}/log/chrony
%changelog +* Thu Jan 16 2025 Fedora Release Engineering releng@fedoraproject.org - 4.6.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Tue Oct 08 2024 Miroslav Lichvar mlichvar@redhat.com 4.6.1-1 - update to 4.6.1
arch-excludes@lists.fedoraproject.org
-
githook-noreply＠fedoraproject.org