From 8a64855659c705b39f59e72e5fb1c57b719c4e22 Mon Sep 17 00:00:00 2001 From: lijian1 Date: Wed, 4 Dec 2024 19:07:49 +0800 Subject: [PATCH] Fix typos --- 0002-Fix-typos.patch | 41 +++++++++++++++++++++++++++++++++++++++++ bcc.spec | 9 +++++++-- 2 files changed, 48 insertions(+), 2 deletions(-) create mode 100644 0002-Fix-typos.patch diff --git a/0002-Fix-typos.patch b/0002-Fix-typos.patch new file mode 100644 index 0000000..6144456 --- /dev/null +++ b/0002-Fix-typos.patch @@ -0,0 +1,41 @@ +From 1dba27a0918e44c8b1cf31444186824c1b656024 Mon Sep 17 00:00:00 2001 +From: lijian1 +Date: Wed, 4 Dec 2024 18:57:57 +0800 +Subject: [PATCH] Fix typos + +--- + tools/memleak.py | 2 +- + tools/memleak_example.txt | 4 ++-- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/tools/memleak.py b/tools/memleak.py +index 4b36714..83444f9 100755 +--- a/tools/memleak.py ++++ b/tools/memleak.py +@@ -116,7 +116,7 @@ parser.add_argument("--percpu", default=False, action="store_true", + parser.add_argument("--sort", type=str, default="size", + help="report sorted in given key; available key list: size, count") + parser.add_argument("--symbols-prefix", type=str, +- help="memory alloctor symbols prefix") ++ help="memory allocator symbols prefix") + + args = parser.parse_args() + +diff --git a/tools/memleak_example.txt b/tools/memleak_example.txt +index cf91d55..05e8bad 100644 +--- a/tools/memleak_example.txt ++++ b/tools/memleak_example.txt +@@ -177,8 +177,8 @@ Attaching to pid 2623, Ctrl+C to quit. + 0x0000559b478700b7 main+0x4a7 [redis-server] + 0x00007fdf47029d90 __libc_start_call_main+0x80 [libc.so.6] + +-When using the --sysbols-prefix argument, memleak can trace the third-party memory +-allocations, such as jemalloc whose sysbols are usually identified by the "je_" prefix ++When using the --symbols-prefix argument, memleak can trace the third-party memory ++allocations, such as jemalloc whose symbols are usually identified by the "je_" prefix + in redis project. + + USAGE message: +-- +2.43.0 + diff --git a/bcc.spec b/bcc.spec index 37163f7..533d708 100644 --- a/bcc.spec +++ b/bcc.spec @@ -2,14 +2,16 @@ Name: bcc Version: 0.29.1 -Release: 2 +Release: 3 Summary: BPF Compiler Collection (BCC) License: ASL 2.0 URL: https://github.com/iovisor/bcc # Upstream now provides a release with the git submodule embedded in it Source0: %{url}/releases/download/v%{version}/%{name}-src-with-submodule.tar.gz Patch001: 0001-CVE-2024-2314-clang-check-header-ownership.patch - +# https://github.com/iovisor/bcc/commit/5a8d76f97b277f2cc3e3216874bbca0d2e424a5c +# https://github.com/iovisor/bcc/pull/4901/commits/43c864b06fea4d461d9736a8af16a2c1f3fb3521 +Patch002: 0002-Fix-typos.patch # Arches will be included as upstream support is added and dependencies are # satisfied in the respective arches @@ -163,6 +165,9 @@ rm -rf %{buildroot}%{_datadir}/%{name}/tools/old/ %changelog +* Wed Dec 4 2024 lijian1 - 0.29.1-3 +- Fix typos + * Mon Mar 18 2024 woody2918 - 0.29.1-2 - Fix CVE-2024-2314 -- Gitee