From 6c34847fb54ab840f2367e32c1bb18c1c62e3101 Mon Sep 17 00:00:00 2001
From: Miroslav Lichvar <mlichvar@redhat.com>
Date: Wed, 25 Sep 2019 15:10:45 +0200
Subject: [PATCH] update to 20190912git48e605

---
 .gitignore             |  3 +++
 linuxptp-headers.patch | 51 ------------------------------------------
 linuxptp.spec          | 14 +++++++-----
 sources                |  6 ++---
 4 files changed, 15 insertions(+), 59 deletions(-)
 delete mode 100644 linuxptp-headers.patch

diff --git a/.gitignore b/.gitignore
index a292f5e..8680329 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,6 @@
 /linuxptp-2.0.tgz
 /clknetsim-42b693.tar.gz
 /linuxptp-testsuite-f6a640.tar.gz
+/linuxptp-48e605.tar.gz
+/linuxptp-testsuite-a7f6e1.tar.gz
+/clknetsim-cb2866.tar.gz
diff --git a/linuxptp-headers.patch b/linuxptp-headers.patch
deleted file mode 100644
index 551a93f..0000000
--- a/linuxptp-headers.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-commit 8ac29acbbed6453baff7dc236ee72d240d5d6d91
-Author: Miroslav Lichvar <mlichvar@redhat.com>
-Date:   Tue Nov 13 12:54:36 2018 +0100
-
-    Fix building with new kernel headers.
-    
-    net_tstamp.h in recent kernel versions requires time.h for clockid_t.
-    
-    Signed-off-by: Miroslav Lichvar <mlichvar@redhat.com>
-
-diff --git a/clock.c b/clock.c
-index 56bc79b..ef9a008 100644
---- a/clock.c
-+++ b/clock.c
-@@ -17,11 +17,11 @@
-  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-  */
- #include <errno.h>
-+#include <time.h>
- #include <linux/net_tstamp.h>
- #include <poll.h>
- #include <stdlib.h>
- #include <string.h>
--#include <time.h>
- #include <sys/queue.h>
- 
- #include "address.h"
-diff --git a/sk.c b/sk.c
-index e2b1f28..30162eb 100644
---- a/sk.c
-+++ b/sk.c
-@@ -18,6 +18,7 @@
-  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-  */
- #include <errno.h>
-+#include <time.h>
- #include <linux/net_tstamp.h>
- #include <linux/sockios.h>
- #include <linux/ethtool.h>
-diff --git a/timemaster.c b/timemaster.c
-index 058678f..00db59f 100644
---- a/timemaster.c
-+++ b/timemaster.c
-@@ -22,6 +22,7 @@
- #include <errno.h>
- #include <libgen.h>
- #include <limits.h>
-+#include <time.h>
- #include <linux/net_tstamp.h>
- #include <net/if.h>
- #include <signal.h>
diff --git a/linuxptp.spec b/linuxptp.spec
index 4ef0aff..9513464 100644
--- a/linuxptp.spec
+++ b/linuxptp.spec
@@ -1,6 +1,9 @@
+%global gitfullver 48e605ef015c59787b0a8da9abd208471830cd56
+%global gitver %(c=%{gitfullver}; echo ${c:0:6})
+%global gitdate 20190912
 %global _hardened_build 1
-%global testsuite_ver f6a640
-%global clknetsim_ver 42b693
+%global testsuite_ver a7f6e1
+%global clknetsim_ver cb2866
 
 Name:		linuxptp
 Version:	2.0
@@ -10,7 +13,8 @@ Summary:	PTP implementation for Linux
 License:	GPLv2+
 URL:		http://linuxptp.sourceforge.net/
 
-Source0:	https://downloads.sourceforge.net/%{name}/%{name}-%{version}.tgz
+#Source0:	https://downloads.sourceforge.net/%{name}/%{name}-%{version}.tgz
+Source0:	https://github.com/richardcochran/%{name}/archive/%{gitver}/%{name}-%{gitver}.tar.gz
 Source1:	phc2sys.service
 Source2:	ptp4l.service
 Source3:	timemaster.service
@@ -19,9 +23,9 @@ Source4:	timemaster.conf
 Source10:	https://github.com/mlichvar/linuxptp-testsuite/archive/%{testsuite_ver}/linuxptp-testsuite-%{testsuite_ver}.tar.gz
 # simulator for test suite
 Source11:	https://github.com/mlichvar/clknetsim/archive/%{clknetsim_ver}/clknetsim-%{clknetsim_ver}.tar.gz
-Patch1:		linuxptp-headers.patch
 
 BuildRequires:	gcc gcc-c++ systemd
+BuildRequires:	net-snmp-devel
 
 %{?systemd_requires}
 
@@ -34,7 +38,6 @@ Supporting legacy APIs and other platforms is not a goal.
 
 %prep
 %setup -q -a 10 -a 11 -n %{name}-%{!?gitfullver:%{version}}%{?gitfullver}
-%patch1 -p1 -b .headers
 mv linuxptp-testsuite-%{testsuite_ver}* testsuite
 mv clknetsim-%{clknetsim_ver}* testsuite/clknetsim
 
@@ -89,6 +92,7 @@ PATH=..:$PATH ./run
 %{_sbindir}/phc_ctl
 %{_sbindir}/pmc
 %{_sbindir}/ptp4l
+%{_sbindir}/snmp4lptp
 %{_sbindir}/timemaster
 %{_mandir}/man5/*.5*
 %{_mandir}/man8/*.8*
diff --git a/sources b/sources
index 0f9dc4c..980bccd 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (linuxptp-2.0.tgz) = c33487a803f8cc461f790d9a137d5cf8b35cb6d292bdd2cf7a16aa666359d8c5e24667473be843182bef1e9f8d5c6af8aab8918978f10bf08257dd408bba66d6
-SHA512 (clknetsim-42b693.tar.gz) = ca30bef7c42e1371f34696a943755dcb6c7f2fe08a1d61602eccbd7232caa2e01a7bad0264d33086c36ed4f4d98aeae5e73c3058c99acaeb2f5e97c179e21037
-SHA512 (linuxptp-testsuite-f6a640.tar.gz) = e03648ed156ee467cd2422df25394e7ff6b1e33b7b036f35d77ed1d57b5bc4964f38b739fdb9e9aa409074e52297222c2cfd52c3e9881b2cb144fb6c55cf4750
+SHA512 (linuxptp-48e605.tar.gz) = 384286447bb360e4f3513abbdd44c8f0df3cc945c5a7326772fc072b0d530a61a3fe1a8ddfca1287e58c939d516f9d90d544d2ce7515d09e43c0d3bc9e5f1d9f
+SHA512 (linuxptp-testsuite-a7f6e1.tar.gz) = 8a29133bbf222432df450332f0aa76efd204d722b16561af915e24e898666da40408e88bbfcf8a39bfe7f8330bce00a666f93500c27a23c5b1bd014dc49568ca
+SHA512 (clknetsim-cb2866.tar.gz) = 21a0be21cf37d1e7ded479b24c9e8d9a510b047232babbd1858394b68d50e32d38f58ee7f5c43bef5abff280efe2002bffc810c11ecef8156357c7f23ca6b2e1