From 719569d848ee6fb4a1973c710a3d32c3900a9f55 Mon Sep 17 00:00:00 2001
From: Jakub Bogusz <qboosh@pld-linux.org>
Date: Fri, 21 Oct 2022 06:36:06 +0200
Subject: [PATCH] - updated to 1.2.8 - removed obsolete types patch

---
 xdp-tools-types.patch | 39 ---------------------------------------
 xdp-tools.spec        |  6 ++----
 2 files changed, 2 insertions(+), 43 deletions(-)
 delete mode 100644 xdp-tools-types.patch

diff --git a/xdp-tools-types.patch b/xdp-tools-types.patch
deleted file mode 100644
index c841170..0000000
--- a/xdp-tools-types.patch
+++ /dev/null
@@ -1,39 +0,0 @@
---- xdp-tools-1.2.4/lib/util/stats.c.orig	2022-06-28 20:21:15.000000000 +0200
-+++ xdp-tools-1.2.4/lib/util/stats.c	2022-07-03 09:34:37.393386875 +0200
-@@ -107,8 +107,8 @@ int stats_print(struct stats_record *sta
- 			return 0;
- 
- 		if (first) {
--			printf("Period of %fs ending at %lu.%06lu\n", period,
--			       t.tv_sec, t.tv_nsec / 1000);
-+			printf("Period of %fs ending at %llu.%06llu\n", period,
-+			       (unsigned long long)t.tv_sec, (unsigned long long)(t.tv_nsec / 1000));
- 			first = false;
- 		}
- 
---- xdp-tools-1.2.4/xdp-dump/xdpdump.c.orig	2022-06-28 20:21:15.000000000 +0200
-+++ xdp-tools-1.2.4/xdp-dump/xdpdump.c	2022-07-03 09:35:58.851004482 +0200
-@@ -644,9 +644,9 @@ static bool capture_on_legacy_interface(
- 			char hline[SNPRINTH_MIN_BUFFER_SIZE];
- 
- 			if (cfg->hex_dump) {
--				printf("%lu.%06lu: packet size %u bytes, "
-+				printf("%llu.%06llu: packet size %u bytes, "
- 				       "captured %u bytes on if_name \"%s\"\n",
--				       h.ts.tv_sec, h.ts.tv_usec,
-+				       (unsigned long long)h.ts.tv_sec, (unsigned long long)h.ts.tv_usec,
- 				       h.len, h.caplen, cfg->iface.ifname);
- 
- 				for (i = 0; i < h.caplen; i += 16) {
-@@ -655,9 +655,9 @@ static bool capture_on_legacy_interface(
- 					printf("  %s\n", hline);
- 				}
- 			} else {
--				printf("%lu.%06lu: packet size %u bytes on "
-+				printf("%llu.%06llu: packet size %u bytes on "
- 				       "if_name \"%s\"\n",
--				       h.ts.tv_sec, h.ts.tv_usec,
-+				       (unsigned long long)h.ts.tv_sec, (unsigned long long)h.ts.tv_usec,
- 				       h.len, cfg->iface.ifname);
- 			}
- 		}
diff --git a/xdp-tools.spec b/xdp-tools.spec
index 6e33dbb..7fa8374 100644
--- a/xdp-tools.spec
+++ b/xdp-tools.spec
@@ -1,14 +1,13 @@
 Summary:	Utilities for use with XDP
 Summary(pl.UTF-8):	Narzędzia do używania z XDP
 Name:		xdp-tools
-Version:	1.2.4
+Version:	1.2.8
 Release:	1
 License:	GPL v2, LGPL v2.1, BSD
 Group:		Applications/System
 #Source0Download: https://github.com/xdp-project/xdp-tools/releases
 Source0:	https://github.com/xdp-project/xdp-tools/releases/download/v%{version}/%{name}-%{version}.tar.gz
-# Source0-md5:	f4a4050e5f79b518d561c8701c3dfd68
-Patch0:		%{name}-types.patch
+# Source0-md5:	a518efccdbe4db764c93ee5293228c4a
 URL:		https://github.com/xdp-project/xdp-tools
 BuildRequires:	clang >= 10
 BuildRequires:	elfutils-devel
@@ -66,7 +65,6 @@ Statyczna biblioteka libxdp.
 
 %prep
 %setup -q
-%patch0 -p1
 
 %build
 CC="%{__cc}" \
-- 
2.44.0