From 95c9c5020c61ddf39c6b27c6b68bad1a7804dc95 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Toke=20H=C3=B8iland-J=C3=B8rgensen?= <toke@redhat.com>
Date: Fri, 10 Feb 2023 19:26:41 +0100
Subject: [PATCH] Update to upstream v1.3.0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Toke Høiland-Jørgensen <toke@redhat.com>
---
 .gitignore     |  2 ++
 sources        |  3 ++-
 xdp-tools.spec | 20 +++++++++++++++++---
 3 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index cbc7fe9..24968ef 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,3 +14,5 @@
 /xdp-tools-1.2.6.tar.gz
 /xdp-tools-1.2.8.tar.gz
 /xdp-tools-1.2.9.tar.gz
+/xdp-tools-configure-Don-t-fail-on-missing-bpftool.patch
+/xdp-tools-1.3.0.tar.gz
diff --git a/sources b/sources
index 3e91b37..ab6f777 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
-SHA512 (xdp-tools-1.2.9.tar.gz) = b3b6ff323a819ecb7075a05ae11437f468843b5b48a6c85d05b715df86d7414549fdc7d59a3558d042f4656a7abc60a60f1466846f153b4e6b40a406dd8bab06
+SHA512 (xdp-tools-1.3.0.tar.gz) = 3f5845c425c6698fb10e80253b39b10e8b8b1eb73ff4615a8e16374de5dc2dc313087ad2b019fe6cbaf3efa041f15c46fb30efe70e23267a89ca1f658c19c528
+SHA512 (xdp-tools-configure-Don-t-fail-on-missing-bpftool.patch) = f57c82d29581b47bc0ce6962650b4aec45d00dd4f4ecc854fccf17ea40655b20ff50e0817aec517a77ed6a6bf766c82930ece76708ab93b910f211a85366a7ff
diff --git a/xdp-tools.spec b/xdp-tools.spec
index 1824376..c438bb3 100644
--- a/xdp-tools.spec
+++ b/xdp-tools.spec
@@ -1,12 +1,13 @@
 Name:             xdp-tools
-Version:          1.2.9
-Release:          2%{?dist}
+Version:          1.3.0
+Release:          1%{?dist}
 Summary:          Utilities and example programs for use with XDP
-%global _soversion 1.2.0
+%global _soversion 1.3.0
 
 License:          GPLv2
 URL:              https://github.com/xdp-project/%{name}
 Source0:          https://github.com/xdp-project/%{name}/releases/download/v%{version}/xdp-tools-%{version}.tar.gz
+Patch0:           xdp-tools-configure-Don-t-fail-on-missing-bpftool.patch
 
 BuildRequires:    libbpf-devel
 BuildRequires:    elfutils-libelf-devel
@@ -21,6 +22,10 @@ BuildRequires:    m4
 BuildRequires:    emacs-nox
 BuildRequires:    wireshark-cli
 
+%ifnarch i686
+BuildRequires:    bpftool
+%endif
+
 # Always keep xdp-tools and libxdp packages in sync
 Requires:         libxdp = %{version}-%{release}
 
@@ -89,6 +94,11 @@ make install V=1
 %{_sbindir}/xdp-filter
 %{_sbindir}/xdp-loader
 %{_sbindir}/xdpdump
+%ifnarch i686
+%{_sbindir}/xdp-bench
+%{_sbindir}/xdp-monitor
+%{_sbindir}/xdp-trafficgen
+%endif
 %{_mandir}/man8/*
 %{_libdir}/bpf/xdpfilt_*.o
 %{_libdir}/bpf/xdpdump_*.o
@@ -112,6 +122,10 @@ make install V=1
 %{_libdir}/pkgconfig/libxdp.pc
 
 %changelog
+* Fri Feb 10 2023 Toke Høiland-Jørgensen <toke@redhat.com> 1.3.0-1
+- Upstream version bump
+- Add patch to enable building without bpftool on i686
+
 * Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.9-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild