From 2b2785da4b10a2fef1b2a372540c4f639fa597d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Toke=20H=C3=B8iland-J=C3=B8rgensen?= <toke@redhat.com>
Date: Wed, 7 Jan 2026 11:10:47 +0100
Subject: [PATCH] Update xdp-tools to v1.6.0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Resolves: RHEL-109724

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

diff --git a/.gitignore b/.gitignore
index 6b401d1..3d3ed2c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -29,3 +29,4 @@
 /xdp-tools-1.5.7.tar.gz
 /0001-xdp-filter-tests-Make-ndisc6-optional.patch
 /0001-test_runner-Wait-for-background-output-file-to-appea.patch
+/xdp-tools-1.6.0.tar.gz
diff --git a/sources b/sources
index a2f5282..0baf6a2 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,2 @@
-SHA512 (xdp-tools-1.5.7.tar.gz) = 8d10fbb058b77e8331e40335a8005a64e2fd965b9974baaa0a7d3dc0360289884b4dfea2a2502fe325749e34e08e3deb5313fc128437997dad9090f65f4f7353
 SHA512 (0001-xdp-filter-tests-Make-ndisc6-optional.patch) = 0780dfe70f0a790cbe6ddd42c44ee7f79524b59aa0b35c2d3b3579598971b3e89a19c914120dfa5ef621e70d67dcab88ebdd4ebe6f328f905570f8cb0f943f55
-SHA512 (0001-test_runner-Wait-for-background-output-file-to-appea.patch) = 6c85a004ff33336ef812681d27792f169ea0b57e08f39f2b877bfd3c06d026e32dbdc649fe574ac2db5789199b77c03350a27cf9b29ee88973f622e7f5438403
+SHA512 (xdp-tools-1.6.0.tar.gz) = 1ce2dea4ac5abcd31ea33f9dc9ec1e7097253b6e5713c32d434204d870a07864df7bff99234ac0e6c4ee6190f5e5ef92eb94fdba1d5884416ec76729f2d29c36
diff --git a/xdp-tools.spec b/xdp-tools.spec
index 88c2786..a94f301 100644
--- a/xdp-tools.spec
+++ b/xdp-tools.spec
@@ -1,14 +1,13 @@
 Name:             xdp-tools
-Version:          1.5.7
+Version:          1.6.0
 Release:          1%{?dist}
 Summary:          Utilities and example programs for use with XDP
-%global _soversion 1.5.0
+%global _soversion 1.6.0
 
 License:          GPL-2.0-only
 URL:              https://github.com/xdp-project/%{name}
 Source0:          https://github.com/xdp-project/%{name}/releases/download/v%{version}/xdp-tools-%{version}.tar.gz
 Patch0:           0001-xdp-filter-tests-Make-ndisc6-optional.patch
-Patch1:           0001-test_runner-Wait-for-background-output-file-to-appea.patch
 
 BuildRequires:    kernel-headers
 BuildRequires:    libbpf-devel
@@ -89,6 +88,7 @@ export MANDIR='%{_mandir}'
 export DATADIR='%{_datadir}'
 export HDRDIR='%{_includedir}/xdp'
 make install V=1
+cd $DESTDIR/$LIBDIR && ln -vs libxdp.so.%{_soversion} libxdp.so.1.5.0
 
 %files
 %{_sbindir}/xdp-filter
@@ -109,6 +109,7 @@ make install V=1
 %files -n libxdp
 %{_libdir}/libxdp.so.1
 %{_libdir}/libxdp.so.%{_soversion}
+%{_libdir}/libxdp.so.1.5.0
 %{_libdir}/bpf/xdp-dispatcher.o
 %{_libdir}/bpf/xsk_def_xdp_prog*.o
 %{_mandir}/man3/*
@@ -123,6 +124,10 @@ make install V=1
 %{_libdir}/pkgconfig/libxdp.pc
 
 %changelog
+* Wed Jan 7 2026 Toke Høiland-Jørgensen <toke@redhat.com> 1.6.0-1
+- Upstream version bump
+- Drop upstreamed patch
+
 * Fri Oct 3 2025 Toke Høiland-Jørgensen <toke@redhat.com> 1.5.7-1
 - Upstream version bump
 - Add annocheck exceptions for BPF objects (Felix)