diff --git a/.gitignore b/.gitignore index 9dfa479..c011d21 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,37 @@ /xdp-tools-0.0.2.tar.gz +/xdp-tools-0.0.3.tar.gz +/xdp-tools-1.0.0~beta1.tar.gz +/xdp-tools-1.0.0~beta2.tar.gz +/xdp-tools-1.0.0~beta3.tar.gz +/xdp-tools-1.0.0.tar.gz +/xdp-tools-1.0.1.tar.gz +/xdp-tools-1.1.0.tar.gz +/xdp-tools-1.1.1.tar.gz +/xdp-tools-1.2.0.tar.gz +/xdp-tools-1.2.2.tar.gz +/xdp-tools-1.2.3.tar.gz +/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 eb32b2b..31b4f5e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xdp-tools-0.0.2.tar.gz) = ee6f6d51cc17115fd263c960249b3495f10cf7ea5ac5eff5fc5d20b7575e1d5216a2484a69cf5533e3bb092ad497b1a21391bc31f9131b44636c0d049e79f45f +SHA512 (xdp-tools-1.6.3.tar.gz) = 4b405a4e10443d31939e57b9cd171f6d232f0ce64ee9c340f3efe2e899f668a0696077aa899bd93c9292be7b4ec8550315c5a14cb4717b066a1f293b701bc326 diff --git a/xdp-tools.spec b/xdp-tools.spec index bb51a75..efbfc5a 100644 --- a/xdp-tools.spec +++ b/xdp-tools.spec @@ -1,36 +1,65 @@ Name: xdp-tools -Version: 0.0.2 +Version: 1.6.3 Release: 2%{?dist} Summary: Utilities and example programs for use with XDP +%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: clang >= 9.0.0 -BuildRequires: llvm >= 9.0.0 +BuildRequires: zlib-devel +BuildRequires: libpcap-devel +BuildRequires: libcap-ng-devel +BuildRequires: clang >= 10.0.0 +BuildRequires: llvm >= 10.0.0 BuildRequires: make BuildRequires: gcc BuildRequires: pkgconfig +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 Utilities and example programs for use with XDP -%package devel -Summary: Development files for %{name} -Requires: %{name} = %{version}-%{release} -Requires: kernel-headers +%package -n libxdp +Summary: XDP helper library +License: LGPL-2.1-only OR BSD-2-Clause -%description devel -The %{name}-devel package contains libraries header files for -developing applications that use %{name} +%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 +License: LGPL-2.1-only OR BSD-2-Clause +Requires: libxdp-devel = %{version}-%{release} + +%description -n libxdp +The libxdp package contains the libxdp library for managing XDP programs, +used by the %{name} package + +%description -n libxdp-devel +The libxdp-devel package contains headers used for building XDP programs using +libxdp. + +%description -n libxdp-static +The libxdp-static package contains the static library version of libxdp. %prep %autosetup -p1 -n %{name}-%{version} @@ -40,30 +69,209 @@ developing applications that use %{name} export CFLAGS='%{build_cflags}' export LDFLAGS='%{build_ldflags}' export LIBDIR='%{_libdir}' +export RUNDIR='%{_rundir}' +export CLANG=$(which clang) export PRODUCTION=1 +export DYNAMIC_LIBXDP=1 +export FORCE_SYSTEM_LIBBPF=1 +export FORCE_EMACS=1 ./configure -make %{?_smp_mflags} +make %{?_smp_mflags} V=1 %install export DESTDIR='%{buildroot}' export SBINDIR='%{_sbindir}' export LIBDIR='%{_libdir}' +export RUNDIR='%{_rundir}' export MANDIR='%{_mandir}' +export DATADIR='%{_datadir}' export HDRDIR='%{_includedir}/xdp' -make install +make install V=1 %files %{_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/*.o -%license LICENSE +%{_libdir}/bpf/xdpfilt_*.o +%{_libdir}/bpf/xdpdump_*.o +%{_datadir}/xdp-tools/ +%license LICENSES/* -%files devel -%{_includedir}/xdp/ +%files -n libxdp +%{_libdir}/libxdp.so.1 +%{_libdir}/libxdp.so.%{_soversion} +%{_libdir}/bpf/xdp-dispatcher.o +%{_libdir}/bpf/xsk_def_xdp_prog*.o +%{_mandir}/man3/* +%license LICENSES/* + +%files -n libxdp-static +%{_libdir}/libxdp.a + +%files -n libxdp-devel +%{_includedir}/xdp/*.h +%{_libdir}/libxdp.so +%{_libdir}/pkgconfig/libxdp.pc %changelog -* Fri Jan 31 2020 Fedora Release Engineering - 0.0.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild +* 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 + +* Tue Aug 16 2022 Toke Høiland-Jørgensen 1.2.6-1 +- Upstream version bump + +* Mon Aug 8 2022 Toke Høiland-Jørgensen 1.2.5-1 +- Upstream version bump + +* Sat Jul 23 2022 Fedora Release Engineering - 1.2.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Thu Feb 17 2022 Toke Høiland-Jørgensen 1.2.3-1 +- Upstream version bump + +* Thu Jan 20 2022 Toke Høiland-Jørgensen 1.2.2-1 +- Upstream version bump + +* Thu Jan 13 2022 Toke Høiland-Jørgensen 1.2.1-1 +- Upstream version bump + +* Fri Jul 23 2021 Fedora Release Engineering - 1.2.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Wed Jul 7 2021 Toke Høiland-Jørgensen 1.2.0-1 +- Upstream version bump + +* Wed Feb 3 2021 Toke Høiland-Jørgensen 1.1.1-1 +- Upstream version bump + +* Wed Jan 27 2021 Fedora Release Engineering - 1.1.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Mon Jan 4 2021 Toke Høiland-Jørgensen 1.1.0-1 +- Upstream version bump + +* Thu Aug 20 2020 Toke Høiland-Jørgensen 1.0.1-1 +- Upstream version bump + +* Tue Aug 18 2020 Toke Høiland-Jørgensen 1.0.0-1 +- Upstream version bump + +* Wed Jul 29 2020 Fedora Release Engineering - 1.0.0~beta3-0.2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Wed Jul 15 2020 Eelco Chaudron 1.0.0~beta3-0.1 +- Upstream version bump + +* Fri Jul 10 2020 Toke Høiland-Jørgensen 1.0.0~beta2-0.1 +- Upstream version bump + +* Mon Jun 15 2020 Toke Høiland-Jørgensen 1.0.0~beta1-0.1 +- Upstream version bump + +* Mon Apr 6 2020 Toke Høiland-Jørgensen 0.0.3-1 +- Upstream update, add libxdp sub-packages * Thu Nov 21 2019 Toke Høiland-Jørgensen 0.0.2-1 - Upstream update