diff --git a/chrony-3.4.tar.gz b/chrony-3.4.tar.gz deleted file mode 100644 index 8c1d9a1..0000000 Binary files a/chrony-3.4.tar.gz and /dev/null differ diff --git a/chrony-3.5.tar.gz b/chrony-3.5.tar.gz new file mode 100644 index 0000000..60559d9 Binary files /dev/null and b/chrony-3.5.tar.gz differ diff --git a/chrony-packettest.patch b/chrony-packettest.patch new file mode 100644 index 0000000..ff1e207 --- /dev/null +++ b/chrony-packettest.patch @@ -0,0 +1,25 @@ +commit 62d6aed6a64b887c9e3b7f03d9e0db1deaa2696a +Author: Miroslav Lichvar +Date: Tue Jun 18 15:41:50 2019 +0200 + + test: update processing of packet log + + Two new fields have been added to the packet log, which broke some + of the simulation tests. + +diff --git a/test/simulation/test.common b/test/simulation/test.common +index 951a794b..8ed6ad9e 100644 +--- a/test/simulation/test.common ++++ b/test/simulation/test.common +@@ -391,9 +391,9 @@ check_packet_port() { + for i in $(seq 1 $(get_chronyd_nodes)); do + test_message 3 0 "node $i:" + +- grep -E -q " $port [0-9]+\$" tmp/log.packets && \ ++ grep -E -q "^([0-9e.+-]+ ){5}$port " tmp/log.packets && \ + ! grep -E "^[0-9e.+-]+ $i " tmp/log.packets | \ +- grep -E -q -v " $port [0-9]+\$" && \ ++ grep -E -q -v "^([0-9e.+-]+ ){5}$port " && \ + test_ok || test_bad + [ $? -eq 0 ] || ret=1 + done diff --git a/chrony-service-helper.patch b/chrony-service-helper.patch index 9035356..65e404e 100644 --- a/chrony-service-helper.patch +++ b/chrony-service-helper.patch @@ -1,8 +1,8 @@ -diff -up chrony-3.1/examples/chronyd.service.service-helper chrony-3.1/examples/chronyd.service ---- chrony-3.1/examples/chronyd.service.service-helper 2017-01-31 12:12:01.863772826 +0100 -+++ chrony-3.1/examples/chronyd.service 2017-01-31 12:12:30.371860064 +0100 -@@ -10,6 +10,7 @@ Type=forking - PIDFile=/var/run/chrony/chronyd.pid +diff -Nur chrony-3.5.bck/examples/chronyd.service chrony-3.5/examples/chronyd.service +--- chrony-3.5.bck/examples/chronyd.service 2020-06-23 15:41:07.789042822 +0800 ++++ chrony-3.5/examples/chronyd.service 2020-06-23 15:42:09.489819150 +0800 +@@ -10,6 +10,7 @@ + PIDFile=/run/chrony/chronyd.pid EnvironmentFile=-/etc/sysconfig/chronyd ExecStart=/usr/sbin/chronyd $OPTIONS +ExecStartPost=/usr/libexec/chrony-helper update-daemon diff --git a/chrony.spec b/chrony.spec index 964ab2a..394f3e6 100644 --- a/chrony.spec +++ b/chrony.spec @@ -1,8 +1,8 @@ -%global clknetsim_ver 774308 +%global clknetsim_ver 79ffe4 Name: chrony -Version: 3.4 -Release: 3 +Version: 3.5 +Release: 1 Summary: An NTP client/server License: GPLv2 URL: https://chrony.tuxfamily.org @@ -16,7 +16,7 @@ Source6: https://github.com/mlichvar/clknetsim/archive/%{clknetsim_ver}/clknet #patch0 form fedora Patch0: chrony-service-helper.patch - +Patch1: chrony-packettest.patch BuildRequires: gcc gcc-c++ bison systemd libcap-devel libedit-devel nettle-devel pps-tools-devel libseccomp-devel Requires: shadow-utils systemd timedatex @@ -31,9 +31,10 @@ service to other computers in the network. %package_help %prep -%autosetup -n %{name}-%{version} -p1 %setup -q -n %{name}-%{version} -a 6 +%patch0 -p1 +%patch1 -p1 mv clknetsim-%{clknetsim_ver}* test/simulation/clknetsim %build @@ -81,7 +82,7 @@ install -d $RPM_BUILD_ROOT%{_localstatedir}/log/chrony touch $RPM_BUILD_ROOT%{_localstatedir}/lib/chrony/{drift,rtc} %check -%make_build -C test/simulation/clknetsim CLKNETSIM_RANDOM_SEED=16888 +%make_build -C test/simulation/clknetsim CLKNETSIM_RANDOM_SEED=24502 make quickcheck @@ -134,8 +135,11 @@ fi %{_mandir}/man[158]/%{name}*.[158]* %changelog +* Sat Jun 28 2020 hanzhijun - 3.5-1 +- update to 3.5-1 + * Tue Dec 24 2019 openEuler Buildteam - 3.4-3 - rename docs subpackage as help subpackage * Sat Sep 14 2019 hufeng - 3.4-2 --Create chrony spec +- Create chrony spec diff --git a/clknetsim-774308.tar.gz b/clknetsim-774308.tar.gz deleted file mode 100644 index f82c219..0000000 Binary files a/clknetsim-774308.tar.gz and /dev/null differ diff --git a/clknetsim-79ffe4.tar.gz b/clknetsim-79ffe4.tar.gz new file mode 100644 index 0000000..b11b2b0 Binary files /dev/null and b/clknetsim-79ffe4.tar.gz differ