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=c3c3f0c2dd19c2....
Change: -%ifarch s390x
Thanks.
Full change: ============
commit cdc407899bc7fc721c211921a3595958357971ba Author: Miroslav Lichvar mlichvar@redhat.com Date: Thu May 13 17:09:26 2021 +0200
4.1-1
diff --git a/chrony.spec b/chrony.spec index ac3d46c..174cd8d 100644 --- a/chrony.spec +++ b/chrony.spec @@ -5,7 +5,7 @@
Name: chrony Version: 4.1 -Release: 0.1.pre1%{?dist} +Release: 1%{?dist} Summary: An NTP client/server
License: GPLv2 @@ -198,6 +198,9 @@ fi %dir %attr(750,chrony,chrony) %{_localstatedir}/log/chrony
%changelog +* Thu May 13 2021 Miroslav Lichvar mlichvar@redhat.com 4.1-1 +- update to 4.1 + * Thu Apr 22 2021 Miroslav Lichvar mlichvar@redhat.com 4.1-0.1.pre1 - update to 4.1-pre1 - rework NM-dispatcher/dhclient detection
commit 7065ea6b2d7ce4f60a7fce760eb63370dac0b604 Author: Miroslav Lichvar mlichvar@redhat.com Date: Thu May 13 16:02:08 2021 +0200
update to 4.1
diff --git a/.gitignore b/.gitignore index c713489..76dba0d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,3 @@ -/chrony-4.1-pre1.tar.gz -/chrony-4.1-pre1-tar-gz-asc.txt +/chrony-4.1.tar.gz +/chrony-4.1-tar-gz-asc.txt /clknetsim-f89702.tar.gz diff --git a/chrony.spec b/chrony.spec index c0806cd..ac3d46c 100644 --- a/chrony.spec +++ b/chrony.spec @@ -1,5 +1,4 @@ %global _hardened_build 1 -%global prerelease -pre1 %global clknetsim_ver f89702 %bcond_without debug %bcond_without nts @@ -13,7 +12,7 @@ License: GPLv2 URL: https://chrony.tuxfamily.org Source0: https://download.tuxfamily.org/chrony/chrony-%%7Bversion%7D%%7B?prerelease%7... Source1: https://download.tuxfamily.org/chrony/chrony-%%7Bversion%7D%%7B?prerelease%7... -Source2: https://chrony.tuxfamily.org/gpgkey-8B1F4A9ADA73D401E3085A0B5FF06F29BA1E013B... +Source2: https://chrony.tuxfamily.org/gpgkey-8F375C7E8D0EE125A3D3BD51537E2B76F7680DAC... Source3: chrony.dhclient # simulator for test suite Source10: https://github.com/mlichvar/clknetsim/archive/%%7Bclknetsim_ver%7D/clknetsim... diff --git a/gpgkey-8B1F4A9ADA73D401E3085A0B5FF06F29BA1E013B.asc b/gpgkey-8B1F4A9ADA73D401E3085A0B5FF06F29BA1E013B.asc deleted file mode 100644 index ce59e23..0000000 --- a/gpgkey-8B1F4A9ADA73D401E3085A0B5FF06F29BA1E013B.asc +++ /dev/null @@ -1,29 +0,0 @@ ------BEGIN PGP PUBLIC KEY BLOCK----- - -mQGiBEYLz1cRBADYNM9gn8g1Bw8t2Zj+HT9hbSHVs9ofSdxqdLEVAbNySeLftOlZ -ba+4CU+lIfC/6XHZ0r+UvTBVK+r/KLjFxWz5cWGGFVUrXOSjo2PDXDqWrs9VALtT -zH8sr0/7qJCByF9fnryPO1fmMKlh9R0+X5cF7vZjlWbM+BV/yxARi4lb4wCgpf9M -7uo9hJUcMyy2zJSdzjUPkcMEAMVyDpw7kwTjnWzwaOHnPlT/x31OkGAO2sZgzRGu -VE1zGN4Ruv36GS7hNPndtpTGZuPtmLrE2wJS2exer4kTYANfiGj/JDTiuGQYF2jp -9cN3zJL7e7Bik004TZVUGg3HzpuWWc/uiTXgrZxIDz4uPxjy5kdDfbhUziNsy9Uj -igOZBADQ9T6XYQBTfRmGUkl7hEeAeu+WfEGDVlHP+EpMtk/uANUqYef5xUG4RomE -EyjRlrEXwG7Ly2HhH3UADBuPjkP68AGN8WslbCNx5Na+nZr6r1sT1+Z3OdUDprpY -PQxCu5WWYsYgzroO/JEA2d3pYgaaHEAhyZxau1UtW4hpAn8svbQmTWlyb3NsYXYg -TGljaHZhciA8bWxpY2h2YXJAcmVkaGF0LmNvbT6IZgQTEQIAJgIbAwYLCQgHAwIE -FQIIAwQWAgMBAh4BAheABQJbt20rBQkb2aQNAAoJEF/wbym6HgE7MOkAnjdG94MF -4XAVLnzCVbrJb/Ishao4AJ9o1EL9U/at8KzvfZdpPyNrmoeq+bkCDQRGC89XEAgA -medsNk8FIYdzJYyP2eaIYKMTpSCFgTKE1EHdiRaX5n3oo9o26+vfA1NfIwKM8G54 -3Ddr1yl2PRmQermHMQahMMsXcehQXjsJoZXTglJq6kw5Xb1V1K6SyXQv/sLmWGxw -T91T+0I+9g+UqMeqR8B2hj950BbfWn6Pu5CRk2voTsYEU2ecejKOWOOrbUnD/5wy -mkSD/1g+T7bgGOHMrSgYWH3Fk7dWNKpGBtQn3cL7fKy+cn4koDW1L3ebxg4zWpFo -l51m3u8DXc9lqUjg9AoqJH1bc9eQPQvJKxd5syU2pkgtHhT2rlSqpRtsKsgRNfBC -qBbK9gtEM3DRUD+EbbEZgwADBQf8CTSksVEUs5svpQlldZERwViUwwVb4TMszKKq -nEti6zu6oMkIDreGzSISDsrWq1WxzUv9IYumwanzkgTpVVfFPxK7samtol8Lol5V -r3Zbil3Q0IGJ9thhitMHRSU3ClhVRZF5QF/MhSzD1j0cXK4Ls0np5DePT3H4tItZ -+OcEhZcDb8k2DMcJW/REuiisWOElwIDM0o0kZyQiy+5QRfE2xancu3n8+wGtwc0N -2Yp/elmIigreu0xuK7HaFOiScUYv00BJa/ZEO2aOkRuiKkdp3oxtz3MIdDYyGbI6 -mL4h+X8079i95yu+L2tUJGHeN5u+X0Hsg9sE6TpVEggQEI30YYhPBBgRAgAPAhsM -BQJbt22dBQkb2aZBAAoJEF/wbym6HgE7rJYAn1gpOMPrFyjezpaYsloAwjSZhu8t -AKCTJlsZByvaTTXjUMyQy2z7tjnVpw== -=4XBU ------END PGP PUBLIC KEY BLOCK----- diff --git a/gpgkey-8F375C7E8D0EE125A3D3BD51537E2B76F7680DAC.asc b/gpgkey-8F375C7E8D0EE125A3D3BD51537E2B76F7680DAC.asc new file mode 100644 index 0000000..604babe --- /dev/null +++ b/gpgkey-8F375C7E8D0EE125A3D3BD51537E2B76F7680DAC.asc @@ -0,0 +1,54 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- + +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 +bcAu2uXfRrQxpaqcOg== +=/wbD +-----END PGP PUBLIC KEY BLOCK----- diff --git a/sources b/sources index 94d11c5..14c91b8 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (chrony-4.1-pre1.tar.gz) = 03e28e6651d6aa3c99333b94ee503843c3a69b8c8366bf647c41a3a9e34e987c440e289ec16e5c62c2a7405271bddc533efbd59d6c6ab43712c8908dfb86322e -SHA512 (chrony-4.1-pre1-tar-gz-asc.txt) = 8eb695c3f85f90d02b22b1202c8766347289a6da1d0658a3d89eed90202799bcfc647b96e5f931fb862011e85feed5f4914b39e45a3e20f01827509fe271a2d7 +SHA512 (chrony-4.1.tar.gz) = 5e283d6a56e6852606c681a7c29c5786b102d584178cbd7033ebbc95a8e95533605631363b850a3087cca438a5878db7a317f120aab2fd856487d02fccfbcb1f +SHA512 (chrony-4.1-tar-gz-asc.txt) = 82faf9171d782c18224d2d44b340994b0ddab141e88cc803dea83d0ffbb6468bc51e8b11c8dd9bd327220cae04f7d789b58ab23141a2bdf038ce628f9adeb57a SHA512 (clknetsim-f89702.tar.gz) = d88d37472b99e4cc044b6c864dfcf5ebb06ef9e2e009ebce06defa07cd46961220707a69c6ec93e35623403a5b4e0683b78b388bf95bfff470fa771d69579c65
commit 3353132ff79d04fa162207054fda37f17ec120d8 Author: Miroslav Lichvar mlichvar@redhat.com Date: Thu Apr 22 14:53:52 2021 +0200
4.1-0.1.pre1
diff --git a/chrony.spec b/chrony.spec index 1ad5da2..c0806cd 100644 --- a/chrony.spec +++ b/chrony.spec @@ -6,7 +6,7 @@
Name: chrony Version: 4.1 -Release: 4%{?dist} +Release: 0.1.pre1%{?dist} Summary: An NTP client/server
License: GPLv2 @@ -199,6 +199,11 @@ fi %dir %attr(750,chrony,chrony) %{_localstatedir}/log/chrony
%changelog +* Thu Apr 22 2021 Miroslav Lichvar mlichvar@redhat.com 4.1-0.1.pre1 +- update to 4.1-pre1 +- rework NM-dispatcher/dhclient detection +- enable LTO on s390x + * Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek zbyszek@in.waw.pl - 4.0-4 - Rebuilt for updated systemd-rpm-macros See https://pagure.io/fesco/issue/2583.
commit f9f7cf22a938e5ba0d2907742bae09f993609e98 Author: Miroslav Lichvar mlichvar@redhat.com Date: Thu Apr 22 13:06:22 2021 +0200
update to 4.1-pre1
diff --git a/.gitignore b/.gitignore index d53e4c7..c713489 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,3 @@ -/chrony-4.0.tar.gz -/chrony-4.0-tar-gz-asc.txt -/clknetsim-1ca4a9.tar.gz +/chrony-4.1-pre1.tar.gz +/chrony-4.1-pre1-tar-gz-asc.txt +/clknetsim-f89702.tar.gz diff --git a/chrony.spec b/chrony.spec index 2fc3452..1ad5da2 100644 --- a/chrony.spec +++ b/chrony.spec @@ -1,10 +1,11 @@ %global _hardened_build 1 -%global clknetsim_ver 1ca4a9 +%global prerelease -pre1 +%global clknetsim_ver f89702 %bcond_without debug %bcond_without nts
Name: chrony -Version: 4.0 +Version: 4.1 Release: 4%{?dist} Summary: An NTP client/server
diff --git a/sources b/sources index 3a81e73..94d11c5 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (chrony-4.0.tar.gz) = a1c11a386c43f495910f7f2e9b5fbb1652c3631471d182b9b8203dfef98611d11535ad547a879856551263aed0ae2e30e4135b8ed89553684706166bc1c725c9 -SHA512 (chrony-4.0-tar-gz-asc.txt) = c3156d91f4fdb6f9e2fdbc83b1399afb0ecdfa9b7bc92648c5bce477c3f0f921d2a13aa21ac6c281f18b008c60f08e3db6d82b642b646f064aea1dbe19295c4c -SHA512 (clknetsim-1ca4a9.tar.gz) = 23c74ad9eadd3e09209bf0826901fefb1d11d210a882e15e83f0ef5903ea3d3fdce6859ac2cd9021485aef9d6771a609aa339af9ce4448522605c88b512c8943 +SHA512 (chrony-4.1-pre1.tar.gz) = 03e28e6651d6aa3c99333b94ee503843c3a69b8c8366bf647c41a3a9e34e987c440e289ec16e5c62c2a7405271bddc533efbd59d6c6ab43712c8908dfb86322e +SHA512 (chrony-4.1-pre1-tar-gz-asc.txt) = 8eb695c3f85f90d02b22b1202c8766347289a6da1d0658a3d89eed90202799bcfc647b96e5f931fb862011e85feed5f4914b39e45a3e20f01827509fe271a2d7 +SHA512 (clknetsim-f89702.tar.gz) = d88d37472b99e4cc044b6c864dfcf5ebb06ef9e2e009ebce06defa07cd46961220707a69c6ec93e35623403a5b4e0683b78b388bf95bfff470fa771d69579c65
commit ba7e409249ade51a2686295e03bf5b068665fe0f Author: Miroslav Lichvar mlichvar@redhat.com Date: Thu Apr 22 12:32:13 2021 +0200
rework NM-dispatcher/dhclient detection
The packaged NM dispatcher and dhclient scripts provide the same functionality. Only one should be active depending on the system configuration.
Instead of guessing in the NM dispatcher script whether the dhclient script is executed, check in the dhclient script whether it is called from a NM dispatcher script (the 11-dhclient script included in the dhcp-client package).
This is simpler and it removes dependency on the 11-dhclient script.
diff --git a/chrony-nm-dispatcher-dhcp.patch b/chrony-nm-dispatcher-dhcp.patch index bdd199d..23087d6 100644 --- a/chrony-nm-dispatcher-dhcp.patch +++ b/chrony-nm-dispatcher-dhcp.patch @@ -1,38 +1,17 @@ -From 1b29e43133d992e735ffbf87d79f008994479036 Mon Sep 17 00:00:00 2001 From: Robert Fairley rfairley@redhat.com Date: Wed, 17 Jun 2020 10:14:19 -0400 -Subject: [PATCH] examples/nm-dispatcher.dhcp: use sysconfig, detect dhclient +Subject: [PATCH] examples/nm-dispatcher.dhcp: use sysconfig
Use the PEERNTP and NTPSERVERARGS environment variables from -/etc/sysconfig/network{-scripts}. Detect a dhclient install to avoid a -redundant operation with the 11-dhclient NM dispatcher in the -dhcp-client package. +/etc/sysconfig/network{-scripts}.
Co-Authored-By: Christian Glombek cglombek@redhat.com ---- - examples/chrony.nm-dispatcher.dhcp | 21 +++++++++++++++++++-- - 1 file changed, 19 insertions(+), 2 deletions(-)
diff --git a/examples/chrony.nm-dispatcher.dhcp b/examples/chrony.nm-dispatcher.dhcp index 6ea4c37..a6ad35a 100644 --- a/examples/chrony.nm-dispatcher.dhcp +++ b/examples/chrony.nm-dispatcher.dhcp -@@ -6,21 +6,39 @@ - - export LC_ALL=C - -+# If a dhclient installation is present, avoid a redundant operation -+# in case dhclient handles NTP server config through its own chrony config script, -+# exec'ed by NetworkManager's 11-dhclient dispatcher script. -+# In RHCOS, 11-dhclient is excluded and not shipped with base image. -+[ -e /usr/sbin/dhclient ] && \ -+ [ -e /etc/dhcp/dhclient.d/chrony.sh ] && \ -+ [ -e /etc/NetworkManager/dispatcher.d/11-dhclient -o \ -+ -e /usr/lib/NetworkManager/dispatcher.d/11-dhclient ] && \ -+ exit 0 -+ - interface=$1 - action=$2 +@@ -6,16 +6,24 @@
chronyc=/usr/bin/chronyc default_server_options=iburst diff --git a/chrony.dhclient b/chrony.dhclient index 92fa4fa..3fe9e92 100644 --- a/chrony.dhclient +++ b/chrony.dhclient @@ -4,6 +4,9 @@ CHRONY_SOURCEDIR=/run/chrony-dhcp SERVERFILE=$CHRONY_SOURCEDIR/$interface.sources
chrony_config() { + # Disable modifications if called from a NM dispatcher script + [ -n "$NM_DISPATCHER_ACTION" ] && return 0 + rm -f "$SERVERFILE" if [ "$PEERNTP" != "no" ]; then mkdir -p $CHRONY_SOURCEDIR @@ -15,6 +18,8 @@ chrony_config() { }
chrony_restore() { + [ -n "$NM_DISPATCHER_ACTION" ] && return 0 + if [ -f "$SERVERFILE" ]; then rm -f "$SERVERFILE" /usr/bin/chronyc reload sources > /dev/null 2>&1 || : diff --git a/chrony.spec b/chrony.spec index e26f14e..2fc3452 100644 --- a/chrony.spec +++ b/chrony.spec @@ -63,7 +63,7 @@ md5sum -c <<-EOF | (! grep -v 'OK$') 2d01b94bc1a7b7fb70cbee831488d121 examples/chrony.conf.example2 96999221eeef476bd49fe97b97503126 examples/chrony.keys.example 6a3178c4670de7de393d9365e2793740 examples/chrony.logrotate - 2da011da89727ef009799502d84e7cd0 examples/chrony.nm-dispatcher.dhcp + a7054c9352c07384bd7ea0477e6e8a8c examples/chrony.nm-dispatcher.dhcp 8f5a98fcb400a482d355b929d04b5518 examples/chrony.nm-dispatcher.onoffline 32c34c995c59fd1c3ad1616d063ae4a0 examples/chronyd.service EOF
commit c3c3f0c2dd19c2842afb2c915658bf8e55b27ed5 Author: Miroslav Lichvar mlichvar@redhat.com Date: Thu Mar 25 15:37:59 2021 +0100
enable LTO on s390x
Update clknetsim to fix test failure on s390x with enabled LTO.
diff --git a/.gitignore b/.gitignore index e4a6ac3..d53e4c7 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,3 @@ /chrony-4.0.tar.gz /chrony-4.0-tar-gz-asc.txt -/clknetsim-c4ccc2.tar.gz +/clknetsim-1ca4a9.tar.gz diff --git a/chrony.spec b/chrony.spec index ef092b6..e26f14e 100644 --- a/chrony.spec +++ b/chrony.spec @@ -1,5 +1,5 @@ %global _hardened_build 1 -%global clknetsim_ver c4ccc2 +%global clknetsim_ver 1ca4a9 %bcond_without debug %bcond_without nts
@@ -90,11 +90,6 @@ rm -f getdate.c mv clknetsim-%{clknetsim_ver}* test/simulation/clknetsim
%build -# This package fails its testsuite when LTO is enabled on s390x -# Disable LTO for now -%ifarch s390x -%define _lto_cflags %{nil} -%endif %configure \ %{?with_debug: --enable-debug} \ --enable-ntp-signd \ diff --git a/sources b/sources index 96eabab..3a81e73 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ SHA512 (chrony-4.0.tar.gz) = a1c11a386c43f495910f7f2e9b5fbb1652c3631471d182b9b8203dfef98611d11535ad547a879856551263aed0ae2e30e4135b8ed89553684706166bc1c725c9 SHA512 (chrony-4.0-tar-gz-asc.txt) = c3156d91f4fdb6f9e2fdbc83b1399afb0ecdfa9b7bc92648c5bce477c3f0f921d2a13aa21ac6c281f18b008c60f08e3db6d82b642b646f064aea1dbe19295c4c -SHA512 (clknetsim-c4ccc2.tar.gz) = d2f71b2036e33ee92cd3590079dac04bc57bf2e9909f11e9ba66cd61c9946e92d2ebbdfd03c359cf39c6c8c07b28557d35fee3cb57eec75f5b1201858aa1d701 +SHA512 (clknetsim-1ca4a9.tar.gz) = 23c74ad9eadd3e09209bf0826901fefb1d11d210a882e15e83f0ef5903ea3d3fdce6859ac2cd9021485aef9d6771a609aa339af9ce4448522605c88b512c8943
commit b1f5ca15234e40cdeffd79563c184142864db8a8 Author: Zbigniew Jędrzejewski-Szmek zbyszek@in.waw.pl Date: Tue Mar 2 16:14:05 2021 +0100
Rebuilt for updated systemd-rpm-macros
See https://pagure.io/fesco/issue/2583.
diff --git a/chrony.spec b/chrony.spec index 0492642..ef092b6 100644 --- a/chrony.spec +++ b/chrony.spec @@ -5,7 +5,7 @@
Name: chrony Version: 4.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: An NTP client/server
License: GPLv2 @@ -203,6 +203,10 @@ fi %dir %attr(750,chrony,chrony) %{_localstatedir}/log/chrony
%changelog +* Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek zbyszek@in.waw.pl - 4.0-4 +- Rebuilt for updated systemd-rpm-macros + See https://pagure.io/fesco/issue/2583. + * Tue Feb 02 2021 Miroslav Lichvar mlichvar@redhat.com 4.0-3 - update NM DHCP dispatcher script
commit ed6f12d1c1f5c3419fcbd28c3c03e54bcec4d8bd Author: Miroslav Lichvar mlichvar@redhat.com Date: Tue Feb 2 10:47:17 2021 +0100
4.0-3
diff --git a/chrony.spec b/chrony.spec index cd9c222..0492642 100644 --- a/chrony.spec +++ b/chrony.spec @@ -5,7 +5,7 @@
Name: chrony Version: 4.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: An NTP client/server
License: GPLv2 @@ -203,8 +203,13 @@ fi %dir %attr(750,chrony,chrony) %{_localstatedir}/log/chrony
%changelog +* Tue Feb 02 2021 Miroslav Lichvar mlichvar@redhat.com 4.0-3 +- update NM DHCP dispatcher script + * Tue Jan 26 2021 Fedora Release Engineering releng@fedoraproject.org - 4.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild +- Add BuildRequires: make +- drop dnssrv service and timer
* Wed Oct 07 2020 Miroslav Lichvar mlichvar@redhat.com 4.0-1 - update to 4.0
commit 7f89c4666b798ba0736359100595702698cf0b93 Author: Christian Glombek cglombek@redhat.com Date: Mon Feb 1 16:32:54 2021 +0000
update NM DHCP dispatcher script
Updates the patch with downstream changes from https://github.com/openshift/os/pull/486 and https://github.com/openshift/os/pull/494
diff --git a/chrony-nm-dispatcher-dhcp.patch b/chrony-nm-dispatcher-dhcp.patch index afb56cf..bdd199d 100644 --- a/chrony-nm-dispatcher-dhcp.patch +++ b/chrony-nm-dispatcher-dhcp.patch @@ -1,4 +1,4 @@ -From e0c6457fd42252f88ec60d16582b7b6e6fb04f41 Mon Sep 17 00:00:00 2001 +From 1b29e43133d992e735ffbf87d79f008994479036 Mon Sep 17 00:00:00 2001 From: Robert Fairley rfairley@redhat.com Date: Wed, 17 Jun 2020 10:14:19 -0400 Subject: [PATCH] examples/nm-dispatcher.dhcp: use sysconfig, detect dhclient @@ -7,27 +7,39 @@ Use the PEERNTP and NTPSERVERARGS environment variables from /etc/sysconfig/network{-scripts}. Detect a dhclient install to avoid a redundant operation with the 11-dhclient NM dispatcher in the dhcp-client package. + +Co-Authored-By: Christian Glombek cglombek@redhat.com --- - examples/chrony.nm-dispatcher.dhcp | 15 ++++++++++++++- - 1 file changed, 14 insertions(+), 1 deletion(-) + examples/chrony.nm-dispatcher.dhcp | 21 +++++++++++++++++++-- + 1 file changed, 19 insertions(+), 2 deletions(-)
diff --git a/examples/chrony.nm-dispatcher.dhcp b/examples/chrony.nm-dispatcher.dhcp -index 6ea4c37..878e72f 100644 +index 6ea4c37..a6ad35a 100644 --- a/examples/chrony.nm-dispatcher.dhcp +++ b/examples/chrony.nm-dispatcher.dhcp -@@ -6,6 +6,11 @@ +@@ -6,21 +6,39 @@
export LC_ALL=C
+# If a dhclient installation is present, avoid a redundant operation -+# with dhclient which handles NTP server config through its own -+# NetworkManager dispatcher script 11-dhclient. -+[ -e /usr/sbin/dhclient ] && exit 0 ++# in case dhclient handles NTP server config through its own chrony config script, ++# exec'ed by NetworkManager's 11-dhclient dispatcher script. ++# In RHCOS, 11-dhclient is excluded and not shipped with base image. ++[ -e /usr/sbin/dhclient ] && \ ++ [ -e /etc/dhcp/dhclient.d/chrony.sh ] && \ ++ [ -e /etc/NetworkManager/dispatcher.d/11-dhclient -o \ ++ -e /usr/lib/NetworkManager/dispatcher.d/11-dhclient ] && \ ++ exit 0 + interface=$1 action=$2
-@@ -17,10 +22,18 @@ dhcp_server_file=$server_dir/$interface.sources + chronyc=/usr/bin/chronyc + default_server_options=iburst +-server_dir=/var/run/chrony-dhcp ++server_dir=/run/chrony-dhcp + + dhcp_server_file=$server_dir/$interface.sources # DHCP4_NTP_SERVERS is passed from DHCP options by NetworkManager. nm_dhcp_servers=$DHCP4_NTP_SERVERS
@@ -48,17 +60,5 @@ index 6ea4c37..878e72f 100644 $chronyc reload sources > /dev/null 2>&1 || : } -- -2.26.2 +2.29.2
-diff -up chrony-4.0-pre3/examples/chrony.nm-dispatcher.dhcp.nm-dispatcher-dhcp chrony-4.0-pre3/examples/chrony.nm-dispatcher.dhcp ---- chrony-4.0-pre3/examples/chrony.nm-dispatcher.dhcp.nm-dispatcher-dhcp 2020-08-26 09:27:47.076282468 +0200 -+++ chrony-4.0-pre3/examples/chrony.nm-dispatcher.dhcp 2020-08-26 09:27:51.847297974 +0200 -@@ -16,7 +16,7 @@ action=$2 - - chronyc=/usr/bin/chronyc - default_server_options=iburst --server_dir=/var/run/chrony-dhcp -+server_dir=/run/chrony-dhcp - - dhcp_server_file=$server_dir/$interface.sources - # DHCP4_NTP_SERVERS is passed from DHCP options by NetworkManager. diff --git a/chrony.spec b/chrony.spec index 3b1049d..cd9c222 100644 --- a/chrony.spec +++ b/chrony.spec @@ -63,7 +63,7 @@ md5sum -c <<-EOF | (! grep -v 'OK$') 2d01b94bc1a7b7fb70cbee831488d121 examples/chrony.conf.example2 96999221eeef476bd49fe97b97503126 examples/chrony.keys.example 6a3178c4670de7de393d9365e2793740 examples/chrony.logrotate - e051740bb4b21e2e12e6dc63f5195c48 examples/chrony.nm-dispatcher.dhcp + 2da011da89727ef009799502d84e7cd0 examples/chrony.nm-dispatcher.dhcp 8f5a98fcb400a482d355b929d04b5518 examples/chrony.nm-dispatcher.onoffline 32c34c995c59fd1c3ad1616d063ae4a0 examples/chronyd.service EOF
commit a565083d9b17fb0f90a5ec642e285fcd53f78238 Author: Miroslav Lichvar mlichvar@redhat.com Date: Tue Jan 12 11:23:15 2021 +0100
fix spec indentation
diff --git a/chrony.spec b/chrony.spec index dc39db6..3b1049d 100644 --- a/chrony.spec +++ b/chrony.spec @@ -26,8 +26,7 @@ BuildRequires: libcap-devel libedit-devel nettle-devel pps-tools-devel %ifarch %{ix86} x86_64 %{arm} aarch64 mipsel mips64el ppc64 ppc64le s390 s390x BuildRequires: libseccomp-devel %endif -BuildRequires: gcc gcc-c++ bison systemd gnupg2 net-tools -BuildRequires: make +BuildRequires: gcc gcc-c++ make bison systemd gnupg2 net-tools %{?with_nts:BuildRequires: gnutls-devel gnutls-utils}
Requires(pre): shadow-utils
commit 65b8f20ff63288427e5425a3981e895dc88b7a46 Author: Fedora Release Engineering releng@fedoraproject.org Date: Tue Jan 26 01:57:12 2021 +0000
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
Signed-off-by: Fedora Release Engineering releng@fedoraproject.org
diff --git a/chrony.spec b/chrony.spec index 472e074..dc39db6 100644 --- a/chrony.spec +++ b/chrony.spec @@ -5,7 +5,7 @@
Name: chrony Version: 4.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: An NTP client/server
License: GPLv2 @@ -204,6 +204,9 @@ fi %dir %attr(750,chrony,chrony) %{_localstatedir}/log/chrony
%changelog +* Tue Jan 26 2021 Fedora Release Engineering releng@fedoraproject.org - 4.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Wed Oct 07 2020 Miroslav Lichvar mlichvar@redhat.com 4.0-1 - update to 4.0 - update directory permissions to follow upstream
commit dbe22151e263e687a8c717b83f8bddb7921f40f4 Author: Tom Stellard tstellar@redhat.com Date: Sat Dec 19 05:13:45 2020 +0000
Add BuildRequires: make
https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot
diff --git a/chrony.spec b/chrony.spec index 15f5680..472e074 100644 --- a/chrony.spec +++ b/chrony.spec @@ -27,6 +27,7 @@ BuildRequires: libcap-devel libedit-devel nettle-devel pps-tools-devel BuildRequires: libseccomp-devel %endif BuildRequires: gcc gcc-c++ bison systemd gnupg2 net-tools +BuildRequires: make %{?with_nts:BuildRequires: gnutls-devel gnutls-utils}
Requires(pre): shadow-utils
commit 0fb07c271c53829807e884a0a9c15e2cc53f954d Author: Miroslav Lichvar mlichvar@redhat.com Date: Wed Nov 4 15:51:41 2020 +0100
drop dnssrv service and timer
They no longer work as they rely on the chrony-helper script, which was dropped in 4.0-1.
diff --git a/chrony-dnssrv@.service b/chrony-dnssrv@.service deleted file mode 100644 index 139ed28..0000000 --- a/chrony-dnssrv@.service +++ /dev/null @@ -1,8 +0,0 @@ -[Unit] -Description=DNS SRV lookup of %I for chrony -After=chronyd.service network-online.target -Wants=network-online.target - -[Service] -Type=oneshot -ExecStart=/usr/libexec/chrony-helper update-dnssrv-servers %I diff --git a/chrony-dnssrv@.timer b/chrony-dnssrv@.timer deleted file mode 100644 index 8495e01..0000000 --- a/chrony-dnssrv@.timer +++ /dev/null @@ -1,9 +0,0 @@ -[Unit] -Description=Periodic DNS SRV lookup of %I for chrony - -[Timer] -OnActiveSec=0 -OnUnitInactiveSec=1h - -[Install] -WantedBy=timers.target diff --git a/chrony.spec b/chrony.spec index 3e42b2c..15f5680 100644 --- a/chrony.spec +++ b/chrony.spec @@ -14,8 +14,6 @@ Source0: https://download.tuxfamily.org/chrony/chrony-%%7Bversion%7D%%7B?prerel Source1: https://download.tuxfamily.org/chrony/chrony-%%7Bversion%7D%%7B?prerelease%7... Source2: https://chrony.tuxfamily.org/gpgkey-8B1F4A9ADA73D401E3085A0B5FF06F29BA1E013B... Source3: chrony.dhclient -Source5: chrony-dnssrv@.service -Source6: chrony-dnssrv@.timer # simulator for test suite Source10: https://github.com/mlichvar/clknetsim/archive/%%7Bclknetsim_ver%7D/clknetsim... %{?gitpatch:Patch0: chrony-%{version}%{?prerelease}-%{gitpatch}.patch.gz} @@ -140,8 +138,6 @@ install -m 755 -p examples/chrony.nm-dispatcher.dhcp \ $RPM_BUILD_ROOT%{_prefix}/lib/NetworkManager/dispatcher.d/20-chrony-dhcp install -m 644 -p examples/chrony-wait.service \ $RPM_BUILD_ROOT%{_unitdir}/chrony-wait.service -install -m 644 -p %{SOURCE5} $RPM_BUILD_ROOT%{_unitdir}/chrony-dnssrv@.service -install -m 644 -p %{SOURCE6} $RPM_BUILD_ROOT%{_unitdir}/chrony-dnssrv@.timer
cat > $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/chronyd <<EOF # Command-line options for chronyd @@ -200,7 +196,6 @@ fi %{_prefix}/lib/NetworkManager %{_prefix}/lib/systemd/ntp-units.d/*.list %{_unitdir}/chrony*.service -%{_unitdir}/chrony*.timer %{_mandir}/man[158]/%{name}*.[158]* %dir %attr(750,chrony,chrony) %{_localstatedir}/lib/chrony %ghost %attr(-,chrony,chrony) %{_localstatedir}/lib/chrony/drift
arch-excludes@lists.fedoraproject.org