From cbbb167faedc53bb698a762779032da430d5b347 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Toke=20H=C3=B8iland-J=C3=B8rgensen?= Date: Fri, 10 Feb 2023 19:26:41 +0100 Subject: [PATCH 1/3] Update to upstream v1.3.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Toke Høiland-Jørgensen --- .gitignore | 2 ++ sources | 3 ++- xdp-tools.spec | 18 ++++++++++++++++-- 3 files changed, 20 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 14a8c08..99d7967 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,5 @@ /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 diff --git a/sources b/sources index d939781..ab6f777 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ -SHA512 (xdp-tools-1.2.8.tar.gz) = 9a5693b17f18ac0e6aa7ee4d5715f57c5f2c056e7b1b9ac4593362b2275baecc91c9b807ce2f576b55fa1da4b148321c015e9044f1092974a9138254f4a462b1 +SHA512 (xdp-tools-1.3.0.tar.gz) = 3f5845c425c6698fb10e80253b39b10e8b8b1eb73ff4615a8e16374de5dc2dc313087ad2b019fe6cbaf3efa041f15c46fb30efe70e23267a89ca1f658c19c528 +SHA512 (xdp-tools-configure-Don-t-fail-on-missing-bpftool.patch) = f57c82d29581b47bc0ce6962650b4aec45d00dd4f4ecc854fccf17ea40655b20ff50e0817aec517a77ed6a6bf766c82930ece76708ab93b910f211a85366a7ff diff --git a/xdp-tools.spec b/xdp-tools.spec index 6042896..46289c8 100644 --- a/xdp-tools.spec +++ b/xdp-tools.spec @@ -1,12 +1,13 @@ Name: xdp-tools -Version: 1.2.8 +Version: 1.3.0 Release: 1%{?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,10 @@ make install V=1 %{_libdir}/pkgconfig/libxdp.pc %changelog +* 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 From 6ec2ab9c7009a47aa27c1e5794f2248babae0b24 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Toke=20H=C3=B8iland-J=C3=B8rgensen?= Date: Thu, 23 Feb 2023 18:47:30 +0100 Subject: [PATCH 2/3] Update to upstream v1.3.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Toke Høiland-Jørgensen --- .gitignore | 1 + sources | 2 +- xdp-tools.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 99d7967..d366553 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ /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 ab6f777..65abf77 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (xdp-tools-1.3.0.tar.gz) = 3f5845c425c6698fb10e80253b39b10e8b8b1eb73ff4615a8e16374de5dc2dc313087ad2b019fe6cbaf3efa041f15c46fb30efe70e23267a89ca1f658c19c528 +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 46289c8..a4a0125 100644 --- a/xdp-tools.spec +++ b/xdp-tools.spec @@ -1,5 +1,5 @@ Name: xdp-tools -Version: 1.3.0 +Version: 1.3.1 Release: 1%{?dist} Summary: Utilities and example programs for use with XDP %global _soversion 1.3.0 @@ -122,6 +122,9 @@ make install V=1 %{_libdir}/pkgconfig/libxdp.pc %changelog +* 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 From 1b21e55aa44109d864cd9619ac73e67d4d41e759 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Toke=20H=C3=B8iland-J=C3=B8rgensen?= Date: Sun, 23 Apr 2023 02:16:56 +0200 Subject: [PATCH 3/3] Bump revision for rebuild against libbpf-1.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Toke Høiland-Jørgensen --- xdp-tools.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xdp-tools.spec b/xdp-tools.spec index a4a0125..4282dec 100644 --- a/xdp-tools.spec +++ b/xdp-tools.spec @@ -1,6 +1,6 @@ Name: xdp-tools Version: 1.3.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Utilities and example programs for use with XDP %global _soversion 1.3.0 @@ -122,6 +122,9 @@ 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