3 changed files with 24 additions and 54 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1 +1 @@
-SOURCES/xdp-tools-1.4.2.tar.gz
+SOURCES/xdp-tools-1.2.10.tar.gz
--- a/.xdp-tools.metadata
+++ b/.xdp-tools.metadata
@ -1 +1 @@
-89399a7765f7910c2a60a11f74670c229d10a34b SOURCES/xdp-tools-1.4.2.tar.gz
+f0ea44bb9e7d53f7a1b83ede05984ee5ca27c0a7 SOURCES/xdp-tools-1.2.10.tar.gz
--- a/SPECS/xdp-tools.spec
+++ b/SPECS/xdp-tools.spec
@ -1,10 +1,10 @@
 Name:             xdp-tools
-Version:          1.4.2
+Version:          1.2.10
 Release:          1%{?dist}
 Summary:          Utilities and example programs for use with XDP
-%global _soversion 1.4.0
+%global _soversion 1.2.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

@ -21,10 +21,6 @@ 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}

@ -32,24 +28,25 @@ 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
-License:          LGPL-2.1-only OR BSD-2-Clause
 Requires:         kernel-headers
+Requires:         libbpf >= 0.2.0-1

 %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}

@ -91,16 +88,13 @@ 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-monitor
-%{_sbindir}/xdp-trafficgen
-%endif
 %{_mandir}/man8/*
 %{_libdir}/bpf/xdpfilt_*.o
 %{_libdir}/bpf/xdpdump_*.o
@ -110,6 +104,8 @@ make install V=1
 %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/*
@ -124,56 +120,27 @@ make install V=1
 %{_libdir}/pkgconfig/libxdp.pc

 %changelog
-* Tue Feb 6 2024 Toke Høiland-Jørgensen <toke@redhat.com> 1.4.2-1
+* Wed Feb 8 2023 Toke Høiland-Jørgensen <toke@redhat.com> 1.2.10-1
 - Upstream version bump

-* Fri Oct 20 2023 Toke Høiland-Jørgensen <toke@redhat.com> 1.4.1-1
- Upstream version bump
-
-* Thu Jul 6 2023 Toke Høiland-Jørgensen <toke@redhat.com> 1.4.0-1
- Upstream version bump
-
-* Thu Feb 23 2023 Toke Høiland-Jørgensen <toke@redhat.com> 1.3.1-1
- Upstream version bump
-
-* Thu Feb 9 2023 Toke Høiland-Jørgensen <toke@redhat.com> 1.3.0-2
- Restore building on i686, by patching the build to exclude the bits that require bpftool
-
-* Tue Feb 7 2023 Toke Høiland-Jørgensen <toke@redhat.com> 1.3.0-1
- Upstream version bump
- Don't build on i686 (because of missing bpftool)
-
-* Thu Feb 2 2023 Toke Høiland-Jørgensen <toke@redhat.com> 1.2.9-1
+* Fri Jan 20 2023 Toke Høiland-Jørgensen <toke@redhat.com> 1.2.9-1
 - Upstream version bump

 * Tue Aug 16 2022 Toke Høiland-Jørgensen <toke@redhat.com> 1.2.6-1
 - Upstream version bump

-* Thu Feb 17 2022 Toke Høiland-Jørgensen <toke@redhat.com> 1.2.3-1
- Upstream version bump
-
-* Mon Jan 31 2022 Toke Høiland-Jørgensen <toke@redhat.com> 1.2.2-1
- Upstream version bump
-
 * Thu Jan 13 2022 Toke Høiland-Jørgensen <toke@redhat.com> 1.2.1-1
 - Upstream version bump

-* Thu Aug 19 2021 Toke Høiland-Jørgensen <toke@redhat.com> 1.2.0-1
+* Wed Jul 7 2021 Toke Høiland-Jørgensen <toke@redhat.com> 1.2.0-1
 - Upstream version bump

-* Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 1.1.1-3
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
-  Related: rhbz#1991688
-
-* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 1.1.1-2
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
+* Wed Feb 10 2021 Toke Høiland-Jørgensen <toke@redhat.com> 1.1.1-2
+- Fix depedency and patch two issues fixed upstream

 * Wed Feb 3 2021 Toke Høiland-Jørgensen <toke@redhat.com> 1.1.1-1
 - Upstream version bump

-* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
 * Mon Jan 4 2021 Toke Høiland-Jørgensen <toke@redhat.com> 1.1.0-1
 - Upstream version bump

@ -183,9 +150,6 @@ make install V=1
 * Tue Aug 18 2020 Toke Høiland-Jørgensen <toke@redhat.com> 1.0.0-1
 - Upstream version bump

-* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.0~beta3-0.2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
 * Wed Jul 15 2020 Eelco Chaudron <echaudro@redhat.com> 1.0.0~beta3-0.1
 - Upstream version bump

@ -195,6 +159,12 @@ make install V=1
 * Mon Jun 15 2020 Toke Høiland-Jørgensen <toke@redhat.com> 1.0.0~beta1-0.1
 - Upstream version bump

+* Tue May 12 2020 Toke Høiland-Jørgensen <toke@redhat.com> 0.0.3-3
+- Add CI gating config file
+
+* Mon May 11 2020 Toke Høiland-Jørgensen <toke@redhat.com> 0.0.3-2
+- Fix build error due to missing _GNU_SOURCE define
+
 * Mon Apr 6 2020 Toke Høiland-Jørgensen <toke@redhat.com> 0.0.3-1
 - Upstream update, add libxdp sub-packages