diff --git a/.gitignore b/.gitignore index 14a8c08..d366553 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,6 @@ /xdp-tools-1.2.5.tar.gz /xdp-tools-1.2.6.tar.gz /xdp-tools-1.2.8.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 diff --git a/sources b/sources index d939781..65abf77 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ -SHA512 (xdp-tools-1.2.8.tar.gz) = 9a5693b17f18ac0e6aa7ee4d5715f57c5f2c056e7b1b9ac4593362b2275baecc91c9b807ce2f576b55fa1da4b148321c015e9044f1092974a9138254f4a462b1 +SHA512 (xdp-tools-1.3.1.tar.gz) = c41512c9fe43eccb2b0144c8c9d7473adfae36dbb2a4bba53d27472f4832d0c0e5dc0ce9c84d2ebaea59810a69de66d0aba3d9f17c3eed1a13753ea48d3cc1df +SHA512 (xdp-tools-configure-Don-t-fail-on-missing-bpftool.patch) = f57c82d29581b47bc0ce6962650b4aec45d00dd4f4ecc854fccf17ea40655b20ff50e0817aec517a77ed6a6bf766c82930ece76708ab93b910f211a85366a7ff diff --git a/xdp-tools.spec b/xdp-tools.spec index 6042896..4282dec 100644 --- a/xdp-tools.spec +++ b/xdp-tools.spec @@ -1,12 +1,13 @@ Name: xdp-tools -Version: 1.2.8 -Release: 1%{?dist} +Version: 1.3.1 +Release: 2%{?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,16 @@ make install V=1 %{_libdir}/pkgconfig/libxdp.pc %changelog +* Sun Apr 23 2023 Toke Høiland-Jørgensen 1.3.1-2 +- Rebuild for libbpf 1.0 + +* 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 + * Sun Sep 18 2022 Toke Høiland-Jørgensen 1.2.8-1 - Upstream version bump