diff --git a/chrony-4.2.tar.gz b/chrony-4.2.tar.gz deleted file mode 100644 index 42b76edbc3468f0571bd78a81e4c04986635247b..0000000000000000000000000000000000000000 Binary files a/chrony-4.2.tar.gz and /dev/null differ diff --git a/chrony-4.3.tar.gz b/chrony-4.3.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..900caa9a03b8c1c59b64e198fced6afe50af95df Binary files /dev/null and b/chrony-4.3.tar.gz differ diff --git a/0001-solve-the-compilation-error.patch b/chrony-nm-dispatcher-dhcp.patch similarity index 44% rename from 0001-solve-the-compilation-error.patch rename to chrony-nm-dispatcher-dhcp.patch index b0460a0d6d43ed100b070147a2142b07e296224c..dd9fc2aa4aa4e02ae133d0c6ac4814e5365cc61c 100644 --- a/0001-solve-the-compilation-error.patch +++ b/chrony-nm-dispatcher-dhcp.patch @@ -1,44 +1,39 @@ -From 778108006c5cede66862f5e967c7e5345fd9ba8d Mon Sep 17 00:00:00 2001 -From: pangqing -Date: Thu, 10 Mar 2022 14:39:19 +0800 -Subject: [PATCH] Solve the compilation error +From: Robert Fairley +Date: Wed, 17 Jun 2020 10:14:19 -0400 +Subject: [PATCH] examples/nm-dispatcher.dhcp: use sysconfig -Signed-off-by: pangqing ---- - examples/chrony.nm-dispatcher.dhcp | 12 ++++++++++-- - 1 file changed, 10 insertions(+), 2 deletions(-) +Use the PEERNTP and NTPSERVERARGS environment variables from +/etc/sysconfig/network{-scripts}. + +Co-Authored-By: Christian Glombek diff --git a/examples/chrony.nm-dispatcher.dhcp b/examples/chrony.nm-dispatcher.dhcp -index 6ea4c37..e36cc98 100644 +index 6ea4c37..a6ad35a 100644 --- a/examples/chrony.nm-dispatcher.dhcp +++ b/examples/chrony.nm-dispatcher.dhcp -@@ -11,16 +11,24 @@ action=$2 +@@ -8,15 +8,23 @@ export LC_ALL=C + interface=$1 + action=$2 ++[ -f /etc/sysconfig/network ] && . /etc/sysconfig/network ++[ -f /etc/sysconfig/network-scripts/ifcfg-"${interface}" ] && \ ++ . /etc/sysconfig/network-scripts/ifcfg-"${interface}" ++ chronyc=/usr/bin/chronyc - default_server_options=iburst +-server_options=iburst -server_dir=/var/run/chrony-dhcp ++server_options=${NTPSERVERARGS:-iburst} +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 + dhcp_ntp_servers="$DHCP4_NTP_SERVERS $DHCP6_DHCP6_NTP_SERVERS" -+[ -f /etc/sysconfig/network ] && . /etc/sysconfig/network -+[ -f /etc/sysconfig/network-scripts/ifcfg-"${interface}" ] && \ -+ . /etc/sysconfig/network-scripts/ifcfg-"${interface}" -+ add_servers_from_dhcp() { rm -f "$dhcp_server_file" + + # Don't add NTP servers if PEERNTP=no specified; return early. + [ "$PEERNTP" = "no" ] && return + - for server in $nm_dhcp_servers; do -- echo "server $server $default_server_options" >> "$dhcp_server_file" -+ echo "server $server ${NTPSERVERARGS:-$default_server_options}" >> "$dhcp_server_file" - done - $chronyc reload sources > /dev/null 2>&1 || : - } --- -2.18.4 - + for server in $dhcp_ntp_servers; do + # Check for invalid characters (from the DHCPv6 NTP FQDN suboption) + len1=$(printf '%s' "$server" | wc -c) diff --git a/chrony.spec b/chrony.spec index e4c821860b04f5d0b4e5777366bfd8ae5d53aa81..359ae1f6a56e272a48ce36da9607b2214a246943 100644 --- a/chrony.spec +++ b/chrony.spec @@ -1,6 +1,6 @@ %define anolis_release 1 %global _hardened_build 1 -%global clknetsim_ver 470b5e +%global clknetsim_ver f00531 %bcond_without debug %bcond_without nts @@ -9,20 +9,20 @@ %endif Name: chrony -Version: 4.2 +Version: 4.3 Release: %{anolis_release}%{?dist} Summary: An NTP client/server License: GPLv2 URL: https://chrony.tuxfamily.org -Source0: chrony-4.2.tar.gz +Source0: chrony-4.3.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} # add distribution-specific bits to DHCP dispatcher -Patch1: 0001-solve-the-compilation-error.patch +Patch1: chrony-nm-dispatcher-dhcp.patch BuildRequires: libcap-devel libedit-devel nettle-devel pps-tools-devel BuildRequires: gcc gcc-c++ make bison systemd gnupg2 @@ -49,6 +49,14 @@ service to other computers in the network. %global vendorzone %(source /etc/os-release && echo ${ID}.) %endif +%package doc +Summary: Documentation files for %{name} +Requires: %{name} = %{version}-%{release} +BuildArch: noarch + +%description doc +The %{name}-doc package contains documentation files for %{name}. + %prep %setup -q -n %{name}-%{version}%{?prerelease} -a 10 %{?gitpatch:%patch0 -p1} @@ -62,8 +70,8 @@ md5sum -c <<-EOF | (! grep -v 'OK$') 2d01b94bc1a7b7fb70cbee831488d121 examples/chrony.conf.example2 96999221eeef476bd49fe97b97503126 examples/chrony.keys.example 6a3178c4670de7de393d9365e2793740 examples/chrony.logrotate - a7054c9352c07384bd7ea0477e6e8a8c examples/chrony.nm-dispatcher.dhcp - 8f5a98fcb400a482d355b929d04b5518 examples/chrony.nm-dispatcher.onoffline + c3992e2f985550739cd1cd95f98c9548 examples/chrony.nm-dispatcher.dhcp + 2b81c60c020626165ac655b2633608eb examples/chrony.nm-dispatcher.onoffline 677ad16d6439daa369da44a1b75d1772 examples/chronyd.service EOF @@ -179,7 +187,6 @@ fi %files %{!?_licensedir:%global license %%doc} %license COPYING -%doc FAQ NEWS README %config(noreplace) %{_sysconfdir}/chrony.conf %config(noreplace) %verify(not md5 size mtime) %attr(640,root,chrony) %{_sysconfdir}/chrony.keys %config(noreplace) %{_sysconfdir}/logrotate.d/chrony @@ -196,7 +203,13 @@ fi %ghost %attr(-,chrony,chrony) %{_localstatedir}/lib/chrony/rtc %dir %attr(750,chrony,chrony) %{_localstatedir}/log/chrony +%files doc +%doc FAQ NEWS README + %changelog +* Mon Sep 26 2022 mgb01105731 - 4.3-1 +- update to 4.3 + * Wed Mar 09 2022 pangqing - 4.2-1 - Init for anolisOS 23 diff --git a/clknetsim-470b5e.tar.gz b/clknetsim-470b5e.tar.gz deleted file mode 100644 index 4bbf793573bbb443e8354ba2b15057ca0a76e21d..0000000000000000000000000000000000000000 Binary files a/clknetsim-470b5e.tar.gz and /dev/null differ diff --git a/clknetsim-f00531.tar.gz b/clknetsim-f00531.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..f63d7bb761f226ea4c681f20bf484f3a0a364cb5 Binary files /dev/null and b/clknetsim-f00531.tar.gz differ