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/chrony-nm-dispatcher-dhcp.patch b/chrony-nm-dispatcher-dhcp.patch index 23087d6b84e9ea78322b82fd4a2cdceb5029ab68..028bdf826baafb6e8e05eb55b4137afff2e4059d 100644 --- a/chrony-nm-dispatcher-dhcp.patch +++ b/chrony-nm-dispatcher-dhcp.patch @@ -7,20 +7,23 @@ Use the PEERNTP and NTPSERVERARGS environment variables from Co-Authored-By: Christian Glombek +--- + examples/chrony.nm-dispatcher.dhcp | 12 ++++++++++-- + 1 file changed, 10 insertions(+), 2 deletions(-) + diff --git a/examples/chrony.nm-dispatcher.dhcp b/examples/chrony.nm-dispatcher.dhcp -index 6ea4c37..a6ad35a 100644 +index 547ce83..f23756e 100644 --- a/examples/chrony.nm-dispatcher.dhcp +++ b/examples/chrony.nm-dispatcher.dhcp -@@ -6,16 +6,24 @@ +@@ -10,13 +10,21 @@ action=$2 chronyc=/usr/bin/chronyc - default_server_options=iburst + 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 + dhcp_ntp_servers="$DHCP4_NTP_SERVERS $DHCP6_DHCP6_NTP_SERVERS" +[ -f /etc/sysconfig/network ] && . /etc/sysconfig/network +[ -f /etc/sysconfig/network-scripts/ifcfg-"${interface}" ] && \ @@ -32,12 +35,18 @@ index 6ea4c37..a6ad35a 100644 + # 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" + for server in $dhcp_ntp_servers; do + # Check for invalid characters (from the DHCPv6 NTP FQDN suboption) + len1=$(printf '%s' "$server" | wc -c) +@@ -25,7 +33,7 @@ add_servers_from_dhcp() { + continue + fi + +- printf 'server %s %s\n' "$server" "$server_options" >> "$dhcp_server_file" ++ printf 'server %s %s\n' "$server" "${NTPSERVERARGS:-$server_options}" >> "$dhcp_server_file" done $chronyc reload sources > /dev/null 2>&1 || : } -- -2.29.2 +2.23.0 diff --git a/chrony.spec b/chrony.spec index 4b2772230cc2aa07add9d46c78715ff63dde66f0..047863865ef1b878680a938bf17065204025cb4c 100644 --- a/chrony.spec +++ b/chrony.spec @@ -1,8 +1,8 @@ -%global clknetsim_ver 470b5e +%global clknetsim_ver f00531 Name: chrony -Version: 4.2 -Release: 3 +Version: 4.3 +Release: 1 Summary: An NTP client/server License: GPLv2 URL: https://chrony.tuxfamily.org @@ -13,8 +13,7 @@ Source6: https://github.com/mlichvar/clknetsim/archive/%{clknetsim_ver}/clknet Patch1: chrony-nm-dispatcher-dhcp.patch Patch2: chrony-services.patch -BuildRequires: gcc gcc-c++ bison systemd libcap-devel libedit-devel nettle-devel pps-tools-devel libseccomp-devel - +BuildRequires: gcc gcc-c++ bison systemd libcap-devel libedit-devel nettle-devel pps-tools-devel libseccomp-devel m4 Requires: shadow-utils systemd timedatex %description @@ -29,6 +28,10 @@ service to other computers in the network. %prep %autosetup -p1 -n %{name}-%{version} -a 6 + +# regenerate the file from getdate.y +rm -f getdate.c + mv clknetsim-%{clknetsim_ver}* test/simulation/clknetsim %build @@ -135,6 +138,12 @@ fi %{_mandir}/man[158]/%{name}*.[158]* %changelog +* Mon Jan 30 2023 chengyechun - 4.3-1 +- Type:enhancement +- ID:NA +- SUG:na +- DESC:update to chrony-4.3 + * Sat Dec 24 2022 chengyechun - 4.2-3 - Type:bugfix - ID:NA 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..9528dc28b043b4493b5cebfab31d2427de616f17 Binary files /dev/null and b/clknetsim-f00531.tar.gz differ