diff --git a/0001-doc-fix-wrong-name-of-authselectmode-directive.patch b/0001-doc-fix-wrong-name-of-authselectmode-directive.patch new file mode 100644 index 0000000000000000000000000000000000000000..4446ce3e4b3c64251cbc4d1486f9b87373be572b --- /dev/null +++ b/0001-doc-fix-wrong-name-of-authselectmode-directive.patch @@ -0,0 +1,41 @@ +From a6179261a7f2de08f9e0bd9ac2110cbe52a4fbf4 Mon Sep 17 00:00:00 2001 +From: Miroslav Lichvar +Date: Thu, 13 Oct 2022 12:29:29 +0200 +Subject: [PATCH] doc: fix wrong name of authselectmode directive + +--- + doc/chronyc.adoc | 4 ++-- + doc/faq.adoc | 2 +- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/doc/chronyc.adoc b/doc/chronyc.adoc +index 45d8548..9f4e804 100644 +--- a/doc/chronyc.adoc ++++ b/doc/chronyc.adoc +@@ -500,8 +500,8 @@ This column displays the configured selection options of the source. + This column displays the current effective selection options of the source, + which can be different from the configured options due to the authentication + selection mode (configured by the +-<> directive). The symbols are the +-same as in the *COpts* column. ++<> directive). The symbols ++are the same as in the *COpts* column. + *Last*::: + This column displays how long ago was the last measurement of the source made + when the selection was performed. +diff --git a/doc/faq.adoc b/doc/faq.adoc +index 1b299d2..f7da34f 100644 +--- a/doc/faq.adoc ++++ b/doc/faq.adoc +@@ -232,7 +232,7 @@ authenticated servers should be configured as trusted and required to not allow + the unauthenticated servers to override the authenticated servers in the source + selection. Since `chrony` version 4.0, the selection options are enabled in + such a case automatically. This behaviour can be disabled or modified by the +-`authselmode` directive. ++`authselectmode` directive. + + An example of a client configuration limiting the impact of the attacks could + be +-- +2.31.1 + diff --git a/chrony.spec b/chrony.spec index 359ae1f6a56e272a48ce36da9607b2214a246943..39c5bf690f1683cfb462da01807c0ffa179f7d85 100644 --- a/chrony.spec +++ b/chrony.spec @@ -1,4 +1,4 @@ -%define anolis_release 1 +%define anolis_release 2 %global _hardened_build 1 %global clknetsim_ver f00531 %bcond_without debug @@ -15,17 +15,18 @@ Summary: An NTP client/server License: GPLv2 URL: https://chrony.tuxfamily.org -Source0: chrony-4.3.tar.gz +Source0: https://download.tuxfamily.org/chrony/chrony-%{version}.tar.gz Source3: chrony.dhclient # simulator for test suite Source10: https://github.com/mlichvar/clknetsim/archive/%{clknetsim_ver}/clknetsim-%{clknetsim_ver}.tar.gz -%{?gitpatch:Patch0: chrony-%{version}%{?prerelease}-%{gitpatch}.patch.gz} +%{?gitpatch:Patch0: chrony-%{version}-%{gitpatch}.patch.gz} # add distribution-specific bits to DHCP dispatcher Patch1: chrony-nm-dispatcher-dhcp.patch +Patch2: 0001-doc-fix-wrong-name-of-authselectmode-directive.patch BuildRequires: libcap-devel libedit-devel nettle-devel pps-tools-devel -BuildRequires: gcc gcc-c++ make bison systemd gnupg2 +BuildRequires: gcc gcc-c++ make bison systemd gnupg2 asciidoctor %{?with_nts:BuildRequires: gnutls-devel gnutls-utils} %{?with_seccomp:BuildRequires: libseccomp-devel} @@ -58,9 +59,7 @@ BuildArch: noarch The %{name}-doc package contains documentation files for %{name}. %prep -%setup -q -n %{name}-%{version}%{?prerelease} -a 10 -%{?gitpatch:%patch0 -p1} -%patch1 -p1 -b .nm-dispatcher-dhcp +%autosetup -n %{name}-%{version} -p1 -a 10 %{?gitpatch: echo %{version}-%{gitpatch} > version.txt} @@ -151,6 +150,8 @@ touch $RPM_BUILD_ROOT%{_localstatedir}/lib/chrony/{drift,rtc} echo 'chronyd.service' > \ $RPM_BUILD_ROOT%{_prefix}/lib/systemd/ntp-units.d/50-chronyd.list +%generate_compatibility_deps + %check # set random seed to get deterministic results export CLKNETSIM_RANDOM_SEED=24505 @@ -186,6 +187,7 @@ fi %files %{!?_licensedir:%global license %%doc} +%dir %{abidir} %license COPYING %config(noreplace) %{_sysconfdir}/chrony.conf %config(noreplace) %verify(not md5 size mtime) %attr(640,root,chrony) %{_sysconfdir}/chrony.keys @@ -193,7 +195,9 @@ fi %config(noreplace) %{_sysconfdir}/sysconfig/chronyd %{_sysconfdir}/dhcp/dhclient.d/chrony.sh %{_bindir}/chronyc +%{abidir}/chronyc-option.list %{_sbindir}/chronyd +%{abidir}/chronyd-option.list %{_prefix}/lib/NetworkManager %{_prefix}/lib/systemd/ntp-units.d/*.list %{_unitdir}/chrony*.service @@ -207,6 +211,9 @@ fi %doc FAQ NEWS README %changelog +* Tue Oct 25 2022 Shawn Wang - 4.3-2 +- optimise spec file + * Mon Sep 26 2022 mgb01105731 - 4.3-1 - update to 4.3