Accepting request 774157 from home:marxin:branches:network:time

- Add chrony-test-update-processing-of-packet-log.patch in order
  to fix test-suite failure.

OBS-URL: https://build.opensuse.org/request/show/774157
OBS-URL: https://build.opensuse.org/package/show/network:time/chrony?expand=0&rev=81

chrony-test-update-processing-of-packet-log.patch

@@ -0,0 +1,30 @@
+From 62d6aed6a64b887c9e3b7f03d9e0db1deaa2696a Mon Sep 17 00:00:00 2001
+From: Miroslav Lichvar <mlichvar@redhat.com>
+Date: Tue, 18 Jun 2019 15:41:50 +0200
+Subject: [PATCH] test: update processing of packet log
+
+Two new fields have been added to the packet log, which broke some
+of the simulation tests.
+---
+ test/simulation/test.common | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/test/simulation/test.common b/test/simulation/test.common
+index 951a794..8ed6ad9 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
+-- 
+2.25.0
+

chrony.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Feb 13 12:45:44 UTC 2020 - Martin Liška <mliska@suse.cz>
+
+- Add chrony-test-update-processing-of-packet-log.patch in order
+  to fix test-suite failure.
+
 -------------------------------------------------------------------
 Wed Feb 12 09:24:24 UTC 2020 - Martin Liška <mliska@suse.cz>
 

chrony.spec

@@ -47,6 +47,7 @@ Patch1:         chrony-service-helper.patch
 Patch2:         chrony-logrotate.patch
 Patch3:         chrony-service-ordering.patch
 Patch4:         chrony-test-fix-util-unit-test-for-NTP-era-split.patch
+Patch5:         chrony-test-update-processing-of-packet-log.patch
 BuildRequires:  NetworkManager-devel
 BuildRequires:  bison
 BuildRequires:  gcc-c++
@@ -100,6 +101,7 @@ or a different computer.
 %patch2 -p1
 %patch3
 %patch4 -p1
+%patch5 -p1
 
 # If this is an openSUSE build, use our vendor zone
 # (2.*pool.ntp.org names include IPv6 addresses). If not