diff --git a/.gitignore b/.gitignore index c011d21..8cbcc4d 100644 --- a/.gitignore +++ b/.gitignore @@ -7,31 +7,3 @@ /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 31b4f5e..28ba6b7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xdp-tools-1.6.3.tar.gz) = 4b405a4e10443d31939e57b9cd171f6d232f0ce64ee9c340f3efe2e899f668a0696077aa899bd93c9292be7b4ec8550315c5a14cb4717b066a1f293b701bc326 +SHA512 (xdp-tools-1.1.1.tar.gz) = 9beaef46e5e8285ebe296fa131ba35495d6949ecd724910b7a8f2df9bc17e5ea8857dfd74ffe9f337e178739bab17a2a89ce743c308c14d006fd2ecfe884a6d5 diff --git a/xdp-tools.spec b/xdp-tools.spec index efbfc5a..f96528b 100644 --- a/xdp-tools.spec +++ b/xdp-tools.spec @@ -1,19 +1,17 @@ Name: xdp-tools -Version: 1.6.3 -Release: 2%{?dist} +Version: 1.1.1 +Release: 1%{?dist} Summary: Utilities and example programs for use with XDP -%global _soversion 1.6.0 +%global _soversion 1.1.0 -License: GPL-2.0-only +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 -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 @@ -23,13 +21,12 @@ 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 @@ -37,17 +34,16 @@ Utilities and example programs for use with XDP %package -n libxdp Summary: XDP helper library -License: LGPL-2.1-only OR BSD-2-Clause +Requires: kernel-headers %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: kernel-headers Requires: libxdp-devel = %{version}-%{release} %description -n libxdp @@ -69,8 +65,8 @@ The libxdp-static package contains the static library version of libxdp. export CFLAGS='%{build_cflags}' export LDFLAGS='%{build_ldflags}' export LIBDIR='%{_libdir}' -export RUNDIR='%{_rundir}' -export CLANG=$(which clang) +export CLANG=%{_bindir}/clang +export LLC=%{_bindir}/llc export PRODUCTION=1 export DYNAMIC_LIBXDP=1 export FORCE_SYSTEM_LIBBPF=1 @@ -82,7 +78,6 @@ make %{?_smp_mflags} V=1 export DESTDIR='%{buildroot}' export SBINDIR='%{_sbindir}' export LIBDIR='%{_libdir}' -export RUNDIR='%{_rundir}' export MANDIR='%{_mandir}' export DATADIR='%{_datadir}' export HDRDIR='%{_includedir}/xdp' @@ -92,25 +87,17 @@ 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 %{_datadir}/xdp-tools/ -%license LICENSES/* +%license LICENSE %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 @@ -121,128 +108,6 @@ 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 - -* 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