From 665bdf5b45176b4fd2beee491aa21ea94a7010e3 Mon Sep 17 00:00:00 2001 From: Miroslav Lichvar Date: Tue, 3 Sep 2024 11:58:19 +0200 Subject: [PATCH] update to 4.6 (RHEL-55735) Resolves: RHEL-55735 --- .gitignore | 6 ++-- chrony-reload.patch | 86 --------------------------------------------- chrony.spec | 9 ++--- sources | 6 ++-- 4 files changed, 9 insertions(+), 98 deletions(-) delete mode 100644 chrony-reload.patch diff --git a/.gitignore b/.gitignore index ca5815e..c02a352 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,3 @@ -/chrony-4.5.tar.gz -/chrony-4.5-tar-gz-asc.txt -/clknetsim-5d1dc0.tar.gz +/chrony-4.6.tar.gz +/chrony-4.6-tar-gz-asc.txt +/clknetsim-64df92.tar.gz diff --git a/chrony-reload.patch b/chrony-reload.patch deleted file mode 100644 index b8ac742..0000000 --- a/chrony-reload.patch +++ /dev/null @@ -1,86 +0,0 @@ -commit f49be7f06343ee27fff2950937d7f6742f53976f -Author: Miroslav Lichvar -Date: Tue Mar 12 14:30:27 2024 +0100 - - conf: don't load sourcedir during initstepslew and RTC init - - If the reload sources command was received in the chronyd start-up - sequence with initstepslew and/or RTC init (-s option), the sources - loaded from sourcedirs caused a crash due to failed assertion after - adding sources specified in the config. - - Ignore the reload sources command until chronyd enters the normal - operation mode. - - Fixes: 519796de3756 ("conf: add sourcedirs directive") - -diff --git a/conf.c b/conf.c -index 6eae11c9..8849bdce 100644 ---- a/conf.c -+++ b/conf.c -@@ -298,6 +298,8 @@ static ARR_Instance ntp_sources; - static ARR_Instance ntp_source_dirs; - /* Array of uint32_t corresponding to ntp_sources (for sourcedirs reload) */ - static ARR_Instance ntp_source_ids; -+/* Flag indicating ntp_sources and ntp_source_ids are used for sourcedirs */ -+static int conf_ntp_sources_added = 0; - - /* Array of RefclockParameters */ - static ARR_Instance refclock_sources; -@@ -1689,8 +1691,12 @@ reload_source_dirs(void) - NSR_Status s; - int d, pass; - -+ /* Ignore reload command before adding configured sources */ -+ if (!conf_ntp_sources_added) -+ return; -+ - prev_size = ARR_GetSize(ntp_source_ids); -- if (prev_size > 0 && ARR_GetSize(ntp_sources) != prev_size) -+ if (ARR_GetSize(ntp_sources) != prev_size) - assert(0); - - /* Save the current sources and their configuration IDs */ -@@ -1859,7 +1865,10 @@ CNF_AddSources(void) - Free(source->params.name); - } - -+ /* The arrays will be used for sourcedir (re)loading */ - ARR_SetSize(ntp_sources, 0); -+ ARR_SetSize(ntp_source_ids, 0); -+ conf_ntp_sources_added = 1; - - reload_source_dirs(); - } -diff --git a/test/simulation/203-initreload b/test/simulation/203-initreload -new file mode 100755 -index 00000000..cf7924b8 ---- /dev/null -+++ b/test/simulation/203-initreload -@@ -0,0 +1,26 @@ -+#!/usr/bin/env bash -+ -+. ./test.common -+ -+check_config_h 'FEAT_CMDMON 1' || test_skip -+ -+# Test fix "conf: don't load sourcedir during initstepslew and RTC init" -+ -+test_start "reload during initstepslew" -+ -+client_conf="initstepslew 5 192.168.123.1 -+sourcedir tmp" -+client_server_conf="#" -+chronyc_conf="reload sources" -+chronyc_start=4 -+ -+echo 'server 192.168.123.1' > tmp/sources.sources -+ -+run_test || test_fail -+check_chronyd_exit || test_fail -+check_source_selection || test_fail -+check_sync || test_fail -+ -+check_log_messages "Added source 192\.168\.123\.1" 1 1 || test_fail -+ -+test_pass diff --git a/chrony.spec b/chrony.spec index 870d941..053dd11 100644 --- a/chrony.spec +++ b/chrony.spec @@ -1,5 +1,5 @@ %global _hardened_build 1 -%global clknetsim_ver 5d1dc0 +%global clknetsim_ver 64df92 %bcond_without debug %bcond_without nts @@ -8,7 +8,7 @@ %endif Name: chrony -Version: 4.5 +Version: 4.6 Release: 6%{?dist} Summary: An NTP client/server @@ -25,8 +25,6 @@ Source10: https://gitlab.com/chrony/clknetsim/-/archive/master/clknetsim-% # add distribution-specific bits to DHCP dispatcher Patch1: chrony-nm-dispatcher-dhcp.patch -# fix crash on reload command during start -Patch2: chrony-reload.patch BuildRequires: gnutls-devel libcap-devel libedit-devel pps-tools-devel BuildRequires: gcc gcc-c++ make bison systemd gnupg2 @@ -61,14 +59,13 @@ 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 %{?gitpatch: echo %{version}-%{gitpatch} > version.txt} # review changes in packaged configuration files and scripts md5sum -c <<-EOF | (! grep -v 'OK$') 5530d6e60f84b76c27495485d2510bac examples/chrony-wait.service - 2d01b94bc1a7b7fb70cbee831488d121 examples/chrony.conf.example2 + 826354a2d467d6147e412d43bfe07484 examples/chrony.conf.example2 6a3178c4670de7de393d9365e2793740 examples/chrony.logrotate c3992e2f985550739cd1cd95f98c9548 examples/chrony.nm-dispatcher.dhcp 4e85d36595727318535af3387411070c examples/chrony.nm-dispatcher.onoffline diff --git a/sources b/sources index 970d87e..d1a6a50 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (chrony-4.5.tar.gz) = 58a449e23186da799064b16ab16f799c1673296984b152b43e87c620d86e272c55365e83439d410fc89e4e0ba0befd7d5c625eac78a6665813b7ea75444f71b5 -SHA512 (chrony-4.5-tar-gz-asc.txt) = 05470e6cc34524fdab494f70cee71d46172b38bdd4acd8173ac79fdec12178239248880db474437690094aae7909002113289ac7f9305130c5e0a1d9364122cb -SHA512 (clknetsim-5d1dc0.tar.gz) = 7d542443d7d9334d900cee821207fab1ee87e57fda6580a9d894f65fb36d265fdc4a72022b4293134d54cdeffba7e84d2f68f732f4b228b84d846d8668b314b2 +SHA512 (chrony-4.6.tar.gz) = 84926b6c9eb90824ab98333412b001b18de9342dacb898d195ee8de52868b1945700a8b161de6b603c231460d290e02df6712c1dcb7f034ba45754b38466c8bd +SHA512 (chrony-4.6-tar-gz-asc.txt) = f735c1d52f1474d2af656e55d3a9abfd33b4ed706b983a393c7e3852b766b5179fe4098425ee7f32bb5db4a2e4170e8c5930cf63d20884be6c0eac338a3d26db +SHA512 (clknetsim-64df92.tar.gz) = 3253e6823b66f23f63203aad0ea22c25cf9d1f5af789722662f4d383111cb2c1816cb23d2fa06171a65b102ae82a5371376becb029d7c9b163b0aee710374c02