.gitignore

@@ -1 +1 @@
-SOURCES/linux-4.18.0-402.el8.tar.xz
+SOURCES/linux-5.14.0-473.el9.tar.xz

.libbpf.metadata

@@ -1 +1 @@
-89c6dfe7b35089a8d281f1e0083158576a3cd3ef SOURCES/linux-4.18.0-402.el8.tar.xz
+f1b6626b8267d1713f3a954de7a9ef3f20c7699e SOURCES/linux-5.14.0-473.el9.tar.xz

SPECS/libbpf.spec

@@ -4,18 +4,23 @@
 # used as kernel tar.
 
 # RHEL kernel version-release
-%define kver   4.18.0-402
+%define kver   5.14.0-473
-%define source linux-%{kver}.el8
+%define source linux-%{kver}.el9
 
 Name:           libbpf
-Version:        0.5.0
+Version:        1.4.0
 Release:        1%{?dist}
 Summary:        Libbpf library
 
 License:        LGPLv2 or BSD
 Source0:        %{source}.tar.xz
 BuildRequires:  gcc elfutils-libelf-devel elfutils-devel python3
-Conflicts:      bcc < 0.10
+BuildRequires: make
+
+# This package supersedes libbpf from kernel-tools,
+# which has default Epoch: 0. By having Epoch: > 0
+# this libbpf will take over smoothly
+Epoch:          2
 
 %description
 A mirror of bpf-next linux tree bpf-next/tools/lib/bpf directory plus its
@@ -24,8 +29,9 @@ ABI.
 
 %package devel
 Summary:        Development files for %{name}
-Requires:       %{name} = %{version}-%{release}
+Requires:       %{name} = 2:%{version}-%{release}
 Requires:       kernel-headers >= %{kver}
+Requires:       zlib
 
 %description devel
 The %{name}-devel package contains libraries header files for
@@ -33,14 +39,14 @@ developing applications that use %{name}
 
 %package static
 Summary: Static library for libbpf development
-Requires: %{name}-devel = %{version}-%{release}
+Requires: %{name}-devel = 2:%{version}-%{release}
 
 %description static
 The %{name}-static package contains static library for
 developing applications that use %{name}
 
 %global libbpf_make \
-  make EXTRA_CFLAGS="${RPM_OPT_FLAGS}" LDFLAGS="%{__global_ldflags}" DESTDIR=%{buildroot} V=1
+  make DESTDIR=%{buildroot} OBJDIR=%{_builddir} CFLAGS="%{build_cflags} -fPIC" LDFLAGS="%{build_ldflags} -Wl,--no-as-needed" LIBDIR=/%{_libdir} NO_PKG_CONFIG=1
 
 %prep
 %setup -n %{source}
@@ -57,70 +63,131 @@ popd
 
 %files
 %{_libdir}/libbpf.so.%{version}
-%{_libdir}/libbpf.so.0
+%{_libdir}/libbpf.so.1
 
 %files devel
 %{_libdir}/libbpf.so
-%{_includedir}/bpf
+%{_includedir}/bpf/
 %{_libdir}/pkgconfig/libbpf.pc
 
 %files static
 %{_libdir}/libbpf.a
 
 %changelog
-* Tue Jun 21 2022 Viktor Malik <vmalik@redhat.com> - 2:0.5.0-1
+* Thu Jul 11 2024 Viktor Malik <vmalik@redhat.com> - 2:1.4.0-1
-- kernel update
+- Update to BPF 6.8 rebase (RHEL-30776)
-- Related: rhbz#2097413
 
-* Thu Dec 23 2021 Jiri Olsa <jolsa@redhat.com> - 2:0.4.0-3
+* Wed Feb 07 2024 Viktor Malik <vmalik@redhat.com> - 2:1.3.0-2
-- kernel update
+- Fix bug in bpf_xdp_query causing stack corruption (RHEL-26037)
-- Related: rhbz#2010431
 
-* Tue Nov 16 2021 Jiri Olsa <jolsa@redhat.com> - 2:0.5.0-2
+* Tue Jan 16 2024 Viktor Malik <vmalik@redhat.com> - 2:1.3.0-1
-- fix LDFLAGS passing
+- Update to BPF 6.6 rebase (RHEL-10695)
-- Related: rhbz#2023488
 
-* Wed Aug 18 2021 Jiri Olsa <jolsa@redhat.com> - 0.4.0-1
+* Mon Jul 03 2023 Viktor Malik <vmalik@redhat.com> - 2:1.2.0-1
-- update [1995111]
+- Update to BPF 6.3 rebase
+- Resolves: rhbz#2178933
 
-* Wed Jul 21 2021 Jiri Olsa <jolsa@redhat.com> - 0.3.0-1
+* Tue May 16 2023 Viktor Malik <vmalik@redhat.com> - 2:1.1.0-2
-- update [1944754]
+- Update to BPF 6.2 rebase
+- Resolves: rhbz#2178932
 
-* Sun Jun 06 2021 Jiri Olsa <jolsa@redhat.com> - 0.2.0-2
+* Thu Mar 30 2023 Viktor Malik <vmalik@redhat.com> - 2:1.1.0-1
-- update [1944754]
+- Update to BPF 6.1 rebase
+- Resolves: rhbz#2178931
 
-* Fri Feb 05 2021 Jiri Olsa <jolsa@redhat.com> - 0.2.0-1
+* Thu Jan 19 2023 Viktor Malik <vmalik@redhat.com> - 2:1.0.0-2
-- new kernel version [1919345]
+- Update to BPF 6.0 rebase
+- Resolves: rhbz#2159763
 
-* Fri Jan 22 2021 Jiri Olsa <jolsa@redhat.com> - 0.0.9-1
+* Mon Jan 02 2023 Viktor Malik <vmalik@redhat.com> - 2:1.0.0-1
-- new kernel version [1919345]
+- Update to 1.0.0 (BPF 5.19 rebase)
+- Resolves: rhbz#2157592
 
-* Wed Aug 12 2020 Jiri Olsa <jolsa@redhat.com> - 0.0.8-4
+* Tue Dec 13 2022 Viktor Malik <vmalik@redhat.com> - 2:0.8.0-1
-- new kernel version [1846820]
+- Update to 0.8.0 (BPF 5.18 rebase)
+- Resolves: rhbz#2149243
 
-* Mon Jul 20 2020 Jiri Olsa <jolsa@redhat.com> - 0.0.8-3
+* Fri Jun 24 2022 Viktor Malik <vmalik@redhat.com> - 2:0.6.0-1
-- add Conflicts for bcc < 0.10 [1855816]
+- Update to 0.6.0 (BPF 5.16 rebase)
+- Related: rhbz#2010428
+- Enable LTO
+- Related: rhbz#1990029
 
-* Wed Jul 08 2020 Jiri Olsa <jolsa@redhat.com> - 0.0.8-2
+* Wed Feb 23 2022 Viktor Malik <vmalik@redhat.com> - 2:0.5.0-4
-- new kernel version [1846820]
+- Backport fix for netlink operations on ppc
+- Related: rhbz#2057476
 
-* Fri Jun 26 2020 Jiri Olsa <jolsa@redhat.com> - 0.0.8-1
+* Tue Nov 09 2021 Jiri Olsa <jolsa@redhat.com> - 2:0.5.0-3
-- new kernel version [1846820]
+- pull new kernel sources with fixes
+- Related: rhbz#2006305
 
-* Wed Mar 04 2020 Jiri Olsa <jolsa@redhat.com> - 0.0.4-5
+* Fri Oct 11 2021 Jiri Olsa <jolsa@redhat.com> - 2:0.5.0-2
-- new kernel version [1809913]
+- Fix passing of system's CFLAGS/LDFLAGS
+- Related: rhbz#2012774
 
-* Thu Jan 09 2020 Jiri Olsa <jolsa@redhat.com> - 0.0.4-4
+* Fri Oct 1 2021 Jiri Olsa <jolsa@redhat.com> - 2:0.5.0-1
-- missing libbpf.pc file [1759154]
+- update to RHEL spec
+- Related: rhbz#2009725
 
-* Sun Dec 15 2019 Jiri Olsa <jolsa@redhat.com> - 0.0.4-3
+* Wed Aug 25 2021 Jiri Olsa <jolsa@redhat.com> - 2:0.4.0-1
-- new kernel version [1759154]
+- updated to 0.4.0
+  Related: rhbz#1997597
 
-* Tue Dec 10 2019 Jiri Olsa <jolsa@redhat.com> - 0.0.4-2
+* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 2:0.3.0-4
-- new build for gating [1759154]
+- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
+  Related: rhbz#1991688
 
-* Mon Nov 02 2019 Jiri Olsa <jolsa@redhat.com> - 0.0.4-1
+* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 2:0.3.0-3
-- version 0.0.4 [1759154]
+- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
 
-* Mon Nov 02 2019 Jiri Olsa <jolsa@redhat.com> - 0.0.2-1
+* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2:0.3.0-2
-- initial package [1759154]
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Fri Jan 22 2021 Jiri Olsa <jolsa@redhat.com> - 2:0.3.0-1
+- release 0.3.0-1
+
+* Thu Oct 01 2020 Jiri Olsa <jolsa@redhat.com> - 2:0.1.0-1
+- release 0.1.0
+
+* Sun Aug 02 2020 Jiri Olsa <jolsa@redhat.com> - 2:0.0.9-1
+- release 0.0.9
+
+* Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2:0.0.8-3
+- Second attempt - Rebuilt for
+  https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2:0.0.8-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Sun May 10 2020 Jiri Olsa <jolsa@redhat.com> - 2:0.0.8-1
+- release 0.0.8
+
+* Wed Mar 03 2020 Jiri Olsa <jolsa@redhat.com> - 2:0.0.7-1
+- release 0.0.7
+
+* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2:0.0.6-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Mon Jan 2 2020 Jiri Olsa <jolsa@redhat.com> - 0.0.6-2
+- release 0.0.6-2, build server issues
+
+* Mon Dec 30 2019 Jiri Olsa <jolsa@redhat.com> - 0.0.6-1
+- release 0.0.6
+
+* Thu Nov 28 2019 Jiri Olsa <jolsa@redhat.com> - 0.0.5-3
+- release 0.0.5
+
+* Fri Nov 22 2019 Jiri Olsa <jolsa@redhat.com> - 0.0.3-3
+- Revert to 0.0.3 version and adjust kernel-headers dependency (BZ#1755317)
+
+* Tue Nov 12 2019 Jiri Olsa <jolsa@redhat.com> - 0.0.5-2
+- Add kernel-headers dependency
+
+* Thu Oct 03 2019 Jiri Olsa <jolsa@redhat.com> - 0.0.5-1
+- release 0.0.5
+
+* Wed Sep 25 2019 Jiri Olsa <jolsa@redhat.com> - 0.0.3-2
+- Fix libelf linking (BZ#1755317)
+
+* Fri Sep 13 2019 Jiri Olsa <jolsa@redhat.com> - 0.0.3-1
+- Initial release