diff --git a/.gitignore b/.gitignore index 8288260..01970f4 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/xdp-tools-1.2.10.tar.gz +xdp-tools-1.5.3.tar.gz diff --git a/.xdp-tools.metadata b/.xdp-tools.metadata deleted file mode 100644 index 43d1fe8..0000000 --- a/.xdp-tools.metadata +++ /dev/null @@ -1 +0,0 @@ -f0ea44bb9e7d53f7a1b83ede05984ee5ca27c0a7 SOURCES/xdp-tools-1.2.10.tar.gz diff --git a/sources b/sources new file mode 100644 index 0000000..8357318 --- /dev/null +++ b/sources @@ -0,0 +1 @@ +SHA512 (xdp-tools-1.5.3.tar.gz) = bd4aa90c210622022a0e18474821bad395bd8db8f5b53f96a3492443e8647bde95d1fe3bf77c7e4b470fdc846a6a21ea598330103eb32b6888a644c83b9690b4 diff --git a/SPECS/xdp-tools.spec b/xdp-tools.spec similarity index 56% rename from SPECS/xdp-tools.spec rename to xdp-tools.spec index 342c142..239b92c 100644 --- a/SPECS/xdp-tools.spec +++ b/xdp-tools.spec @@ -1,13 +1,14 @@ Name: xdp-tools -Version: 1.2.10 +Version: 1.5.3 Release: 1%{?dist} Summary: Utilities and example programs for use with XDP -%global _soversion 1.2.0 +%global _soversion 1.5.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 @@ -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} @@ -28,26 +33,23 @@ Requires: libxdp = %{version}-%{release} # disable the debug package to avoid rpmbuild error'ing out because of this %global debug_package %{nil} %global _hardened_build 1 -# strip barfs on BPF files, override it as a workaround -%global __brp_strip_lto %{_bindir}/true -%global __brp_strip %{_bindir}/true %description Utilities and example programs for use with XDP %package -n libxdp Summary: XDP helper library -Requires: kernel-headers -Requires: libbpf >= 0.2.0-1 +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 @@ -88,13 +90,17 @@ 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.0.0 -cd $DESTDIR/$LIBDIR && ln -vs libxdp.so.%{_soversion} libxdp.so.1.1.0 %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/xdpfilt_*.o %{_libdir}/bpf/xdpdump_*.o @@ -104,8 +110,6 @@ cd $DESTDIR/$LIBDIR && ln -vs libxdp.so.%{_soversion} libxdp.so.1.1.0 %files -n libxdp %{_libdir}/libxdp.so.1 %{_libdir}/libxdp.so.%{_soversion} -%{_libdir}/libxdp.so.1.0.0 -%{_libdir}/libxdp.so.1.1.0 %{_libdir}/bpf/xdp-dispatcher.o %{_libdir}/bpf/xsk_def_xdp_prog*.o %{_mandir}/man3/* @@ -120,27 +124,89 @@ cd $DESTDIR/$LIBDIR && ln -vs libxdp.so.%{_soversion} libxdp.so.1.1.0 %{_libdir}/pkgconfig/libxdp.pc %changelog -* Wed Feb 8 2023 Toke Høiland-Jørgensen 1.2.10-1 +* Fri Mar 7 2025 Toke Høiland-Jørgensen 1.5.3-1 - Upstream version bump -* Fri Jan 20 2023 Toke Høiland-Jørgensen 1.2.9-1 +* 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 + +* Tue Oct 29 2024 Troy Dawson - 1.4.2-3 +- Bump release for October 2024 mass rebuild: + Resolves: RHEL-64018 + +* Mon Jun 24 2024 Troy Dawson - 1.4.2-2 +- Bump release for June 2024 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 10 2021 Toke Høiland-Jørgensen 1.1.1-2 -- Fix depedency and patch two issues fixed upstream - * 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 @@ -150,6 +216,9 @@ cd $DESTDIR/$LIBDIR && ln -vs libxdp.so.%{_soversion} libxdp.so.1.1.0 * 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 @@ -159,12 +228,6 @@ cd $DESTDIR/$LIBDIR && ln -vs libxdp.so.%{_soversion} libxdp.so.1.1.0 * Mon Jun 15 2020 Toke Høiland-Jørgensen 1.0.0~beta1-0.1 - Upstream version bump -* Tue May 12 2020 Toke Høiland-Jørgensen 0.0.3-3 -- Add CI gating config file - -* Mon May 11 2020 Toke Høiland-Jørgensen 0.0.3-2 -- Fix build error due to missing _GNU_SOURCE define - * Mon Apr 6 2020 Toke Høiland-Jørgensen 0.0.3-1 - Upstream update, add libxdp sub-packages