From b7b78e963d7e62a79d926e1e96cd8ff590fb7690 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Toke=20H=C3=B8iland-J=C3=B8rgensen?= <toke@redhat.com>
Date: Fri, 3 Oct 2025 16:36:25 +0200
Subject: [PATCH] Update xdp-tools to v1.5.7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Resolves: RHEL-105793
Resolves: RHEL-115324

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

diff --git a/.gitignore b/.gitignore
index 1973990..6b401d1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -26,3 +26,6 @@
 /xdp-tools-1.5.2.tar.gz
 /xdp-tools-1.5.3.tar.gz
 /xdp-tools-1.5.5.tar.gz
+/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
diff --git a/rpminspect.yaml b/rpminspect.yaml
index 755724a..e0f1b94 100644
--- a/rpminspect.yaml
+++ b/rpminspect.yaml
@@ -3,3 +3,5 @@ annocheck:
     ignore:
         - /usr/lib64/bpf/*.o
         - /usr/share/xdp-tools/*.o
+        - /usr/share/xdp-tools/tests/libxdp/check_kern_compat
+        - /usr/share/xdp-tools/tests/libxdp/test_dispatcher_versions
diff --git a/sources b/sources
index 60fc256..a2f5282 100644
--- a/sources
+++ b/sources
@@ -1 +1,3 @@
-SHA512 (xdp-tools-1.5.5.tar.gz) = 95d4238333837b14fff76cd3419464c152cc8e4ce505e85e98ead2f69889f18ce8306f61aa21d3af737c01f6ed2a3df1eead91973f973500b17e1b62bbeed878
+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
diff --git a/xdp-tools.spec b/xdp-tools.spec
index 44eeb29..88c2786 100644
--- a/xdp-tools.spec
+++ b/xdp-tools.spec
@@ -1,5 +1,5 @@
 Name:             xdp-tools
-Version:          1.5.5
+Version:          1.5.7
 Release:          1%{?dist}
 Summary:          Utilities and example programs for use with XDP
 %global _soversion 1.5.0
@@ -7,12 +7,15 @@ Summary:          Utilities and example programs for use with XDP
 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
 BuildRequires:    elfutils-libelf-devel
 BuildRequires:    zlib-devel
 BuildRequires:    libpcap-devel
+BuildRequires:    libcap-ng-devel
 BuildRequires:    clang >= 10.0.0
 BuildRequires:    llvm >= 10.0.0
 BuildRequires:    make
@@ -120,6 +123,12 @@ make install V=1
 %{_libdir}/pkgconfig/libxdp.pc
 
 %changelog
+* 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)
+- Re-enable debug builds (Felix)
+- Add libcap-ng-devel to BuildDepends
+
 * Wed Jun 4 2025 Toke Høiland-Jørgensen <toke@redhat.com> 1.5.5-1
 - Upstream version bump
 - Fix build with Clang 20