From c022e418584c43a0fd8ecfb933434c4d5a293820f12ccda6bdbbba8e658a34cc Mon Sep 17 00:00:00 2001
From: Martin Pluskal <mpluskal@suse.com>
Date: Fri, 3 Aug 2018 09:17:49 +0000
Subject: [PATCH] - Update clknetsim to revision 42b693b   * Drop not needed
 chrony-fix-open.patch - Build tests with optflags as well - Do not run tests
 on i586 - Enable signd

OBS-URL: https://build.opensuse.org/package/show/network:time/chrony?expand=0&rev=50
---
 chrony-fix-open.patch    | 22 ----------------------
 chrony.changes           |  9 +++++++++
 chrony.spec              | 10 ++++++----
 clknetsim-42b693b.tar.gz |  3 +++
 clknetsim-71dbbc5.tar.gz |  3 ---
 5 files changed, 18 insertions(+), 29 deletions(-)
 delete mode 100644 chrony-fix-open.patch
 create mode 100644 clknetsim-42b693b.tar.gz
 delete mode 100644 clknetsim-71dbbc5.tar.gz

diff --git a/chrony-fix-open.patch b/chrony-fix-open.patch
deleted file mode 100644
index a3c42f7..0000000
--- a/chrony-fix-open.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: chrony-3.2/clknetsim-71dbbc509eee05cb29e33468be93d5ba52b79429/client.c
-===================================================================
---- chrony-3.2.orig/clknetsim-71dbbc509eee05cb29e33468be93d5ba52b79429/client.c
-+++ chrony-3.2/clknetsim-71dbbc509eee05cb29e33468be93d5ba52b79429/client.c
-@@ -1008,6 +1008,8 @@ int open(const char *pathname, int flags
- 	else if (!strcmp(pathname, "/dev/ptp1"))
- 		return SYSCLK_FD;
- 
-+	if (!_open)
-+		_open = (int (*)(const char *pathname, int flags))dlsym(RTLD_NEXT, "open");
- 	r = _open(pathname, flags);
- 	assert(r < 0 || (r < BASE_SOCKET_FD && r < BASE_TIMER_FD));
- 
-@@ -1026,6 +1028,8 @@ int close(int fd) {
- 		return 0;
- 	}
- 
-+	if (!_close)
-+		_close = (int (*)(int fd))dlsym(RTLD_NEXT, "close");
- 	return _close(fd);
- }
- 
diff --git a/chrony.changes b/chrony.changes
index 74c7d0f..639e276 100644
--- a/chrony.changes
+++ b/chrony.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Fri Aug  3 07:56:06 UTC 2018 - mpluskal@suse.com
+
+- Update clknetsim to revision 42b693b
+  * Drop not needed chrony-fix-open.patch
+- Build tests with optflags as well
+- Do not run tests on i586
+- Enable signd
+
 -------------------------------------------------------------------
 Thu Aug  2 07:52:58 UTC 2018 - mpluskal@suse.com
 
diff --git a/chrony.spec b/chrony.spec
index 61be17c..532da65 100644
--- a/chrony.spec
+++ b/chrony.spec
@@ -17,7 +17,7 @@
 
 
 %define vendorzone opensuse.
-%global clknetsim_ver 71dbbc5
+%global clknetsim_ver 42b693b
 #Compat macro for new _fillupdir macro introduced in Nov 2017
 %if ! %{defined _fillupdir}
   %define _fillupdir %{_localstatedir}/adm/fillup-templates
@@ -44,7 +44,6 @@ Patch0:         chrony-config.patch
 # Add NTP servers from DHCP when starting service
 Patch1:         chrony-service-helper.patch
 Patch2:         chrony-logrotate.patch
-Patch5:         chrony-fix-open.patch
 BuildRequires:  NetworkManager-devel
 BuildRequires:  bison
 BuildRequires:  gcc-c++
@@ -95,7 +94,6 @@ or a different computer.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
-%patch5 -p1
 
 # If this is an openSUSE build, use our vendor zone
 # (2.*pool.ntp.org names include IPv6 addresses). If not
@@ -132,7 +130,8 @@ export LDFLAGS="-pie -Wl,-z,relro,-z,now"
   %endif
   --with-user=chrony                        \
   --with-hwclockfile=%{_sysconfdir}/adjtime \
-  --with-sendmail=%{_sbindir}/sendmail
+  --with-sendmail=%{_sbindir}/sendmail      \
+  --enable-ntp-signd
 make %{?_smp_mflags} all docs
 
 %install
@@ -173,11 +172,14 @@ install -Dpm 755 %{SOURCE4} \
 install -d %{buildroot}%{_localstatedir}/log/chrony
 touch %{buildroot}%{_localstatedir}/lib/chrony/{drift,rtc}
 
+%ifnarch %ix86
 %check
 # Set random seed to get deterministic results
 export CLKNETSIM_RANDOM_SEED=24501
+export CFLAGS="%{optflags}"
 make %{?_smp_mflags} -C test/simulation/clknetsim
 make %{?_smp_mflags} check
+%endif
 
 %pre
 getent group %{name} >/dev/null || groupadd -r %{name}
diff --git a/clknetsim-42b693b.tar.gz b/clknetsim-42b693b.tar.gz
new file mode 100644
index 0000000..bc881fe
--- /dev/null
+++ b/clknetsim-42b693b.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2cc12343114ebb9fc96e62404fac4be7fca5d5cb2a8bdc65fdc41948ea0ee449
+size 41933
diff --git a/clknetsim-71dbbc5.tar.gz b/clknetsim-71dbbc5.tar.gz
deleted file mode 100644
index 6372926..0000000
--- a/clknetsim-71dbbc5.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:d3f58e70731922bf2d6c8a39256acd0b402a5e125eefe82c5b9542081dac6d23
-size 41648