From d656f0581653bb65868030154f018f7c00b21d61 Mon Sep 17 00:00:00 2001
From: Miroslav Lichvar <mlichvar@redhat.com>
Date: Wed, 19 Sep 2018 17:20:41 +0200
Subject: [PATCH] update to 3.4

---
 .gitignore        |  2 +-
 chrony-test.patch | 20 --------------------
 chrony.spec       |  6 +-----
 sources           |  2 +-
 4 files changed, 3 insertions(+), 27 deletions(-)
 delete mode 100644 chrony-test.patch

diff --git a/.gitignore b/.gitignore
index c5c36ff..1b2ff45 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
-/chrony-3.4-pre1.tar.gz
+/chrony-3.4.tar.gz
 /clknetsim-774308.tar.gz
diff --git a/chrony-test.patch b/chrony-test.patch
deleted file mode 100644
index a068b5f..0000000
--- a/chrony-test.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-commit 49d52b547fe1e66aac5b0799c6918ae3a5a831da
-Author: Miroslav Lichvar <mlichvar@redhat.com>
-Date:   Fri Aug 31 12:48:07 2018 +0200
-
-    test: make 129-reload more reliable
-
-diff --git a/test/simulation/129-reload b/test/simulation/129-reload
-index 9c4e985..7a346a4 100755
---- a/test/simulation/129-reload
-+++ b/test/simulation/129-reload
-@@ -9,7 +9,8 @@ limit=100
- min_sync_time=100
- max_sync_time=104
- client_chronyd_options="-r"
--client_conf="dumpdir tmp"
-+client_conf="dumpdir tmp
-+maxupdateskew 10000"
- 
- run_test || test_fail
- 
diff --git a/chrony.spec b/chrony.spec
index 4992411..9336a36 100644
--- a/chrony.spec
+++ b/chrony.spec
@@ -1,5 +1,4 @@
 %global _hardened_build 1
-%global prerelease -pre1
 %global clknetsim_ver 774308
 %bcond_without debug
 
@@ -22,8 +21,6 @@ Source10:       https://github.com/mlichvar/clknetsim/archive/%{clknetsim_ver}/c
 
 # add NTP servers from DHCP when starting service
 Patch2:         chrony-service-helper.patch
-# fix test suite to pass quick check
-Patch3:         chrony-test.patch
 
 BuildRequires:  libcap-devel libedit-devel nettle-devel pps-tools-devel
 %ifarch %{ix86} x86_64 %{arm} aarch64 mipsel mips64el ppc64 ppc64le s390 s390x
@@ -55,7 +52,6 @@ service to other computers in the network.
 %setup -q -n %{name}-%{version}%{?prerelease} -a 10
 %{?gitpatch:%patch0 -p1}
 %patch2 -p1 -b .service-helper
-%patch3 -p1
 
 %{?gitpatch: echo %{version}-%{gitpatch} > version.txt}
 
@@ -63,7 +59,7 @@ service to other computers in the network.
 md5sum -c <<-EOF | (! grep -v 'OK$')
         47ad7eccc410b981d2f2101cf5682616  examples/chrony-wait.service
         e473a9fab7fe200cacce3dca8b66290b  examples/chrony.conf.example2
-        ba6bb05c50e03f6b5ab54a2b7914800d  examples/chrony.keys.example
+        96999221eeef476bd49fe97b97503126  examples/chrony.keys.example
         6a3178c4670de7de393d9365e2793740  examples/chrony.logrotate
         8748a663f0b1943ea491858f414a6b26  examples/chrony.nm-dispatcher
         921b354e94f5e3db124cb50d11cd560f  examples/chronyd.service
diff --git a/sources b/sources
index 4e89cb6..c451c74 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (chrony-3.4-pre1.tar.gz) = b45c2f94060ee4f5917d49420a726c412231cb8c3fdc4475465daee6d24d809ae6cb146332e88c975d58f969de357d1b9e2fb3a1c66e35f988f6c8828b39f9a3
+SHA512 (chrony-3.4.tar.gz) = 4fbb0311c8d363a87edd6f5d1be3d8554da169f260ba23c1ad9e8c567808258c6fd7513ba630d6fa27453ecfd81f0ece0e26d5ee2f98ca47fbc9887181a36918
 SHA512 (clknetsim-774308.tar.gz) = 303c9d270e62f3de80a02da387b3df4188dabac738f249ac25096e202cbb2991e23c116713dfce5c3f4c17c1925af9796b0828de74b501fef1cc01b098e2c5c5