diff --git a/.gitignore b/.gitignore index 14a8c08..c011d21 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,25 @@ /xdp-tools-1.2.5.tar.gz /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 +/xdp-tools-1.3.1.tar.gz +/xdp-tools-1.4.0.tar.gz +/xdp-tools-1.4.0-configure-Don-t-fail-on-missing-bpftool.patch +/xdp-tools-1.4.1.tar.gz +/xdp-tools-1.4.2.tar.gz +/xdp-tools-1.4.3.tar.gz +/xdp-tools-1.5.0.tar.gz +/xdp-tools-1.5.1.tar.gz +/xdp-tools-1.5.2.tar.gz +/xdp-tools-1.5.3.tar.gz +/xdp-tools-1.5.4.tar.gz +/xdp-tools-1.5.5.tar.gz +/xdp-tools-1.5.6.tar.gz +/xdp-tools-1.5.7.tar.gz +/xdp-tools-1.5.8.tar.gz +/xdp-tools-1.6.0.tar.gz +/xdp-tools-1.6.1.tar.gz +/xdp-tools-1.6.2.tar.gz +/xdp-tools-1.6.3.tar.gz diff --git a/sources b/sources index d939781..31b4f5e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xdp-tools-1.2.8.tar.gz) = 9a5693b17f18ac0e6aa7ee4d5715f57c5f2c056e7b1b9ac4593362b2275baecc91c9b807ce2f576b55fa1da4b148321c015e9044f1092974a9138254f4a462b1 +SHA512 (xdp-tools-1.6.3.tar.gz) = 4b405a4e10443d31939e57b9cd171f6d232f0ce64ee9c340f3efe2e899f668a0696077aa899bd93c9292be7b4ec8550315c5a14cb4717b066a1f293b701bc326 diff --git a/xdp-tools.spec b/xdp-tools.spec index 6042896..efbfc5a 100644 --- a/xdp-tools.spec +++ b/xdp-tools.spec @@ -1,17 +1,19 @@ Name: xdp-tools -Version: 1.2.8 -Release: 1%{?dist} +Version: 1.6.3 +Release: 2%{?dist} Summary: Utilities and example programs for use with XDP -%global _soversion 1.2.0 +%global _soversion 1.6.0 -License: GPLv2 +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 +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 @@ -21,12 +23,13 @@ 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} -# 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 @@ -34,16 +37,17 @@ Utilities and example programs for use with XDP %package -n libxdp Summary: XDP helper library -Requires: kernel-headers +License: LGPL-2.1-only OR BSD-2-Clause %package -n libxdp-devel Summary: Development files for libxdp +License: LGPL-2.1-only OR BSD-2-Clause Requires: kernel-headers Requires: libxdp = %{version}-%{release} %package -n libxdp-static Summary: Static library files for libxdp -Requires: kernel-headers +License: LGPL-2.1-only OR BSD-2-Clause Requires: libxdp-devel = %{version}-%{release} %description -n libxdp @@ -66,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 @@ -89,6 +92,12 @@ make install V=1 %{_sbindir}/xdp-filter %{_sbindir}/xdp-loader %{_sbindir}/xdpdump +%ifnarch i686 +%{_sbindir}/xdp-bench +%{_sbindir}/xdp-forward +%{_sbindir}/xdp-monitor +%{_sbindir}/xdp-trafficgen +%endif %{_mandir}/man8/* %{_libdir}/bpf/xdpfilt_*.o %{_libdir}/bpf/xdpdump_*.o @@ -112,6 +121,101 @@ make install V=1 %{_libdir}/pkgconfig/libxdp.pc %changelog +* Fri Jul 17 2026 Fedora Release Engineering - 1.6.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild + +* Wed Mar 25 2026 Toke Høiland-Jørgensen 1.6.3-1 +- Upstream version bump + +* Thu Feb 19 2026 Toke Høiland-Jørgensen 1.6.2-1 +- Upstream version bump + +* Wed Feb 11 2026 Toke Høiland-Jørgensen 1.6.1-1 +- Upstream version bump + +* Sat Jan 17 2026 Fedora Release Engineering - 1.6.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild + +* Tue Jan 6 2026 Toke Høiland-Jørgensen 1.6.0-1 +- Upstream version bump + +* Sat Nov 29 2025 Toke Høiland-Jørgensen 1.5.8-1 +- Upstream version bump + +* Fri Oct 3 2025 Toke Høiland-Jørgensen 1.5.7-1 +- Upstream version bump +- Re-enable debug packages +- Add libcap-ng-devel to BuildRequires + +* Fri Aug 15 2025 Toke Høiland-Jørgensen 1.5.6-1 +- Upstream version bump + +* Fri Jul 25 2025 Fedora Release Engineering - 1.5.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + +* Mon May 26 2025 Toke Høiland-Jørgensen 1.5.5-1 +- Upstream version bump + +* Mon Apr 28 2025 Toke Høiland-Jørgensen 1.5.4-1 +- Upstream version bump +- Fix build with Clang 20 + +* Fri Mar 7 2025 Toke Høiland-Jørgensen 1.5.3-1 +- Upstream version bump + +* Wed Feb 19 2025 Toke Høiland-Jørgensen 1.5.2-1 +- Upstream version bump + +* Sun Jan 19 2025 Fedora Release Engineering - 1.5.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + +* Tue Jan 14 2025 Toke Høiland-Jørgensen 1.5.1-1 +- Upstream version bump + +* Thu Jan 9 2025 Toke Høiland-Jørgensen 1.5.0-1 +- Upstream version bump + +* Wed Aug 7 2024 Toke Høiland-Jørgensen 1.4.3-1 +- Upstream version bump +- Move kernel-headers dependency to a build requirement, not a runtime dependency + +* Sat Jul 20 2024 Fedora Release Engineering - 1.4.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Tue Jan 30 2024 Toke Høiland-Jørgensen 1.4.2-1 +- Upstream version bump + +* Sat Jan 27 2024 Fedora Release Engineering - 1.4.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Fri Oct 20 2023 Toke Høiland-Jørgensen 1.4.1-1 +- Upstream version bump + +* Wed Aug 9 2023 Toke Høiland-Jørgensen 1.4.0-3 +- Migrated to SPDX format for licenses + +* Sat Jul 22 2023 Fedora Release Engineering - 1.4.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Thu Jul 6 2023 Toke Høiland-Jørgensen 1.4.0-1 +- Upstream version bump + +* Thu Feb 23 2023 Toke Høiland-Jørgensen 1.3.1-1 +- Upstream version bump + +* Fri Feb 10 2023 Toke Høiland-Jørgensen 1.3.0-1 +- Upstream version bump +- Add patch to enable building without bpftool on i686 + +* Sat Jan 21 2023 Fedora Release Engineering - 1.2.9-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Wed Dec 14 2022 Toke Høiland-Jørgensen 1.2.9-1 +- Upstream version bump + +* Thu Nov 03 2022 Jiri Olsa 1.2.8-2 +- libbpf 1.0 build + * Sun Sep 18 2022 Toke Høiland-Jørgensen 1.2.8-1 - Upstream version bump