!5 update to 3.5

Merge pull request !5 from hanzj0122/master

chrony-packettest.patch

@@ -0,0 +1,25 @@
+commit 62d6aed6a64b887c9e3b7f03d9e0db1deaa2696a
+Author: Miroslav Lichvar <mlichvar@redhat.com>
+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

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

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,6 +135,9 @@ fi
 %{_mandir}/man[158]/%{name}*.[158]*
 
 %changelog
+* Sat Jun 28 2020 hanzhijun <hanzhijun1@huawei.com> - 3.5-1
+- update to 3.5-1
+
 * Tue Dec 24 2019 openEuler Buildteam <buildteam@openeuler.org> - 3.4-3
 - rename docs subpackage as help subpackage