.gitignore

@@ -1 +1 @@
-SOURCES/xdp-tools-1.2.3.tar.gz
+SOURCES/xdp-tools-1.2.10.tar.gz

.xdp-tools.metadata

@@ -1 +1 @@
-dea5ab76d86d8288de3b2a8f623a0310162f6840 SOURCES/xdp-tools-1.2.3.tar.gz
+f0ea44bb9e7d53f7a1b83ede05984ee5ca27c0a7 SOURCES/xdp-tools-1.2.10.tar.gz

SPECS/xdp-tools.spec

@@ -1,5 +1,5 @@
 Name:             xdp-tools
-Version:          1.2.3
+Version:          1.2.10
 Release:          1%{?dist}
 Summary:          Utilities and example programs for use with XDP
 %global _soversion 1.2.0
@@ -28,6 +28,9 @@ 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
@@ -35,6 +38,7 @@ Utilities and example programs for use with XDP
 %package -n libxdp
 Summary:          XDP helper library
 Requires:         kernel-headers
+Requires:         libbpf >= 0.2.0-1
 
 %package -n libxdp-devel
 Summary:          Development files for libxdp
@@ -65,6 +69,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,10 +83,13 @@ 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'
 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
@@ -90,15 +98,18 @@ make install V=1
 %{_mandir}/man8/*
 %{_libdir}/bpf/xdpfilt_*.o
 %{_libdir}/bpf/xdpdump_*.o
-%{_libdir}/bpf/xsk_def_xdp_prog*.o
 %{_datadir}/xdp-tools/
 %license LICENSES/*
 
 %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/*
+%license LICENSES/*
 
 %files -n libxdp-static
 %{_libdir}/libxdp.a
@@ -109,31 +120,27 @@ make install V=1
 %{_libdir}/pkgconfig/libxdp.pc
 
 %changelog
-* Thu Feb 17 2022 Toke Høiland-Jørgensen <toke@redhat.com> 1.2.3-1
+* Wed Feb 8 2023 Toke Høiland-Jørgensen <toke@redhat.com> 1.2.10-1
 - Upstream version bump
 
-* Mon Jan 31 2022 Toke Høiland-Jørgensen <toke@redhat.com> 1.2.2-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 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
+* Wed Feb 10 2021 Toke Høiland-Jørgensen <toke@redhat.com> 1.1.1-2
-- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
+- Fix depedency and patch two issues fixed upstream
-  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 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
 
@@ -143,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
 
@@ -155,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