Update to upstream v1.3.1

Signed-off-by: Toke Høiland-Jørgensen <toke@redhat.com>

.gitignore

@@ -9,3 +9,11 @@
 /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

sources

@@ -1 +1,2 @@
-SHA512 (xdp-tools-1.2.2.tar.gz) = d02d4d486c2c34a81a671bf40dd3bbc675e79e8d2fd8e18664845fa53b9488eb18fed84a19e47dfe8e839d07388beabb99e28d43d79ba1549ff37567cf9e3f14
+SHA512 (xdp-tools-1.3.1.tar.gz) = c41512c9fe43eccb2b0144c8c9d7473adfae36dbb2a4bba53d27472f4832d0c0e5dc0ce9c84d2ebaea59810a69de66d0aba3d9f17c3eed1a13753ea48d3cc1df
+SHA512 (xdp-tools-configure-Don-t-fail-on-missing-bpftool.patch) = f57c82d29581b47bc0ce6962650b4aec45d00dd4f4ecc854fccf17ea40655b20ff50e0817aec517a77ed6a6bf766c82930ece76708ab93b910f211a85366a7ff

xdp-tools.spec

@@ -1,12 +1,13 @@
 Name:             xdp-tools
-Version:          1.2.2
+Version:          1.3.1
 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}
 
@@ -65,6 +70,7 @@ 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=%{_bindir}/clang
 export LLC=%{_bindir}/llc
 export PRODUCTION=1
@@ -78,6 +84,7 @@ 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'
@@ -87,10 +94,14 @@ 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
-%{_libdir}/bpf/xsk_def_xdp_prog*.o
 %{_datadir}/xdp-tools/
 %license LICENSES/*
 
@@ -98,7 +109,9 @@ make install V=1
 %{_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
@@ -109,6 +122,37 @@ make install V=1
 %{_libdir}/pkgconfig/libxdp.pc
 
 %changelog
+* Thu Feb 23 2023 Toke Høiland-Jørgensen <toke@redhat.com> 1.3.1-1
+- Upstream version bump
+
+* Fri Feb 10 2023 Toke Høiland-Jørgensen <toke@redhat.com> 1.3.0-1
+- Upstream version bump
+- Add patch to enable building without bpftool on i686
+
+* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.9-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Wed Dec 14 2022 Toke Høiland-Jørgensen <toke@redhat.com> 1.2.9-1
+- Upstream version bump
+
+* Thu Nov 03 2022 Jiri Olsa <jolsa@kernel.org> 1.2.8-2
+- libbpf 1.0 build
+
+* Sun Sep 18 2022 Toke Høiland-Jørgensen <toke@redhat.com> 1.2.8-1
+- Upstream version bump
+
+* Tue Aug 16 2022 Toke Høiland-Jørgensen <toke@redhat.com> 1.2.6-1
+- Upstream version bump
+
+* Mon Aug 8 2022 Toke Høiland-Jørgensen <toke@redhat.com> 1.2.5-1
+- Upstream version bump
+
+* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Thu Feb 17 2022 Toke Høiland-Jørgensen <toke@redhat.com> 1.2.3-1
+- Upstream version bump
+
 * Thu Jan 20 2022 Toke Høiland-Jørgensen <toke@redhat.com> 1.2.2-1
 - Upstream version bump