From 59b4f6c6632a3399f5c82b87edbd90c491399bee Mon Sep 17 00:00:00 2001
From: AlmaLinux RelEng Bot <eabdullin@almalinux.org>
Date: Mon, 30 Mar 2026 11:15:03 -0400
Subject: [PATCH] import CS xdp-tools-1.6.2-1.el9

---
 .gitignore           |  2 +-
 .xdp-tools.metadata  |  2 +-
 SPECS/xdp-tools.spec | 33 ++++++++++++++++++++++++++-------
 3 files changed, 28 insertions(+), 9 deletions(-)

diff --git a/.gitignore b/.gitignore
index 0d20990..8860a9d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/xdp-tools-1.5.1.tar.gz
+SOURCES/xdp-tools-1.6.2.tar.gz
diff --git a/.xdp-tools.metadata b/.xdp-tools.metadata
index 2f492bc..76438a1 100644
--- a/.xdp-tools.metadata
+++ b/.xdp-tools.metadata
@@ -1 +1 @@
-69e92707c1a0444e3ca4e1feedfbcc39a93d9547 SOURCES/xdp-tools-1.5.1.tar.gz
+ef5af2d761bad94a9ea31fa546270846af2074c7 SOURCES/xdp-tools-1.6.2.tar.gz
diff --git a/SPECS/xdp-tools.spec b/SPECS/xdp-tools.spec
index 1e59e5c..296c3cd 100644
--- a/SPECS/xdp-tools.spec
+++ b/SPECS/xdp-tools.spec
@@ -1,8 +1,8 @@
 Name:             xdp-tools
-Version:          1.5.1
+Version:          1.6.2
 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}
@@ -13,6 +13,7 @@ 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
@@ -29,9 +30,6 @@ BuildRequires:    bpftool
 # Always keep xdp-tools and libxdp packages in sync
 Requires:         libxdp = %{version}-%{release}
 
-# find-debuginfo produces empty debugsourcefiles.list
-# disable the debug package to avoid rpmbuild error'ing out because of this
-%global debug_package %{nil}
 %global _hardened_build 1
 
 %description
@@ -72,8 +70,7 @@ export CFLAGS='%{build_cflags}'
 export LDFLAGS='%{build_ldflags}'
 export LIBDIR='%{_libdir}'
 export RUNDIR='%{_rundir}'
-export CLANG=%{_bindir}/clang
-export LLC=%{_bindir}/llc
+export CLANG=$(which clang)
 export PRODUCTION=1
 export DYNAMIC_LIBXDP=1
 export FORCE_SYSTEM_LIBBPF=1
@@ -90,6 +87,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
@@ -110,6 +108,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/*
@@ -124,6 +123,26 @@ make install V=1
 %{_libdir}/pkgconfig/libxdp.pc
 
 %changelog
+* Thu Feb 19 2026 Toke Høiland-Jørgensen <toke@redhat.com> 1.6.2-1
+- Upstream version bump
+
+* 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)
+- 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
+
+* Fri Mar 7 2025 Toke Høiland-Jørgensen <toke@redhat.com> 1.5.3-1
+- Upstream version bump
+
 * Tue Jan 14 2025 Toke Høiland-Jørgensen <toke@redhat.com> 1.5.1-1
 - Upstream version bump