From b90d72db1ab870e6d9863aaeb74ae7adf3f3dd7b Mon Sep 17 00:00:00 2001 From: "L.X" <854182924@qq.com> Date: Thu, 9 Mar 2023 13:31:06 +0000 Subject: [PATCH] =?UTF-8?q?=E5=9B=9E=E9=80=80=20'Pull=20Request=20!70=20:?= =?UTF-8?q?=20Fix=20bpf=5Fprog=5Fload()=20pointing=20error=20causing=20lib?= =?UTF-8?q?bcc=20segfault'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...inting-error-causing-libbcc-segfault.patch | 24 ------------------- libbpf.spec | 6 +---- 2 files changed, 1 insertion(+), 29 deletions(-) delete mode 100644 Fix-bpf_prog_load-pointing-error-causing-libbcc-segfault.patch diff --git a/Fix-bpf_prog_load-pointing-error-causing-libbcc-segfault.patch b/Fix-bpf_prog_load-pointing-error-causing-libbcc-segfault.patch deleted file mode 100644 index e4cd83a..0000000 --- a/Fix-bpf_prog_load-pointing-error-causing-libbcc-segfault.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 07b03a723c95efad85446095ff0f101634a04630 Mon Sep 17 00:00:00 2001 -From: Rong Tao -Date: Mon, 6 Mar 2023 11:18:39 +0800 -Subject: [PATCH] Fix bpf_prog_load() pointing error causing libbcc segfault - ---- - src/libbpf.map | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/src/libbpf.map b/src/libbpf.map -index 6b36f46..ef3f87d 100644 ---- a/src/libbpf.map -+++ b/src/libbpf.map -@@ -61,7 +61,6 @@ LIBBPF_0.0.1 { - bpf_prog_detach2; - bpf_prog_get_fd_by_id; - bpf_prog_get_next_id; -- bpf_prog_load; - bpf_prog_load_xattr; - bpf_prog_query; - bpf_prog_test_run; --- -2.27.0 - diff --git a/libbpf.spec b/libbpf.spec index c4b0647..c31417b 100644 --- a/libbpf.spec +++ b/libbpf.spec @@ -4,7 +4,7 @@ Name: %{githubname} Version: %{githubver} -Release: 5 +Release: 4 Summary: Libbpf library License: LGPLv2 or BSD @@ -17,7 +17,6 @@ Patch0001: backport-libbpf-preserve-errno-across-pr_warn-pr_info-pr_debug.p Patch0002: backport-libbpf-Ensure-functions-with-always_inline-attribute-are-inline.patch Patch0003: backport-libbpf-Fix-the-name-of-a-reused-map.patch Patch0004: backport-libbpf-Disable-SEC-pragma-macro-on-GCC.patch -Patch0005: Fix-bpf_prog_load-pointing-error-causing-libbcc-segfault.patch # This package supersedes libbpf from kernel-tools, # which has default Epoch: 0. By having Epoch: 1 # this libbpf will take over smoothly @@ -69,9 +68,6 @@ developing applications that use %{name} %{_libdir}/libbpf.a %changelog -* Mon Mar 6 2023 Ge Wang - 2:0.8.1-5 -- Fix bpf_prg_load pointing error - * Thu Mar 2 2023 zhangmingyi - 2:0.8.1-4 - backporting: backport-libbpf-Disable-SEC-pragma-macro-on-GCC.patch -- Gitee